Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fde09c6d authored by Yu Zhao's avatar Yu Zhao Committed by Jesse Barnes
Browse files

PCI: define PCI resource names in an 'enum' 



This patch moves all definitions of the PCI resource names to an 'enum',
and also replaces some hard-coded resource variables with symbol
names. This change eases introduction of device specific resources.

Reviewed-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarYu Zhao <yu.zhao@intel.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 14add80b

drivers/pci/pci-sysfs.c

+3 −1
Original line number Diff line number Diff line
@@ -102,11 +102,13 @@ resource_show(struct device * dev, struct device_attribute *attr, char * buf) 
	struct pci_dev * pci_dev = to_pci_dev(dev);

	char * str = buf;

	int i;

	int max = 7;

	int max;

	resource_size_t start, end;



	if (pci_dev->subordinate)

		max = DEVICE_COUNT_RESOURCE;

	else

		max = PCI_BRIDGE_RESOURCES;



	for (i = 0; i < max; i++) {

		struct resource *res =  &pci_dev->resource[i];

drivers/pci/probe.c

+1 −1
Original line number Diff line number Diff line
@@ -423,7 +423,7 @@ static struct pci_bus *pci_alloc_child_bus(struct pci_bus *parent, 
	child->subordinate = 0xff;



	/* Set up default resource pointers and names.. */

	for (i = 0; i < 4; i++) {

	for (i = 0; i < PCI_BRIDGE_RESOURCE_NUM; i++) {

		child->resource[i] = &bridge->resource[PCI_BRIDGE_RESOURCES+i];

		child->resource[i]->name = child->name;

	}

drivers/pci/proc.c

+4 −3
Original line number Diff line number Diff line
@@ -361,15 +361,16 @@ static int show_device(struct seq_file *m, void *v) 
			dev->vendor,

			dev->device,

			dev->irq);

	/* Here should be 7 and not PCI_NUM_RESOURCES as we need to preserve compatibility */

	for (i=0; i<7; i++) {



	/* only print standard and ROM resources to preserve compatibility */

	for (i = 0; i <= PCI_ROM_RESOURCE; i++) {

		resource_size_t start, end;

		pci_resource_to_user(dev, i, &dev->resource[i], &start, &end);

		seq_printf(m, "\t%16llx",

			(unsigned long long)(start |

			(dev->resource[i].flags & PCI_REGION_FLAG_MASK)));

	}

	for (i=0; i<7; i++) {

	for (i = 0; i <= PCI_ROM_RESOURCE; i++) {

		resource_size_t start, end;

		pci_resource_to_user(dev, i, &dev->resource[i], &start, &end);

		seq_printf(m, "\t%16llx",

include/linux/pci.h

+24 −13
Original line number Diff line number Diff line
@@ -82,7 +82,30 @@ enum pci_mmap_state { 
#define PCI_DMA_FROMDEVICE	2

#define PCI_DMA_NONE		3



#define DEVICE_COUNT_RESOURCE	12

/*

 *  For PCI devices, the region numbers are assigned this way:

 */

enum {

	/* #0-5: standard PCI resources */

	PCI_STD_RESOURCES,

	PCI_STD_RESOURCE_END = 5,



	/* #6: expansion ROM resource */

	PCI_ROM_RESOURCE,



	/* resources assigned to buses behind the bridge */

#define PCI_BRIDGE_RESOURCE_NUM 4



	PCI_BRIDGE_RESOURCES,

	PCI_BRIDGE_RESOURCE_END = PCI_BRIDGE_RESOURCES +

				  PCI_BRIDGE_RESOURCE_NUM - 1,



	/* total resources associated with a PCI device */

	PCI_NUM_RESOURCES,



	/* preserve this for compatibility */

	DEVICE_COUNT_RESOURCE

};



typedef int __bitwise pci_power_t;
@@ -274,18 +297,6 @@ static inline void pci_add_saved_cap(struct pci_dev *pci_dev, 
	hlist_add_head(&new_cap->next, &pci_dev->saved_cap_space);

}



/*

 *  For PCI devices, the region numbers are assigned this way:

 *

 *	0-5	standard PCI regions

 *	6	expansion ROM

 *	7-10	bridges: address space assigned to buses behind the bridge

 */



#define PCI_ROM_RESOURCE	6

#define PCI_BRIDGE_RESOURCES	7

#define PCI_NUM_RESOURCES	11



#ifndef PCI_BUS_NUM_RESOURCES

#define PCI_BUS_NUM_RESOURCES	16

#endif