Commit 0384e295 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev 

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (35 commits)
  [libata] Improve timeout handling
  [libata] Drain data on errors
  pata_sc1200: Activate secondary channel
  pata_artop: Serializing support
  [libata] ahci: correct enclosure LED state save
  [libata] More robust parsing for IDENTIFY DEVICE multi_count field
  sata_mv: fix LED blinking for SoC+NCQ
  sata_mv: optimize IRQ coalescing for 8-port chips
  sata_mv: implement IRQ coalescing (v2)
  sata_mv: cosmetic preparations for IRQ coalescing
  pata-rb532-cf: platform_get_irq() fix ignored failure
  pata_efar: fix *dma_mask
  pata_radisys: fix mwdma_mask to exclude mwdma0
  [libata] convert drivers to use ata.h mode mask defines
  include/linux/ata.h: add some more transfer masks
  ahci: Blacklist HP Compaq 6720s that spins off disks during ACPI power off
  [libata] sata_mv: Implement direct FIS transmission via mv_qc_issue_fis().
  [libata] Export ata_pio_queue_task() so that it can be used from sata_mv.
  [libata] sata_mv: Add a new mv_sff_check_status() function to sata_mv.
  [libata] sata_mv: Tighten up interrupt masking in mv_qc_issue()
  ...
parents 61a09182 c96f1732

drivers/ata/ahci.c

