libata fixes and updates
PATCH 1/1 libata fixes and updates
This push is larger than average, because sata_sx4 is brought back from the dead. It was non-functional for at least a kernel release.
Additionally, this adds reporting logical/physical sector size, and moves the form factor / rotation rate determination from libata-scsi.c to linux/ata.h. This prepares for upcoming SSD and non-standard sector size work.
Plus other minor fixes.
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/libata-scsi.c | 34 +++++++-- drivers/ata/sata_fsl.c | 15 ++-- drivers/ata/sata_sx4.c | 180 +++++++++++++++++++++++++++++++-------------- include/linux/ata.h | 28 +++++++ 4 files changed, 191 insertions(+), 66 deletions(-)
Dave Liu (1):
sata_fsl: Fix the command description of FSL SATA controller
David Milburn (1):
[libata] sata_sx4: fixup interrupt handling
Jeff Garzik (1):
[libata] sata_sx4: convert to new exception handling methods
Kumar Gala (1):
sata_fsl: Fix compile warnings
Martin K. Petersen (2):
libata: Report disk alignment and physical block size
libata: Media rotation rate and form factor heuristics
drivers/ata/libata-scsi.c +28 -6
@@ -2142,13 +2142,14 @@ static unsigned int ata_scsiop_inq_89(struct ata_scsi_args *args, u8 *rbuf)static unsigned int ata_scsiop_inq_b1 (struct ata_scsi_args *args,u8 *rbuf) { +int form_factor =ata_id_form_factor (args->id); +int media_rotation_rate =ata_id_rotation_rate (args->id); + rbuf[1 ] =0xb1 ; rbuf[3 ] =0x3c ; -if (ata_id_major_version (args->id) >7 ) { - rbuf[4 ] = args->id[217 ] >>8 ; - rbuf[5 ] = args->id[217 ]; - rbuf[7 ] = args->id[168 ] &0xf ; - } + rbuf[4 ] = media_rotation_rate >>8 ; + rbuf[5 ] = media_rotation_rate; + rbuf[7 ] = form_factor;return 0 ; }
@@ -2376,7 +2377,23 @@ saving_not_supp:*/ static unsigned int ata_scsiop_read_cap (struct ata_scsi_args *args,u8 *rbuf) { -u64 last_lba = args->dev->n_sectors -1 ;/* LBA of the last block */ +struct ata_device *dev = args->dev; +u64 last_lba = dev->n_sectors -1 ;/* LBA of the last block */ +u8 log_per_phys =0 ; +u16 lowest_aligned =0 ; +u16 word_106 = dev->id[106 ]; +u16 word_209 = dev->id[209 ]; + +if ((word_106 &0xc000 ) ==0x4000 ) { +/* Number and offset of logical sectors per physical sector */ +if (word_106 & (1 <<13 )) + log_per_phys = word_106 &0xf ; +if ((word_209 &0xc000 ) ==0x4000 ) { +u16 first = dev->id[209 ] &0x3fff ; +if (first >0 ) + lowest_aligned = (1 << log_per_phys) - first; + } + }VPRINTK ("ENTER\n" );
@@ -2407,6 +2424,11 @@ static unsigned int ata_scsiop_read_cap(struct ata_scsi_args *args, u8 *rbuf)/* sector size */ rbuf[10 ] =ATA_SECT_SIZE >>8 ; rbuf[11 ] =ATA_SECT_SIZE &0xff ; + + rbuf[12 ] =0 ; + rbuf[13 ] = log_per_phys; + rbuf[14 ] = (lowest_aligned >>8 ) &0x3f ; + rbuf[15 ] = lowest_aligned; }return 0 ;
drivers/ata/sata_fsl.c +9 -6
@@ -205,6 +205,7 @@ struct cmdhdr_tbl_entry {* Description information bitdefs */ enum { +CMD_DESC_RES = (1 <<11 ),VENDOR_SPECIFIC_BIST = (1 <<10 ),CMD_DESC_SNOOP_ENABLE = (1 <<9 ),FPDMA_QUEUED_CMD = (1 <<8 ),
@@ -332,13 +333,14 @@ static unsigned int sata_fsl_fill_sg(struct ata_queued_cmd *qc, void *cmd_desc,dma_addr_t sg_addr =sg_dma_address (sg);u32 sg_len =sg_dma_len (sg); -VPRINTK ("SATA FSL : fill_sg, sg_addr = 0x%x, sg_len = %d\n" , - sg_addr, sg_len); +VPRINTK ("SATA FSL : fill_sg, sg_addr = 0x%llx, sg_len = %d\n" , + (unsigned long long )sg_addr, sg_len);/* warn if each s/g element is not dword aligned */ if (sg_addr &0x03 )ata_port_printk (qc->ap,KERN_ERR , -"s/g addr unaligned : 0x%x\n" , sg_addr); +"s/g addr unaligned : 0x%llx\n" , + (unsigned long long )sg_addr);if (sg_len &0x03 )ata_port_printk (qc->ap,KERN_ERR ,"s/g len unaligned : 0x%x\n" , sg_len);
@@ -387,7 +389,7 @@ static void sata_fsl_qc_prep(struct ata_queued_cmd *qc)void __iomem *hcr_base = host_priv->hcr_base;unsigned int tag =sata_fsl_tag (qc->tag, hcr_base);struct command_desc *cd; -u32 desc_info =CMD_DESC_SNOOP_ENABLE ; +u32 desc_info =CMD_DESC_RES |CMD_DESC_SNOOP_ENABLE ;u32 num_prde =0 ;u32 ttl_dwords =0 ;dma_addr_t cd_paddr;
@@ -840,7 +842,7 @@ issue_srst:/* device reset/SRST is a control register update FIS, uses tag0 */ sata_fsl_setup_cmd_hdr_entry (pp,0 , -SRST_CMD |CMD_DESC_SNOOP_ENABLE ,0 ,0 ,5 ); +SRST_CMD |CMD_DESC_RES |CMD_DESC_SNOOP_ENABLE ,0 ,0 ,5 ); tf.ctl |=ATA_SRST ;/* setup SRST bit in taskfile control reg */ ata_tf_to_fis (&tf, pmp,0 , cfis);
@@ -886,7 +888,8 @@ issue_srst:* using ATA signature D2H register FIS to the host controller. */ -sata_fsl_setup_cmd_hdr_entry (pp,0 ,CMD_DESC_SNOOP_ENABLE ,0 ,0 ,5 ); +sata_fsl_setup_cmd_hdr_entry (pp,0 ,CMD_DESC_RES |CMD_DESC_SNOOP_ENABLE , +0 ,0 ,5 ); tf.ctl &= ~ATA_SRST ;/* 2nd H2D Ctl. register FIS */ ata_tf_to_fis (&tf, pmp,0 , cfis);
drivers/ata/sata_sx4.c +126 -54
247 lines not on this page · raw message
include/linux/ata.h +28 -0
@@ -730,6 +730,34 @@ static inline int ata_id_has_unload(const u16 *id)return 0 ; } +static inline int ata_id_form_factor (const u16 *id) +{ +u16 val = id[168 ]; + +if (ata_id_major_version (id) <7 || val ==0 || val ==0xffff ) +return 0 ; + + val &=0xf ; + +if (val >5 ) +return 0 ; + +return val; +} + +static inline int ata_id_rotation_rate (const u16 *id) +{ +u16 val = id[217 ]; + +if (ata_id_major_version (id) <7 || val ==0 || val ==0xffff ) +return 0 ; + +if (val >1 && val <0x401 ) +return 0 ; + +return val; +} +static inline int ata_id_has_trim (const u16 *id) { if (ata_id_major_version(id) >= 7 &&