Commit 5a0a6a4f authored by Tejun Heo's avatar Tejun Heo
Browse files

Merge branch 'libata/for-3.10-fixes' into libata/for-3.11 



libata/for-3.10-fixes never got submitted during v3.10 cycle.  Merge
it into for-3.11 so that it can be routed together with other changes
scheduled for v3.11.

Three trivial conflicts in drivers/ata/sata_rcar.c.  All are caused by
1b20f6a9 ("sata_rcar: add 'base' local variable to some functions")
conflicting with logic updates in for-3.10-fixes.  The offending
commit simply adds local variable @base on functions which
dereferences sata_rcar_priv->base multiple times.  The resolutions are
trivial - applying s/priv->base/base/ in the conflicting logic
updates.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parents 9bbb1b0e 1cfc7df3

drivers/ata/acard-ahci.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ 
/*

/*

 *  acard-ahci.c - ACard AHCI SATA support

 *  acard-ahci.c - ACard AHCI SATA support

 *

 *

 *  Maintained by:  Jeff Garzik <jgarzik@pobox.com>

 *  Maintained by:  Tejun Heo <tj@kernel.org>

 *		    Please ALWAYS copy linux-ide@vger.kernel.org

 *		    Please ALWAYS copy linux-ide@vger.kernel.org

 *		    on emails.

 *		    on emails.

 *

 *

drivers/ata/ahci.c

+4 −1
Original line number Original line Diff line number Diff line 
/*

/*

 *  ahci.c - AHCI SATA support

 *  ahci.c - AHCI SATA support

 *

 *

 *  Maintained by:  Jeff Garzik <jgarzik@pobox.com>

 *  Maintained by:  Tejun Heo <tj@kernel.org>

 *    		    Please ALWAYS copy linux-ide@vger.kernel.org

 *    		    Please ALWAYS copy linux-ide@vger.kernel.org

 *		    on emails.

 *		    on emails.

 *

 *
@@ -291,6 +291,7 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	{ PCI_VDEVICE(INTEL, 0x8d64), board_ahci }, /* Wellsburg RAID */

	{ PCI_VDEVICE(INTEL, 0x8d64), board_ahci }, /* Wellsburg RAID */

	{ PCI_VDEVICE(INTEL, 0x8d66), board_ahci }, /* Wellsburg RAID */

	{ PCI_VDEVICE(INTEL, 0x8d66), board_ahci }, /* Wellsburg RAID */

	{ PCI_VDEVICE(INTEL, 0x8d6e), board_ahci }, /* Wellsburg RAID */

	{ PCI_VDEVICE(INTEL, 0x8d6e), board_ahci }, /* Wellsburg RAID */

	{ PCI_VDEVICE(INTEL, 0x23a3), board_ahci }, /* Coleto Creek AHCI */





	/* JMicron 360/1/3/5/6, match class to avoid IDE function */

	/* JMicron 360/1/3/5/6, match class to avoid IDE function */

	{ PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,

	{ PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
@@ -423,6 +424,8 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	  .driver_data = board_ahci_yes_fbs },			/* 88se9125 */

	  .driver_data = board_ahci_yes_fbs },			/* 88se9125 */

	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x917a),

	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x917a),

	  .driver_data = board_ahci_yes_fbs },			/* 88se9172 */

	  .driver_data = board_ahci_yes_fbs },			/* 88se9172 */

	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9172),

	  .driver_data = board_ahci_yes_fbs },			/* 88se9172 */

	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9192),

	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9192),

	  .driver_data = board_ahci_yes_fbs },			/* 88se9172 on some Gigabyte */

	  .driver_data = board_ahci_yes_fbs },			/* 88se9172 on some Gigabyte */

	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x91a3),

	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x91a3),

drivers/ata/ahci.h

+1 −1
Original line number Original line Diff line number Diff line 
/*

/*

 *  ahci.h - Common AHCI SATA definitions and declarations

 *  ahci.h - Common AHCI SATA definitions and declarations

 *

 *

 *  Maintained by:  Jeff Garzik <jgarzik@pobox.com>

 *  Maintained by:  Tejun Heo <tj@kernel.org>

 *    		    Please ALWAYS copy linux-ide@vger.kernel.org

 *    		    Please ALWAYS copy linux-ide@vger.kernel.org

 *		    on emails.

 *		    on emails.

 *

 *

drivers/ata/ata_piix.c

+18 −1
Original line number Original line Diff line number Diff line 
/*

/*

 *    ata_piix.c - Intel PATA/SATA controllers

 *    ata_piix.c - Intel PATA/SATA controllers

 *

 *

 *    Maintained by:  Jeff Garzik <jgarzik@pobox.com>

 *    Maintained by:  Tejun Heo <tj@kernel.org>

 *    		    Please ALWAYS copy linux-ide@vger.kernel.org

 *    		    Please ALWAYS copy linux-ide@vger.kernel.org

 *		    on emails.

 *		    on emails.

 *

 *
@@ -151,6 +151,7 @@ enum piix_controller_ids { 
	piix_pata_vmw,			/* PIIX4 for VMware, spurious DMA_ERR */

	piix_pata_vmw,			/* PIIX4 for VMware, spurious DMA_ERR */

	ich8_sata_snb,

	ich8_sata_snb,

	ich8_2port_sata_snb,

	ich8_2port_sata_snb,

	ich8_2port_sata_byt,

};

};





struct piix_map_db {

struct piix_map_db {
@@ -334,6 +335,11 @@ static const struct pci_device_id piix_pci_tbl[] = { 
	{ 0x8086, 0x8d60, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },

	{ 0x8086, 0x8d60, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },

	/* SATA Controller IDE (Wellsburg) */

	/* SATA Controller IDE (Wellsburg) */

	{ 0x8086, 0x8d68, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },

	{ 0x8086, 0x8d68, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },

	/* SATA Controller IDE (BayTrail) */

	{ 0x8086, 0x0F20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata_byt },

	{ 0x8086, 0x0F21, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata_byt },

	/* SATA Controller IDE (Coleto Creek) */

	{ 0x8086, 0x23a6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },





	{ }	/* terminate list */

	{ }	/* terminate list */

};

};
@@ -441,6 +447,7 @@ static const struct piix_map_db *piix_map_db_table[] = { 
	[tolapai_sata]		= &tolapai_map_db,

	[tolapai_sata]		= &tolapai_map_db,

	[ich8_sata_snb]		= &ich8_map_db,

	[ich8_sata_snb]		= &ich8_map_db,

	[ich8_2port_sata_snb]	= &ich8_2port_map_db,

	[ich8_2port_sata_snb]	= &ich8_2port_map_db,

	[ich8_2port_sata_byt]	= &ich8_2port_map_db,

};

};





static struct pci_bits piix_enable_bits[] = {

static struct pci_bits piix_enable_bits[] = {
@@ -1254,6 +1261,16 @@ static struct ata_port_info piix_port_info[] = { 
		.udma_mask	= ATA_UDMA6,

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &piix_sata_ops,

		.port_ops	= &piix_sata_ops,

	},

	},



	[ich8_2port_sata_byt] =

	{

		.flags          = PIIX_SATA_FLAGS | PIIX_FLAG_SIDPR | PIIX_FLAG_PIO16,

		.pio_mask       = ATA_PIO4,

		.mwdma_mask     = ATA_MWDMA2,

		.udma_mask      = ATA_UDMA6,

		.port_ops       = &piix_sata_ops,

	},



};

};





#define AHCI_PCI_BAR 5

#define AHCI_PCI_BAR 5

drivers/ata/libahci.c

+2 −3
Original line number Original line Diff line number Diff line 
/*

/*

 *  libahci.c - Common AHCI SATA low-level routines

 *  libahci.c - Common AHCI SATA low-level routines

 *

 *

 *  Maintained by:  Jeff Garzik <jgarzik@pobox.com>

 *  Maintained by:  Tejun Heo <tj@kernel.org>

 *    		    Please ALWAYS copy linux-ide@vger.kernel.org

 *    		    Please ALWAYS copy linux-ide@vger.kernel.org

 *		    on emails.

 *		    on emails.

 *

 *
@@ -1561,8 +1561,7 @@ static void ahci_error_intr(struct ata_port *ap, u32 irq_stat) 
		u32 fbs = readl(port_mmio + PORT_FBS);

		u32 fbs = readl(port_mmio + PORT_FBS);

		int pmp = fbs >> PORT_FBS_DWE_OFFSET;

		int pmp = fbs >> PORT_FBS_DWE_OFFSET;





		if ((fbs & PORT_FBS_SDE) && (pmp < ap->nr_pmp_links) &&

		if ((fbs & PORT_FBS_SDE) && (pmp < ap->nr_pmp_links)) {

		    ata_link_online(&ap->pmp_link[pmp])) {

			link = &ap->pmp_link[pmp];

			link = &ap->pmp_link[pmp];

			fbs_need_dec = true;

			fbs_need_dec = true;

		}

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE