Commit 61ac7bf5 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:
  ahci: change the Device IDs of nvidia MCP7B AHCI controller in ahci.c
  [libata] sata_fsl: Fix broken driver, add port multiplier (PMP) support
  libata: SRST can't be trusted on PMP sil3726
  libata: fix libata-scsi kernel-doc notation
  ata: Convert to static DEFINE_SPINLOCK(lock)
  ata_piix: fix macbook ich8m problems
  sata_mv: implement SoC guideline SATA_S11
  sata_mv: workaround for 60x1 errata sata13
  sata_mv: nuke unreleased GenIIe revisions
  sata_mv: PHY_MODEx errata fixes
  sata_mv: move SOC_FLAG to hpriv
parents 14d03fd9 3072c379

drivers/ata/ahci.c

+4 −4
Original line number Diff line number Diff line
@@ -502,10 +502,10 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	{ PCI_VDEVICE(NVIDIA, 0x0bcd), board_ahci },		/* MCP7B */

	{ PCI_VDEVICE(NVIDIA, 0x0bce), board_ahci },		/* MCP7B */

	{ PCI_VDEVICE(NVIDIA, 0x0bcf), board_ahci },		/* MCP7B */

	{ PCI_VDEVICE(NVIDIA, 0x0bd0), board_ahci },		/* MCP7B */

	{ PCI_VDEVICE(NVIDIA, 0x0bd1), board_ahci },		/* MCP7B */

	{ PCI_VDEVICE(NVIDIA, 0x0bd2), board_ahci },		/* MCP7B */

	{ PCI_VDEVICE(NVIDIA, 0x0bd3), board_ahci },		/* MCP7B */

	{ PCI_VDEVICE(NVIDIA, 0x0bc4), board_ahci },		/* MCP7B */

	{ PCI_VDEVICE(NVIDIA, 0x0bc5), board_ahci },		/* MCP7B */

	{ PCI_VDEVICE(NVIDIA, 0x0bc6), board_ahci },		/* MCP7B */

	{ PCI_VDEVICE(NVIDIA, 0x0bc7), board_ahci },		/* MCP7B */



	/* SiS */

	{ PCI_VDEVICE(SI, 0x1184), board_ahci }, /* SiS 966 */

drivers/ata/ata_piix.c

+4 −3
Original line number Diff line number Diff line
@@ -247,10 +247,11 @@ static const struct pci_device_id piix_pci_tbl[] = { 
	{ 0x8086, 0x2820, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },

	/* SATA Controller 2 IDE (ICH8) */

	{ 0x8086, 0x2825, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },

	/* Mobile SATA Controller IDE (ICH8M) */

	{ 0x8086, 0x2828, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },

	/* Mobile SATA Controller IDE (ICH8M), Apple */

	{ 0x8086, 0x2828, 0x106b, 0x00a0, 0, 0, ich8m_apple_sata },

	{ 0x8086, 0x2828, 0x106b, 0x00a1, 0, 0, ich8m_apple_sata },

	/* Mobile SATA Controller IDE (ICH8M) */

	{ 0x8086, 0x2828, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },

	/* SATA Controller IDE (ICH9) */

	{ 0x8086, 0x2920, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },

	/* SATA Controller IDE (ICH9) */
@@ -526,7 +527,7 @@ static struct ata_port_info piix_port_info[] = { 


	[ich8m_apple_sata] =

	{

		.flags		= PIIX_SATA_FLAGS | PIIX_FLAG_SIDPR,

		.flags		= PIIX_SATA_FLAGS,

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

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

		.udma_mask	= ATA_UDMA6,

drivers/ata/libata-core.c

+1 −1
Original line number Diff line number Diff line
@@ -5403,7 +5403,7 @@ static void ata_host_stop(struct device *gendev, void *res) 
 */

static void ata_finalize_port_ops(struct ata_port_operations *ops)

{

	static spinlock_t lock = SPIN_LOCK_UNLOCKED;

	static DEFINE_SPINLOCK(lock);

	const struct ata_port_operations *cur;

	void **begin = (void **)ops;

	void **end = (void **)&ops->inherits;

drivers/ata/libata-pmp.c

+5 −2
Original line number Diff line number Diff line
@@ -322,9 +322,12 @@ static void sata_pmp_quirks(struct ata_port *ap) 
	if (vendor == 0x1095 && devid == 0x3726) {

		/* sil3726 quirks */

		ata_port_for_each_link(link, ap) {

			/* class code report is unreliable */

			/* Class code report is unreliable and SRST

			 * times out under certain configurations.

			 */

			if (link->pmp < 5)

				link->flags |= ATA_LFLAG_ASSUME_ATA;

				link->flags |= ATA_LFLAG_NO_SRST |

					       ATA_LFLAG_ASSUME_ATA;



			/* port 5 is for SEMB device and it doesn't like SRST */

			if (link->pmp == 5)

drivers/ata/libata-scsi.c

+2 −1
Original line number Diff line number Diff line
@@ -1637,6 +1637,7 @@ defer: 


/**

 *	ata_scsi_rbuf_get - Map response buffer.

 *	@cmd: SCSI command containing buffer to be mapped.

 *	@flags: unsigned long variable to store irq enable status

 *	@copy_in: copy in from user buffer

 *
@@ -1954,7 +1955,7 @@ static unsigned int ata_msense_ctl_mode(u8 *buf) 


/**

 *	ata_msense_rw_recovery - Simulate MODE SENSE r/w error recovery page

 *	@bufp: output buffer

 *	@buf: output buffer

 *

 *	Generate a generic MODE SENSE r/w error recovery page.

 *

CRA Git | Maintained and supported by SUSTech CRA and CCSE