| Message ID | 8CEF83825BEC744B83065625E567D7C204A2C707@IRSMSX108.ger.corp.intel.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers |
Return-Path: <dev-bounces@dpdk.org> X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id D9356C36E; Tue, 2 Jun 2015 10:26:19 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 353ABC342 for <dev@dpdk.org>; Tue, 2 Jun 2015 10:26:17 +0200 (CEST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga101.jf.intel.com with ESMTP; 02 Jun 2015 01:26:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,538,1427785200"; d="scan'208";a="735471156" Received: from irsmsx151.ger.corp.intel.com ([163.33.192.59]) by fmsmga002.fm.intel.com with ESMTP; 02 Jun 2015 01:26:16 -0700 Received: from irsmsx108.ger.corp.intel.com ([169.254.11.59]) by IRSMSX151.ger.corp.intel.com ([169.254.4.102]) with mapi id 14.03.0224.002; Tue, 2 Jun 2015 09:26:15 +0100 From: "Iremonger, Bernard" <bernard.iremonger@intel.com> To: "Qiu, Michael" <michael.qiu@intel.com>, "dev@dpdk.org" <dev@dpdk.org> Thread-Topic: [RFC PATCH] librte_pmd_fm10k: Add hotplug support for fm10k Thread-Index: AQHQm69Nd7knu+UFjEiopgN6tfC2152Y40sQ Date: Tue, 2 Jun 2015 08:26:14 +0000 Message-ID: <8CEF83825BEC744B83065625E567D7C204A2C707@IRSMSX108.ger.corp.intel.com> References: <1433083021-16701-1-git-send-email-michael.qiu@intel.com> In-Reply-To: <1433083021-16701-1-git-send-email-michael.qiu@intel.com> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [163.33.239.182] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Cc: "He, Shaopeng" <shaopeng.he@intel.com> Subject: Re: [dpdk-dev] [RFC PATCH] librte_pmd_fm10k: Add hotplug support for fm10k X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK <dev.dpdk.org> List-Unsubscribe: <http://dpdk.org/ml/options/dev>, <mailto:dev-request@dpdk.org?subject=unsubscribe> List-Archive: <http://dpdk.org/ml/archives/dev/> List-Post: <mailto:dev@dpdk.org> List-Help: <mailto:dev-request@dpdk.org?subject=help> List-Subscribe: <http://dpdk.org/ml/listinfo/dev>, <mailto:dev-request@dpdk.org?subject=subscribe> Errors-To: dev-bounces@dpdk.org Sender: "dev" <dev-bounces@dpdk.org> |
Commit Message
Iremonger, Bernard
June 2, 2015, 8:26 a.m. UTC
-----Original Message----- From: Qiu, Michael Sent: Sunday, May 31, 2015 3:37 PM To: dev@dpdk.org Cc: Chen, Jing D; Iremonger, Bernard; He, Shaopeng; Qiu, Michael Subject: [RFC PATCH] librte_pmd_fm10k: Add hotplug support for fm10k Add hotplug support for fm10k Signed-off-by: Michael Qiu <michael.qiu@intel.com> --- lib/librte_pmd_fm10k/fm10k_ethdev.c | 134 ++++++++++++++++++++++++++++++++++-- 1 file changed, 129 insertions(+), 5 deletions(-) Hi Michael, The location of the fm10k pmd has changed to drivers/net/fm10k. lib/librte_pmd_fm10k no longer exists. You will need to rebase to use the new directory structure. Regards, Bernard. PMD_INIT_FUNC_TRACE(); - for (i = 0; i < dev->data->nb_tx_queues; i++) - fm10k_dev_tx_queue_stop(dev, i); + if (dev->data->tx_queues) + for (i = 0; i < dev->data->nb_tx_queues; i++) + fm10k_dev_tx_queue_stop(dev, i); - for (i = 0; i < dev->data->nb_rx_queues; i++) - fm10k_dev_rx_queue_stop(dev, i); + if (dev->data->rx_queues) + for (i = 0; i < dev->data->nb_rx_queues; i++) + fm10k_dev_rx_queue_stop(dev, i); +} + +static void +fm10k_dev_queue_release(__rte_unused struct rte_eth_dev *dev) { + int i; + + PMD_INIT_FUNC_TRACE(); + + if (dev->data->tx_queues) { + for (i = 0; i < dev->data->nb_tx_queues; i++) + fm10k_tx_queue_release(dev->data->tx_queues[i]); + rte_free(dev->data->tx_queues); + dev->data->tx_queues = NULL; + } + + if (dev->data->rx_queues) { + for (i = 0; i < dev->data->nb_rx_queues; i++) + fm10k_rx_queue_release(dev->data->rx_queues[i]); + rte_free(dev->data->rx_queues); + dev->data->rx_queues = NULL; + } } static void @@ -705,6 +733,7 @@ fm10k_dev_close(struct rte_eth_dev *dev) /* Stop mailbox service first */ fm10k_close_mbx_service(hw); fm10k_dev_stop(dev); + fm10k_dev_queue_release(dev); fm10k_stop_hw(hw); } @@ -1406,6 +1435,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); @@ -1423,6 +1482,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) { @@ -1868,6 +1943,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 */ + 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. @@ -1883,9 +2006,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
Comments
On 6/2/2015 4:26 PM, Iremonger, Bernard wrote: > > -----Original Message----- > From: Qiu, Michael > Sent: Sunday, May 31, 2015 3:37 PM > To: dev@dpdk.org > Cc: Chen, Jing D; Iremonger, Bernard; He, Shaopeng; Qiu, Michael > Subject: [RFC PATCH] librte_pmd_fm10k: Add hotplug support for fm10k > > Add hotplug support for fm10k > > Signed-off-by: Michael Qiu <michael.qiu@intel.com> > --- > lib/librte_pmd_fm10k/fm10k_ethdev.c | 134 ++++++++++++++++++++++++++++++++++-- > 1 file changed, 129 insertions(+), 5 deletions(-) > > Hi Michael, > > The location of the fm10k pmd has changed to drivers/net/fm10k. > lib/librte_pmd_fm10k no longer exists. > You will need to rebase to use the new directory structure. OK, got it, I will rebase it, Thanks, Michael > Regards, > > Bernard. > > > diff --git a/lib/librte_pmd_fm10k/fm10k_ethdev.c b/lib/librte_pmd_fm10k/fm10k_ethdev.c > index 7f5f513..3d72607 100644 > --- a/lib/librte_pmd_fm10k/fm10k_ethdev.c > +++ b/lib/librte_pmd_fm10k/fm10k_ethdev.c > @@ -55,6 +55,10 @@ > > static void fm10k_close_mbx_service(struct fm10k_hw *hw); > > +static void fm10k_tx_queue_release(void *queue); > + > +static void fm10k_rx_queue_release(void *queue); > + > static void > fm10k_mbx_initlock(struct fm10k_hw *hw) { @@ -688,11 +692,35 @@ fm10k_dev_stop(struct rte_eth_dev *dev) > > PMD_INIT_FUNC_TRACE(); > > - for (i = 0; i < dev->data->nb_tx_queues; i++) > - fm10k_dev_tx_queue_stop(dev, i); > + if (dev->data->tx_queues) > + for (i = 0; i < dev->data->nb_tx_queues; i++) > + fm10k_dev_tx_queue_stop(dev, i); > > - for (i = 0; i < dev->data->nb_rx_queues; i++) > - fm10k_dev_rx_queue_stop(dev, i); > + if (dev->data->rx_queues) > + for (i = 0; i < dev->data->nb_rx_queues; i++) > + fm10k_dev_rx_queue_stop(dev, i); > +} > + > +static void > +fm10k_dev_queue_release(__rte_unused struct rte_eth_dev *dev) { > + int i; > + > + PMD_INIT_FUNC_TRACE(); > + > + if (dev->data->tx_queues) { > + for (i = 0; i < dev->data->nb_tx_queues; i++) > + fm10k_tx_queue_release(dev->data->tx_queues[i]); > + rte_free(dev->data->tx_queues); > + dev->data->tx_queues = NULL; > + } > + > + if (dev->data->rx_queues) { > + for (i = 0; i < dev->data->nb_rx_queues; i++) > + fm10k_rx_queue_release(dev->data->rx_queues[i]); > + rte_free(dev->data->rx_queues); > + dev->data->rx_queues = NULL; > + } > } > > static void > @@ -705,6 +733,7 @@ fm10k_dev_close(struct rte_eth_dev *dev) > /* Stop mailbox service first */ > fm10k_close_mbx_service(hw); > fm10k_dev_stop(dev); > + fm10k_dev_queue_release(dev); > fm10k_stop_hw(hw); > } > > @@ -1406,6 +1435,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); > @@ -1423,6 +1482,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) { @@ -1868,6 +1943,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 */ > + 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. > @@ -1883,9 +2006,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 > >
diff --git a/lib/librte_pmd_fm10k/fm10k_ethdev.c b/lib/librte_pmd_fm10k/fm10k_ethdev.c index 7f5f513..3d72607 100644 --- a/lib/librte_pmd_fm10k/fm10k_ethdev.c +++ b/lib/librte_pmd_fm10k/fm10k_ethdev.c @@ -55,6 +55,10 @@ static void fm10k_close_mbx_service(struct fm10k_hw *hw); +static void fm10k_tx_queue_release(void *queue); + +static void fm10k_rx_queue_release(void *queue); + static void fm10k_mbx_initlock(struct fm10k_hw *hw) { @@ -688,11 +692,35 @@ fm10k_dev_stop(struct rte_eth_dev *dev)