Commit 8f754468 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:
  libata: ahci_start_engine compliant to AHCI spec
  ata: pata_at91.c bugfix for initial_timing initialisation
  ata: pata_at91.c bugfix for high master clock
  ahci: AHCI-mode SATA patch for Intel Panther Point DeviceIDs
  ata_piix: IDE-mode SATA patch for Intel Panther Point DeviceIDs
  libata: Pioneer DVR-216D can't do SETXFER
  ahci: don't enable port irq before handler is registered
  libata: Implement ATA_FLAG_NO_DIPM and apply it to mcp65
  libata: Kill unused ATA_DFLAG_{H|D}IPM flags
  ahci: EM supported message type sysfs attribute
parents 1f91f48b 270dac35

drivers/ata/ahci.c

+7 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ static const struct ata_port_info ahci_port_info[] = { 
	{

		AHCI_HFLAGS	(AHCI_HFLAG_NO_FPDMA_AA | AHCI_HFLAG_NO_PMP |

				 AHCI_HFLAG_YES_NCQ),

		.flags		= AHCI_FLAG_COMMON,

		.flags		= AHCI_FLAG_COMMON | ATA_FLAG_NO_DIPM,

		.pio_mask	= ATA_PIO4,

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &ahci_ops,
@@ -261,6 +261,12 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	{ PCI_VDEVICE(INTEL, 0x1d06), board_ahci }, /* PBG RAID */

	{ PCI_VDEVICE(INTEL, 0x2826), board_ahci }, /* PBG RAID */

	{ PCI_VDEVICE(INTEL, 0x2323), board_ahci }, /* DH89xxCC AHCI */

	{ PCI_VDEVICE(INTEL, 0x1e02), board_ahci }, /* Panther Point AHCI */

	{ PCI_VDEVICE(INTEL, 0x1e03), board_ahci }, /* Panther Point AHCI */

	{ PCI_VDEVICE(INTEL, 0x1e04), board_ahci }, /* Panther Point RAID */

	{ PCI_VDEVICE(INTEL, 0x1e05), board_ahci }, /* Panther Point RAID */

	{ PCI_VDEVICE(INTEL, 0x1e06), board_ahci }, /* Panther Point RAID */

	{ PCI_VDEVICE(INTEL, 0x1e07), board_ahci }, /* Panther Point 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,

drivers/ata/ahci.h

+4 −0
Original line number Diff line number Diff line
@@ -229,6 +229,10 @@ enum { 
	EM_CTL_ALHD		= (1 << 26), /* Activity LED */

	EM_CTL_XMT		= (1 << 25), /* Transmit Only */

	EM_CTL_SMB		= (1 << 24), /* Single Message Buffer */

	EM_CTL_SGPIO		= (1 << 19), /* SGPIO messages supported */

	EM_CTL_SES		= (1 << 18), /* SES-2 messages supported */

	EM_CTL_SAFTE		= (1 << 17), /* SAF-TE messages supported */

	EM_CTL_LED		= (1 << 16), /* LED messages supported */



	/* em message type */

	EM_MSG_TYPE_LED		= (1 << 0), /* LED */

drivers/ata/ata_piix.c

+8 −0
Original line number Diff line number Diff line
@@ -309,6 +309,14 @@ static const struct pci_device_id piix_pci_tbl[] = { 
	{ 0x8086, 0x1d00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },

	/* SATA Controller IDE (PBG) */

	{ 0x8086, 0x1d08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },

	/* SATA Controller IDE (Panther Point) */

	{ 0x8086, 0x1e00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },

	/* SATA Controller IDE (Panther Point) */

	{ 0x8086, 0x1e01, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },

	/* SATA Controller IDE (Panther Point) */

	{ 0x8086, 0x1e08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },

	/* SATA Controller IDE (Panther Point) */

	{ 0x8086, 0x1e09, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },

	{ }	/* terminate list */

};

drivers/ata/libahci.c

+58 −2
Original line number Diff line number Diff line
@@ -109,6 +109,8 @@ static ssize_t ahci_read_em_buffer(struct device *dev, 
static ssize_t ahci_store_em_buffer(struct device *dev,

				    struct device_attribute *attr,

				    const char *buf, size_t size);

static ssize_t ahci_show_em_supported(struct device *dev,

				      struct device_attribute *attr, char *buf);



static DEVICE_ATTR(ahci_host_caps, S_IRUGO, ahci_show_host_caps, NULL);

static DEVICE_ATTR(ahci_host_cap2, S_IRUGO, ahci_show_host_cap2, NULL);
@@ -116,6 +118,7 @@ static DEVICE_ATTR(ahci_host_version, S_IRUGO, ahci_show_host_version, NULL); 
static DEVICE_ATTR(ahci_port_cmd, S_IRUGO, ahci_show_port_cmd, NULL);

static DEVICE_ATTR(em_buffer, S_IWUSR | S_IRUGO,

		   ahci_read_em_buffer, ahci_store_em_buffer);

static DEVICE_ATTR(em_message_supported, S_IRUGO, ahci_show_em_supported, NULL);



struct device_attribute *ahci_shost_attrs[] = {

	&dev_attr_link_power_management_policy,
@@ -126,6 +129,7 @@ struct device_attribute *ahci_shost_attrs[] = { 
	&dev_attr_ahci_host_version,

	&dev_attr_ahci_port_cmd,

	&dev_attr_em_buffer,

	&dev_attr_em_message_supported,

	NULL

};

EXPORT_SYMBOL_GPL(ahci_shost_attrs);
@@ -343,6 +347,24 @@ static ssize_t ahci_store_em_buffer(struct device *dev, 
	return size;

}



static ssize_t ahci_show_em_supported(struct device *dev,

				      struct device_attribute *attr, char *buf)

{

	struct Scsi_Host *shost = class_to_shost(dev);

	struct ata_port *ap = ata_shost_to_port(shost);

	struct ahci_host_priv *hpriv = ap->host->private_data;

	void __iomem *mmio = hpriv->mmio;

	u32 em_ctl;



	em_ctl = readl(mmio + HOST_EM_CTL);



	return sprintf(buf, "%s%s%s%s\n",

		       em_ctl & EM_CTL_LED ? "led " : "",

		       em_ctl & EM_CTL_SAFTE ? "saf-te " : "",

		       em_ctl & EM_CTL_SES ? "ses-2 " : "",

		       em_ctl & EM_CTL_SGPIO ? "sgpio " : "");

}



/**

 *	ahci_save_initial_config - Save and fixup initial config values

 *	@dev: target AHCI device
@@ -539,6 +561,27 @@ void ahci_start_engine(struct ata_port *ap) 
{

	void __iomem *port_mmio = ahci_port_base(ap);

	u32 tmp;

	u8 status;



	status = readl(port_mmio + PORT_TFDATA) & 0xFF;



	/*

	 * At end of section 10.1 of AHCI spec (rev 1.3), it states

	 * Software shall not set PxCMD.ST to 1 until it is determined

	 * that a functoinal device is present on the port as determined by

	 * PxTFD.STS.BSY=0, PxTFD.STS.DRQ=0 and PxSSTS.DET=3h

	 *

	 * Even though most AHCI host controllers work without this check,

	 * specific controller will fail under this condition

	 */

	if (status & (ATA_BUSY | ATA_DRQ))

		return;

	else {

		ahci_scr_read(&ap->link, SCR_STATUS, &tmp);



		if ((tmp & 0xf) != 0x3)

			return;

	}



	/* start DMA */

	tmp = readl(port_mmio + PORT_CMD);
@@ -1897,6 +1940,16 @@ static void ahci_pmp_attach(struct ata_port *ap) 
	ahci_enable_fbs(ap);



	pp->intr_mask |= PORT_IRQ_BAD_PMP;



	/*

	 * We must not change the port interrupt mask register if the

	 * port is marked frozen, the value in pp->intr_mask will be

	 * restored later when the port is thawed.

	 *

	 * Note that during initialization, the port is marked as

	 * frozen since the irq handler is not yet registered.

	 */

	if (!(ap->pflags & ATA_PFLAG_FROZEN))

		writel(pp->intr_mask, port_mmio + PORT_IRQ_MASK);

}
@@ -1913,6 +1966,9 @@ static void ahci_pmp_detach(struct ata_port *ap) 
	writel(cmd, port_mmio + PORT_CMD);



	pp->intr_mask &= ~PORT_IRQ_BAD_PMP;



	/* see comment above in ahci_pmp_attach() */

	if (!(ap->pflags & ATA_PFLAG_FROZEN))

		writel(pp->intr_mask, port_mmio + PORT_IRQ_MASK);

}

drivers/ata/libata-core.c

+2 −1
Original line number Diff line number Diff line
@@ -4139,6 +4139,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { 
	 */

	{ "PIONEER DVD-RW  DVRTD08",	"1.00",	ATA_HORKAGE_NOSETXFER },

	{ "PIONEER DVD-RW  DVR-212D",	"1.28", ATA_HORKAGE_NOSETXFER },

	{ "PIONEER DVD-RW  DVR-216D",	"1.08", ATA_HORKAGE_NOSETXFER },



	/* End Marker */

	{ }
@@ -5480,7 +5481,7 @@ struct ata_port *ata_port_alloc(struct ata_host *host) 
	if (!ap)

		return NULL;



	ap->pflags |= ATA_PFLAG_INITIALIZING;

	ap->pflags |= ATA_PFLAG_INITIALIZING | ATA_PFLAG_FROZEN;

	ap->lock = &host->lock;

	ap->print_id = -1;

	ap->host = host;

CRA Git | Maintained and supported by SUSTech CRA and CCSE