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 355365A85 for ; Wed, 11 Mar 2015 11:26:27 +0100 (CET) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga103.jf.intel.com with ESMTP; 11 Mar 2015 03:23:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,381,1422950400"; d="scan'208";a="663620032" Received: from bricha3-mobl3.ger.corp.intel.com ([10.243.20.28]) by orsmga001.jf.intel.com with SMTP; 11 Mar 2015 03:26:24 -0700 Received: by (sSMTP sendmail emulation); Wed, 11 Mar 2015 10:26:22 +0025 Date: Wed, 11 Mar 2015 10:26:22 +0000 From: Bruce Richardson To: Raz Amir Message-ID: <20150311102621.GA12704@bricha3-MOBL3> References: <1424932400-66862-1-git-send-email-razamir22@gmail.com> <1425572663-22299-1-git-send-email-razamir22@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1425572663-22299-1-git-send-email-razamir22@gmail.com> Organization: Intel Shannon Ltd. User-Agent: Mutt/1.5.23 (2014-03-12) Cc: dev@dpdk.org Subject: Re: [dpdk-dev] [PATCH v4] pci: save list of detached devices, and re-probe during driver unload 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: Wed, 11 Mar 2015 10:26:27 -0000 On Thu, Mar 05, 2015 at 06:24:23PM +0200, Raz Amir wrote: > Added code that saves the pointers to the detached devices, during > driver loading, and during driver unloading, go over the list, > and re-attach them by calling device_probe_and_attach > on each device. > > Signed-off-by: Raz Amir Acked-by: Bruce Richardson > --- > lib/librte_eal/bsdapp/nic_uio/nic_uio.c | 34 ++++++++++++++++++++++++++++----- > 1 file changed, 29 insertions(+), 5 deletions(-) > > diff --git a/lib/librte_eal/bsdapp/nic_uio/nic_uio.c b/lib/librte_eal/bsdapp/nic_uio/nic_uio.c > index 5ae8560..7a4ed5d 100644 > --- a/lib/librte_eal/bsdapp/nic_uio/nic_uio.c > +++ b/lib/librte_eal/bsdapp/nic_uio/nic_uio.c > @@ -55,6 +55,9 @@ __FBSDID("$FreeBSD$"); > > #define MAX_BARS (PCIR_MAX_BAR_0 + 1) > > +#define MAX_DETACHED_DEVICES 128 > +static device_t detached_devices[MAX_DETACHED_DEVICES] = {}; > +static int num_detached = 0; > > struct nic_uio_softc { > device_t dev_t; > @@ -288,17 +291,38 @@ nic_uio_load(void) > function = strtol(token, NULL, 10); > > dev = pci_find_bsf(bus, device, function); > - if (dev != NULL) > - for (i = 0; i < NUM_DEVICES; i++) > - if (pci_get_vendor(dev) == devices[i].vend && > - pci_get_device(dev) == devices[i].dev) > - device_detach(dev); > + if (dev == NULL) > + continue; > + > + for (i = 0; i < NUM_DEVICES; i++) > + if (pci_get_vendor(dev) == devices[i].vend && > + pci_get_device(dev) == devices[i].dev) { > + if (num_detached < MAX_DETACHED_DEVICES) { > + printf("nic_uio_load: detaching and storing dev=%p\n", dev); > + detached_devices[num_detached++] = dev; > + } > + else > + printf("nic_uio_load: reached MAX_DETACHED_DEVICES=%d. dev=%p won't be reattached\n", > + MAX_DETACHED_DEVICES, dev); > + device_detach(dev); > + } > } > } > > static void > nic_uio_unload(void) > { > + int i; > + printf("nic_uio_unload: entered ... \n"); > + > + for (i = 0; i < num_detached; i++) { > + printf("nic_uio_unload: calling to device_probe_and_attach for dev=%p...\n", > + detached_devices[i]); > + device_probe_and_attach(detached_devices[i]); > + printf("nic_uio_unload: done.\n"); > + } > + > + printf("nic_uio_unload: leaving ... \n"); > } > > static int > -- > 2.1.2 >