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

Commit 2e56ff20 authored by Kumar Gala's avatar Kumar Gala
Browse files

[POWERPC] Make endianess of cfg_addr for indirect pci ops runtime 



Make it so we do a runtime check to know if we need to write cfg_addr
as big or little endian.  This is needed if we want to allow 86xx support
to co-exist in the same kernel as other 6xx PPCs.

Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent d5269966

arch/powerpc/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -411,11 +411,6 @@ config PPC_INDIRECT_PCI 
	default y if 40x || 44x

	default n



config PPC_INDIRECT_PCI_BE

	bool

	depends PPC_INDIRECT_PCI

	default n



config EISA

	bool

arch/powerpc/platforms/82xx/mpc82xx_ads.c

+2 −1
Original line number Diff line number Diff line
@@ -553,7 +553,8 @@ static void __init mpc82xx_add_bridge(struct device_node *np) 


	setup_indirect_pci(hose,

			   r.start + offsetof(pci_cpm2_t, pci_cfg_addr),

			   r.start + offsetof(pci_cpm2_t, pci_cfg_data));

			   r.start + offsetof(pci_cpm2_t, pci_cfg_data),

			   0);



	pci_process_bridge_OF_ranges(hose, np, 1);

}

arch/powerpc/platforms/83xx/pci.c

+2 −2
Original line number Diff line number Diff line
@@ -74,11 +74,11 @@ int __init mpc83xx_add_bridge(struct device_node *dev) 
	 */

	/* PCI 1 */

	if ((rsrc.start & 0xfffff) == 0x8500) {

		setup_indirect_pci(hose, immr + 0x8300, immr + 0x8304);

		setup_indirect_pci(hose, immr + 0x8300, immr + 0x8304, 0);

	}

	/* PCI 2 */

	if ((rsrc.start & 0xfffff) == 0x8600) {

		setup_indirect_pci(hose, immr + 0x8380, immr + 0x8384);

		setup_indirect_pci(hose, immr + 0x8380, immr + 0x8384, 0);

		primary = 0;

	}

arch/powerpc/platforms/85xx/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ config MPC85xx 
	bool

	select PPC_UDBG_16550

	select PPC_INDIRECT_PCI if PCI

	select PPC_INDIRECT_PCI_BE if PCI

	select MPIC

	select FSL_PCI if PCI

	select SERIAL_8250_SHARE_IRQ if SERIAL_8250

arch/powerpc/platforms/86xx/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ endchoice 


config MPC8641

	bool

	select PPC_INDIRECT_PCI_BE if PCI

	select FSL_PCI if PCI

	select PPC_UDBG_16550

	select MPIC