On 6/19/2015 12:42 AM, Iremonger, Bernard wrote: >> -----Original Message----- >> From: Qiu, Michael >> Sent: Wednesday, June 17, 2015 9:45 AM >> To: dev at dpdk.org >> Cc: Chen, Jing D; Iremonger, Bernard; He, Shaopeng; Qiu, Michael >> Subject: [PATCH 2/2 v2] fm10k: Add hotplug support for fm10k >> >> Add hotplug support for fm10k. >> >> Signed-off-by: Michael Qiu <michael.qiu at intel.com> > Hi Michael, > > There is one comment inline. > >> --- >> drivers/net/fm10k/fm10k_ethdev.c | 97 >> +++++++++++++++++++++++++++++++++++++++- >> 1 file changed, 96 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/net/fm10k/fm10k_ethdev.c >> b/drivers/net/fm10k/fm10k_ethdev.c >> index e310698..0d3eaf1 100644 >> --- a/drivers/net/fm10k/fm10k_ethdev.c >> +++ b/drivers/net/fm10k/fm10k_ethdev.c >> @@ -1412,6 +1412,36 @@ fm10k_dev_enable_intr_pf(struct rte_eth_dev >> *dev) } >> >> static void >> +fm10k_dev_disable_intr_pf(struct rte_eth_dev *dev) { >> + struct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data- >>> dev_private); >> + uint32_t int_map = FM10K_INT_MAP_DISABLE; >> + >> + int_map |= 0; >> + >> + FM10K_WRITE_REG(hw, FM10K_INT_MAP(fm10k_int_Mailbox), >> int_map); >> + FM10K_WRITE_REG(hw, FM10K_INT_MAP(fm10k_int_PCIeFault), >> int_map); >> + FM10K_WRITE_REG(hw, >> FM10K_INT_MAP(fm10k_int_SwitchUpDown), int_map); >> + FM10K_WRITE_REG(hw, FM10K_INT_MAP(fm10k_int_SwitchEvent), >> int_map); >> + FM10K_WRITE_REG(hw, FM10K_INT_MAP(fm10k_int_SRAM), >> int_map); >> + FM10K_WRITE_REG(hw, FM10K_INT_MAP(fm10k_int_VFLR), >> int_map); >> + >> + /* Disable misc causes */ >> + FM10K_WRITE_REG(hw, FM10K_EIMR, >> FM10K_EIMR_DISABLE(PCA_FAULT) | >> + FM10K_EIMR_DISABLE(THI_FAULT) | >> + FM10K_EIMR_DISABLE(FUM_FAULT) | >> + FM10K_EIMR_DISABLE(MAILBOX) | >> + FM10K_EIMR_DISABLE(SWITCHREADY) | >> + FM10K_EIMR_DISABLE(SWITCHNOTREADY) | >> + FM10K_EIMR_DISABLE(SRAMERROR) | >> + FM10K_EIMR_DISABLE(VFLR)); >> + >> + /* Disable ITR 0 */ >> + FM10K_WRITE_REG(hw, FM10K_ITR(0), FM10K_ITR_MASK_SET); >> + FM10K_WRITE_FLUSH(hw); >> +} >> + >> +static void >> fm10k_dev_enable_intr_vf(struct rte_eth_dev *dev) { >> struct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data- >>> dev_private); >> @@ -1429,6 +1459,22 @@ fm10k_dev_enable_intr_vf(struct rte_eth_dev >> *dev) >> FM10K_WRITE_FLUSH(hw); >> } >> >> +static void >> +fm10k_dev_disable_intr_vf(struct rte_eth_dev *dev) { >> + struct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data- >>> dev_private); >> + uint32_t int_map = FM10K_INT_MAP_DISABLE; >> + >> + int_map |= 0; >> + >> + /* Only INT 0 available, other 15 are reserved. */ >> + FM10K_WRITE_REG(hw, FM10K_VFINT_MAP, int_map); >> + >> + /* Disable ITR 0 */ >> + FM10K_WRITE_REG(hw, FM10K_VFITR(0), FM10K_ITR_MASK_SET); >> + FM10K_WRITE_FLUSH(hw); >> +} >> + >> static int >> fm10k_dev_handle_fault(struct fm10k_hw *hw, uint32_t eicr) { @@ - >> 1858,6 +1904,54 @@ eth_fm10k_dev_init(struct rte_eth_dev *dev) >> return 0; >> } >> >> +static int >> +eth_fm10k_dev_uninit(struct rte_eth_dev *dev) { >> + struct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data- >>> dev_private); >> + >> + PMD_INIT_FUNC_TRACE(); >> + >> + /* only uninitialize in the primary process */ >> + if (rte_eal_process_type() != RTE_PROC_PRIMARY) >> + return 0; >> + >> + /* safe to close dev here */ > Should a flag be added so as not to call fm10k_dev_close() if it has been > called already ?
It's OK for fm10k, for i40e for 82599, there has a flag in share code to show whether has been closed, but for fm10k there doesn't. Also function fm10k_dev_close() would check all pointer and resource, that's why need first patch in fm10k_dev_stop(). Thanks, Michael > Regards, > > Bernard. > >> + fm10k_dev_close(dev); >> + >> + dev->dev_ops = NULL; >> + dev->rx_pkt_burst = NULL; >> + dev->tx_pkt_burst = NULL; >> + >> + /* disable uio/vfio intr */ >> + rte_intr_disable(&(dev->pci_dev->intr_handle)); >> + >> + /*PF/VF has different interrupt handling mechanism */ >> + if (hw->mac.type == fm10k_mac_pf) { >> + /* disable interrupt */ >> + fm10k_dev_disable_intr_pf(dev); >> + >> + /* unregister callback func to eal lib */ >> + rte_intr_callback_unregister(&(dev->pci_dev->intr_handle), >> + fm10k_dev_interrupt_handler_pf, (void *)dev); >> + } else { >> + /* disable interrupt */ >> + fm10k_dev_disable_intr_vf(dev); >> + >> + rte_intr_callback_unregister(&(dev->pci_dev->intr_handle), >> + fm10k_dev_interrupt_handler_vf, (void *)dev); >> + } >> + >> + /* free mac memory */ >> + if (dev->data->mac_addrs) { >> + rte_free(dev->data->mac_addrs); >> + dev->data->mac_addrs = NULL; >> + } >> + >> + memset(hw, 0, sizeof(*hw)); >> + >> + return 0; >> +} >> + >> /* >> * The set of PCI devices this driver supports. This driver will enable >> both PF >> * and SRIOV-VF devices. >> @@ -1873,9 +1967,10 @@ static struct eth_driver rte_pmd_fm10k = { >> { >> .name = "rte_pmd_fm10k", >> .id_table = pci_id_fm10k_map, >> - .drv_flags = RTE_PCI_DRV_NEED_MAPPING, >> + .drv_flags = RTE_PCI_DRV_NEED_MAPPING | >> RTE_PCI_DRV_DETACHABLE, >> }, >> .eth_dev_init = eth_fm10k_dev_init, >> + .eth_dev_uninit = eth_fm10k_dev_uninit, >> .dev_private_size = sizeof(struct fm10k_adapter), }; >> >> -- >> 1.9.3 >