Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6296b96 authored by Anton Blanchard's avatar Anton Blanchard Committed by Benjamin Herrenschmidt
Browse files

powerpc: Make PCI device node device tree accesses endian safe 



Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent a795dc54

arch/powerpc/kernel/pci_dn.c

+11 −9
Original line number Diff line number Diff line
@@ -47,9 +47,8 @@ struct pci_dn *pci_get_pdn(struct pci_dev *pdev) 
void *update_dn_pci_info(struct device_node *dn, void *data)

{

	struct pci_controller *phb = data;

	const int *type =

		of_get_property(dn, "ibm,pci-config-space-type", NULL);

	const u32 *regs;

	const __be32 *type = of_get_property(dn, "ibm,pci-config-space-type", NULL);

	const __be32 *regs;

	struct pci_dn *pdn;



	pdn = zalloc_maybe_bootmem(sizeof(*pdn), GFP_KERNEL);
@@ -63,12 +62,14 @@ void *update_dn_pci_info(struct device_node *dn, void *data) 
#endif

	regs = of_get_property(dn, "reg", NULL);

	if (regs) {

		u32 addr = of_read_number(regs, 1);



		/* First register entry is addr (00BBSS00)  */

		pdn->busno = (regs[0] >> 16) & 0xff;

		pdn->devfn = (regs[0] >> 8) & 0xff;

		pdn->busno = (addr >> 16) & 0xff;

		pdn->devfn = (addr >> 8) & 0xff;

	}



	pdn->pci_ext_config_space = (type && *type == 1);

	pdn->pci_ext_config_space = (type && of_read_number(type, 1) == 1);

	return NULL;

}
@@ -98,12 +99,13 @@ void *traverse_pci_devices(struct device_node *start, traverse_func pre, 


	/* We started with a phb, iterate all childs */

	for (dn = start->child; dn; dn = nextdn) {

		const u32 *classp;

		u32 class;

		const __be32 *classp;

		u32 class = 0;



		nextdn = NULL;

		classp = of_get_property(dn, "class-code", NULL);

		class = classp ? *classp : 0;

		if (classp)

			class = of_read_number(classp, 1);



		if (pre && ((ret = pre(dn, data)) != NULL))

			return ret;