* [patch] 2.5.64-ac3: fix a typo in ide-default.c
2003-03-07 17:56 Linux 2.5.64-ac3 Alan Cox
@ 2003-03-07 20:14 ` Adrian Bunk
2003-03-07 20:33 ` [PATCH][TRIVIAL] Re: Linux 2.5.64-ac3 Maciej Soltysiak
` (3 subsequent siblings)
4 siblings, 0 replies; 10+ messages in thread
From: Adrian Bunk @ 2003-03-07 20:14 UTC (permalink / raw)
To: Alan Cox; +Cc: linux-kernel
The following patch fixes a typo in ide-default.c that causes a compile
error:
--- linux-2.5.64-ac3/drivers/ide/ide-default.c.old 2003-03-07 21:11:35.000000000 +0100
+++ linux-2.5.64-ac3/drivers/ide/ide-default.c 2003-03-07 21:12:17.000000000 +0100
@@ -51,7 +51,7 @@
.name = "ide-default",
.version = IDEDEFAULT_VERSION,
.attach = idedefault_attach,
- .supports_dma = 1.
+ .supports_dma = 1,
.drives = LIST_HEAD_INIT(idedefault_driver.drives)
};
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH][TRIVIAL] Re: Linux 2.5.64-ac3
2003-03-07 17:56 Linux 2.5.64-ac3 Alan Cox
2003-03-07 20:14 ` [patch] 2.5.64-ac3: fix a typo in ide-default.c Adrian Bunk
@ 2003-03-07 20:33 ` Maciej Soltysiak
2003-03-07 23:08 ` Alan Cox
2003-03-07 21:03 ` 2.5.64-ac3: 3c527.c doesn't compile Adrian Bunk
` (2 subsequent siblings)
4 siblings, 1 reply; 10+ messages in thread
From: Maciej Soltysiak @ 2003-03-07 20:33 UTC (permalink / raw)
To: Alan Cox; +Cc: linux-kernel
[-- Attachment #1: Type: TEXT/PLAIN, Size: 596 bytes --]
Hi,
> Linux 2.5.64-ac3
> o Bring core IDE code into sync with the latest (me)
> 2.4.21pre5-ac code base. The drivers are not
> quite current with it yet.
There's a typo that breaks compiling ide-default.c
Here's the patch:
--- linux-2.5.60/drivers/ide/ide-default.c~ 2003-03-07 20:32:32.000000000 +0100
+++ linux-2.5.60/drivers/ide/ide-default.c 2003-03-07 21:30:01.000000000 +0100
@@ -51,7 +51,7 @@
.name = "ide-default",
.version = IDEDEFAULT_VERSION,
.attach = idedefault_attach,
- .supports_dma = 1.
+ .supports_dma = 1,
.drives = LIST_HEAD_INIT(idedefault_driver.drives)
};
[-- Attachment #2: ide-default.c.diff --]
[-- Type: TEXT/plain, Size: 381 bytes --]
--- linux-2.5.60/drivers/ide/ide-default.c~ 2003-03-07 20:32:32.000000000 +0100
+++ linux-2.5.60/drivers/ide/ide-default.c 2003-03-07 21:30:01.000000000 +0100
@@ -51,7 +51,7 @@
.name = "ide-default",
.version = IDEDEFAULT_VERSION,
.attach = idedefault_attach,
- .supports_dma = 1.
+ .supports_dma = 1,
.drives = LIST_HEAD_INIT(idedefault_driver.drives)
};
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH][TRIVIAL] Re: Linux 2.5.64-ac3
2003-03-07 20:33 ` [PATCH][TRIVIAL] Re: Linux 2.5.64-ac3 Maciej Soltysiak
@ 2003-03-07 23:08 ` Alan Cox
0 siblings, 0 replies; 10+ messages in thread
From: Alan Cox @ 2003-03-07 23:08 UTC (permalink / raw)
To: Maciej Soltysiak; +Cc: Alan Cox, Linux Kernel Mailing List
On Fri, 2003-03-07 at 20:33, Maciej Soltysiak wrote:
> Hi,
>
> > Linux 2.5.64-ac3
> > o Bring core IDE code into sync with the latest (me)
> > 2.4.21pre5-ac code base. The drivers are not
> > quite current with it yet.
> There's a typo that breaks compiling ide-default.c
>
> Here's the patch:
>
> --- linux-2.5.60/drivers/ide/ide-default.c~ 2003-03-07 20:32:32.000000000 +0100
> +++ linux-2.5.60/drivers/ide/ide-default.c 2003-03-07 21:30:01.000000000 +0100
> @@ -51,7 +51,7 @@
> .name = "ide-default",
> .version = IDEDEFAULT_VERSION,
> .attach = idedefault_attach,
> - .supports_dma = 1.
> + .supports_dma = 1,
> .drives = LIST_HEAD_INIT(idedefault_driver.drives)
> };
Thanks. Last minute conversion to C99 format to avoid flames 8)
^ permalink raw reply [flat|nested] 10+ messages in thread
* 2.5.64-ac3: 3c527.c doesn't compile
2003-03-07 17:56 Linux 2.5.64-ac3 Alan Cox
2003-03-07 20:14 ` [patch] 2.5.64-ac3: fix a typo in ide-default.c Adrian Bunk
2003-03-07 20:33 ` [PATCH][TRIVIAL] Re: Linux 2.5.64-ac3 Maciej Soltysiak
@ 2003-03-07 21:03 ` Adrian Bunk
2003-03-07 21:34 ` James Bottomley
2003-03-09 1:58 ` Question about VISWS 2.5.64-ac3 Osamu Tomita
2003-03-09 2:16 ` New IDE codes in 2.5.64-ac3 Osamu Tomita
4 siblings, 1 reply; 10+ messages in thread
From: Adrian Bunk @ 2003-03-07 21:03 UTC (permalink / raw)
To: Alan Cox, James Bottomley; +Cc: linux-kernel
On Fri, Mar 07, 2003 at 12:56:44PM -0500, Alan Cox wrote:
>...
> Linux 2.5.64-ac2
>...
> o Update 3c527 to modern locking (untested) (James Bottomley)
>...
It seems even the compilation is untested?
<-- snip -->
...
gcc -Wp,-MD,drivers/net/.3c527.o.d -D__KERNEL__ -Iinclude -Wall
-Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common
-pipe -mpreferred-stack-boundary=2 -march=k6
-Iinclude/asm-i386/mach-default -nostdinc -iwithprefix include
-DKBUILD_BASENAME=3c527 -DKBUILD_MODNAME=3c527 -c -o drivers/net/3c527.o
drivers/net/3c527.c
In file included from include/linux/mca.h:132,
from drivers/net/3c527.c:95:
include/linux/mca-legacy.h:10: warning: #warning "MCA legacy - please
move your driver to the new sysfs api"
drivers/net/3c527.c: In function `mc32_command':
drivers/net/3c527.c:649: `flags' undeclared (first use in this function)
drivers/net/3c527.c:649: (Each undeclared identifier is reported only once
drivers/net/3c527.c:649: for each function it appears in.)
drivers/net/3c527.c: In function `mc32_halt_transceiver':
drivers/net/3c527.c:733: `flags' undeclared (first use in this function)
drivers/net/3c527.c: In function `mc32_open':
drivers/net/3c527.c:951: `unsigned_long' undeclared (first use in this function)
drivers/net/3c527.c:951: parse error before `flags'
drivers/net/3c527.c:953: `flags' undeclared (first use in this function)
make[2]: *** [drivers/net/3c527.o] Error 1
<-- snip -->
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: 2.5.64-ac3: 3c527.c doesn't compile
2003-03-07 21:03 ` 2.5.64-ac3: 3c527.c doesn't compile Adrian Bunk
@ 2003-03-07 21:34 ` James Bottomley
2003-03-22 8:23 ` Adrian Bunk
0 siblings, 1 reply; 10+ messages in thread
From: James Bottomley @ 2003-03-07 21:34 UTC (permalink / raw)
To: Adrian Bunk; +Cc: Alan Cox, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 395 bytes --]
On Fri, 2003-03-07 at 15:03, Adrian Bunk wrote:
> On Fri, Mar 07, 2003 at 12:56:44PM -0500, Alan Cox wrote:
>
> >...
> > Linux 2.5.64-ac2
> >...
> > o Update 3c527 to modern locking (untested) (James Bottomley)
> >...
>
> It seems even the compilation is untested?
It builds for me fine in 2.5.64. Perhaps you misapplied the patch, or
got a mangled one. The correct patch is below.
James
[-- Attachment #2: tmp.diff --]
[-- Type: application/octet-stream, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: 2.5.64-ac3: 3c527.c doesn't compile
2003-03-07 21:34 ` James Bottomley
@ 2003-03-22 8:23 ` Adrian Bunk
0 siblings, 0 replies; 10+ messages in thread
From: Adrian Bunk @ 2003-03-22 8:23 UTC (permalink / raw)
To: James Bottomley; +Cc: Alan Cox, linux-kernel
On Fri, Mar 07, 2003 at 03:34:52PM -0600, James Bottomley wrote:
> On Fri, 2003-03-07 at 15:03, Adrian Bunk wrote:
> > On Fri, Mar 07, 2003 at 12:56:44PM -0500, Alan Cox wrote:
> >
> > >...
> > > Linux 2.5.64-ac2
> > >...
> > > o Update 3c527 to modern locking (untested) (James Bottomley)
> > >...
> >
> > It seems even the compilation is untested?
>
> It builds for me fine in 2.5.64. Perhaps you misapplied the patch, or
> got a mangled one. The correct patch is below.
The patch in your mail was empty.
The problem is still present in 2.5.65-ac2, is the patch below correct?
> James
cu
Adrian
--- linux-2.5.65-ac2/drivers/net/3c527.c.old 2003-03-22 09:19:39.000000000 +0100
+++ linux-2.5.65-ac2/drivers/net/3c527.c 2003-03-22 09:20:44.000000000 +0100
@@ -624,7 +624,8 @@
struct mc32_local *lp = (struct mc32_local *)dev->priv;
int ioaddr = dev->base_addr;
int ret = 0;
-
+ unsigned long flags;
+
/*
* Wait for a command
*/
@@ -729,6 +730,7 @@
{
struct mc32_local *lp = (struct mc32_local *)dev->priv;
int ioaddr = dev->base_addr;
+ unsigned long flags;
spin_lock_irqsave(&lp->lock, flags);
@@ -948,7 +950,7 @@
u8 one=1;
u8 regs;
u16 descnumbuffs[2] = {TX_RING_LEN, RX_RING_LEN};
- unsigned_long flags;
+ unsigned long flags;
spin_lock_irqsave(&lp->lock, flags);
^ permalink raw reply [flat|nested] 10+ messages in thread
* Question about VISWS 2.5.64-ac3
2003-03-07 17:56 Linux 2.5.64-ac3 Alan Cox
` (2 preceding siblings ...)
2003-03-07 21:03 ` 2.5.64-ac3: 3c527.c doesn't compile Adrian Bunk
@ 2003-03-09 1:58 ` Osamu Tomita
2003-03-09 2:16 ` New IDE codes in 2.5.64-ac3 Osamu Tomita
4 siblings, 0 replies; 10+ messages in thread
From: Osamu Tomita @ 2003-03-09 1:58 UTC (permalink / raw)
To: Alan Cox; +Cc: Linux Kernel Mailing List
2.5.64-ac might need patch for VISWS below?
I'm not sure. Because I don't know about VISWS.
Please check.
Regards,
Osamu Tomita
diff -Nru linux-2.5.64-ac3/arch/i386/mach-visws/visws_apic.c linux/arch/i386/mach-visws/visws_apic.c
--- linux-2.5.64-ac3/arch/i386/mach-visws/visws_apic.c 2003-03-08 13:54:20.000000000 +0900
+++ linux/arch/i386/mach-visws/visws_apic.c 2003-03-08 14:49:53.000000000 +0900
@@ -230,12 +230,12 @@
cached_irq_mask |= 1 << realirq;
if (unlikely(realirq > 7)) {
inb(0xa1);
- outb(cached_A1, 0xa1);
+ outb(cached_slave_mask, 0xa1);
outb(0x60 + (realirq & 7), 0xa0);
outb(0x60 + 2, 0x20);
} else {
inb(0x21);
- outb(cached_21, 0x21);
+ outb(cached_master_mask, 0x21);
outb(0x60 + realirq, 0x20);
}
diff -Nru linux-2.5.64-ac3/include/asm-i386/mach-visws/irq_vectors.h linux/include/asm-i386/mach-visws/irq_vectors.h
--- linux-2.5.64-ac3/include/asm-i386/mach-visws/irq_vectors.h 2003-03-08 13:54:58.000000000 +0900
+++ linux/include/asm-i386/mach-visws/irq_vectors.h 2003-03-08 14:08:33.000000000 +0900
@@ -51,4 +51,10 @@
*/
#define NR_IRQS 224
+#define FPU_IRQ 13
+
+#define FIRST_VM86_IRQ 3
+#define LAST_VM86_IRQ 15
+#define invalid_vm86_irq(irq) ((irq) < 3 || (irq) > 15)
+
#endif /* _ASM_IRQ_VECTORS_H */
^ permalink raw reply [flat|nested] 10+ messages in thread
* New IDE codes in 2.5.64-ac3
2003-03-07 17:56 Linux 2.5.64-ac3 Alan Cox
` (3 preceding siblings ...)
2003-03-09 1:58 ` Question about VISWS 2.5.64-ac3 Osamu Tomita
@ 2003-03-09 2:16 ` Osamu Tomita
2003-03-09 20:53 ` Alan Cox
4 siblings, 1 reply; 10+ messages in thread
From: Osamu Tomita @ 2003-03-09 2:16 UTC (permalink / raw)
To: Alan Cox; +Cc: Linux Kernel Mailing List
My PC98 box doesn't boot 2.5.64-ac3.
After print "ide-default: hdd: Failed to register the driver with ide.c"
forced to panic.
"hdd" is not connected my box.
IMHO We need status meaning 'supported by the driver but drive not present'.
Or this problem is PC98 specific?
I attached my quick fix. Please comment.
Regards,
Osamu Tomita
diff -Nru linux-2.5.64-ac3/drivers/ide/ide-default.c linux-2.5.64-ac3-quick-fix/drivers/ide/ide-default.c
--- linux-2.5.64-ac3/drivers/ide/ide-default.c 2003-03-08 12:51:33.000000000 +0900
+++ linux-2.5.64-ac3-quick-fix/drivers/ide/ide-default.c 2003-03-09 10:14:51.000000000 +0900
@@ -61,7 +61,8 @@
&idedefault_driver, IDE_SUBDRIVER_VERSION)) {
printk(KERN_ERR "ide-default: %s: Failed to register the "
"driver with ide.c\n", drive->name);
- return 1;
+ //return 1;
+ drive->present = 0;
}
return 0;
}
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: New IDE codes in 2.5.64-ac3
2003-03-09 2:16 ` New IDE codes in 2.5.64-ac3 Osamu Tomita
@ 2003-03-09 20:53 ` Alan Cox
0 siblings, 0 replies; 10+ messages in thread
From: Alan Cox @ 2003-03-09 20:53 UTC (permalink / raw)
To: Osamu Tomita; +Cc: Alan Cox, Linux Kernel Mailing List
On Sun, 2003-03-09 at 02:16, Osamu Tomita wrote:
> My PC98 box doesn't boot 2.5.64-ac3.
> After print "ide-default: hdd: Failed to register the driver with ide.c"
> forced to panic.
> "hdd" is not connected my box.
> IMHO We need status meaning 'supported by the driver but drive not present'.
> Or this problem is PC98 specific?
Every device registered should now have a driver in all situations. The
panic sounds like the pc98 ide might be using ata_attach() directly or
indirectly on a non existant disk. That would upset things
^ permalink raw reply [flat|nested] 10+ messages in thread