2001-10-07 18:50:33

by Linus Torvalds

[permalink] [raw]
Subject: Linux-2.4.11-pre5


USB and quota update.

And the fix for VM breakage in pre4.

Linus

-----

pre5:
- Keith Owens: module exporting error checking
- Greg KH: USB update
- Paul Mackerras: clean up wait_init_idle(), ppc prefetch macros
- Jan Kara: quota fixes
- Abraham vd Merwe: agpgart support for Intel 830M
- Jakub Jelinek: ELF loader cleanups
- Al Viro: more cleanups
- David Miller: sparc64 fix, netfilter fixes
- me: tweak resurrected oom handling

pre4:
- Al Viro: separate out superblocks and FS namespaces: fs/super.c fathers
fs/namespace.c
- David Woodhouse: large MTD and JFFS[2] update
- Marcelo Tosatti: resurrect oom handling
- Hugh Dickins: add_to_swap_cache racefix cleanup
- Jean Tourrilhes: IrDA update
- Martin Bligh: support clustered logical APIC for >8 CPU x86 boxes
- Richard Henderson: alpha update

pre3:
- Al Viro: superblock cleanups, partition handling fixes and cleanups
- Ben Collins: firewire update
- Jeff Garzik: network driver updates
- Urban Widmark: smbfs updates
- Kai M?kisara: SCSI tape driver update
- various: embarrassing lack of error checking in ELF loader
- Neil Brown: md formatting cleanup.

pre2:
- me/Al Viro: fix bdget() oops with block device modules that don't
clean up after they exit
- Alan Cox: continued merging (drivers, license tags)
- David Miller: sparc update, network fixes
- Christoph Hellwig: work around broken drivers that add a gendisk more
than once
- Jakub Jelinek: handle more ELF loading special cases
- Trond Myklebust: NFS client and lockd reclaimer cleanups/fixes
- Greg KH: USB updates
- Mikael Pettersson: sparate out local APIC / IO-APIC config options

pre1:
- Chris Mason: fix ppp race conditions
- me: buffers-in-pagecache coherency, buffer.c cleanups
- Al Viro: block device cleanups/fixes
- Anton Altaparmakov: NTFS 1.1.20 update
- Andrea Arcangeli: VM tweaks


2001-10-07 19:18:49

by Simon Kirby

[permalink] [raw]
Subject: Re: Linux-2.4.11-pre5

On Sun, Oct 07, 2001 at 11:49:46AM -0700, Linus Torvalds wrote:

> pre5:
> - Greg KH: USB update

This appears to break my Logitech optical mouse with uhci. usb-uhci
works fine.

hub.c: USB new device connect on bus1/2, assigned device number 2
usb_control/bulk_msg: timeout
usb.c: USB device not accepting new address=2 (error=-110)

Simon-

[ Stormix Technologies Inc. ][ NetNation Communications Inc. ]
[ [email protected] ][ [email protected] ]
[ Opinions expressed are not necessarily those of my employers. ]

2001-10-07 19:32:02

by Johannes Erdfelt

[permalink] [raw]
Subject: Re: Linux-2.4.11-pre5

On Sun, Oct 07, 2001, Simon Kirby <[email protected]> wrote:
> On Sun, Oct 07, 2001 at 11:49:46AM -0700, Linus Torvalds wrote:
>
> > pre5:
> > - Greg KH: USB update
>
> This appears to break my Logitech optical mouse with uhci. usb-uhci
> works fine.
>
> hub.c: USB new device connect on bus1/2, assigned device number 2
> usb_control/bulk_msg: timeout
> usb.c: USB device not accepting new address=2 (error=-110)

Could you give me the output of /proc/interrupts?

Do you see any other messages in dmesg?

What UHCI controller is this? (lspci -v)

JE

2001-10-07 19:40:34

by Simon Kirby

[permalink] [raw]
Subject: Re: Linux-2.4.11-pre5

On Sun, Oct 07, 2001 at 03:34:33PM -0400, Johannes Erdfelt wrote:

> > hub.c: USB new device connect on bus1/2, assigned device number 2
> > usb_control/bulk_msg: timeout
> > usb.c: USB device not accepting new address=2 (error=-110)
>
> Could you give me the output of /proc/interrupts?

