Merge branches 'pci/aer', 'pci/misc' and 'pci/virtualization' into next
* pci/aer: PCI/AER: Use list_first_entry_or_null() to simplify code PCI/AER: Restore pci_ops pointer while calling original pci_ops PCI/AER: Rename pci_ops_aer to aer_inj_pci_ops * pci/misc: PCI: Remove includes of asm/pci-bridge.h PCI: Remove empty asm-generic/pci-bridge.h ARM64: PCI: Remove generated include of asm-generic/pci-bridge.h PCI: Remove includes of empty asm-generic/pci-bridge.h PCI: Move pci_set_flags() from asm-generic/pci-bridge.h to linux/pci.h PCI/PME: Restructure pcie_pme_suspend() to prevent compiler warning PCI/PME: Remove redundant port lookup PCI: Check device_attach() return value always * pci/virtualization: PCI: Add ACS quirk for all Cavium devices
This commit is contained in:
commit
129aaabc84
|
@ -7,7 +7,6 @@
|
|||
#include <linux/dma-mapping.h>
|
||||
#include <linux/scatterlist.h>
|
||||
#include <asm/machvec.h>
|
||||
#include <asm-generic/pci-bridge.h>
|
||||
|
||||
/*
|
||||
* The following structure is used to manage multiple PCI busses.
|
||||
|
|
|
@ -3,8 +3,6 @@
|
|||
|
||||
#ifdef __KERNEL__
|
||||
#include <asm-generic/pci-dma-compat.h>
|
||||
#include <asm-generic/pci-bridge.h>
|
||||
|
||||
#include <asm/mach/pci.h> /* for pci_sys_data */
|
||||
|
||||
extern unsigned long pcibios_min_io;
|
||||
|
@ -41,5 +39,4 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
|
|||
}
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
|
||||
#endif
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
|
||||
|
||||
generic-y += bug.h
|
||||
generic-y += bugs.h
|
||||
generic-y += checksum.h
|
||||
|
@ -31,7 +29,6 @@ generic-y += msgbuf.h
|
|||
generic-y += msi.h
|
||||
generic-y += mutex.h
|
||||
generic-y += pci.h
|
||||
generic-y += pci-bridge.h
|
||||
generic-y += poll.h
|
||||
generic-y += preempt.h
|
||||
generic-y += resource.h
|
||||
|
|
|
@ -7,7 +7,6 @@
|
|||
#include <linux/dma-mapping.h>
|
||||
|
||||
#include <asm/io.h>
|
||||
#include <asm-generic/pci-bridge.h>
|
||||
#include <asm-generic/pci-dma-compat.h>
|
||||
|
||||
#define PCIBIOS_MIN_IO 0x1000
|
||||
|
|
|
@ -19,8 +19,6 @@
|
|||
#include <linux/of_platform.h>
|
||||
#include <linux/slab.h>
|
||||
|
||||
#include <asm/pci-bridge.h>
|
||||
|
||||
/*
|
||||
* Called after each bus is probed, but before its children are examined
|
||||
*/
|
||||
|
|
|
@ -102,7 +102,6 @@ static inline void pci_resource_to_user(const struct pci_dev *dev, int bar,
|
|||
#include <linux/scatterlist.h>
|
||||
#include <linux/string.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm-generic/pci-bridge.h>
|
||||
|
||||
struct pci_dev;
|
||||
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
#include <linux/pci.h>
|
||||
#include <linux/list.h>
|
||||
#include <linux/ioport.h>
|
||||
#include <asm-generic/pci-bridge.h>
|
||||
|
||||
struct device_node;
|
||||
|
||||
|
|
|
@ -14,7 +14,6 @@
|
|||
|
||||
#ifdef __KERNEL__
|
||||
#include <asm-generic/pci-dma-compat.h>
|
||||
#include <asm-generic/pci-bridge.h>
|
||||
#include <asm-generic/pci.h>
|
||||
#include <mach/hardware.h> /* for PCIBIOS_MIN_* */
|
||||
|
||||
|
@ -23,5 +22,4 @@ extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
|
|||
enum pci_mmap_state mmap_state, int write_combine);
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
|
||||
#endif
|
||||
|
|
|
@ -12,7 +12,6 @@
|
|||
#include <linux/dmi.h>
|
||||
#include <linux/slab.h>
|
||||
|
||||
#include <asm-generic/pci-bridge.h>
|
||||
#include <asm/acpi.h>
|
||||
#include <asm/segment.h>
|
||||
#include <asm/io.h>
|
||||
|
|
|
@ -22,6 +22,7 @@
|
|||
#include <linux/scatterlist.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/gfp.h>
|
||||
#include <linux/pci.h>
|
||||
|
||||
#include <scsi/scsi.h>
|
||||
#include <scsi/scsi_host.h>
|
||||
|
@ -30,7 +31,6 @@
|
|||
#include <asm/macio.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/dbdma.h>
|
||||
#include <asm/pci-bridge.h>
|
||||
#include <asm/machdep.h>
|
||||
#include <asm/pmac_feature.h>
|
||||
#include <asm/mediabay.h>
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
#include <linux/delay.h>
|
||||
#include <linux/vmalloc.h>
|
||||
#include <asm/uninorth.h>
|
||||
#include <asm/pci-bridge.h>
|
||||
#include <asm/prom.h>
|
||||
#include <asm/pmac_feature.h>
|
||||
#include "agp.h"
|
||||
|
|
|
@ -34,7 +34,6 @@
|
|||
#include <asm/machdep.h>
|
||||
#include <asm/pmac_feature.h>
|
||||
#include <asm/prom.h>
|
||||
#include <asm/pci-bridge.h>
|
||||
#endif /* CONFIG_PPC_PMAC */
|
||||
|
||||
/* from radeon_legacy_encoder.c */
|
||||
|
|
|
@ -28,7 +28,6 @@
|
|||
|
||||
#ifdef CONFIG_PPC_PMAC
|
||||
#include <asm/prom.h>
|
||||
#include <asm/pci-bridge.h>
|
||||
#endif
|
||||
|
||||
#define DRV_NAME "pdc202xx_new"
|
||||
|
|
|
@ -40,7 +40,6 @@
|
|||
#include <asm/io.h>
|
||||
#include <asm/dbdma.h>
|
||||
#include <asm/ide.h>
|
||||
#include <asm/pci-bridge.h>
|
||||
#include <asm/machdep.h>
|
||||
#include <asm/pmac_feature.h>
|
||||
#include <asm/sections.h>
|
||||
|
|
|
@ -31,7 +31,6 @@
|
|||
#include <asm/macio.h>
|
||||
#include <asm/pmac_feature.h>
|
||||
#include <asm/prom.h>
|
||||
#include <asm/pci-bridge.h>
|
||||
|
||||
#undef DEBUG
|
||||
|
||||
|
|
|
@ -19,7 +19,6 @@
|
|||
#include <linux/delay.h>
|
||||
#include <asm/opal.h>
|
||||
#include <asm/msi_bitmap.h>
|
||||
#include <asm/pci-bridge.h> /* for struct pci_controller */
|
||||
#include <asm/pnv-pci.h>
|
||||
#include <asm/io.h>
|
||||
|
||||
|
|
|
@ -51,7 +51,6 @@
|
|||
#endif
|
||||
|
||||
#ifdef CONFIG_PPC_PMAC
|
||||
#include <asm/pci-bridge.h>
|
||||
#include <asm/prom.h>
|
||||
#include <asm/machdep.h>
|
||||
#include <asm/pmac_feature.h>
|
||||
|
|
|
@ -48,7 +48,6 @@
|
|||
#include <linux/wait.h>
|
||||
#include <linux/workqueue.h>
|
||||
#include <linux/bitops.h>
|
||||
#include <asm/pci-bridge.h>
|
||||
#include <net/checksum.h>
|
||||
|
||||
#include "spider_net.h"
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
#include <linux/of_device.h>
|
||||
#include <linux/of_pci.h>
|
||||
#include <linux/slab.h>
|
||||
#include <asm-generic/pci-bridge.h>
|
||||
|
||||
static inline int __of_pci_pci_compare(struct device_node *node,
|
||||
unsigned int data)
|
||||
|
|
|
@ -291,7 +291,12 @@ void pci_bus_add_device(struct pci_dev *dev)
|
|||
|
||||
dev->match_driver = true;
|
||||
retval = device_attach(&dev->dev);
|
||||
WARN_ON(retval < 0);
|
||||
if (retval < 0) {
|
||||
dev_warn(&dev->dev, "device attach failed (%d)\n", retval);
|
||||
pci_proc_detach_device(dev);
|
||||
pci_remove_sysfs_dev_files(dev);
|
||||
return;
|
||||
}
|
||||
|
||||
dev->is_added = 1;
|
||||
}
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
#include <linux/device.h>
|
||||
#include <linux/pm_runtime.h>
|
||||
#include <linux/pci_hotplug.h>
|
||||
#include <asm-generic/pci-bridge.h>
|
||||
#include <asm/setup.h>
|
||||
#include <linux/aer.h>
|
||||
#include "pci.h"
|
||||
|
|
|
@ -124,16 +124,13 @@ static struct pci_ops *__find_pci_bus_ops(struct pci_bus *bus)
|
|||
static struct pci_bus_ops *pci_bus_ops_pop(void)
|
||||
{
|
||||
unsigned long flags;
|
||||
struct pci_bus_ops *bus_ops = NULL;
|
||||
struct pci_bus_ops *bus_ops;
|
||||
|
||||
spin_lock_irqsave(&inject_lock, flags);
|
||||
if (list_empty(&pci_bus_ops_list))
|
||||
bus_ops = NULL;
|
||||
else {
|
||||
struct list_head *lh = pci_bus_ops_list.next;
|
||||
list_del(lh);
|
||||
bus_ops = list_entry(lh, struct pci_bus_ops, list);
|
||||
}
|
||||
bus_ops = list_first_entry_or_null(&pci_bus_ops_list,
|
||||
struct pci_bus_ops, list);
|
||||
if (bus_ops)
|
||||
list_del(&bus_ops->list);
|
||||
spin_unlock_irqrestore(&inject_lock, flags);
|
||||
return bus_ops;
|
||||
}
|
||||
|
@ -181,14 +178,16 @@ static u32 *find_pci_config_dword(struct aer_error *err, int where,
|
|||
return target;
|
||||
}
|
||||
|
||||
static int pci_read_aer(struct pci_bus *bus, unsigned int devfn, int where,
|
||||
int size, u32 *val)
|
||||
static int aer_inj_read_config(struct pci_bus *bus, unsigned int devfn,
|
||||
int where, int size, u32 *val)
|
||||
{
|
||||
u32 *sim;
|
||||
struct aer_error *err;
|
||||
unsigned long flags;
|
||||
struct pci_ops *ops;
|
||||
struct pci_ops *my_ops;
|
||||
int domain;
|
||||
int rv;
|
||||
|
||||
spin_lock_irqsave(&inject_lock, flags);
|
||||
if (size != sizeof(u32))
|
||||
|
@ -208,19 +207,32 @@ static int pci_read_aer(struct pci_bus *bus, unsigned int devfn, int where,
|
|||
}
|
||||
out:
|
||||
ops = __find_pci_bus_ops(bus);
|
||||
/*
|
||||
* pci_lock must already be held, so we can directly
|
||||
* manipulate bus->ops. Many config access functions,
|
||||
* including pci_generic_config_read() require the original
|
||||
* bus->ops be installed to function, so temporarily put them
|
||||
* back.
|
||||
*/
|
||||
my_ops = bus->ops;
|
||||
bus->ops = ops;
|
||||
rv = ops->read(bus, devfn, where, size, val);
|
||||
bus->ops = my_ops;
|
||||
spin_unlock_irqrestore(&inject_lock, flags);
|
||||
return ops->read(bus, devfn, where, size, val);
|
||||
return rv;
|
||||
}
|
||||
|
||||
static int pci_write_aer(struct pci_bus *bus, unsigned int devfn, int where,
|
||||
int size, u32 val)
|
||||
static int aer_inj_write_config(struct pci_bus *bus, unsigned int devfn,
|
||||
int where, int size, u32 val)
|
||||
{
|
||||
u32 *sim;
|
||||
struct aer_error *err;
|
||||
unsigned long flags;
|
||||
int rw1cs;
|
||||
struct pci_ops *ops;
|
||||
struct pci_ops *my_ops;
|
||||
int domain;
|
||||
int rv;
|
||||
|
||||
spin_lock_irqsave(&inject_lock, flags);
|
||||
if (size != sizeof(u32))
|
||||
|
@ -243,13 +255,24 @@ static int pci_write_aer(struct pci_bus *bus, unsigned int devfn, int where,
|
|||
}
|
||||
out:
|
||||
ops = __find_pci_bus_ops(bus);
|
||||
/*
|
||||
* pci_lock must already be held, so we can directly
|
||||
* manipulate bus->ops. Many config access functions,
|
||||
* including pci_generic_config_write() require the original
|
||||
* bus->ops be installed to function, so temporarily put them
|
||||
* back.
|
||||
*/
|
||||
my_ops = bus->ops;
|
||||
bus->ops = ops;
|
||||
rv = ops->write(bus, devfn, where, size, val);
|
||||
bus->ops = my_ops;
|
||||
spin_unlock_irqrestore(&inject_lock, flags);
|
||||
return ops->write(bus, devfn, where, size, val);
|
||||
return rv;
|
||||
}
|
||||
|
||||
static struct pci_ops pci_ops_aer = {
|
||||
.read = pci_read_aer,
|
||||
.write = pci_write_aer,
|
||||
static struct pci_ops aer_inj_pci_ops = {
|
||||
.read = aer_inj_read_config,
|
||||
.write = aer_inj_write_config,
|
||||
};
|
||||
|
||||
static void pci_bus_ops_init(struct pci_bus_ops *bus_ops,
|
||||
|
@ -270,9 +293,9 @@ static int pci_bus_set_aer_ops(struct pci_bus *bus)
|
|||
bus_ops = kmalloc(sizeof(*bus_ops), GFP_KERNEL);
|
||||
if (!bus_ops)
|
||||
return -ENOMEM;
|
||||
ops = pci_bus_set_ops(bus, &pci_ops_aer);
|
||||
ops = pci_bus_set_ops(bus, &aer_inj_pci_ops);
|
||||
spin_lock_irqsave(&inject_lock, flags);
|
||||
if (ops == &pci_ops_aer)
|
||||
if (ops == &aer_inj_pci_ops)
|
||||
goto out;
|
||||
pci_bus_ops_init(bus_ops, bus, ops);
|
||||
list_add(&bus_ops->list, &pci_bus_ops_list);
|
||||
|
|
|
@ -396,7 +396,7 @@ static int pcie_pme_suspend(struct pcie_device *srv)
|
|||
{
|
||||
struct pcie_pme_service_data *data = get_service_data(srv);
|
||||
struct pci_dev *port = srv->port;
|
||||
bool wakeup;
|
||||
bool wakeup, wake_irq_enabled = false;
|
||||
int ret;
|
||||
|
||||
if (device_may_wakeup(&port->dev)) {
|
||||
|
@ -409,11 +409,12 @@ static int pcie_pme_suspend(struct pcie_device *srv)
|
|||
spin_lock_irq(&data->lock);
|
||||
if (wakeup) {
|
||||
ret = enable_irq_wake(srv->irq);
|
||||
data->suspend_level = PME_SUSPEND_WAKEUP;
|
||||
if (ret == 0) {
|
||||
data->suspend_level = PME_SUSPEND_WAKEUP;
|
||||
wake_irq_enabled = true;
|
||||
}
|
||||
}
|
||||
if (!wakeup || ret) {
|
||||
struct pci_dev *port = srv->port;
|
||||
|
||||
if (!wake_irq_enabled) {
|
||||
pcie_pme_interrupt_enable(port, false);
|
||||
pcie_clear_root_pme_status(port);
|
||||
data->suspend_level = PME_SUSPEND_NOIRQ;
|
||||
|
|
|
@ -15,7 +15,6 @@
|
|||
#include <linux/pci-aspm.h>
|
||||
#include <linux/aer.h>
|
||||
#include <linux/acpi.h>
|
||||
#include <asm-generic/pci-bridge.h>
|
||||
#include "pci.h"
|
||||
|
||||
#define CARDBUS_LATENCY_TIMER 176 /* secondary latency timer */
|
||||
|
@ -1803,6 +1802,13 @@ static int only_one_child(struct pci_bus *bus)
|
|||
return 0;
|
||||
if (pci_pcie_type(parent) == PCI_EXP_TYPE_ROOT_PORT)
|
||||
return 1;
|
||||
|
||||
/*
|
||||
* PCIe downstream ports are bridges that normally lead to only a
|
||||
* device 0, but if PCI_SCAN_ALL_PCIE_DEVS is set, scan all
|
||||
* possible devices, not just device 0. See PCIe spec r3.0,
|
||||
* sec 7.3.1.
|
||||
*/
|
||||
if (parent->has_secondary_link &&
|
||||
!pci_has_flag(PCI_SCAN_ALL_PCIE_DEVS))
|
||||
return 1;
|
||||
|
|
|
@ -3832,6 +3832,19 @@ static int pci_quirk_amd_sb_acs(struct pci_dev *dev, u16 acs_flags)
|
|||
#endif
|
||||
}
|
||||
|
||||
static int pci_quirk_cavium_acs(struct pci_dev *dev, u16 acs_flags)
|
||||
{
|
||||
/*
|
||||
* Cavium devices matching this quirk do not perform peer-to-peer
|
||||
* with other functions, allowing masking out these bits as if they
|
||||
* were unimplemented in the ACS capability.
|
||||
*/
|
||||
acs_flags &= ~(PCI_ACS_SV | PCI_ACS_TB | PCI_ACS_RR |
|
||||
PCI_ACS_CR | PCI_ACS_UF | PCI_ACS_DT);
|
||||
|
||||
return acs_flags ? 0 : 1;
|
||||
}
|
||||
|
||||
/*
|
||||
* Many Intel PCH root ports do provide ACS-like features to disable peer
|
||||
* transactions and validate bus numbers in requests, but do not provide an
|
||||
|
@ -3984,6 +3997,8 @@ static const struct pci_dev_acs_enabled {
|
|||
{ PCI_VENDOR_ID_INTEL, PCI_ANY_ID, pci_quirk_intel_pch_acs },
|
||||
{ 0x19a2, 0x710, pci_quirk_mf_endpoint_acs }, /* Emulex BE3-R */
|
||||
{ 0x10df, 0x720, pci_quirk_mf_endpoint_acs }, /* Emulex Skyhawk-R */
|
||||
/* Cavium ThunderX */
|
||||
{ PCI_VENDOR_ID_CAVIUM, PCI_ANY_ID, pci_quirk_cavium_acs },
|
||||
{ 0 }
|
||||
};
|
||||
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
#include <linux/ioport.h>
|
||||
#include <linux/cache.h>
|
||||
#include <linux/slab.h>
|
||||
#include <asm-generic/pci-bridge.h>
|
||||
#include "pci.h"
|
||||
|
||||
unsigned int pci_flags;
|
||||
|
|
|
@ -18,11 +18,11 @@
|
|||
#include <linux/spinlock.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/pci.h>
|
||||
#include <asm/dbdma.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/pgtable.h>
|
||||
#include <asm/prom.h>
|
||||
#include <asm/pci-bridge.h>
|
||||
#include <asm/macio.h>
|
||||
|
||||
#include <scsi/scsi.h>
|
||||
|
|
|
@ -29,6 +29,7 @@
|
|||
#include <linux/interrupt.h>
|
||||
#include <linux/reboot.h>
|
||||
#include <linux/spinlock.h>
|
||||
#include <linux/pci.h>
|
||||
#include <asm/dbdma.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/pgtable.h>
|
||||
|
@ -38,7 +39,6 @@
|
|||
#include <asm/processor.h>
|
||||
#include <asm/machdep.h>
|
||||
#include <asm/pmac_feature.h>
|
||||
#include <asm/pci-bridge.h>
|
||||
#include <asm/macio.h>
|
||||
|
||||
#include <scsi/scsi.h>
|
||||
|
|
|
@ -28,7 +28,6 @@
|
|||
#ifdef CONFIG_PPC_PMAC
|
||||
#include <asm/machdep.h>
|
||||
#include <asm/pmac_feature.h>
|
||||
#include <asm/pci-bridge.h>
|
||||
#include <asm/prom.h>
|
||||
#endif
|
||||
|
||||
|
|
|
@ -68,7 +68,6 @@
|
|||
#include <asm/machdep.h>
|
||||
#include <asm/pmac_feature.h>
|
||||
#include <asm/prom.h>
|
||||
#include <asm/pci-bridge.h>
|
||||
#include "../macmodes.h"
|
||||
#endif
|
||||
|
||||
|
|
|
@ -76,7 +76,6 @@
|
|||
|
||||
#ifdef CONFIG_PPC
|
||||
|
||||
#include <asm/pci-bridge.h>
|
||||
#include "../macmodes.h"
|
||||
|
||||
#ifdef CONFIG_BOOTX_TEXT
|
||||
|
|
|
@ -33,7 +33,6 @@
|
|||
#if defined(CONFIG_PPC)
|
||||
#include <linux/nvram.h>
|
||||
#include <asm/prom.h>
|
||||
#include <asm/pci-bridge.h>
|
||||
#include "macmodes.h"
|
||||
#endif
|
||||
|
||||
|
|
|
@ -47,7 +47,6 @@
|
|||
|
||||
#if defined(CONFIG_PPC_PMAC)
|
||||
#include <asm/prom.h>
|
||||
#include <asm/pci-bridge.h>
|
||||
#include "../macmodes.h"
|
||||
#endif
|
||||
|
||||
|
|
|
@ -28,10 +28,6 @@
|
|||
#include <linux/pci.h>
|
||||
#include <asm/io.h>
|
||||
|
||||
#ifdef CONFIG_PPC64
|
||||
#include <asm/pci-bridge.h>
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_PPC32
|
||||
#include <asm/bootx.h>
|
||||
#endif
|
||||
|
|
|
@ -1,74 +0,0 @@
|
|||
/*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version
|
||||
* 2 of the License, or (at your option) any later version.
|
||||
*/
|
||||
#ifndef _ASM_GENERIC_PCI_BRIDGE_H
|
||||
#define _ASM_GENERIC_PCI_BRIDGE_H
|
||||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
enum {
|
||||
/* Force re-assigning all resources (ignore firmware
|
||||
* setup completely)
|
||||
*/
|
||||
PCI_REASSIGN_ALL_RSRC = 0x00000001,
|
||||
|
||||
/* Re-assign all bus numbers */
|
||||
PCI_REASSIGN_ALL_BUS = 0x00000002,
|
||||
|
||||
/* Do not try to assign, just use existing setup */
|
||||
PCI_PROBE_ONLY = 0x00000004,
|
||||
|
||||
/* Don't bother with ISA alignment unless the bridge has
|
||||
* ISA forwarding enabled
|
||||
*/
|
||||
PCI_CAN_SKIP_ISA_ALIGN = 0x00000008,
|
||||
|
||||
/* Enable domain numbers in /proc */
|
||||
PCI_ENABLE_PROC_DOMAINS = 0x00000010,
|
||||
/* ... except for domain 0 */
|
||||
PCI_COMPAT_DOMAIN_0 = 0x00000020,
|
||||
|
||||
/* PCIe downstream ports are bridges that normally lead to only a
|
||||
* device 0, but if this is set, we scan all possible devices, not
|
||||
* just device 0.
|
||||
*/
|
||||
PCI_SCAN_ALL_PCIE_DEVS = 0x00000040,
|
||||
};
|
||||
|
||||
#ifdef CONFIG_PCI
|
||||
extern unsigned int pci_flags;
|
||||
|
||||
static inline void pci_set_flags(int flags)
|
||||
{
|
||||
pci_flags = flags;
|
||||
}
|
||||
|
||||
static inline void pci_add_flags(int flags)
|
||||
{
|
||||
pci_flags |= flags;
|
||||
}
|
||||
|
||||
static inline void pci_clear_flags(int flags)
|
||||
{
|
||||
pci_flags &= ~flags;
|
||||
}
|
||||
|
||||
static inline int pci_has_flag(int flag)
|
||||
{
|
||||
return pci_flags & flag;
|
||||
}
|
||||
#else
|
||||
static inline void pci_set_flags(int flags) { }
|
||||
static inline void pci_add_flags(int flags) { }
|
||||
static inline void pci_clear_flags(int flags) { }
|
||||
static inline int pci_has_flag(int flag)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
#endif /* CONFIG_PCI */
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
#endif /* _ASM_GENERIC_PCI_BRIDGE_H */
|
|
@ -746,9 +746,26 @@ struct pci_driver {
|
|||
.vendor = PCI_VENDOR_ID_##vend, .device = (dev), \
|
||||
.subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID, 0, 0
|
||||
|
||||
enum {
|
||||
PCI_REASSIGN_ALL_RSRC = 0x00000001, /* ignore firmware setup */
|
||||
PCI_REASSIGN_ALL_BUS = 0x00000002, /* reassign all bus numbers */
|
||||
PCI_PROBE_ONLY = 0x00000004, /* use existing setup */
|
||||
PCI_CAN_SKIP_ISA_ALIGN = 0x00000008, /* don't do ISA alignment */
|
||||
PCI_ENABLE_PROC_DOMAINS = 0x00000010, /* enable domains in /proc */
|
||||
PCI_COMPAT_DOMAIN_0 = 0x00000020, /* ... except domain 0 */
|
||||
PCI_SCAN_ALL_PCIE_DEVS = 0x00000040, /* scan all, not just dev 0 */
|
||||
};
|
||||
|
||||
/* these external functions are only available when PCI support is enabled */
|
||||
#ifdef CONFIG_PCI
|
||||
|
||||
extern unsigned int pci_flags;
|
||||
|
||||
static inline void pci_set_flags(int flags) { pci_flags = flags; }
|
||||
static inline void pci_add_flags(int flags) { pci_flags |= flags; }
|
||||
static inline void pci_clear_flags(int flags) { pci_flags &= ~flags; }
|
||||
static inline int pci_has_flag(int flag) { return pci_flags & flag; }
|
||||
|
||||
void pcie_bus_configure_settings(struct pci_bus *bus);
|
||||
|
||||
enum pcie_bus_config_types {
|
||||
|
@ -1405,6 +1422,11 @@ void pci_register_set_vga_state(arch_set_vga_state_t func);
|
|||
|
||||
#else /* CONFIG_PCI is not enabled */
|
||||
|
||||
static inline void pci_set_flags(int flags) { }
|
||||
static inline void pci_add_flags(int flags) { }
|
||||
static inline void pci_clear_flags(int flags) { }
|
||||
static inline int pci_has_flag(int flag) { return 0; }
|
||||
|
||||
/*
|
||||
* If the system does not have PCI, clearly these return errors. Define
|
||||
* these as simple inline functions to avoid hair in drivers.
|
||||
|
|
|
@ -34,7 +34,6 @@
|
|||
#include "pmac.h"
|
||||
#include <sound/pcm_params.h>
|
||||
#include <asm/pmac_feature.h>
|
||||
#include <asm/pci-bridge.h>
|
||||
|
||||
|
||||
/* fixed frequency table for awacs, screamer, burgundy, DACA (44100 max) */
|
||||
|
|
Loading…
Reference in a new issue