Re: Compiling EIDE patch on PPC

Re: Compiling EIDE patch on PPC

[Mike Fedyk]

On Thu, Aug 09, 2001 at 09:43:41PM +0200, Michel Lanners wrote:
> Hi Mike,
>
> On   7 Aug, this message from Mike Fedyk echoed through cyberspace:
> > I am attempting to compile a 2.2.19 kernel for a promise udma66 ide
> > controller on PPC.
>
> Hm, I have not been using 2.2 kernels for a long time....
>
> > Michel, what else I need to do for a working Promise UDMA66 on PPC?
> >
> > I have applied:
> > 2.2.18-pci.diff
> > ide.2.2.19.05042001.patch.bz2
>
> That should be it.....
>
> > and this patch (from Phil Brutsche <pbrutsch@tux.creighton.edu> on LKML):
> > --- 2.2.19-ide-05042001/drivers/block/ll_rw_blk.c~      Tue Aug  7 15:34:29
> > 2001
> > +++ 2.2.19-ide-05042001/drivers/block/ll_rw_blk.c       Tue Aug  7 15:50:08
> > 2001
> > @@ -25,6 +25,7 @@
> >  #include <linux/blk.h>
> >
> >  #ifdef CONFIG_POWERMAC
> > +#include <linux/ide.h>
> >  #include <asm/ide.h>
> >  #endif
>
> Ah, this problem.... I guess every single kernel file had this problem
> at one time or another.... You can probably remove the #include
> <asm/ide.h>, since <linux/ide.h> includes that itself.
>

OK, I've been able to compile it successfully.  Changes included.

I haven't booted the kernel yet.  Can someone take a look at the patch to
see if I may have made any bad changes?  Maybe the actual files in asm-ppc
should be changed instead?  If it is good, I'll send it to Hedrick for the
next patch release.

Also, there is an include for asm/ide.h in apus_setup.c.  I didn't change it
because I don't have any prep machines for testing, and for some reason it is
also including from the m86k arch.

Michel, I'm going to do another compile with your pci-fixup patch.  Do you
have any idea if it is needed on 7200, 6500, or oldworld g3 powermacs also?

This patch is against 2.2.19 + ide.05042001

The patch is below:
--- 2.2.19-ide-05042001/drivers/block/ide-pmac.c	Fri Aug 10 12:40:07 2001
+++ 2.2.19-ide-05042001-mikef/drivers/block/ide-pmac.c	Fri Aug 10 12:34:47 2001
@@ -28,7 +28,6 @@
 #include <asm/prom.h>
 #include <asm/io.h>
 #include <asm/dbdma.h>
-//	#include <asm/ide.h>
 #include <asm/mediabay.h>
 #include <asm/feature.h>
 #ifdef CONFIG_PMAC_PBOOK
--- 2.2.19-ide-05042001/drivers/block/ide-disk.c	Fri Aug 10 12:40:07 2001
+++ 2.2.19-ide-05042001-mikef/drivers/block/ide-disk.c	Fri Aug 10 12:35:23 2001
@@ -54,7 +54,6 @@
 #include <asm/irq.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
-#include <asm/ide.h>

 #ifdef CONFIG_BLK_DEV_PDC4030
 #define IS_PDC4030_DRIVE (HWIF(drive)->chipset == ide_pdc4030)
--- 2.2.19-ide-05042001/drivers/block/ll_rw_blk.c	Fri Aug 10 12:40:07 2001
+++ 2.2.19-ide-05042001-mikef/drivers/block/ll_rw_blk.c	Fri Aug 10 12:35:57 2001
@@ -25,7 +25,7 @@
 #include <linux/blk.h>

 #ifdef CONFIG_POWERMAC
-#include <asm/ide.h>
+#include <linux/ide.h>
 #endif

 #include <linux/module.h>
--- 2.2.19-ide-05042001/arch/ppc/kernel/residual.c	Fri Aug 10 12:40:06 2001
+++ 2.2.19-ide-05042001-mikef/arch/ppc/kernel/residual.c	Fri Aug 10 12:36:29 2001
@@ -47,7 +47,6 @@
 #include <asm/io.h>
 #include <asm/pgtable.h>
 #include <linux/ide.h>
-#include <asm/ide.h>


 const char * PnP_BASE_TYPES[] __initdata = {
--- 2.2.19-ide-05042001/arch/ppc/kernel/ppc_ksyms.c	Fri Aug 10 12:40:06 2001
+++ 2.2.19-ide-05042001-mikef/arch/ppc/kernel/ppc_ksyms.c	Fri Aug 10 12:32:38 2001
@@ -12,7 +12,6 @@
 #include <asm/semaphore.h>
 #include <asm/processor.h>
 #include <asm/uaccess.h>
-#include <asm/ide.h>
 #include <linux/ide.h>
 #include <asm/checksum.h>
 #include <asm/pgtable.h>

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

Re: Compiling EIDE patch on PPC

[Michel Lanners]

Hi all,

On  10 Aug, this message from Mike Fedyk echoed through cyberspace:
> OK, I've been able to compile it successfully.  Changes included.

Good.

> I haven't booted the kernel yet.  Can someone take a look at the patch to
> see if I may have made any bad changes?

Well, if it compiles and works like that, than it should be OK. You only
changed #include's, after all...

> Maybe the actual files in asm-ppc should be changed instead?

Which ones are you refering to? You only changed .c files; no header
files. Under asm-ppc, there are only header files.....

> If it is good, I'll send it to Hedrick for the
> next patch release.

Looks good to me. THough I am a bit surprised by you being able to
remove asm/ide.h from generic IDE driver files...

> Also, there is an include for asm/ide.h in apus_setup.c.  I didn't change it
> because I don't have any prep machines for testing, and for some reason it is
> also including from the m86k arch.

APUS is not PREP, its some Amiga stuff. Basically, originally 68k-Amigas
upgraded with PPC processors; so no wonder they're a hybrid of m68k and
ppc ;-). I would _guess_ they need the <asm/ide.h> replaced by
<linux/ide.h> too.

> Michel, I'm going to do another compile with your pci-fixup patch.  Do you
> have any idea if it is needed on 7200, 6500, or oldworld g3 powermacs also?

I never tested it there; but since the problem (for your IDE card) is
with access to PCI IO ports, _any_ ppc 2.2 kernel would suffer from that
problem, independant of the precise hardware.

Cheers

Michel

-------------------------------------------------------------------------
Michel Lanners                 |  " Read Philosophy.  Study Art.
23, Rue Paul Henkes            |    Ask Questions.  Make Mistakes.
L-1710 Luxembourg              |
email   mlan@cpu.lu            |
http://www.cpu.lu/~mlan        |                     Learn Always. "


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

Re: Compiling EIDE patch on PPC

[Mike Fedyk]

On Sat, Aug 11, 2001 at 08:47:04AM +0200, Michel Lanners wrote:
> Hi all,
>
> On  10 Aug, this message from Mike Fedyk echoed through cyberspace:
> > OK, I've been able to compile it successfully.  Changes included.
>
> Good.
>
> > I haven't booted the kernel yet.  Can someone take a look at the patch to
> > see if I may have made any bad changes?
>
> Well, if it compiles and works like that, than it should be OK. You only
> changed #include's, after all...
>
> > Maybe the actual files in asm-ppc should be changed instead?
>
> Which ones are you refering to? You only changed .c files; no header
> files. Under asm-ppc, there are only header files.....
>

Someone mentioned that the ppc headers were missing some definitions that
are in i386.  I'm referring to copying those changes instead of changing the
includes... I just wanted to mention it, in case it affects something I
don't know about.

> > If it is good, I'll send it to Hedrick for the
> > next patch release.
>
> Looks good to me. THough I am a bit surprised by you being able to
> remove asm/ide.h from generic IDE driver files...
>

asm/ide.h is included from linux/ide.h, and IIRC gcc doesn't care how far
away the code is included... as long as it gets what it needs.  Probably
just including everything before parsing...

> > Also, there is an include for asm/ide.h in apus_setup.c.  I didn't change it
> > because I don't have any prep machines for testing, and for some reason it is
> > also including from the m86k arch.
>
> APUS is not PREP, its some Amiga stuff. Basically, originally 68k-Amigas
> upgraded with PPC processors; so no wonder they're a hybrid of m68k and
> ppc ;-). I would _guess_ they need the <asm/ide.h> replaced by
> <linux/ide.h> too.
>

Oops, brain fart.  Did any of those APUS have PCI?  If not, then the change
may not be needed.

> > Michel, I'm going to do another compile with your pci-fixup patch.  Do you
> > have any idea if it is needed on 7200, 6500, or oldworld g3 powermacs also?
>
> I never tested it there; but since the problem (for your IDE card) is
> with access to PCI IO ports, _any_ ppc 2.2 kernel would suffer from that
> problem, independant of the precise hardware.
>

Michel, your pci-fixup patch is incompatible with Donald Becker's rtl8139.c
(from his site) driver with the new pci-scan.c module from his web site.  I
thought I'd let you know.

When I insert the module, I get an oops.  On these machines (PPC mac 7200,
6500, & oldworld g3) I have had to use his new drivers to get reliable
ethernet access.  The ones in Linus' kernel haven't been reliable for me.

Is there any chance that your pci patch would fix any problems I've been
having with the eth drivers in the kernel.org kernel?

What behavior could I expect from the system if I used the ide patch without
the PCI-fixup patch on a promise udma66 card?

Mike

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

Re: Compiling EIDE patch on PPC

[Michel Dänzer]

Mike Fedyk wrote:

> > > Also, there is an include for asm/ide.h in apus_setup.c.  I didn't
> > > change it because I don't have any prep machines for testing, and for
> > > some reason it is also including from the m86k arch.
> >
> > APUS is not PREP, its some Amiga stuff. Basically, originally 68k-Amigas
> > upgraded with PPC processors; so no wonder they're a hybrid of m68k and
> > ppc ;-). I would _guess_ they need the <asm/ide.h> replaced by
> > <linux/ide.h> too.
>
> Oops, brain fart.  Did any of those APUS have PCI?

Yes and no. Not for IDE so far.

> If not, then the change may not be needed.

I don't know offhand, but don't worry, we'll take care of it.


--
Earthling Michel Dänzer (MrCooper)    \   Debian GNU/Linux (powerpc) developer
CS student, Free Software enthusiast   \        XFree86 and DRI project member

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