CPU0 CPU1
0: 71555 64454 IO-APIC-edge timer
1: 1355 1274 IO-APIC-edge keyboard
2: 0 0 XT-PIC cascade
5: 0 0 IO-APIC-edge NE2000
14: 4157 5136 IO-APIC-edge ide0
15: 2 19 IO-APIC-edge ide1
16: 2462 2381 IO-APIC-level eth0
17: 0 0 IO-APIC-level Trident 4DWave NX
18: 1 1 IO-APIC-level bttv
19: 2330 2467 IO-APIC-level aic7xxx, usb-uhci
NMI: 0 0
LOC: 135894 135912
ERR: 0
MIS: 0

> Do you see any other messages in dmesg?

Here is an entire "insmod uhci" output:

uhci.c: USB Universal Host Controller Interface driver v1.1
uhci.c: USB UHCI at I/O 0xb400, IRQ 19
usb.c: new USB bus registered, assigned bus number 1
hub.c: USB hub found
hub.c: 2 ports detected
hub.c: USB new device connect on bus1/2, assigned device number 2
usb_control/bulk_msg: timeout
usb.c: USB device not accepting new address=2 (error=-110)
hub.c: USB new device connect on bus1/2, assigned device number 3
usb_control/bulk_msg: timeout
usb.c: USB device not accepting new address=3 (error=-110)

> What UHCI controller is this? (lspci -v)

00:04.2 USB Controller: Intel Corporation 82371AB PIIX4 USB (rev 01) (prog-if 00 [UHCI])
Flags: bus master, medium devsel, latency 32, IRQ 19
I/O ports at b400 [size=32]

It's on an ASUS P2B-DS (with broken USB resistor shorted).

Simon-

[ Stormix Technologies Inc. ][ NetNation Communications Inc. ]
[ [email protected] ][ [email protected] ]
[ Opinions expressed are not necessarily those of my employers. ]

2001-10-07 20:16:35

by Johannes Erdfelt

[permalink] [raw]
Subject: Re: Linux-2.4.11-pre5

On Sun, Oct 07, 2001, Simon Kirby <[email protected]> wrote:
> On Sun, Oct 07, 2001 at 03:34:33PM -0400, Johannes Erdfelt wrote:
>
> > > hub.c: USB new device connect on bus1/2, assigned device number 2
> > > usb_control/bulk_msg: timeout
> > > usb.c: USB device not accepting new address=2 (error=-110)
> >
> > Could you give me the output of /proc/interrupts?
>
> CPU0 CPU1
> 0: 71555 64454 IO-APIC-edge timer
> 1: 1355 1274 IO-APIC-edge keyboard
> 2: 0 0 XT-PIC cascade
> 5: 0 0 IO-APIC-edge NE2000
> 14: 4157 5136 IO-APIC-edge ide0
> 15: 2 19 IO-APIC-edge ide1
> 16: 2462 2381 IO-APIC-level eth0
> 17: 0 0 IO-APIC-level Trident 4DWave NX
> 18: 1 1 IO-APIC-level bttv
> 19: 2330 2467 IO-APIC-level aic7xxx, usb-uhci
> NMI: 0 0
> LOC: 135894 135912
> ERR: 0
> MIS: 0
>
> > Do you see any other messages in dmesg?
>
> Here is an entire "insmod uhci" output:
>
> uhci.c: USB Universal Host Controller Interface driver v1.1
> uhci.c: USB UHCI at I/O 0xb400, IRQ 19
> usb.c: new USB bus registered, assigned bus number 1
> hub.c: USB hub found
> hub.c: 2 ports detected
> hub.c: USB new device connect on bus1/2, assigned device number 2
> usb_control/bulk_msg: timeout
> usb.c: USB device not accepting new address=2 (error=-110)
> hub.c: USB new device connect on bus1/2, assigned device number 3
> usb_control/bulk_msg: timeout
> usb.c: USB device not accepting new address=3 (error=-110)
>
> > What UHCI controller is this? (lspci -v)
>
> 00:04.2 USB Controller: Intel Corporation 82371AB PIIX4 USB (rev 01) (prog-if 00 [UHCI])
> Flags: bus master, medium devsel, latency 32, IRQ 19
> I/O ports at b400 [size=32]
>
> It's on an ASUS P2B-DS (with broken USB resistor shorted).

Ahh, could you replace this line:

pci_write_config_word(uhci->dev, USBLEGSUP, 0);

with this:

pci_write_config_word(uhci->dev, USBLEGSUP, USBLEGSUP_DEFAULT);

and try again?

JE

2001-10-07 20:30:26

by Johannes Erdfelt

[permalink] [raw]
Subject: [patch] uhci.c interrupts

A quick update patch to fix a couple of bugs, one important.

- Don't disable PIRQ on controller
- Print I/O base for controller when we suspend or wakeup
- Suspend controller, don't reset when system suspend's
- Don't print terminating TD twice in debug code
- Don't shadow irq parameter in alloc_uhci

Greg, please send it on to Linus. The patch is relative to 2.4.11-pre5

JE

--- linux-2.4.11-pre5/drivers/usb/uhci.c Sun Oct 7 13:20:29 2001
+++ linux/drivers/usb/uhci.c Sun Oct 7 13:21:51 2001
@@ -2410,7 +2410,7 @@
{
unsigned int io_addr = uhci->io_addr;

- dbg("suspend_hc");
+ dbg("%x: suspend_hc", io_addr);

outw(USBCMD_EGSM, io_addr + USBCMD);

@@ -2422,7 +2422,7 @@
unsigned int io_addr = uhci->io_addr;
unsigned int status;

- dbg("wakeup_hc");
+ dbg("%x: wakeup_hc", io_addr);

outw(0, io_addr + USBCMD);

@@ -2564,7 +2564,7 @@
* - The fourth queue is the bandwidth reclamation queue, which loops back
* to the high speed control queue.
*/
-static int alloc_uhci(struct pci_dev *dev, int irq, unsigned int io_addr, unsigned int io_size)
+static int alloc_uhci(struct pci_dev *dev, unsigned int io_addr, unsigned int io_size)
{
struct uhci *uhci;
int retval = -EBUSY;
@@ -2602,9 +2602,9 @@
pci_set_master(dev);

#ifndef __sparc__
- sprintf(buf, "%d", irq);
+ sprintf(buf, "%d", dev->irq);
#else
- bufp = __irq_itoa(irq);
+ bufp = __irq_itoa(dev->irq);
#endif
printk(KERN_INFO __FILE__ ": USB UHCI at I/O 0x%x, IRQ %s\n",
io_addr, bufp);
@@ -2828,13 +2828,13 @@

start_hc(uhci);

- if (request_irq(irq, uhci_interrupt, SA_SHIRQ, "usb-uhci", uhci))
+ if (request_irq(dev->irq, uhci_interrupt, SA_SHIRQ, "usb-uhci", uhci))
goto err_request_irq;

- uhci->irq = irq;
+ uhci->irq = dev->irq;

/* disable legacy emulation */
- pci_write_config_word(uhci->dev, USBLEGSUP, 0);
+ pci_write_config_word(uhci->dev, USBLEGSUP, USBLEGSUP_DEFAULT);

usb_connect(uhci->rh.dev);

@@ -2925,7 +2925,7 @@
if (!(pci_resource_flags(dev, i) & IORESOURCE_IO))
continue;

- return alloc_uhci(dev, dev->irq, io_addr, io_size);
+ return alloc_uhci(dev, io_addr, io_size);
}

return -ENODEV;
@@ -2958,7 +2958,7 @@
#ifdef CONFIG_PM
static int uhci_pci_suspend(struct pci_dev *dev, u32 state)
{
- reset_hc((struct uhci *) dev->driver_data);
+ suspend_hc((struct uhci *) dev->driver_data);
return 0;
}

--- linux-2.4.11-pre5/drivers/usb/uhci-debug.h Wed Aug 15 14:23:46 2001
+++ linux/drivers/usb/uhci-debug.h Sun Oct 7 12:50:55 2001
@@ -372,7 +372,9 @@
if (td->link != td->dma_handle)
out += sprintf(out, " skel_term_td does not link to self\n");

- out += uhci_show_td(td, out, len - (out - buf), 4);
+ /* Don't show it twice */
+ if (debug <= 1)
+ out += uhci_show_td(td, out, len - (out - buf), 4);
}

continue;
--- linux-2.4.11-pre5/drivers/usb/uhci.h Wed Aug 15 14:23:46 2001
+++ linux/drivers/usb/uhci.h Sun Oct 7 13:11:57 2001
@@ -53,8 +53,8 @@
#define USBPORTSC_SUSP 0x1000 /* Suspend */

/* Legacy support register */
-#define USBLEGSUP 0xc0
-#define USBLEGSUP_DEFAULT 0x2000 /* only PIRQ enable set */
+#define USBLEGSUP 0xc0
+#define USBLEGSUP_DEFAULT 0x2000 /* only PIRQ enable set */

#define UHCI_NULL_DATA_SIZE 0x7FF /* for UHCI controller TD */

2001-10-07 20:49:08

by Adrian Bunk

[permalink] [raw]
Subject: Re: Linux-2.4.11-pre5


I get the error below. Must likely there's a problem when you build a
kernel without module support (my .config is attached).

...
gcc -D__KERNEL__ -I/home/bunk/linux/linux/include -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=k6 -c -o exec_domain.o exec_domain.c
exec_domain.c: In function `lookup_exec_domain':
exec_domain.c:80: warning: unused variable `buffer'
exec_domain.c: At top level:
exec_domain.c:234: parse error before `this_object_must_be_defined_as_export_objs_in_the_Makefile'
exec_domain.c:234: warning: type defaults to `int' in declaration of `this_object_must_be_defined_as_export_objs_in_the_Makefile'
exec_domain.c:234: warning: data definition has no type or storage class
exec_domain.c:235: parse error before `this_object_must_be_defined_as_export_objs_in_the_Makefile'
exec_domain.c:235: warning: type defaults to `int' in declaration of `this_object_must_be_defined_as_export_objs_in_the_Makefile'
exec_domain.c:235: warning: data definition has no type or storage class
exec_domain.c:236: parse error before `this_object_must_be_defined_as_export_objs_in_the_Makefile'
exec_domain.c:236: warning: type defaults to `int' in declaration of `this_object_must_be_defined_as_export_objs_in_the_Makefile'
exec_domain.c:236: warning: data definition has no type or storage class
exec_domain.c:287: parse error before `this_object_must_be_defined_as_export_objs_in_the_Makefile'
exec_domain.c:287: warning: type defaults to `int' in declaration of `this_object_must_be_defined_as_export_objs_in_the_Makefile'
exec_domain.c:287: warning: data definition has no type or storage class
exec_domain.c:288: parse error before `this_object_must_be_defined_as_export_objs_in_the_Makefile'
exec_domain.c:288: warning: type defaults to `int' in declaration of `this_object_must_be_defined_as_export_objs_in_the_Makefile'
exec_domain.c:288: warning: data definition has no type or storage class
exec_domain.c:289: parse error before `this_object_must_be_defined_as_export_objs_in_the_Makefile'
exec_domain.c:289: warning: type defaults to `int' in declaration of `this_object_must_be_defined_as_export_objs_in_the_Makefile'
exec_domain.c:289: warning: data definition has no type or storage class
exec_domain.c:290: parse error before `this_object_must_be_defined_as_export_objs_in_the_Makefile'
exec_domain.c:290: warning: type defaults to `int' in declaration of `this_object_must_be_defined_as_export_objs_in_the_Makefile'
exec_domain.c:290: warning: data definition has no type or storage class
exec_domain.c:291: parse error before `this_object_must_be_defined_as_export_objs_in_the_Makefile'
exec_domain.c:291: warning: type defaults to `int' in declaration of `this_object_must_be_defined_as_export_objs_in_the_Makefile'
exec_domain.c:291: warning: data definition has no type or storage class
exec_domain.c:292: parse error before `this_object_must_be_defined_as_export_objs_in_the_Makefile'
exec_domain.c:292: warning: type defaults to `int' in declaration of `this_object_must_be_defined_as_export_objs_in_the_Makefile'
exec_domain.c:292: warning: data definition has no type or storage class
make[2]: *** [exec_domain.o] Error 1
make[2]: Leaving directory `/home/bunk/linux/linux/kernel'
make[1]: *** [first_rule] Error 2
make[1]: Leaving directory `/home/bunk/linux/linux/kernel'
make: *** [_dir_kernel] Error 2


This seems to be triggered by the following change in pre5:


--- linux/include/linux/module.h
+++ linux/include/linux/module.h
@@ -348,6 +348,13 @@
#define EXPORT_SYMBOL_NOVERS(var) error config_must_be_included_before_module
#define EXPORT_SYMBOL_GPL(var) error config_must_be_included_before_module

+#elif !defined(EXPORT_SYMTAB)
+
+#define __EXPORT_SYMBOL(sym,str) error this_object_must_be_defined_as_export_objs_in_the_Makefile
+#define EXPORT_SYMBOL(var) error this_object_must_be_defined_as_export_objs_in_the_Makefile
+#define EXPORT_SYMBOL_NOVERS(var) error this_object_must_be_defined_as_export_objs_in_the_Makefile
+#define EXPORT_SYMBOL_GPL(var) error this_object_must_be_defined_as_export_objs_in_the_Makefile
+
#elif !defined(CONFIG_MODULES)

#define __EXPORT_SYMBOL(sym,str)



cu
Adrian

--

Get my GPG key: finger [email protected] | gpg --import

Fingerprint: B29C E71E FE19 6755 5C8A 84D4 99FC EA98 4F12 B400


Attachments:
.config (18.37 kB)

2001-10-07 21:14:47

by Alessandro Suardi

[permalink] [raw]
Subject: Re: Linux-2.4.11-pre5

Adrian Bunk wrote:
>
> I get the error below. Must likely there's a problem when you build a
> kernel without module support (my .config is attached).
>
> ...
> gcc -D__KERNEL__ -I/home/bunk/linux/linux/include -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=k6 -c -o exec_domain.o exec_domain.c

[snip]

> This seems to be triggered by the following change in pre5:
>
> --- linux/include/linux/module.h
> +++ linux/include/linux/module.h
> @@ -348,6 +348,13 @@
> #define EXPORT_SYMBOL_NOVERS(var) error config_must_be_included_before_module
> #define EXPORT_SYMBOL_GPL(var) error config_must_be_included_before_module
>
> +#elif !defined(EXPORT_SYMTAB)
> +
> +#define __EXPORT_SYMBOL(sym,str) error this_object_must_be_defined_as_export_objs_in_the_Makefile
> +#define EXPORT_SYMBOL(var) error this_object_must_be_defined_as_export_objs_in_the_Makefile
> +#define EXPORT_SYMBOL_NOVERS(var) error this_object_must_be_defined_as_export_objs_in_the_Makefile
> +#define EXPORT_SYMBOL_GPL(var) error this_object_must_be_defined_as_export_objs_in_the_Makefile
> +
> #elif !defined(CONFIG_MODULES)
>
> #define __EXPORT_SYMBOL(sym,str)

Happens also for ieee1394 when built as module.

--alessandro

"this is no time to get cute, it's a mad dog's promenade
so walk tall, or baby don't walk at all"
(Bruce Springsteen, 'New York City Serenade')

2001-10-07 21:46:12

by Alan

[permalink] [raw]
Subject: Re: Linux-2.4.11-pre5

> I get the error below. Must likely there's a problem when you build a
> kernel without module support (my .config is attached).

Its a sanity checker in the module processing code. Means you (or Linus..)
need to fix the makefiles

2001-10-07 23:46:48

by Linus Torvalds

[permalink] [raw]
Subject: Re: Linux-2.4.11-pre5


On Sun, 7 Oct 2001, Alessandro Suardi wrote:
>
> Happens also for ieee1394 when built as module.

Add "ohci1394.o" to the list of export-objs in ieee1349/Makefile.

As to the exec_domain.c one - that one is already on the export-obhjs
list, and I wonder if perhaps Adrian forgot to do a "make dep" or
similar...

Linus

2001-10-08 01:11:32

by Keith Owens

[permalink] [raw]
Subject: Re: Linux-2.4.11-pre5

On Sun, 7 Oct 2001 22:49:09 +0200 (CEST),
Adrian Bunk <[email protected]> wrote:
>I get the error below. Must likely there's a problem when you build a
>kernel without module support (my .config is attached).
>...
>gcc -D__KERNEL__ -I/home/bunk/linux/linux/include -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=k6 -c -o exec_domain.o exec_domain.c
>exec_domain.c: At top level:
>exec_domain.c:234: parse error before `this_object_must_be_defined_as_export_objs_in_the_Makefile'

My fault, Rules.make does not set EXPORT_SYMTAB for export-objs unless
the kernel is configured for modules. The test for EXPORT_SYMTAB must
come after CONFIG_MODULES. Against 2.4.11-pre5.

Index: 11-pre5.1/include/linux/module.h
--- 11-pre5.1/include/linux/module.h Mon, 08 Oct 2001 10:58:25 +1000 kaos (linux-2.4/c/b/46_module.h 1.1.1.1.2.6 644)
+++ 11-pre5.1(w)/include/linux/module.h Mon, 08 Oct 2001 11:08:09 +1000 kaos (linux-2.4/c/b/46_module.h 1.1.1.1.2.6 644)
@@ -348,19 +348,19 @@ extern struct module *module_list;
#define EXPORT_SYMBOL_NOVERS(var) error config_must_be_included_before_module
#define EXPORT_SYMBOL_GPL(var) error config_must_be_included_before_module

-#elif !defined(EXPORT_SYMTAB)
-
-#define __EXPORT_SYMBOL(sym,str) error this_object_must_be_defined_as_export_objs_in_the_Makefile
-#define EXPORT_SYMBOL(var) error this_object_must_be_defined_as_export_objs_in_the_Makefile
-#define EXPORT_SYMBOL_NOVERS(var) error this_object_must_be_defined_as_export_objs_in_the_Makefile
-#define EXPORT_SYMBOL_GPL(var) error this_object_must_be_defined_as_export_objs_in_the_Makefile
-
#elif !defined(CONFIG_MODULES)

#define __EXPORT_SYMBOL(sym,str)
#define EXPORT_SYMBOL(var)
#define EXPORT_SYMBOL_NOVERS(var)
#define EXPORT_SYMBOL_GPL(var)
+
+#elif !defined(EXPORT_SYMTAB)
+
+#define __EXPORT_SYMBOL(sym,str) error this_object_must_be_defined_as_export_objs_in_the_Makefile
+#define EXPORT_SYMBOL(var) error this_object_must_be_defined_as_export_objs_in_the_Makefile
+#define EXPORT_SYMBOL_NOVERS(var) error this_object_must_be_defined_as_export_objs_in_the_Makefile
+#define EXPORT_SYMBOL_GPL(var) error this_object_must_be_defined_as_export_objs_in_the_Makefile

#else


2001-10-08 16:35:08

by Robert Schiele

[permalink] [raw]
Subject: [PATCH] Re: Linux-2.4.11-pre5

On Sun, Oct 07, 2001 at 04:46:02PM -0700, Linus Torvalds wrote:
>
> On Sun, 7 Oct 2001, Alessandro Suardi wrote:
> >
> > Happens also for ieee1394 when built as module.
>
> Add "ohci1394.o" to the list of export-objs in ieee1349/Makefile.

To make this a bit more complete, I made a patch from all the
export-objs related changes I had to make to build my kernel. I don't
think that this list is complete, as I fixed only those parts that
prevented the kernel build on my system.

Robert

And now the patches:

--- linux-2.4.11-pre5/drivers/char/Makefile~ Sun Sep 9 19:43:02 2001
+++ linux-2.4.11-pre5/drivers/char/Makefile Mon Oct 8 06:29:08 2001
@@ -23,7 +23,7 @@

export-objs := busmouse.o console.o keyboard.o sysrq.o \
misc.o pty.o random.o selection.o serial.o \
- sonypi.o tty_io.o tty_ioctl.o
+ sonypi.o tty_io.o tty_ioctl.o generic_serial.o

mod-subdirs := joystick ftape drm pcmcia

--- linux-2.4.11-pre5/drivers/ide/Makefile~ Tue Sep 18 08:23:40 2001
+++ linux-2.4.11-pre5/drivers/ide/Makefile Mon Oct 8 06:48:09 2001
@@ -10,7 +10,7 @@

O_TARGET := idedriver.o

-export-objs := ide.o ide-features.o
+export-objs := ide.o ide-features.o ataraid.o
list-multi := ide-mod.o ide-probe-mod.o

obj-y :=
--- linux-2.4.11-pre5/drivers/ieee1394/Makefile~ Fri Jul 20 21:47:31 2001
+++ linux-2.4.11-pre5/drivers/ieee1394/Makefile Mon Oct 8 07:02:34 2001
@@ -4,7 +4,7 @@

O_TARGET := ieee1394drv.o

-export-objs := ieee1394_syms.o
+export-objs := ieee1394_syms.o ohci1394.o

list-multi := ieee1394.o
ieee1394-objs := ieee1394_core.o ieee1394_transactions.o hosts.o \
--- linux-2.4.11-pre5/drivers/video/sis/Makefile~ Fri Dec 29 23:07:23 2000
+++ linux-2.4.11-pre5/drivers/video/sis/Makefile Mon Oct 8 17:30:28 2001
@@ -4,6 +4,8 @@

O_TARGET := sisfb.o

+export-objs := sis_main.o
+
obj-y := sis_main.o sis_300.o sis_301.o
obj-m := $(O_TARGET)


--
Robert Schiele Tel.: +49-621-10059
Dipl.-Wirtsch.informatiker mailto:[email protected]


Attachments:
(No filename) (1.94 kB)
(No filename) (524.00 B)
Download all attachments

2001-10-08 19:02:26

by Simon Kirby

[permalink] [raw]
Subject: Re: Linux-2.4.11-pre5

On Sun, Oct 07, 2001 at 04:19:03PM -0400, Johannes Erdfelt wrote:

> Ahh, could you replace this line:
>
> pci_write_config_word(uhci->dev, USBLEGSUP, 0);
>
> with this:
>
> pci_write_config_word(uhci->dev, USBLEGSUP, USBLEGSUP_DEFAULT);
>
> and try again?

Yes, this fixed it. Thanks.

Simon-

[ Stormix Technologies Inc. ][ NetNation Communications Inc. ]
[ [email protected] ][ [email protected] ]
[ Opinions expressed are not necessarily those of my employers. ]

2001-10-08 19:47:36

by Simon Kirby

[permalink] [raw]
Subject: Re: Linux-2.4.11-pre5

On Mon, Oct 08, 2001 at 12:02:23PM -0700, Simon Kirby wrote:

> On Sun, Oct 07, 2001 at 04:19:03PM -0400, Johannes Erdfelt wrote:
>
> > Ahh, could you replace this line:
> >
> > pci_write_config_word(uhci->dev, USBLEGSUP, 0);
> >
> > with this:
> >
> > pci_write_config_word(uhci->dev, USBLEGSUP, USBLEGSUP_DEFAULT);
> >
> > and try again?
>
> Yes, this fixed it. Thanks.

However, now the downloading from my digital camera (Kodak DC290) is
abysmally slow...about a magnitude slower. usb-uhci instead goes at
the same speed as before.

Simon-

[ Stormix Technologies Inc. ][ NetNation Communications Inc. ]
[ [email protected] ][ [email protected] ]
[ Opinions expressed are not necessarily those of my employers. ]

2001-10-08 20:18:43

by Johannes Erdfelt

[permalink] [raw]
Subject: Re: Linux-2.4.11-pre5

On Mon, Oct 08, 2001, Simon Kirby <[email protected]> wrote:
> On Mon, Oct 08, 2001 at 12:02:23PM -0700, Simon Kirby wrote:
>
> > On Sun, Oct 07, 2001 at 04:19:03PM -0400, Johannes Erdfelt wrote:
> >
> > > Ahh, could you replace this line:
> > >
> > > pci_write_config_word(uhci->dev, USBLEGSUP, 0);
> > >
> > > with this:
> > >
> > > pci_write_config_word(uhci->dev, USBLEGSUP, USBLEGSUP_DEFAULT);
> > >
> > > and try again?
> >
> > Yes, this fixed it. Thanks.
>
> However, now the downloading from my digital camera (Kodak DC290) is
> abysmally slow...about a magnitude slower. usb-uhci instead goes at
> the same speed as before.

What are you using to download with? gphoto2?

JE

2001-10-08 20:30:07

by Simon Kirby

[permalink] [raw]
Subject: Re: Linux-2.4.11-pre5

On Mon, Oct 08, 2001 at 04:21:25PM -0400, Johannes Erdfelt wrote:

> On Mon, Oct 08, 2001, Simon Kirby <[email protected]> wrote:
>
> > However, now the downloading from my digital camera (Kodak DC290) is
> > abysmally slow...about a magnitude slower. usb-uhci instead goes at
> > the same speed as before.
>
> What are you using to download with? gphoto2?

"ks" from the opendis project.

Simon-

[ Stormix Technologies Inc. ][ NetNation Communications Inc. ]
[ [email protected] ][ [email protected] ]
[ Opinions expressed are not necessarily those of my employers. ]