libata updates
PATCH 1/1 libata updates
1) 8-patch patchset from Tejun to fix eSata cable flakiness and WD My Book issues
2) A CompactFlash (CFA) identification fix, which also affects drivers/ide, since drivers/ide shares some definitions with libata via include/linux/ata.h.
Other minor fixes, and an AHCI workaround for staggered spin-up ("SSS") from Arjan related to the async stuff.
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/ahci.c | 9 ++++- drivers/ata/libata-core.c | 96 +++++++++++++++++++++++++++++++++----------- drivers/ata/libata-eh.c | 87 +++++++++++++++++++++++++++++++++++++---- drivers/ata/libata-pmp.c | 2 +- drivers/ata/libata-scsi.c | 1 + drivers/ata/libata.h | 4 +- drivers/ata/sata_mv.c | 4 +- drivers/ata/sata_nv.c | 7 +++- drivers/ata/sata_sil.c | 2 +- include/linux/ata.h | 15 +++++-- include/linux/libata.h | 19 +++++---- 11 files changed, 193 insertions(+), 53 deletions(-)
Arjan van de Ven (1):
ahci: add a module parameter to ignore the SSS flags for async scanning
Mark Lord (1):
sata_mv: Fix chip type for Hightpoint RocketRaid 1740/1742
Pasi Kärkkäinen (1):
[libata] sata_sil: Fix compilation error with libata debugging enabled
Randy Dunlap (1):
libata: fix kernel-doc warnings
Sergei Shtylyov (1):
ide/libata: fix ata_id_is_cfa() (take 4)
Tejun Heo (9):
sata_nv: ck804 has borked hardreset too
libata: fix EH device failure handling
libata: move ata_dev_disable() to libata-eh.c
libata: check onlineness before using SPD in sata_down_spd_limit()
libata: clear dev->ering in smarter way
libata: add @spd_limit to sata_down_spd_limit()
libata: improve probe failure handling
libata: add no penalty retry request for EH device handling routines
libata: implement HORKAGE_1_5_GBPS and apply it to WD My Book
drivers/ata/ahci.c +8 -1
@@ -61,9 +61,14 @@#define EM_MSG_LED_VALUE_ON 0x00010000static int ahci_skip_host_reset; +static int ahci_ignore_sss; +module_param_named (skip_host_reset, ahci_skip_host_reset, int,0444 );MODULE_PARM_DESC (skip_host_reset,"skip global host reset (0=don't skip, 1=skip)" ); +module_param_named (ignore_sss, ahci_ignore_sss, int,0444 ); +MODULE_PARM_DESC (ignore_sss,"Ignore staggered spinup flag (0=don't ignore, 1=ignore)" ); +static int ahci_enable_alpm (struct ata_port *ap,enum link_pm policy);static void ahci_disable_alpm (struct ata_port *ap);
@@ -2692,8 +2697,10 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) host->iomap =pcim_iomap_table (pdev); host->private_data = hpriv; -if (!(hpriv->cap &HOST_CAP_SSS )) +if (!(hpriv->cap &HOST_CAP_SSS ) || ahci_ignore_sss) host->flags |=ATA_HOST_PARALLEL_SCAN ; +else +printk (KERN_INFO "ahci: SSS flag set, parallel bus scan disabled\n" );if (pi.flags &ATA_FLAG_EM )ahci_reset_em (host);
drivers/ata/libata-core.c +72 -24
193 lines not on this page · raw message
drivers/ata/libata-eh.c +79 -8
149 lines not on this page · raw message
drivers/ata/libata-pmp.c +1 -1
@@ -729,7 +729,7 @@ static int sata_pmp_eh_recover_pmp(struct ata_port *ap,if (tries) {/* consecutive revalidation failures? speed down */ if (reval_failed) -sata_down_spd_limit (link); +sata_down_spd_limit (link,0 );else reval_failed =1 ;
drivers/ata/libata-scsi.c +1 -0
@@ -415,6 +415,7 @@ int ata_std_bios_param(struct scsi_device *sdev, struct block_device *bdev,/** * ata_get_identity - Handler for HDIO_GET_IDENTITY ioctl +* @ap: target port * @sdev: SCSI device to get identify data for * @arg: User buffer area for identify data *
drivers/ata/libata.h +2 -2
@@ -79,7 +79,6 @@ extern int ata_build_rw_tf(struct ata_taskfile *tf, struct ata_device *dev, u64 block, u32 n_block, unsigned int tf_flags, unsigned int tag);extern u64 ata_tf_read_block (struct ata_taskfile *tf,struct ata_device *dev); -extern void ata_dev_disable (struct ata_device *dev);extern void ata_pio_queue_task (struct ata_port *ap,void *data,unsigned long delay);extern void ata_port_flush_task (struct ata_port *ap);
@@ -100,7 +99,7 @@ extern int ata_dev_reread_id(struct ata_device *dev, unsigned int readid_flags);extern int ata_dev_revalidate (struct ata_device *dev,unsigned int new_class,unsigned int readid_flags);extern int ata_dev_configure (struct ata_device *dev); -extern int sata_down_spd_limit (struct ata_link *link); +extern int sata_down_spd_limit (struct ata_link *link,u32 spd_limit);extern int ata_down_xfermask_limit (struct ata_device *dev,unsigned int sel);extern void ata_sg_clean (struct ata_queued_cmd *qc);extern void ata_qc_free (struct ata_queued_cmd *qc);
@@ -160,6 +159,7 @@ extern void ata_scsi_error(struct Scsi_Host *host);extern void ata_port_wait_eh (struct ata_port *ap);extern void ata_eh_fastdrain_timerfn (unsigned long arg);extern void ata_qc_schedule_eh (struct ata_queued_cmd *qc); +extern void ata_dev_disable (struct ata_device *dev);extern void ata_eh_detach_dev (struct ata_device *dev);extern void ata_eh_about_to_do (struct ata_link *link,struct ata_device *dev,unsigned int action);
drivers/ata/sata_mv.c +2 -2
@@ -663,8 +663,8 @@ static const struct pci_device_id mv_pci_tbl[] = { { PCI_VDEVICE(MARVELL, 0x5081), chip_508x },/* RocketRAID 1720/174x have different identifiers */ { PCI_VDEVICE(TTI, 0x1720), chip_6042 }, - { PCI_VDEVICE(TTI, 0x1740), chip_508x }, - { PCI_VDEVICE(TTI, 0x1742), chip_508x }, + { PCI_VDEVICE(TTI, 0x1740), chip_6042 }, + { PCI_VDEVICE(TTI, 0x1742), chip_6042 }, { PCI_VDEVICE(MARVELL, 0x6040), chip_604x }, { PCI_VDEVICE(MARVELL, 0x6041), chip_604x },
drivers/ata/sata_nv.c +6 -1
@@ -436,11 +436,16 @@ static struct ata_port_operations nv_nf2_ops = { .hardreset = nv_noclassify_hardreset, }; -/* CK804 finally gets hardreset right */ +/* For initial probing after boot and hot plugging, hardreset mostly +* works fine on CK804 but curiously, reprobing on the initial port by +* rescanning or rmmod/insmod fails to acquire the initial D2H Reg FIS +* in somewhat undeterministic way. Use noclassify hardreset. +*/ static struct ata_port_operations nv_ck804_ops = { .inherits = &nv_common_ops, .freeze = nv_ck804_freeze, .thaw = nv_ck804_thaw, + .hardreset = nv_noclassify_hardreset, .host_stop = nv_ck804_host_stop, };
drivers/ata/sata_sil.c +1 -1
@@ -324,7 +324,7 @@ static void sil_fill_sg(struct ata_queued_cmd *qc) prd->addr =cpu_to_le32 (addr); prd->flags_len =cpu_to_le32 (sg_len); -VPRINTK ("PRD[%u] = (0x%X, 0x%X)\n" , pi, addr, sg_len); +VPRINTK ("PRD[%u] = (0x%X, 0x%X)\n" , si, addr, sg_len); last_prd = prd; prd++;
include/linux/ata.h +10 -5
@@ -731,12 +731,17 @@ static inline int ata_id_current_chs_valid(const u16 *id)static inline int ata_id_is_cfa (const u16 *id) { -if (id[ATA_ID_CONFIG ] ==0x848A )/* Standard CF */ +if (id[ATA_ID_CONFIG ] ==0x848A )/* Traditional CF */ return 1 ; -/* Could be CF hiding as standard ATA */ -if (ata_id_major_version (id) >=3 && - id[ATA_ID_COMMAND_SET_1 ] !=0xFFFF && - (id[ATA_ID_COMMAND_SET_1 ] & (1 <<2 ))) +/* +* CF specs don't require specific value in the word 0 anymore and yet +* they forbid to report the ATA version in the word 80 and require the +* CFA feature set support to be indicated in the word 83 in this case. +* Unfortunately, some cards only follow either of this requirements, +* and while those that don't indicate CFA feature support need some +* sort of quirk list, it seems impractical for the ones that do... +*/ +if ((id[ATA_ID_COMMAND_SET_2 ] &0xC004 ) ==0x4004 )return 1 ;return 0 ; }
include/linux/libata.h +11 -8
@@ -380,6 +380,7 @@ enum {ATA_HORKAGE_ATAPI_MOD16_DMA = (1 <<11 ),/* use ATAPI DMA for commands not multiple of 16 bytes */ ATA_HORKAGE_FIRMWARE_WARN = (1 <<12 ),/* firwmare update warning */ + ATA_HORKAGE_1_5_GBPS = (1 << 13), /* force 1.5 Gbps *//* DMA mask for user DMA control: User visible values; DO NOT renumber */
@@ -580,7 +581,7 @@ struct ata_device {acpi_handle acpi_handle;union acpi_object *gtf_cache;#endif -/* n_sector is used as CLEAR_OFFSET, read comment above CLEAR_OFFSET */ +/* n_sector is CLEAR_BEGIN, read comment above CLEAR_BEGIN */ u64 n_sectors;/* size of device, if ATA */ unsigned int class;/* ATA_DEV_xxx */ unsigned long unpark_deadline;
@@ -605,20 +606,22 @@ struct ata_device {u16 heads;/* Number of heads */ u16 sectors;/* Number of sectors per track */ -/* error history */ -int spdn_cnt; -struct ata_ering ering; -union {u16 id[ATA_ID_WORDS ];/* IDENTIFY xxx DEVICE data */ u32 gscr[SATA_PMP_GSCR_DWORDS ];/* PMP GSCR block */ }; + +/* error history */ +int spdn_cnt; +/* ering is CLEAR_END, read comment above CLEAR_END */ +struct ata_ering ering; }; -/* Offset into struct ata_device. Fields above it are maintained -* acress device init. Fields below are zeroed. +/* Fields between ATA_DEVICE_CLEAR_BEGIN and ATA_DEVICE_CLEAR_END are +* cleared to zero on ata_dev_init(). */ -#define ATA_DEVICE_CLEAR_OFFSET offsetof(struct ata_device, n_sectors) +#define ATA_DEVICE_CLEAR_BEGIN offsetof(struct ata_device, n_sectors) +#define ATA_DEVICE_CLEAR_END offsetof(struct ata_device, ering)struct ata_eh_info {struct ata_device *dev;/* offending device */