libata fixes
Subsystems (2)
PATCH 1/1 libata fixes
Note: Tejun's change is a feature addition, but one that is IMO important for debugging and serious-bug workarounds. It's self-contained and should not affect anyone not using the new parm.
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:
Documentation/kernel-parameters.txt | 35 ++++ drivers/ata/libata-core.c | 380 ++++++++++++++++++++++++++++++++++- drivers/ata/libata-eh.c | 8 +- drivers/ata/libata-scsi.c | 2 +- drivers/ata/libata.h | 1 + drivers/ata/pata_legacy.c | 44 ++-- drivers/ata/sata_mv.c | 9 +- include/linux/libata.h | 2 +- 8 files changed, 448 insertions(+), 33 deletions(-)
Harvey Harrison (2):
ata: fix sparse warnings in pata_legacy.c
ata: fix sparse warning in libata.h
Martin Michlmayr (1):
sata_mv: Define module alias for platform device
Randy Dunlap (1):
libata: fix kernel-doc parameter warning
Saeed Bishara (2):
sata_mv: use hpriv->base instead of the host->iomap
sata_mv: remove iounmap in mv_platform_remove and use devm_iomap
Tejun Heo (1):
libata: implement libata.force module parameter
Documentation/kernel-parameters.txt +35 -0
@@ -950,6 +950,41 @@ and is between 256 and 4096 characters. It is defined in the file when set. Format: <int> + libata.force= [LIBATA] Force configurations. The format is comma + separated list of "[ID:]VAL" where ID is + PORT[:DEVICE]. PORT and DEVICE are decimal numbers + matching port, link or device. Basically, it matches + the ATA ID string printed on console by libata. If + the whole ID part is omitted, the last PORT and DEVICE + values are used. If ID hasn't been specified yet, the + configuration applies to all ports, links and devices. + + If only DEVICE is omitted, the parameter applies to + the port and all links and devices behind it. DEVICE + number of 0 either selects the first device or the + first fan-out link behind PMP device. It does not + select the host link. DEVICE number of 15 selects the + host link and device attached to it. + + The VAL specifies the configuration to force. As long + as there's no ambiguity shortcut notation is allowed. + For example, both 1.5 and 1.5G would work for 1.5Gbps. + The following configurations can be forced. + + * Cable type: 40c, 80c, short40c, unk, ign or sata. + Any ID with matching PORT is used. + + * SATA link speed limit: 1.5Gbps or 3.0Gbps. + + * Transfer mode: pio[0-7], mwdma[0-4] and udma[0-7]. + udma[/][16,25,33,44,66,100,133] notation is also + allowed. + + * [no]ncq: Turn on or off NCQ. + + If there are multiple matching configurations changing + the same attribute, the last one is used. + load_ramdisk= [RAM] List of ramdisks to load from floppy See Documentation/ramdisk.txt.
drivers/ata/libata-core.c +379 -1
432 lines not on this page · raw message
drivers/ata/libata-eh.c +5 -3
@@ -2393,9 +2393,11 @@ static int ata_eh_revalidate_and_attach(struct ata_link *link, }/* PDIAG- should have been released, ask cable type if post-reset */ -if (ata_is_host_link (link) && ap->ops->cable_detect && - (ehc->i.flags &ATA_EHI_DID_RESET )) - ap->cbl = ap->ops->cable_detect (ap); +if ((ehc->i.flags &ATA_EHI_DID_RESET ) &&ata_is_host_link (link)) { +if (ap->ops->cable_detect) + ap->cbl = ap->ops->cable_detect (ap); +ata_force_cbl (ap); + }/* Configure new devices forward such that user doesn't see * device detection messages backwards.
drivers/ata/libata-scsi.c +1 -1
@@ -828,7 +828,7 @@ static void ata_scsi_sdev_config(struct scsi_device *sdev)/** * atapi_drain_needed - Check whether data transfer may overflow -* @request: request to be checked +* @rq: request to be checked * * ATAPI commands which transfer variable length data to host * might overflow due to application error or hardare bug. This
drivers/ata/libata.h +1 -0
@@ -61,6 +61,7 @@ extern int atapi_passthru16;extern int libata_fua;extern int libata_noacpi;extern int libata_allow_tpm; +extern void ata_force_cbl (struct ata_port *ap);extern struct ata_queued_cmd *ata_qc_new_init (struct ata_device *dev); extern int ata_build_rw_tf(struct ata_taskfile *tf, struct ata_device *dev, u64 block, u32 n_block, unsigned int tf_flags,
drivers/ata/pata_legacy.c +22 -22
134 lines not on this page · raw message
drivers/ata/sata_mv.c +4 -5
@@ -870,7 +870,7 @@ static void mv_start_dma(struct ata_port *ap, void __iomem *port_mmio,struct mv_host_priv *hpriv = ap->host->private_data;int hard_port =mv_hardport_from_port (ap->port_no);void __iomem *hc_mmio =mv_hc_base_from_port ( - ap->host->iomap[MV_PRIMARY_BAR ], hard_port); +mv_host_base (ap->host), hard_port);u32 hc_irq_cause, ipending;/* clear EDMA event indicators, if any */
@@ -2947,7 +2947,8 @@ static int mv_platform_probe(struct platform_device *pdev) hpriv->n_ports = n_ports; host->iomap =NULL ; - hpriv->base =ioremap (res->start, res->end - res->start +1 ); + hpriv->base =devm_ioremap (&pdev->dev, res->start, + res->end - res->start +1 ); hpriv->base -=MV_SATAHC0_REG_BASE ; rc =mv_create_dma_pools (hpriv, &pdev->dev);
@@ -2979,11 +2980,8 @@ static int __devexit mv_platform_remove(struct platform_device *pdev) {struct device *dev = &pdev->dev;struct ata_host *host =dev_get_drvdata (dev); -struct mv_host_priv *hpriv = host->private_data; -void __iomem *base = hpriv->base;ata_host_detach (host); -iounmap (base);return 0 ; }
@@ -3194,6 +3192,7 @@ MODULE_DESCRIPTION("SCSI low-level driver for Marvell SATA controllers");MODULE_LICENSE ("GPL" );MODULE_DEVICE_TABLE (pci, mv_pci_tbl);MODULE_VERSION (DRV_VERSION ); +MODULE_ALIAS ("platform:sata_mv" );#ifdef CONFIG_PCI module_param (msi, int,0444 );
include/linux/libata.h +1 -1
@@ -1197,7 +1197,7 @@ static inline struct ata_link *ata_port_next_link(struct ata_link *link)return ap->pmp_link; } -if (++link - ap->pmp_link < ap->nr_pmp_links) +if (++link < ap->nr_pmp_links + ap->pmp_link)return link;return NULL ; }