libata updates
PATCH 1/1 libata updates
The PCI change was ack'd by Greg...
Please pull from 'upstream-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-linus
to receive the following updates:
drivers/ata/Kconfig | 2 +- drivers/ata/ahci.c | 2 + drivers/ata/ata_piix.c | 10 +- drivers/ata/pata_bf54x.c | 53 ++--- drivers/ata/pata_sl82c105.c | 33 +++- drivers/ata/sata_mv.c | 486 +++++++++++++++++++++++++++---------------- drivers/ata/sata_nv.c | 18 +- drivers/pci/pci.c | 3 +- 8 files changed, 389 insertions(+), 218 deletions(-)
Adrian Bunk (1):
ata_piix.c: make piix_merge_scr() static
Alan Cox (1):
pata_sl82c105: dual channel support
Bryan Wu (1):
Blackfin pata-bf54x driver: fix compiling bug - no ata_port struct in struct ata_device any more
Jason Gaston (2):
ahci: RAID mode SATA patch for Intel ICH10 DeviceID's
ata_piix: IDE mode SATA patch for Intel ICH10 DeviceID's
Mark Lord (13):
sata_mv ncq EH fixes
sata_mv ncq Mask transient IRQs
sata_mv ncq Rename base to port mmio
sata_mv ncq Fix EDMA configuration
sata_mv ncq Add want ncq parameter for EDMA configuration sata_mv ncq Use hqtag instead of ioid
sata_mv ncq Ignore response status LSB on NCQ sata_mv ncq Restrict max sectors to 8-bits on GenII NCQ sata_mv ncq Use DMA memory pools for hardware memory tables sata_mv ncq Introduce per-tag SG tables
sata_mv ncq Enable NCQ operation
sata_mv ncq Remove post internal cmd op
sata_mv ncq Comments and version bump
Robert Hancock (1):
sata_nv: fix for completion handling
Saeed Bishara (1):
sata_mv: Remove PCI dependency
Sonic Zhang (3):
Blackfin pata-bf54x driver: Remove obsolete PM function Blackfin pata-bf54x driver: Add debug information
Blackfin pata-bf54x driver: should cover all possible interrupt sources
Tejun Heo (1):
pci: allow multiple calls to pcim_enable_device()
drivers/ata/Kconfig +1 -1
@@ -69,7 +69,7 @@ config ATA_PIIX config SATA_MV tristate "Marvell SATA support (HIGHLY EXPERIMENTAL)" - depends on PCI && EXPERIMENTAL + depends on EXPERIMENTAL help This option enables support for the Marvell Serial ATA family. Currently supports 88SX[56]0[48][01] chips.
drivers/ata/ahci.c +2 -0
@@ -475,6 +475,8 @@ static const struct pci_device_id ahci_pci_tbl[] = { { PCI_VDEVICE(INTEL, 0x294e), board_ahci }, /* ICH9M */ { PCI_VDEVICE(INTEL, 0x502a), board_ahci }, /* Tolapai */ { PCI_VDEVICE(INTEL, 0x502b), board_ahci }, /* Tolapai */ + { PCI_VDEVICE(INTEL, 0x3a05), board_ahci }, /* ICH10 */ + { PCI_VDEVICE(INTEL, 0x3a25), board_ahci }, /* ICH10 *//* JMicron 360/1/3/5/6, match class to avoid IDE function */ { PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
drivers/ata/ata_piix.c +9 -1
@@ -267,6 +267,14 @@ static const struct pci_device_id piix_pci_tbl[] = { { 0x8086, 0x292e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_ahci },/* SATA Controller IDE (Tolapai) */ { 0x8086, 0x5028, PCI_ANY_ID, PCI_ANY_ID, 0, 0, tolapai_sata_ahci }, +/* SATA Controller IDE (ICH10) */ + { 0x8086, 0x3a00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_ahci }, +/* SATA Controller IDE (ICH10) */ + { 0x8086, 0x3a06, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, +/* SATA Controller IDE (ICH10) */ + { 0x8086, 0x3a20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_ahci }, +/* SATA Controller IDE (ICH10) */ + { 0x8086, 0x3a26, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, { } /* terminate list */ };
@@ -1068,7 +1076,7 @@ static void piix_sidpr_write(struct ata_device *dev, unsigned int reg, u32 val)iowrite32 (val, hpriv->sidpr +PIIX_SIDPR_DATA ); } -u32 piix_merge_scr (u32 val0,u32 val1,const int *const *merge_tbl) +static u32 piix_merge_scr (u32 val0,u32 val1,const int *const *merge_tbl) {u32 val =0 ;int i, mi;
drivers/ata/pata_bf54x.c +24 -29
169 lines not on this page · raw message
drivers/ata/pata_sl82c105.c +31 -2
@@ -26,7 +26,7 @@#include <linux/libata.h> #define DRV_NAME "pata_sl82c105" -#define DRV_VERSION "0.3.2" +#define DRV_VERSION "0.3.3"enum {/*
@@ -206,6 +206,34 @@ static void sl82c105_bmdma_stop(struct ata_queued_cmd *qc)sl82c105_set_piomode (ap, qc->dev); } +/** +* sl82c105_qc_defer - implement serialization +* @qc: command +* +* We must issue one command per host not per channel because +* of the reset bug. +* +* Q: is the scsi host lock sufficient ? +*/ + +static int sl82c105_qc_defer (struct ata_queued_cmd *qc) +{ +struct ata_host *host = qc->ap->host; +struct ata_port *alt = host->ports[1 ^ qc->ap->port_no]; +int rc; + +/* First apply the usual rules */ + rc =ata_std_qc_defer (qc); +if (rc !=0 ) +return rc; + +/* Now apply serialization rules. Only allow a command if the +other channel state machine is idle */ +if (alt && alt->qc_active) +return ATA_DEFER_PORT ; +return 0 ; +} +static struct scsi_host_template sl82c105_sht = { .module =THIS_MODULE , .name =DRV_NAME ,
@@ -245,6 +273,7 @@ static struct ata_port_operations sl82c105_port_ops = { .bmdma_stop = sl82c105_bmdma_stop, .bmdma_status = ata_bmdma_status, + .qc_defer = sl82c105_qc_defer, .qc_prep = ata_qc_prep, .qc_issue = ata_qc_issue_prot,
@@ -312,7 +341,7 @@ static int sl82c105_init_one(struct pci_dev *dev, const struct pci_device_id *id };/* for now use only the first port */ const struct ata_port_info *ppi[] = { &info_early, - &ata_dummy_port_info }; +NULL };u32 val;int rev;
drivers/ata/sata_mv.c +308 -178
941 lines not on this page · raw message
drivers/ata/sata_nv.c +12 -6
@@ -1011,14 +1011,20 @@ static irqreturn_t nv_adma_interrupt(int irq, void *dev_instance) }if (status & (NV_ADMA_STAT_DONE | -NV_ADMA_STAT_CPBERR )) { -u32 check_commands; +NV_ADMA_STAT_CPBERR | +NV_ADMA_STAT_CMD_COMPLETE )) { +u32 check_commands = notifier_clears[i];int pos, error =0 ; -if (ata_tag_valid (ap->link.active_tag)) - check_commands =1 << ap->link.active_tag; -else - check_commands = ap->link.sactive; +if (status &NV_ADMA_STAT_CPBERR ) { +/* Check all active commands */ +if (ata_tag_valid (ap->link.active_tag)) + check_commands =1 << + ap->link.active_tag; +else + check_commands = ap-> + link.sactive; + }/** Check CPBs for completed commands */ while ((pos =ffs (check_commands)) && !error) {
drivers/pci/pci.c +2 -1
@@ -823,7 +823,8 @@ int pcim_enable_device(struct pci_dev *pdev) dr =get_pci_dr (pdev);if (unlikely (!dr))return -ENOMEM ; -WARN_ON (!!dr->enabled); +if (dr->enabled) +return 0 ; rc =pci_enable_device (pdev);if (!rc) {