Commit fc9983b6 authored by Daniel Verkamp's avatar Daniel Verkamp Committed by Jim Harris
Browse files

env: drop spdk_pci_device_get_class() 



Now that the env PCI framework already requires enumerating devices
based on an enum of specific device types, it is not useful to query the
class code of a PCI device handle.

It is currently unused and does not work in its current form on FreeBSD
(it reads a file from /sys).  This lets us drop a big chunk of file
reading and parsing code.

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

include/spdk/env.h

+0 −1
Original line number Diff line number Diff line
@@ -211,7 +211,6 @@ uint16_t spdk_pci_device_get_subdevice_id(struct spdk_pci_device *dev); 


struct spdk_pci_id spdk_pci_device_get_id(struct spdk_pci_device *dev);



uint32_t spdk_pci_device_get_class(struct spdk_pci_device *dev);

int spdk_pci_device_get_serial_number(struct spdk_pci_device *dev, char *sn, size_t len);

int spdk_pci_device_claim(const struct spdk_pci_addr *pci_addr);

lib/env_dpdk/pci.c

+0 −48
Original line number Diff line number Diff line
@@ -56,10 +56,8 @@ 
#include "spdk/env.h"

#include "spdk/pci_ids.h"



#define SYSFS_PCI_DEVICES	"/sys/bus/pci/devices"

#define SYSFS_PCI_DRIVERS	"/sys/bus/pci/drivers"



#define SPDK_PCI_PATH_MAX	256

#define PCI_CFG_SIZE		256

#define PCI_EXT_CAP_ID_SN	0x03
@@ -217,40 +215,6 @@ spdk_pci_device_unmap_bar(struct spdk_pci_device *device, uint32_t bar, void *ad 
	return 0;

}



static int

pci_device_get_u32(struct spdk_pci_device *dev, const char *file, uint32_t *val)

{

	char filename[SPDK_PCI_PATH_MAX];

	FILE *fd;

	char buf[10];

	char *end;



	snprintf(filename, sizeof(filename),

		 SYSFS_PCI_DEVICES "/" PCI_PRI_FMT "/%s",

		 spdk_pci_device_get_domain(dev), spdk_pci_device_get_bus(dev),

		 spdk_pci_device_get_dev(dev), spdk_pci_device_get_func(dev), file);



	fd = fopen(filename, "r");

	if (!fd) {

		return -1;

	}



	if (fgets(buf, sizeof(buf), fd) == NULL) {

		fclose(fd);

		return -1;

	}



	*val = strtoul(buf, &end, 0);

	if ((buf[0] == '\0') || (end == NULL) || (*end != '\n')) {

		fclose(fd);

		return -1;

	}



	fclose(fd);

	return 0;



}



uint16_t

spdk_pci_device_get_domain(struct spdk_pci_device *dev)

{
@@ -312,18 +276,6 @@ spdk_pci_device_get_id(struct spdk_pci_device *pci_dev) 
	return pci_id;

}



uint32_t

spdk_pci_device_get_class(struct spdk_pci_device *dev)

{

	uint32_t class_code;



	if (pci_device_get_u32(dev, "class", &class_code) < 0) {

		return 0xFFFFFFFFu;

	}



	return class_code;

}



int

spdk_pci_device_cfg_read8(struct spdk_pci_device *dev, uint8_t *value, uint32_t offset)

{