[dpdk-dev,v3,23/28] eal/pci: Add rte_eal_pci_probe_one and rte_eal_pci_close_one
Commit Message
The functions are used for probe and close a device.
First the function tries to find a device that has the specfied PCI address.
Then, probe or close the device.
Signed-off-by: Tetsuya Mukawa <mukawa@igel.co.jp>
---
lib/librte_eal/common/eal_common_pci.c | 58 +++++++++++++++++++++++++++++++++
lib/librte_eal/common/include/rte_pci.h | 26 +++++++++++++++
2 files changed, 84 insertions(+)
Comments
On 12/9/2014 2:34 PM, Tetsuya Mukawa wrote:
> The functions are used for probe and close a device.
> First the function tries to find a device that has the specfied PCI address.
> Then, probe or close the device.
>
> Signed-off-by: Tetsuya Mukawa <mukawa@igel.co.jp>
> ---
> lib/librte_eal/common/eal_common_pci.c | 58 +++++++++++++++++++++++++++++++++
> lib/librte_eal/common/include/rte_pci.h | 26 +++++++++++++++
> 2 files changed, 84 insertions(+)
>
> diff --git a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/common/eal_common_pci.c
> index b404ee0..5ff7b49 100644
> --- a/lib/librte_eal/common/eal_common_pci.c
> +++ b/lib/librte_eal/common/eal_common_pci.c
> @@ -152,6 +152,64 @@ pci_close_all_drivers(struct rte_pci_device *dev)
> {
> return pci_invoke_all_drivers(dev, INVOKE_CLOSE);
> }
> +
> +static int
> +rte_eal_pci_invoke_one(struct rte_pci_addr *addr, int type)
> +{
> + struct rte_pci_device *dev = NULL;
> + int ret = 0;
> +
> + TAILQ_FOREACH(dev, &pci_device_list, next) {
> + if (eal_compare_pci_addr(&dev->addr, addr))
> + continue;
> +
> + switch (type) {
> + case INVOKE_PROBE:
> + ret = pci_probe_all_drivers(dev);
> + break;
> + case INVOKE_CLOSE:
> + ret = pci_close_all_drivers(dev);
> + break;
> + }
> + if (ret < 0)
> + goto invoke_err_return;
> + if (type == INVOKE_CLOSE)
> + goto remove_dev;
> + return 0;
> + }
> +
> + return -1;
> +
> +invoke_err_return:
> + RTE_LOG(WARNING, EAL, "Requested device " PCI_PRI_FMT
> + " cannot be used\n", dev->addr.domain, dev->addr.bus,
> + dev->addr.devid, dev->addr.function);
> + return -1;
> +
> +remove_dev:
> + TAILQ_REMOVE(&pci_device_list, dev, next);
> + return 0;
> +}
> +
> +/*
> + * Find the pci device specified by pci address, then invoke probe function of
> + * the driver of the devive.
> + */
> +int
> +rte_eal_pci_probe_one(struct rte_pci_addr *addr)
> +{
> + return rte_eal_pci_invoke_one(addr, INVOKE_PROBE);
> +}
> +
> +/*
> + * Find the pci device specified by pci address, then invoke close function of
> + * the driver of the devive.
> + */
> +int
> +rte_eal_pci_close_one(struct rte_pci_addr *addr)
> +{
> + return rte_eal_pci_invoke_one(addr, INVOKE_CLOSE);
> +}
> #endif /* RTE_LIBRTE_EAL_HOTPLUG & RTE_LIBRTE_EAL_LINUXAPP */
>
> /*
> diff --git a/lib/librte_eal/common/include/rte_pci.h b/lib/librte_eal/common/include/rte_pci.h
> index 74720d1..5a7e06f 100644
> --- a/lib/librte_eal/common/include/rte_pci.h
> +++ b/lib/librte_eal/common/include/rte_pci.h
> @@ -311,6 +311,32 @@ eal_compare_pci_addr(struct rte_pci_addr *addr, struct rte_pci_addr *addr2)
> int rte_eal_pci_probe(void);
>
> /**
> + * Probe the single PCI device.
> + *
> + * Scan the content of the PCI bus, and find the pci device specified by pci
> + * address, then call the probe() function for registered driver that has a
> + * matching entry in its id_table for discovered device.
> + *
> + * @return
> + * - 0 on success.
> + * - Negative on error.
> + */
> +int rte_eal_pci_probe_one(struct rte_pci_addr *addr);
> +
> +/**
> + * Close the single PCI device.
> + *
> + * Scan the content of the PCI bus, and find the pci device specified by pci
> + * address, then call the close() function for registered driver that has a
> + * matching entry in its id_table for discovered device.
> + *
> + * @return
> + * - 0 on success.
> + * - Negative on error.
> + */
> +int rte_eal_pci_close_one(struct rte_pci_addr *addr);
> +
You declare here directly, but implement them with macros
"RTE_LIBRTE_EAL_HOTPLUG & RTE_LIBRTE_EAL_LINUXAPP ".
> +/**
> * Dump the content of the PCI bus.
> *
> * @param f
(2014/12/11 14:54), Qiu, Michael wrote:
> On 12/9/2014 2:34 PM, Tetsuya Mukawa wrote:
>> The functions are used for probe and close a device.
>> First the function tries to find a device that has the specfied PCI address.
>> Then, probe or close the device.
>>
>> Signed-off-by: Tetsuya Mukawa <mukawa@igel.co.jp>
>> ---
>> lib/librte_eal/common/eal_common_pci.c | 58 +++++++++++++++++++++++++++++++++
>> lib/librte_eal/common/include/rte_pci.h | 26 +++++++++++++++
>> 2 files changed, 84 insertions(+)
>>
>> diff --git a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/common/eal_common_pci.c
>> index b404ee0..5ff7b49 100644
>> --- a/lib/librte_eal/common/eal_common_pci.c
>> +++ b/lib/librte_eal/common/eal_common_pci.c
>> @@ -152,6 +152,64 @@ pci_close_all_drivers(struct rte_pci_device *dev)
>> {
>> return pci_invoke_all_drivers(dev, INVOKE_CLOSE);
>> }
>> +
>> +static int
>> +rte_eal_pci_invoke_one(struct rte_pci_addr *addr, int type)
>> +{
>> + struct rte_pci_device *dev = NULL;
>> + int ret = 0;
>> +
>> + TAILQ_FOREACH(dev, &pci_device_list, next) {
>> + if (eal_compare_pci_addr(&dev->addr, addr))
>> + continue;
>> +
>> + switch (type) {
>> + case INVOKE_PROBE:
>> + ret = pci_probe_all_drivers(dev);
>> + break;
>> + case INVOKE_CLOSE:
>> + ret = pci_close_all_drivers(dev);
>> + break;
>> + }
>> + if (ret < 0)
>> + goto invoke_err_return;
>> + if (type == INVOKE_CLOSE)
>> + goto remove_dev;
>> + return 0;
>> + }
>> +
>> + return -1;
>> +
>> +invoke_err_return:
>> + RTE_LOG(WARNING, EAL, "Requested device " PCI_PRI_FMT
>> + " cannot be used\n", dev->addr.domain, dev->addr.bus,
>> + dev->addr.devid, dev->addr.function);
>> + return -1;
>> +
>> +remove_dev:
>> + TAILQ_REMOVE(&pci_device_list, dev, next);
>> + return 0;
>> +}
>> +
>> +/*
>> + * Find the pci device specified by pci address, then invoke probe function of
>> + * the driver of the devive.
>> + */
>> +int
>> +rte_eal_pci_probe_one(struct rte_pci_addr *addr)
>> +{
>> + return rte_eal_pci_invoke_one(addr, INVOKE_PROBE);
>> +}
>> +
>> +/*
>> + * Find the pci device specified by pci address, then invoke close function of
>> + * the driver of the devive.
>> + */
>> +int
>> +rte_eal_pci_close_one(struct rte_pci_addr *addr)
>> +{
>> + return rte_eal_pci_invoke_one(addr, INVOKE_CLOSE);
>> +}
>> #endif /* RTE_LIBRTE_EAL_HOTPLUG & RTE_LIBRTE_EAL_LINUXAPP */
>>
>> /*
>> diff --git a/lib/librte_eal/common/include/rte_pci.h b/lib/librte_eal/common/include/rte_pci.h
>> index 74720d1..5a7e06f 100644
>> --- a/lib/librte_eal/common/include/rte_pci.h
>> +++ b/lib/librte_eal/common/include/rte_pci.h
>> @@ -311,6 +311,32 @@ eal_compare_pci_addr(struct rte_pci_addr *addr, struct rte_pci_addr *addr2)
>> int rte_eal_pci_probe(void);
>>
>> /**
>> + * Probe the single PCI device.
>> + *
>> + * Scan the content of the PCI bus, and find the pci device specified by pci
>> + * address, then call the probe() function for registered driver that has a
>> + * matching entry in its id_table for discovered device.
>> + *
>> + * @return
>> + * - 0 on success.
>> + * - Negative on error.
>> + */
>> +int rte_eal_pci_probe_one(struct rte_pci_addr *addr);
>> +
>> +/**
>> + * Close the single PCI device.
>> + *
>> + * Scan the content of the PCI bus, and find the pci device specified by pci
>> + * address, then call the close() function for registered driver that has a
>> + * matching entry in its id_table for discovered device.
>> + *
>> + * @return
>> + * - 0 on success.
>> + * - Negative on error.
>> + */
>> +int rte_eal_pci_close_one(struct rte_pci_addr *addr);
>> +
> You declare here directly, but implement them with macros
> "RTE_LIBRTE_EAL_HOTPLUG & RTE_LIBRTE_EAL_LINUXAPP ".
I will fix it.
Thanks,
Tetsuya
>
>> +/**
>> * Dump the content of the PCI bus.
>> *
>> * @param f
@@ -152,6 +152,64 @@ pci_close_all_drivers(struct rte_pci_device *dev)
{
return pci_invoke_all_drivers(dev, INVOKE_CLOSE);
}
+
+static int
+rte_eal_pci_invoke_one(struct rte_pci_addr *addr, int type)
+{
+ struct rte_pci_device *dev = NULL;
+ int ret = 0;
+
+ TAILQ_FOREACH(dev, &pci_device_list, next) {
+ if (eal_compare_pci_addr(&dev->addr, addr))
+ continue;
+
+ switch (type) {
+ case INVOKE_PROBE:
+ ret = pci_probe_all_drivers(dev);
+ break;
+ case INVOKE_CLOSE:
+ ret = pci_close_all_drivers(dev);
+ break;
+ }
+ if (ret < 0)
+ goto invoke_err_return;
+ if (type == INVOKE_CLOSE)
+ goto remove_dev;
+ return 0;
+ }
+
+ return -1;
+
+invoke_err_return:
+ RTE_LOG(WARNING, EAL, "Requested device " PCI_PRI_FMT
+ " cannot be used\n", dev->addr.domain, dev->addr.bus,
+ dev->addr.devid, dev->addr.function);
+ return -1;
+
+remove_dev:
+ TAILQ_REMOVE(&pci_device_list, dev, next);
+ return 0;
+}
+
+/*
+ * Find the pci device specified by pci address, then invoke probe function of
+ * the driver of the devive.
+ */
+int
+rte_eal_pci_probe_one(struct rte_pci_addr *addr)
+{
+ return rte_eal_pci_invoke_one(addr, INVOKE_PROBE);
+}
+
+/*
+ * Find the pci device specified by pci address, then invoke close function of
+ * the driver of the devive.
+ */
+int
+rte_eal_pci_close_one(struct rte_pci_addr *addr)
+{
+ return rte_eal_pci_invoke_one(addr, INVOKE_CLOSE);
+}
#endif /* RTE_LIBRTE_EAL_HOTPLUG & RTE_LIBRTE_EAL_LINUXAPP */
/*
@@ -311,6 +311,32 @@ eal_compare_pci_addr(struct rte_pci_addr *addr, struct rte_pci_addr *addr2)
int rte_eal_pci_probe(void);
/**
+ * Probe the single PCI device.
+ *
+ * Scan the content of the PCI bus, and find the pci device specified by pci
+ * address, then call the probe() function for registered driver that has a
+ * matching entry in its id_table for discovered device.
+ *
+ * @return
+ * - 0 on success.
+ * - Negative on error.
+ */
+int rte_eal_pci_probe_one(struct rte_pci_addr *addr);
+
+/**
+ * Close the single PCI device.
+ *
+ * Scan the content of the PCI bus, and find the pci device specified by pci
+ * address, then call the close() function for registered driver that has a
+ * matching entry in its id_table for discovered device.
+ *
+ * @return
+ * - 0 on success.
+ * - Negative on error.
+ */
+int rte_eal_pci_close_one(struct rte_pci_addr *addr);
+
+/**
* Dump the content of the PCI bus.
*
* @param f