Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e228c1b5 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: RAID mode SATA patch for Intel Ibex Peak DeviceIDs
  pata_sil680: remove duplicate pcim_enable_device
  libata-sff: kill spurious WARN_ON() in ata_hsm_move()
  sata_nv: disable hardreset for generic
  ahci: disable PMP for marvell ahcis
  sata_mv: add RocketRaid 1720 PCI ID to driver
  ahci, pata_marvell: play nicely together
parents a46add72 8e48b6b3

drivers/ata/Kconfig

+4 −2
Original line number Diff line number Diff line
@@ -448,8 +448,10 @@ config PATA_MARVELL 
	tristate "Marvell PATA support via legacy mode"

	depends on PCI

	help

	  This option enables limited support for the Marvell 88SE6145 ATA

	  controller.

	  This option enables limited support for the Marvell 88SE61xx ATA

	  controllers. If you wish to use only the SATA ports then select

	  the AHCI driver alone. If you wish to the use the PATA port or

	  both SATA and PATA include this driver.



	  If unsure, say N.

drivers/ata/ahci.c

+20 −1
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ static const struct ata_port_info ahci_port_info[] = { 
	/* board_ahci_mv */

	{

		AHCI_HFLAGS	(AHCI_HFLAG_NO_NCQ | AHCI_HFLAG_NO_MSI |

				 AHCI_HFLAG_MV_PATA),

				 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 */
@@ -487,7 +487,9 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	{ PCI_VDEVICE(INTEL, 0x3a05), board_ahci }, /* ICH10 */

	{ PCI_VDEVICE(INTEL, 0x3a25), board_ahci }, /* ICH10 */

	{ PCI_VDEVICE(INTEL, 0x3b24), board_ahci }, /* PCH RAID */

	{ PCI_VDEVICE(INTEL, 0x3b25), board_ahci }, /* PCH RAID */

	{ PCI_VDEVICE(INTEL, 0x3b2b), board_ahci }, /* PCH RAID */

	{ PCI_VDEVICE(INTEL, 0x3b2c), board_ahci }, /* PCH RAID */



	/* 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,
@@ -610,6 +612,15 @@ module_param(ahci_em_messages, int, 0444); 
MODULE_PARM_DESC(ahci_em_messages,

	"Set AHCI Enclosure Management Message type (0 = disabled, 1 = LED");



#if defined(CONFIG_PATA_MARVELL) || defined(CONFIG_PATA_MARVELL_MODULE)

static int marvell_enable;

#else

static int marvell_enable = 1;

#endif

module_param(marvell_enable, int, 0644);

MODULE_PARM_DESC(marvell_enable, "Marvell SATA via AHCI (1 = enabled)");





static inline int ahci_nr_ports(u32 cap)

{

	return (cap & 0x1f) + 1;
@@ -732,6 +743,8 @@ static void ahci_save_initial_config(struct pci_dev *pdev, 
			   "MV_AHCI HACK: port_map %x -> %x\n",

			   port_map,

			   port_map & mv);

		dev_printk(KERN_ERR, &pdev->dev,

			  "Disabling your PATA port. Use the boot option 'ahci.marvell_enable=0' to avoid this.\n");



		port_map &= mv;

	}
@@ -2533,6 +2546,12 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (!printed_version++)

		dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");



	/* The AHCI driver can only drive the SATA ports, the PATA driver

	   can drive them all so if both drivers are selected make sure

	   AHCI stays out of the way */

	if (pdev->vendor == PCI_VENDOR_ID_MARVELL && !marvell_enable)

		return -ENODEV;



	/* acquire resources */

	rc = pcim_enable_device(pdev);

	if (rc)

drivers/ata/libata-sff.c

+0 −5
Original line number Diff line number Diff line
@@ -1315,11 +1315,6 @@ int ata_sff_hsm_move(struct ata_port *ap, struct ata_queued_cmd *qc, 
		break;



	case HSM_ST_ERR:

		/* make sure qc->err_mask is available to

		 * know what's wrong and recover

		 */

		WARN_ON(!(qc->err_mask & (AC_ERR_DEV | AC_ERR_HSM)));



		ap->hsm_task_state = HSM_ST_IDLE;



		/* complete taskfile transaction */

drivers/ata/pata_marvell.c

+38 −13
Original line number Diff line number Diff line
@@ -20,29 +20,30 @@ 
#include <linux/ata.h>



#define DRV_NAME	"pata_marvell"

#define DRV_VERSION	"0.1.4"

#define DRV_VERSION	"0.1.6"



/**

 *	marvell_pre_reset	-	check for 40/80 pin

 *	@link: link

 *	@deadline: deadline jiffies for the operation

 *	marvell_pata_active	-	check if PATA is active

 *	@pdev: PCI device

 *

 *	Perform the PATA port setup we need.

 *	Returns 1 if the PATA port may be active. We know how to check this

 *	for the 6145 but not the other devices

 */



static int marvell_pre_reset(struct ata_link *link, unsigned long deadline)

static int marvell_pata_active(struct pci_dev *pdev)

{

	struct ata_port *ap = link->ap;

	struct pci_dev *pdev = to_pci_dev(ap->host->dev);

	int i;

	u32 devices;

	void __iomem *barp;

	int i;



	/* Check if our port is enabled */

	/* We don't yet know how to do this for other devices */

	if (pdev->device != 0x6145)

		return 1;	



	barp = pci_iomap(pdev, 5, 0x10);

	if (barp == NULL)

		return -ENOMEM;



	printk("BAR5:");

	for(i = 0; i <= 0x0F; i++)

		printk("%02X:%02X ", i, ioread8(barp + i));
@@ -51,8 +52,26 @@ static int marvell_pre_reset(struct ata_link *link, unsigned long deadline) 
	devices = ioread32(barp + 0x0C);

	pci_iounmap(pdev, barp);



	if ((pdev->device == 0x6145) && (ap->port_no == 0) &&

	    (!(devices & 0x10)))	/* PATA enable ? */

	if (devices & 0x10)

		return 1;

	return 0;

}



/**

 *	marvell_pre_reset	-	check for 40/80 pin

 *	@link: link

 *	@deadline: deadline jiffies for the operation

 *

 *	Perform the PATA port setup we need.

 */



static int marvell_pre_reset(struct ata_link *link, unsigned long deadline)

{

	struct ata_port *ap = link->ap;

	struct pci_dev *pdev = to_pci_dev(ap->host->dev);



	if (pdev->device == 0x6145 && ap->port_no == 0 &&

		!marvell_pata_active(pdev))	/* PATA enable ? */

			return -ENOENT;



	return ata_sff_prereset(link, deadline);
@@ -128,6 +147,12 @@ static int marvell_init_one (struct pci_dev *pdev, const struct pci_device_id *i 
	if (pdev->device == 0x6101)

		ppi[1] = &ata_dummy_port_info;



#if defined(CONFIG_AHCI) || defined(CONFIG_AHCI_MODULE)

	if (!marvell_pata_active(pdev)) {

		printk(KERN_INFO DRV_NAME ": PATA port not active, deferring to AHCI driver.\n");

		return -ENODEV;

	}

#endif

	return ata_pci_sff_init_one(pdev, ppi, &marvell_sht, NULL);

}

drivers/ata/pata_sil680.c

+0 −3
Original line number Diff line number Diff line
@@ -322,9 +322,6 @@ static int __devinit sil680_init_one(struct pci_dev *pdev, 
	/* Try to acquire MMIO resources and fallback to PIO if

	 * that fails

	 */

	rc = pcim_enable_device(pdev);

	if (rc)

		return rc;

	rc = pcim_iomap_regions(pdev, 1 << SIL680_MMIO_BAR, DRV_NAME);

	if (rc)

		goto use_ioports;