Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
[PATCH] libata-sff: Allow for wacky systems
[PATCH] ahci: readability tweak
[PATCH] libata: typo fix
[PATCH] ATA must depend on BLOCK
[PATCH] libata: use correct map_db values for ICH8
+14
-4
+1
drivers/ata/Kconfig
+1
drivers/ata/Kconfig
+1
-1
drivers/ata/ahci.c
+1
-1
drivers/ata/ahci.c
···
1041
1041
/* hmmm... a spurious interupt */
1042
1042
1043
1043
/* some devices send D2H reg with I bit set during NCQ command phase */
1044
-
if (ap->sactive && status & PORT_IRQ_D2H_REG_FIS)
1044
+
if (ap->sactive && (status & PORT_IRQ_D2H_REG_FIS))
1045
1045
return;
1046
1046
1047
1047
/* ignore interim PIO setup fis interrupts */
+2
-2
drivers/ata/ata_piix.c
+2
-2
drivers/ata/ata_piix.c
···
432
432
.present_shift = 8,
433
433
.map = {
434
434
/* PM PS SM SS MAP */
435
-
{ P0, NA, P1, NA }, /* 00b (hardwired) */
435
+
{ P0, P2, P1, P3 }, /* 00b (hardwired when in AHCI) */
436
436
{ RV, RV, RV, RV },
437
-
{ RV, RV, RV, RV }, /* 10b (never) */
437
+
{ IDE, IDE, NA, NA }, /* 10b (IDE mode) */
438
438
{ RV, RV, RV, RV },
439
439
},
440
440
};
+9
drivers/ata/libata-sff.c
+9
drivers/ata/libata-sff.c
···
981
981
mask = (1 << 2) | (1 << 0);
982
982
if ((tmp8 & mask) != mask)
983
983
legacy_mode = (1 << 3);
984
+
#if defined(CONFIG_NO_ATA_LEGACY)
985
+
/* Some platforms with PCI limits cannot address compat
986
+
port space. In that case we punt if their firmware has
987
+
left a device in compatibility mode */
988
+
if (legacy_mode) {
989
+
printk(KERN_ERR "ata: Compatibility mode ATA is not supported on this platform, skipping.\n");
990
+
return -EOPNOTSUPP;
991
+
}
992
+
#endif
984
993
}
985
994
986
995
rc = pci_request_regions(pdev, DRV_NAME);
+1
-1
include/linux/libata.h
+1
-1
include/linux/libata.h
···
143
143
ATA_DFLAG_CFG_MASK = (1 << 8) - 1,
144
144
145
145
ATA_DFLAG_PIO = (1 << 8), /* device limited to PIO mode */
146
-
ATA_DFLAG_NCQ_OFF = (1 << 9), /* devied limited to non-NCQ mode */
146
+
ATA_DFLAG_NCQ_OFF = (1 << 9), /* device limited to non-NCQ mode */
147
147
ATA_DFLAG_SUSPENDED = (1 << 10), /* device suspended */
148
148
ATA_DFLAG_INIT_MASK = (1 << 16) - 1,
149
149