powerpc: Use arch/powerpc/mm and arch/powerpc/lib for 64-bit (daec962e) · Commits · e / devices / android_kernel_teracube_2e

arch/powerpc/Makefile

+6 −9

Original line number	Original line	Diff line number	Diff line
	@@ -124,15 +124,12 @@ head-$(CONFIG_6xx) += arch/powerpc/kernel/idle_6xx.o
	head-$(CONFIG_PPC_FPU) += arch/powerpc/kernel/fpu.o		head-$(CONFIG_PPC_FPU) += arch/powerpc/kernel/fpu.o
	endif		endif

	core-y += arch/powerpc/kernel/		core-y += arch/powerpc/kernel/ \
	core-y += arch/$(OLDARCH)/kernel/		arch/$(OLDARCH)/kernel/ \
	core-$(CONFIG_PPC32) += arch/powerpc/mm/		arch/powerpc/mm/ \
	core-$(CONFIG_PPC64) += arch/$(OLDARCH)/mm/		arch/powerpc/lib/ \
	core-$(CONFIG_PPC32) += arch/powerpc/lib/		arch/powerpc/sysdev/ \
	libs-$(CONFIG_PPC64) += arch/$(OLDARCH)/lib/		arch/powerpc/platforms/
	core-y += arch/powerpc/sysdev/
	core-y += arch/powerpc/platforms/
	core-$(CONFIG_PPC32) += arch/ppc/syslib/
	core-$(CONFIG_MATH_EMULATION) += arch/ppc/math-emu/		core-$(CONFIG_MATH_EMULATION) += arch/ppc/math-emu/
	core-$(CONFIG_XMON) += arch/powerpc/xmon/		core-$(CONFIG_XMON) += arch/powerpc/xmon/
	core-$(CONFIG_APUS) += arch/ppc/amiga/		core-$(CONFIG_APUS) += arch/ppc/amiga/

arch/powerpc/sysdev/Makefile

+3 −1

Original line number	Original line	Diff line number	Diff line
	obj-$(CONFIG_MPIC) += mpic.o		obj-$(CONFIG_MPIC) += mpic.o
			indirectpci-$(CONFIG_PPC_PMAC) = indirect_pci.o
			obj-$(CONFIG_PPC32) += $(indirectpci-y)

arch/powerpc/sysdev/indirect_pci.c

0 → 100644

+134 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Support for indirect PCI bridges.
			*
			* Copyright (C) 1998 Gabriel Paubert.
			*
			* 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 (at your option) any later version.
			*/

			#include <linux/kernel.h>
			#include <linux/pci.h>
			#include <linux/delay.h>
			#include <linux/string.h>
			#include <linux/init.h>

			#include <asm/io.h>
			#include <asm/prom.h>
			#include <asm/pci-bridge.h>
			#include <asm/machdep.h>

			#ifdef CONFIG_PPC_INDIRECT_PCI_BE
			#define PCI_CFG_OUT out_be32
			#else
			#define PCI_CFG_OUT out_le32
			#endif

			static int
			indirect_read_config(struct pci_bus *bus, unsigned int devfn, int offset,
			int len, u32 *val)
			{
			struct pci_controller *hose = bus->sysdata;
			volatile void __iomem *cfg_data;
			u8 cfg_type = 0;

			if (ppc_md.pci_exclude_device)
			if (ppc_md.pci_exclude_device(bus->number, devfn))
			return PCIBIOS_DEVICE_NOT_FOUND;

			if (hose->set_cfg_type)
			if (bus->number != hose->first_busno)
			cfg_type = 1;

			PCI_CFG_OUT(hose->cfg_addr,
			(0x80000000 \| ((bus->number - hose->bus_offset) << 16)
			\| (devfn << 8) \| ((offset & 0xfc) \| cfg_type)));

			/*
			* Note: the caller has already checked that offset is
			* suitably aligned and that len is 1, 2 or 4.
			*/
			cfg_data = hose->cfg_data + (offset & 3);
			switch (len) {
			case 1:
			*val = in_8(cfg_data);
			break;
			case 2:
			*val = in_le16(cfg_data);
			break;
			default:
			*val = in_le32(cfg_data);
			break;
			}
			return PCIBIOS_SUCCESSFUL;
			}

			static int
			indirect_write_config(struct pci_bus *bus, unsigned int devfn, int offset,
			int len, u32 val)
			{
			struct pci_controller *hose = bus->sysdata;
			volatile void __iomem *cfg_data;
			u8 cfg_type = 0;

			if (ppc_md.pci_exclude_device)
			if (ppc_md.pci_exclude_device(bus->number, devfn))
			return PCIBIOS_DEVICE_NOT_FOUND;

			if (hose->set_cfg_type)
			if (bus->number != hose->first_busno)
			cfg_type = 1;

			PCI_CFG_OUT(hose->cfg_addr,
			(0x80000000 \| ((bus->number - hose->bus_offset) << 16)
			\| (devfn << 8) \| ((offset & 0xfc) \| cfg_type)));

			/*
			* Note: the caller has already checked that offset is
			* suitably aligned and that len is 1, 2 or 4.
			*/
			cfg_data = hose->cfg_data + (offset & 3);
			switch (len) {
			case 1:
			out_8(cfg_data, val);
			break;
			case 2:
			out_le16(cfg_data, val);
			break;
			default:
			out_le32(cfg_data, val);
			break;
			}
			return PCIBIOS_SUCCESSFUL;
			}

			static struct pci_ops indirect_pci_ops =
			{
			indirect_read_config,
			indirect_write_config
			};

			void __init
			setup_indirect_pci_nomap(struct pci_controller* hose, void __iomem * cfg_addr,
			void __iomem * cfg_data)
			{
			hose->cfg_addr = cfg_addr;
			hose->cfg_data = cfg_data;
			hose->ops = &indirect_pci_ops;
			}

			void __init
			setup_indirect_pci(struct pci_controller* hose, u32 cfg_addr, u32 cfg_data)
			{
			unsigned long base = cfg_addr & PAGE_MASK;
			void __iomem mbase, addr, *data;

			mbase = ioremap(base, PAGE_SIZE);
			addr = mbase + (cfg_addr & ~PAGE_MASK);
			if ((cfg_data & PAGE_MASK) != base)
			mbase = ioremap(cfg_data & PAGE_MASK, PAGE_SIZE);
			data = mbase + (cfg_data & ~PAGE_MASK);
			setup_indirect_pci_nomap(hose, addr, data);
			}

arch/ppc/syslib/Makefile

+0 −14

Original line number	Original line	Diff line number	Diff line
	@@ -5,7 +5,6 @@
	CFLAGS_prom_init.o += -fPIC		CFLAGS_prom_init.o += -fPIC
	CFLAGS_btext.o += -fPIC		CFLAGS_btext.o += -fPIC

	ifneq ($(CONFIG_PPC_MERGE),y)
	wdt-mpc8xx-$(CONFIG_8xx_WDT) += m8xx_wdt.o		wdt-mpc8xx-$(CONFIG_8xx_WDT) += m8xx_wdt.o

	obj-$(CONFIG_PPCBUG_NVRAM) += prep_nvram.o		obj-$(CONFIG_PPCBUG_NVRAM) += prep_nvram.o
	@@ -110,16 +109,3 @@ obj-$(CONFIG_PPC_MPC52xx) += mpc52xx_setup.o mpc52xx_pic.o \
	ifeq ($(CONFIG_PPC_MPC52xx),y)		ifeq ($(CONFIG_PPC_MPC52xx),y)
	obj-$(CONFIG_PCI) += mpc52xx_pci.o		obj-$(CONFIG_PCI) += mpc52xx_pci.o
	endif		endif

	else
	# Stuff still needed by the merged powerpc sources

	obj-$(CONFIG_PPCBUG_NVRAM) += prep_nvram.o
	obj-$(CONFIG_PPC_OF) += prom_init.o prom.o of_device.o
	obj-$(CONFIG_PPC_PMAC) += indirect_pci.o
	obj-$(CONFIG_PPC_CHRP) += indirect_pci.o i8259.o
	obj-$(CONFIG_PPC_PREP) += indirect_pci.o i8259.o todc_time.o
	obj-$(CONFIG_BOOTX_TEXT) += btext.o
	obj-$(CONFIG_MPC10X_BRIDGE) += mpc10x_common.o indirect_pci.o ppc_sys.o

	endif