a fix for NS87415 on C3K broken

["Joel Soete" <soete.joel@tiscali.be>]

[-- Attachment #1: Type: text/plain, Size: 3363 bytes --]

Hello Grant, Bartlomiej and *,

I test this patch:
--- arch/parisc/kernel/pci.c.Orig	2004-09-22 09:47:02.000000000 +0200
+++ arch/parisc/kernel/pci.c	2004-09-22 11:26:02.104187784 +0200
@@ -146,6 +146,9 @@
 	return str;
 }

+/* Used in drivers/pci/quirks.c */
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_87415, superio_fixup_pci);
+
 /*
  * Called by pci_set_master() - a driver interface.
  *
--- drivers/parisc/superio.c.Orig	2004-09-22 11:17:53.759427472 +0200
+++ drivers/parisc/superio.c	2004-09-22 11:27:32.856391352 +0200
@@ -484,7 +484,6 @@
 	pci_read_config_byte(pdev, PCI_CLASS_PROG, &prog);
 	printk("PCI: Enabled native mode for NS87415 (pif=0x%x)\n", prog);
 }
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_87415, superio_fixup_pci);

 /* Because of a defect in Super I/O, all reads of the PCI DMA status
  * registers, IDE status register and the IDE select register need to be

=========><=========

That fix the NS87415 pb on my c2k model :)
Can somebody check it with some c3k model?

And if Ok for all, can somebody ci for me?

Tia,
    Joel

PS: here attached the diff in case of bad wrapping
> -- Original Message --
> From: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
> To: Grant Grundler <grundler@parisc-linux.org>
> Date: Fri, 17 Sep 2004 02:43:06 +0200
> Cc: linux-ide@vger.kernel.org, parisc-linux@lists.parisc-linux.org
> Subject: [parisc-linux] Re: NS87415 on C3K broken
>
>
> On Friday 17 September 2004 01:25, Grant Grundler wrote:
> > > ide_setup_pci_controller()
> > > 	-> ide_pci_enable()
> > > 		-> pci_enable_device()
> > >
> > > and ide_setup_pci_controller() is called at the beginning
> > > of ide_setup_pci_device() before ->init_chipset()
> >
> > Yes - I tracked the pci_enabled_device back to ide_setup_pci_controller().
> > But I just realized I had another brainfart: ide_setup_pci_controller()
> > is not ide_setup_pci_device(). I should stop coding late at night...
>
> Heh.
>
> > > > Anyway, ns87415 driver has more problems. The patch below adds
> > > > "init_chipset" entry point and init_chipset_ns87415() calls
> > > > pci_enable_device() and pci_set_master() before the probe.
> > > > And my C3k still HPMCs. My guess is more of the code from
> > > > init_hwif_ns87415() needs to be moved to init_chipset_ns87415().
> > > > And possible call some special suckyio init routines.
> > > > I won't be able to touch this for a few days.
> > > > Anyone else on parisc-linux ml want to take a whack at this?
> > ...
> > > Yep, also if they are to stay please move them to ns87415.c
> > > because using <linux/ide.h> outside drivers/ide is WRONG.
> >
> > they? superio_ide_init_iops() or something else?
>
> They.
>
> > Willy mentioned that as a TODO item and it's on my list.
> > But I didn't plan on touching that before the HPMC is resolved
> > or the PCI resource mgt issues are resolved.
>
> OK, thanks.
> _______________________________________________
> parisc-linux mailing list
> parisc-linux@lists.parisc-linux.org
> http://lists.parisc-linux.org/mailman/listinfo/parisc-linux


---------------------------------------------------------------------------
Tiscali ADSL GO, 29,50 Euro/mois pendant toute une année, profitez-en...
http://reg.tiscali.be/adsl/welcome.asp?lg=FR





[-- Attachment #2: NS87415.diff --]
[-- Type: application/octet-stream, Size: 877 bytes --]

--- arch/parisc/kernel/pci.c.Orig	2004-09-22 09:47:02.000000000 +0200
+++ arch/parisc/kernel/pci.c	2004-09-22 11:26:02.104187784 +0200
@@ -146,6 +146,9 @@
 	return str;
 }
 
+/* Used in drivers/pci/quirks.c */
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_87415, superio_fixup_pci);
+
 /*
  * Called by pci_set_master() - a driver interface.
  *
--- drivers/parisc/superio.c.Orig	2004-09-22 11:17:53.759427472 +0200
+++ drivers/parisc/superio.c	2004-09-22 11:27:32.856391352 +0200
@@ -484,7 +484,6 @@
 	pci_read_config_byte(pdev, PCI_CLASS_PROG, &prog);
 	printk("PCI: Enabled native mode for NS87415 (pif=0x%x)\n", prog);
 }
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_87415, superio_fixup_pci);
 
 /* Because of a defect in Super I/O, all reads of the PCI DMA status 
  * registers, IDE status register and the IDE select register need to be