On Wednesday 07 October 2009 00:35:24 Linus Torvalds wrote: > > David, can you test these on the sis5513 system that had problems with the > original pio0 mode setting? > > Thanks, > Linus > > On Wed, 7 Oct 2009, Bartlomiej Zolnierkiewicz wrote: > > > > patch #1 fixes old bug in sis5513 (uncovered by 2.6.30 device probing > > changes but it could be also triggered in earlier kernels on warm-plug > > operation) patch #1 contained a stupid mistake preventing it from working (thanks to David Fries for letting me know quickly), I guess that is what one gets for the late night hacking.. The corrected version below, David please try it instead: From: Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx> Subject: [PATCH take 2] sis5513: fix PIO setup for ATAPI devices Clear prefetch setting before potentially (re-)enabling it in config_drive_art_rwp() so the transition of the device type on the port from ATA to ATAPI (i.e. during warm-plug operation) is handled correctly. This is a really old bug (it probably goes back to very early days of the driver) but it was only affecting warm-plug operation until the recent "ide: try to use PIO Mode 0 during probe if possible" change (commit 6029336426a2b43e4bc6f4a84be8789a047d139e). Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx> Cc: David S. Miller <davem@xxxxxxxxxxxxx> Cc: Joao Ramos <joao.ramos@xxxxxxx> Cc: David Fries <david@xxxxxxxxx> Cc: d.stussy@xxxxxxxxx Cc: stable@xxxxxxxxxx --- drivers/ide/sis5513.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) Index: b/drivers/ide/sis5513.c =================================================================== --- a/drivers/ide/sis5513.c +++ b/drivers/ide/sis5513.c @@ -2,7 +2,7 @@ * Copyright (C) 1999-2000 Andre Hedrick <andre@xxxxxxxxxxxxx> * Copyright (C) 2002 Lionel Bouton <Lionel.Bouton@xxxxxxxx>, Maintainer * Copyright (C) 2003 Vojtech Pavlik <vojtech@xxxxxxx> - * Copyright (C) 2007 Bartlomiej Zolnierkiewicz + * Copyright (C) 2007-2009 Bartlomiej Zolnierkiewicz * * May be copied or modified under the terms of the GNU General Public License * @@ -281,11 +281,13 @@ static void config_drive_art_rwp(ide_dri pci_read_config_byte(dev, 0x4b, ®4bh); + rw_prefetch = reg4bh & ~(0x11 << drive->dn); + if (drive->media == ide_disk) - rw_prefetch = 0x11 << drive->dn; + rw_prefetch |= 0x11 << drive->dn; - if ((reg4bh & (0x11 << drive->dn)) != rw_prefetch) - pci_write_config_byte(dev, 0x4b, reg4bh|rw_prefetch); + if (reg4bh != rw_prefetch) + pci_write_config_byte(dev, 0x4b, rw_prefetch); } static void sis_set_pio_mode(ide_drive_t *drive, const u8 pio) -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
