Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-17 09:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

PCI: PCIe portdrv: Remove struct pcie_port_service_id

Browse Source 
The PCI Express port driver uses 'struct pcie_port_service_id' for
matching port service devices and drivers, but this structure
contains fields that duplicate information from the port device
itself (vendor, device, subvendor, subdevice) and fields that are not
used by any existing port service driver (class, class_mask,
drvier_data).  Also, both existing port service drivers (AER and
PCIe HP) don't even use the vendor and device fields for device
matching.  Therefore 'struct pcie_port_service_id' can be removed
altogether and the only useful members of it (port_type, service) can
be introduced directly into the port service device and port service
driver structures.  That simplifies the code quite a bit and reduces
its size.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
Rafael J. Wysocki 2009-01-13 14:46:46 +01:00 committed by Jesse Barnes
parent 0516c8bcd2
commit 22106368c9
8 changed files with 30 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/pci/hotplug/pciehp_acpi.c
View File

@ -67,16 +67,6 @@ static int __init parse_detect_mode(void)
return PCIEHP_DETECT_DEFAULT; return PCIEHP_DETECT_DEFAULT;
} }
static struct pcie_port_service_id __initdata port_pci_ids[] = {
{
.vendor = PCI_ANY_ID,
.device = PCI_ANY_ID,
.port_type = PCIE_ANY_PORT,
.service_type = PCIE_PORT_SERVICE_HP,
.driver_data = 0,
}, { /* end: all zeroes */ }
};
static int __initdata dup_slot_id; static int __initdata dup_slot_id;
static int __initdata acpi_slot_detected; static int __initdata acpi_slot_detected;
static struct list_head __initdata dummy_slots = LIST_HEAD_INIT(dummy_slots); static struct list_head __initdata dummy_slots = LIST_HEAD_INIT(dummy_slots);
@ -110,7 +100,8 @@ static int __init dummy_probe(struct pcie_device *dev)
static struct pcie_port_service_driver __initdata dummy_driver = { static struct pcie_port_service_driver __initdata dummy_driver = {
.name = "pciehp_dummy", .name = "pciehp_dummy",
.id_table = port_pci_ids, .port_type = PCIE_ANY_PORT,
.service = PCIE_PORT_SERVICE_HP,
.probe = dummy_probe, .probe = dummy_probe,
}; };

12
drivers/pci/hotplug/pciehp_core.c
View File

