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 | 87 +++++++++++++++++++ 5 files changed, 207 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/ethernet/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 @@ # obj-$(CONFIG_MGBE) += rnpgbe.o -rnpgbe-objs := rnpgbe_main.o +rnpgbe-objs := rnpgbe_main.o\ + rnpgbe_chip.o diff --git a/drivers/net/ethernet/mucse/rnpgbe/rnpgbe.h b/drivers/net/ethernet/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 +#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, }; +enum rnpgbe_hw_type { + rnpgbe_hw_n500 = 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); }; /* 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 = &hw->mbx; + + mbx->pf2fw_mbox_ctrl = GBE_PF2FW_MBX_MASK_OFFSET; + mbx->fw_pf_mbox_mask = 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 = &hw->mbx; + + rnpgbe_init_common(hw); + + mbx->fw2pf_mbox_vec = N500_FW2PF_MBX_VEC_OFFSET; + mbx->fw_pf_shm_base = 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 = &hw->mbx; + + rnpgbe_init_common(hw); + + mbx->fw2pf_mbox_vec = N210_FW2PF_MBX_VEC_OFFSET; + mbx->fw_pf_shm_base = N210_FWPF_SHM_BASE_OFFSET; +} + +const struct rnpgbe_info rnpgbe_n500_info = { + .hw_type = rnpgbe_hw_n500, + .init = &rnpgbe_init_n500, +}; + +const struct rnpgbe_info rnpgbe_n210_info = { + .hw_type = rnpgbe_hw_n210, + .init = &rnpgbe_init_n210, +}; + +const struct rnpgbe_info rnpgbe_n210L_info = { + .hw_type = rnpgbe_hw_n210L, + .init = &rnpgbe_init_n210, +}; diff --git a/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_hw.h b/drivers/net/ethernet/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 b4a9c5c66af6..6992a3c0e58a 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 #include "rnpgbe.h" +#include "rnpgbe_hw.h" static const char rnpgbe_driver_name[] = "rnpgbe"; +static const struct rnpgbe_info *rnpgbe_info_tbl[] = { + [board_n500] = &rnpgbe_n500_info, + [board_n210] = &rnpgbe_n210_info, + [board_n210L] = &rnpgbe_n210L_info, +}; /* rnpgbe_pci_tbl - PCI Device ID Table * @@ -27,6 +35,56 @@ static struct pci_device_id rnpgbe_pci_tbl[] = { {0, }, }; +/** + * 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; + int err; + + netdev = alloc_etherdev_mq(sizeof(struct mucse), RNPGBE_MAX_QUEUES); + if (!netdev) + return -ENOMEM; + + SET_NETDEV_DEV(netdev, &pdev->dev); + mucse = netdev_priv(netdev); + mucse->netdev = netdev; + mucse->pdev = pdev; + pci_set_drvdata(pdev, mucse); + + hw = &mucse->hw; + hw->hw_type = info->hw_type; + hw->pdev = pdev; + hw_addr = devm_ioremap(&pdev->dev, + pci_resource_start(pdev, 2), + pci_resource_len(pdev, 2)); + if (!hw_addr) { + err = -EIO; + goto err_free_net; + } + + hw->hw_addr = 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[] = { **/ static int rnpgbe_probe(struct pci_dev *pdev, const struct pci_device_id *id) { + const struct rnpgbe_info *info = rnpgbe_info_tbl[id->driver_data]; int err; err = pci_enable_device_mem(pdev); @@ -61,13 +120,36 @@ static int rnpgbe_probe(struct pci_dev *pdev, const struct pci_device_id *id) pci_set_master(pdev); pci_save_state(pdev); + err = rnpgbe_add_adapter(pdev, info); + if (err) + goto err_regions; return 0; +err_regions: + pci_release_mem_regions(pdev); err_dma: pci_disable_device(pdev); return err; } +/** + * 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 = pci_get_drvdata(pdev); + struct net_device *netdev; + + if (!mucse) + return; + netdev = mucse->netdev; + mucse->netdev = NULL; + free_netdev(netdev); +} + /** * rnpgbe_remove - Device removal routine * @pdev: PCI device information struct @@ -79,6 +161,7 @@ static int rnpgbe_probe(struct pci_dev *pdev, const struct 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 +172,10 @@ static void rnpgbe_remove(struct pci_dev *pdev) **/ static void rnpgbe_dev_shutdown(struct pci_dev *pdev) { + struct mucse *mucse = pci_get_drvdata(pdev); + struct net_device *netdev = mucse->netdev; + + netif_device_detach(netdev); pci_disable_device(pdev); } -- 2.25.1