Commit 3c693024 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] Fix windfarm platform device usage
  [POWERPC] Fix i2c-powermac platform device usage
  [POWERPC] Fix secondary CPU startup on old "powersurge" SMP powermacs
  [POWERPC] ARCH=ppc pt_regs fixes
  [POWERPC] Update maple defconfig
  [POWERPC] Fix Maple secondary IDE interrupt
  [POWERPC] Make U4 PCIe work on maple
  [POWERPC] cell: fix default zImage build target
  [POWERPC] Fix boot wrapper invocation if CROSS_COMPILE contains spaces
  [POWERPC] Fix xmon IRQ handler for pt_regs removal
parents 107c3a73 10270613

arch/powerpc/boot/Makefile

+8 −8
Original line number Diff line number Diff line
@@ -105,10 +105,10 @@ wrapperbits := $(extra-y) $(addprefix $(obj)/,addnote hack-coff) 
# Bits for building various flavours of zImage



ifneq ($(CROSS32_COMPILE),)

CROSSWRAP := -C $(CROSS32_COMPILE)

CROSSWRAP := -C "$(CROSS32_COMPILE)"

else

ifneq ($(CROSS_COMPILE),)

CROSSWRAP := -C $(CROSS_COMPILE)

CROSSWRAP := -C "$(CROSS_COMPILE)"

endif

endif
@@ -153,7 +153,7 @@ $(obj)/uImage: vmlinux $(wrapperbits) 


image-$(CONFIG_PPC_PSERIES)		+= zImage.pseries

image-$(CONFIG_PPC_MAPLE)		+= zImage.pseries

image-$(CONFIG_PPC_CELL)	+= zImage.pseries

image-$(CONFIG_PPC_IBM_CELL_BLADE)	+= zImage.pseries

image-$(CONFIG_PPC_CHRP)		+= zImage.chrp

image-$(CONFIG_PPC_PMAC)		+= zImage.pmac

image-$(CONFIG_DEFAULT_UIMAGE)		+= uImage

arch/powerpc/configs/maple_defconfig

+43 −13
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.18-rc6

# Sun Sep 10 10:24:55 2006

# Linux kernel version: 2.6.18

# Mon Oct  9 11:59:34 2006

#

CONFIG_PPC64=y

CONFIG_64BIT=y
@@ -22,6 +22,7 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y 
CONFIG_PPC_OF=y

CONFIG_PPC_UDBG_16550=y

CONFIG_GENERIC_TBSYNC=y

CONFIG_AUDIT_ARCH=y

# CONFIG_DEFAULT_UIMAGE is not set



#
@@ -34,7 +35,7 @@ CONFIG_PPC_FPU=y 
CONFIG_PPC_STD_MMU=y

CONFIG_VIRT_CPU_ACCOUNTING=y

CONFIG_SMP=y

CONFIG_NR_CPUS=2

CONFIG_NR_CPUS=4

CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"



#
@@ -51,10 +52,11 @@ CONFIG_LOCALVERSION="" 
CONFIG_LOCALVERSION_AUTO=y

CONFIG_SWAP=y

CONFIG_SYSVIPC=y

# CONFIG_IPC_NS is not set

CONFIG_POSIX_MQUEUE=y

# CONFIG_BSD_PROCESS_ACCT is not set

# CONFIG_TASKSTATS is not set

CONFIG_SYSCTL=y

# CONFIG_UTS_NS is not set

# CONFIG_AUDIT is not set

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y
@@ -62,7 +64,9 @@ CONFIG_IKCONFIG_PROC=y 
# CONFIG_RELAY is not set

CONFIG_INITRAMFS_SOURCE=""

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_SYSCTL=y

# CONFIG_EMBEDDED is not set

# CONFIG_SYSCTL_SYSCALL is not set

CONFIG_KALLSYMS=y

CONFIG_KALLSYMS_ALL=y

# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -71,12 +75,12 @@ CONFIG_PRINTK=y 
CONFIG_BUG=y

CONFIG_ELF_CORE=y

CONFIG_BASE_FULL=y

CONFIG_RT_MUTEXES=y

CONFIG_FUTEX=y

CONFIG_EPOLL=y

CONFIG_SHMEM=y

CONFIG_SLAB=y

CONFIG_VM_EVENT_COUNTERS=y

CONFIG_RT_MUTEXES=y

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0

