From nobody Fri Oct 3 18:02:41 2025 Received: from smtpbguseast1.qq.com (smtpbguseast1.qq.com [54.204.34.129]) (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 5ECE126A1BE; Thu, 28 Aug 2025 02:56:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=54.204.34.129 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756349792; cv=none; b=oi1XkbPDnSMes9VHDchSQSijuAUhDvN7Ch3O8eZKeRrH/JyAVbFHP7tNOqAYAhJRkZ9tmgZviF08o9T7IzTUwsazDTf9Ud3l5svly671QvGGIdVN9SVPZE2eMYHXyKAYBpmFumQL/qdAVfvV6LjzA2s1jKVkuEJQ6bYIXnR08bE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756349792; c=relaxed/simple; bh=CQMl/bWQcNom0w9E0ye6Iydgedovv8+aZAoXeY/ntsw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=eGuYaRmK+/KzML6kqWke0zXA4JTzimmvluEDTt2Xls7p3q7ipLzMoKn9VRr4l9GvKxS7V2hBfblgjW7qzczBRE/sVaPC2LhSK1hHU3FBYVyhnF+iyFwTa3uMpaqLfPdqZRp5klhh6+IwXgfxY1Gv4hfff/C5R3rBqb0gg/SkarI= 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.204.34.129 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: esmtpgz16t1756349767tae3dd0d2 X-QQ-Originating-IP: nATIrpFjpOkEeQFP9vD0p/jq5v7+Ipt6yA2Q0TtsiAY= Received: from localhost.localdomain ( [203.174.112.180]) by bizesmtp.qq.com (ESMTP) with id ; Thu, 28 Aug 2025 10:56:04 +0800 (CST) X-QQ-SSF: 0000000000000000000000000000000 X-QQ-GoodBg: 0 X-BIZMAIL-ID: 14306827464524467034 EX-QQ-RecipientCnt: 28 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, rdunlap@infradead.org, vadim.fedorenko@linux.dev 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 v9 2/5] net: rnpgbe: Add n500/n210 chip support Date: Thu, 28 Aug 2025 10:55:44 +0800 Message-Id: <20250828025547.568563-3-dong100@mucse.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250828025547.568563-1-dong100@mucse.com> References: <20250828025547.568563-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: NHHBtKpbeb7pMR6RXFtwgR5s5IKFZw5in0ZBn6UZu64AAbglHxA2bxWo vPSGErSzSMiDPQd2EFP2RQ1EGLyFmDlrFa3f3vTr8M945WZBY7sCKc+m1k6XWwUYFK+7skG DZd6/x7bzg9qFBV7ZrBvvLuWxwRqwhN+FIWAMuW8teFVYdayhfLnkGU7x9W4CnsHdRPO9Wt f0HdRZGmR/cdbbvwBbah5Q8kjh+vjB8G5q6P1DoRQwhZxdnXLgKdiZU1BDHrqPOdKTSrDR7 06jBZ+Q/9hWNS7UGpV22wmJC5CJbqjKZieT5t/5ldao+4+u0IQm4Sxvxt3Oa/wDDdRO3xwF vuItzrbYRT91SqaNEHG1ddjGnTXGq4yHYNUwxPD6xdVok7EtfzH8N0yCgUwiYQTqCeui5qn ipyd1WTRVHuc54yd/QpwqFQBZw9e4reeAKLItLg6lLvW2Ya2yWqjJWXrwVWFx+sYPR+MSEU 65REef60dz4YXM/sq9i6IBzHtjHnBPdG0ElvDGZJElhdhVKH8Wx4+y10YJbJW3YJAmntQ1O YOLK40yiGPhkxA/oiBndykFKnXVDW0ZErvkl2ocMj4LZgCpZZziUVz8AtZCA/WMSGTKHc12 hULjblKK0FFVaUehGykmSt3DsXVMlB6BIoKuIG52Ye6NGRFWXQyFotFy6W7kiipZXna3sY7 7Wf5KlvwCxlLwsYopDxvNbc1J9CzKwTQtAh23wz85Xk1q7pG70SMxv6Z1KgZbJiH2acyw1c 0eEsBDbB9otwQdWQqr/QOWQnK31y7rvhmrdHxQ3/mfYQ5uyvZNSSljxyEVZbybUzJnR7onN 4bOfjzBMDwbaJ05Yrt6ESAaqTG6v2tDM/e8tFZrP+vKuMiNZqUi7guDIujmyUqmMxx8n5qB S9iqdzFdHNy71yTGfbhsNSupMuJuPytqptGcv4Ca92zaNeF7SszjvKTvupZBs3ozuLwNswi Ud+zR58iWnXnygNnpVRgPaAN4po5mksGDXOfcF0kaXkbj3hY+HtAIP32WsBJMA73itBf0PI DUVRioj+JQw/G0OzlqHiGyt+XCbVw= X-QQ-XMRINFO: NS+P29fieYNw95Bth2bWPxk= 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 | 34 ++++++++ .../net/ethernet/mucse/rnpgbe/rnpgbe_chip.c | 68 +++++++++++++++ drivers/net/ethernet/mucse/rnpgbe/rnpgbe_hw.h | 16 ++++ .../net/ethernet/mucse/rnpgbe/rnpgbe_main.c | 85 +++++++++++++++++++ 5 files changed, 205 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..9a86e67d6395 100644 --- a/drivers/net/ethernet/mucse/rnpgbe/rnpgbe.h +++ b/drivers/net/ethernet/mucse/rnpgbe/rnpgbe.h @@ -4,15 +4,49 @@ #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 { + 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..179621ea09f3 --- /dev/null +++ b/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_chip.c @@ -0,0 +1,68 @@ +// 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 { + .hw_type =3D rnpgbe_hw_n500, + .init =3D &rnpgbe_init_n500, +}; + +const struct rnpgbe_info rnpgbe_n210_info =3D { + .hw_type =3D rnpgbe_hw_n210, + .init =3D &rnpgbe_init_n210, +}; + +const struct rnpgbe_info rnpgbe_n210L_info =3D { + .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 98905607e74b..25b7119d6ecb 100644 --- a/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_main.c +++ b/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_main.c @@ -4,10 +4,18 @@ #include #include #include +#include +#include =20 #include "rnpgbe.h" +#include "rnpgbe_hw.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 +35,56 @@ 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 errno 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; + int err; + + netdev =3D alloc_etherdev_mq(sizeof(struct mucse), RNPGBE_MAX_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 +97,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); @@ -65,6 +124,9 @@ static int rnpgbe_probe(struct pci_dev *pdev, const stru= ct pci_device_id *id) dev_err(&pdev->dev, "pci_save_state failed %d\n", err); goto err_free_regions; } + err =3D rnpgbe_add_adapter(pdev, info); + if (err) + goto err_free_regions; =20 return 0; err_free_regions: @@ -74,6 +136,24 @@ static int rnpgbe_probe(struct pci_dev *pdev, const str= uct pci_device_id *id) 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 @@ -85,6 +165,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); } @@ -95,6 +176,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