d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

env: drop spdk_pci_device_get_class()

Browse Source 
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: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Daniel Verkamp 2016-11-15 13:24:33 -07:00 committed by Jim Harris
parent b43db69a44
commit fc9983b638
2 changed files with 0 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/spdk/env.h
View File

@ -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);

48
lib/env_dpdk/pci.c
View File

@ -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)
{