2.6.x libata updates
PATCH 1/1 2.6.x libata updates
Please pull from 'upstream-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git
to receive the following updates:
drivers/pci/quirks.c | 5 ++- drivers/scsi/ahci.c | 10 ++++++ drivers/scsi/ata_piix.c | 3 + drivers/scsi/libata-core.c | 73 +++++++++++++++++++++++++++++++++++++------- drivers/scsi/sata_promise.c | 16 +++++++++ drivers/scsi/sata_svw.c | 1 include/linux/libata.h | 11 ++++-- 7 files changed, 105 insertions(+), 14 deletions(-)
Alan Cox:
libata: Pre UDMA EIDE PIO mode selection
libata: add a function to decide if we need iordy
libata: Fix heuristic typos add LBA48PIO flag and support code, add IRQ flag for next diff
libata: Fix sector lock to apply to both drives not drive 0 twice
libata: Code for the IRQ mask flag
Jason Gaston:
ahci: AHCI mode SATA patch for Intel ICH8
Intel ICH8 SATA: add PCI device IDs
Oliver Weihe:
[libata] sata_svw: add pci id
Yusuf Iskenderoglu:
[libata] sata_promise: add pci id
drivers/pci/quirks.c +4 -1
@@ -1142,6 +1142,9 @@ static void __devinit quirk_intel_ide_cocase 0x27c4 : ich =7 ;break ; +case 0x2828 :/* ICH8M */ + ich =8 ; +break ;default :/* we do not handle this PCI device */ return ;
@@ -1161,7 +1164,7 @@ static void __devinit quirk_intel_ide_coelse return ;/* not in combined mode */ }else { -WARN_ON ((ich !=6 ) && (ich !=7 )); +WARN_ON ((ich !=6 ) && (ich !=7 ) && (ich !=8 )); tmp &=0x3 ;/* interesting bits 1:0 */ if (tmp & (1 <<0 )) comb = (1 <<2 );/* PATA port 0, SATA port 1 */
drivers/scsi/ahci.c +10 -0
@@ -276,6 +276,16 @@ static const struct pci_device_id ahci_p board_ahci }, /* ESB2 */ {PCI_VENDOR_ID_INTEL ,0x27c6 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , board_ahci }, /* ICH7-M DH */ + { PCI_VENDOR_ID_INTEL, 0x2821, PCI_ANY_ID, PCI_ANY_ID, 0, 0, + board_ahci }, /* ICH8 */ + { PCI_VENDOR_ID_INTEL, 0x2822, PCI_ANY_ID, PCI_ANY_ID, 0, 0, + board_ahci }, /* ICH8 */ + { PCI_VENDOR_ID_INTEL, 0x2824, PCI_ANY_ID, PCI_ANY_ID, 0, 0, + board_ahci }, /* ICH8 */ + { PCI_VENDOR_ID_INTEL, 0x2829, PCI_ANY_ID, PCI_ANY_ID, 0, 0, + board_ahci }, /* ICH8M */ + { PCI_VENDOR_ID_INTEL, 0x282a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, + board_ahci }, /* ICH8M */ { } /* terminate list */ };
drivers/scsi/ata_piix.c +3 -0
@@ -157,6 +157,9 @@ static const struct pci_device_id piix_p { 0x8086, 0x27c0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci }, { 0x8086, 0x27c4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci }, { 0x8086, 0x2680, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci }, + { 0x8086, 0x2820, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci }, + { 0x8086, 0x2825, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci }, + { 0x8086, 0x2828, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci }, { } /* terminate list */ };
drivers/scsi/libata-core.c +63 -10
116 lines not on this page · raw message
drivers/scsi/sata_promise.c +16 -0
@@ -66,6 +66,7 @@ enum { board_2037x =0 ,/* FastTrak S150 TX2plus */ board_20319 =1 ,/* FastTrak S150 TX4 */ board_20619 =2 ,/* FastTrak TX4000 */ + board_20771 =3 ,/* FastTrak TX2300 */ PDC_HAS_PATA = (1 << 1), /* PDC20375 has PATA */
@@ -190,6 +191,16 @@ static const struct ata_port_info pdc_po .udma_mask = 0x7f, /* udma0-6 ; FIXME */ .port_ops = &pdc_pata_ops, }, + +/* board_20771 */ + { + .sht = &pdc_ata_sht, + .host_flags = PDC_COMMON_FLAGS | ATA_FLAG_SATA, + .pio_mask = 0x1f, /* pio0-4 */ + .mwdma_mask = 0x07, /* mwdma0-2 */ + .udma_mask = 0x7f, /* udma0-6 ; FIXME */ + .port_ops = &pdc_sata_ops, + }, };static const struct pci_device_id pdc_ata_pci_tbl[] = {
@@ -226,6 +237,8 @@ static const struct pci_device_id pdc_at {PCI_VENDOR_ID_PROMISE ,0x6629 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , board_20619 }, + { PCI_VENDOR_ID_PROMISE, 0x3570, PCI_ANY_ID, PCI_ANY_ID, 0, 0, + board_20771 }, { } /* terminate list */ };
@@ -706,6 +719,9 @@ static int pdc_ata_init_one (struct pci_case board_2037x: probe_ent->n_ports =2 ;break ; +case board_20771: + probe_ent->n_ports =2 ; +break ;case board_20619: probe_ent->n_ports =4 ;
drivers/scsi/sata_svw.c +1 -0
@@ -470,6 +470,7 @@ static const struct pci_device_id k2_sat { 0x1166, 0x0241, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 }, { 0x1166, 0x0242, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 8 }, { 0x1166, 0x024a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 }, + { 0x1166, 0x024b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 }, { } };
include/linux/libata.h +8 -3
@@ -126,16 +126,19 @@ enum {ATA_FLAG_SUSPENDED = (1 <<12 ),/* port is suspended */ +ATA_FLAG_PIO_LBA48 = (1 <<13 ),/* Host DMA engine is LBA28 only */ +ATA_FLAG_IRQ_MASK = (1 <<14 ),/* Mask IRQ in PIO xfers */ +ATA_QCFLAG_ACTIVE = (1 <<1 ),/* cmd not yet ack'd to scsi lyer */ ATA_QCFLAG_SG = (1 <<3 ),/* have s/g table? */ ATA_QCFLAG_SINGLE = (1 <<4 ),/* no s/g, just a single buffer */ ATA_QCFLAG_DMAMAP =ATA_QCFLAG_SG |ATA_QCFLAG_SINGLE ,/* various lengths of time */ -ATA_TMOUT_EDD =5 *HZ ,/* hueristic */ +ATA_TMOUT_EDD =5 *HZ ,/* heuristic */ ATA_TMOUT_PIO =30 *HZ , -ATA_TMOUT_BOOT =30 *HZ ,/* hueristic */ -ATA_TMOUT_BOOT_QUICK =7 *HZ ,/* hueristic */ +ATA_TMOUT_BOOT =30 *HZ ,/* heuristic */ +ATA_TMOUT_BOOT_QUICK =7 *HZ ,/* heuristic */ ATA_TMOUT_CDB =30 *HZ ,ATA_TMOUT_CDB_QUICK =5 *HZ , ATA_TMOUT_INTERNAL = 30 * HZ,
@@ -499,6 +502,8 @@ extern int ata_scsi_slave_config(struct/* * Timing helpers */ + +extern unsigned int ata_pio_need_iordy (const struct ata_device *);extern int ata_timing_compute (struct ata_device *,unsigned short ,struct ata_timing *,int ,int ); extern void ata_timing_merge(const struct ata_timing *,
Quoted 3 lines · Jeff Garzik
Please pull from 'upstream-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git
I worry that whatever it is which has busted Reuben's machine will leak into mainline. This patch probably isn't it.
I guess if we can feed libata and acpi into mainline in little bits and pieces like this, that'll help us work out the cause.
Reuben has spent ages bisecting lots of patches, but the bug is quite intermittent, which makes the process quite maddeningly error-prone and slow.
Then again, perhaps merging it up is the best way of fixing it: someone out there will hit the thing more repeatably and will have a better shot at finding the cause.
Quoted 8 lines · Andrew Morton
Quoted 2 lines · Jeff Garzik
Please pull from 'upstream-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git
I worry that whatever it is which has busted Reuben's machine will leak into mainline. This patch probably isn't it.
Nothing at all in this push is remotely controversial...
Quoted 10 lines
I guess if we can feed libata and acpi into mainline in little bits and pieces like this, that'll help us work out the cause.
Reuben has spent ages bisecting lots of patches, but the bug is quite intermittent, which makes the process quite maddeningly error-prone and slow.
Then again, perhaps merging it up is the best way of fixing it: someone out there will hit the thing more repeatably and will have a better shot at finding the cause.
Well, I haven't even looked at ACPI yet, and the Jens/Tejun stuff didn't get much testing at all. There's a lot of unfamiliar stuff in the mix.
Jeff