mirror of
https://gitee.com/bianbu-linux/linux-6.6
synced 2025-04-24 14:07:52 -04:00
PCI: Introduce pci_dev_for_each_resource()
Instead of open-coding it everywhere introduce a tiny helper that can be used to iterate over each resource of a PCI device, and convert the most obvious users into it. While at it drop doubled empty line before pdev_sort_resources(). No functional changes intended. Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Link: https://lore.kernel.org/r/20230330162434.35055-4-andriy.shevchenko@linux.intel.com Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Krzysztof Wilczyński <kw@linux.com>
This commit is contained in:
parent
144d204df7
commit
09cc900632
23 changed files with 111 additions and 132 deletions
|
@ -520,6 +520,7 @@ ForEachMacros:
|
||||||
- 'of_property_for_each_string'
|
- 'of_property_for_each_string'
|
||||||
- 'of_property_for_each_u32'
|
- 'of_property_for_each_u32'
|
||||||
- 'pci_bus_for_each_resource'
|
- 'pci_bus_for_each_resource'
|
||||||
|
- 'pci_dev_for_each_resource'
|
||||||
- 'pci_doe_for_each_off'
|
- 'pci_doe_for_each_off'
|
||||||
- 'pcl_for_each_chunk'
|
- 'pcl_for_each_chunk'
|
||||||
- 'pcl_for_each_segment'
|
- 'pcl_for_each_segment'
|
||||||
|
|
|
@ -288,11 +288,10 @@ pcibios_claim_one_bus(struct pci_bus *b)
|
||||||
struct pci_bus *child_bus;
|
struct pci_bus *child_bus;
|
||||||
|
|
||||||
list_for_each_entry(dev, &b->devices, bus_list) {
|
list_for_each_entry(dev, &b->devices, bus_list) {
|
||||||
|
struct resource *r;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
for (i = 0; i < PCI_NUM_RESOURCES; i++) {
|
pci_dev_for_each_resource(dev, r, i) {
|
||||||
struct resource *r = &dev->resource[i];
|
|
||||||
|
|
||||||
if (r->parent || !r->start || !r->flags)
|
if (r->parent || !r->start || !r->flags)
|
||||||
continue;
|
continue;
|
||||||
if (pci_has_flag(PCI_PROBE_ONLY) ||
|
if (pci_has_flag(PCI_PROBE_ONLY) ||
|
||||||
|
|
|
@ -142,15 +142,15 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_WINBOND2, PCI_DEVICE_ID_WINBOND2_89C940F,
|
||||||
*/
|
*/
|
||||||
static void pci_fixup_dec21285(struct pci_dev *dev)
|
static void pci_fixup_dec21285(struct pci_dev *dev)
|
||||||
{
|
{
|
||||||
int i;
|
|
||||||
|
|
||||||
if (dev->devfn == 0) {
|
if (dev->devfn == 0) {
|
||||||
|
struct resource *r;
|
||||||
|
|
||||||
dev->class &= 0xff;
|
dev->class &= 0xff;
|
||||||
dev->class |= PCI_CLASS_BRIDGE_HOST << 8;
|
dev->class |= PCI_CLASS_BRIDGE_HOST << 8;
|
||||||
for (i = 0; i < PCI_NUM_RESOURCES; i++) {
|
pci_dev_for_each_resource(dev, r) {
|
||||||
dev->resource[i].start = 0;
|
r->start = 0;
|
||||||
dev->resource[i].end = 0;
|
r->end = 0;
|
||||||
dev->resource[i].flags = 0;
|
r->flags = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -162,13 +162,11 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_21285, pci_fixup_d
|
||||||
static void pci_fixup_ide_bases(struct pci_dev *dev)
|
static void pci_fixup_ide_bases(struct pci_dev *dev)
|
||||||
{
|
{
|
||||||
struct resource *r;
|
struct resource *r;
|
||||||
int i;
|
|
||||||
|
|
||||||
if ((dev->class >> 8) != PCI_CLASS_STORAGE_IDE)
|
if ((dev->class >> 8) != PCI_CLASS_STORAGE_IDE)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
for (i = 0; i < PCI_NUM_RESOURCES; i++) {
|
pci_dev_for_each_resource(dev, r) {
|
||||||
r = dev->resource + i;
|
|
||||||
if ((r->start & ~0x80) == 0x374) {
|
if ((r->start & ~0x80) == 0x374) {
|
||||||
r->start |= 2;
|
r->start |= 2;
|
||||||
r->end = r->start;
|
r->end = r->start;
|
||||||
|
|
|
@ -142,14 +142,14 @@ static struct pci_ops pcie_ops = {
|
||||||
static void rc_pci_fixup(struct pci_dev *dev)
|
static void rc_pci_fixup(struct pci_dev *dev)
|
||||||
{
|
{
|
||||||
if (dev->bus->parent == NULL && dev->devfn == 0) {
|
if (dev->bus->parent == NULL && dev->devfn == 0) {
|
||||||
int i;
|
struct resource *r;
|
||||||
|
|
||||||
dev->class &= 0xff;
|
dev->class &= 0xff;
|
||||||
dev->class |= PCI_CLASS_BRIDGE_HOST << 8;
|
dev->class |= PCI_CLASS_BRIDGE_HOST << 8;
|
||||||
for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
|
pci_dev_for_each_resource(dev, r) {
|
||||||
dev->resource[i].start = 0;
|
r->start = 0;
|
||||||
dev->resource[i].end = 0;
|
r->end = 0;
|
||||||
dev->resource[i].flags = 0;
|
r->flags = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -186,14 +186,14 @@ static struct pci_ops pcie_ops = {
|
||||||
static void rc_pci_fixup(struct pci_dev *dev)
|
static void rc_pci_fixup(struct pci_dev *dev)
|
||||||
{
|
{
|
||||||
if (dev->bus->parent == NULL && dev->devfn == 0) {
|
if (dev->bus->parent == NULL && dev->devfn == 0) {
|
||||||
int i;
|
struct resource *r;
|
||||||
|
|
||||||
dev->class &= 0xff;
|
dev->class &= 0xff;
|
||||||
dev->class |= PCI_CLASS_BRIDGE_HOST << 8;
|
dev->class |= PCI_CLASS_BRIDGE_HOST << 8;
|
||||||
for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
|
pci_dev_for_each_resource(dev, r) {
|
||||||
dev->resource[i].start = 0;
|
r->start = 0;
|
||||||
dev->resource[i].end = 0;
|
r->end = 0;
|
||||||
dev->resource[i].flags = 0;
|
r->flags = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -522,14 +522,14 @@ static int __init pci_setup(struct pci_sys_data *sys)
|
||||||
static void rc_pci_fixup(struct pci_dev *dev)
|
static void rc_pci_fixup(struct pci_dev *dev)
|
||||||
{
|
{
|
||||||
if (dev->bus->parent == NULL && dev->devfn == 0) {
|
if (dev->bus->parent == NULL && dev->devfn == 0) {
|
||||||
int i;
|
struct resource *r;
|
||||||
|
|
||||||
dev->class &= 0xff;
|
dev->class &= 0xff;
|
||||||
dev->class |= PCI_CLASS_BRIDGE_HOST << 8;
|
dev->class |= PCI_CLASS_BRIDGE_HOST << 8;
|
||||||
for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
|
pci_dev_for_each_resource(dev, r) {
|
||||||
dev->resource[i].start = 0;
|
r->start = 0;
|
||||||
dev->resource[i].end = 0;
|
r->end = 0;
|
||||||
dev->resource[i].flags = 0;
|
r->flags = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -413,18 +413,18 @@ struct pci_ops bcm63xx_cb_ops = {
|
||||||
static void bcm63xx_fixup(struct pci_dev *dev)
|
static void bcm63xx_fixup(struct pci_dev *dev)
|
||||||
{
|
{
|
||||||
static int io_window = -1;
|
static int io_window = -1;
|
||||||
int i, found, new_io_window;
|
int found, new_io_window;
|
||||||
|
struct resource *r;
|
||||||
u32 val;
|
u32 val;
|
||||||
|
|
||||||
/* look for any io resource */
|
/* look for any io resource */
|
||||||
found = 0;
|
found = 0;
|
||||||
for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
|
pci_dev_for_each_resource(dev, r) {
|
||||||
if (pci_resource_flags(dev, i) & IORESOURCE_IO) {
|
if (resource_type(r) == IORESOURCE_IO) {
|
||||||
found = 1;
|
found = 1;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!found)
|
if (!found)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
|
@ -249,12 +249,11 @@ static int pcibios_enable_resources(struct pci_dev *dev, int mask)
|
||||||
|
|
||||||
pci_read_config_word(dev, PCI_COMMAND, &cmd);
|
pci_read_config_word(dev, PCI_COMMAND, &cmd);
|
||||||
old_cmd = cmd;
|
old_cmd = cmd;
|
||||||
for (idx = 0; idx < PCI_NUM_RESOURCES; idx++) {
|
pci_dev_for_each_resource(dev, r, idx) {
|
||||||
/* Only set up the requested stuff */
|
/* Only set up the requested stuff */
|
||||||
if (!(mask & (1<<idx)))
|
if (!(mask & (1<<idx)))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
r = &dev->resource[idx];
|
|
||||||
if (!(r->flags & (IORESOURCE_IO | IORESOURCE_MEM)))
|
if (!(r->flags & (IORESOURCE_IO | IORESOURCE_MEM)))
|
||||||
continue;
|
continue;
|
||||||
if ((idx == PCI_ROM_RESOURCE) &&
|
if ((idx == PCI_ROM_RESOURCE) &&
|
||||||
|
|
|
@ -880,6 +880,7 @@ int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge)
|
||||||
static void pcibios_fixup_resources(struct pci_dev *dev)
|
static void pcibios_fixup_resources(struct pci_dev *dev)
|
||||||
{
|
{
|
||||||
struct pci_controller *hose = pci_bus_to_host(dev->bus);
|
struct pci_controller *hose = pci_bus_to_host(dev->bus);
|
||||||
|
struct resource *res;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if (!hose) {
|
if (!hose) {
|
||||||
|
@ -891,9 +892,9 @@ static void pcibios_fixup_resources(struct pci_dev *dev)
|
||||||
if (dev->is_virtfn)
|
if (dev->is_virtfn)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
|
pci_dev_for_each_resource(dev, res, i) {
|
||||||
struct resource *res = dev->resource + i;
|
|
||||||
struct pci_bus_region reg;
|
struct pci_bus_region reg;
|
||||||
|
|
||||||
if (!res->flags)
|
if (!res->flags)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
@ -1452,11 +1453,10 @@ void pcibios_claim_one_bus(struct pci_bus *bus)
|
||||||
struct pci_bus *child_bus;
|
struct pci_bus *child_bus;
|
||||||
|
|
||||||
list_for_each_entry(dev, &bus->devices, bus_list) {
|
list_for_each_entry(dev, &bus->devices, bus_list) {
|
||||||
|
struct resource *r;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
for (i = 0; i < PCI_NUM_RESOURCES; i++) {
|
pci_dev_for_each_resource(dev, r, i) {
|
||||||
struct resource *r = &dev->resource[i];
|
|
||||||
|
|
||||||
if (r->parent || !r->start || !r->flags)
|
if (r->parent || !r->start || !r->flags)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
@ -1705,19 +1705,20 @@ EXPORT_SYMBOL_GPL(pcibios_scan_phb);
|
||||||
|
|
||||||
static void fixup_hide_host_resource_fsl(struct pci_dev *dev)
|
static void fixup_hide_host_resource_fsl(struct pci_dev *dev)
|
||||||
{
|
{
|
||||||
int i, class = dev->class >> 8;
|
int class = dev->class >> 8;
|
||||||
/* When configured as agent, programming interface = 1 */
|
/* When configured as agent, programming interface = 1 */
|
||||||
int prog_if = dev->class & 0xf;
|
int prog_if = dev->class & 0xf;
|
||||||
|
struct resource *r;
|
||||||
|
|
||||||
if ((class == PCI_CLASS_PROCESSOR_POWERPC ||
|
if ((class == PCI_CLASS_PROCESSOR_POWERPC ||
|
||||||
class == PCI_CLASS_BRIDGE_OTHER) &&
|
class == PCI_CLASS_BRIDGE_OTHER) &&
|
||||||
(dev->hdr_type == PCI_HEADER_TYPE_NORMAL) &&
|
(dev->hdr_type == PCI_HEADER_TYPE_NORMAL) &&
|
||||||
(prog_if == 0) &&
|
(prog_if == 0) &&
|
||||||
(dev->bus->parent == NULL)) {
|
(dev->bus->parent == NULL)) {
|
||||||
for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
|
pci_dev_for_each_resource(dev, r) {
|
||||||
dev->resource[i].start = 0;
|
r->start = 0;
|
||||||
dev->resource[i].end = 0;
|
r->end = 0;
|
||||||
dev->resource[i].flags = 0;
|
r->flags = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -57,7 +57,7 @@ static inline int ppc440spe_revA(void)
|
||||||
static void fixup_ppc4xx_pci_bridge(struct pci_dev *dev)
|
static void fixup_ppc4xx_pci_bridge(struct pci_dev *dev)
|
||||||
{
|
{
|
||||||
struct pci_controller *hose;
|
struct pci_controller *hose;
|
||||||
int i;
|
struct resource *r;
|
||||||
|
|
||||||
if (dev->devfn != 0 || dev->bus->self != NULL)
|
if (dev->devfn != 0 || dev->bus->self != NULL)
|
||||||
return;
|
return;
|
||||||
|
@ -79,9 +79,9 @@ static void fixup_ppc4xx_pci_bridge(struct pci_dev *dev)
|
||||||
/* Hide the PCI host BARs from the kernel as their content doesn't
|
/* Hide the PCI host BARs from the kernel as their content doesn't
|
||||||
* fit well in the resource management
|
* fit well in the resource management
|
||||||
*/
|
*/
|
||||||
for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
|
pci_dev_for_each_resource(dev, r) {
|
||||||
dev->resource[i].start = dev->resource[i].end = 0;
|
r->start = r->end = 0;
|
||||||
dev->resource[i].flags = 0;
|
r->flags = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
printk(KERN_INFO "PCI: Hiding 4xx host bridge resources %s\n",
|
printk(KERN_INFO "PCI: Hiding 4xx host bridge resources %s\n",
|
||||||
|
|
|
@ -327,14 +327,13 @@ mpc52xx_pci_setup(struct pci_controller *hose,
|
||||||
static void
|
static void
|
||||||
mpc52xx_pci_fixup_resources(struct pci_dev *dev)
|
mpc52xx_pci_fixup_resources(struct pci_dev *dev)
|
||||||
{
|
{
|
||||||
int i;
|
struct resource *res;
|
||||||
|
|
||||||
pr_debug("%s() %.4x:%.4x\n", __func__, dev->vendor, dev->device);
|
pr_debug("%s() %.4x:%.4x\n", __func__, dev->vendor, dev->device);
|
||||||
|
|
||||||
/* We don't rely on boot loader for PCI and resets all
|
/* We don't rely on boot loader for PCI and resets all
|
||||||
devices */
|
devices */
|
||||||
for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
|
pci_dev_for_each_resource(dev, res) {
|
||||||
struct resource *res = &dev->resource[i];
|
|
||||||
if (res->end > res->start) { /* Only valid resources */
|
if (res->end > res->start) { /* Only valid resources */
|
||||||
res->end -= res->start;
|
res->end -= res->start;
|
||||||
res->start = 0;
|
res->start = 0;
|
||||||
|
|
|
@ -240,7 +240,7 @@ void __init pSeries_final_fixup(void)
|
||||||
*/
|
*/
|
||||||
static void fixup_winbond_82c105(struct pci_dev* dev)
|
static void fixup_winbond_82c105(struct pci_dev* dev)
|
||||||
{
|
{
|
||||||
int i;
|
struct resource *r;
|
||||||
unsigned int reg;
|
unsigned int reg;
|
||||||
|
|
||||||
if (!machine_is(pseries))
|
if (!machine_is(pseries))
|
||||||
|
@ -251,14 +251,14 @@ static void fixup_winbond_82c105(struct pci_dev* dev)
|
||||||
/* Enable LEGIRQ to use INTC instead of ISA interrupts */
|
/* Enable LEGIRQ to use INTC instead of ISA interrupts */
|
||||||
pci_write_config_dword(dev, 0x40, reg | (1<<11));
|
pci_write_config_dword(dev, 0x40, reg | (1<<11));
|
||||||
|
|
||||||
for (i = 0; i < DEVICE_COUNT_RESOURCE; ++i) {
|
pci_dev_for_each_resource(dev, r) {
|
||||||
/* zap the 2nd function of the winbond chip */
|
/* zap the 2nd function of the winbond chip */
|
||||||
if (dev->resource[i].flags & IORESOURCE_IO
|
if (dev->bus->number == 0 && dev->devfn == 0x81 &&
|
||||||
&& dev->bus->number == 0 && dev->devfn == 0x81)
|
r->flags & IORESOURCE_IO)
|
||||||
dev->resource[i].flags &= ~IORESOURCE_IO;
|
r->flags &= ~IORESOURCE_IO;
|
||||||
if (dev->resource[i].start == 0 && dev->resource[i].end) {
|
if (r->start == 0 && r->end) {
|
||||||
dev->resource[i].flags = 0;
|
r->flags = 0;
|
||||||
dev->resource[i].end = 0;
|
r->end = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -140,12 +140,12 @@ static void sh7786_pci_fixup(struct pci_dev *dev)
|
||||||
* Prevent enumeration of root complex resources.
|
* Prevent enumeration of root complex resources.
|
||||||
*/
|
*/
|
||||||
if (pci_is_root_bus(dev->bus) && dev->devfn == 0) {
|
if (pci_is_root_bus(dev->bus) && dev->devfn == 0) {
|
||||||
int i;
|
struct resource *r;
|
||||||
|
|
||||||
for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
|
pci_dev_for_each_resource(dev, r) {
|
||||||
dev->resource[i].start = 0;
|
r->start = 0;
|
||||||
dev->resource[i].end = 0;
|
r->end = 0;
|
||||||
dev->resource[i].flags = 0;
|
r->flags = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -62,15 +62,14 @@ void leon_pci_init(struct platform_device *ofdev, struct leon_pci_info *info)
|
||||||
|
|
||||||
int pcibios_enable_device(struct pci_dev *dev, int mask)
|
int pcibios_enable_device(struct pci_dev *dev, int mask)
|
||||||
{
|
{
|
||||||
|
struct resource *res;
|
||||||
u16 cmd, oldcmd;
|
u16 cmd, oldcmd;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
pci_read_config_word(dev, PCI_COMMAND, &cmd);
|
pci_read_config_word(dev, PCI_COMMAND, &cmd);
|
||||||
oldcmd = cmd;
|
oldcmd = cmd;
|
||||||
|
|
||||||
for (i = 0; i < PCI_NUM_RESOURCES; i++) {
|
pci_dev_for_each_resource(dev, res, i) {
|
||||||
struct resource *res = &dev->resource[i];
|
|
||||||
|
|
||||||
/* Only set up the requested stuff */
|
/* Only set up the requested stuff */
|
||||||
if (!(mask & (1<<i)))
|
if (!(mask & (1<<i)))
|
||||||
continue;
|
continue;
|
||||||
|
|
|
@ -663,11 +663,10 @@ static void pci_claim_bus_resources(struct pci_bus *bus)
|
||||||
struct pci_dev *dev;
|
struct pci_dev *dev;
|
||||||
|
|
||||||
list_for_each_entry(dev, &bus->devices, bus_list) {
|
list_for_each_entry(dev, &bus->devices, bus_list) {
|
||||||
|
struct resource *r;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
for (i = 0; i < PCI_NUM_RESOURCES; i++) {
|
pci_dev_for_each_resource(dev, r, i) {
|
||||||
struct resource *r = &dev->resource[i];
|
|
||||||
|
|
||||||
if (r->parent || !r->start || !r->flags)
|
if (r->parent || !r->start || !r->flags)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
@ -724,15 +723,14 @@ struct pci_bus *pci_scan_one_pbm(struct pci_pbm_info *pbm,
|
||||||
|
|
||||||
int pcibios_enable_device(struct pci_dev *dev, int mask)
|
int pcibios_enable_device(struct pci_dev *dev, int mask)
|
||||||
{
|
{
|
||||||
|
struct resource *res;
|
||||||
u16 cmd, oldcmd;
|
u16 cmd, oldcmd;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
pci_read_config_word(dev, PCI_COMMAND, &cmd);
|
pci_read_config_word(dev, PCI_COMMAND, &cmd);
|
||||||
oldcmd = cmd;
|
oldcmd = cmd;
|
||||||
|
|
||||||
for (i = 0; i < PCI_NUM_RESOURCES; i++) {
|
pci_dev_for_each_resource(dev, res, i) {
|
||||||
struct resource *res = &dev->resource[i];
|
|
||||||
|
|
||||||
/* Only set up the requested stuff */
|
/* Only set up the requested stuff */
|
||||||
if (!(mask & (1<<i)))
|
if (!(mask & (1<<i)))
|
||||||
continue;
|
continue;
|
||||||
|
|
|
@ -643,15 +643,14 @@ void pcibios_fixup_bus(struct pci_bus *bus)
|
||||||
|
|
||||||
int pcibios_enable_device(struct pci_dev *dev, int mask)
|
int pcibios_enable_device(struct pci_dev *dev, int mask)
|
||||||
{
|
{
|
||||||
|
struct resource *res;
|
||||||
u16 cmd, oldcmd;
|
u16 cmd, oldcmd;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
pci_read_config_word(dev, PCI_COMMAND, &cmd);
|
pci_read_config_word(dev, PCI_COMMAND, &cmd);
|
||||||
oldcmd = cmd;
|
oldcmd = cmd;
|
||||||
|
|
||||||
for (i = 0; i < PCI_NUM_RESOURCES; i++) {
|
pci_dev_for_each_resource(dev, res, i) {
|
||||||
struct resource *res = &dev->resource[i];
|
|
||||||
|
|
||||||
/* Only set up the requested stuff */
|
/* Only set up the requested stuff */
|
||||||
if (!(mask & (1<<i)))
|
if (!(mask & (1<<i)))
|
||||||
continue;
|
continue;
|
||||||
|
|
|
@ -5,10 +5,9 @@
|
||||||
|
|
||||||
static void pci_free_resources(struct pci_dev *dev)
|
static void pci_free_resources(struct pci_dev *dev)
|
||||||
{
|
{
|
||||||
int i;
|
struct resource *res;
|
||||||
|
|
||||||
for (i = 0; i < PCI_NUM_RESOURCES; i++) {
|
pci_dev_for_each_resource(dev, res) {
|
||||||
struct resource *res = dev->resource + i;
|
|
||||||
if (res->parent)
|
if (res->parent)
|
||||||
release_resource(res);
|
release_resource(res);
|
||||||
}
|
}
|
||||||
|
|
|
@ -124,20 +124,17 @@ static resource_size_t get_res_add_align(struct list_head *head,
|
||||||
return dev_res ? dev_res->min_align : 0;
|
return dev_res ? dev_res->min_align : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* Sort resources by alignment */
|
/* Sort resources by alignment */
|
||||||
static void pdev_sort_resources(struct pci_dev *dev, struct list_head *head)
|
static void pdev_sort_resources(struct pci_dev *dev, struct list_head *head)
|
||||||
{
|
{
|
||||||
|
struct resource *r;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
for (i = 0; i < PCI_NUM_RESOURCES; i++) {
|
pci_dev_for_each_resource(dev, r, i) {
|
||||||
struct resource *r;
|
|
||||||
struct pci_dev_resource *dev_res, *tmp;
|
struct pci_dev_resource *dev_res, *tmp;
|
||||||
resource_size_t r_align;
|
resource_size_t r_align;
|
||||||
struct list_head *n;
|
struct list_head *n;
|
||||||
|
|
||||||
r = &dev->resource[i];
|
|
||||||
|
|
||||||
if (r->flags & IORESOURCE_PCI_FIXED)
|
if (r->flags & IORESOURCE_PCI_FIXED)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
@ -895,10 +892,9 @@ static void pbus_size_io(struct pci_bus *bus, resource_size_t min_size,
|
||||||
|
|
||||||
min_align = window_alignment(bus, IORESOURCE_IO);
|
min_align = window_alignment(bus, IORESOURCE_IO);
|
||||||
list_for_each_entry(dev, &bus->devices, bus_list) {
|
list_for_each_entry(dev, &bus->devices, bus_list) {
|
||||||
int i;
|
struct resource *r;
|
||||||
|
|
||||||
for (i = 0; i < PCI_NUM_RESOURCES; i++) {
|
pci_dev_for_each_resource(dev, r) {
|
||||||
struct resource *r = &dev->resource[i];
|
|
||||||
unsigned long r_size;
|
unsigned long r_size;
|
||||||
|
|
||||||
if (r->parent || !(r->flags & IORESOURCE_IO))
|
if (r->parent || !(r->flags & IORESOURCE_IO))
|
||||||
|
@ -1014,10 +1010,10 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask,
|
||||||
size = 0;
|
size = 0;
|
||||||
|
|
||||||
list_for_each_entry(dev, &bus->devices, bus_list) {
|
list_for_each_entry(dev, &bus->devices, bus_list) {
|
||||||
|
struct resource *r;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
for (i = 0; i < PCI_NUM_RESOURCES; i++) {
|
pci_dev_for_each_resource(dev, r, i) {
|
||||||
struct resource *r = &dev->resource[i];
|
|
||||||
resource_size_t r_size;
|
resource_size_t r_size;
|
||||||
|
|
||||||
if (r->parent || (r->flags & IORESOURCE_PCI_FIXED) ||
|
if (r->parent || (r->flags & IORESOURCE_PCI_FIXED) ||
|
||||||
|
@ -1358,11 +1354,10 @@ static void assign_fixed_resource_on_bus(struct pci_bus *b, struct resource *r)
|
||||||
*/
|
*/
|
||||||
static void pdev_assign_fixed_resources(struct pci_dev *dev)
|
static void pdev_assign_fixed_resources(struct pci_dev *dev)
|
||||||
{
|
{
|
||||||
int i;
|
struct resource *r;
|
||||||
|
|
||||||
for (i = 0; i < PCI_NUM_RESOURCES; i++) {
|
pci_dev_for_each_resource(dev, r) {
|
||||||
struct pci_bus *b;
|
struct pci_bus *b;
|
||||||
struct resource *r = &dev->resource[i];
|
|
||||||
|
|
||||||
if (r->parent || !(r->flags & IORESOURCE_PCI_FIXED) ||
|
if (r->parent || !(r->flags & IORESOURCE_PCI_FIXED) ||
|
||||||
!(r->flags & (IORESOURCE_IO | IORESOURCE_MEM)))
|
!(r->flags & (IORESOURCE_IO | IORESOURCE_MEM)))
|
||||||
|
@ -1795,11 +1790,9 @@ static void remove_dev_resources(struct pci_dev *dev, struct resource *io,
|
||||||
struct resource *mmio,
|
struct resource *mmio,
|
||||||
struct resource *mmio_pref)
|
struct resource *mmio_pref)
|
||||||
{
|
{
|
||||||
int i;
|
struct resource *res;
|
||||||
|
|
||||||
for (i = 0; i < PCI_NUM_RESOURCES; i++) {
|
|
||||||
struct resource *res = &dev->resource[i];
|
|
||||||
|
|
||||||
|
pci_dev_for_each_resource(dev, res) {
|
||||||
if (resource_type(res) == IORESOURCE_IO) {
|
if (resource_type(res) == IORESOURCE_IO) {
|
||||||
remove_dev_resource(io, dev, res);
|
remove_dev_resource(io, dev, res);
|
||||||
} else if (resource_type(res) == IORESOURCE_MEM) {
|
} else if (resource_type(res) == IORESOURCE_MEM) {
|
||||||
|
|
|
@ -484,12 +484,10 @@ int pci_enable_resources(struct pci_dev *dev, int mask)
|
||||||
pci_read_config_word(dev, PCI_COMMAND, &cmd);
|
pci_read_config_word(dev, PCI_COMMAND, &cmd);
|
||||||
old_cmd = cmd;
|
old_cmd = cmd;
|
||||||
|
|
||||||
for (i = 0; i < PCI_NUM_RESOURCES; i++) {
|
pci_dev_for_each_resource(dev, r, i) {
|
||||||
if (!(mask & (1 << i)))
|
if (!(mask & (1 << i)))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
r = &dev->resource[i];
|
|
||||||
|
|
||||||
if (!(r->flags & (IORESOURCE_IO | IORESOURCE_MEM)))
|
if (!(r->flags & (IORESOURCE_IO | IORESOURCE_MEM)))
|
||||||
continue;
|
continue;
|
||||||
if ((i == PCI_ROM_RESOURCE) &&
|
if ((i == PCI_ROM_RESOURCE) &&
|
||||||
|
|
|
@ -548,10 +548,8 @@ static bool vga_is_firmware_default(struct pci_dev *pdev)
|
||||||
#if defined(CONFIG_X86) || defined(CONFIG_IA64)
|
#if defined(CONFIG_X86) || defined(CONFIG_IA64)
|
||||||
u64 base = screen_info.lfb_base;
|
u64 base = screen_info.lfb_base;
|
||||||
u64 size = screen_info.lfb_size;
|
u64 size = screen_info.lfb_size;
|
||||||
|
struct resource *r;
|
||||||
u64 limit;
|
u64 limit;
|
||||||
resource_size_t start, end;
|
|
||||||
unsigned long flags;
|
|
||||||
int i;
|
|
||||||
|
|
||||||
/* Select the device owning the boot framebuffer if there is one */
|
/* Select the device owning the boot framebuffer if there is one */
|
||||||
|
|
||||||
|
@ -561,19 +559,14 @@ static bool vga_is_firmware_default(struct pci_dev *pdev)
|
||||||
limit = base + size;
|
limit = base + size;
|
||||||
|
|
||||||
/* Does firmware framebuffer belong to us? */
|
/* Does firmware framebuffer belong to us? */
|
||||||
for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
|
pci_dev_for_each_resource(pdev, r) {
|
||||||
flags = pci_resource_flags(pdev, i);
|
if (resource_type(r) != IORESOURCE_MEM)
|
||||||
|
|
||||||
if ((flags & IORESOURCE_MEM) == 0)
|
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
start = pci_resource_start(pdev, i);
|
if (!r->start || !r->end)
|
||||||
end = pci_resource_end(pdev, i);
|
|
||||||
|
|
||||||
if (!start || !end)
|
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (base < start || limit >= end)
|
if (base < r->start || limit >= r->end)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
|
|
@ -390,9 +390,7 @@ static int pcifront_claim_resource(struct pci_dev *dev, void *data)
|
||||||
int i;
|
int i;
|
||||||
struct resource *r;
|
struct resource *r;
|
||||||
|
|
||||||
for (i = 0; i < PCI_NUM_RESOURCES; i++) {
|
pci_dev_for_each_resource(dev, r, i) {
|
||||||
r = &dev->resource[i];
|
|
||||||
|
|
||||||
if (!r->parent && r->start && r->flags) {
|
if (!r->parent && r->start && r->flags) {
|
||||||
dev_info(&pdev->xdev->dev, "claiming resource %s/%d\n",
|
dev_info(&pdev->xdev->dev, "claiming resource %s/%d\n",
|
||||||
pci_name(dev), i);
|
pci_name(dev), i);
|
||||||
|
|
|
@ -229,8 +229,7 @@ static void quirk_ad1815_mpu_resources(struct pnp_dev *dev)
|
||||||
static void quirk_system_pci_resources(struct pnp_dev *dev)
|
static void quirk_system_pci_resources(struct pnp_dev *dev)
|
||||||
{
|
{
|
||||||
struct pci_dev *pdev = NULL;
|
struct pci_dev *pdev = NULL;
|
||||||
struct resource *res;
|
struct resource *res, *r;
|
||||||
resource_size_t pnp_start, pnp_end, pci_start, pci_end;
|
|
||||||
int i, j;
|
int i, j;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -243,32 +242,26 @@ static void quirk_system_pci_resources(struct pnp_dev *dev)
|
||||||
* so they won't be claimed by the PNP system driver.
|
* so they won't be claimed by the PNP system driver.
|
||||||
*/
|
*/
|
||||||
for_each_pci_dev(pdev) {
|
for_each_pci_dev(pdev) {
|
||||||
for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
|
pci_dev_for_each_resource(pdev, r, i) {
|
||||||
unsigned long flags, type;
|
unsigned long type = resource_type(r);
|
||||||
|
|
||||||
flags = pci_resource_flags(pdev, i);
|
if (!(type == IORESOURCE_IO || type == IORESOURCE_MEM) ||
|
||||||
type = flags & (IORESOURCE_IO | IORESOURCE_MEM);
|
resource_size(r) == 0)
|
||||||
if (!type || pci_resource_len(pdev, i) == 0)
|
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (flags & IORESOURCE_UNSET)
|
if (r->flags & IORESOURCE_UNSET)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
pci_start = pci_resource_start(pdev, i);
|
|
||||||
pci_end = pci_resource_end(pdev, i);
|
|
||||||
for (j = 0;
|
for (j = 0;
|
||||||
(res = pnp_get_resource(dev, type, j)); j++) {
|
(res = pnp_get_resource(dev, type, j)); j++) {
|
||||||
if (res->start == 0 && res->end == 0)
|
if (res->start == 0 && res->end == 0)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
pnp_start = res->start;
|
|
||||||
pnp_end = res->end;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* If the PNP region doesn't overlap the PCI
|
* If the PNP region doesn't overlap the PCI
|
||||||
* region at all, there's no problem.
|
* region at all, there's no problem.
|
||||||
*/
|
*/
|
||||||
if (pnp_end < pci_start || pnp_start > pci_end)
|
if (!resource_overlaps(res, r))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -278,8 +271,7 @@ static void quirk_system_pci_resources(struct pnp_dev *dev)
|
||||||
* PNP device describes a bridge with PCI
|
* PNP device describes a bridge with PCI
|
||||||
* behind it.
|
* behind it.
|
||||||
*/
|
*/
|
||||||
if (pnp_start <= pci_start &&
|
if (res->start <= r->start && res->end >= r->end)
|
||||||
pnp_end >= pci_end)
|
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -288,9 +280,8 @@ static void quirk_system_pci_resources(struct pnp_dev *dev)
|
||||||
* driver from requesting its resources.
|
* driver from requesting its resources.
|
||||||
*/
|
*/
|
||||||
dev_warn(&dev->dev,
|
dev_warn(&dev->dev,
|
||||||
"disabling %pR because it overlaps "
|
"disabling %pR because it overlaps %s BAR %d %pR\n",
|
||||||
"%s BAR %d %pR\n", res,
|
res, pci_name(pdev), i, r);
|
||||||
pci_name(pdev), i, &pdev->resource[i]);
|
|
||||||
res->flags |= IORESOURCE_DISABLED;
|
res->flags |= IORESOURCE_DISABLED;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2002,6 +2002,20 @@ int pci_iobar_pfn(struct pci_dev *pdev, int bar, struct vm_area_struct *vma);
|
||||||
(pci_resource_end((dev), (bar)) ? \
|
(pci_resource_end((dev), (bar)) ? \
|
||||||
resource_size(pci_resource_n((dev), (bar))) : 0)
|
resource_size(pci_resource_n((dev), (bar))) : 0)
|
||||||
|
|
||||||
|
#define __pci_dev_for_each_res0(dev, res, ...) \
|
||||||
|
for (unsigned int __b = 0; \
|
||||||
|
res = pci_resource_n(dev, __b), __b < PCI_NUM_RESOURCES; \
|
||||||
|
__b++)
|
||||||
|
|
||||||
|
#define __pci_dev_for_each_res1(dev, res, __b) \
|
||||||
|
for (__b = 0; \
|
||||||
|
res = pci_resource_n(dev, __b), __b < PCI_NUM_RESOURCES; \
|
||||||
|
__b++)
|
||||||
|
|
||||||
|
#define pci_dev_for_each_resource(dev, res, ...) \
|
||||||
|
CONCATENATE(__pci_dev_for_each_res, COUNT_ARGS(__VA_ARGS__)) \
|
||||||
|
(dev, res, __VA_ARGS__)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Similar to the helpers above, these manipulate per-pci_dev
|
* Similar to the helpers above, these manipulate per-pci_dev
|
||||||
* driver-specific data. They are really just a wrapper around
|
* driver-specific data. They are really just a wrapper around
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue