libata: implement ATA_EHI_PRINTINFO
PATCH 1/3 libata: implement ATA_EHI_PRINTINFO
Implement ehi flag ATA_EHI_PRINTINFO. This flag is set when device configuration needs to print out device info. This used to be handled by @print_info argument to ata_dev_configure() but LLDs also need to know about it in ->dev_config() callback.
This patch replaces @print_info w/ ATA_EHI_PRINTINFO and make sata_sil print workaround messages only on the initial configuration.
---
Jeff, this is respin of patches #1-3 of the following patchset.
http://thread.gmane.org/gmane.linux.ide/13570/focus=13570
All three patches have been ACKed by you. They're simply regenerated against the current #upstream.
Thanks.
drivers/ata/libata-core.c | 10 ++++++---- drivers/ata/libata-eh.c | 7 +++++-- drivers/ata/libata.h | 2 +- drivers/ata/sata_sil.c | 11 +++++++---- include/linux/libata.h | 1 + 5 files changed, 20 insertions(+), 11 deletions(-)
drivers/ata/libata-core.c +6 -4
@@ -1377,7 +1377,6 @@ static void ata_set_port_max_cmd_len(str/** * ata_dev_configure - Configure the specified ATA/ATAPI device * @dev: Target device to configure -* @print_info: Enable device info printout * * Configure @dev according to @dev->id. Generic and low-level * driver specific fixups are also applied.
@@ -1388,9 +1387,10 @@ static void ata_set_port_max_cmd_len(str* RETURNS: * 0 on success, -errno otherwise */ -int ata_dev_configure (struct ata_device *dev,int print_info) +int ata_dev_configure (struct ata_device *dev) {struct ata_port *ap = dev->ap; +int print_info = ap->eh_context.i.flags &ATA_EHI_PRINTINFO ;const u16 *id = dev->id;unsigned int xfer_mask;char revbuf[7 ];/* XYZ-99\0 */
@@ -1638,7 +1638,9 @@ int ata_bus_probe(struct ata_port *ap)if (rc) goto fail; - rc =ata_dev_configure (dev,1 ); + ap->eh_context.i.flags |=ATA_EHI_PRINTINFO ; + rc =ata_dev_configure (dev); + ap->eh_context.i.flags &= ~ATA_EHI_PRINTINFO ;if (rc) goto fail; }
@@ -3045,7 +3047,7 @@ int ata_dev_revalidate(struct ata_devicememcpy (dev->id, id,sizeof (id[0 ]) *ATA_ID_WORDS );/* configure device according to the new ID */ - rc =ata_dev_configure (dev,0 ); + rc =ata_dev_configure (dev);if (rc ==0 )return 0 ;
drivers/ata/libata-eh.c +5 -2
@@ -1661,8 +1661,11 @@ static int ata_eh_revalidate_and_attach( dev->class = ehc->classes[dev->devno]; rc =ata_dev_read_id (dev, &dev->class,1 , dev->id); -if (rc ==0 ) - rc =ata_dev_configure (dev,1 ); +if (rc ==0 ) { + ehc->i.flags |=ATA_EHI_PRINTINFO ; + rc =ata_dev_configure (dev); + ehc->i.flags &= ~ATA_EHI_PRINTINFO ; + }if (rc) { dev->class =ATA_DEV_UNKNOWN ;
drivers/ata/libata.h +1 -1
@@ -54,7 +54,7 @@ extern unsigned int ata_do_simple_cmd(stextern int ata_dev_read_id (struct ata_device *dev,unsigned int *p_class,int post_reset,u16 *id);extern int ata_dev_revalidate (struct ata_device *dev,int post_reset); -extern int ata_dev_configure (struct ata_device *dev,int print_info); +extern int ata_dev_configure (struct ata_device *dev);extern int sata_down_spd_limit (struct ata_port *ap);extern int sata_set_spd_needed (struct ata_port *ap);extern int ata_down_xfermask_limit (struct ata_device *dev,int force_pio0);
include/linux/libata.h +1 -0
@@ -283,6 +283,7 @@ enum {ATA_EHI_QUIET = (1 <<3 ),/* be quiet */ ATA_EHI_DID_RESET = (1 <<16 ),/* already reset this port */ +ATA_EHI_PRINTINFO = (1 <<17 ),/* print configuration info */ ATA_EHI_RESET_MODIFIER_MASK = ATA_EHI_RESUME_LINK,
drivers/ata/sata_sil.c +7 -4
@@ -534,6 +534,7 @@ static void sil_thaw(struct ata_port *ap*/ static void sil_dev_config (struct ata_port *ap,struct ata_device *dev) { +int print_info = ap->eh_context.i.flags &ATA_EHI_PRINTINFO ;unsigned int n, quirks =0 ;unsigned char model_num[41 ];
@@ -549,16 +550,18 @@ static void sil_dev_config(struct ata_poif (slow_down || ((ap->flags &SIL_FLAG_MOD15WRITE ) && (quirks &SIL_QUIRK_MOD15WRITE ))) { -ata_dev_printk (dev,KERN_INFO ,"applying Seagate errata fix " -"(mod15write workaround)\n" ); +if (print_info) +ata_dev_printk (dev,KERN_INFO ,"applying Seagate " +"errata fix (mod15write workaround)\n" ); dev->max_sectors =15 ;return ; }/* limit to udma5 */ if (quirks &SIL_QUIRK_UDMA5MAX ) { -ata_dev_printk (dev,KERN_INFO , -"applying Maxtor errata fix %s\n" , model_num); +if (print_info) +ata_dev_printk (dev,KERN_INFO ,"applying Maxtor " +"errata fix %s\n" , model_num); dev->udma_mask &=ATA_UDMA5 ;return ; }
PATCH 2/3 libata: implement ATA_EHI_SETMODE and ATA_EHI_POST_SETMODE
libata EH used to perform ata_set_mode() iff the EH session performed reset as indicated by ATA_EHI_DID_RESET. This is incorrect because ->dev_config() called by revalidation is allowed to modify transfer mode which ata_set_mode() should take care of. This patch implements the following two flags.
* ATA_EHI_SETMODE: set during EH to schedule ata_set_mode(). Both new device attachment and revalidation set this flag.
* ATA_EHI_POST_SETMODE: set while the device is revalidated after ata_set_mode(). Post-setmode revalidation is different from initial configuaration and EH revalidation in that ->dev_config() is not allowed tune transfer mode. LLD can use this flag to determine whether it's allowed to tune transfer mode. Note that POST_SETMODE ->dev_config() is guaranteed to be preceded by non-POST_SETMODE ->dev_config().
--- drivers/ata/libata-core.c | 3 +++ drivers/ata/libata-eh.c | 13 +++++++++++-- include/linux/libata.h | 2 ++ 3 files changed, 16 insertions(+), 2 deletions(-)
drivers/ata/libata-core.c +3 -0
@@ -2158,6 +2158,7 @@ int ata_down_xfermask_limit(struct ata_dstatic int ata_dev_set_mode (struct ata_device *dev) { +struct ata_eh_context *ehc = &dev->ap->eh_context;unsigned int err_mask;int rc;
@@ -2172,7 +2173,9 @@ static int ata_dev_set_mode(struct ata_dreturn -EIO ; } + ehc->i.flags |=ATA_EHI_POST_SETMODE ; rc =ata_dev_revalidate (dev,0 ); + ehc->i.flags &= ~ATA_EHI_POST_SETMODE ;if (rc)return rc;
drivers/ata/libata-eh.c +11 -2
@@ -1653,6 +1653,11 @@ static int ata_eh_revalidate_and_attach(ata_eh_done (ap, dev,ATA_EH_REVALIDATE ); +/* Configuration may have changed, reconfigure +* transfer mode. +*/ + ehc->i.flags |=ATA_EHI_SETMODE ; +/* schedule the scsi_rescan_device() here */ queue_work (ata_aux_wq, &(ap->scsi_rescan_task)); } else if (dev->class == ATA_DEV_UNKNOWN &&
@@ -1675,6 +1680,9 @@ static int ata_eh_revalidate_and_attach(spin_lock_irqsave (ap->lock, flags); ap->pflags |=ATA_PFLAG_SCSI_HOTPLUG ;spin_unlock_irqrestore (ap->lock, flags); + +/* new device discovered, configure transfer mode */ + ehc->i.flags |=ATA_EHI_SETMODE ; } }
@@ -1990,13 +1998,14 @@ static int ata_eh_recover(struct ata_porif (rc) goto dev_fail; -/* configure transfer mode if the port has been reset */ -if (ehc->i.flags &ATA_EHI_DID_RESET ) { +/* configure transfer mode if necessary */ +if (ehc->i.flags &ATA_EHI_SETMODE ) { rc =ata_set_mode (ap, &dev);if (rc) { down_xfermask =1 ; goto dev_fail; } + ehc->i.flags &= ~ATA_EHI_SETMODE ; }/* suspend devices */
include/linux/libata.h +2 -0
@@ -284,6 +284,8 @@ enum {ATA_EHI_DID_RESET = (1 <<16 ),/* already reset this port */ ATA_EHI_PRINTINFO = (1 <<17 ),/* print configuration info */ +ATA_EHI_SETMODE = (1 <<18 ),/* configure transfer mode */ +ATA_EHI_POST_SETMODE = (1 <<19 ),/* revaildating after setmode */ ATA_EHI_RESET_MODIFIER_MASK = ATA_EHI_RESUME_LINK,
PATCH 1/1 libata: move dev->max_sectors configuration into ata_dev_configure()
Move dev->max_sectors configuration from ata_scsi_dev_config() to ata_dev_configure().
* more consistent.
* allows LLDs to peek at the default dev->max_sectors value.
--- drivers/ata/libata-core.c | 5 +++++ drivers/ata/libata-scsi.c | 19 +++---------------- 2 files changed, 8 insertions(+), 16 deletions(-)
drivers/ata/libata-core.c +5 -0
@@ -1533,6 +1533,11 @@ int ata_dev_configure(struct ata_device cdb_intr_string); } +/* determine max_sectors */ + dev->max_sectors =ATA_MAX_SECTORS ; +if (dev->flags &ATA_DFLAG_LBA48 ) + dev->max_sectors =ATA_MAX_SECTORS_LBA48 ; +if (dev->horkage &ATA_HORKAGE_DIAGNOSTIC ) {/* Let the user know. We don't want to disallow opens for rescue purposes, or in case the vendor is just a blithering
drivers/ata/libata-scsi.c +3 -16
@@ -807,23 +807,10 @@ static void ata_scsi_sdev_config(structstatic void ata_scsi_dev_config (struct scsi_device *sdev,struct ata_device *dev) { -unsigned int max_sectors; +/* configure max sectors */ +blk_queue_max_sectors (sdev->request_queue, dev->max_sectors); -/* TODO: 2048 is an arbitrary number, not the -* hardware maximum. This should be increased to -* 65534 when Jens Axboe's patch for dynamically -* determining max_sectors is merged. -*/ - max_sectors =ATA_MAX_SECTORS ; -if (dev->flags &ATA_DFLAG_LBA48 ) - max_sectors =ATA_MAX_SECTORS_LBA48 ; -if (dev->max_sectors) - max_sectors = dev->max_sectors; - -blk_queue_max_sectors (sdev->request_queue, max_sectors); - -/* -* SATA DMA transfers must be multiples of 4 byte, so +/* SATA DMA transfers must be multiples of 4 byte, so * we need to pad ATAPI transfers using an extra sg. * Decrement max hw segments accordingly. */
applied 1-3