# CONFIG_SLOB is not set
@@ -95,6 +99,7 @@ CONFIG_STOP_MACHINE=y 
#

# Block layer

#

CONFIG_BLOCK=y

# CONFIG_BLK_DEV_IO_TRACE is not set



#
@@ -114,16 +119,16 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" 
# Platform support

#

CONFIG_PPC_MULTIPLATFORM=y

# CONFIG_PPC_ISERIES is not set

# CONFIG_EMBEDDED6xx is not set

# CONFIG_APUS is not set

# CONFIG_PPC_PSERIES is not set

# CONFIG_PPC_ISERIES is not set

# CONFIG_PPC_PMAC is not set

CONFIG_PPC_MAPLE=y

# CONFIG_PPC_PASEMI is not set

# CONFIG_PPC_CELL is not set

# CONFIG_PPC_CELL_NATIVE is not set

# CONFIG_PPC_IBM_CELL_BLADE is not set

# CONFIG_UDBG_RTAS_CONSOLE is not set

CONFIG_U3_DART=y

# CONFIG_PPC_RTAS is not set

# CONFIG_MMIO_NVRAM is not set
@@ -157,6 +162,7 @@ CONFIG_IRQ_ALL_CPUS=y 
CONFIG_ARCH_SELECT_MEMORY_MODEL=y

CONFIG_ARCH_FLATMEM_ENABLE=y

CONFIG_ARCH_SPARSEMEM_ENABLE=y

CONFIG_ARCH_POPULATES_NODE_MAP=y

CONFIG_SELECT_MEMORY_MODEL=y

CONFIG_FLATMEM_MANUAL=y

# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -184,6 +190,7 @@ CONFIG_GENERIC_ISA_DMA=y 
CONFIG_PCI=y

CONFIG_PCI_DOMAINS=y

# CONFIG_PCIEPORTBUS is not set

# CONFIG_PCI_MULTITHREAD_PROBE is not set

# CONFIG_PCI_DEBUG is not set



#
@@ -211,6 +218,7 @@ CONFIG_PACKET_MMAP=y 
CONFIG_UNIX=y

CONFIG_XFRM=y

CONFIG_XFRM_USER=m

# CONFIG_XFRM_SUB_POLICY is not set

# CONFIG_NET_KEY is not set

CONFIG_INET=y

CONFIG_IP_MULTICAST=y
@@ -232,10 +240,12 @@ CONFIG_IP_PNP_DHCP=y 
# CONFIG_INET_TUNNEL is not set

CONFIG_INET_XFRM_MODE_TRANSPORT=y

CONFIG_INET_XFRM_MODE_TUNNEL=y

CONFIG_INET_XFRM_MODE_BEET=y

CONFIG_INET_DIAG=y

CONFIG_INET_TCP_DIAG=y

# CONFIG_TCP_CONG_ADVANCED is not set

CONFIG_TCP_CONG_BIC=y

CONFIG_TCP_CONG_CUBIC=y

CONFIG_DEFAULT_TCP_CONG="cubic"

# CONFIG_IPV6 is not set

# CONFIG_INET6_XFRM_TUNNEL is not set

# CONFIG_INET6_TUNNEL is not set
@@ -265,7 +275,6 @@ CONFIG_TCP_CONG_BIC=y 
# CONFIG_ATALK is not set

# CONFIG_X25 is not set

# CONFIG_LAPB is not set

# CONFIG_NET_DIVERT is not set

# CONFIG_ECONET is not set

# CONFIG_WAN_ROUTER is not set
@@ -377,6 +386,7 @@ CONFIG_BLK_DEV_AMD74XX=y 
# CONFIG_BLK_DEV_CS5530 is not set

# CONFIG_BLK_DEV_HPT34X is not set

# CONFIG_BLK_DEV_HPT366 is not set

# CONFIG_BLK_DEV_JMICRON is not set

# CONFIG_BLK_DEV_SC1200 is not set

# CONFIG_BLK_DEV_PIIX is not set

# CONFIG_BLK_DEV_IT821X is not set
@@ -399,6 +409,12 @@ CONFIG_IDEDMA_AUTO=y 
#

# CONFIG_RAID_ATTRS is not set

# CONFIG_SCSI is not set

# CONFIG_SCSI_NETLINK is not set



#

# Serial ATA (prod) and Parallel ATA (experimental) drivers

#

# CONFIG_ATA is not set



#

# Multi-device support (RAID and LVM)
@@ -498,7 +514,7 @@ CONFIG_E1000=y 
# CONFIG_VIA_VELOCITY is not set

CONFIG_TIGON3=y

# CONFIG_BNX2 is not set

# CONFIG_MV643XX_ETH is not set

# CONFIG_QLA3XXX is not set



#

# Ethernet (10000 Mbit)
@@ -545,6 +561,7 @@ CONFIG_TIGON3=y 
# Input device support

#

CONFIG_INPUT=y

# CONFIG_INPUT_FF_MEMLESS is not set



#

# Userland interfaces
@@ -704,6 +721,7 @@ CONFIG_I2C_AMD8111=y 
#

# Misc devices

#

# CONFIG_TIFM_CORE is not set



#

# Multimedia devices
@@ -779,7 +797,6 @@ CONFIG_USB_UHCI_HCD=y 
#

# may also be needed; see USB_STORAGE Help for more information

#

# CONFIG_USB_STORAGE is not set

# CONFIG_USB_LIBUSUAL is not set



#
@@ -802,6 +819,7 @@ CONFIG_USB_HIDINPUT=y 
# CONFIG_USB_ATI_REMOTE2 is not set

# CONFIG_USB_KEYSPAN_REMOTE is not set

# CONFIG_USB_APPLETOUCH is not set

# CONFIG_USB_TRANCEVIBRATOR is not set



#

# USB Imaging devices
@@ -828,6 +846,7 @@ CONFIG_USB_MON=y 
CONFIG_USB_SERIAL=y

# CONFIG_USB_SERIAL_CONSOLE is not set

CONFIG_USB_SERIAL_GENERIC=y

# CONFIG_USB_SERIAL_AIRCABLE is not set

# CONFIG_USB_SERIAL_AIRPRIME is not set

# CONFIG_USB_SERIAL_ARK3116 is not set

# CONFIG_USB_SERIAL_BELKIN is not set
@@ -862,6 +881,7 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y 
# CONFIG_USB_SERIAL_KLSI is not set

# CONFIG_USB_SERIAL_KOBIL_SCT is not set

# CONFIG_USB_SERIAL_MCT_U232 is not set

# CONFIG_USB_SERIAL_MOS7840 is not set

# CONFIG_USB_SERIAL_NAVMAN is not set

# CONFIG_USB_SERIAL_PL2303 is not set

# CONFIG_USB_SERIAL_HP4X is not set
@@ -879,6 +899,7 @@ CONFIG_USB_EZUSB=y 
#

# CONFIG_USB_EMI62 is not set

# CONFIG_USB_EMI26 is not set

# CONFIG_USB_ADUTUX is not set

# CONFIG_USB_AUERSWALD is not set

# CONFIG_USB_RIO500 is not set

# CONFIG_USB_LEGOTOWER is not set
@@ -886,9 +907,9 @@ CONFIG_USB_EZUSB=y 
# CONFIG_USB_LED is not set

# CONFIG_USB_CYPRESS_CY7C63 is not set

# CONFIG_USB_CYTHERM is not set

# CONFIG_USB_PHIDGETKIT is not set

# CONFIG_USB_PHIDGETSERVO is not set

# CONFIG_USB_PHIDGET is not set

# CONFIG_USB_IDMOUSE is not set

# CONFIG_USB_FTDI_ELAN is not set

# CONFIG_USB_APPLEDISPLAY is not set

# CONFIG_USB_SISUSBVGA is not set

# CONFIG_USB_LD is not set
@@ -995,8 +1016,10 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" 
#

CONFIG_PROC_FS=y

CONFIG_PROC_KCORE=y

CONFIG_PROC_SYSCTL=y

CONFIG_SYSFS=y

CONFIG_TMPFS=y

# CONFIG_TMPFS_POSIX_ACL is not set

CONFIG_HUGETLBFS=y

CONFIG_HUGETLB_PAGE=y

CONFIG_RAMFS=y
@@ -1129,6 +1152,7 @@ CONFIG_PLIST=y 
# Kernel hacking

#

# CONFIG_PRINTK_TIME is not set

CONFIG_ENABLE_MUST_CHECK=y

CONFIG_MAGIC_SYSRQ=y

# CONFIG_UNUSED_SYMBOLS is not set

CONFIG_DEBUG_KERNEL=y
@@ -1148,6 +1172,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y 
# CONFIG_DEBUG_INFO is not set

CONFIG_DEBUG_FS=y

# CONFIG_DEBUG_VM is not set

# CONFIG_DEBUG_LIST is not set

# CONFIG_FORCED_INLINING is not set

# CONFIG_RCU_TORTURE_TEST is not set

CONFIG_DEBUG_STACKOVERFLOW=y
@@ -1169,6 +1194,9 @@ CONFIG_BOOTX_TEXT=y 
# Cryptographic options

#

CONFIG_CRYPTO=y

CONFIG_CRYPTO_ALGAPI=y

CONFIG_CRYPTO_BLKCIPHER=m

CONFIG_CRYPTO_MANAGER=m

# CONFIG_CRYPTO_HMAC is not set

# CONFIG_CRYPTO_NULL is not set

# CONFIG_CRYPTO_MD4 is not set
@@ -1178,6 +1206,8 @@ CONFIG_CRYPTO_MD5=y 
# CONFIG_CRYPTO_SHA512 is not set

# CONFIG_CRYPTO_WP512 is not set

# CONFIG_CRYPTO_TGR192 is not set

CONFIG_CRYPTO_ECB=m

CONFIG_CRYPTO_CBC=m

CONFIG_CRYPTO_DES=y

# CONFIG_CRYPTO_BLOWFISH is not set

# CONFIG_CRYPTO_TWOFISH is not set

arch/powerpc/platforms/maple/pci.c

+181 −6
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
 * 2 of the License, or (at your option) any later version.

 */



#define DEBUG

#undef DEBUG



#include <linux/kernel.h>

#include <linux/pci.h>
@@ -16,6 +16,7 @@ 
#include <linux/string.h>

#include <linux/init.h>

#include <linux/bootmem.h>

#include <linux/irq.h>



#include <asm/sections.h>

#include <asm/io.h>
@@ -33,7 +34,7 @@ 
#define DBG(x...)

#endif



static struct pci_controller *u3_agp, *u3_ht;

static struct pci_controller *u3_agp, *u3_ht, *u4_pcie;



static int __init fixup_one_level_bus_range(struct device_node *node, int higher)

{
@@ -287,6 +288,114 @@ static struct pci_ops u3_ht_pci_ops = 
	u3_ht_write_config

};



static unsigned int u4_pcie_cfa0(unsigned int devfn, unsigned int off)

{

	return (1 << PCI_SLOT(devfn))	|

	       (PCI_FUNC(devfn) << 8)	|

	       ((off >> 8) << 28) 	|

	       (off & 0xfcu);

}



static unsigned int u4_pcie_cfa1(unsigned int bus, unsigned int devfn,

				 unsigned int off)

{

        return (bus << 16)		|

	       (devfn << 8)		|

	       ((off >> 8) << 28)	|

	       (off & 0xfcu)		| 1u;

}



static volatile void __iomem *u4_pcie_cfg_access(struct pci_controller* hose,

                                        u8 bus, u8 dev_fn, int offset)

{

        unsigned int caddr;



        if (bus == hose->first_busno)

                caddr = u4_pcie_cfa0(dev_fn, offset);

        else

                caddr = u4_pcie_cfa1(bus, dev_fn, offset);



        /* Uninorth will return garbage if we don't read back the value ! */

        do {

                out_le32(hose->cfg_addr, caddr);

        } while (in_le32(hose->cfg_addr) != caddr);



        offset &= 0x03;

        return hose->cfg_data + offset;

}



static int u4_pcie_read_config(struct pci_bus *bus, unsigned int devfn,

                               int offset, int len, u32 *val)

{

        struct pci_controller *hose;

        volatile void __iomem *addr;



        hose = pci_bus_to_host(bus);

        if (hose == NULL)

                return PCIBIOS_DEVICE_NOT_FOUND;

        if (offset >= 0x1000)

                return  PCIBIOS_BAD_REGISTER_NUMBER;

        addr = u4_pcie_cfg_access(hose, bus->number, devfn, offset);

        if (!addr)

                return PCIBIOS_DEVICE_NOT_FOUND;

        /*

         * Note: the caller has already checked that offset is

         * suitably aligned and that len is 1, 2 or 4.

         */

        switch (len) {

        case 1:

                *val = in_8(addr);

                break;

        case 2:

                *val = in_le16(addr);

                break;

        default:

                *val = in_le32(addr);

                break;

        }

        return PCIBIOS_SUCCESSFUL;

}

static int u4_pcie_write_config(struct pci_bus *bus, unsigned int devfn,

                                int offset, int len, u32 val)

{

        struct pci_controller *hose;

        volatile void __iomem *addr;



        hose = pci_bus_to_host(bus);

        if (hose == NULL)

                return PCIBIOS_DEVICE_NOT_FOUND;

        if (offset >= 0x1000)

                return  PCIBIOS_BAD_REGISTER_NUMBER;

        addr = u4_pcie_cfg_access(hose, bus->number, devfn, offset);

        if (!addr)

                return PCIBIOS_DEVICE_NOT_FOUND;

        /*

         * Note: the caller has already checked that offset is

         * suitably aligned and that len is 1, 2 or 4.

         */

        switch (len) {

        case 1:

                out_8(addr, val);

                (void) in_8(addr);

                break;

        case 2:

                out_le16(addr, val);

                (void) in_le16(addr);

                break;

        default:

                out_le32(addr, val);

                (void) in_le32(addr);

                break;

        }

        return PCIBIOS_SUCCESSFUL;

}



static struct pci_ops u4_pcie_pci_ops =

{

        u4_pcie_read_config,

        u4_pcie_write_config

};



static void __init setup_u3_agp(struct pci_controller* hose)

{

	/* On G5, we move AGP up to high bus number so we don't need
@@ -307,6 +416,26 @@ static void __init setup_u3_agp(struct pci_controller* hose) 
	u3_agp = hose;

}



static void __init setup_u4_pcie(struct pci_controller* hose)

{

        /* We currently only implement the "non-atomic" config space, to

         * be optimised later.

         */

        hose->ops = &u4_pcie_pci_ops;

        hose->cfg_addr = ioremap(0xf0000000 + 0x800000, 0x1000);

        hose->cfg_data = ioremap(0xf0000000 + 0xc00000, 0x1000);



        /* The bus contains a bridge from root -> device, we need to

         * make it visible on bus 0 so that we pick the right type

         * of config cycles. If we didn't, we would have to force all

         * config cycles to be type 1. So we override the "bus-range"

         * property here

         */

        hose->first_busno = 0x00;

        hose->last_busno = 0xff;

        u4_pcie = hose;

}



static void __init setup_u3_ht(struct pci_controller* hose)

{

	hose->ops = &u3_ht_pci_ops;
@@ -354,6 +483,10 @@ static int __init add_bridge(struct device_node *dev) 
		setup_u3_ht(hose);

		disp_name = "U3-HT";

		primary = 1;

        } else if (device_is_compatible(dev, "u4-pcie")) {

                setup_u4_pcie(hose);

                disp_name = "U4-PCIE";

                primary = 0;

	}

	printk(KERN_INFO "Found %s PCI host bridge. Firmware bus number: %d->%d\n",

		disp_name, hose->first_busno, hose->last_busno);
@@ -361,7 +494,6 @@ static int __init add_bridge(struct device_node *dev) 
	/* Interpret the "ranges" property */

	/* This also maps the I/O region and sets isa_io/mem_base */

	pci_process_bridge_OF_ranges(hose, dev, primary);

	pci_setup_phb_io(hose, primary);



	/* Fixup "bus-range" OF property */

	fixup_bus_range(dev);
@@ -376,8 +508,30 @@ void __init maple_pcibios_fixup(void) 


	DBG(" -> maple_pcibios_fixup\n");



	for_each_pci_dev(dev)

	for_each_pci_dev(dev) {

		/* Fixup IRQ for PCIe host */

		if (u4_pcie != NULL && dev->bus->number == 0 &&

		    pci_bus_to_host(dev->bus) == u4_pcie) {

			printk(KERN_DEBUG "Fixup U4 PCIe IRQ\n");

			dev->irq = irq_create_mapping(NULL, 1);

			if (dev->irq != NO_IRQ)

				set_irq_type(dev->irq, IRQ_TYPE_LEVEL_LOW);

			continue;

		}



		/* Hide AMD8111 IDE interrupt when in legacy mode so

		 * the driver calls pci_get_legacy_ide_irq()

		 */

		if (dev->vendor == PCI_VENDOR_ID_AMD &&

		    dev->device == PCI_DEVICE_ID_AMD_8111_IDE &&

		    (dev->class & 5) != 5) {

			dev->irq = NO_IRQ;

			continue;

		}



		/* For all others, map the interrupt from the device-tree */

		pci_read_irq_line(dev);

	}



	DBG(" <- maple_pcibios_fixup\n");

}
@@ -388,8 +542,10 @@ static void __init maple_fixup_phb_resources(void) 
	

	list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {

		unsigned long offset = (unsigned long)hose->io_base_virt - pci_io_base;



		hose->io_resource.start += offset;

		hose->io_resource.end += offset;



		printk(KERN_INFO "PCI Host %d, io start: %llx; io end: %llx\n",

		       hose->global_number,

		       (unsigned long long)hose->io_resource.start,
@@ -431,6 +587,19 @@ void __init maple_pci_init(void) 
	if (ht && add_bridge(ht) != 0)

		of_node_put(ht);



        /*

         * We need to call pci_setup_phb_io for the HT bridge first

         * so it gets the I/O port numbers starting at 0, and we

         * need to call it for the AGP bridge after that so it gets

         * small positive I/O port numbers.

         */

        if (u3_ht)

                pci_setup_phb_io(u3_ht, 1);

        if (u3_agp)

                pci_setup_phb_io(u3_agp, 0);

        if (u4_pcie)

                pci_setup_phb_io(u4_pcie, 0);



	/* Fixup the IO resources on our host bridges as the common code

	 * does it only for childs of the host bridges

	 */
@@ -465,8 +634,11 @@ int maple_pci_get_legacy_ide_irq(struct pci_dev *pdev, int channel) 
		return defirq;



	np = pci_device_to_OF_node(pdev);

	if (np == NULL)

	if (np == NULL) {

		printk("Failed to locate OF node for IDE %s\n",

		       pci_name(pdev));

		return defirq;

	}

	irq = irq_of_parse_and_map(np, channel & 0x1);

	if (irq == NO_IRQ) {

		printk("Failed to map onboard IDE interrupt for channel %d\n",
@@ -479,6 +651,9 @@ int maple_pci_get_legacy_ide_irq(struct pci_dev *pdev, int channel) 
/* XXX: To remove once all firmwares are ok */

static void fixup_maple_ide(struct pci_dev* dev)

{

	if (!machine_is(maple))

		return;



#if 0 /* Enable this to enable IDE port 0 */

	{

		u8 v;
@@ -495,7 +670,7 @@ static void fixup_maple_ide(struct pci_dev* dev) 
	dev->resource[4].start = 0xcc00;

	dev->resource[4].end = 0xcc10;

#endif

#if 1 /* Enable this to fixup IDE sense/polarity of irqs in IO-APICs */

#if 0 /* Enable this to fixup IDE sense/polarity of irqs in IO-APICs */

	{

		struct pci_dev *apicdev;

		u32 v;

arch/powerpc/platforms/powermac/smp.c

+6 −1
Original line number Diff line number Diff line
@@ -328,6 +328,7 @@ static void __init smp_psurge_kick_cpu(int nr) 
{

	unsigned long start = __pa(__secondary_start_pmac_0) + nr * 8;

	unsigned long a;

	int i;



	/* may need to flush here if secondary bats aren't setup */

	for (a = KERNELBASE; a < KERNELBASE + 0x800000; a += 32)
@@ -340,7 +341,11 @@ static void __init smp_psurge_kick_cpu(int nr) 
	mb();



	psurge_set_ipi(nr);

	udelay(10);

	/*

	 * We can't use udelay here because the timebase is now frozen.

	 */

	for (i = 0; i < 2000; ++i)

		barrier();

	psurge_clr_ipi(nr);



	if (ppc_md.progress) ppc_md.progress("smp_psurge_kick_cpu - done", 0x354);

arch/powerpc/xmon/xmon.c

+3 −3
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <asm/rtas.h>

#include <asm/sstep.h>

#include <asm/bug.h>

#include <asm/irq_regs.h>



#ifdef CONFIG_PPC64

#include <asm/hvcall.h>
@@ -521,13 +522,12 @@ int xmon(struct pt_regs *excp) 
}

EXPORT_SYMBOL(xmon);



irqreturn_t

xmon_irq(int irq, void *d, struct pt_regs *regs)

irqreturn_t xmon_irq(int irq, void *d)

{

	unsigned long flags;

	local_irq_save(flags);

	printf("Keyboard interrupt\n");

	xmon(regs);

	xmon(get_irq_regs());

	local_irq_restore(flags);

	return IRQ_HANDLED;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE