libata fixes, new ids
PATCH 1/1 libata fixes, new ids
Main thing is Alan's commit, rightly taking me to task, and cleaning up the mess in the Marvell dual-mode controller (legacy or AHCI) case.
Plus some new ids and fixes from Tejun (see commits for more info).
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 | 6 +++- drivers/ata/ahci.c | 21 +++++++++++++++++- drivers/ata/libata-sff.c | 5 ---- drivers/ata/pata_marvell.c | 51 ++++++++++++++++++++++++++++++++----------- drivers/ata/pata_sil680.c | 3 -- drivers/ata/sata_mv.c | 3 +- drivers/ata/sata_nv.c | 19 +--------------- 7 files changed, 65 insertions(+), 43 deletions(-)
Alan Cox (1):
ahci, pata_marvell: play nicely together
David Milburn (1):
pata_sil680: remove duplicate pcim_enable_device
Mark Lord (1):
sata_mv: add RocketRaid 1720 PCI ID to driver
Seth Heasley (1):
ahci: RAID mode SATA patch for Intel Ibex Peak DeviceIDs
Tejun Heo (3):
ahci: disable PMP for marvell ahcis
sata_nv: disable hardreset for generic
libata-sff: kill spurious WARN_ON() in ata_hsm_move()
drivers/ata/Kconfig +4 -2
@@ -448,8 +448,10 @@ config PATA_MARVELL tristate "Marvell PATA support via legacy mode" depends on PCI help - This option enables limited support for the Marvell 88SE6145 ATA - controller. + This option enables limited support for the Marvell 88SE61xx ATA + controllers. If you wish to use only the SATA ports then select + the AHCI driver alone. If you wish to the use the PATA port or + both SATA and PATA include this driver. If unsure, say N.
drivers/ata/ahci.c +20 -1
@@ -420,7 +420,7 @@ static const struct ata_port_info ahci_port_info[] = {/* board_ahci_mv */ {AHCI_HFLAGS (AHCI_HFLAG_NO_NCQ |AHCI_HFLAG_NO_MSI | - AHCI_HFLAG_MV_PATA), + AHCI_HFLAG_MV_PATA | AHCI_HFLAG_NO_PMP), .flags =ATA_FLAG_SATA |ATA_FLAG_NO_LEGACY | ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA, .pio_mask = 0x1f, /* pio0-4 */
@@ -487,7 +487,9 @@ static const struct pci_device_id ahci_pci_tbl[] = { { PCI_VDEVICE(INTEL, 0x3a05), board_ahci }, /* ICH10 */ { PCI_VDEVICE(INTEL, 0x3a25), board_ahci }, /* ICH10 */ { PCI_VDEVICE(INTEL, 0x3b24), board_ahci }, /* PCH RAID */ + { PCI_VDEVICE(INTEL, 0x3b25), board_ahci }, /* PCH RAID */ { PCI_VDEVICE(INTEL, 0x3b2b), board_ahci }, /* PCH RAID */ + { PCI_VDEVICE(INTEL, 0x3b2c), board_ahci }, /* PCH RAID *//* 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,
@@ -610,6 +612,15 @@ module_param(ahci_em_messages, int, 0444);MODULE_PARM_DESC (ahci_em_messages,"Set AHCI Enclosure Management Message type (0 = disabled, 1 = LED" ); +#if defined(CONFIG_PATA_MARVELL ) || defined(CONFIG_PATA_MARVELL_MODULE ) +static int marvell_enable; +#else +static int marvell_enable =1 ; +#endif +module_param (marvell_enable, int,0644 ); +MODULE_PARM_DESC (marvell_enable,"Marvell SATA via AHCI (1 = enabled)" ); + +static inline int ahci_nr_ports (u32 cap) {return (cap &0x1f ) +1 ;
@@ -732,6 +743,8 @@ static void ahci_save_initial_config(struct pci_dev *pdev,"MV_AHCI HACK: port_map %x -> %x\n" , port_map, port_map & mv); +dev_printk (KERN_ERR , &pdev->dev, +"Disabling your PATA port. Use the boot option 'ahci.marvell_enable=0' to avoid this.\n" ); port_map &= mv; }
@@ -2533,6 +2546,12 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)if (!printed_version++)dev_printk (KERN_DEBUG , &pdev->dev,"version " DRV_VERSION "\n" ); +/* The AHCI driver can only drive the SATA ports, the PATA driver +can drive them all so if both drivers are selected make sure +AHCI stays out of the way */ +if (pdev->vendor ==PCI_VENDOR_ID_MARVELL && !marvell_enable) +return -ENODEV ; +/* acquire resources */ rc =pcim_enable_device (pdev);if (rc)
drivers/ata/libata-sff.c +0 -5
@@ -1315,11 +1315,6 @@ fsm_start:break ;case HSM_ST_ERR : -/* make sure qc->err_mask is available to -* know what's wrong and recover -*/ -WARN_ON (!(qc->err_mask & (AC_ERR_DEV |AC_ERR_HSM ))); - ap->hsm_task_state =HSM_ST_IDLE ;/* complete taskfile transaction */
drivers/ata/pata_marvell.c +38 -13
82 lines not on this page · raw message
drivers/ata/pata_sil680.c +0 -3
@@ -322,9 +322,6 @@ static int __devinit sil680_init_one(struct pci_dev *pdev,/* Try to acquire MMIO resources and fallback to PIO if * that fails */ - rc =pcim_enable_device (pdev); -if (rc) -return rc; rc =pcim_iomap_regions (pdev,1 <<SIL680_MMIO_BAR ,DRV_NAME );if (rc) goto use_ioports;
drivers/ata/sata_mv.c +2 -1
@@ -667,7 +667,8 @@ static const struct pci_device_id mv_pci_tbl[] = { { PCI_VDEVICE(MARVELL, 0x5041), chip_504x }, { PCI_VDEVICE(MARVELL, 0x5080), chip_5080 }, { PCI_VDEVICE(MARVELL, 0x5081), chip_508x }, -/* RocketRAID 1740/174x have different identifiers */ +/* RocketRAID 1720/174x have different identifiers */ + { PCI_VDEVICE(TTI, 0x1720), chip_6042 }, { PCI_VDEVICE(TTI, 0x1740), chip_508x }, { PCI_VDEVICE(TTI, 0x1742), chip_508x },
drivers/ata/sata_nv.c +1 -18
@@ -309,8 +309,6 @@ static void nv_nf2_freeze(struct ata_port *ap);static void nv_nf2_thaw (struct ata_port *ap);static void nv_ck804_freeze (struct ata_port *ap);static void nv_ck804_thaw (struct ata_port *ap); -static int nv_hardreset (struct ata_link *link,unsigned int *class, -unsigned long deadline);static int nv_adma_slave_config (struct scsi_device *sdev);static int nv_adma_check_atapi_dma (struct ata_queued_cmd *qc);static void nv_adma_qc_prep (struct ata_queued_cmd *qc);
@@ -407,7 +405,7 @@ static struct scsi_host_template nv_swncq_sht = {static struct ata_port_operations nv_generic_ops = { .inherits = &ata_bmdma_port_ops, - .hardreset = nv_hardreset, + .hardreset =ATA_OP_NULL , .scr_read = nv_scr_read, .scr_write = nv_scr_write, };
@@ -1588,21 +1586,6 @@ static void nv_mcp55_thaw(struct ata_port *ap)ata_sff_thaw (ap); } -static int nv_hardreset (struct ata_link *link,unsigned int *class, -unsigned long deadline) -{ -int rc; - -/* SATA hardreset fails to retrieve proper device signature on -* some controllers. Request follow up SRST. For more info, -* see http://bugzilla.kernel.org/show_bug.cgi?id=3352 -*/ - rc =sata_sff_hardreset (link, class, deadline); -if (rc) -return rc; -return -EAGAIN ; -} -static void nv_adma_error_handler (struct ata_port *ap) {struct nv_adma_port_priv *pp = ap->private_data;