Commit d6e6c48e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-3.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata 

Pull libata fixes from Tejun Heo:
 "Late libata fixes.

  The most important one is from Kevin Hao which makes sure that libata
  only allocates tags inside the max tag number the controller supports.
  libata always had this problem but the recent tag allocation change
  and addition of support for sata_fsl which only supports queue depth
  of 16 exposed the issue.

  Hans de Goede agreed to become the maintainer of libahci_platform
  which is under higher than usual development pressure from all the new
  controllers popping up from the ARM world"

* 'for-3.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  ahci: add support for the Promise FastTrak TX8660 SATA HBA (ahci mode)
  drivers/ata/pata_ep93xx.c: use signed int type for result of platform_get_irq()
  libata: EH should handle AMNF error condition as a media error
  libata: support the ata host which implements a queue depth less than 32
  MAINTAINERS: Add Hans de Goede as ahci-platform maintainer
parents 5b2b9d77 b32bfc06

MAINTAINERS

+10 −0
Original line number Diff line number Diff line
@@ -8019,6 +8019,16 @@ F: drivers/ata/ 
F:	include/linux/ata.h

F:	include/linux/libata.h



SERIAL ATA AHCI PLATFORM devices support

M:	Hans de Goede <hdegoede@redhat.com>

M:	Tejun Heo <tj@kernel.org>

L:	linux-ide@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git

S:	Supported

F:	drivers/ata/ahci_platform.c

F:	drivers/ata/libahci_platform.c

F:	include/linux/ahci_platform.h



SERVER ENGINES 10Gbps iSCSI - BladeEngine 2 DRIVER

M:	Jayamohan Kallickal <jayamohan.kallickal@emulex.com>

L:	linux-scsi@vger.kernel.org

drivers/ata/ahci.c

+1 −0
Original line number Diff line number Diff line
@@ -456,6 +456,7 @@ static const struct pci_device_id ahci_pci_tbl[] = { 


	/* Promise */

	{ PCI_VDEVICE(PROMISE, 0x3f20), board_ahci },	/* PDC42819 */

	{ PCI_VDEVICE(PROMISE, 0x3781), board_ahci },   /* FastTrak TX8660 ahci-mode */



	/* Asmedia */

	{ PCI_VDEVICE(ASMEDIA, 0x0601), board_ahci },	/* ASM1060 */

drivers/ata/libata-core.c

+19 −3
Original line number Diff line number Diff line
@@ -4787,6 +4787,10 @@ void swap_buf_le16(u16 *buf, unsigned int buf_words) 
 *	ata_qc_new - Request an available ATA command, for queueing

 *	@ap: target port

 *

 *	Some ATA host controllers may implement a queue depth which is less

 *	than ATA_MAX_QUEUE. So we shouldn't allocate a tag which is beyond

 *	the hardware limitation.

 *

 *	LOCKING:

 *	None.

 */
@@ -4794,14 +4798,16 @@ void swap_buf_le16(u16 *buf, unsigned int buf_words) 
static struct ata_queued_cmd *ata_qc_new(struct ata_port *ap)

{

	struct ata_queued_cmd *qc = NULL;

	unsigned int i, tag;

	unsigned int i, tag, max_queue;



	max_queue = ap->scsi_host->can_queue;



	/* no command while frozen */

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

		return NULL;



	for (i = 0; i < ATA_MAX_QUEUE; i++) {

		tag = (i + ap->last_tag + 1) % ATA_MAX_QUEUE;

	for (i = 0, tag = ap->last_tag + 1; i < max_queue; i++, tag++) {

		tag = tag < max_queue ? tag : 0;



		/* the last tag is reserved for internal command. */

		if (tag == ATA_TAG_INTERNAL)
@@ -6169,6 +6175,16 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht) 
{

	int i, rc;



	/*

	 * The max queue supported by hardware must not be greater than

	 * ATA_MAX_QUEUE.

	 */

	if (sht->can_queue > ATA_MAX_QUEUE) {

		dev_err(host->dev, "BUG: the hardware max queue is too large\n");

		WARN_ON(1);

		return -EINVAL;

	}



	/* host must have been started */

	if (!(host->flags & ATA_HOST_STARTED)) {

		dev_err(host->dev, "BUG: trying to register unstarted host\n");

drivers/ata/libata-eh.c

+5 −4
Original line number Diff line number Diff line
@@ -1811,7 +1811,7 @@ static unsigned int ata_eh_analyze_tf(struct ata_queued_cmd *qc, 
	case ATA_DEV_ATA:

		if (err & ATA_ICRC)

			qc->err_mask |= AC_ERR_ATA_BUS;

		if (err & ATA_UNC)

		if (err & (ATA_UNC | ATA_AMNF))

			qc->err_mask |= AC_ERR_MEDIA;

		if (err & ATA_IDNF)

			qc->err_mask |= AC_ERR_INVALID;
@@ -2556,11 +2556,12 @@ static void ata_eh_link_report(struct ata_link *link) 
		}



		if (cmd->command != ATA_CMD_PACKET &&

		    (res->feature & (ATA_ICRC | ATA_UNC | ATA_IDNF |

				     ATA_ABORTED)))

			ata_dev_err(qc->dev, "error: { %s%s%s%s}\n",

		    (res->feature & (ATA_ICRC | ATA_UNC | ATA_AMNF |

				     ATA_IDNF | ATA_ABORTED)))

			ata_dev_err(qc->dev, "error: { %s%s%s%s%s}\n",

			  res->feature & ATA_ICRC ? "ICRC " : "",

			  res->feature & ATA_UNC ? "UNC " : "",

			  res->feature & ATA_AMNF ? "AMNF " : "",

			  res->feature & ATA_IDNF ? "IDNF " : "",

			  res->feature & ATA_ABORTED ? "ABRT " : "");

#endif

drivers/ata/pata_ep93xx.c

+1 −1
Original line number Diff line number Diff line
@@ -915,7 +915,7 @@ static int ep93xx_pata_probe(struct platform_device *pdev) 
	struct ep93xx_pata_data *drv_data;

	struct ata_host *host;

	struct ata_port *ap;

	unsigned int irq;

	int irq;

	struct resource *mem_res;

	void __iomem *ide_base;

	int err;

CRA Git | Maintained and supported by SUSTech CRA and CCSE