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

Commit bf7c036f authored by Zhang Wei's avatar Zhang Wei Committed by Kumar Gala
Browse files

[POWERPC] Remove PCI-e errata for MPC8641 silicon ver 1.0 



Remove errata for PCI-e support of Rev 1.0 of MPC8641 since its considered
obselete and is not production level silicon from Freescale.

Signed-off-by: default avatarZhang Wei <wei.zhang@freescale.com>
Acked-by: default avatarRoy Zang <tie-fei.zang@freescale.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 0a3786c5

arch/powerpc/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -419,10 +419,6 @@ config SBUS 
config FSL_SOC

	bool



config FSL_PCIE

	bool

	depends on PPC_86xx



# Yes MCA RS/6000s exist but Linux-PPC does not currently support any

config MCA

	bool

arch/powerpc/boot/dts/mpc8641_hpcn.dts

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ 
			#size-cells = <2>;

			#address-cells = <3>;

			reg = <8000 1000>;

			bus-range = <0 fe>;

			bus-range = <0 ff>;

			ranges = <02000000 0 80000000 80000000 0 20000000

				  01000000 0 00000000 e2000000 0 00100000>;

			clock-frequency = <1fca055>;

arch/powerpc/platforms/86xx/mpc86xx.h

+0 −6
Original line number Diff line number Diff line
@@ -20,12 +20,6 @@ extern int mpc86xx_add_bridge(struct device_node *dev); 
extern int mpc86xx_exclude_device(struct pci_controller *hose,

				  u_char bus, u_char devfn);



extern void setup_indirect_pcie(struct pci_controller *hose,

				       u32 cfg_addr, u32 cfg_data);

extern void setup_indirect_pcie_nomap(struct pci_controller *hose,

					     void __iomem *cfg_addr,

					     void __iomem *cfg_data);



extern void __init mpc86xx_smp_init(void);



#endif	/* __MPC86XX_H__ */

arch/powerpc/platforms/86xx/mpc86xx_hpcn.c

+0 −2
Original line number Diff line number Diff line
@@ -358,8 +358,6 @@ mpc86xx_hpcn_setup_arch(void) 
#ifdef CONFIG_PCI

	for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)

		mpc86xx_add_bridge(np);



	ppc_md.pci_exclude_device = mpc86xx_exclude_device;

#endif



	printk("MPC86xx HPCN board from Freescale Semiconductor\n");

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

+2 −16
Original line number Diff line number Diff line
@@ -133,19 +133,6 @@ mpc86xx_setup_pcie(struct pci_controller *hose, u32 pcie_offset, u32 pcie_size) 
	early_write_config_word(hose, 0, 0, PCI_COMMAND, cmd);



	early_write_config_byte(hose, 0, 0, PCI_LATENCY_TIMER, 0x80);



	/* PCIE Bus, Fix the MPC8641D host bridge's location to bus 0xFF. */

	early_read_config_dword(hose, 0, 0, PCI_PRIMARY_BUS, &temps);

	temps = (temps & 0xff000000) | (0xff) | (0x0 << 8) | (0xfe << 16);

	early_write_config_dword(hose, 0, 0, PCI_PRIMARY_BUS, temps);

}



int mpc86xx_exclude_device(struct pci_controller *hose, u_char bus, u_char devfn)

{

	if (bus == 0 && PCI_SLOT(devfn) == 0)

		return PCIBIOS_DEVICE_NOT_FOUND;



	return PCIBIOS_SUCCESSFUL;

}



int __init mpc86xx_add_bridge(struct device_node *dev)
@@ -173,11 +160,10 @@ int __init mpc86xx_add_bridge(struct device_node *dev) 
		return -ENOMEM;

	hose->arch_data = dev;



	/* last_busno = 0xfe cause by MPC8641 PCIE bug */

	hose->first_busno = bus_range ? bus_range[0] : 0x0;

	hose->last_busno = bus_range ? bus_range[1] : 0xfe;

	hose->last_busno = bus_range ? bus_range[1] : 0xff;



	setup_indirect_pcie(hose, rsrc.start, rsrc.start + 0x4);

	setup_indirect_pci(hose, rsrc.start, rsrc.start + 0x4);



	/* Setup the PCIE host controller. */

	mpc86xx_setup_pcie(hose, rsrc.start, rsrc.end - rsrc.start + 1);