Commit ae65a391 authored by Linas Vepstas's avatar Linas Vepstas Committed by Paul Mackerras
Browse files

[PATCH] ppc64: uniform usage of bus unit id interfaces 



01-pci-dn-uniformization.patch

This patch changes the rtas_pci interface to use the new struct pci_dn
structure for two routines that work with pci device nodes.

This patch also does some minor janitorial work: it uses some handy macros
and cleans up some trailing whitespace in the affected file.

Signed-off-by: default avatarLinas Vepstas <linas@austin.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 77ac166f

arch/ppc64/kernel/eeh.c

+0 −4
Original line number Diff line number Diff line
@@ -71,10 +71,6 @@ 
 *  and sent out for processing.

 */



/** Bus Unit ID macros; get low and hi 32-bits of the 64-bit BUID */

#define BUID_HI(buid) ((buid) >> 32)

#define BUID_LO(buid) ((buid) & 0xffffffff)



/* EEH event workqueue setup. */

static DEFINE_SPINLOCK(eeh_eventlist_lock);

LIST_HEAD(eeh_eventlist);

arch/ppc64/kernel/rtas_pci.c

+24 −23
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ static int write_pci_config; 
static int ibm_read_pci_config;

static int ibm_write_pci_config;



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

static inline int config_access_valid(struct pci_dn *dn, int where)

{

	if (where < 256)

		return 1;
@@ -72,16 +72,14 @@ static int of_device_available(struct device_node * dn) 
        return 0;

}



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

static int rtas_read_config(struct pci_dn *pdn, int where, int size, u32 *val)

{

	int returnval = -1;

	unsigned long buid, addr;

	int ret;

	struct pci_dn *pdn;



	if (!dn || !dn->data)

	if (!pdn)

		return PCIBIOS_DEVICE_NOT_FOUND;

	pdn = dn->data;

	if (!config_access_valid(pdn, where))

		return PCIBIOS_BAD_REGISTER_NUMBER;
@@ -90,7 +88,7 @@ static int rtas_read_config(struct device_node *dn, int where, int size, u32 *va 
	buid = pdn->phb->buid;

	if (buid) {

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

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

				addr, BUID_HI(buid), BUID_LO(buid), size);

	} else {

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

	}
@@ -100,7 +98,7 @@ static int rtas_read_config(struct device_node *dn, int where, int size, u32 *va 
		return PCIBIOS_DEVICE_NOT_FOUND;



	if (returnval == EEH_IO_ERROR_VALUE(size) &&

	    eeh_dn_check_failure (dn, NULL))

	    eeh_dn_check_failure (pdn->node, NULL))

		return PCIBIOS_DEVICE_NOT_FOUND;



	return PCIBIOS_SUCCESSFUL;
@@ -118,23 +116,23 @@ static int rtas_pci_read_config(struct pci_bus *bus, 
		busdn = bus->sysdata;	/* must be a phb */



	/* Search only direct children of the bus */

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

		if (dn->data && PCI_DN(dn)->devfn == devfn

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

		struct pci_dn *pdn = PCI_DN(dn);

		if (pdn && pdn->devfn == devfn

		    && of_device_available(dn))

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

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

	}



	return PCIBIOS_DEVICE_NOT_FOUND;

}



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

int rtas_write_config(struct pci_dn *pdn, int where, int size, u32 val)

{

	unsigned long buid, addr;

	int ret;

	struct pci_dn *pdn;



	if (!dn || !dn->data)

	if (!pdn)

		return PCIBIOS_DEVICE_NOT_FOUND;

	pdn = dn->data;

	if (!config_access_valid(pdn, where))

		return PCIBIOS_BAD_REGISTER_NUMBER;
@@ -142,7 +140,8 @@ int rtas_write_config(struct device_node *dn, int where, int size, u32 val) 
		(pdn->devfn << 8) | (where & 0xff);

	buid = pdn->phb->buid;

	if (buid) {

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

		ret = rtas_call(ibm_write_pci_config, 5, 1, NULL, addr,

			BUID_HI(buid), BUID_LO(buid), size, (ulong) val);

	} else {

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

	}
@@ -165,10 +164,12 @@ static int rtas_pci_write_config(struct pci_bus *bus, 
		busdn = bus->sysdata;	/* must be a phb */



	/* Search only direct children of the bus */

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

		if (dn->data && PCI_DN(dn)->devfn == devfn

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

		struct pci_dn *pdn = PCI_DN(dn);

		if (pdn && pdn->devfn == devfn

		    && of_device_available(dn))

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

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

	}

	return PCIBIOS_DEVICE_NOT_FOUND;

}

include/asm-powerpc/ppc-pci.h

+4 −0
Original line number Diff line number Diff line
@@ -26,6 +26,10 @@ extern unsigned long find_and_init_phbs(void); 


extern struct pci_dev *ppc64_isabridge_dev;	/* may be NULL if no ISA bus */



/** Bus Unit ID macros; get low and hi 32-bits of the 64-bit BUID */

#define BUID_HI(buid) ((buid) >> 32)

#define BUID_LO(buid) ((buid) & 0xffffffff)



/* PCI device_node operations */

struct device_node;

typedef void *(*traverse_func)(struct device_node *me, void *data);