From nobody Thu Jan 30 19:02:19 2025 Received: from mx.socionext.com (mx.socionext.com [202.248.49.38]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8CC091FCFC5; Mon, 27 Jan 2025 09:25:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.248.49.38 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737969903; cv=none; b=LHMAnaP7FsBzkhdybu5HRzpQP3Zy3stK2zAIa5kcRkFvELU7gR3GTwF1pXcRxbNlYqHybTRDJfTHfIVA4oeM0qr0YwnYGzxNxrpt7LgvuwSA8F8Fh6OXBs2hGJKGKto4AB20LXumoH9V0R6UU7ueOkmdN5a6I70iDKUjD3B31+Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737969903; c=relaxed/simple; bh=NL1KOGzHFnM7vRC/AL3GHdK7FWSKGHiUE5U8IFAELYI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=GFhAAJ6UOOwRhqKmFNpswf0JZEd+T0L4O0F37o5X3/2KfPbE2MfVnwVj2xB/e96NeFNCnWCMBsaeb9UJOAvA/UdZ50NNp2oAtul7MXEotJX1J6X5BijCHja0L5C1Mjoh3iv+4hUSZlClL+pa+nSIjVfsmmOpvlu6cfT5Umy6aoc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=socionext.com; spf=pass smtp.mailfrom=socionext.com; arc=none smtp.client-ip=202.248.49.38 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=socionext.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=socionext.com Received: from unknown (HELO kinkan2-ex.css.socionext.com) ([172.31.9.52]) by mx.socionext.com with ESMTP; 27 Jan 2025 18:24:59 +0900 Received: from mail.mfilter.local (mail-arc01.css.socionext.com [10.213.46.36]) by kinkan2-ex.css.socionext.com (Postfix) with ESMTP id 246AC200B5D4; Mon, 27 Jan 2025 18:24:59 +0900 (JST) Received: from kinkan2.css.socionext.com ([172.31.9.51]) by m-FILTER with ESMTP; Mon, 27 Jan 2025 18:24:59 +0900 Received: from plum.e01.socionext.com (unknown [10.212.245.39]) by kinkan2.css.socionext.com (Postfix) with ESMTP id 87E16661; Mon, 27 Jan 2025 18:24:58 +0900 (JST) From: Kunihiko Hayashi To: Alexandre Torgue , Jose Abreu , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Kunihiko Hayashi Subject: [PATCH net 1/3] net: stmmac: Fix use of queue max macros for Rx interrupt name Date: Mon, 27 Jan 2025 18:24:48 +0900 Message-Id: <20250127092450.2945611-2-hayashi.kunihiko@socionext.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250127092450.2945611-1-hayashi.kunihiko@socionext.com> References: <20250127092450.2945611-1-hayashi.kunihiko@socionext.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Fix macros for maximum queue number to keep consistency. Fixes: 8532f613bc78 ("net: stmmac: introduce MSI Interrupt routines for mac= , safety, RX & TX") Signed-off-by: Kunihiko Hayashi Reviewed-by: Huacai Chen Reviewed-by: Russell King (Oracle) --- drivers/net/ethernet/stmicro/stmmac/stmmac.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/eth= ernet/stmicro/stmmac/stmmac.h index ea135203ff2e..86c071baedf2 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h @@ -354,7 +354,7 @@ struct stmmac_priv { char int_name_sfty[IFNAMSIZ + 10]; char int_name_sfty_ce[IFNAMSIZ + 10]; char int_name_sfty_ue[IFNAMSIZ + 10]; - char int_name_rx_irq[MTL_MAX_TX_QUEUES][IFNAMSIZ + 14]; + char int_name_rx_irq[MTL_MAX_RX_QUEUES][IFNAMSIZ + 14]; char int_name_tx_irq[MTL_MAX_TX_QUEUES][IFNAMSIZ + 18]; =20 #ifdef CONFIG_DEBUG_FS --=20 2.25.1 From nobody Thu Jan 30 19:02:19 2025 Received: from mx.socionext.com (mx.socionext.com [202.248.49.38]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 19B68126BEE; Mon, 27 Jan 2025 09:25:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.248.49.38 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737969903; cv=none; b=T7V6Ej1oD/LnFzdll4+c84IDR/MKzbaOl1bhwOCQ4yU80pQVpUY5LrV6w36lSYPn8ea4QtGBaWvB4curHXpdML0qxi3DGiiKtHuMEzuAk5/3rqdzyoMTkMhz7LJYc5ltHCYf2RGGmQNz9v9ijqHwNAJ2PFE9SSPqsaEIZ15u2i4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737969903; c=relaxed/simple; bh=EflSrG9KbKJ9RvEErWpM2cwRI+yKZfxPjt435VTpixE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=PK975pT5u4kQI+lMp83WM+S3mNtk26BvkBWaFW/6gLWXtaVoXrthr95BDu5xz/5Rr4aZlBqmmVSPGmMguS6GMQDyFyjNN5LoA42zHvFvcbl9iRaEP7nuM8dGSUqQR5A0JOQ/3bPXMUccF5UPHC8krjdBCm8Wz+vK9jFpmxjOsTc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=socionext.com; spf=pass smtp.mailfrom=socionext.com; arc=none smtp.client-ip=202.248.49.38 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=socionext.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=socionext.com Received: from unknown (HELO iyokan2-ex.css.socionext.com) ([172.31.9.54]) by mx.socionext.com with ESMTP; 27 Jan 2025 18:24:59 +0900 Received: from mail.mfilter.local (mail-arc02.css.socionext.com [10.213.46.40]) by iyokan2-ex.css.socionext.com (Postfix) with ESMTP id BFEB32006FCC; Mon, 27 Jan 2025 18:24:59 +0900 (JST) Received: from kinkan2.css.socionext.com ([172.31.9.51]) by m-FILTER with ESMTP; Mon, 27 Jan 2025 18:24:59 +0900 Received: from plum.e01.socionext.com (unknown [10.212.245.39]) by kinkan2.css.socionext.com (Postfix) with ESMTP id 1A431C3C1E; Mon, 27 Jan 2025 18:24:59 +0900 (JST) From: Kunihiko Hayashi To: Alexandre Torgue , Jose Abreu , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Kunihiko Hayashi Subject: [PATCH net 2/3] net: stmmac: Fix use of queue max macros for Rx coalesce Date: Mon, 27 Jan 2025 18:24:49 +0900 Message-Id: <20250127092450.2945611-3-hayashi.kunihiko@socionext.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250127092450.2945611-1-hayashi.kunihiko@socionext.com> References: <20250127092450.2945611-1-hayashi.kunihiko@socionext.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Fix macros for maximum queue number to keep consistency. Fixes: db2f2842e6f5 ("net: stmmac: add per-queue TX & RX coalesce ethtool s= upport") Signed-off-by: Kunihiko Hayashi Reviewed-by: Huacai Chen Reviewed-by: Russell King (Oracle) --- drivers/net/ethernet/stmicro/stmmac/stmmac.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/eth= ernet/stmicro/stmmac/stmmac.h index 86c071baedf2..1793ddd69164 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h @@ -265,7 +265,7 @@ struct stmmac_priv { /* Frequently used values are kept adjacent for cache effect */ u32 tx_coal_frames[MTL_MAX_TX_QUEUES]; u32 tx_coal_timer[MTL_MAX_TX_QUEUES]; - u32 rx_coal_frames[MTL_MAX_TX_QUEUES]; + u32 rx_coal_frames[MTL_MAX_RX_QUEUES]; =20 int hwts_tx_en; bool tx_path_in_lpi_mode; @@ -275,7 +275,7 @@ struct stmmac_priv { u32 sarc_type; =20 unsigned int rx_copybreak; - u32 rx_riwt[MTL_MAX_TX_QUEUES]; + u32 rx_riwt[MTL_MAX_RX_QUEUES]; int hwts_rx_en; =20 void __iomem *ioaddr; --=20 2.25.1 From nobody Thu Jan 30 19:02:19 2025 Received: from mx.socionext.com (mx.socionext.com [202.248.49.38]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B88401FCFFB; Mon, 27 Jan 2025 09:25:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.248.49.38 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737969904; cv=none; b=TNC8tekHoxKEI+g2JsK6Niw3KkQzpApLt73vE6ElHrj5GETq46G9AcGbn4pP9ofMwFsAOTwJpXtOwawoQ9qlxtHb4Cil8LGMnfS4C9jz9YmpbkefchPj1uPKIUQuJkpM5iM6lJ4CvxzQ3s3kblekKgqPXQYklu6s6W+93J9MdTM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737969904; c=relaxed/simple; bh=1Bm1EjOqPGULASeVmVzWQbP1B6OsDmHLXOD3Wk2v8vw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=YHZVy531/rRu8EhazTmYR50W/3Oehx8OBMXdTY7yjTo+Apdb1SXzO/8UOWX/wKwENCV3zhsIpqRM6BpeccB7AN12GU2MDiQZK9ypZc0wWW+4cH/sbWkFtDCX850oOUk4jbXZXS6aaHdNfPTIz/LjRMaXcAURA2AIXq6CXW+XjOY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=socionext.com; spf=pass smtp.mailfrom=socionext.com; arc=none smtp.client-ip=202.248.49.38 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=socionext.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=socionext.com Received: from unknown (HELO kinkan2-ex.css.socionext.com) ([172.31.9.52]) by mx.socionext.com with ESMTP; 27 Jan 2025 18:25:00 +0900 Received: from mail.mfilter.local (mail-arc02.css.socionext.com [10.213.46.40]) by kinkan2-ex.css.socionext.com (Postfix) with ESMTP id 47147200B5D4; Mon, 27 Jan 2025 18:25:00 +0900 (JST) Received: from kinkan2.css.socionext.com ([172.31.9.51]) by m-FILTER with ESMTP; Mon, 27 Jan 2025 18:25:00 +0900 Received: from plum.e01.socionext.com (unknown [10.212.245.39]) by kinkan2.css.socionext.com (Postfix) with ESMTP id 996D8AB187; Mon, 27 Jan 2025 18:24:59 +0900 (JST) From: Kunihiko Hayashi To: Alexandre Torgue , Jose Abreu , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Kunihiko Hayashi Subject: [PATCH net 3/3] net: stmmac: Fix use of queue max macros for irq statistics Date: Mon, 27 Jan 2025 18:24:50 +0900 Message-Id: <20250127092450.2945611-4-hayashi.kunihiko@socionext.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250127092450.2945611-1-hayashi.kunihiko@socionext.com> References: <20250127092450.2945611-1-hayashi.kunihiko@socionext.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Fix macros for maximum queue number to keep consistency. Fixes: 38cc3c6dcc09 ("net: stmmac: protect updates of 64-bit statistics cou= nters") Signed-off-by: Kunihiko Hayashi Reviewed-by: Huacai Chen Reviewed-by: Russell King (Oracle) --- drivers/net/ethernet/stmicro/stmmac/common.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/common.h b/drivers/net/eth= ernet/stmicro/stmmac/common.h index 684489156dce..b6966218cb77 100644 --- a/drivers/net/ethernet/stmicro/stmmac/common.h +++ b/drivers/net/ethernet/stmicro/stmmac/common.h @@ -101,8 +101,8 @@ struct stmmac_rxq_stats { /* Updates on each CPU protected by not allowing nested irqs. */ struct stmmac_pcpu_stats { struct u64_stats_sync syncp; - u64_stats_t rx_normal_irq_n[MTL_MAX_TX_QUEUES]; - u64_stats_t tx_normal_irq_n[MTL_MAX_RX_QUEUES]; + u64_stats_t rx_normal_irq_n[MTL_MAX_RX_QUEUES]; + u64_stats_t tx_normal_irq_n[MTL_MAX_TX_QUEUES]; }; =20 /* Extra statistic and debug information exposed by ethtool */ --=20 2.25.1