@ -505,18 +505,10 @@ static int pciehp_resume (struct pcie_device *dev)
} }
#endif #endif
static struct pcie_port_service_id port_pci_ids[] = { {
.vendor = PCI_ANY_ID,
.device = PCI_ANY_ID,
.port_type = PCIE_ANY_PORT,
.service_type = PCIE_PORT_SERVICE_HP,
.driver_data = 0,
}, { /* end: all zeroes */ }
};
static struct pcie_port_service_driver hpdriver_portdrv = { static struct pcie_port_service_driver hpdriver_portdrv = {
.name = PCIE_MODULE_NAME, .name = PCIE_MODULE_NAME,
.id_table = &port_pci_ids[0], .port_type = PCIE_ANY_PORT,
.service = PCIE_PORT_SERVICE_HP,
.probe = pciehp_probe, .probe = pciehp_probe,
.remove = pciehp_remove, .remove = pciehp_remove,

16
drivers/pci/pcie/aer/aerdrv.c
View File

@ -48,19 +48,6 @@ static pci_ers_result_t aer_error_detected(struct pci_dev *dev,
static void aer_error_resume(struct pci_dev *dev); static void aer_error_resume(struct pci_dev *dev);
static pci_ers_result_t aer_root_reset(struct pci_dev *dev); static pci_ers_result_t aer_root_reset(struct pci_dev *dev);
/*
* PCI Express bus's AER Root service driver data structure
*/
static struct pcie_port_service_id aer_id[] = {
{
.vendor = PCI_ANY_ID,
.device = PCI_ANY_ID,
.port_type = PCIE_RC_PORT,
.service_type = PCIE_PORT_SERVICE_AER,
},
{ /* end: all zeroes */ }
};
static struct pci_error_handlers aer_error_handlers = { static struct pci_error_handlers aer_error_handlers = {
.error_detected = aer_error_detected, .error_detected = aer_error_detected,
.resume = aer_error_resume, .resume = aer_error_resume,
@ -68,7 +55,8 @@ static struct pci_error_handlers aer_error_handlers = {
static struct pcie_port_service_driver aerdriver = { static struct pcie_port_service_driver aerdriver = {
.name = "aer", .name = "aer",
.id_table = &aer_id[0], .port_type = PCIE_ANY_PORT,
.service = PCIE_PORT_SERVICE_AER,
.probe = aer_probe, .probe = aer_probe,
.remove = aer_remove, .remove = aer_remove,

10
drivers/pci/pcie/aer/aerdrv_core.c
View File

@ -351,21 +351,21 @@ static int find_aer_service_iter(struct device *device, void *data)
{ {
struct device_driver *driver; struct device_driver *driver;
struct pcie_port_service_driver *service_driver; struct pcie_port_service_driver *service_driver;
struct pcie_device *pcie_dev;
struct find_aer_service_data *result; struct find_aer_service_data *result;
result = (struct find_aer_service_data *) data; result = (struct find_aer_service_data *) data;
if (device->bus == &pcie_port_bus_type) { if (device->bus == &pcie_port_bus_type) {
pcie_dev = to_pcie_device(device); struct pcie_port_data *port_data;
if (pcie_dev->id.port_type == PCIE_SW_DOWNSTREAM_PORT)
port_data = pci_get_drvdata(to_pcie_device(device)->port);
if (port_data->port_type == PCIE_SW_DOWNSTREAM_PORT)
result->is_downstream = 1; result->is_downstream = 1;
driver = device->driver; driver = device->driver;
if (driver) { if (driver) {
service_driver = to_service_driver(driver); service_driver = to_service_driver(driver);
if (service_driver->id_table->service_type == if (service_driver->service == PCIE_PORT_SERVICE_AER) {
PCIE_PORT_SERVICE_AER) {
result->aer_driver = service_driver; result->aer_driver = service_driver;
return 1; return 1;
} }

5
drivers/pci/pcie/portdrv.h
View File

@ -28,11 +28,6 @@
#define get_descriptor_id(type, service) (((type - 4) << 4) | service) #define get_descriptor_id(type, service) (((type - 4) << 4) | service)
struct pcie_port_data {
int port_type; /* Type of the port */
int port_irq_mode; /* [0:INTx | 1:MSI | 2:MSI-X] */
};
extern struct bus_type pcie_port_bus_type; extern struct bus_type pcie_port_bus_type;
extern int pcie_port_device_probe(struct pci_dev *dev); extern int pcie_port_device_probe(struct pci_dev *dev);
extern int pcie_port_device_register(struct pci_dev *dev); extern int pcie_port_device_register(struct pci_dev *dev);

18
drivers/pci/pcie/portdrv_bus.c
View File

@ -26,20 +26,22 @@ EXPORT_SYMBOL_GPL(pcie_port_bus_type);
static int pcie_port_bus_match(struct device *dev, struct device_driver *drv) static int pcie_port_bus_match(struct device *dev, struct device_driver *drv)
{ {
struct pcie_device *pciedev; struct pcie_device *pciedev;
struct pcie_port_data *port_data;
struct pcie_port_service_driver *driver; struct pcie_port_service_driver *driver;
if (drv->bus != &pcie_port_bus_type || dev->bus != &pcie_port_bus_type) if (drv->bus != &pcie_port_bus_type || dev->bus != &pcie_port_bus_type)
return 0; return 0;
pciedev = to_pcie_device(dev); pciedev = to_pcie_device(dev);
driver = to_service_driver(drv); driver = to_service_driver(drv);
if ( (driver->id_table->vendor != PCI_ANY_ID &&
driver->id_table->vendor != pciedev->id.vendor) || if (driver->service != pciedev->service)
(driver->id_table->device != PCI_ANY_ID && return 0;
driver->id_table->device != pciedev->id.device) ||
(driver->id_table->port_type != PCIE_ANY_PORT && port_data = pci_get_drvdata(pciedev->port);
driver->id_table->port_type != pciedev->id.port_type) ||
driver->id_table->service_type != pciedev->id.service_type ) if (driver->port_type != PCIE_ANY_PORT
&& driver->port_type != port_data->port_type)
return 0; return 0;
return 1; return 1;

5
drivers/pci/pcie/portdrv_core.c
View File

@ -140,10 +140,7 @@ static void pcie_device_init(struct pci_dev *parent, struct pcie_device *dev,
dev->port = parent; dev->port = parent;
dev->irq = irq; dev->irq = irq;
dev->id.vendor = parent->vendor; dev->service = service_type;
dev->id.device = parent->device;
dev->id.port_type = port_type;
dev->id.service_type = service_type;
/* Initialize generic device interface */ /* Initialize generic device interface */
device = &dev->device; device = &dev->device;

17
include/linux/pcieport_if.h
View File

@ -27,18 +27,15 @@
#define PCIE_PORT_MSI_MODE 1 #define PCIE_PORT_MSI_MODE 1
#define PCIE_PORT_MSIX_MODE 2 #define PCIE_PORT_MSIX_MODE 2
struct pcie_port_service_id { struct pcie_port_data {
__u32 vendor, device; /* Vendor and device ID or PCI_ANY_ID*/ int port_type; /* Type of the port */
__u32 subvendor, subdevice; /* Subsystem ID's or PCI_ANY_ID */ int port_irq_mode; /* [0:INTx | 1:MSI | 2:MSI-X] */
__u32 class, class_mask; /* (class,subclass,prog-if) triplet */
__u32 port_type, service_type; /* Port Entity */
kernel_ulong_t driver_data;
}; };
struct pcie_device { struct pcie_device {
int irq; /* Service IRQ/MSI/MSI-X Vector */ int irq; /* Service IRQ/MSI/MSI-X Vector */
struct pcie_port_service_id id; /* Service ID */ struct pci_dev *port; /* Root/Upstream/Downstream Port */
struct pci_dev *port; /* Root/Upstream/Downstream Port */ u32 service; /* Port service this device represents */
void *priv_data; /* Service Private Data */ void *priv_data; /* Service Private Data */
struct device device; /* Generic Device Interface */ struct device device; /* Generic Device Interface */
}; };
@ -67,7 +64,9 @@ struct pcie_port_service_driver {
/* Link Reset Capability - AER service driver specific */ /* Link Reset Capability - AER service driver specific */
pci_ers_result_t (*reset_link) (struct pci_dev *dev); pci_ers_result_t (*reset_link) (struct pci_dev *dev);
const struct pcie_port_service_id *id_table; int port_type; /* Type of the port this driver can handle */
u32 service; /* Port service this device represents */
struct device_driver driver; struct device_driver driver;
}; };
#define to_service_driver(d) \ #define to_service_driver(d) \