From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id EE42BC73E for ; Thu, 18 Jun 2015 18:42:16 +0200 (CEST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP; 18 Jun 2015 09:42:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,640,1427785200"; d="scan'208";a="730057020" Received: from irsmsx154.ger.corp.intel.com ([163.33.192.96]) by fmsmga001.fm.intel.com with ESMTP; 18 Jun 2015 09:42:11 -0700 Received: from irsmsx108.ger.corp.intel.com ([169.254.11.201]) by IRSMSX154.ger.corp.intel.com ([169.254.12.91]) with mapi id 14.03.0224.002; Thu, 18 Jun 2015 17:42:09 +0100 From: "Iremonger, Bernard" To: "Qiu, Michael" , "dev@dpdk.org" Thread-Topic: [PATCH 2/2 v2] fm10k: Add hotplug support for fm10k Thread-Index: AQHQqNnnKJJ70Tjo00eVnzrUzSgN252ydoqQ Date: Thu, 18 Jun 2015 16:42:09 +0000 Message-ID: <8CEF83825BEC744B83065625E567D7C204A37E29@IRSMSX108.ger.corp.intel.com> References: <1433938895-16331-2-git-send-email-michael.qiu@intel.com> <1434530691-16242-1-git-send-email-michael.qiu@intel.com> In-Reply-To: <1434530691-16242-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" Subject: Re: [dpdk-dev] [PATCH 2/2 v2] 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Jun 2015 16:42:17 -0000 > -----Original Message----- > From: Qiu, Michael > Sent: Wednesday, June 17, 2015 9:45 AM > To: dev@dpdk.org > Cc: Chen, Jing D; Iremonger, Bernard; He, Shaopeng; Qiu, Michael > Subject: [PATCH 2/2 v2] fm10k: Add hotplug support for fm10k >=20 > Add hotplug support for fm10k. >=20 > Signed-off-by: Michael Qiu Hi Michael, There is one comment inline. > --- > drivers/net/fm10k/fm10k_ethdev.c | 97 > +++++++++++++++++++++++++++++++++++++++- > 1 file changed, 96 insertions(+), 1 deletion(-) >=20 > 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) } >=20 > static void > +fm10k_dev_disable_intr_pf(struct rte_eth_dev *dev) { > + struct fm10k_hw *hw =3D FM10K_DEV_PRIVATE_TO_HW(dev->data- > >dev_private); > + uint32_t int_map =3D FM10K_INT_MAP_DISABLE; > + > + int_map |=3D 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 =3D 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); > } >=20 > +static void > +fm10k_dev_disable_intr_vf(struct rte_eth_dev *dev) { > + struct fm10k_hw *hw =3D FM10K_DEV_PRIVATE_TO_HW(dev->data- > >dev_private); > + uint32_t int_map =3D FM10K_INT_MAP_DISABLE; > + > + int_map |=3D 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; > } >=20 > +static int > +eth_fm10k_dev_uninit(struct rte_eth_dev *dev) { > + struct fm10k_hw *hw =3D FM10K_DEV_PRIVATE_TO_HW(dev->data- > >dev_private); > + > + PMD_INIT_FUNC_TRACE(); > + > + /* only uninitialize in the primary process */ > + if (rte_eal_process_type() !=3D 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 c= alled already ? Regards, Bernard. > + fm10k_dev_close(dev); > + > + dev->dev_ops =3D NULL; > + dev->rx_pkt_burst =3D NULL; > + dev->tx_pkt_burst =3D NULL; > + > + /* disable uio/vfio intr */ > + rte_intr_disable(&(dev->pci_dev->intr_handle)); > + > + /*PF/VF has different interrupt handling mechanism */ > + if (hw->mac.type =3D=3D 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 =3D 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 =3D { > { > .name =3D "rte_pmd_fm10k", > .id_table =3D pci_id_fm10k_map, > - .drv_flags =3D RTE_PCI_DRV_NEED_MAPPING, > + .drv_flags =3D RTE_PCI_DRV_NEED_MAPPING | > RTE_PCI_DRV_DETACHABLE, > }, > .eth_dev_init =3D eth_fm10k_dev_init, > + .eth_dev_uninit =3D eth_fm10k_dev_uninit, > .dev_private_size =3D sizeof(struct fm10k_adapter), }; >=20 > -- > 1.9.3