Linux 2.4.28-rc1

PATCH RESEND New Marcelo Tosatti 5 participants 8 messages Oct 22, 2004 – Oct 24, 2004

Subsystems (4)

Documentation SCSI PCI Ninja SCSI-32Bi/ude PCI/cardbus SCSI host adapter driver

lore

Share & tools

lore

Marcelo Tosatti

author

2004-10-22 21:30 UTC #0 lore raw

Hi,

Here goes the first release candidate of v2.4.28.

It contains a small number of changes from -pre4, a couple of libata bugfixes, a PIIX IDE driver DMA bugfix, USB fixes, and some tmpfs corrections.

Detailed changelog follows.

Summary of changes from v2.4.28-pre4 to v2.4.28-rc1
============================================

<chaus:rz.uni-potsdam.de>:
o Fix bug in PIIX code where DMA could be turned on without proper hw configuration (bugzilla bug #3473)

Bartlomiej Zolnierkiewicz:
o libata: PCI IDE legacy mode fix
o [libata] do not memset() SCSI request buf in a get-reference style function
o [libata piix] Fix PATA UDMA masks

Benjamin Herrenschmidt:
o Mikael Pettersson: PowerPC 745x coherency fix

Dave Jones:
o davej CREDITS update

François Romieu:
o sata_nv: enable hotplug event on successfull init only
o sata_nv: wrong failure path and leak
o sata_nv: housekeeping for goto labels

Herbert Xu:
o Fix hiddev devfs oops

Hugh Dickins:
o tmpfs: stop negative dentries
o tmpfs: fix shmem_file_write return value

Jake Moilanen:
o PPC64 build break

Jeff Garzik:
o [libata] add hook, and export functions needed for sata2 drivers
o [libata] add sata_uli driver for ULi (formerly ALi) SATA

Jens Axboe:
o scsi io completion bug

Maciej W. Rozycki:
o "console=" parameter ignored

Marcelo Tosatti:
o Changed EXTRAVERSION to -rc1

Margit Schubert-While:
o Add prism54 to MAINTAINERS

Paul Fulghum:
o serial send_break duration fix

Pete Zaitcev:
o Crash with cat /proc/bus/usb/devices and disconnect

Özkan Sezer:
o e1000 driver, gcc-3.4 inlining fix

Jan Engelhardt

2004-10-22 22:24 UTC #1 lore raw

Quoted 3 lines

Hi,
Here goes the first release candidate of v2.4.28.

Hi,

if this one <http://lkml.org/lkml/2004/10/22/74> makes it in, it could also be considered for the 2.4 tree.

Regards,
Jan Engelhardt

Signature · 2 lines

Gesellschaft für Wissenschaftliche Datenverarbeitung
Am Fassberg, 37077 Göttingen, www.gwdg.de

Marcelo Tosatti

author

2004-10-23 13:09 UTC #2 lore raw

Quoted 8 lines · Jan Engelhardt

Quoted 3 lines
Hi,
Here goes the first release candidate of v2.4.28.
Hi,
if this one <http://lkml.org/lkml/2004/10/22/74> makes it in, it could also be considered for the 2.4 tree.

Sure, looks pretty easy, can Jan Kara or you prepare a backport please?

Mark Lord

2004-10-23 13:48 UTC #3 lore raw

PATCH RESEND 1/1 delkin_cb new driver for Delkin Cardbus CF Adapter

Marcelo,

This new driver is also ready to go into 2.4.xx. It is completely stand-alone, with no code impact to any existing drivers, and so should be pretty safe.

Signed-off-by Mark Lord <[email protected]>

Signature · 2 lines

Mark Lord
(hdparm keeper & the original "Linux IDE Guy")

Documentation/Configure.help +7 -0

diff -u --recursive --new-file --exclude='.*' linux-2.4.28-pre4-bk6/Documentation/Configure.help linux/Documentation/Configure.help
@@ -781,6 +781,13 @@
   <file:Documentation/modules.txt>. The module will be called
   ide-cs.o
 
+Cardbus IDE support (Delkin/ASKA/Workbit)
+CONFIG_BLK_DEV_DELKIN
+  Support for Delkin/ASKA/Workbit cardbus CompactFlash Adapters.
+  This may also work for similar SD and XD adapters.  If you want
+  to be able to use one of these, then say M here.  The module will
+  be called delkin_cb.o
+
 Include IDE/ATAPI CD-ROM support
 CONFIG_BLK_DEV_IDECD
   If you have a CD-ROM drive using the ATAPI protocol, say Y. ATAPI is

drivers/ide/Config.in +1 -0

diff -u --recursive --new-file --exclude='.*' linux-2.4.28-pre4-bk6/drivers/ide/Config.in linux/drivers/ide/Config.in
@@ -18,6 +18,7 @@
    dep_mbool '    Auto-Geometry Resizing support' CONFIG_IDEDISK_STROKE $CONFIG_BLK_DEV_IDEDISK
 
    dep_tristate '  PCMCIA IDE support' CONFIG_BLK_DEV_IDECS $CONFIG_BLK_DEV_IDE $CONFIG_PCMCIA
+   dep_tristate '  Cardbus IDE support (Delkin/ASKA/Workbit)' CONFIG_BLK_DEV_DELKIN $CONFIG_BLK_DEV_IDE $CONFIG_PCMCIA $CONFIG_PCI
    dep_tristate '  Include IDE/ATAPI CDROM support' CONFIG_BLK_DEV_IDECD $CONFIG_BLK_DEV_IDE
    dep_tristate '  Include IDE/ATAPI TAPE support' CONFIG_BLK_DEV_IDETAPE $CONFIG_BLK_DEV_IDE
    dep_tristate '  Include IDE/ATAPI FLOPPY support' CONFIG_BLK_DEV_IDEFLOPPY $CONFIG_BLK_DEV_IDE

drivers/ide/pci/delkin_cb.c +149 -0

149 lines not on this page · raw message

drivers/ide/pci/Makefile +1 -0

diff -u --recursive --new-file --exclude='.*' linux-2.4.28-pre4-bk6/drivers/ide/pci/Makefile linux/drivers/ide/pci/Makefile
@@ -34,6 +34,7 @@
 obj-$(CONFIG_BLK_DEV_TRM290)		+= trm290.o
 obj-$(CONFIG_BLK_DEV_VIA82CXXX)		+= via82cxxx.o
 obj-$(CONFIG_BLK_DEV_TRIFLEX)		+= triflex.o
+obj-$(CONFIG_BLK_DEV_DELKIN)		+= delkin_cb.o
 
 # Must appear at the end of the block
 obj-$(CONFIG_BLK_DEV_GENERIC)		+= generic.o

drivers/scsi/nsp32.h +0 -1

diff -u --recursive --new-file --exclude='.*' linux-2.4.28-pre4-bk6/drivers/scsi/nsp32.h linux/drivers/scsi/nsp32.h
@@ -22,7 +22,6 @@
  * VENDOR/DEVICE ID
  */
 #define PCI_VENDOR_ID_IODATA  0x10fc
-#define PCI_VENDOR_ID_WORKBIT 0x1145
 
 #define PCI_DEVICE_ID_NINJASCSI_32BI_CBSC_II   0x0005
 #define PCI_DEVICE_ID_NINJASCSI_32BI_KME       0xf007

include/linux/pci_ids.h +3 -0

diff -u --recursive --new-file --exclude='.*' linux-2.4.28-pre4-bk6/include/linux/pci_ids.h linux/include/linux/pci_ids.h
@@ -2057,3 +2057,6 @@
 #define PCI_DEVICE_ID_MICROGATE_USC	0x0010
 #define PCI_DEVICE_ID_MICROGATE_SCC	0x0020
 #define PCI_DEVICE_ID_MICROGATE_SCA	0x0030
+
+#define PCI_VENDOR_ID_WORKBIT		0x1145
+#define PCI_DEVICE_ID_WORKBIT_CB	0xf021

Jan Engelhardt

2004-10-23 19:57 UTC #4 lore raw

In reply to Marcelo Tosatti

Quoted 8 lines

Quoted 6 lines
Quoted 1 line
Here goes the first release candidate of v2.4.28.
Hi,
if this one <http://lkml.org/lkml/2004/10/22/74> makes it in, it could also be considered for the 2.4 tree.
Sure, looks pretty easy, can Jan Kara or you prepare a backport please?

There is no difference, the patch will also apply to 2.4 without problems.

Jan Engelhardt

Signature · 2 lines

Gesellschaft für Wissenschaftliche Datenverarbeitung
Am Fassberg, 37077 Göttingen, www.gwdg.de

Paul Fulghum

2004-10-23 13:30 UTC #5 lore raw

In reply to Marcelo Tosatti

Quoted 1 line · Marcelo Tosatti

Here goes the first release candidate of v2.4.28.

Any chance of getting this in?

Signature · 2 lines

Paul Fulghum
[email protected]

Quoted 1 line

From [email protected] Fri Oct 8 13:20:56 2004

Subject: [PATCH] serial receive lockup fix
From: Paul Fulghum <[email protected]>
To: Marcelo Tosatti <[email protected]>
Cc: linux-kernel <[email protected]>

Fix lockup caused by serial driver not clearing receive interrupt if flip buffer becomes full.

Signed-off-by Paul Fulghum <[email protected]>

drivers/char/serial.c +12 -1

@@ -573,8 +573,19 @@
 	do {
 		if (tty->flip.count >= TTY_FLIPBUF_SIZE) {
 			tty->flip.tqueue.routine((void *) tty);
-			if (tty->flip.count >= TTY_FLIPBUF_SIZE)
+			if (tty->flip.count >= TTY_FLIPBUF_SIZE) {
+				/* no room in flip buffer, discard rx FIFO contents to clear IRQ
+				 * *FIXME* Hardware with auto flow control
+				 * would benefit from leaving the data in the FIFO and
+				 * disabling the rx IRQ until space becomes available.
+				 */
+				do {
+					serial_inp(info, UART_RX);
+					icount->overrun++;
+					*status = serial_inp(info, UART_LSR);
+				} while ((*status & UART_LSR_DR) && (max_count-- > 0));
 				return;		// if TTY_DONT_FLIP is set
+			}
 		}
 		ch = serial_inp(info, UART_RX);
 		*tty->flip.char_buf_ptr = ch;

Marcelo Tosatti

author

2004-10-23 14:06 UTC #6 lore raw

Quoted 4 lines · Paul Fulghum

Quoted 1 line · Marcelo Tosatti
Here goes the first release candidate of v2.4.28.
Any chance of getting this in?

Oh I missed that, sorry (I've seen it and thought I had applied).

Well, there it is.

Quoted 43 lines

Signature · 3 lines
-- 
Paul Fulghum
[email protected]
Quoted 1 line
From [email protected] Fri Oct 8 13:20:56 2004
Subject: [PATCH] serial receive lockup fix
From: Paul Fulghum <[email protected]>
To: Marcelo Tosatti <[email protected]>
Cc: linux-kernel <[email protected]>
Fix lockup caused by serial driver not clearing receive interrupt if flip buffer becomes full.
Signed-off-by Paul Fulghum <[email protected]>
drivers/char/serial.c +12 -1
@@ -573,8 +573,19 @@
 	do {
 		if (tty->flip.count >= TTY_FLIPBUF_SIZE) {
 			tty->flip.tqueue.routine((void *) tty);
-			if (tty->flip.count >= TTY_FLIPBUF_SIZE)
+			if (tty->flip.count >= TTY_FLIPBUF_SIZE) {
+				/* no room in flip buffer, discard rx FIFO contents to clear IRQ
+				 * *FIXME* Hardware with auto flow control
+				 * would benefit from leaving the data in the FIFO and
+				 * disabling the rx IRQ until space becomes available.
+				 */
+				do {
+					serial_inp(info, UART_RX);
+					icount->overrun++;
+					*status = serial_inp(info, UART_LSR);
+				} while ((*status & UART_LSR_DR) && (max_count-- > 0));
 				return;		// if TTY_DONT_FLIP is set
+			}
 		}
 		ch = serial_inp(info, UART_RX);
 		*tty->flip.char_buf_ptr = ch;

Adrian Bunk

2004-10-24 14:08 UTC #7 lore raw

PATCH 1/1 add SCSI_SATA_ULI help text

In reply to Marcelo Tosatti

Quoted 8 lines · Marcelo Tosatti

...
Summary of changes from v2.4.28-pre4 to v2.4.28-rc1
============================================
...
Jeff Garzik:
...
o [libata] add sata_uli driver for ULi (formerly ALi) SATA
...

#include <no/help/text.h>

Signed-off-by Adrian Bunk <[email protected]>

Documentation/Configure.help renamed from Documentation/Configure.help.old +5 -0

@@ -9354,6 +9354,11 @@
 
   If unsure, say N.
 
+CONFIG_SCSI_SATA_ULI
+  This option enables support for ULi Electronics SATA.
+
+  If unsure, say N.
+
 CONFIG_SCSI_SATA_VIA
   This option enables support for VIA Serial ATA.