Commit 19a11e7e authored by Tomasz Zawadzki's avatar Tomasz Zawadzki
Browse files

lib/env_dpdk: update PCI headers for DPDK 22.11.4 



Just this week DPDK 22.11.4 was released, which
included a change in the pci_dpdk API.

The change is non-breaking for SPDK use of the API.
It was introduced as backport from DPDK 23.07.

If rte_pci_pasid_set_state() is to be used in future,
a new copy and implementation should be created.
To catch the case of someone unaware of this versioning,
a redefinition of this function was added.
It should have been present since SPDK supported DPDK 23.07.

Signed-off-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Change-Id: If591d35d8d21bb3f5e734dc9fd9ccf4b05cc7513
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/21578


Reviewed-by: default avatarMichal Berger <michal.berger@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
Community-CI: Mellanox Build Bot
parent 67642ba9

lib/env_dpdk/pci_dpdk.c

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ dpdk_pci_init(void) 
	}



	if (year == 22 && month == 11) {

		if (minor > 3) {

		if (minor > 4) {

			/* It is possible that LTS minor release changed private ABI, so we

			 * cannot assume fn_table_2211 works for minor releases.  As 22.11

			 * minor releases occur, this will need to be updated to either affirm

lib/env_dpdk/pci_dpdk_2211.c

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ SPDK_STATIC_ASSERT(offsetof(struct spdk_pci_driver, driver) >= sizeof(struct rte 
 */

#define rte_pci_mmio_read(...) SPDK_STATIC_ASSERT(false, "rte_pci_mmio_read requires new pci_dpdk_2307 compat layer")

#define rte_pci_mmio_write(...) SPDK_STATIC_ASSERT(false, "rte_pci_mmio_write requires new pci_dpdk_2307 compat layer")

#define rte_pci_pasid_set_state(...) SPDK_STATIC_ASSERT(false, "rte_pci_pasid_set_state requires new pci_dpdk_2307 compat layer")



static struct rte_mem_resource *

pci_device_get_mem_resource_2211(struct rte_pci_device *dev, uint32_t bar)

scripts/env_dpdk/22.11/22.11-rte_bus_pci.h.patch

0 → 100644
+21 −0
Original line number Diff line number Diff line 
@@ -101,20 +101,6 @@ off_t rte_pci_find_ext_capability(struct rte_pci_device *dev, uint32_t cap);

 __rte_experimental

 int rte_pci_set_bus_master(struct rte_pci_device *dev, bool enable);



-/**

- * Enable/Disable PASID (Process Address Space ID).

- *

- * @param dev

- *   A pointer to a rte_pci_device structure.

- * @param offset

- *   Offset of the PASID external capability.

- * @param enable

- *   Flag to enable or disable PASID.

- */

-__rte_internal

-int rte_pci_pasid_set_state(const struct rte_pci_device *dev,

-		off_t offset, bool enable);

-

 /**

  * Read PCI config space.

  *