+20 −11
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ static const struct ata_port_info ahci_port_info[] = { 
	/* board_ahci */

	{

		.flags		= AHCI_FLAG_COMMON,

		.pio_mask	= 0x1f, /* pio0-4 */

		.pio_mask	= ATA_PIO4,

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &ahci_ops,

	},
@@ -412,7 +412,7 @@ static const struct ata_port_info ahci_port_info[] = { 
	{

		AHCI_HFLAGS	(AHCI_HFLAG_NO_NCQ | AHCI_HFLAG_NO_PMP),

		.flags		= AHCI_FLAG_COMMON,

		.pio_mask	= 0x1f, /* pio0-4 */

		.pio_mask	= ATA_PIO4,

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &ahci_vt8251_ops,

	},
@@ -420,7 +420,7 @@ static const struct ata_port_info ahci_port_info[] = { 
	{

		AHCI_HFLAGS	(AHCI_HFLAG_IGN_IRQ_IF_ERR),

		.flags		= AHCI_FLAG_COMMON,

		.pio_mask	= 0x1f, /* pio0-4 */

		.pio_mask	= ATA_PIO4,

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &ahci_ops,

	},
@@ -430,7 +430,7 @@ static const struct ata_port_info ahci_port_info[] = { 
				 AHCI_HFLAG_32BIT_ONLY | AHCI_HFLAG_NO_MSI |

				 AHCI_HFLAG_SECT255),

		.flags		= AHCI_FLAG_COMMON,

		.pio_mask	= 0x1f, /* pio0-4 */

		.pio_mask	= ATA_PIO4,

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &ahci_sb600_ops,

	},
@@ -440,7 +440,7 @@ static const struct ata_port_info ahci_port_info[] = { 
				 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 */

		.pio_mask	= ATA_PIO4,

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &ahci_ops,

	},
@@ -448,7 +448,7 @@ static const struct ata_port_info ahci_port_info[] = { 
	{

		AHCI_HFLAGS	(AHCI_HFLAG_IGN_SERR_INTERNAL),

		.flags		= AHCI_FLAG_COMMON,

		.pio_mask	= 0x1f, /* pio0-4 */

		.pio_mask	= ATA_PIO4,

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &ahci_sb600_ops,

	},
@@ -456,7 +456,7 @@ static const struct ata_port_info ahci_port_info[] = { 
	{

		AHCI_HFLAGS	(AHCI_HFLAG_YES_NCQ),

		.flags		= AHCI_FLAG_COMMON,

		.pio_mask	= 0x1f, /* pio0-4 */

		.pio_mask	= ATA_PIO4,

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &ahci_ops,

	},
@@ -464,7 +464,7 @@ static const struct ata_port_info ahci_port_info[] = { 
	{

		AHCI_HFLAGS	(AHCI_HFLAG_NO_PMP),

		.flags		= AHCI_FLAG_COMMON,

		.pio_mask	= 0x1f, /* pio0-4 */

		.pio_mask	= ATA_PIO4,

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &ahci_ops,

	},
@@ -1348,7 +1348,7 @@ static ssize_t ahci_transmit_led_message(struct ata_port *ap, u32 state, 
	writel(message[1], mmio + hpriv->em_loc+4);



	/* save off new led state for port/slot */

	emp->led_state = message[1];

	emp->led_state = state;



	/*

	 * tell hardware to transmit the message
@@ -2565,6 +2565,15 @@ static bool ahci_broken_system_poweroff(struct pci_dev *pdev) 
			/* PCI slot number of the controller */

			.driver_data = (void *)0x1FUL,

		},

		{

			.ident = "HP Compaq 6720s",

			.matches = {

				DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),

				DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6720s"),

			},

			/* PCI slot number of the controller */

			.driver_data = (void *)0x1FUL,

		},



		{ }	/* terminate list */

	};
@@ -2647,8 +2656,8 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (board_id == board_ahci_sb700 && pdev->revision >= 0x40)

		hpriv->flags &= ~AHCI_HFLAG_IGN_SERR_INTERNAL;



	if ((hpriv->flags & AHCI_HFLAG_NO_MSI) || pci_enable_msi(pdev))

		pci_intx(pdev, 1);

	if (!(hpriv->flags & AHCI_HFLAG_NO_MSI))

		pci_enable_msi(pdev);



	/* save initial config */

	ahci_save_initial_config(pdev, hpriv);

drivers/ata/ata_generic.c

+2 −2
Original line number Diff line number Diff line
@@ -118,8 +118,8 @@ static int ata_generic_init_one(struct pci_dev *dev, const struct pci_device_id 
	u16 command;

	static const struct ata_port_info info = {

		.flags = ATA_FLAG_SLAVE_POSS,

		.pio_mask = 0x1f,

		.mwdma_mask = 0x07,

		.pio_mask = ATA_PIO4,

		.mwdma_mask = ATA_MWDMA2,

		.udma_mask = ATA_UDMA5,

		.port_ops = &generic_port_ops

	};

drivers/ata/ata_piix.c

+30 −30
Original line number Diff line number Diff line
@@ -446,34 +446,34 @@ static struct ata_port_info piix_port_info[] = { 
	[piix_pata_mwdma] = 	/* PIIX3 MWDMA only */

	{

		.flags		= PIIX_PATA_FLAGS,

		.pio_mask	= 0x1f,	/* pio0-4 */

		.mwdma_mask	= 0x06, /* mwdma1-2 ?? CHECK 0 should be ok but slow */

		.pio_mask	= ATA_PIO4,

		.mwdma_mask	= ATA_MWDMA12_ONLY, /* mwdma1-2 ?? CHECK 0 should be ok but slow */

		.port_ops	= &piix_pata_ops,

	},



	[piix_pata_33] =	/* PIIX4 at 33MHz */

	{

		.flags		= PIIX_PATA_FLAGS,

		.pio_mask	= 0x1f,	/* pio0-4 */

		.mwdma_mask	= 0x06, /* mwdma1-2 ?? CHECK 0 should be ok but slow */

		.udma_mask	= ATA_UDMA_MASK_40C,

		.pio_mask	= ATA_PIO4,

		.mwdma_mask	= ATA_MWDMA12_ONLY, /* mwdma1-2 ?? CHECK 0 should be ok but slow */

		.udma_mask	= ATA_UDMA2,

		.port_ops	= &piix_pata_ops,

	},



	[ich_pata_33] = 	/* ICH0 - ICH at 33Mhz*/

	{

		.flags		= PIIX_PATA_FLAGS,

		.pio_mask 	= 0x1f,	/* pio 0-4 */

		.mwdma_mask	= 0x06, /* Check: maybe 0x07  */

		.udma_mask	= ATA_UDMA2, /* UDMA33 */

		.pio_mask 	= ATA_PIO4,

		.mwdma_mask	= ATA_MWDMA12_ONLY, /* Check: maybe MWDMA0 is ok  */

		.udma_mask	= ATA_UDMA2,

		.port_ops	= &ich_pata_ops,

	},



	[ich_pata_66] = 	/* ICH controllers up to 66MHz */

	{

		.flags		= PIIX_PATA_FLAGS,

		.pio_mask 	= 0x1f,	/* pio 0-4 */

		.mwdma_mask	= 0x06, /* MWDMA0 is broken on chip */

		.pio_mask 	= ATA_PIO4,

		.mwdma_mask	= ATA_MWDMA12_ONLY, /* MWDMA0 is broken on chip */

		.udma_mask	= ATA_UDMA4,

		.port_ops	= &ich_pata_ops,

	},
@@ -481,17 +481,17 @@ static struct ata_port_info piix_port_info[] = { 
	[ich_pata_100] =

	{

		.flags		= PIIX_PATA_FLAGS | PIIX_FLAG_CHECKINTR,

		.pio_mask	= 0x1f,	/* pio0-4 */

		.mwdma_mask	= 0x06, /* mwdma1-2 */

		.udma_mask	= ATA_UDMA5, /* udma0-5 */

		.pio_mask	= ATA_PIO4,

		.mwdma_mask	= ATA_MWDMA12_ONLY,

		.udma_mask	= ATA_UDMA5,

		.port_ops	= &ich_pata_ops,

	},



	[ich5_sata] =

	{

		.flags		= PIIX_SATA_FLAGS,

		.pio_mask	= 0x1f,	/* pio0-4 */

		.mwdma_mask	= 0x07, /* mwdma0-2 */

		.pio_mask	= ATA_PIO4,

		.mwdma_mask	= ATA_MWDMA2,

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &piix_sata_ops,

	},
@@ -499,8 +499,8 @@ static struct ata_port_info piix_port_info[] = { 
	[ich6_sata] =

	{

		.flags		= PIIX_SATA_FLAGS,

		.pio_mask	= 0x1f,	/* pio0-4 */

		.mwdma_mask	= 0x07, /* mwdma0-2 */

		.pio_mask	= ATA_PIO4,

		.mwdma_mask	= ATA_MWDMA2,

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &piix_sata_ops,

	},
@@ -508,8 +508,8 @@ static struct ata_port_info piix_port_info[] = { 
	[ich6m_sata] =

	{

		.flags		= PIIX_SATA_FLAGS,

		.pio_mask	= 0x1f,	/* pio0-4 */

		.mwdma_mask	= 0x07, /* mwdma0-2 */

		.pio_mask	= ATA_PIO4,

		.mwdma_mask	= ATA_MWDMA2,

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &piix_sata_ops,

	},
@@ -517,8 +517,8 @@ static struct ata_port_info piix_port_info[] = { 
	[ich8_sata] =

	{

		.flags		= PIIX_SATA_FLAGS | PIIX_FLAG_SIDPR,

		.pio_mask	= 0x1f,	/* pio0-4 */

		.mwdma_mask	= 0x07, /* mwdma0-2 */

		.pio_mask	= ATA_PIO4,

		.mwdma_mask	= ATA_MWDMA2,

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &piix_sata_ops,

	},
@@ -526,8 +526,8 @@ static struct ata_port_info piix_port_info[] = { 
	[ich8_2port_sata] =

	{

		.flags		= PIIX_SATA_FLAGS | PIIX_FLAG_SIDPR,

		.pio_mask	= 0x1f,	/* pio0-4 */

		.mwdma_mask	= 0x07, /* mwdma0-2 */

		.pio_mask	= ATA_PIO4,

		.mwdma_mask	= ATA_MWDMA2,

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &piix_sata_ops,

	},
@@ -535,8 +535,8 @@ static struct ata_port_info piix_port_info[] = { 
	[tolapai_sata] =

	{

		.flags		= PIIX_SATA_FLAGS,

		.pio_mask	= 0x1f,	/* pio0-4 */

		.mwdma_mask	= 0x07, /* mwdma0-2 */

		.pio_mask	= ATA_PIO4,

		.mwdma_mask	= ATA_MWDMA2,

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &piix_sata_ops,

	},
@@ -544,8 +544,8 @@ static struct ata_port_info piix_port_info[] = { 
	[ich8m_apple_sata] =

	{

		.flags		= PIIX_SATA_FLAGS,

		.pio_mask	= 0x1f,	/* pio0-4 */

		.mwdma_mask	= 0x07, /* mwdma0-2 */

		.pio_mask	= ATA_PIO4,

		.mwdma_mask	= ATA_MWDMA2,

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &piix_sata_ops,

	},
@@ -553,9 +553,9 @@ static struct ata_port_info piix_port_info[] = { 
	[piix_pata_vmw] =

	{

		.flags		= PIIX_PATA_FLAGS,

		.pio_mask	= 0x1f,	/* pio0-4 */

		.mwdma_mask	= 0x06, /* mwdma1-2 ?? CHECK 0 should be ok but slow */

		.udma_mask	= ATA_UDMA_MASK_40C,

		.pio_mask	= ATA_PIO4,

		.mwdma_mask	= ATA_MWDMA12_ONLY, /* mwdma1-2 ?? CHECK 0 should be ok but slow */

		.udma_mask	= ATA_UDMA2,

		.port_ops	= &piix_vmw_ops,

	},

drivers/ata/libata-core.c

+12 −2
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 
#include <linux/scatterlist.h>

#include <linux/io.h>

#include <linux/async.h>

#include <linux/log2.h>

#include <scsi/scsi.h>

#include <scsi/scsi_cmnd.h>

#include <scsi/scsi_host.h>
@@ -2389,6 +2390,7 @@ int ata_dev_configure(struct ata_device *dev) 
	dev->cylinders = 0;

	dev->heads = 0;

	dev->sectors = 0;

	dev->multi_count = 0;



	/*

	 * common ATA, ATAPI feature tests
@@ -2426,8 +2428,15 @@ int ata_dev_configure(struct ata_device *dev) 


		dev->n_sectors = ata_id_n_sectors(id);



		if (dev->id[59] & 0x100)

			dev->multi_count = dev->id[59] & 0xff;

		/* get current R/W Multiple count setting */

		if ((dev->id[47] >> 8) == 0x80 && (dev->id[59] & 0x100)) {

			unsigned int max = dev->id[47] & 0xff;

			unsigned int cnt = dev->id[59] & 0xff;

			/* only recognize/allow powers of two here */

			if (is_power_of_2(max) && is_power_of_2(cnt))

				if (cnt <= max)

					dev->multi_count = cnt;

		}



		if (ata_id_has_lba(id)) {

			const char *lba_desc;
@@ -6709,6 +6718,7 @@ EXPORT_SYMBOL_GPL(ata_id_c_string); 
EXPORT_SYMBOL_GPL(ata_do_dev_read_id);

EXPORT_SYMBOL_GPL(ata_scsi_simulate);



EXPORT_SYMBOL_GPL(ata_pio_queue_task);

EXPORT_SYMBOL_GPL(ata_pio_need_iordy);

EXPORT_SYMBOL_GPL(ata_timing_find_mode);

EXPORT_SYMBOL_GPL(ata_timing_compute);

drivers/ata/libata-eh.c

+17 −2
Original line number Diff line number Diff line
@@ -547,7 +547,7 @@ void ata_scsi_error(struct Scsi_Host *host) 


	/* For new EH, all qcs are finished in one of three ways -

	 * normal completion, error completion, and SCSI timeout.

	 * Both cmpletions can race against SCSI timeout.  When normal

	 * Both completions can race against SCSI timeout.  When normal

	 * completion wins, the qc never reaches EH.  When error

	 * completion wins, the qc has ATA_QCFLAG_FAILED set.

	 *
@@ -563,6 +563,18 @@ void ata_scsi_error(struct Scsi_Host *host) 


		spin_lock_irqsave(ap->lock, flags);

		

		/* This must occur under the ap->lock as we don't want

		   a polled recovery to race the real interrupt handler

		   

		   The lost_interrupt handler checks for any completed but

		   non-notified command and completes much like an IRQ handler.

		   

		   We then fall into the error recovery code which will treat

		   this as if normal completion won the race */



		if (ap->ops->lost_interrupt)

			ap->ops->lost_interrupt(ap);

			

		list_for_each_entry_safe(scmd, tmp, &host->eh_cmd_q, eh_entry) {

			struct ata_queued_cmd *qc;
@@ -607,6 +619,9 @@ void ata_scsi_error(struct Scsi_Host *host) 
	} else

		spin_unlock_wait(ap->lock);

		

	/* If we timed raced normal completion and there is nothing to

	   recover nr_timedout == 0 why exactly are we doing error recovery ? */



 repeat:

	/* invoke error handler */

	if (ap->ops->error_handler) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE