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

Commit 89ef68f0 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Linus Torvalds
Browse files

[PATCH] ppc64 iSeries: remove XmPciLpEvent.c 



This patch just merges XmPciLpEvent.c into iSeries_irq.c (the only caller of
its only external function).  XmPciLpEvent.c just contained the lowlevel
iSeries irq code.

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 0c3b4f1a

arch/ppc64/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ pci-obj-$(CONFIG_PPC_MULTIPLATFORM) += pci_dn.o pci_direct_iommu.o 


obj-$(CONFIG_PCI)	+= pci.o pci_iommu.o iomap.o $(pci-obj-y)



obj-$(CONFIG_PPC_ISERIES) += iSeries_irq.o XmPciLpEvent.o \

obj-$(CONFIG_PPC_ISERIES) += iSeries_irq.o \

			     HvCall.o HvLpConfig.o LparData.o \

			     iSeries_setup.o ItLpQueue.o hvCall.o \

			     mf.o HvLpEvent.o iSeries_proc.o iSeries_htab.o \

arch/ppc64/kernel/XmPciLpEvent.c

deleted100644 → 0
+0 −183
Original line number Diff line number Diff line 
/*

 * File XmPciLpEvent.c created by Wayne Holm on Mon Jan 15 2001.

 *

 * This module handles PCI interrupt events sent by the iSeries Hypervisor.

 */

#include <linux/config.h>

#include <linux/pci.h>

#include <linux/init.h>

#include <linux/threads.h>

#include <linux/smp.h>

#include <linux/param.h>

#include <linux/string.h>

#include <linux/bootmem.h>

#include <linux/ide.h>



#include <asm/iSeries/HvTypes.h>

#include <asm/iSeries/HvLpEvent.h>

#include <asm/iSeries/HvCallPci.h>

#include <asm/iSeries/iSeries_irq.h>

#include <asm/ppcdebug.h>



static long Pci_Interrupt_Count;

static long Pci_Event_Count;



enum XmPciLpEvent_Subtype {

	XmPciLpEvent_BusCreated		= 0,	// PHB has been created

	XmPciLpEvent_BusError		= 1,	// PHB has failed

	XmPciLpEvent_BusFailed		= 2,	// Msg to Secondary, Primary failed bus

	XmPciLpEvent_NodeFailed		= 4,	// Multi-adapter bridge has failed

	XmPciLpEvent_NodeRecovered	= 5,	// Multi-adapter bridge has recovered

	XmPciLpEvent_BusRecovered	= 12,	// PHB has been recovered

	XmPciLpEvent_UnQuiesceBus	= 18,	// Secondary bus unqiescing

	XmPciLpEvent_BridgeError	= 21,	// Bridge Error

	XmPciLpEvent_SlotInterrupt	= 22	// Slot interrupt

};



struct XmPciLpEvent_BusInterrupt {

	HvBusNumber	busNumber;

	HvSubBusNumber	subBusNumber;

};



struct XmPciLpEvent_NodeInterrupt {

	HvBusNumber	busNumber;

	HvSubBusNumber	subBusNumber;

	HvAgentId	deviceId;

};



struct XmPciLpEvent {

	struct HvLpEvent hvLpEvent;



	union {

		u64 alignData;			// Align on an 8-byte boundary



		struct {

			u32		fisr;

			HvBusNumber	busNumber;

			HvSubBusNumber	subBusNumber;

			HvAgentId	deviceId;

		} slotInterrupt;



		struct XmPciLpEvent_BusInterrupt busFailed;

		struct XmPciLpEvent_BusInterrupt busRecovered;

		struct XmPciLpEvent_BusInterrupt busCreated;



		struct XmPciLpEvent_NodeInterrupt nodeFailed;

		struct XmPciLpEvent_NodeInterrupt nodeRecovered;



	} eventData;



};



static void intReceived(struct XmPciLpEvent *eventParm,

		struct pt_regs *regsParm)

{

	int irq;



	++Pci_Interrupt_Count;

#if 0

	PPCDBG(PPCDBG_BUSWALK, "PCI: XmPciLpEvent.c: intReceived\n");

#endif



	switch (eventParm->hvLpEvent.xSubtype) {

	case XmPciLpEvent_SlotInterrupt:

		irq = eventParm->hvLpEvent.xCorrelationToken;

		/* Dispatch the interrupt handlers for this irq */

		ppc_irq_dispatch_handler(regsParm, irq);

		HvCallPci_eoi(eventParm->eventData.slotInterrupt.busNumber,

			eventParm->eventData.slotInterrupt.subBusNumber,

			eventParm->eventData.slotInterrupt.deviceId);

		break;

		/* Ignore error recovery events for now */

	case XmPciLpEvent_BusCreated:

		printk(KERN_INFO "XmPciLpEvent.c: system bus %d created\n",

			eventParm->eventData.busCreated.busNumber);

		break;

	case XmPciLpEvent_BusError:

	case XmPciLpEvent_BusFailed:

		printk(KERN_INFO "XmPciLpEvent.c: system bus %d failed\n",

			eventParm->eventData.busFailed.busNumber);

		break;

	case XmPciLpEvent_BusRecovered:

	case XmPciLpEvent_UnQuiesceBus:

		printk(KERN_INFO "XmPciLpEvent.c: system bus %d recovered\n",

			eventParm->eventData.busRecovered.busNumber);

		break;

	case XmPciLpEvent_NodeFailed:

	case XmPciLpEvent_BridgeError:

		printk(KERN_INFO

			"XmPciLpEvent.c: multi-adapter bridge %d/%d/%d failed\n",

			eventParm->eventData.nodeFailed.busNumber,

			eventParm->eventData.nodeFailed.subBusNumber,

			eventParm->eventData.nodeFailed.deviceId);

		break;

	case XmPciLpEvent_NodeRecovered:

		printk(KERN_INFO

			"XmPciLpEvent.c: multi-adapter bridge %d/%d/%d recovered\n",

			eventParm->eventData.nodeRecovered.busNumber,

			eventParm->eventData.nodeRecovered.subBusNumber,

			eventParm->eventData.nodeRecovered.deviceId);

		break;

	default:

		printk(KERN_ERR

			"XmPciLpEvent.c: unrecognized event subtype 0x%x\n",

			eventParm->hvLpEvent.xSubtype);

		break;

	}

}



static void XmPciLpEvent_handler(struct HvLpEvent *eventParm,

		struct pt_regs *regsParm)

{

#ifdef CONFIG_PCI

#if 0

	PPCDBG(PPCDBG_BUSWALK, "XmPciLpEvent_handler, type 0x%x\n",

			eventParm->xType);

#endif

	++Pci_Event_Count;



	if (eventParm && (eventParm->xType == HvLpEvent_Type_PciIo)) {

		switch (eventParm->xFlags.xFunction) {

		case HvLpEvent_Function_Int:

			intReceived((struct XmPciLpEvent *)eventParm, regsParm);

			break;

		case HvLpEvent_Function_Ack:

			printk(KERN_ERR

				"XmPciLpEvent.c: unexpected ack received\n");

			break;

		default:

			printk(KERN_ERR

				"XmPciLpEvent.c: unexpected event function %d\n",

				(int)eventParm->xFlags.xFunction);

			break;

		}

	} else if (eventParm)

		printk(KERN_ERR

			"XmPciLpEvent.c: Unrecognized PCI event type 0x%x\n",

			(int)eventParm->xType);

	else

		printk(KERN_ERR "XmPciLpEvent.c: NULL event received\n");

#endif

}



/* This should be called sometime prior to buswalk (init_IRQ would be good) */

int XmPciLpEvent_init()

{

	int xRc;



	PPCDBG(PPCDBG_BUSWALK,

			"XmPciLpEvent_init, Register Event type 0x%04X\n",

			HvLpEvent_Type_PciIo);



	xRc = HvLpEvent_registerHandler(HvLpEvent_Type_PciIo,

			&XmPciLpEvent_handler);

	if (xRc == 0) {

		xRc = HvLpEvent_openPath(HvLpEvent_Type_PciIo, 0);

		if (xRc != 0)

			printk(KERN_ERR "XmPciLpEvent.c: open event path "

					"failed with rc 0x%x\n", xRc);

	} else

		printk(KERN_ERR "XmPciLpEvent.c: register handler "

				"failed with rc 0x%x\n", xRc);

	return xRc;

}

