From 9fa23029a7b76ebedd793c73b70de5bb2687e1f8 Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Wed, 29 Jun 2022 11:34:17 +0800 Subject: [PATCH] net/ngbe: fix customized device probing The devices with OEM subsystem vendor ID failed to be initialized, because flash was read before memory address was set. Fixes: 240422edbf84 ("net/ngbe: support OEM subsystem vendor ID") Signed-off-by: Jiawen Wu --- drivers/net/ngbe/ngbe_ethdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ngbe/ngbe_ethdev.c b/drivers/net/ngbe/ngbe_ethdev.c index 308c231183..86c28099c4 100644 --- a/drivers/net/ngbe/ngbe_ethdev.c +++ b/drivers/net/ngbe/ngbe_ethdev.c @@ -363,6 +363,8 @@ eth_ngbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused) rte_eth_copy_pci_info(eth_dev, pci_dev); eth_dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS; + hw->hw_addr = (void *)pci_dev->mem_resource[0].addr; + /* Vendor and Device ID need to be set before init of shared code */ hw->back = pci_dev; hw->device_id = pci_dev->id.device_id; @@ -381,7 +383,6 @@ eth_ngbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused) hw->sub_system_id = (u16)ssid >> 8 | (u16)ssid << 8; } ngbe_map_device_id(hw); - hw->hw_addr = (void *)pci_dev->mem_resource[0].addr; /* Reserve memory for interrupt status block */ mz = rte_eth_dma_zone_reserve(eth_dev, "ngbe_driver", -1, -- 2.20.1