libata updates
Subsystems (3)
PATCH 1/1 libata updates
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 | 18 + drivers/ata/Makefile | 2 + drivers/ata/ahci.c | 2 +- drivers/ata/ahci_platform.c | 26 +- drivers/ata/ata_generic.c | 4 - drivers/ata/ata_piix.c | 8 + drivers/ata/libata-core.c | 161 ++--- drivers/ata/libata-eh.c | 1 + drivers/ata/pata_samsung_cf.c | 683 ++++++++++++++++ drivers/ata/pata_scc.c | 3 +- drivers/ata/sata_dwc_460ex.c | 1756 +++++++++++++++++++++++++++++++++++++++++ drivers/ata/sata_fsl.c | 20 +- drivers/ata/sata_mv.c | 47 +- drivers/ata/sata_nv.c | 32 +- drivers/pci/quirks.c | 6 + include/linux/ahci_platform.h | 4 +- include/linux/pci_ids.h | 2 + 17 files changed, 2616 insertions(+), 159 deletions(-) create mode 100644 drivers/ata/pata_samsung_cf.c create mode 100644 drivers/ata/sata_dwc_460ex.c
Abhilash Kesavan (1):
[libata] Add Samsung PATA controller driver, pata_samsung_cf
Anton Vorontsov (1):
ahci_platform: Remove unneeded ahci_driver.probe assignment
FUJITA Tomonori (1):
[libata] add ATA_CMD_DSM to ata_get_cmd_descript
Jassi Brar (1):
ahci_platform: Provide for vendor specific init
Justin P. Mattock (1):
[libata] ahci: Fix warning: comparison between 'enum <anonymous>' and 'enum <anonymous>'
Mark Lord (5):
libata: glob_match for ata_device_blacklist (v2)
libata: reduce blacklist size (v2)
libata: reduce blacklist size even more (v2)
libata: allow hyphenated pattern ranges
[libata] update blacklist for new hyphenated pattern ranges (v2)
Peter Huewe (1):
ata: Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)
Rupjyoti Sarmah (1):
[libata] Add 460EX on-chip SATA driver, sata_dwc_460ex
Tejun Heo (4):
ata_generic: drop hard coded DMA force logic for CENATEK
ata_piix: fix locking around SIDPR access
libata: more PCI IDs for jmicron controllers sata_fsl,mv,nv: prepare for NCQ command completion update
drivers/ata/Kconfig +18 -0
@@ -187,6 +187,15 @@ config ATA_PIIX If unsure, say N. +config SATA_DWC + tristate "DesignWare Cores SATA support" + depends on 460EX + help + This option enables support for the on-chip SATA controller of the + AppliedMicro processor 460EX. + + If unsure, say N. + config SATA_MV tristate "Marvell SATA support" help
@@ -796,6 +805,15 @@ config PATA_RZ1000 If unsure, say N. +config PATA_SAMSUNG_CF + tristate "Samsung SoC PATA support" + depends on SAMSUNG_DEV_IDE + help + This option enables basic support for Samsung's S3C/S5P board + PATA controllers via the new ATA layer + + If unsure, say N. + config PATA_WINBOND_VLB tristate "Winbond W83759A VLB PATA support (Experimental)" depends on ISA && EXPERIMENTAL
drivers/ata/Makefile +2 -0
@@ -7,6 +7,7 @@ obj-$(CONFIG_SATA_AHCI_PLATFORM) += ahci_platform.o libahci.o obj-$(CONFIG_SATA_FSL) += sata_fsl.o obj-$(CONFIG_SATA_INIC162X) += sata_inic162x.o obj-$(CONFIG_SATA_SIL24) += sata_sil24.o +obj-$(CONFIG_SATA_DWC) += sata_dwc_460ex.o # SFF w/ custom DMA obj-$(CONFIG_PDC_ADMA) += pdc_adma.o
@@ -87,6 +88,7 @@ obj-$(CONFIG_PATA_OF_PLATFORM) += pata_of_platform.o obj-$(CONFIG_PATA_QDI) += pata_qdi.o obj-$(CONFIG_PATA_RB532) += pata_rb532_cf.o obj-$(CONFIG_PATA_RZ1000) += pata_rz1000.o +obj-$(CONFIG_PATA_SAMSUNG_CF) += pata_samsung_cf.o obj-$(CONFIG_PATA_WINBOND_VLB) += pata_winbond.o # Should be last but two libata driver
drivers/ata/ahci.c +1 -1
@@ -1042,7 +1042,7 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)VPRINTK ("ENTER\n" ); -WARN_ON (ATA_MAX_QUEUE >AHCI_MAX_CMDS ); +WARN_ON ((int )ATA_MAX_QUEUE >AHCI_MAX_CMDS );if (!printed_version++)dev_printk (KERN_DEBUG , &pdev->dev,"version " DRV_VERSION "\n" );
drivers/ata/ahci_platform.c +15 -11
@@ -54,19 +54,13 @@ static int __init ahci_probe(struct platform_device *pdev)return -EINVAL ; } -if (pdata && pdata->init) { - rc = pdata->init (dev); -if (rc) -return rc; - } -if (pdata && pdata->ata_port_info) pi = *pdata->ata_port_info; hpriv =devm_kzalloc (dev,sizeof (*hpriv),GFP_KERNEL );if (!hpriv) { - rc = -ENOMEM ; - goto err0; +dev_err (dev,"can't alloc ahci_host_priv\n" ); +return -ENOMEM ; } hpriv->flags |= (unsigned long )pi.private_data;
@@ -74,8 +68,19 @@ static int __init ahci_probe(struct platform_device *pdev) hpriv->mmio =devm_ioremap (dev, mem->start,resource_size (mem));if (!hpriv->mmio) {dev_err (dev,"can't map %pR\n" , mem); - rc = -ENOMEM ; - goto err0; +return -ENOMEM ; + } + +/* +* Some platforms might need to prepare for mmio region access, +* which could be done in the following init call. So, the mmio +* region shouldn't be accessed before init (if provided) has +* returned successfully. +*/ +if (pdata && pdata->init) { + rc = pdata->init (dev, hpriv->mmio); +if (rc) +return rc; } ahci_save_initial_config(dev, hpriv,
@@ -166,7 +171,6 @@ static int __devexit ahci_remove(struct platform_device *pdev) }static struct platform_driver ahci_driver = { - .probe = ahci_probe, .remove =__devexit_p (ahci_remove), .driver = { .name ="ahci" ,
drivers/ata/ata_generic.c +0 -4
@@ -54,7 +54,6 @@ static int generic_set_mode(struct ata_link *link, struct ata_device **unused)const struct pci_device_id *id = ap->host->private_data;int dma_enabled =0 ;struct ata_device *dev; -struct pci_dev *pdev =to_pci_dev (ap->host->dev);if (id->driver_data &ATA_GEN_FORCE_DMA ) { dma_enabled =0xff ;
@@ -63,9 +62,6 @@ static int generic_set_mode(struct ata_link *link, struct ata_device **unused) dma_enabled =ioread8 (ap->ioaddr.bmdma_addr +ATA_DMA_STATUS ); } -if (pdev->vendor ==PCI_VENDOR_ID_CENATEK ) - dma_enabled =0xFF ; -ata_for_each_dev (dev, link,ENABLED ) {/* We don't really care */ dev->pio_mode =XFER_PIO_0 ;
drivers/ata/ata_piix.c +8 -0
@@ -158,6 +158,7 @@ struct piix_map_db {struct piix_host_priv {const int *map;u32 saved_iocfg; +spinlock_t sidpr_lock;/* FIXME: remove once locking in EH is fixed */ void __iomem *sidpr; };
@@ -951,12 +952,15 @@ static int piix_sidpr_scr_read(struct ata_link *link, unsigned int reg, u32 *val) { struct piix_host_priv *hpriv = link->ap->host->private_data; +unsigned long flags;if (reg >=ARRAY_SIZE (piix_sidx_map))return -EINVAL ; +spin_lock_irqsave (&hpriv->sidpr_lock, flags);piix_sidpr_sel (link, reg); *val =ioread32 (hpriv->sidpr +PIIX_SIDPR_DATA ); +spin_unlock_irqrestore (&hpriv->sidpr_lock, flags);return 0 ; }
@@ -964,12 +968,15 @@ static int piix_sidpr_scr_write(struct ata_link *link, unsigned int reg, u32 val) {struct piix_host_priv *hpriv = link->ap->host->private_data; +unsigned long flags;if (reg >=ARRAY_SIZE (piix_sidx_map))return -EINVAL ; +spin_lock_irqsave (&hpriv->sidpr_lock, flags);piix_sidpr_sel (link, reg);iowrite32 (val, hpriv->sidpr +PIIX_SIDPR_DATA ); +spin_unlock_irqrestore (&hpriv->sidpr_lock, flags);return 0 ; }
@@ -1566,6 +1573,7 @@ static int __devinit piix_init_one(struct pci_dev *pdev, hpriv =devm_kzalloc (dev,sizeof (*hpriv),GFP_KERNEL );if (!hpriv)return -ENOMEM ; +spin_lock_init (&hpriv->sidpr_lock);/* Save IOCFG, this will be used for cable detection, quirk * detection and restoration on detach. This is necessary
drivers/ata/libata-core.c +72 -89
208 lines not on this page · raw message
drivers/ata/libata-eh.c +1 -0
@@ -2214,6 +2214,7 @@ const char *ata_get_cmd_descript(u8 command) { ATA_CMD_SMART, "SMART" }, { ATA_CMD_MEDIA_LOCK, "DOOR LOCK" }, { ATA_CMD_MEDIA_UNLOCK, "DOOR UNLOCK" }, + { ATA_CMD_DSM, "DATA SET MANAGEMENT" }, { ATA_CMD_CHK_MED_CRD_TYP, "CHECK MEDIA CARD TYPE" }, { ATA_CMD_CFA_REQ_EXT_ERR, "CFA REQUEST EXTENDED ERROR" }, { ATA_CMD_CFA_WRITE_NE, "CFA WRITE SECTORS WITHOUT ERASE" },
drivers/ata/pata_samsung_cf.c new file +683 -0
683 lines not on this page · raw message
drivers/ata/pata_scc.c +1 -2
@@ -168,8 +168,7 @@ static const unsigned long JCACTSELtbl[2][7] = { };static const struct pci_device_id scc_pci_tbl[] = { - {PCI_VENDOR_ID_TOSHIBA_2 ,PCI_DEVICE_ID_TOSHIBA_SCC_ATA , -PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, + {PCI_VDEVICE (TOSHIBA_2 ,PCI_DEVICE_ID_TOSHIBA_SCC_ATA ),0 }, { }/* terminate list */ };
drivers/ata/sata_dwc_460ex.c new file +1756 -0
1,756 lines not on this page · raw message
drivers/ata/sata_fsl.c +10 -10
@@ -1096,7 +1096,7 @@ static void sata_fsl_host_intr(struct ata_port *ap) {struct sata_fsl_host_priv *host_priv = ap->host->private_data;void __iomem *hcr_base = host_priv->hcr_base; -u32 hstatus, qc_active =0 ; +u32 hstatus, done_mask =0 ;struct ata_queued_cmd *qc;u32 SError;
@@ -1116,28 +1116,28 @@ static void sata_fsl_host_intr(struct ata_port *ap) }/* Read command completed register */ - qc_active =ioread32 (hcr_base +CC ); + done_mask =ioread32 (hcr_base +CC );VPRINTK ("Status of all queues :\n" ); -VPRINTK ("qc_active/CC = 0x%x, CA = 0x%x, CE=0x%x,CQ=0x%x,apqa=0x%x\n" , - qc_active, +VPRINTK ("done_mask/CC = 0x%x, CA = 0x%x, CE=0x%x,CQ=0x%x,apqa=0x%x\n" , + done_mask,ioread32 (hcr_base +CA ),ioread32 (hcr_base +CE ),ioread32 (hcr_base +CQ ), ap->qc_active); -if (qc_active & ap->qc_active) { +if (done_mask & ap->qc_active) {int i;/* clear CC bit, this will also complete the interrupt */ -iowrite32 (qc_active, hcr_base +CC ); +iowrite32 (done_mask, hcr_base +CC );DPRINTK ("Status of all queues :\n" ); -DPRINTK ("qc_active/CC = 0x%x, CA = 0x%x, CE=0x%x\n" , - qc_active,ioread32 (hcr_base +CA ), +DPRINTK ("done_mask/CC = 0x%x, CA = 0x%x, CE=0x%x\n" , + done_mask,ioread32 (hcr_base +CA ),ioread32 (hcr_base +CE ));for (i =0 ; i <SATA_FSL_QUEUE_DEPTH ; i++) { -if (qc_active & (1 << i)) { +if (done_mask & (1 << i)) { qc =ata_qc_from_tag (ap, i);if (qc) {ata_qc_complete (qc);
@@ -1164,7 +1164,7 @@ static void sata_fsl_host_intr(struct ata_port *ap)/* Spurious Interrupt!! */ DPRINTK ("spurious interrupt!!, CC = 0x%x\n" ,ioread32 (hcr_base +CC )); -iowrite32 (qc_active, hcr_base +CC ); +iowrite32 (done_mask, hcr_base +CC );return ; } }
drivers/ata/sata_mv.c +24 -23
58 lines not on this page · raw message
drivers/ata/sata_nv.c +14 -18
@@ -1018,7 +1018,7 @@ static irqreturn_t nv_adma_interrupt(int irq, void *dev_instance) NV_ADMA_STAT_CPBERR | NV_ADMA_STAT_CMD_COMPLETE)) {u32 check_commands = notifier_clears[i]; -int pos, error =0 ; +int pos, rc;if (status &NV_ADMA_STAT_CPBERR ) {/* check all active commands */
@@ -1030,10 +1030,12 @@ static irqreturn_t nv_adma_interrupt(int irq, void *dev_instance) }/* check CPBs for completed commands */ -while ((pos =ffs (check_commands)) && !error) { +while ((pos =ffs (check_commands))) { pos--; - error =nv_adma_check_cpb (ap, pos, + rc =nv_adma_check_cpb (ap, pos, notifier_error & (1 << pos)); +if (unlikely (rc)) + check_commands =0 ; check_commands &= ~(1 << pos); } }
@@ -2129,7 +2131,6 @@ static int nv_swncq_sdbfis(struct ata_port *ap)struct nv_swncq_port_priv *pp = ap->private_data;struct ata_eh_info *ehi = &ap->link.eh_info;u32 sactive; -int nr_done =0 ;u32 done_mask;int i;u8 host_stat;
@@ -2170,22 +2171,21 @@ static int nv_swncq_sdbfis(struct ata_port *ap) pp->dhfis_bits &= ~(1 << i); pp->dmafis_bits &= ~(1 << i); pp->sdbfis_bits |= (1 << i); - nr_done++; } }if (!ap->qc_active) {DPRINTK ("over\n" );nv_swncq_pp_reinit (ap); -return nr_done; +return 0 ; }if (pp->qc_active & pp->dhfis_bits) -return nr_done; +return 0 ;if ((pp->ncq_flags & ncq_saw_backout) || (pp->qc_active ^ pp->dhfis_bits)) -/* if the controller cann't get a device to host register FIS, +/* if the controller can't get a device to host register FIS, * The driver needs to reissue the new command. */ lack_dhfis =1 ;
@@ -2202,7 +2202,7 @@ static int nv_swncq_sdbfis(struct ata_port *ap)if (lack_dhfis) { qc =ata_qc_from_tag (ap, pp->last_issue_tag);nv_swncq_issue_atacmd (ap, qc); -return nr_done; +return 0 ; }if (pp->defer_queue.defer_bits) {
@@ -2212,7 +2212,7 @@ static int nv_swncq_sdbfis(struct ata_port *ap)nv_swncq_issue_atacmd (ap, qc); } -return nr_done;
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
Quoted 6 lines · Jeff Garzik
Tejun Heo (4):
ata_generic: drop hard coded DMA force logic for CENATEK
ata_piix: fix locking around SIDPR access
libata: more PCI IDs for jmicron controllers sata_fsl,mv,nv: prepare for NCQ command completion update
Hmm. Aren't these the ones that you said causes "sata_mv is behaving weirdly"? I think I'll wait for you to do another pull request when that is sorted out..
Linus
Quoted 11 lines · Linus Torvalds
Quoted 6 lines · Jeff Garzik
Tejun Heo (4):
ata_generic: drop hard coded DMA force logic for CENATEK
ata_piix: fix locking around SIDPR access
libata: more PCI IDs for jmicron controllers sata_fsl,mv,nv: prepare for NCQ command completion updateHmm. Aren't these the ones that you said causes "
sata_mvis behaving weirdly"? I think I'll wait for you to do another pull request when that is sorted out..
"prepare for..." is patch #1 of 2. With #2, sata_mv starts behaving strangely. #1 seems to be working here.
Jeff