libata: Pass host flags into the pci helper
PATCH 1/5 libata: Pass host flags into the pci helper
This allows parallel scan and the like to be set without having to stop using the existing full helper functions. This patch merely adds the argument and fixes up the callers. It doesn't undo the special cases already in the tree or add any new parallel callers.
---
drivers/ata/ata_generic.c | 2 +- drivers/ata/libata-sff.c | 6 ++++-- drivers/ata/pata_acpi.c | 2 +- drivers/ata/pata_ali.c | 2 +- drivers/ata/pata_amd.c | 2 +- drivers/ata/pata_artop.c | 2 +- drivers/ata/pata_atiixp.c | 2 +- drivers/ata/pata_cmd640.c | 2 +- drivers/ata/pata_cmd64x.c | 2 +- drivers/ata/pata_cs5530.c | 2 +- drivers/ata/pata_cs5535.c | 2 +- drivers/ata/pata_cs5536.c | 2 +- drivers/ata/pata_cypress.c | 2 +- drivers/ata/pata_efar.c | 2 +- drivers/ata/pata_hpt366.c | 2 +- drivers/ata/pata_hpt37x.c | 2 +- drivers/ata/pata_hpt3x2n.c | 2 +- drivers/ata/pata_it8213.c | 2 +- drivers/ata/pata_it821x.c | 2 +- drivers/ata/pata_jmicron.c | 2 +- drivers/ata/pata_marvell.c | 2 +- drivers/ata/pata_netcell.c | 2 +- drivers/ata/pata_ns87410.c | 2 +- drivers/ata/pata_ns87415.c | 2 +- drivers/ata/pata_oldpiix.c | 2 +- drivers/ata/pata_opti.c | 2 +- drivers/ata/pata_optidma.c | 2 +- drivers/ata/pata_pdc202xx_old.c | 2 +- drivers/ata/pata_piccolo.c | 2 +- drivers/ata/pata_radisys.c | 2 +- drivers/ata/pata_rz1000.c | 2 +- drivers/ata/pata_sc1200.c | 2 +- drivers/ata/pata_serverworks.c | 2 +- drivers/ata/pata_sil680.c | 2 +- drivers/ata/pata_sis.c | 2 +- drivers/ata/pata_sl82c105.c | 2 +- drivers/ata/pata_triflex.c | 2 +- drivers/ata/pata_via.c | 2 +- include/linux/libata.h | 4 ++-- 39 files changed, 43 insertions(+), 41 deletions(-)
drivers/ata/ata_generic.c +1 -1
@@ -156,7 +156,7 @@ static int ata_generic_init_one(struct pci_dev *dev, const struct pci_device_idreturn rc;pcim_pin_device (dev); } -return ata_pci_sff_init_one (dev, ppi, &generic_sht,NULL ); +return ata_pci_sff_init_one (dev, ppi, &generic_sht,NULL ,0 ); }static struct pci_device_id ata_generic[] = {
drivers/ata/libata-sff.c +4 -2
@@ -3061,6 +3061,7 @@ EXPORT_SYMBOL_GPL(ata_pci_sff_activate_host);* @ppi: array of port_info, must be enough for two ports * @sht: scsi_host_template to use when registering the host * @host_priv: host private_data +* @hflag: host flags * * This is a helper function which can be called from a driver's * xxx_init_one() probe function if the hardware uses traditional
@@ -3081,8 +3082,8 @@ EXPORT_SYMBOL_GPL(ata_pci_sff_activate_host);* Zero on success, negative on errno-based value on error. */ int ata_pci_sff_init_one (struct pci_dev *pdev, -const struct ata_port_info *const *ppi, -struct scsi_host_template *sht,void *host_priv) +const struct ata_port_info *const *ppi, +struct scsi_host_template *sht,void *host_priv,int hflag) {struct device *dev = &pdev->dev;const struct ata_port_info *pi =NULL ;
@@ -3117,6 +3118,7 @@ int ata_pci_sff_init_one(struct pci_dev *pdev,if (rc) goto out; host->private_data = host_priv; + host->flags |= hflag;pci_set_master (pdev); rc =ata_pci_sff_activate_host (host, ata_sff_interrupt, sht);
drivers/ata/pata_acpi.c +1 -1
@@ -260,7 +260,7 @@ static int pacpi_init_one (struct pci_dev *pdev, const struct pci_device_id *id)return rc;pcim_pin_device (pdev); } -return ata_pci_sff_init_one (pdev, ppi, &pacpi_sht,NULL ); +return ata_pci_sff_init_one (pdev, ppi, &pacpi_sht,NULL ,0 ); }static const struct pci_device_id pacpi_pci_tbl[] = {
drivers/ata/pata_ali.c +1 -1
@@ -585,7 +585,7 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) ppi[0 ] = &info_20_udma; } -return ata_pci_sff_init_one (pdev, ppi, &ali_sht,NULL ); +return ata_pci_sff_init_one (pdev, ppi, &ali_sht,NULL ,0 ); }#ifdef CONFIG_PM
drivers/ata/pata_amd.c +1 -1
@@ -576,7 +576,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) }/* And fire it up */ -return ata_pci_sff_init_one (pdev, ppi, &amd_sht, hpriv); +return ata_pci_sff_init_one (pdev, ppi, &amd_sht, hpriv,0 ); }#ifdef CONFIG_PM
drivers/ata/pata_artop.c +1 -1
@@ -423,7 +423,7 @@ static int artop_init_one (struct pci_dev *pdev, const struct pci_device_id *id)BUG_ON (ppi[0 ] ==NULL ); -return ata_pci_sff_init_one (pdev, ppi, &artop_sht,NULL ); +return ata_pci_sff_init_one (pdev, ppi, &artop_sht,NULL ,0 ); }static const struct pci_device_id artop_pci_tbl[] = {
drivers/ata/pata_atiixp.c +1 -1
@@ -238,7 +238,7 @@ static int atiixp_init_one(struct pci_dev *pdev, const struct pci_device_id *id)if (!pci_test_config_bits (pdev, &atiixp_enable_bits[i])) ppi[i] = &ata_dummy_port_info; -return ata_pci_sff_init_one (pdev, ppi, &atiixp_sht,NULL ); +return ata_pci_sff_init_one (pdev, ppi, &atiixp_sht,NULL ,0 ); }static const struct pci_device_id atiixp[] = {
drivers/ata/pata_cmd640.c +1 -1
@@ -224,7 +224,7 @@ static int cmd640_init_one(struct pci_dev *pdev, const struct pci_device_id *id)cmd640_hardware_init (pdev); -return ata_pci_sff_init_one (pdev, ppi, &cmd640_sht,NULL ); +return ata_pci_sff_init_one (pdev, ppi, &cmd640_sht,NULL ,0 ); }#ifdef CONFIG_PM
drivers/ata/pata_cmd64x.c +1 -1
@@ -368,7 +368,7 @@ static int cmd64x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)pci_write_config_byte (pdev,UDIDETCR0 ,0xF0 );#endif -return ata_pci_sff_init_one (pdev, ppi, &cmd64x_sht,NULL ); +return ata_pci_sff_init_one (pdev, ppi, &cmd64x_sht,NULL ,0 ); }#ifdef CONFIG_PM
drivers/ata/pata_cs5530.c +1 -1
@@ -325,7 +325,7 @@ static int cs5530_init_one(struct pci_dev *pdev, const struct pci_device_id *id) ppi[1 ] = &info_palmax_secondary;/* Now kick off ATA set up */ -return ata_pci_sff_init_one (pdev, ppi, &cs5530_sht,NULL ); +return ata_pci_sff_init_one (pdev, ppi, &cs5530_sht,NULL ,0 ); }#ifdef CONFIG_PM
drivers/ata/pata_cs5535.c +1 -1
@@ -199,7 +199,7 @@ static int cs5535_init_one(struct pci_dev *dev, const struct pci_device_id *id)rdmsr (ATAC_CH0D1_PIO , timings, dummy);if (CS5535_BAD_PIO (timings))wrmsr (ATAC_CH0D1_PIO ,0xF7F4F7F4UL ,0 ); -return ata_pci_sff_init_one (dev, ppi, &cs5535_sht,NULL ); +return ata_pci_sff_init_one (dev, ppi, &cs5535_sht,NULL ,0 ); }static const struct pci_device_id cs5535[] = {
drivers/ata/pata_cs5536.c +1 -1
@@ -261,7 +261,7 @@ static int cs5536_init_one(struct pci_dev *dev, const struct pci_device_id *id)return -ENODEV ; } -return ata_pci_sff_init_one (dev, ppi, &cs5536_sht,NULL ); +return ata_pci_sff_init_one (dev, ppi, &cs5536_sht,NULL ,0 ); }static const struct pci_device_id cs5536[] = {
drivers/ata/pata_cypress.c +1 -1
@@ -138,7 +138,7 @@ static int cy82c693_init_one(struct pci_dev *pdev, const struct pci_device_id *iif (PCI_FUNC (pdev->devfn) !=1 )return -ENODEV ; -return ata_pci_sff_init_one (pdev, ppi, &cy82c693_sht,NULL ); +return ata_pci_sff_init_one (pdev, ppi, &cy82c693_sht,NULL ,0 ); }static const struct pci_device_id cy82c693[] = {
drivers/ata/pata_efar.c +1 -1
@@ -263,7 +263,7 @@ static int efar_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)dev_printk (KERN_DEBUG , &pdev->dev,"version " DRV_VERSION "\n" ); -return ata_pci_sff_init_one (pdev, ppi, &efar_sht,NULL ); +return ata_pci_sff_init_one (pdev, ppi, &efar_sht,NULL ,0 ); }static const struct pci_device_id efar_pci_tbl[] = {
drivers/ata/pata_hpt366.c +1 -1
@@ -362,7 +362,7 @@ static int hpt36x_init_one(struct pci_dev *dev, const struct pci_device_id *id)break ; }/* Now kick off ATA set up */ -return ata_pci_sff_init_one (dev, ppi, &hpt36x_sht, hpriv); +return ata_pci_sff_init_one (dev, ppi, &hpt36x_sht, hpriv,0 ); }#ifdef CONFIG_PM
drivers/ata/pata_hpt37x.c +1 -1
@@ -989,7 +989,7 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id) }/* Now kick off ATA set up */ -return ata_pci_sff_init_one (dev, ppi, &hpt37x_sht, private_data); +return ata_pci_sff_init_one (dev, ppi, &hpt37x_sht, private_data,0 ); }static const struct pci_device_id hpt37x[] = {
drivers/ata/pata_hpt3x2n.c +1 -1
@@ -549,7 +549,7 @@ static int hpt3x2n_init_one(struct pci_dev *dev, const struct pci_device_id *id)outb (inb (iobase +0x9c ) |0x04 , iobase +0x9c );/* Now kick off ATA set up */ -return ata_pci_sff_init_one (dev, ppi, &hpt3x2n_sht, hpriv); +return ata_pci_sff_init_one (dev, ppi, &hpt3x2n_sht, hpriv,0 ); }static const struct pci_device_id hpt3x2n[] = {
drivers/ata/pata_it8213.c +1 -1
@@ -274,7 +274,7 @@ static int it8213_init_one (struct pci_dev *pdev, const struct pci_device_id *endev_printk (KERN_DEBUG , &pdev->dev,"version " DRV_VERSION "\n" ); -return ata_pci_sff_init_one (pdev, ppi, &it8213_sht,NULL ); +return ata_pci_sff_init_one (pdev, ppi, &it8213_sht,NULL ,0 ); }static const struct pci_device_id it8213_pci_tbl[] = {
drivers/ata/pata_it821x.c +1 -1
@@ -934,7 +934,7 @@ static int it821x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)else ppi[0 ] = &info_smart; } -return ata_pci_sff_init_one (pdev, ppi, &it821x_sht,NULL ); +return ata_pci_sff_init_one (pdev, ppi, &it821x_sht,NULL ,0 ); }#ifdef CONFIG_PM
drivers/ata/pata_jmicron.c +1 -1
@@ -145,7 +145,7 @@ static int jmicron_init_one (struct pci_dev *pdev, const struct pci_device_id *i };const struct ata_port_info *ppi[] = { &info,NULL }; -return ata_pci_sff_init_one (pdev, ppi, &jmicron_sht,NULL ); +return ata_pci_sff_init_one (pdev, ppi, &jmicron_sht,NULL ,0 ); }static const struct pci_device_id jmicron_pci_tbl[] = {
drivers/ata/pata_marvell.c +1 -1
@@ -154,7 +154,7 @@ static int marvell_init_one (struct pci_dev *pdev, const struct pci_device_id *ireturn -ENODEV ; }#endif -return ata_pci_sff_init_one (pdev, ppi, &marvell_sht,NULL ); +return ata_pci_sff_init_one (pdev, ppi, &marvell_sht,NULL ,0 ); } static const struct pci_device_id marvell_pci_tbl[] = {
drivers/ata/pata_netcell.c +1 -1
@@ -83,7 +83,7 @@ static int netcell_init_one (struct pci_dev *pdev, const struct pci_device_id *eata_pci_bmdma_clear_simplex (pdev);/* And let the library code do the work */ -return ata_pci_sff_init_one (pdev, port_info, &netcell_sht,NULL ); +return ata_pci_sff_init_one (pdev, port_info, &netcell_sht,NULL ,0 ); }static const struct pci_device_id netcell_pci_tbl[] = {
drivers/ata/pata_ns87410.c +1 -1
@@ -149,7 +149,7 @@ static int ns87410_init_one(struct pci_dev *dev, const struct pci_device_id *id) .port_ops = &ns87410_port_ops };const struct ata_port_info *ppi[] = { &info,NULL }; -return ata_pci_sff_init_one (dev, ppi, &ns87410_sht,NULL ); +return ata_pci_sff_init_one (dev, ppi, &ns87410_sht,NULL ,0 ); }static const struct pci_device_id ns87410[] = {
drivers/ata/pata_ns87415.c +1 -1
@@ -381,7 +381,7 @@ static int ns87415_init_one (struct pci_dev *pdev, const struct pci_device_id *ens87415_fixup (pdev); -return ata_pci_sff_init_one (pdev, ppi, &ns87415_sht,NULL ); +return ata_pci_sff_init_one (pdev, ppi, &ns87415_sht,NULL ,0 ); }static const struct pci_device_id ns87415_pci_tbl[] = {
drivers/ata/pata_oldpiix.c +1 -1
@@ -249,7 +249,7 @@ static int oldpiix_init_one (struct pci_dev *pdev, const struct pci_device_id *edev_printk (KERN_DEBUG , &pdev->dev,"version " DRV_VERSION "\n" ); -return ata_pci_sff_init_one (pdev, ppi, &oldpiix_sht,NULL ); +return ata_pci_sff_init_one (pdev, ppi, &oldpiix_sht,NULL ,0 ); }static const struct pci_device_id oldpiix_pci_tbl[] = {
drivers/ata/pata_opti.c +1 -1
@@ -173,7 +173,7 @@ static int opti_init_one(struct pci_dev *dev, const struct pci_device_id *id)if (!printed_version++)dev_printk (KERN_DEBUG , &dev->dev,"version " DRV_VERSION "\n" ); -return ata_pci_sff_init_one (dev, ppi, &opti_sht,NULL ); +return ata_pci_sff_init_one (dev, ppi, &opti_sht,NULL ,0 ); }static const struct pci_device_id opti[] = {
drivers/ata/pata_optidma.c +1 -1
@@ -430,7 +430,7 @@ static int optidma_init_one(struct pci_dev *dev, const struct pci_device_id *id)if (optiplus_with_udma (dev)) ppi[0 ] = &info_82c700_udma; -return ata_pci_sff_init_one (dev, ppi, &optidma_sht,NULL ); +return ata_pci_sff_init_one (dev, ppi, &optidma_sht,NULL ,0 ); }static const struct pci_device_id optidma[] = {
drivers/ata/pata_pdc202xx_old.c +1 -1
@@ -338,7 +338,7 @@ static int pdc202xx_init_one(struct pci_dev *dev, const struct pci_device_id *idreturn -ENODEV ; } } -return ata_pci_sff_init_one (dev, ppi, &pdc202xx_sht,NULL ); +return ata_pci_sff_init_one (dev, ppi, &pdc202xx_sht,NULL ,0 ); }static const struct pci_device_id pdc202xx[] = {
drivers/ata/pata_piccolo.c +1 -1
@@ -96,7 +96,7 @@ static int ata_tosh_init_one(struct pci_dev *dev, const struct pci_device_id *id };const struct ata_port_info *ppi[] = { &info, &ata_dummy_port_info };/* Just one port for the moment */ -return ata_pci_sff_init_one (dev, ppi, &tosh_sht,NULL ); +return ata_pci_sff_init_one (dev, ppi, &tosh_sht,NULL ,0 ); }static struct pci_device_id ata_tosh[] = {
drivers/ata/pata_radisys.c +1 -1
@@ -228,7 +228,7 @@ static int radisys_init_one (struct pci_dev *pdev, const struct pci_device_id *edev_printk (KERN_DEBUG , &pdev->dev,"version " DRV_VERSION "\n" ); -return ata_pci_sff_init_one (pdev, ppi, &radisys_sht,NULL ); +return ata_pci_sff_init_one (pdev, ppi, &radisys_sht,NULL ,0 ); }static const struct pci_device_id radisys_pci_tbl[] = {
drivers/ata/pata_rz1000.c +1 -1
@@ -96,7 +96,7 @@ static int rz1000_init_one (struct pci_dev *pdev, const struct pci_device_id *en printk_once(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n");if (rz1000_fifo_disable (pdev) ==0 ) -return ata_pci_sff_init_one (pdev, ppi, &rz1000_sht,NULL ); +return ata_pci_sff_init_one (pdev, ppi, &rz1000_sht,NULL ,0 ); printk(KERN_ERR DRV_NAME ": failed to disable read-ahead on chipset..\n");/* Not safe to use so skip */
drivers/ata/pata_sc1200.c +1 -1
@@ -238,7 +238,7 @@ static int sc1200_init_one(struct pci_dev *dev, const struct pci_device_id *id) };const struct ata_port_info *ppi[] = { &info,NULL }; -return ata_pci_sff_init_one (dev, ppi, &sc1200_sht,NULL ); +return ata_pci_sff_init_one (dev, ppi, &sc1200_sht,NULL ,0 ); }static const struct pci_device_id sc1200[] = {
drivers/ata/pata_serverworks.c +1 -1
@@ -461,7 +461,7 @@ static int serverworks_init_one(struct pci_dev *pdev, const struct pci_device_idif (pdev->device ==PCI_DEVICE_ID_SERVERWORKS_CSB5IDE )ata_pci_bmdma_clear_simplex (pdev); -return ata_pci_sff_init_one (pdev, ppi, &serverworks_sht,NULL ); +return ata_pci_sff_init_one (pdev, ppi, &serverworks_sht,NULL ,0 ); }#ifdef CONFIG_PM
drivers/ata/pata_sil680.c +1 -1
@@ -378,7 +378,7 @@ static int __devinit sil680_init_one(struct pci_dev *pdev, IRQF_SHARED, &sil680_sht); use_ioports: -return ata_pci_sff_init_one (pdev, ppi, &sil680_sht,NULL ); +return ata_pci_sff_init_one (pdev, ppi, &sil680_sht,NULL ,0 ); }#ifdef CONFIG_PM
drivers/ata/pata_sis.c +1 -1
@@ -828,7 +828,7 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)sis_fixup (pdev, chipset); -return ata_pci_sff_init_one (pdev, ppi, &sis_sht, chipset); +return ata_pci_sff_init_one (pdev, ppi, &sis_sht, chipset,0 ); }#ifdef CONFIG_PM
drivers/ata/pata_sl82c105.c +1 -1
@@ -316,7 +316,7 @@ static int sl82c105_init_one(struct pci_dev *dev, const struct pci_device_id *id val |=CTRL_P0EN |CTRL_P0F16 |CTRL_P1F16 ;pci_write_config_dword (dev,0x40 , val); -return ata_pci_sff_init_one (dev, ppi, &sl82c105_sht,NULL ); +return ata_pci_sff_init_one (dev, ppi, &sl82c105_sht,NULL ,0 ); }static const struct pci_device_id sl82c105[] = {
drivers/ata/pata_triflex.c +1 -1
@@ -202,7 +202,7 @@ static int triflex_init_one(struct pci_dev *dev, const struct pci_device_id *id)if (!printed_version++)dev_printk (KERN_DEBUG , &dev->dev,"version " DRV_VERSION "\n" ); -return ata_pci_sff_init_one (dev, ppi, &triflex_sht,NULL ); +return ata_pci_sff_init_one (dev, ppi, &triflex_sht,NULL ,0 ); }static const struct pci_device_id triflex[] = {
drivers/ata/pata_via.c +1 -1
@@ -623,7 +623,7 @@ static int via_init_one(struct pci_dev *pdev, const struct pci_device_id *id) }/* We have established the device type, now fire it up */ -return ata_pci_sff_init_one (pdev, ppi, &via_sht, (void *)config); +return ata_pci_sff_init_one (pdev, ppi, &via_sht, (void *)config,0 ); }#ifdef CONFIG_PM
include/linux/libata.h +2 -2
@@ -1646,8 +1646,8 @@ extern int ata_pci_sff_activate_host(struct ata_host *host,irq_handler_t irq_handler, struct scsi_host_template *sht);extern int ata_pci_sff_init_one (struct pci_dev *pdev, -const struct ata_port_info *const * ppi, -struct scsi_host_template *sht,void *host_priv); +const struct ata_port_info *const * ppi, +struct scsi_host_template *sht,void *host_priv,int hflags);#endif /* CONFIG_PCI */ /**
PATCH 2/5 Subject: [PATCH] pata_efar: add locking for parallel scanning
From: Bartlomiej Zolnierkiewicz <[email protected]>
Add clearing of UDMA enable bit also for PIO modes and then add an extra locking for parallel scanning.
This is similar change as commit 60c3be3 for ata_piix host driver and while pata_efar doesn't enable parallel scan yet the race could probably also be triggered by requesting re-scanning of both ports at the same time using SCSI sysfs interface.
[Ported to current kernel without other patch dependancies by
Alan Cox]
Original is
This one is
---
drivers/ata/pata_efar.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-)
drivers/ata/pata_efar.c +15 -0
@@ -68,6 +68,8 @@ static int efar_cable_detect(struct ata_port *ap)return ATA_CBL_PATA80 ; } +static DEFINE_SPINLOCK (efar_lock); +/** * efar_set_piomode - Initialize host controller PATA PIO timings * @ap: Port whose timings we are configuring
@@ -84,7 +86,9 @@ static void efar_set_piomode (struct ata_port *ap, struct ata_device *adev)unsigned int pio = adev->pio_mode -XFER_PIO_0 ;struct pci_dev *dev =to_pci_dev (ap->host->dev);unsigned int idetm_port= ap->port_no ?0x42 :0x40 ; +unsigned long flags;u16 idetm_data; +u8 udma_enable;int control =0 ;/*
@@ -107,6 +111,8 @@ static void efar_set_piomode (struct ata_port *ap, struct ata_device *adev)if (adev->class ==ATA_DEV_ATA ) control |=4 ;/* PPE */ +spin_lock_irqsave (&efar_lock, flags); +pci_read_config_word (dev, idetm_port, &idetm_data);/* Set PPE, IE, and TIME as appropriate */
@@ -131,6 +137,11 @@ static void efar_set_piomode (struct ata_port *ap, struct ata_device *adev) idetm_data |=0x4000 ;/* Ensure SITRE is set */ pci_write_config_word (dev, idetm_port, idetm_data); + +pci_read_config_byte (dev,0x48 , &udma_enable); + udma_enable &= ~(1 << (2 * ap->port_no + adev->devno)); +pci_write_config_byte (dev,0x48 , udma_enable); +spin_unlock_irqrestore (&efar_lock, flags); }/**
@@ -151,6 +162,7 @@ static void efar_set_dmamode (struct ata_port *ap, struct ata_device *adev)u16 master_data;u8 speed = adev->dma_mode;int devid = adev->devno +2 * ap->port_no; +unsigned long flags;u8 udma_enable; static const /* ISP RTC */
@@ -160,6 +172,8 @@ static void efar_set_dmamode (struct ata_port *ap, struct ata_device *adev) { 2, 1 }, { 2, 3 }, }; +spin_lock_irqsave (&efar_lock, flags); +pci_read_config_word (dev, master_port, &master_data);pci_read_config_byte (dev,0x48 , &udma_enable);
@@ -217,6 +231,7 @@ static void efar_set_dmamode (struct ata_port *ap, struct ata_device *adev)pci_write_config_word (dev, master_port, master_data); }pci_write_config_byte (dev,0x48 , udma_enable); +spin_unlock_irqrestore (&efar_lock, flags); }static struct scsi_host_template efar_sht = {
Re: [PATCH 2/5] Subject: [PATCH] pata_efar: add locking for parallel scanning
Quoted 14 lines · Alan Cox
From: Bartlomiej Zolnierkiewicz<[email protected]>
Add clearing of UDMA enable bit also for PIO modes and then add an extra locking for parallel scanning.
This is similar change as commit 60c3be3 for
ata_piixhost driver and whilepata_efardoesn't enable parallel scan yet the race could probably also be triggered by requesting re-scanning of both ports at the same time using SCSI sysfs interface.[Ported to current kernel without other patch dependancies by
Alan Cox]Original is
Quoted 8 lines
Signed-off-by Bartlomiej Zolnierkiewicz<[email protected]>This one is
Signed-off-by Alan Cox<[email protected]>---
drivers/ata/pata_efar.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-)
applied 2-5
PATCH 3/5 Subject: [PATCH] pata_atiixp: add locking for parallel scanning
In reply to Alan CoxFrom: Bartlomiej Zolnierkiewicz <[email protected]>
This is similar change as commit 60c3be3 for ata_piix host driver and while pata_atiixp doesn't enable parallel scan yet the race could probably also be triggered by requesting re-scanning of both ports at the same time using SCSI sysfs interface.
[Ported to current tree without other patch dependancies by Alan Cox]
Original is
This one is
---
drivers/ata/pata_atiixp.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-)
drivers/ata/pata_atiixp.c +10 -1
@@ -1,7 +1,7 @@/* * pata_atiixp.c - ATI PATA for new ATA layer * (C) 2005 Red Hat Inc -* (C) 2009 Bartlomiej Zolnierkiewicz +* (C) 2009-2010 Bartlomiej Zolnierkiewicz * * Based on *
@@ -46,6 +46,8 @@ static int atiixp_cable_detect(struct ata_port *ap)return ATA_CBL_PATA40 ; } +static DEFINE_SPINLOCK (atiixp_lock); +/** * atiixp_set_pio_timing - set initial PIO mode data * @ap: ATA interface
@@ -88,7 +90,10 @@ static void atiixp_set_pio_timing(struct ata_port *ap, struct ata_device *adev,static void atiixp_set_piomode (struct ata_port *ap,struct ata_device *adev) { +unsigned long flags; +spin_lock_irqsave (&atiixp_lock, flags);atiixp_set_pio_timing (ap, adev, adev->pio_mode -XFER_PIO_0 ); +spin_unlock_irqrestore (&atiixp_lock, flags); }/**
@@ -108,6 +113,9 @@ static void atiixp_set_dmamode(struct ata_port *ap, struct ata_device *adev)int dma = adev->dma_mode;int dn =2 * ap->port_no + adev->devno;int wanted_pio; +unsigned long flags; + +spin_lock_irqsave (&atiixp_lock, flags);if (adev->dma_mode >=XFER_UDMA_0 ) {u16 udma_mode_data;
@@ -145,6 +153,7 @@ static void atiixp_set_dmamode(struct ata_port *ap, struct ata_device *adev)if (adev->pio_mode != wanted_pio)atiixp_set_pio_timing (ap, adev, wanted_pio); +spin_unlock_irqrestore (&atiixp_lock, flags); }/**
PATCH 4/5 pata_atiixp: enable parallel scan
In reply to Alan CoxThis was originally proposed by Bartlomiej but as a device specific expansion of the init_one function rather than making the helper more generic.
Enable the parallel scan via the generic flags.
---
drivers/ata/pata_atiixp.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
drivers/ata/pata_atiixp.c +2 -1
@@ -247,7 +247,8 @@ static int atiixp_init_one(struct pci_dev *pdev, const struct pci_device_id *id)if (!pci_test_config_bits (pdev, &atiixp_enable_bits[i])) ppi[i] = &ata_dummy_port_info; -return ata_pci_sff_init_one (pdev, ppi, &atiixp_sht,NULL ,0 ); +return ata_pci_sff_init_one (pdev, ppi, &atiixp_sht,NULL , +ATA_HOST_PARALLEL_SCAN ); }static const struct pci_device_id atiixp[] = {
PATCH 5/5 pata_efar: Enable PARALLEL_SCAN
In reply to Alan CoxAgain originally proposed by Bartlomiej but this does it by using the generic helper logic instead.
---
drivers/ata/pata_efar.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
drivers/ata/pata_efar.c +2 -1
@@ -278,7 +278,8 @@ static int efar_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)dev_printk (KERN_DEBUG , &pdev->dev,"version " DRV_VERSION "\n" ); -return ata_pci_sff_init_one (pdev, ppi, &efar_sht,NULL ,0 ); +return ata_pci_sff_init_one (pdev, ppi, &efar_sht,NULL , +ATA_HOST_PARALLEL_SCAN ); }static const struct pci_device_id efar_pci_tbl[] = {
Quoted 40 lines · Alan Cox
This allows parallel scan and the like to be set without having to stop using the existing full helper functions. This patch merely adds the argument and fixes up the callers. It doesn't undo the special cases already in the tree or add any new parallel callers.
Signed-off-by Alan Cox<[email protected]>---
drivers/ata/ata_generic.c | 2 +- drivers/ata/libata-sff.c | 6 ++++-- drivers/ata/pata_acpi.c | 2 +- drivers/ata/pata_ali.c | 2 +- drivers/ata/pata_amd.c | 2 +- drivers/ata/pata_artop.c | 2 +- drivers/ata/pata_atiixp.c | 2 +- drivers/ata/pata_cmd640.c | 2 +- drivers/ata/pata_cmd64x.c | 2 +- drivers/ata/pata_cs5530.c | 2 +- drivers/ata/pata_cs5535.c | 2 +- drivers/ata/pata_cs5536.c | 2 +- drivers/ata/pata_cypress.c | 2 +- drivers/ata/pata_efar.c | 2 +- drivers/ata/pata_hpt366.c | 2 +- drivers/ata/pata_hpt37x.c | 2 +- drivers/ata/pata_hpt3x2n.c | 2 +- drivers/ata/pata_it8213.c | 2 +- drivers/ata/pata_it821x.c | 2 +- drivers/ata/pata_jmicron.c | 2 +- drivers/ata/pata_marvell.c | 2 +- drivers/ata/pata_netcell.c | 2 +- drivers/ata/pata_ns87410.c | 2 +- drivers/ata/pata_ns87415.c | 2 +- drivers/ata/pata_oldpiix.c | 2 +- drivers/ata/pata_opti.c | 2 +- drivers/ata/pata_optidma.c | 2 +- drivers/ata/pata_pdc202xx_old.c | 2 +- drivers/ata/pata_piccolo.c | 2 +- drivers/ata/pata_radisys.c | 2 +- drivers/ata/pata_rz1000.c | 2 +- drivers/ata/pata_sc1200.c | 2 +-
Quoted 8 lines
drivers/ata/pata_serverworks.c | 2 +- drivers/ata/pata_sil680.c | 2 +- drivers/ata/pata_sis.c | 2 +- drivers/ata/pata_sl82c105.c | 2 +- drivers/ata/pata_triflex.c | 2 +- drivers/ata/pata_via.c | 2 +- include/linux/libata.h | 4 ++-- 39 files changed, 43 insertions(+), 41 deletions(-)
applied (after catching one miss in drivers/staging/)