IRQ-Tables once again

[Stefan Reinauer]

Hi,

I'm trying to factor the IRQ Table generation a bit, since the
current way to write an IRQ Table plain sucks. This means

* gather all information before actually generating the table
* gather information in a readable and adjustable way.

I juggled with the Arima Hdama irq table, since this one seems to 
work. (See attachment)

Currently I have a couple of defines that are hardcoded into the file.
This should maybe be moved to the motherboard configuration files. 
(At least I would move them and the IRQ_SLOT_COUNT together)

#define IRQ_ROUTER_BUS          1
#define IRQ_ROUTER_DEVFN        PCI_DEVFN(4,3)
#define IRQ_ROUTER_VENDOR       0x1022
#define IRQ_ROUTER_DEVICE       0x746b
#define AVAILABLE_IRQS          0xdef8

Then I substituted the longish irq table entries with a macro
IRQ_SLOT which takes the following arguments:
 * slot number
 * bus,dev,fn
 * 4* irq link line id

Example:
/* PCI Slot 1 */
IRQ_SLOT (1, 3,1,0, 2,3,4,1 ),
/* Let Linux know about bus 1 */
IRQ_SLOT (0, 1,4,3, 0,0,0,0 ),

If there are no objections, I am going to make this change in the code.
Who else is having IRQ Table trouble here?

  Stefan

-- 
     Stefan Reinauer, SUSE LINUX AG
Teamleader Architecture Development
-------------- next part --------------
#include <arch/pirq_routing.h>
#include <device/pci.h>

#define IRQ_ROUTER_BUS		1
#define IRQ_ROUTER_DEVFN	PCI_DEVFN(4,3)
#define IRQ_ROUTER_VENDOR	0x1022
#define IRQ_ROUTER_DEVICE	0x746b

#define AVAILABLE_IRQS 0xdef8
#define IRQ_SLOT(slot, bus, dev, fn, linka, linkb, linkc, linkd) \
	{ bus, (dev<<3)|fn, {{ linka, AVAILABLE_IRQS}, { linkb, AVAILABLE_IRQS}, \
	{linkc, AVAILABLE_IRQS}, {linkd, AVAILABLE_IRQS}}, slot, 0}

/*  Each IRQ_SLOT entry consists of:
 *  bus, devfn, {link, bitmap}, {link, bitmap}, {link, bitmap}, {link, bitmap}, slot, rfu  
 */

const struct irq_routing_table intel_irq_routing_table = {
	PIRQ_SIGNATURE,		/* u32 signature */
	PIRQ_VERSION,		/* u16 version   */
	32+16*IRQ_SLOT_COUNT,	/* there can be total IRQ_SLOT_COUNT 
				 * devices on the bus */
	IRQ_ROUTER_BUS,		/* Where the interrupt router lies (bus) */
	IRQ_ROUTER_DEVFN,	/* Where the interrupt router lies (dev) */
	0x00,			/* IRQs devoted exclusively to PCI usage */
	IRQ_ROUTER_VENDOR,	/* Vendor */
	IRQ_ROUTER_DEVICE,	/* Device */
	0x00,			/* Crap (miniport) */
	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },	/* u8 rfu[11] */
	0x00,			/*  u8 checksum , mod 256 checksum must give
				 *  zero, will be corrected later 
				 */
	{

		/* slot(0=onboard), devfn, irqlinks (line id, 0=not routed) */

		/* PCI Slot 1-6 */
		IRQ_SLOT (1, 3,1,0, 2,3,4,1 ),
		IRQ_SLOT (2, 3,2,0, 3,4,1,2 ),
		IRQ_SLOT (3, 2,1,0, 2,3,4,1 ),
		IRQ_SLOT (4, 2,2,0, 3,4,1,2 ),
		IRQ_SLOT (5, 4,5,0, 2,3,4,1 ),
		IRQ_SLOT (6, 4,4,0, 1,2,3,4 ),

		/* Onboard NICs */
		IRQ_SLOT (0, 2,3,0, 4,0,0,0 ),
		IRQ_SLOT (0, 2,4,0, 4,0,0,0 ),

		/* Let Linux know about bus 1 */
		IRQ_SLOT (0, 1,4,3, 0,0,0,0 ),
	}
};