powerpc: rename ppc_pci_*_flags to pci_*_flags
This renames pci flags functions and enums in preparation for creating generic version in asm-generic/pci-bridge.h. The following search and replace is done: s/ppc_pci_/pci_/ s/PPC_PCI_/PCI_/ Direct accesses to ppc_pci_flag variable are replaced with helper functions. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org>wifi-calibration
parent
fe0d42203c
commit
0e47ff1ce6
|
@ -17,45 +17,45 @@ enum {
|
||||||
/* Force re-assigning all resources (ignore firmware
|
/* Force re-assigning all resources (ignore firmware
|
||||||
* setup completely)
|
* setup completely)
|
||||||
*/
|
*/
|
||||||
PPC_PCI_REASSIGN_ALL_RSRC = 0x00000001,
|
PCI_REASSIGN_ALL_RSRC = 0x00000001,
|
||||||
|
|
||||||
/* Re-assign all bus numbers */
|
/* Re-assign all bus numbers */
|
||||||
PPC_PCI_REASSIGN_ALL_BUS = 0x00000002,
|
PCI_REASSIGN_ALL_BUS = 0x00000002,
|
||||||
|
|
||||||
/* Do not try to assign, just use existing setup */
|
/* Do not try to assign, just use existing setup */
|
||||||
PPC_PCI_PROBE_ONLY = 0x00000004,
|
PCI_PROBE_ONLY = 0x00000004,
|
||||||
|
|
||||||
/* Don't bother with ISA alignment unless the bridge has
|
/* Don't bother with ISA alignment unless the bridge has
|
||||||
* ISA forwarding enabled
|
* ISA forwarding enabled
|
||||||
*/
|
*/
|
||||||
PPC_PCI_CAN_SKIP_ISA_ALIGN = 0x00000008,
|
PCI_CAN_SKIP_ISA_ALIGN = 0x00000008,
|
||||||
|
|
||||||
/* Enable domain numbers in /proc */
|
/* Enable domain numbers in /proc */
|
||||||
PPC_PCI_ENABLE_PROC_DOMAINS = 0x00000010,
|
PCI_ENABLE_PROC_DOMAINS = 0x00000010,
|
||||||
/* ... except for domain 0 */
|
/* ... except for domain 0 */
|
||||||
PPC_PCI_COMPAT_DOMAIN_0 = 0x00000020,
|
PCI_COMPAT_DOMAIN_0 = 0x00000020,
|
||||||
};
|
};
|
||||||
#ifdef CONFIG_PCI
|
#ifdef CONFIG_PCI
|
||||||
extern unsigned int ppc_pci_flags;
|
extern unsigned int pci_flags;
|
||||||
|
|
||||||
static inline void ppc_pci_set_flags(int flags)
|
static inline void pci_set_flags(int flags)
|
||||||
{
|
{
|
||||||
ppc_pci_flags = flags;
|
pci_flags = flags;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void ppc_pci_add_flags(int flags)
|
static inline void pci_add_flags(int flags)
|
||||||
{
|
{
|
||||||
ppc_pci_flags |= flags;
|
pci_flags |= flags;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int ppc_pci_has_flag(int flag)
|
static inline int pci_has_flag(int flag)
|
||||||
{
|
{
|
||||||
return (ppc_pci_flags & flag);
|
return (pci_flags & flag);
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
static inline void ppc_pci_set_flags(int flags) { }
|
static inline void pci_set_flags(int flags) { }
|
||||||
static inline void ppc_pci_add_flags(int flags) { }
|
static inline void pci_add_flags(int flags) { }
|
||||||
static inline int ppc_pci_has_flag(int flag)
|
static inline int pci_has_flag(int flag)
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -44,7 +44,7 @@ struct pci_dev;
|
||||||
* bus numbers (don't do that on ppc64 yet !)
|
* bus numbers (don't do that on ppc64 yet !)
|
||||||
*/
|
*/
|
||||||
#define pcibios_assign_all_busses() \
|
#define pcibios_assign_all_busses() \
|
||||||
(ppc_pci_has_flag(PPC_PCI_REASSIGN_ALL_BUS))
|
(pci_has_flag(PCI_REASSIGN_ALL_BUS))
|
||||||
|
|
||||||
static inline void pcibios_set_master(struct pci_dev *dev)
|
static inline void pcibios_set_master(struct pci_dev *dev)
|
||||||
{
|
{
|
||||||
|
|
|
@ -50,7 +50,7 @@ static int global_phb_number; /* Global phb counter */
|
||||||
resource_size_t isa_mem_base;
|
resource_size_t isa_mem_base;
|
||||||
|
|
||||||
/* Default PCI flags is 0 on ppc32, modified at boot on ppc64 */
|
/* Default PCI flags is 0 on ppc32, modified at boot on ppc64 */
|
||||||
unsigned int ppc_pci_flags = 0;
|
unsigned int pci_flags = 0;
|
||||||
|
|
||||||
|
|
||||||
static struct dma_map_ops *pci_dma_ops = &dma_direct_ops;
|
static struct dma_map_ops *pci_dma_ops = &dma_direct_ops;
|
||||||
|
@ -842,9 +842,9 @@ int pci_proc_domain(struct pci_bus *bus)
|
||||||
{
|
{
|
||||||
struct pci_controller *hose = pci_bus_to_host(bus);
|
struct pci_controller *hose = pci_bus_to_host(bus);
|
||||||
|
|
||||||
if (!(ppc_pci_flags & PPC_PCI_ENABLE_PROC_DOMAINS))
|
if (!pci_has_flag(PCI_ENABLE_PROC_DOMAINS))
|
||||||
return 0;
|
return 0;
|
||||||
if (ppc_pci_flags & PPC_PCI_COMPAT_DOMAIN_0)
|
if (pci_has_flag(PCI_COMPAT_DOMAIN_0))
|
||||||
return hose->global_number != 0;
|
return hose->global_number != 0;
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
@ -920,13 +920,13 @@ static void __devinit pcibios_fixup_resources(struct pci_dev *dev)
|
||||||
struct resource *res = dev->resource + i;
|
struct resource *res = dev->resource + i;
|
||||||
if (!res->flags)
|
if (!res->flags)
|
||||||
continue;
|
continue;
|
||||||
/* On platforms that have PPC_PCI_PROBE_ONLY set, we don't
|
/* On platforms that have PCI_PROBE_ONLY set, we don't
|
||||||
* consider 0 as an unassigned BAR value. It's technically
|
* consider 0 as an unassigned BAR value. It's technically
|
||||||
* a valid value, but linux doesn't like it... so when we can
|
* a valid value, but linux doesn't like it... so when we can
|
||||||
* re-assign things, we do so, but if we can't, we keep it
|
* re-assign things, we do so, but if we can't, we keep it
|
||||||
* around and hope for the best...
|
* around and hope for the best...
|
||||||
*/
|
*/
|
||||||
if (res->start == 0 && !(ppc_pci_flags & PPC_PCI_PROBE_ONLY)) {
|
if (res->start == 0 && !pci_has_flag(PCI_PROBE_ONLY)) {
|
||||||
pr_debug("PCI:%s Resource %d %016llx-%016llx [%x] is unassigned\n",
|
pr_debug("PCI:%s Resource %d %016llx-%016llx [%x] is unassigned\n",
|
||||||
pci_name(dev), i,
|
pci_name(dev), i,
|
||||||
(unsigned long long)res->start,
|
(unsigned long long)res->start,
|
||||||
|
@ -973,7 +973,7 @@ static int __devinit pcibios_uninitialized_bridge_resource(struct pci_bus *bus,
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
/* We don't do anything if PCI_PROBE_ONLY is set */
|
/* We don't do anything if PCI_PROBE_ONLY is set */
|
||||||
if (ppc_pci_flags & PPC_PCI_PROBE_ONLY)
|
if (pci_has_flag(PCI_PROBE_ONLY))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
/* Job is a bit different between memory and IO */
|
/* Job is a bit different between memory and IO */
|
||||||
|
@ -1146,7 +1146,7 @@ void __devinit pci_fixup_cardbus(struct pci_bus *bus)
|
||||||
|
|
||||||
static int skip_isa_ioresource_align(struct pci_dev *dev)
|
static int skip_isa_ioresource_align(struct pci_dev *dev)
|
||||||
{
|
{
|
||||||
if ((ppc_pci_flags & PPC_PCI_CAN_SKIP_ISA_ALIGN) &&
|
if (pci_has_flag(PCI_CAN_SKIP_ISA_ALIGN) &&
|
||||||
!(dev->bus->bridge_ctl & PCI_BRIDGE_CTL_ISA))
|
!(dev->bus->bridge_ctl & PCI_BRIDGE_CTL_ISA))
|
||||||
return 1;
|
return 1;
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -1274,7 +1274,7 @@ void pcibios_allocate_bus_resources(struct pci_bus *bus)
|
||||||
* and as such ensure proper re-allocation
|
* and as such ensure proper re-allocation
|
||||||
* later.
|
* later.
|
||||||
*/
|
*/
|
||||||
if (ppc_pci_flags & PPC_PCI_REASSIGN_ALL_RSRC)
|
if (pci_has_flag(PCI_REASSIGN_ALL_RSRC))
|
||||||
goto clear_resource;
|
goto clear_resource;
|
||||||
pr = pci_find_parent_resource(bus->self, res);
|
pr = pci_find_parent_resource(bus->self, res);
|
||||||
if (pr == res) {
|
if (pr == res) {
|
||||||
|
@ -1459,7 +1459,7 @@ void __init pcibios_resource_survey(void)
|
||||||
list_for_each_entry(b, &pci_root_buses, node)
|
list_for_each_entry(b, &pci_root_buses, node)
|
||||||
pcibios_allocate_bus_resources(b);
|
pcibios_allocate_bus_resources(b);
|
||||||
|
|
||||||
if (!(ppc_pci_flags & PPC_PCI_REASSIGN_ALL_RSRC)) {
|
if (!pci_has_flag(PCI_REASSIGN_ALL_RSRC)) {
|
||||||
pcibios_allocate_resources(0);
|
pcibios_allocate_resources(0);
|
||||||
pcibios_allocate_resources(1);
|
pcibios_allocate_resources(1);
|
||||||
}
|
}
|
||||||
|
@ -1468,7 +1468,7 @@ void __init pcibios_resource_survey(void)
|
||||||
* the low IO area and the VGA memory area if they intersect the
|
* the low IO area and the VGA memory area if they intersect the
|
||||||
* bus available resources to avoid allocating things on top of them
|
* bus available resources to avoid allocating things on top of them
|
||||||
*/
|
*/
|
||||||
if (!(ppc_pci_flags & PPC_PCI_PROBE_ONLY)) {
|
if (!pci_has_flag(PCI_PROBE_ONLY)) {
|
||||||
list_for_each_entry(b, &pci_root_buses, node)
|
list_for_each_entry(b, &pci_root_buses, node)
|
||||||
pcibios_reserve_legacy_regions(b);
|
pcibios_reserve_legacy_regions(b);
|
||||||
}
|
}
|
||||||
|
@ -1476,7 +1476,7 @@ void __init pcibios_resource_survey(void)
|
||||||
/* Now, if the platform didn't decide to blindly trust the firmware,
|
/* Now, if the platform didn't decide to blindly trust the firmware,
|
||||||
* we proceed to assigning things that were left unassigned
|
* we proceed to assigning things that were left unassigned
|
||||||
*/
|
*/
|
||||||
if (!(ppc_pci_flags & PPC_PCI_PROBE_ONLY)) {
|
if (!pci_has_flag(PCI_PROBE_ONLY)) {
|
||||||
pr_debug("PCI: Assigning unassigned resources...\n");
|
pr_debug("PCI: Assigning unassigned resources...\n");
|
||||||
pci_assign_unassigned_resources();
|
pci_assign_unassigned_resources();
|
||||||
}
|
}
|
||||||
|
|
|
@ -373,7 +373,7 @@ static int __init pcibios_init(void)
|
||||||
|
|
||||||
printk(KERN_INFO "PCI: Probing PCI hardware\n");
|
printk(KERN_INFO "PCI: Probing PCI hardware\n");
|
||||||
|
|
||||||
if (ppc_pci_flags & PPC_PCI_REASSIGN_ALL_BUS)
|
if (pci_has_flag(PCI_REASSIGN_ALL_BUS))
|
||||||
pci_assign_all_buses = 1;
|
pci_assign_all_buses = 1;
|
||||||
|
|
||||||
/* Scan all of the recorded PCI controllers. */
|
/* Scan all of the recorded PCI controllers. */
|
||||||
|
|
|
@ -55,12 +55,12 @@ static int __init pcibios_init(void)
|
||||||
ppc_md.phys_mem_access_prot = pci_phys_mem_access_prot;
|
ppc_md.phys_mem_access_prot = pci_phys_mem_access_prot;
|
||||||
|
|
||||||
if (pci_probe_only)
|
if (pci_probe_only)
|
||||||
ppc_pci_flags |= PPC_PCI_PROBE_ONLY;
|
pci_add_flags(PCI_PROBE_ONLY);
|
||||||
|
|
||||||
/* On ppc64, we always enable PCI domains and we keep domain 0
|
/* On ppc64, we always enable PCI domains and we keep domain 0
|
||||||
* backward compatible in /proc for video cards
|
* backward compatible in /proc for video cards
|
||||||
*/
|
*/
|
||||||
ppc_pci_flags |= PPC_PCI_ENABLE_PROC_DOMAINS | PPC_PCI_COMPAT_DOMAIN_0;
|
pci_add_flags(PCI_ENABLE_PROC_DOMAINS | PCI_COMPAT_DOMAIN_0);
|
||||||
|
|
||||||
/* Scan all of the recorded PCI controllers. */
|
/* Scan all of the recorded PCI controllers. */
|
||||||
list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
|
list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
|
||||||
|
|
|
@ -291,7 +291,7 @@ void __init find_and_init_phbs(void)
|
||||||
prop = of_get_property(of_chosen,
|
prop = of_get_property(of_chosen,
|
||||||
"linux,pci-assign-all-buses", NULL);
|
"linux,pci-assign-all-buses", NULL);
|
||||||
if (prop && *prop)
|
if (prop && *prop)
|
||||||
ppc_pci_flags |= PPC_PCI_REASSIGN_ALL_BUS;
|
pci_add_flags(PCI_REASSIGN_ALL_BUS);
|
||||||
#endif /* CONFIG_PPC32 */
|
#endif /* CONFIG_PPC32 */
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -100,7 +100,7 @@ static void __init ep405_setup_arch(void)
|
||||||
/* Find & init the BCSR CPLD */
|
/* Find & init the BCSR CPLD */
|
||||||
ep405_init_bcsr();
|
ep405_init_bcsr();
|
||||||
|
|
||||||
ppc_pci_set_flags(PPC_PCI_REASSIGN_ALL_RSRC);
|
pci_set_flags(PCI_REASSIGN_ALL_RSRC);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __init ep405_probe(void)
|
static int __init ep405_probe(void)
|
||||||
|
|
|
@ -61,7 +61,7 @@ static const char *board[] __initdata = {
|
||||||
static int __init ppc40x_probe(void)
|
static int __init ppc40x_probe(void)
|
||||||
{
|
{
|
||||||
if (of_flat_dt_match(of_get_flat_dt_root(), board)) {
|
if (of_flat_dt_match(of_get_flat_dt_root(), board)) {
|
||||||
ppc_pci_set_flags(PPC_PCI_REASSIGN_ALL_RSRC);
|
pci_set_flags(PCI_REASSIGN_ALL_RSRC);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -51,7 +51,7 @@ static int __init walnut_probe(void)
|
||||||
if (!of_flat_dt_is_compatible(root, "ibm,walnut"))
|
if (!of_flat_dt_is_compatible(root, "ibm,walnut"))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC;
|
pci_set_flags(PCI_REASSIGN_ALL_RSRC);
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -55,7 +55,7 @@ static int __init ppc460ex_probe(void)
|
||||||
{
|
{
|
||||||
unsigned long root = of_get_flat_dt_root();
|
unsigned long root = of_get_flat_dt_root();
|
||||||
if (of_flat_dt_is_compatible(root, "amcc,canyonlands")) {
|
if (of_flat_dt_is_compatible(root, "amcc,canyonlands")) {
|
||||||
ppc_pci_set_flags(PPC_PCI_REASSIGN_ALL_RSRC);
|
pci_set_flags(PCI_REASSIGN_ALL_RSRC);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -54,7 +54,7 @@ static int __init ebony_probe(void)
|
||||||
if (!of_flat_dt_is_compatible(root, "ibm,ebony"))
|
if (!of_flat_dt_is_compatible(root, "ibm,ebony"))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
ppc_pci_set_flags(PPC_PCI_REASSIGN_ALL_RSRC);
|
pci_set_flags(PCI_REASSIGN_ALL_RSRC);
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -72,7 +72,7 @@ static int __init ppc44x_probe(void)
|
||||||
|
|
||||||
for (i = 0; i < ARRAY_SIZE(board); i++) {
|
for (i = 0; i < ARRAY_SIZE(board); i++) {
|
||||||
if (of_flat_dt_is_compatible(root, board[i])) {
|
if (of_flat_dt_is_compatible(root, board[i])) {
|
||||||
ppc_pci_set_flags(PPC_PCI_REASSIGN_ALL_RSRC);
|
pci_set_flags(PCI_REASSIGN_ALL_RSRC);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -51,7 +51,7 @@ static int __init sam440ep_probe(void)
|
||||||
if (!of_flat_dt_is_compatible(root, "acube,sam440ep"))
|
if (!of_flat_dt_is_compatible(root, "acube,sam440ep"))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
ppc_pci_set_flags(PPC_PCI_REASSIGN_ALL_RSRC);
|
pci_set_flags(PCI_REASSIGN_ALL_RSRC);
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -371,7 +371,7 @@ mpc52xx_add_bridge(struct device_node *node)
|
||||||
|
|
||||||
pr_debug("Adding MPC52xx PCI host bridge %s\n", node->full_name);
|
pr_debug("Adding MPC52xx PCI host bridge %s\n", node->full_name);
|
||||||
|
|
||||||
ppc_pci_add_flags(PPC_PCI_REASSIGN_ALL_BUS);
|
pci_add_flags(PCI_REASSIGN_ALL_BUS);
|
||||||
|
|
||||||
if (of_address_to_resource(node, 0, &rsrc) != 0) {
|
if (of_address_to_resource(node, 0, &rsrc) != 0) {
|
||||||
printk(KERN_ERR "Can't get %s resources\n", node->full_name);
|
printk(KERN_ERR "Can't get %s resources\n", node->full_name);
|
||||||
|
|
|
@ -53,7 +53,7 @@ static void __init pq2_pci_add_bridge(struct device_node *np)
|
||||||
if (of_address_to_resource(np, 0, &r) || r.end - r.start < 0x10b)
|
if (of_address_to_resource(np, 0, &r) || r.end - r.start < 0x10b)
|
||||||
goto err;
|
goto err;
|
||||||
|
|
||||||
ppc_pci_add_flags(PPC_PCI_REASSIGN_ALL_BUS);
|
pci_add_flags(PCI_REASSIGN_ALL_BUS);
|
||||||
|
|
||||||
hose = pcibios_alloc_controller(np);
|
hose = pcibios_alloc_controller(np);
|
||||||
if (!hose)
|
if (!hose)
|
||||||
|
|
|
@ -199,7 +199,7 @@ static void __init setup_peg2(struct pci_controller *hose, struct device_node *d
|
||||||
printk ("RTAS supporting Pegasos OF not found, please upgrade"
|
printk ("RTAS supporting Pegasos OF not found, please upgrade"
|
||||||
" your firmware\n");
|
" your firmware\n");
|
||||||
}
|
}
|
||||||
ppc_pci_add_flags(PPC_PCI_REASSIGN_ALL_BUS);
|
pci_add_flags(PCI_REASSIGN_ALL_BUS);
|
||||||
/* keep the reference to the root node */
|
/* keep the reference to the root node */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -731,7 +731,7 @@ static void __init setup_bandit(struct pci_controller *hose,
|
||||||
static int __init setup_uninorth(struct pci_controller *hose,
|
static int __init setup_uninorth(struct pci_controller *hose,
|
||||||
struct resource *addr)
|
struct resource *addr)
|
||||||
{
|
{
|
||||||
ppc_pci_add_flags(PPC_PCI_REASSIGN_ALL_BUS);
|
pci_add_flags(PCI_REASSIGN_ALL_BUS);
|
||||||
has_uninorth = 1;
|
has_uninorth = 1;
|
||||||
hose->ops = ¯isc_pci_ops;
|
hose->ops = ¯isc_pci_ops;
|
||||||
hose->cfg_addr = ioremap(addr->start + 0x800000, 0x1000);
|
hose->cfg_addr = ioremap(addr->start + 0x800000, 0x1000);
|
||||||
|
@ -998,7 +998,7 @@ void __init pmac_pci_init(void)
|
||||||
struct device_node *np, *root;
|
struct device_node *np, *root;
|
||||||
struct device_node *ht = NULL;
|
struct device_node *ht = NULL;
|
||||||
|
|
||||||
ppc_pci_set_flags(PPC_PCI_CAN_SKIP_ISA_ALIGN);
|
pci_set_flags(PCI_CAN_SKIP_ISA_ALIGN);
|
||||||
|
|
||||||
root = of_find_node_by_path("/");
|
root = of_find_node_by_path("/");
|
||||||
if (root == NULL) {
|
if (root == NULL) {
|
||||||
|
@ -1057,7 +1057,7 @@ void __init pmac_pci_init(void)
|
||||||
* some offset between bus number and domains for now when we
|
* some offset between bus number and domains for now when we
|
||||||
* assign all busses should help for now
|
* assign all busses should help for now
|
||||||
*/
|
*/
|
||||||
if (ppc_pci_has_flag(PPC_PCI_REASSIGN_ALL_BUS))
|
if (pci_has_flag(PCI_REASSIGN_ALL_BUS))
|
||||||
pcibios_assign_bus_offset = 0x10;
|
pcibios_assign_bus_offset = 0x10;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -343,7 +343,7 @@ int __init fsl_add_bridge(struct device_node *dev, int is_primary)
|
||||||
printk(KERN_WARNING "Can't get bus-range for %s, assume"
|
printk(KERN_WARNING "Can't get bus-range for %s, assume"
|
||||||
" bus 0\n", dev->full_name);
|
" bus 0\n", dev->full_name);
|
||||||
|
|
||||||
ppc_pci_add_flags(PPC_PCI_REASSIGN_ALL_BUS);
|
pci_add_flags(PCI_REASSIGN_ALL_BUS);
|
||||||
hose = pcibios_alloc_controller(dev);
|
hose = pcibios_alloc_controller(dev);
|
||||||
if (!hose)
|
if (!hose)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
@ -679,7 +679,7 @@ int __init mpc83xx_add_bridge(struct device_node *dev)
|
||||||
" bus 0\n", dev->full_name);
|
" bus 0\n", dev->full_name);
|
||||||
}
|
}
|
||||||
|
|
||||||
ppc_pci_add_flags(PPC_PCI_REASSIGN_ALL_BUS);
|
pci_add_flags(PCI_REASSIGN_ALL_BUS);
|
||||||
hose = pcibios_alloc_controller(dev);
|
hose = pcibios_alloc_controller(dev);
|
||||||
if (!hose)
|
if (!hose)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
|
@ -57,7 +57,7 @@ void __init setup_grackle(struct pci_controller *hose)
|
||||||
{
|
{
|
||||||
setup_indirect_pci(hose, 0xfec00000, 0xfee00000, 0);
|
setup_indirect_pci(hose, 0xfec00000, 0xfee00000, 0);
|
||||||
if (of_machine_is_compatible("PowerMac1,1"))
|
if (of_machine_is_compatible("PowerMac1,1"))
|
||||||
ppc_pci_add_flags(PPC_PCI_REASSIGN_ALL_BUS);
|
pci_add_flags(PCI_REASSIGN_ALL_BUS);
|
||||||
if (of_machine_is_compatible("AAPL,PowerBook1998"))
|
if (of_machine_is_compatible("AAPL,PowerBook1998"))
|
||||||
grackle_set_loop_snoop(hose, 1);
|
grackle_set_loop_snoop(hose, 1);
|
||||||
#if 0 /* Disabled for now, HW problems ??? */
|
#if 0 /* Disabled for now, HW problems ??? */
|
||||||
|
|
|
@ -1960,7 +1960,7 @@ static int __init ppc4xx_pci_find_bridges(void)
|
||||||
{
|
{
|
||||||
struct device_node *np;
|
struct device_node *np;
|
||||||
|
|
||||||
ppc_pci_flags |= PPC_PCI_ENABLE_PROC_DOMAINS | PPC_PCI_COMPAT_DOMAIN_0;
|
pci_add_flags(PCI_ENABLE_PROC_DOMAINS | PCI_COMPAT_DOMAIN_0);
|
||||||
|
|
||||||
#ifdef CONFIG_PPC4xx_PCI_EXPRESS
|
#ifdef CONFIG_PPC4xx_PCI_EXPRESS
|
||||||
for_each_compatible_node(np, NULL, "ibm,plb-pciex")
|
for_each_compatible_node(np, NULL, "ibm,plb-pciex")
|
||||||
|
|
Loading…
Reference in New Issue