Commit c5a3c2e5 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Paul Mackerras
Browse files

[PATCH] ppc64: Split out generic rtas code from pSeries_pci.c. 



BPA is using rtas for PCI but should not be confused by
pSeries code. This also avoids some #ifdefs. Other
platforms that want to use rtas_pci.c could create
their own platform_pci.c with platform specific fixups.

Signed-off-by: default avatarArnd Bergmann <arndb@de.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 773bf9c4

arch/ppc64/kernel/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -31,13 +31,14 @@ obj-$(CONFIG_PPC_MULTIPLATFORM) += nvram.o i8259.o prom_init.o prom.o mpic.o 


obj-$(CONFIG_PPC_PSERIES) += pSeries_pci.o pSeries_lpar.o pSeries_hvCall.o \

			     pSeries_nvram.o rtasd.o ras.o pSeries_reconfig.o \

			     xics.o rtas.o pSeries_setup.o pSeries_iommu.o

			     xics.o pSeries_setup.o pSeries_iommu.o



obj-$(CONFIG_EEH)		+= eeh.o

obj-$(CONFIG_PROC_FS)		+= proc_ppc64.o

obj-$(CONFIG_RTAS_FLASH)	+= rtas_flash.o

obj-$(CONFIG_SMP)		+= smp.o

obj-$(CONFIG_MODULES)		+= module.o ppc_ksyms.o

obj-$(CONFIG_PPC_RTAS)		+= rtas.o rtas_pci.o

obj-$(CONFIG_RTAS_PROC)		+= rtas-proc.o

obj-$(CONFIG_SCANLOG)		+= scanlog.o

obj-$(CONFIG_VIOPATH)		+= viopath.o

arch/ppc64/kernel/mpic.h

+3 −0
Original line number Diff line number Diff line
@@ -265,3 +265,6 @@ extern void mpic_send_ipi(unsigned int ipi_no, unsigned int cpu_mask); 
extern int mpic_get_one_irq(struct mpic *mpic, struct pt_regs *regs);

/* This one gets to the primary mpic */

extern int mpic_get_irq(struct pt_regs *regs);



/* global mpic for pSeries */

extern struct mpic *pSeries_mpic;

arch/ppc64/kernel/pSeries_pci.c

+6 −470
Original line number Diff line number Diff line 
/*

 * pSeries_pci.c

 * arch/ppc64/kernel/pSeries_pci.c

 *

 * Copyright (C) 2001 Dave Engebretsen, IBM Corporation

 * Copyright (C) 2003 Anton Blanchard <anton@au.ibm.com>, IBM

 *

 * pSeries specific routines for PCI.

 * 

 * Based on code from pci.c and chrp_pci.c

 *

 * 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
@@ -23,430 +21,18 @@ 
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA

 */



#include <linux/init.h>

#include <linux/ioport.h>

#include <linux/kernel.h>

#include <linux/threads.h>

#include <linux/pci.h>

#include <linux/string.h>

#include <linux/init.h>

#include <linux/bootmem.h>



#include <asm/io.h>

#include <asm/pgtable.h>

#include <asm/irq.h>

#include <asm/prom.h>

#include <asm/machdep.h>

#include <asm/pci-bridge.h>

#include <asm/iommu.h>

#include <asm/rtas.h>

#include <asm/prom.h>



#include "mpic.h"

#include "pci.h"



/* RTAS tokens */

static int read_pci_config;

static int write_pci_config;

static int ibm_read_pci_config;

static int ibm_write_pci_config;



static int s7a_workaround;



extern struct mpic *pSeries_mpic;



static int config_access_valid(struct device_node *dn, int where)

{

	if (where < 256)

		return 1;

	if (where < 4096 && dn->pci_ext_config_space)

		return 1;



	return 0;

}



static int rtas_read_config(struct device_node *dn, int where, int size, u32 *val)

{

	int returnval = -1;

	unsigned long buid, addr;

	int ret;



	if (!dn)

		return PCIBIOS_DEVICE_NOT_FOUND;

	if (!config_access_valid(dn, where))

		return PCIBIOS_BAD_REGISTER_NUMBER;



	addr = ((where & 0xf00) << 20) | (dn->busno << 16) |

		(dn->devfn << 8) | (where & 0xff);

	buid = dn->phb->buid;

	if (buid) {

		ret = rtas_call(ibm_read_pci_config, 4, 2, &returnval,

				addr, buid >> 32, buid & 0xffffffff, size);

	} else {

		ret = rtas_call(read_pci_config, 2, 2, &returnval, addr, size);

	}

	*val = returnval;



	if (ret)

		return PCIBIOS_DEVICE_NOT_FOUND;



	if (returnval == EEH_IO_ERROR_VALUE(size)

	    && eeh_dn_check_failure (dn, NULL))

		return PCIBIOS_DEVICE_NOT_FOUND;



	return PCIBIOS_SUCCESSFUL;

}



static int rtas_pci_read_config(struct pci_bus *bus,

				unsigned int devfn,

				int where, int size, u32 *val)

{

	struct device_node *busdn, *dn;



	if (bus->self)

		busdn = pci_device_to_OF_node(bus->self);

	else

		busdn = bus->sysdata;	/* must be a phb */



	/* Search only direct children of the bus */

	for (dn = busdn->child; dn; dn = dn->sibling)

		if (dn->devfn == devfn)

			return rtas_read_config(dn, where, size, val);

	return PCIBIOS_DEVICE_NOT_FOUND;

}



static int rtas_write_config(struct device_node *dn, int where, int size, u32 val)

{

	unsigned long buid, addr;

	int ret;



	if (!dn)

		return PCIBIOS_DEVICE_NOT_FOUND;

	if (!config_access_valid(dn, where))

		return PCIBIOS_BAD_REGISTER_NUMBER;



	addr = ((where & 0xf00) << 20) | (dn->busno << 16) |

		(dn->devfn << 8) | (where & 0xff);

	buid = dn->phb->buid;

	if (buid) {

		ret = rtas_call(ibm_write_pci_config, 5, 1, NULL, addr, buid >> 32, buid & 0xffffffff, size, (ulong) val);

	} else {

		ret = rtas_call(write_pci_config, 3, 1, NULL, addr, size, (ulong)val);

	}



	if (ret)

		return PCIBIOS_DEVICE_NOT_FOUND;



	return PCIBIOS_SUCCESSFUL;

}



static int rtas_pci_write_config(struct pci_bus *bus,

				 unsigned int devfn,

				 int where, int size, u32 val)

{

	struct device_node *busdn, *dn;



	if (bus->self)

		busdn = pci_device_to_OF_node(bus->self);

	else

		busdn = bus->sysdata;	/* must be a phb */



	/* Search only direct children of the bus */

	for (dn = busdn->child; dn; dn = dn->sibling)

		if (dn->devfn == devfn)

			return rtas_write_config(dn, where, size, val);

	return PCIBIOS_DEVICE_NOT_FOUND;

}



struct pci_ops rtas_pci_ops = {

	rtas_pci_read_config,

	rtas_pci_write_config

};



int is_python(struct device_node *dev)

{

	char *model = (char *)get_property(dev, "model", NULL);



	if (model && strstr(model, "Python"))

		return 1;



	return 0;

}



static int get_phb_reg_prop(struct device_node *dev,

			    unsigned int addr_size_words,

			    struct reg_property64 *reg)

{

	unsigned int *ui_ptr = NULL, len;



	/* Found a PHB, now figure out where his registers are mapped. */

	ui_ptr = (unsigned int *)get_property(dev, "reg", &len);

	if (ui_ptr == NULL)

		return 1;



	if (addr_size_words == 1) {

		reg->address = ((struct reg_property32 *)ui_ptr)->address;

		reg->size    = ((struct reg_property32 *)ui_ptr)->size;

	} else {

		*reg = *((struct reg_property64 *)ui_ptr);

	}



	return 0;

}



static void python_countermeasures(struct device_node *dev,

				   unsigned int addr_size_words)

{

	struct reg_property64 reg_struct;

	void __iomem *chip_regs;

	volatile u32 val;



	if (get_phb_reg_prop(dev, addr_size_words, &reg_struct))

		return;



	/* Python's register file is 1 MB in size. */

	chip_regs = ioremap(reg_struct.address & ~(0xfffffUL), 0x100000);



	/* 

	 * Firmware doesn't always clear this bit which is critical

	 * for good performance - Anton

	 */



#define PRG_CL_RESET_VALID 0x00010000



	val = in_be32(chip_regs + 0xf6030);

	if (val & PRG_CL_RESET_VALID) {

		printk(KERN_INFO "Python workaround: ");

		val &= ~PRG_CL_RESET_VALID;

		out_be32(chip_regs + 0xf6030, val);

		/*

		 * We must read it back for changes to

		 * take effect

		 */

		val = in_be32(chip_regs + 0xf6030);

		printk("reg0: %x\n", val);

	}



	iounmap(chip_regs);

}



void __init init_pci_config_tokens (void)

{

	read_pci_config = rtas_token("read-pci-config");

	write_pci_config = rtas_token("write-pci-config");

	ibm_read_pci_config = rtas_token("ibm,read-pci-config");

	ibm_write_pci_config = rtas_token("ibm,write-pci-config");

}



unsigned long __devinit get_phb_buid (struct device_node *phb)

{

	int addr_cells;

	unsigned int *buid_vals;

	unsigned int len;

	unsigned long buid;



	if (ibm_read_pci_config == -1) return 0;



	/* PHB's will always be children of the root node,

	 * or so it is promised by the current firmware. */

	if (phb->parent == NULL)

		return 0;

	if (phb->parent->parent)

		return 0;



	buid_vals = (unsigned int *) get_property(phb, "reg", &len);

	if (buid_vals == NULL)

		return 0;



	addr_cells = prom_n_addr_cells(phb);

	if (addr_cells == 1) {

		buid = (unsigned long) buid_vals[0];

	} else {

		buid = (((unsigned long)buid_vals[0]) << 32UL) |

			(((unsigned long)buid_vals[1]) & 0xffffffff);

	}

	return buid;

}



static int phb_set_bus_ranges(struct device_node *dev,

			      struct pci_controller *phb)

{

	int *bus_range;

	unsigned int len;



	bus_range = (int *) get_property(dev, "bus-range", &len);

	if (bus_range == NULL || len < 2 * sizeof(int)) {

		return 1;

 	}

 

	phb->first_busno =  bus_range[0];

	phb->last_busno  =  bus_range[1];



	return 0;

}



static int __devinit setup_phb(struct device_node *dev,

			       struct pci_controller *phb,

			       unsigned int addr_size_words)

{

	pci_setup_pci_controller(phb);



	if (is_python(dev))

		python_countermeasures(dev, addr_size_words);



	if (phb_set_bus_ranges(dev, phb))

		return 1;



	phb->arch_data = dev;

	phb->ops = &rtas_pci_ops;

	phb->buid = get_phb_buid(dev);



	return 0;

}



static void __devinit add_linux_pci_domain(struct device_node *dev,

					   struct pci_controller *phb,

					   struct property *of_prop)

{

	memset(of_prop, 0, sizeof(struct property));

	of_prop->name = "linux,pci-domain";

	of_prop->length = sizeof(phb->global_number);

	of_prop->value = (unsigned char *)&of_prop[1];

	memcpy(of_prop->value, &phb->global_number, sizeof(phb->global_number));

	prom_add_property(dev, of_prop);

}



static struct pci_controller * __init alloc_phb(struct device_node *dev,

						unsigned int addr_size_words)

{

	struct pci_controller *phb;

	struct property *of_prop;



	phb = alloc_bootmem(sizeof(struct pci_controller));

	if (phb == NULL)

		return NULL;



	of_prop = alloc_bootmem(sizeof(struct property) +

				sizeof(phb->global_number));

	if (!of_prop)

		return NULL;



	if (setup_phb(dev, phb, addr_size_words))

		return NULL;



	add_linux_pci_domain(dev, phb, of_prop);



	return phb;

}



static struct pci_controller * __devinit alloc_phb_dynamic(struct device_node *dev, unsigned int addr_size_words)

{

	struct pci_controller *phb;



	phb = (struct pci_controller *)kmalloc(sizeof(struct pci_controller),

					       GFP_KERNEL);

	if (phb == NULL)

		return NULL;



	if (setup_phb(dev, phb, addr_size_words))

		return NULL;



	phb->is_dynamic = 1;



	/* TODO: linux,pci-domain? */



 	return phb;

}



unsigned long __init find_and_init_phbs(void)

