Commit 03aa3af0 authored by Daniel Verkamp's avatar Daniel Verkamp
Browse files

nvme_manage: use spdk_pci_addr_compare() 



Replace open-coded PCI address retrieval and comparison functions with
the new env.h PCI APIs.

Change-Id: I282a3f8d2e0c7c2cfde7b8a752260dd2bf0cb031
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent fd6ebca7

examples/nvme/nvme_manage/nvme_manage.c

+11 −28
Original line number Diff line number Diff line
@@ -69,33 +69,14 @@ enum controller_display_model { 
	CONTROLLER_DISPLAY_SIMPLISTIC		= 0x1,

};



static uint64_t

get_pci_addr(struct spdk_pci_device *pci_dev)

{

	uint64_t cmp;



	cmp = (uint64_t)spdk_pci_device_get_domain(pci_dev) << 24;

	cmp |= (uint64_t)spdk_pci_device_get_bus(pci_dev) << 16;

	cmp |= (uint64_t)spdk_pci_device_get_dev(pci_dev) << 8;

	cmp |= (uint64_t)spdk_pci_device_get_func(pci_dev);



	return cmp;

}



static int

cmp_devs(const void *ap, const void *bp)

{

	const struct dev *a = ap, *b = bp;

	uint64_t cmp_a = get_pci_addr(a->pci_dev);

	uint64_t cmp_b = get_pci_addr(b->pci_dev);

	struct spdk_pci_addr a1 = spdk_pci_device_get_addr(a->pci_dev);

	struct spdk_pci_addr a2 = spdk_pci_device_get_addr(b->pci_dev);



	if (cmp_a < cmp_b) {

		return -1;

	} else if (cmp_a > cmp_b) {

		return 1;

	} else {

		return 0;

	}

	return spdk_pci_addr_compare(&a1, &a2);

}



static bool
@@ -322,7 +303,7 @@ get_controller(void) 
	unsigned int				bus;

	unsigned int				devid;

	unsigned int				function;

	uint64_t				pci_addr;

	struct spdk_pci_addr			pci_addr;

	char					address[64];

	char					*p;

	int					ch;
@@ -359,13 +340,15 @@ get_controller(void) 
		return NULL;

	}



	pci_addr = (uint64_t)domain << 24;

	pci_addr |= (uint64_t)bus << 16;

	pci_addr |= (uint64_t)devid << 8;

	pci_addr |= (uint64_t)function;

	pci_addr.domain = domain;

	pci_addr.bus = bus;

	pci_addr.dev = devid;

	pci_addr.func = function;



	foreach_dev(iter) {

		if (pci_addr == get_pci_addr(iter->pci_dev)) {

		struct spdk_pci_addr iter_addr = spdk_pci_device_get_addr(iter->pci_dev);



		if (spdk_pci_addr_compare(&pci_addr, &iter_addr) == 0) {

			return iter;

		}

	}