arch/ppc64/kernel/iSeries_irq.c

+168 −2
Original line number Diff line number Diff line 
/*

 * This module supports the iSeries PCI bus interrupt handling

 * Copyright (C) 20yy  <Robert L Holtorf> <IBM Corp>

 * Copyright (C) 2004-2005 IBM Corporation

 *

 * 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
@@ -22,6 +23,7 @@ 
 *   Created, December 13, 2000 by Wayne Holm

 * End Change Activity

 */

#include <linux/config.h>

#include <linux/pci.h>

#include <linux/init.h>

#include <linux/threads.h>
@@ -30,11 +32,12 @@ 
#include <linux/string.h>

#include <linux/bootmem.h>

#include <linux/ide.h>



#include <linux/irq.h>

#include <linux/spinlock.h>

#include <asm/ppcdebug.h>



#include <asm/ppcdebug.h>

#include <asm/iSeries/HvTypes.h>

#include <asm/iSeries/HvLpEvent.h>

#include <asm/iSeries/HvCallPci.h>

#include <asm/iSeries/HvCallXm.h>

#include <asm/iSeries/iSeries_irq.h>
@@ -46,6 +49,169 @@ unsigned int virt_irq_to_real_map[NR_IRQS]; 
/* Note: the pcnet32 driver assumes irq numbers < 2 aren't valid. :( */

static int next_virtual_irq = 2;



static long Pci_Interrupt_Count;

static long Pci_Event_Count;



enum XmPciLpEvent_Subtype {

	XmPciLpEvent_BusCreated		= 0,	// PHB has been created

	XmPciLpEvent_BusError		= 1,	// PHB has failed

	XmPciLpEvent_BusFailed		= 2,	// Msg to Secondary, Primary failed bus

	XmPciLpEvent_NodeFailed		= 4,	// Multi-adapter bridge has failed

	XmPciLpEvent_NodeRecovered	= 5,	// Multi-adapter bridge has recovered

	XmPciLpEvent_BusRecovered	= 12,	// PHB has been recovered

	XmPciLpEvent_UnQuiesceBus	= 18,	// Secondary bus unqiescing

	XmPciLpEvent_BridgeError	= 21,	// Bridge Error

	XmPciLpEvent_SlotInterrupt	= 22	// Slot interrupt

};



struct XmPciLpEvent_BusInterrupt {

	HvBusNumber	busNumber;

	HvSubBusNumber	subBusNumber;

};



struct XmPciLpEvent_NodeInterrupt {

	HvBusNumber	busNumber;

	HvSubBusNumber	subBusNumber;

	HvAgentId	deviceId;

};



struct XmPciLpEvent {

	struct HvLpEvent hvLpEvent;



	union {

		u64 alignData;			// Align on an 8-byte boundary



		struct {

			u32		fisr;

			HvBusNumber	busNumber;

			HvSubBusNumber	subBusNumber;

			HvAgentId	deviceId;

		} slotInterrupt;



		struct XmPciLpEvent_BusInterrupt busFailed;

		struct XmPciLpEvent_BusInterrupt busRecovered;

		struct XmPciLpEvent_BusInterrupt busCreated;



		struct XmPciLpEvent_NodeInterrupt nodeFailed;

		struct XmPciLpEvent_NodeInterrupt nodeRecovered;



	} eventData;



};



static void intReceived(struct XmPciLpEvent *eventParm,

		struct pt_regs *regsParm)

{

	int irq;



	++Pci_Interrupt_Count;

#if 0

	PPCDBG(PPCDBG_BUSWALK, "PCI: XmPciLpEvent.c: intReceived\n");

#endif



	switch (eventParm->hvLpEvent.xSubtype) {

	case XmPciLpEvent_SlotInterrupt:

		irq = eventParm->hvLpEvent.xCorrelationToken;

		/* Dispatch the interrupt handlers for this irq */

		ppc_irq_dispatch_handler(regsParm, irq);

		HvCallPci_eoi(eventParm->eventData.slotInterrupt.busNumber,

			eventParm->eventData.slotInterrupt.subBusNumber,

			eventParm->eventData.slotInterrupt.deviceId);

		break;

		/* Ignore error recovery events for now */

	case XmPciLpEvent_BusCreated:

		printk(KERN_INFO "XmPciLpEvent.c: system bus %d created\n",

			eventParm->eventData.busCreated.busNumber);

		break;

	case XmPciLpEvent_BusError:

	case XmPciLpEvent_BusFailed:

		printk(KERN_INFO "XmPciLpEvent.c: system bus %d failed\n",

			eventParm->eventData.busFailed.busNumber);

		break;

	case XmPciLpEvent_BusRecovered:

	case XmPciLpEvent_UnQuiesceBus:

		printk(KERN_INFO "XmPciLpEvent.c: system bus %d recovered\n",

			eventParm->eventData.busRecovered.busNumber);

		break;

	case XmPciLpEvent_NodeFailed:

	case XmPciLpEvent_BridgeError:

		printk(KERN_INFO

			"XmPciLpEvent.c: multi-adapter bridge %d/%d/%d failed\n",

			eventParm->eventData.nodeFailed.busNumber,

			eventParm->eventData.nodeFailed.subBusNumber,

			eventParm->eventData.nodeFailed.deviceId);

		break;

	case XmPciLpEvent_NodeRecovered:

		printk(KERN_INFO

			"XmPciLpEvent.c: multi-adapter bridge %d/%d/%d recovered\n",

			eventParm->eventData.nodeRecovered.busNumber,

			eventParm->eventData.nodeRecovered.subBusNumber,

			eventParm->eventData.nodeRecovered.deviceId);

		break;

	default:

		printk(KERN_ERR

			"XmPciLpEvent.c: unrecognized event subtype 0x%x\n",

			eventParm->hvLpEvent.xSubtype);

		break;

	}

}



static void XmPciLpEvent_handler(struct HvLpEvent *eventParm,

		struct pt_regs *regsParm)

{

#ifdef CONFIG_PCI

#if 0

	PPCDBG(PPCDBG_BUSWALK, "XmPciLpEvent_handler, type 0x%x\n",

			eventParm->xType);

#endif

	++Pci_Event_Count;



	if (eventParm && (eventParm->xType == HvLpEvent_Type_PciIo)) {

		switch (eventParm->xFlags.xFunction) {

		case HvLpEvent_Function_Int:

			intReceived((struct XmPciLpEvent *)eventParm, regsParm);

			break;

		case HvLpEvent_Function_Ack:

			printk(KERN_ERR

				"XmPciLpEvent.c: unexpected ack received\n");

			break;

		default:

			printk(KERN_ERR

				"XmPciLpEvent.c: unexpected event function %d\n",

				(int)eventParm->xFlags.xFunction);

			break;

		}

	} else if (eventParm)

		printk(KERN_ERR

			"XmPciLpEvent.c: Unrecognized PCI event type 0x%x\n",

			(int)eventParm->xType);

	else

		printk(KERN_ERR "XmPciLpEvent.c: NULL event received\n");

#endif

}



/* This should be called sometime prior to buswalk (init_IRQ would be good) */

int XmPciLpEvent_init()

{

	int xRc;



	PPCDBG(PPCDBG_BUSWALK,

			"XmPciLpEvent_init, Register Event type 0x%04X\n",

			HvLpEvent_Type_PciIo);



	xRc = HvLpEvent_registerHandler(HvLpEvent_Type_PciIo,

			&XmPciLpEvent_handler);

	if (xRc == 0) {

		xRc = HvLpEvent_openPath(HvLpEvent_Type_PciIo, 0);

		if (xRc != 0)

			printk(KERN_ERR "XmPciLpEvent.c: open event path "

					"failed with rc 0x%x\n", xRc);

	} else

		printk(KERN_ERR "XmPciLpEvent.c: register handler "

				"failed with rc 0x%x\n", xRc);

	return xRc;

}



/* This is called by init_IRQ.  set in ppc_md.init_IRQ by iSeries_setup.c */

void __init iSeries_init_IRQ(void)

{