[RFC][PATCH 3/9] Support for old IBM PReP boxes

[RFC][PATCH 3/9] Support for old IBM PReP boxes

[Leigh Brown]

This patch adds a function residual_pcidev_irq() which finds out
from the residual data which IRQ the given PCI device should use.
The interesting part about this patch is the changes I made to
prep_pcibios_fixup().  The old code was more than a little
opaque so I tried to change it to make it a bit clearer.  I'd
definitely be pleased if someone could cast their eyes over
that bit.


diff -urNX .diffex linux-2.6.6-prev/arch/ppc/platforms/prep_pci.c
linux-2.6.6/arch/ppc/platforms/prep_pci.c
--- linux-2.6.6-prev/arch/ppc/platforms/prep_pci.c	2004-06-10
14:03:56.000000000 +0100
+++ linux-2.6.6/arch/ppc/platforms/prep_pci.c	2004-06-10
14:04:19.000000000 +0100
@@ -1171,38 +1171,52 @@
 prep_pcibios_fixup(void)
 {
         struct pci_dev *dev = NULL;
+	int irq;
+	int have_openpic = (OpenPIC_Addr != NULL);

 	prep_route_pci_interrupts();

 	printk("Setting PCI interrupts for a \"%s\"\n", Motherboard_map_name);
-	if (OpenPIC_Addr) {
-		/* PCI interrupts are controlled by the OpenPIC */
-		while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
-			if (dev->bus->number == 0) {
-                       		dev->irq =
openpic_to_irq(Motherboard_map[PCI_SLOT(dev->devfn)]);
-				pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq);
-			} else {
-				if (Motherboard_non0 != NULL)
-					Motherboard_non0(dev);
-			}
-		}
-
-		/* Setup the Winbond or Via PIB */
-		prep_pib_init();
-
-		return;
-	}

-	dev = NULL;
+	/* Iterate through all the PCI devices, setting the IRQ */
 	while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
 		/*
-		 * Use our old hard-coded kludge to figure out what
-		 * irq this device uses.  This is necessary on things
-		 * without residual data. -- Cort
+		 * If we have residual data, then this is easy: query the
+		 * residual data for the IRQ line allocated to the device.
+		 * This works the same whether we have an OpenPic or not.
+		 */
+		if (have_residual_data()) {
+			irq = residual_pcidev_irq(dev);
+			dev->irq = have_openpic ? openpic_to_irq(irq) : irq;
+		}
+		/*
+		 * If we don't have residual data, then we need to use
+		 * tables to determine the IRQ.  The table organisation
+		 * is different depending on whether there is an OpenPIC
+		 * or not.  The tables are only used for bus 0, so check
+		 * this first.
 		 */
-		unsigned char d = PCI_SLOT(dev->devfn);
-		dev->irq = Motherboard_routes[Motherboard_map[d]];
+		else if (dev->bus->number == 0) {
+			irq = Motherboard_map[PCI_SLOT(dev->devfn)];
+			dev->irq = have_openpic ? openpic_to_irq(irq)
+						: Motherboard_routes[irq];
+		}
+		/*
+		 * Finally, if we don't have residual data and the bus is
+		 * non-zero, use the callback (if provided)
+		 */
+		else {
+			if (Motherboard_non0 != NULL)
+				Motherboard_non0(dev);
+
+			continue;
+		}
+
+		pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq);
 	}
+
+	/* Setup the Winbond or Via PIB */
+	prep_pib_init();
 }

 static void __init
diff -urNX .diffex linux-2.6.6-prev/arch/ppc/platforms/residual.c
linux-2.6.6/arch/ppc/platforms/residual.c
--- linux-2.6.6-prev/arch/ppc/platforms/residual.c	2004-06-10
14:03:56.000000000 +0100
+++ linux-2.6.6/arch/ppc/platforms/residual.c	2004-06-10
14:04:19.000000000 +0100
@@ -827,6 +827,66 @@
 	return 0;
 }

+static int __init
+residual_scan_pcibridge(PnP_TAG_PACKET * pkt, struct pci_dev *dev)
+{
+	int irq = -1;
+
+#define data pkt->L4_Pack.L4_Data.L4_PPCPack.PPCData
+	if (dev->bus->number == data[16]) {
+		int i, size;
+
+		size = 3 + ld_le16((u_short *) (&pkt->L4_Pack.Count0));
+		for (i = 20; i < size - 4; i += 12) {
+			unsigned char pin;
+			int line_irq;
+
+			if (dev->devfn != data[i + 1])
+				continue;
+
+			pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);
+			if (pin) {
+				line_irq = ld_le16((unsigned short *)
+						(&data[i + 4 + 2 * (pin - 1)]));
+				irq = (line_irq == 0xffff) ? 0
+							   : line_irq & 0x7fff;
+			} else
+				irq = 0;
+
+			break;
+		}
+	}
+#undef data
+
+	return irq;
+}
+
+int __init
+residual_pcidev_irq(struct pci_dev *dev)
+{
+	int i = 0;
+	int irq = -1;
+	PPC_DEVICE *bridge;
+
+	while ((bridge = residual_find_device
+	       (-1, NULL, BridgeController, PCIBridge, -1, i++))) {
+
+		PnP_TAG_PACKET *pkt;
+		if (bridge->AllocatedOffset) {
+			pkt = PnP_find_large_vendor_packet(res->DevicePnPHeap +
+					   bridge->AllocatedOffset, 3, 0);
+			if (!pkt)
+				continue;
+
+			irq = residual_scan_pcibridge(pkt, dev);
+			if (irq != -1)
+				break;
+		}
+	}
+
+	return (irq < 0) ? 0 : irq;
+}
+
 PnP_TAG_PACKET *PnP_find_packet(unsigned char *p,
 				unsigned packet_tag,
 				int n)
diff -urNX .diffex linux-2.6.6-prev/include/asm-ppc/residual.h
linux-2.6.6/include/asm-ppc/residual.h
--- linux-2.6.6-prev/include/asm-ppc/residual.h	2004-06-10
14:03:56.000000000 +0100
+++ linux-2.6.6/include/asm-ppc/residual.h	2004-06-10 14:05:25.000000000
+0100
@@ -315,11 +315,18 @@
   } RESIDUAL;


+/*
+ * Forward declaration - we can't include <linux/pci.h> because it
+ * breaks the boot loader
+ */
+struct pci_dev;
+
 extern RESIDUAL *res;
 extern void print_residual_device_info(void);
 extern PPC_DEVICE *residual_find_device(unsigned long BusMask,
 					unsigned char * DevID, int BaseType,
 					int SubType, int Interface, int n);
+extern int residual_pcidev_irq(struct pci_dev *dev);
 extern PnP_TAG_PACKET *PnP_find_packet(unsigned char *p, unsigned
packet_tag,
 				       int n);
 extern PnP_TAG_PACKET *PnP_find_small_vendor_packet(unsigned char *p,


** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/

Re: [RFC][PATCH 3/9] Support for old IBM PReP boxes

[Tom Rini]

On Thu, Jun 10, 2004 at 05:55:56PM +0100, Leigh Brown wrote:

>
> This patch adds a function residual_pcidev_irq() which finds out
> from the residual data which IRQ the given PCI device should use.
> The interesting part about this patch is the changes I made to
> prep_pcibios_fixup().  The old code was more than a little
> opaque so I tried to change it to make it a bit clearer.  I'd
> definitely be pleased if someone could cast their eyes over
> that bit.

Is this jsut a "Residual Data is Good" type change, or does it fix some
set of IBM machines?  I ask since residual data on Motorola PRePs can be
incorrect, iirc.

--
Tom Rini
http://gate.crashing.org/~trini/

** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/

Re: [RFC][PATCH 3/9] Support for old IBM PReP boxes

[Leigh Brown]

Tom Rini said:
> On Thu, Jun 10, 2004 at 05:55:56PM +0100, Leigh Brown wrote:
>
>>
>> This patch adds a function residual_pcidev_irq() which finds out
>> from the residual data which IRQ the given PCI device should use.
>> The interesting part about this patch is the changes I made to
>> prep_pcibios_fixup().  The old code was more than a little
>> opaque so I tried to change it to make it a bit clearer.  I'd
>> definitely be pleased if someone could cast their eyes over
>> that bit.
>
> Is this jsut a "Residual Data is Good" type change, or does it fix some
> set of IBM machines?  I ask since residual data on Motorola PRePs can be
> incorrect, iirc.

The idea is that we can support machines we don't know about, assuming
their residual data is correct.  IMO it is better to use the residual
data where possible, then add code for those machines that have broken
residual data.

In my experience, the only IBM PReP machines I know that have broken
residual data are the 6020 and 6030 laptops.  I'm planning on adding
code to work around their brokeness when I get a chance.


** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/

Re: [RFC][PATCH 3/9] Support for old IBM PReP boxes

[Tom Rini]

On Thu, Jun 17, 2004 at 05:29:16PM +0100, Leigh Brown wrote:

>
> Tom Rini said:
> > On Thu, Jun 10, 2004 at 05:55:56PM +0100, Leigh Brown wrote:
> >
> >>
> >> This patch adds a function residual_pcidev_irq() which finds out
> >> from the residual data which IRQ the given PCI device should use.
> >> The interesting part about this patch is the changes I made to
> >> prep_pcibios_fixup().  The old code was more than a little
> >> opaque so I tried to change it to make it a bit clearer.  I'd
> >> definitely be pleased if someone could cast their eyes over
> >> that bit.
> >
> > Is this jsut a "Residual Data is Good" type change, or does it fix some
> > set of IBM machines?  I ask since residual data on Motorola PRePs can be
> > incorrect, iirc.
>
> The idea is that we can support machines we don't know about, assuming
> their residual data is correct.  IMO it is better to use the residual
> data where possible, then add code for those machines that have broken
> residual data.
>
> In my experience, the only IBM PReP machines I know that have broken
> residual data are the 6020 and 6030 laptops.  I'm planning on adding
> code to work around their brokeness when I get a chance.

How soon until you might have some sort of code to handle a list of
machines to blacklist residual information on?  If we could do that, and
then use something like that then ignore the bad residual data on Mot
preps, I'd be happier with the first change here.

--
Tom Rini
http://gate.crashing.org/~trini/

** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/

Re: [RFC][PATCH 3/9] Support for old IBM PReP boxes

[Gabriel Paubert]

On Thu, Jun 17, 2004 at 09:16:16AM -0700, Tom Rini wrote:
>
> On Thu, Jun 10, 2004 at 05:55:56PM +0100, Leigh Brown wrote:
>
> >
> > This patch adds a function residual_pcidev_irq() which finds out
> > from the residual data which IRQ the given PCI device should use.
> > The interesting part about this patch is the changes I made to
> > prep_pcibios_fixup().  The old code was more than a little
> > opaque so I tried to change it to make it a bit clearer.  I'd
> > definitely be pleased if someone could cast their eyes over
> > that bit.
>
> Is this jsut a "Residual Data is Good" type change, or does it fix some
> set of IBM machines?  I ask since residual data on Motorola PRePs can be
> incorrect, iirc.

On my PreP machines (well PowerPlus since they are actually
Raven/Falcon or Hawk based), the residual data for interrupt
routing is correct, but some people insisted in writing code
without having read the spec, and refused mine which correctly
decoded this information :-(

BTW: I believe that we should really merge PPlus, MVME5100 and PreP,
they are really minor variants (and on my MVME2[467]xx machine which
boot as PreP, I reprogram the Raven/Hawk so that they look more like
CHRP because I need a very large PCI address space, but 1GB of I/O
space is stupid.

For now I'm still running 2.2 with an 1999 distribution (machines
are not visible from the internet so security is not that
critical). I plan some upgrade but don't hold your breath since
I first have to finish 2 (or 3 or 4) microwave hardware projects.

	Regards,
	Gabriel

** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/

Re: [RFC][PATCH 3/9] Support for old IBM PReP boxes

[Tom Rini]

On Fri, Jun 18, 2004 at 12:36:26AM +0200, Gabriel Paubert wrote:

> On Thu, Jun 17, 2004 at 09:16:16AM -0700, Tom Rini wrote:
> >
> > On Thu, Jun 10, 2004 at 05:55:56PM +0100, Leigh Brown wrote:
> >
> > >
> > > This patch adds a function residual_pcidev_irq() which finds out
> > > from the residual data which IRQ the given PCI device should use.
> > > The interesting part about this patch is the changes I made to
> > > prep_pcibios_fixup().  The old code was more than a little
> > > opaque so I tried to change it to make it a bit clearer.  I'd
> > > definitely be pleased if someone could cast their eyes over
> > > that bit.
> >
> > Is this jsut a "Residual Data is Good" type change, or does it fix some
> > set of IBM machines?  I ask since residual data on Motorola PRePs can be
> > incorrect, iirc.
>
> On my PreP machines (well PowerPlus since they are actually
> Raven/Falcon or Hawk based), the residual data for interrupt
> routing is correct, but some people insisted in writing code
> without having read the spec, and refused mine which correctly
> decoded this information :-(

Fixing things up to follow the spec, so long as there's not a good
reason to not follow the spec (e.g. more machines have out-of-spec data,
than do), maybe it'll get in now. :)

> BTW: I believe that we should really merge PPlus, MVME5100 and PreP,
> they are really minor variants (and on my MVME2[467]xx machine which
> boot as PreP, I reprogram the Raven/Hawk so that they look more like
> CHRP because I need a very large PCI address space, but 1GB of I/O
> space is stupid.

Actually, there's 2 directions that ideally, someday, we might go in:
- Make any subset of 'compatibile' machines configurable, e.g. a kernel
  that works on pmac, pplus, and sbs k2 (but not also an ebony or
  walnut)
- Finish ripping the pplus stuff out of prep*, since it's a bit better
  supported in pplus.c (current 2.6) and if there's not a good reason
  not to, merge mvme5100 stuff into another platform grouping (pplus if
  it fits easily, for example).

--
Tom Rini
http://gate.crashing.org/~trini/

** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/

Re: [RFC][PATCH 3/9] Support for old IBM PReP boxes

[Leigh Brown]

Tom Rini said:
> On Fri, Jun 18, 2004 at 12:36:26AM +0200, Gabriel Paubert wrote:
>> On my PreP machines (well PowerPlus since they are actually
>> Raven/Falcon or Hawk based), the residual data for interrupt
>> routing is correct, but some people insisted in writing code
>> without having read the spec, and refused mine which correctly
>> decoded this information :-(
>
> Fixing things up to follow the spec, so long as there's not a good
> reason to not follow the spec (e.g. more machines have out-of-spec data,
> than do), maybe it'll get in now. :)

What would be useful for me would be having a copy of the  residual
data for a few Motorola machines...  (the residual data on my
powerstack works fine).

My approach for machines with duff residual data wasn't going to
be blacklisting, but working around problems with particular
machines.


** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/