From nobody Sat Oct 4 06:37:09 2025 Received: from smtpbgau2.qq.com (smtpbgau2.qq.com [54.206.34.216]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 078A42D9488 for ; Wed, 20 Aug 2025 09:23:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=54.206.34.216 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755681825; cv=none; b=DAcB5D/3GGIIZxt4ycO+mgI1AF+x6VZmPXGw8zIwIJViPoNLtOWxzw7iFvPW6BFM6X60OS56GPtdwQZYCRRhEnNT3A3v1zM7ljAAcs4A5aJHZwjvhFF8pPlpCyZhtUMHY1EL+QWuZtqI920sN6bQVRcBxNYoXz85NdSPEmsj/3M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755681825; c=relaxed/simple; bh=U/YODyrjcBv6SJkVwH7Og1VEt98H1AAx8TDEvCEhjR0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=VWhgyuCLJkDt9aR3OiNZ0zIM9DaGjtI0VhLE0apYku+aedWq2/L9a795o9zBeLfdo1WhRy1lBsp/uGUTtL2E5qO4VosKV1xgxrBMRTtJ2xl9tUsq2B8ocCZNnhlfjELVGMG01f35Cta6lXMNpO2eKCcffJtZje1CfQzHObE2fSk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=mucse.com; spf=pass smtp.mailfrom=mucse.com; arc=none smtp.client-ip=54.206.34.216 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=mucse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=mucse.com X-QQ-mid: esmtpgz10t1755681737tb521dec9 X-QQ-Originating-IP: mZ5gb4xFM/lOoxt5V8kuyf1D72PHVnk+tGKc0zN+IC8= Received: from localhost.localdomain ( [203.174.112.180]) by bizesmtp.qq.com (ESMTP) with id ; Wed, 20 Aug 2025 17:22:14 +0800 (CST) X-QQ-SSF: 0000000000000000000000000000000 X-QQ-GoodBg: 0 X-BIZMAIL-ID: 11971569143370105039 EX-QQ-RecipientCnt: 26 From: Dong Yibo To: andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org, corbet@lwn.net, gur.stavi@huawei.com, maddy@linux.ibm.com, mpe@ellerman.id.au, danishanwar@ti.com, lee@trager.us, gongfan1@huawei.com, lorenzo@kernel.org, geert+renesas@glider.be, Parthiban.Veerasooran@microchip.com, lukas.bulwahn@redhat.com, alexanderduyck@fb.com, richardcochran@gmail.com, kees@kernel.org, gustavoars@kernel.org Cc: netdev@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, dong100@mucse.com Subject: [PATCH net-next v6 2/5] net: rnpgbe: Add n500/n210 chip support Date: Wed, 20 Aug 2025 17:21:51 +0800 Message-Id: <20250820092154.1643120-3-dong100@mucse.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250820092154.1643120-1-dong100@mucse.com> References: <20250820092154.1643120-1-dong100@mucse.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 X-QQ-SENDSIZE: 520 Feedback-ID: esmtpgz:mucse.com:qybglogicsvrgz:qybglogicsvrgz8a-1 X-QQ-XMAILINFO: OSpg15mXxluHnNw8++zGk5UxIFbHxXbTGGeUsyVkEd48I8kj38iMooha OrDkmOAdy1E2BgXean0Qozh0RWwDUib55PH8BbtnSNPKGJFAaLpfovphNWzsxx40k5VqgPS cXDwfHHIH64ctA3kXuWVgLQObMLTrb6iKVgHa3JuzNlG/TSuaCH3FTjSj5zMm7Pq6aCrkwq cQ70O2XA6sSSY8PGpkqeIXzw5UJqFyWb1GoOfFSwl0727RA2Yz0ZYx3X5FRUyvxkqFOXGSc h99CVLcAiSS+aaIqWVyJxclSDp6nxxIV58zI4a/SiqSJd0toSbRV2ZSuZE4G56ae1QwKa2X 1tUdYj3bDvWfgZGkjgwlMFwlkjrhDjvl6m1hhpsmTGxuMabMZsd7hhpBX/gViQZ0nk9myzB IYZwEnNzsxJGJYi5OGv/4DPyUNebwbR219BuYhj4XngsmFUl6L7ygx9p17vEARBK+OYrEVu a7nwpHu53PV/awcZiGWSk4BduvWEHWvm9yEDWSYSLMXWB05JT5O2m2VFFavKf5HKdM/aW7Q 1l29LrVIbx2C0E6tnCHKV6RxaF/n4ZVrRRXn5si0r9zvIS+HcDOmCQDdQxj6fPgvabRy5Gr boPtnR8hS70OPnbVgW+o7kNmi5VEIJNierYjGN5QpCZCqihwBpW+37yTEiozZKxSVEhBxAw QXEut+xsACRi9zMKf1rFE36pXEF4JDG62WvzPtQXLVkqit5yPxbB1aJkcC4awZ+YEZ6e+4m 6em8lgJTwLuIBQXoJfeV4Rq/Lmhz8y1tbmPeP9PpIdoHgXcfXTMYjhOsMtb637lkcWJ5UOV DkFyo6h5j3+GDsb2cka38hKsQTGtCHqDfVqSw2GJDFghN8aw/IhaRcl9UOzH433Tawc6dOD JbYXiqhFQ2QEgb18dFfMHDxzVziyBIfTvk74z9+2hCqwrS6HZn9iQ3paRjrKLrxvL1D8T7A z7jl2qGRUFUySxMenr9SoEFFoStCEw/XjeCh6afNTzqV4X1umqxQTsaVug5jFtpqr/qt5Vb vvF0LV/+2pl6qePoHESbQz20J0EAzRHxgu3j2qy4ZVQSLjapO9Bv405o7JOKXDBvVlvSnAj Rjc/3HdhmXH3jtbLhFREy1WBMFoR9D/FNFjM4RQiecUsenXYfs8pUlEexJJKcPKj10/28yC 7Xlk X-QQ-XMRINFO: OD9hHCdaPRBwq3WW+NvGbIU= X-QQ-RECHKSPAM: 0 Content-Type: text/plain; charset="utf-8" Initialize n500/n210 chip bar resource map and dma, eth, mbx ... info for future use. Signed-off-by: Dong Yibo --- drivers/net/ethernet/mucse/rnpgbe/Makefile | 3 +- drivers/net/ethernet/mucse/rnpgbe/rnpgbe.h | 35 ++++++++ .../net/ethernet/mucse/rnpgbe/rnpgbe_chip.c | 71 +++++++++++++++ drivers/net/ethernet/mucse/rnpgbe/rnpgbe_hw.h | 16 ++++ .../net/ethernet/mucse/rnpgbe/rnpgbe_main.c | 88 +++++++++++++++++++ 5 files changed, 212 insertions(+), 1 deletion(-) create mode 100644 drivers/net/ethernet/mucse/rnpgbe/rnpgbe_chip.c create mode 100644 drivers/net/ethernet/mucse/rnpgbe/rnpgbe_hw.h diff --git a/drivers/net/ethernet/mucse/rnpgbe/Makefile b/drivers/net/ether= net/mucse/rnpgbe/Makefile index 9df536f0d04c..42c359f459d9 100644 --- a/drivers/net/ethernet/mucse/rnpgbe/Makefile +++ b/drivers/net/ethernet/mucse/rnpgbe/Makefile @@ -5,4 +5,5 @@ # =20 obj-$(CONFIG_MGBE) +=3D rnpgbe.o -rnpgbe-objs :=3D rnpgbe_main.o +rnpgbe-objs :=3D rnpgbe_main.o\ + rnpgbe_chip.o diff --git a/drivers/net/ethernet/mucse/rnpgbe/rnpgbe.h b/drivers/net/ether= net/mucse/rnpgbe/rnpgbe.h index 64b2c093bc6e..2ae310303a48 100644 --- a/drivers/net/ethernet/mucse/rnpgbe/rnpgbe.h +++ b/drivers/net/ethernet/mucse/rnpgbe/rnpgbe.h @@ -4,15 +4,50 @@ #ifndef _RNPGBE_H #define _RNPGBE_H =20 +#include + +extern const struct rnpgbe_info rnpgbe_n500_info; +extern const struct rnpgbe_info rnpgbe_n210_info; +extern const struct rnpgbe_info rnpgbe_n210L_info; + enum rnpgbe_boards { board_n500, board_n210, board_n210L, }; =20 +enum rnpgbe_hw_type { + rnpgbe_hw_n500 =3D 0, + rnpgbe_hw_n210, + rnpgbe_hw_n210L, + rnpgbe_hw_unknown +}; + +struct mucse_mbx_info { + /* fw <--> pf mbx */ + u32 fw_pf_shm_base; + u32 pf2fw_mbox_ctrl; + u32 fw_pf_mbox_mask; + u32 fw2pf_mbox_vec; +}; + +struct mucse_hw { + void __iomem *hw_addr; + struct pci_dev *pdev; + enum rnpgbe_hw_type hw_type; + struct mucse_mbx_info mbx; +}; + struct mucse { struct net_device *netdev; struct pci_dev *pdev; + struct mucse_hw hw; +}; + +struct rnpgbe_info { + int total_queue_pair_cnts; + enum rnpgbe_hw_type hw_type; + void (*init)(struct mucse_hw *hw); }; =20 /* Device IDs */ diff --git a/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_chip.c b/drivers/net/= ethernet/mucse/rnpgbe/rnpgbe_chip.c new file mode 100644 index 000000000000..3cb25670586e --- /dev/null +++ b/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_chip.c @@ -0,0 +1,71 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright(c) 2020 - 2025 Mucse Corporation. */ + +#include "rnpgbe.h" +#include "rnpgbe_hw.h" + +/** + * rnpgbe_init_common - Setup common attribute + * @hw: hw information structure + **/ +static void rnpgbe_init_common(struct mucse_hw *hw) +{ + struct mucse_mbx_info *mbx =3D &hw->mbx; + + mbx->pf2fw_mbox_ctrl =3D GBE_PF2FW_MBX_MASK_OFFSET; + mbx->fw_pf_mbox_mask =3D GBE_FWPF_MBX_MASK; +} + +/** + * rnpgbe_init_n500 - Setup n500 hw info + * @hw: hw information structure + * + * rnpgbe_init_n500 initializes all private + * structure, such as dma, eth, mac and mbx base on + * hw->hw_addr for n500 + **/ +static void rnpgbe_init_n500(struct mucse_hw *hw) +{ + struct mucse_mbx_info *mbx =3D &hw->mbx; + + rnpgbe_init_common(hw); + + mbx->fw2pf_mbox_vec =3D N500_FW2PF_MBX_VEC_OFFSET; + mbx->fw_pf_shm_base =3D N500_FWPF_SHM_BASE_OFFSET; +} + +/** + * rnpgbe_init_n210 - Setup n210 hw info + * @hw: hw information structure + * + * rnpgbe_init_n210 initializes all private + * structure, such as dma, eth, mac and mbx base on + * hw->hw_addr for n210 + **/ +static void rnpgbe_init_n210(struct mucse_hw *hw) +{ + struct mucse_mbx_info *mbx =3D &hw->mbx; + + rnpgbe_init_common(hw); + + mbx->fw2pf_mbox_vec =3D N210_FW2PF_MBX_VEC_OFFSET; + mbx->fw_pf_shm_base =3D N210_FWPF_SHM_BASE_OFFSET; +} + +const struct rnpgbe_info rnpgbe_n500_info =3D { + .total_queue_pair_cnts =3D RNPGBE_MAX_QUEUES, + .hw_type =3D rnpgbe_hw_n500, + .init =3D &rnpgbe_init_n500, +}; + +const struct rnpgbe_info rnpgbe_n210_info =3D { + .total_queue_pair_cnts =3D RNPGBE_MAX_QUEUES, + .hw_type =3D rnpgbe_hw_n210, + .init =3D &rnpgbe_init_n210, +}; + +const struct rnpgbe_info rnpgbe_n210L_info =3D { + .total_queue_pair_cnts =3D RNPGBE_MAX_QUEUES, + .hw_type =3D rnpgbe_hw_n210L, + .init =3D &rnpgbe_init_n210, +}; diff --git a/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_hw.h b/drivers/net/et= hernet/mucse/rnpgbe/rnpgbe_hw.h new file mode 100644 index 000000000000..746dca78f1df --- /dev/null +++ b/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_hw.h @@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright(c) 2020 - 2025 Mucse Corporation. */ + +#ifndef _RNPGBE_HW_H +#define _RNPGBE_HW_H + +/**************** MBX Resource ****************************/ +#define N500_FW2PF_MBX_VEC_OFFSET 0x28b00 +#define N500_FWPF_SHM_BASE_OFFSET 0x2d000 +#define GBE_PF2FW_MBX_MASK_OFFSET 0x5500 +#define GBE_FWPF_MBX_MASK 0x5700 +#define N210_FW2PF_MBX_VEC_OFFSET 0x29400 +#define N210_FWPF_SHM_BASE_OFFSET 0x2d900 +/**************** CHIP Resource ****************************/ +#define RNPGBE_MAX_QUEUES 8 +#endif /* _RNPGBE_HW_H */ diff --git a/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_main.c b/drivers/net/= ethernet/mucse/rnpgbe/rnpgbe_main.c index 2090942ef633..9ce81e38e278 100644 --- a/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_main.c +++ b/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_main.c @@ -4,10 +4,17 @@ #include #include #include +#include +#include =20 #include "rnpgbe.h" =20 static const char rnpgbe_driver_name[] =3D "rnpgbe"; +static const struct rnpgbe_info *rnpgbe_info_tbl[] =3D { + [board_n500] =3D &rnpgbe_n500_info, + [board_n210] =3D &rnpgbe_n210_info, + [board_n210L] =3D &rnpgbe_n210L_info, +}; =20 /* rnpgbe_pci_tbl - PCI Device ID Table * @@ -27,6 +34,58 @@ static struct pci_device_id rnpgbe_pci_tbl[] =3D { {0, }, }; =20 +/** + * rnpgbe_add_adapter - Add netdev for this pci_dev + * @pdev: PCI device information structure + * @info: chip info structure + * + * rnpgbe_add_adapter initializes a netdev for this pci_dev + * structure. Initializes Bar map, private structure, and a + * hardware reset occur. + * + * @return: 0 on success, negative on failure + **/ +static int rnpgbe_add_adapter(struct pci_dev *pdev, + const struct rnpgbe_info *info) +{ + struct net_device *netdev; + void __iomem *hw_addr; + struct mucse *mucse; + struct mucse_hw *hw; + u32 queues; + int err; + + queues =3D info->total_queue_pair_cnts; + netdev =3D alloc_etherdev_mq(sizeof(struct mucse), queues); + if (!netdev) + return -ENOMEM; + + SET_NETDEV_DEV(netdev, &pdev->dev); + mucse =3D netdev_priv(netdev); + mucse->netdev =3D netdev; + mucse->pdev =3D pdev; + pci_set_drvdata(pdev, mucse); + + hw =3D &mucse->hw; + hw->hw_type =3D info->hw_type; + hw->pdev =3D pdev; + hw_addr =3D devm_ioremap(&pdev->dev, + pci_resource_start(pdev, 2), + pci_resource_len(pdev, 2)); + if (!hw_addr) { + err =3D -EIO; + goto err_free_net; + } + + hw->hw_addr =3D hw_addr; + info->init(hw); + return 0; + +err_free_net: + free_netdev(netdev); + return err; +} + /** * rnpgbe_probe - Device initialization routine * @pdev: PCI device information struct @@ -39,6 +98,7 @@ static struct pci_device_id rnpgbe_pci_tbl[] =3D { **/ static int rnpgbe_probe(struct pci_dev *pdev, const struct pci_device_id *= id) { + const struct rnpgbe_info *info =3D rnpgbe_info_tbl[id->driver_data]; int err; =20 err =3D pci_enable_device_mem(pdev); @@ -61,13 +121,36 @@ static int rnpgbe_probe(struct pci_dev *pdev, const st= ruct pci_device_id *id) =20 pci_set_master(pdev); pci_save_state(pdev); + err =3D rnpgbe_add_adapter(pdev, info); + if (err) + goto err_regions; =20 return 0; +err_regions: + pci_release_mem_regions(pdev); err_dma: pci_disable_device(pdev); return err; } =20 +/** + * rnpgbe_rm_adapter - Remove netdev for this mucse structure + * @pdev: PCI device information struct + * + * rnpgbe_rm_adapter remove a netdev for this mucse structure + **/ +static void rnpgbe_rm_adapter(struct pci_dev *pdev) +{ + struct mucse *mucse =3D pci_get_drvdata(pdev); + struct net_device *netdev; + + if (!mucse) + return; + netdev =3D mucse->netdev; + mucse->netdev =3D NULL; + free_netdev(netdev); +} + /** * rnpgbe_remove - Device removal routine * @pdev: PCI device information struct @@ -79,6 +162,7 @@ static int rnpgbe_probe(struct pci_dev *pdev, const stru= ct pci_device_id *id) **/ static void rnpgbe_remove(struct pci_dev *pdev) { + rnpgbe_rm_adapter(pdev); pci_release_mem_regions(pdev); pci_disable_device(pdev); } @@ -89,6 +173,10 @@ static void rnpgbe_remove(struct pci_dev *pdev) **/ static void rnpgbe_dev_shutdown(struct pci_dev *pdev) { + struct mucse *mucse =3D pci_get_drvdata(pdev); + struct net_device *netdev =3D mucse->netdev; + + netif_device_detach(netdev); pci_disable_device(pdev); } =20 --=20 2.25.1