* Linux 2.4.28-rc1
@ 2004-10-22 18:59 Marcelo Tosatti
2004-10-22 22:14 ` Jan Engelhardt
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Marcelo Tosatti @ 2004-10-22 18:59 UTC (permalink / raw)
To: linux-kernel
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
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: Linux 2.4.28-rc1 2004-10-22 18:59 Linux 2.4.28-rc1 Marcelo Tosatti @ 2004-10-22 22:14 ` Jan Engelhardt 2004-10-23 10:43 ` Marcelo Tosatti 2004-10-23 13:30 ` Paul Fulghum 2004-10-24 14:07 ` [2.4 patch] add SCSI_SATA_ULI help text Adrian Bunk 2 siblings, 1 reply; 8+ messages in thread From: Jan Engelhardt @ 2004-10-22 22:14 UTC (permalink / raw) To: Marcelo Tosatti; +Cc: linux-kernel >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 -- Gesellschaft für Wissenschaftliche Datenverarbeitung Am Fassberg, 37077 Göttingen, www.gwdg.de ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Linux 2.4.28-rc1 2004-10-22 22:14 ` Jan Engelhardt @ 2004-10-23 10:43 ` Marcelo Tosatti 2004-10-23 13:48 ` [RESEND PATCH 2.4.28] delkin_cb new driver for Delkin Cardbus CF Adapter Mark Lord 2004-10-23 19:54 ` Linux 2.4.28-rc1 Jan Engelhardt 0 siblings, 2 replies; 8+ messages in thread From: Marcelo Tosatti @ 2004-10-23 10:43 UTC (permalink / raw) To: Jan Engelhardt; +Cc: linux-kernel On Sat, Oct 23, 2004 at 12:14:37AM +0200, Jan Engelhardt wrote: > >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? ^ permalink raw reply [flat|nested] 8+ messages in thread
* [RESEND PATCH 2.4.28] delkin_cb new driver for Delkin Cardbus CF Adapter 2004-10-23 10:43 ` Marcelo Tosatti @ 2004-10-23 13:48 ` Mark Lord 2004-10-23 19:54 ` Linux 2.4.28-rc1 Jan Engelhardt 1 sibling, 0 replies; 8+ messages in thread From: Mark Lord @ 2004-10-23 13:48 UTC (permalink / raw) To: Marcelo Tosatti; +Cc: linux-kernel [-- Attachment #1: Type: text/plain, Size: 270 bytes --] 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 <mlord@pobox.com> -- Mark Lord (hdparm keeper & the original "Linux IDE Guy") [-- Attachment #2: delkin_cb-2.4.28-bk4.patch --] [-- Type: text/plain, Size: 7798 bytes --] diff -u --recursive --new-file --exclude='.*' linux-2.4.28-pre4-bk6/Documentation/Configure.help linux/Documentation/Configure.help --- linux-2.4.28-pre4-bk6/Documentation/Configure.help 2004-10-21 11:02:17.000000000 -0400 +++ linux/Documentation/Configure.help 2004-10-21 19:38:35.000000000 -0400 @@ -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 diff -u --recursive --new-file --exclude='.*' linux-2.4.28-pre4-bk6/drivers/ide/Config.in linux/drivers/ide/Config.in --- linux-2.4.28-pre4-bk6/drivers/ide/Config.in 2004-10-21 11:02:18.000000000 -0400 +++ linux/drivers/ide/Config.in 2004-10-21 11:46:05.000000000 -0400 @@ -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 diff -u --recursive --new-file --exclude='.*' linux-2.4.28-pre4-bk6/drivers/ide/pci/delkin_cb.c linux/drivers/ide/pci/delkin_cb.c --- linux-2.4.28-pre4-bk6/drivers/ide/pci/delkin_cb.c 1969-12-31 19:00:00.000000000 -0500 +++ linux/drivers/ide/pci/delkin_cb.c 2004-10-21 17:47:33.000000000 -0400 @@ -0,0 +1,149 @@ +/* + * linux/drivers/ide/pci/delkin_cb.c + * + * Created 21 Oct 2004 by Mark Lord + * + * Basic support for Delkin/ASKA/Workbit Cardbus CompactFlash adapter + * + * Modeled after the 16-bit PCMCIA driver: ide-cs.c + * + * This is slightly peculiar, in that it is a PCI driver, + * but is NOT an IDE PCI driver -- the IDE layer does not directly + * support hot insertion/removal of PCI interfaces, so this driver + * is unable to use the IDE PCI interfaces. Instead, it uses the + * same interfaces as the ide-cs (PCMCIA) driver uses. + * On the plus side, the driver is also smaller/simpler this way. + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file COPYING in the main directory of this archive for + * more details. + */ +#include <linux/config.h> +#include <linux/types.h> +#include <linux/module.h> +#include <linux/mm.h> +#include <linux/blkdev.h> +#include <linux/hdreg.h> +#include <linux/ide.h> +#include <linux/init.h> +#include <linux/pci.h> +#include <asm/io.h> + +/* + * No chip documentation has yet been found, + * so these configuration values were pulled from + * a running Win98 system using "debug". + * This gives around 3MByte/second read performance, + * which is about 2/3 of what the chip is capable of. + * + * There is also a 4KByte mmio region on the card, + * but its purpose has yet to be reverse-engineered. + */ +static const u8 setup[] = { + 0x00, 0x05, 0xbe, 0x01, 0x20, 0x8f, 0x00, 0x00, + 0xa4, 0x1f, 0xb3, 0x1b, 0x00, 0x00, 0x00, 0x80, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xa4, 0x83, 0x02, 0x13, +}; + +static int __devinit +delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id) +{ + unsigned long base; + hw_regs_t hw; + ide_hwif_t *hwif = NULL; + ide_drive_t *drive; + int i, rc; + + MOD_INC_USE_COUNT; + rc = pci_enable_device(dev); + if (rc) { + printk(KERN_ERR "delkin_cb: pci_enable_device failed (%d)\n", rc); + return rc; + } + rc = pci_request_regions(dev, "delkin_cb"); + if (rc) { + printk(KERN_ERR "delkin_cb: pci_request_regions failed (%d)\n", rc); + pci_disable_device(dev); + return rc; + } + base = pci_resource_start(dev, 0); + outb(0x02, base + 0x1e); /* set nIEN to block interrupts */ + inb(base + 0x17); /* read status to clear interrupts */ + for (i = 0; i < sizeof(setup); ++i) { + if (setup[i]) + outb(setup[i], base + i); + } + pci_release_regions(dev); /* IDE layer handles regions itself */ + + memset(&hw, 0, sizeof(hw)); + ide_init_hwif_ports(&hw, (ide_ioreg_t)(base + 0x10), + (ide_ioreg_t)(base + 0x1e), NULL); + hw.irq = dev->irq; + hw.chipset = ide_pci; /* this enables IRQ sharing */ + + rc = ide_register_hw(&hw, &hwif); + if (rc < 0) /* ide_register_hw likes to be invoked twice (buggy) */ + rc = ide_register_hw(&hw, &hwif); + if (rc < 0) { + printk(KERN_ERR "delkin_cb: ide_register_hw failed (%d)\n", rc); + MOD_DEC_USE_COUNT; + return -ENODEV; + } + pci_set_drvdata(dev, hwif); + hwif->pci_dev = dev; + drive = &hwif->drives[0]; + if (drive->present) { + drive->id->csfo = 0; /* workaround for idedisk_open bug */ + drive->io_32bit = 1; + drive->unmask = 1; + } + return 0; +} + +static void +delkin_cb_remove (struct pci_dev *dev) +{ + ide_hwif_t *hwif = pci_get_drvdata(dev); + + if (hwif) { + ide_unregister(hwif->index); + MOD_DEC_USE_COUNT; + } + pci_disable_device(dev); +} + +static struct pci_device_id delkin_cb_pci_tbl[] __devinitdata = { + { PCI_VENDOR_ID_WORKBIT, PCI_DEVICE_ID_WORKBIT_CB, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, + { 0, }, +}; +MODULE_DEVICE_TABLE(pci, delkin_cb_pci_tbl); + +static struct pci_driver driver = { + .name = "Delkin/ASKA/Workbit Cardbus IDE", + .id_table = delkin_cb_pci_tbl, + .probe = delkin_cb_probe, + .remove = delkin_cb_remove, +}; + +static int +delkin_cb_init (void) +{ + return pci_module_init(&driver); +} + +static void +delkin_cb_exit (void) +{ + pci_unregister_driver(&driver); +} + +module_init(delkin_cb_init); +module_exit(delkin_cb_exit); + +MODULE_AUTHOR("Mark Lord"); +MODULE_DESCRIPTION("Basic support for Delkin/ASKA/Workbit Cardbus IDE"); +MODULE_LICENSE("GPL"); + +EXPORT_NO_SYMBOLS; + diff -u --recursive --new-file --exclude='.*' linux-2.4.28-pre4-bk6/drivers/ide/pci/Makefile linux/drivers/ide/pci/Makefile --- linux-2.4.28-pre4-bk6/drivers/ide/pci/Makefile 2004-04-14 09:05:29.000000000 -0400 +++ linux/drivers/ide/pci/Makefile 2004-10-21 11:46:20.000000000 -0400 @@ -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 diff -u --recursive --new-file --exclude='.*' linux-2.4.28-pre4-bk6/drivers/scsi/nsp32.h linux/drivers/scsi/nsp32.h --- linux-2.4.28-pre4-bk6/drivers/scsi/nsp32.h 2003-11-28 13:26:20.000000000 -0500 +++ linux/drivers/scsi/nsp32.h 2004-10-21 11:31:03.000000000 -0400 @@ -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 diff -u --recursive --new-file --exclude='.*' linux-2.4.28-pre4-bk6/include/linux/pci_ids.h linux/include/linux/pci_ids.h --- linux-2.4.28-pre4-bk6/include/linux/pci_ids.h 2004-10-21 11:02:21.000000000 -0400 +++ linux/include/linux/pci_ids.h 2004-10-21 11:16:32.000000000 -0400 @@ -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 ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Linux 2.4.28-rc1 2004-10-23 10:43 ` Marcelo Tosatti 2004-10-23 13:48 ` [RESEND PATCH 2.4.28] delkin_cb new driver for Delkin Cardbus CF Adapter Mark Lord @ 2004-10-23 19:54 ` Jan Engelhardt 1 sibling, 0 replies; 8+ messages in thread From: Jan Engelhardt @ 2004-10-23 19:54 UTC (permalink / raw) To: Marcelo Tosatti; +Cc: linux-kernel >> >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 -- Gesellschaft für Wissenschaftliche Datenverarbeitung Am Fassberg, 37077 Göttingen, www.gwdg.de ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Linux 2.4.28-rc1 2004-10-22 18:59 Linux 2.4.28-rc1 Marcelo Tosatti 2004-10-22 22:14 ` Jan Engelhardt @ 2004-10-23 13:30 ` Paul Fulghum 2004-10-23 11:39 ` Marcelo Tosatti 2004-10-24 14:07 ` [2.4 patch] add SCSI_SATA_ULI help text Adrian Bunk 2 siblings, 1 reply; 8+ messages in thread From: Paul Fulghum @ 2004-10-23 13:30 UTC (permalink / raw) To: Marcelo Tosatti; +Cc: Linux Kernel list On Fri, 2004-10-22 at 13:59, Marcelo Tosatti wrote: > Here goes the first release candidate of v2.4.28. Any chance of getting this in? -- Paul Fulghum paulkf@microgate.com >From paulkf@microgate.com Fri Oct 8 13:20:56 2004 Subject: [PATCH] serial receive lockup fix From: Paul Fulghum <paulkf@microgate.com> To: Marcelo Tosatti <marcelo.tosatti@cyclades.com> Cc: linux-kernel <linux-kernel@vger.kernel.org> Fix lockup caused by serial driver not clearing receive interrupt if flip buffer becomes full. Signed-off-by: Paul Fulghum <paulkf@microgate.com> --- a/drivers/char/serial.c 2004-09-29 09:08:35.000000000 -0500 +++ b/drivers/char/serial.c 2004-09-29 09:09:07.000000000 -0500 @@ -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; ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Linux 2.4.28-rc1 2004-10-23 13:30 ` Paul Fulghum @ 2004-10-23 11:39 ` Marcelo Tosatti 0 siblings, 0 replies; 8+ messages in thread From: Marcelo Tosatti @ 2004-10-23 11:39 UTC (permalink / raw) To: Paul Fulghum; +Cc: Linux Kernel list On Sat, Oct 23, 2004 at 08:30:20AM -0500, Paul Fulghum wrote: > On Fri, 2004-10-22 at 13:59, Marcelo Tosatti wrote: > > 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. > > -- > Paul Fulghum > paulkf@microgate.com > > >From paulkf@microgate.com Fri Oct 8 13:20:56 2004 > Subject: [PATCH] serial receive lockup fix > From: Paul Fulghum <paulkf@microgate.com> > To: Marcelo Tosatti <marcelo.tosatti@cyclades.com> > Cc: linux-kernel <linux-kernel@vger.kernel.org> > > Fix lockup caused by serial driver not clearing > receive interrupt if flip buffer becomes full. > > Signed-off-by: Paul Fulghum <paulkf@microgate.com> > > > > --- a/drivers/char/serial.c 2004-09-29 09:08:35.000000000 -0500 > +++ b/drivers/char/serial.c 2004-09-29 09:09:07.000000000 -0500 > @@ -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; > > ^ permalink raw reply [flat|nested] 8+ messages in thread
* [2.4 patch] add SCSI_SATA_ULI help text 2004-10-22 18:59 Linux 2.4.28-rc1 Marcelo Tosatti 2004-10-22 22:14 ` Jan Engelhardt 2004-10-23 13:30 ` Paul Fulghum @ 2004-10-24 14:07 ` Adrian Bunk 2 siblings, 0 replies; 8+ messages in thread From: Adrian Bunk @ 2004-10-24 14:07 UTC (permalink / raw) To: Marcelo Tosatti, jgarzik; +Cc: linux-kernel On Fri, Oct 22, 2004 at 04:59:53PM -0200, Marcelo Tosatti wrote: >... > 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 <bunk@stusta.de> --- linux-2.4.28-rc1-full/Documentation/Configure.help.old 2004-10-24 16:03:07.000000000 +0200 +++ linux-2.4.28-rc1-full/Documentation/Configure.help 2004-10-24 16:04:11.000000000 +0200 @@ -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. ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2004-10-24 14:08 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2004-10-22 18:59 Linux 2.4.28-rc1 Marcelo Tosatti 2004-10-22 22:14 ` Jan Engelhardt 2004-10-23 10:43 ` Marcelo Tosatti 2004-10-23 13:48 ` [RESEND PATCH 2.4.28] delkin_cb new driver for Delkin Cardbus CF Adapter Mark Lord 2004-10-23 19:54 ` Linux 2.4.28-rc1 Jan Engelhardt 2004-10-23 13:30 ` Paul Fulghum 2004-10-23 11:39 ` Marcelo Tosatti 2004-10-24 14:07 ` [2.4 patch] add SCSI_SATA_ULI help text Adrian Bunk
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).