Commit c120c3d1 authored by Konrad Sztyber's avatar Konrad Sztyber Committed by Tomasz Zawadzki
Browse files

vmd: rename vmd_map_bars -> vmd_domain_map_bars 



There already is a function called vmd_dev_map_bar(), but it's used in a
different context (it maps BARs of the devices behind the VMD), so
vmd_map_bars() was renamed to better reflect its purpose.

Additionally, this patch removes the spdk_pci_device argument from this
function, as it's available from struct vmd_adapter.

Signed-off-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Change-Id: I8de03c159653a04286e71e9adf226eee40ef06ae
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/20186


Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 1a2eaf9b

lib/vmd/vmd.c

+4 −4
Original line number Diff line number Diff line
@@ -1163,18 +1163,18 @@ vmd_scan_pcibus(struct vmd_pci_bus *bus) 
}



static int

vmd_map_bars(struct vmd_adapter *vmd, struct spdk_pci_device *dev)

vmd_domain_map_bars(struct vmd_adapter *vmd)

{

	int rc;



	rc = spdk_pci_device_map_bar(dev, 0, (void **)&vmd->cfg_vaddr,

	rc = spdk_pci_device_map_bar(vmd->pci, 0, (void **)&vmd->cfg_vaddr,

				     &vmd->cfgbar, &vmd->cfgbar_size);

	if (rc != 0) {

		SPDK_ERRLOG("Failed to map config bar: %s\n", spdk_strerror(-rc));

		return rc;

	}



	rc = spdk_pci_device_map_bar(dev, 2, (void **)&vmd->mem_vaddr,

	rc = spdk_pci_device_map_bar(vmd->pci, 2, (void **)&vmd->mem_vaddr,

				     &vmd->membar, &vmd->membar_size);

	if (rc != 0) {

		SPDK_ERRLOG("Failed to map memory bar: %s\n", spdk_strerror(-rc));
@@ -1281,7 +1281,7 @@ vmd_enum_cb(void *ctx, struct spdk_pci_device *pci_dev) 
		(pci_dev->addr.bus << 16) | (pci_dev->addr.dev << 8) | pci_dev->addr.func;

	TAILQ_INIT(&vmd_c->vmd[i].bus_list);



	if (vmd_map_bars(&vmd_c->vmd[i], pci_dev) != 0) {

	if (vmd_domain_map_bars(&vmd_c->vmd[i]) != 0) {

		return -1;

	}