{

	struct device_node *node;

	struct pci_controller *phb;

	unsigned int root_size_cells = 0;

	unsigned int index;

	unsigned int *opprop = NULL;

	struct device_node *root = of_find_node_by_path("/");



	if (ppc64_interrupt_controller == IC_OPEN_PIC) {

		opprop = (unsigned int *)get_property(root,

				"platform-open-pic", NULL);

	}



	root_size_cells = prom_n_size_cells(root);



	index = 0;



	for (node = of_get_next_child(root, NULL);

	     node != NULL;

	     node = of_get_next_child(root, node)) {

		if (node->type == NULL || strcmp(node->type, "pci") != 0)

			continue;



		phb = alloc_phb(node, root_size_cells);

		if (!phb)

			continue;



		pci_process_bridge_OF_ranges(phb, node);

		pci_setup_phb_io(phb, index == 0);



		if (ppc64_interrupt_controller == IC_OPEN_PIC && pSeries_mpic) {

			int addr = root_size_cells * (index + 2) - 1;

			mpic_assign_isu(pSeries_mpic, index, opprop[addr]);

		}



		index++;

	}



	of_node_put(root);

	pci_devs_phb_init();



	/*

	 * pci_probe_only and pci_assign_all_buses can be set via properties

	 * in chosen.

	 */

	if (of_chosen) {

		int *prop;



		prop = (int *)get_property(of_chosen, "linux,pci-probe-only",

					   NULL);

		if (prop)

			pci_probe_only = *prop;



		prop = (int *)get_property(of_chosen,

					   "linux,pci-assign-all-buses", NULL);

		if (prop)

			pci_assign_all_buses = *prop;

	}



	return 0;

}



struct pci_controller * __devinit init_phb_dynamic(struct device_node *dn)

{

	struct device_node *root = of_find_node_by_path("/");

	unsigned int root_size_cells = 0;

	struct pci_controller *phb;

	struct pci_bus *bus;

	int primary;



	root_size_cells = prom_n_size_cells(root);



	primary = list_empty(&hose_list);

	phb = alloc_phb_dynamic(dn, root_size_cells);

	if (!phb)

		return NULL;



	pci_process_bridge_OF_ranges(phb, dn);



	pci_setup_phb_io_dynamic(phb, primary);

	of_node_put(root);



	pci_devs_phb_init_dynamic(phb);

	phb->last_busno = 0xff;

	bus = pci_scan_bus(phb->first_busno, phb->ops, phb->arch_data);

	phb->bus = bus;

	phb->last_busno = bus->subordinate;



	return phb;

}

EXPORT_SYMBOL(init_phb_dynamic);

static int __initdata s7a_workaround;



#if 0

void pcibios_name_device(struct pci_dev *dev)
@@ -474,7 +60,7 @@ void pcibios_name_device(struct pci_dev *dev) 
DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pcibios_name_device);

#endif



static void check_s7a(void)

static void __init check_s7a(void)

{

	struct device_node *root;

	char *model;
@@ -488,56 +74,6 @@ static void check_s7a(void) 
	}

}



/* RPA-specific bits for removing PHBs */

int pcibios_remove_root_bus(struct pci_controller *phb)

{

	struct pci_bus *b = phb->bus;

	struct resource *res;

	int rc, i;



	res = b->resource[0];

	if (!res->flags) {

		printk(KERN_ERR "%s: no IO resource for PHB %s\n", __FUNCTION__,

				b->name);

		return 1;

	}



	rc = unmap_bus_range(b);

	if (rc) {

		printk(KERN_ERR "%s: failed to unmap IO on bus %s\n",

			__FUNCTION__, b->name);

		return 1;

	}



	if (release_resource(res)) {

		printk(KERN_ERR "%s: failed to release IO on bus %s\n",

				__FUNCTION__, b->name);

		return 1;

	}



	for (i = 1; i < 3; ++i) {

		res = b->resource[i];

		if (!res->flags && i == 0) {

			printk(KERN_ERR "%s: no MEM resource for PHB %s\n",

				__FUNCTION__, b->name);

			return 1;

		}

		if (res->flags && release_resource(res)) {

			printk(KERN_ERR

			       "%s: failed to release IO %d on bus %s\n",

				__FUNCTION__, i, b->name);

			return 1;

		}

	}



	list_del(&phb->list_node);

	if (phb->is_dynamic)

		kfree(phb);



	return 0;

}

EXPORT_SYMBOL(pcibios_remove_root_bus);



static void __init pSeries_request_regions(void)

{

	if (!isa_io_base)

arch/ppc64/kernel/rtas_pci.c

0 → 100644
+495 −0

File added.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE