libata fixes
PATCH 1/1 libata fixes
The following changes add module parameters to two SATA drivers. The first, sata_mv, fixes the driver so that it works for a larger set of users (MSI is too immature to use by default). The second gives the user an option to work around various bios/system[/driver?] problems that are occasionally reported.
[the sata_mv change is a resend, it didn't get pulled the first time]
Both are definitely -rc material.
Please pull from 'upstream-fixes' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git
to receive the following updates:
drivers/scsi/sata_mv.c | 11 ++++++++++- drivers/scsi/sata_sil.c | 10 ++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-)
Jeff Garzik:
[libata sata_sil] implement 'slow_down' module parameter [libata sata_mv] do not enable PCI MSI by default
drivers/scsi/sata_mv.c +10 -1
@@ -510,6 +510,12 @@ static const struct mv_hw_ops mv6xxx_ops };/* +* module options +*/ +static int msi;/* Use PCI msi; either zero (off, default) or non-zero */ + + +/* * Functions */
@@ -2191,7 +2197,7 @@ static int mv_init_one(struct pci_dev *p }/* Enable interrupts */ -if (pci_enable_msi (pdev) ==0 ) { +if (msi &&pci_enable_msi (pdev) ==0 ) { hpriv->hp_flags |=MV_HP_FLAG_MSI ; }else {pci_intx (pdev,1 );
@@ -2246,5 +2252,8 @@ MODULE_LICENSE("GPL");MODULE_DEVICE_TABLE (pci, mv_pci_tbl);MODULE_VERSION (DRV_VERSION ); +module_param (msi, int,0444 ); +MODULE_PARM_DESC (msi,"Enable use of PCI MSI (0=off, 1=on)" ); +module_init (mv_init);module_exit (mv_exit);
drivers/scsi/sata_sil.c +8 -2
@@ -231,6 +231,10 @@ MODULE_LICENSE("GPL");MODULE_DEVICE_TABLE (pci, sil_pci_tbl);MODULE_VERSION (DRV_VERSION ); +static int slow_down =0 ; +module_param (slow_down, int,0444 ); +MODULE_PARM_DESC (slow_down,"Sledgehammer used to work around random problems, by limiting commands to 15 sectors (0=off, 1=on)" ); +static unsigned char sil_get_device_cache_line (struct pci_dev *pdev) {
@@ -354,8 +358,10 @@ static void sil_dev_config(struct ata_po }/* limit requests to 15 sectors */ -if ((ap->flags &SIL_FLAG_MOD15WRITE ) && (quirks &SIL_QUIRK_MOD15WRITE )) { -printk (KERN_INFO "ata%u(%u): applying Seagate errata fix\n" , +if (slow_down || + ((ap->flags &SIL_FLAG_MOD15WRITE ) && + (quirks &SIL_QUIRK_MOD15WRITE ))) { +printk (KERN_INFO "ata%u(%u): applying Seagate errata fix (mod15write workaround)\n" , ap->id, dev->devno); ap->host->max_sectors =15 ; ap->host->hostt->max_sectors =15 ;