Commit 4e8790f7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull libata changes from Tejun Heo:
 "The only interesting piece is the support for shingled drives.  The
  changes in libata layer are minimal.  All it does is identifying the
  new class of device and report upwards accordingly"

* 'for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  libata: Remove FIXME comment in atapi_request_sense()
  sata_rcar: Document deprecated "renesas,rcar-sata"
  sata_rcar: Add clocks to sata_rcar bindings
  ahci_sunxi: Make AHCI_HFLAG_NO_PMP flag configurable with a module option
  libata-scsi: Update SATL for ZAC drives
  libata: Implement ATA_DEV_ZAC
  libsas: use ata_dev_classify()
parents 0a27044c 2ba520f0

Documentation/devicetree/bindings/ata/sata_rcar.txt

+7 −4
Original line number Diff line number Diff line
@@ -3,18 +3,21 @@ 
Required properties:

- compatible		: should contain one of the following:

			  - "renesas,sata-r8a7779" for R-Car H1

			    ("renesas,rcar-sata" is deprecated)

			  - "renesas,sata-r8a7790-es1" for R-Car H2 ES1

			  - "renesas,sata-r8a7790" for R-Car H2 other than ES1

			  - "renesas,sata-r8a7791" for R-Car M2-W

			  - "renesas,sata-r8a7793" for R-Car M2-N

- reg			: address and length of the SATA registers;

- interrupts		: must consist of one interrupt specifier.

- clocks		: must contain a reference to the functional clock.



Example:



sata: sata@fc600000 {

	compatible = "renesas,sata-r8a7779";

	reg = <0xfc600000 0x2000>;

sata0: sata@ee300000 {

	compatible = "renesas,sata-r8a7791";

	reg = <0 0xee300000 0 0x2000>;

	interrupt-parent = <&gic>;

	interrupts = <0 100 IRQ_TYPE_LEVEL_HIGH>;

	interrupts = <0 105 IRQ_TYPE_LEVEL_HIGH>;

	clocks = <&mstp8_clks R8A7791_CLK_SATA0>;

};

drivers/ata/ahci_sunxi.c

+15 −1
Original line number Diff line number Diff line
@@ -27,6 +27,12 @@ 
#include <linux/regulator/consumer.h>

#include "ahci.h"



/* Insmod parameters */

static bool enable_pmp;

module_param(enable_pmp, bool, 0);

MODULE_PARM_DESC(enable_pmp,

	"Enable support for sata port multipliers, only use if you use a pmp!");



#define AHCI_BISTAFR	0x00a0

#define AHCI_BISTCR	0x00a4

#define AHCI_BISTFCTR	0x00a8
@@ -184,7 +190,15 @@ static int ahci_sunxi_probe(struct platform_device *pdev) 
		goto disable_resources;



	hpriv->flags = AHCI_HFLAG_32BIT_ONLY | AHCI_HFLAG_NO_MSI |

		       AHCI_HFLAG_NO_PMP | AHCI_HFLAG_YES_NCQ;

		       AHCI_HFLAG_YES_NCQ;



	/*

	 * The sunxi sata controller seems to be unable to successfully do a

	 * soft reset if no pmp is attached, so disable pmp use unless

	 * requested, otherwise directly attached disks do not work.

	 */

	if (!enable_pmp)

		hpriv->flags |= AHCI_HFLAG_NO_PMP;



	rc = ahci_platform_init_host(pdev, hpriv, &ahci_sunxi_port_info);

	if (rc)

drivers/ata/libata-core.c

+14 −6
Original line number Diff line number Diff line
@@ -1043,8 +1043,8 @@ const char *sata_spd_string(unsigned int spd) 
 *	None.

 *

 *	RETURNS:

 *	Device type, %ATA_DEV_ATA, %ATA_DEV_ATAPI, %ATA_DEV_PMP or

 *	%ATA_DEV_UNKNOWN the event of failure.

 *	Device type, %ATA_DEV_ATA, %ATA_DEV_ATAPI, %ATA_DEV_PMP,

 *	%ATA_DEV_ZAC, or %ATA_DEV_UNKNOWN the event of failure.

 */

unsigned int ata_dev_classify(const struct ata_taskfile *tf)

{
@@ -1089,6 +1089,11 @@ unsigned int ata_dev_classify(const struct ata_taskfile *tf) 
		return ATA_DEV_SEMB;

	}



	if ((tf->lbam == 0xcd) && (tf->lbah == 0xab)) {

		DPRINTK("found ZAC device by sig\n");

		return ATA_DEV_ZAC;

	}



	DPRINTK("unknown device\n");

	return ATA_DEV_UNKNOWN;

}
@@ -1329,7 +1334,7 @@ static int ata_hpa_resize(struct ata_device *dev) 
	int rc;



	/* do we need to do it? */

	if (dev->class != ATA_DEV_ATA ||

	if ((dev->class != ATA_DEV_ATA && dev->class != ATA_DEV_ZAC) ||

	    !ata_id_has_lba(dev->id) || !ata_id_hpa_enabled(dev->id) ||

	    (dev->horkage & ATA_HORKAGE_BROKEN_HPA))

		return 0;
@@ -1889,6 +1894,7 @@ retry: 
	case ATA_DEV_SEMB:

		class = ATA_DEV_ATA;	/* some hard drives report SEMB sig */

	case ATA_DEV_ATA:

	case ATA_DEV_ZAC:

		tf.command = ATA_CMD_ID_ATA;

		break;

	case ATA_DEV_ATAPI:
@@ -1980,7 +1986,7 @@ retry: 
	rc = -EINVAL;

	reason = "device reports invalid type";



	if (class == ATA_DEV_ATA) {

	if (class == ATA_DEV_ATA || class == ATA_DEV_ZAC) {

		if (!ata_id_is_ata(id) && !ata_id_is_cfa(id))

			goto err_out;

		if (ap->host->flags & ATA_HOST_IGNORE_ATA &&
@@ -2015,7 +2021,8 @@ retry: 
			goto retry;

	}



	if ((flags & ATA_READID_POSTRESET) && class == ATA_DEV_ATA) {

	if ((flags & ATA_READID_POSTRESET) &&

	    (class == ATA_DEV_ATA || class == ATA_DEV_ZAC)) {

		/*

		 * The exact sequence expected by certain pre-ATA4 drives is:

		 * SRST RESET
@@ -2280,7 +2287,7 @@ int ata_dev_configure(struct ata_device *dev) 
			sizeof(modelbuf));



	/* ATA-specific feature tests */

	if (dev->class == ATA_DEV_ATA) {

	if (dev->class == ATA_DEV_ATA || dev->class == ATA_DEV_ZAC) {

		if (ata_id_is_cfa(id)) {

			/* CPRM may make this media unusable */

			if (id[ATA_ID_CFA_KEY_MGMT] & 1)
@@ -4033,6 +4040,7 @@ int ata_dev_revalidate(struct ata_device *dev, unsigned int new_class, 
	if (ata_class_enabled(new_class) &&

	    new_class != ATA_DEV_ATA &&

	    new_class != ATA_DEV_ATAPI &&

	    new_class != ATA_DEV_ZAC &&

	    new_class != ATA_DEV_SEMB) {

		ata_dev_info(dev, "class mismatch %u != %u\n",

			     dev->class, new_class);

drivers/ata/libata-eh.c

+5 −2
Original line number Diff line number Diff line
@@ -1809,6 +1809,7 @@ static unsigned int ata_eh_analyze_tf(struct ata_queued_cmd *qc, 


	switch (qc->dev->class) {

	case ATA_DEV_ATA:

	case ATA_DEV_ZAC:

		if (err & ATA_ICRC)

			qc->err_mask |= AC_ERR_ATA_BUS;

		if (err & (ATA_UNC | ATA_AMNF))
@@ -3792,7 +3793,8 @@ int ata_eh_recover(struct ata_port *ap, ata_prereset_fn_t prereset, 
				struct ata_eh_context *ehc = &link->eh_context;

				unsigned long tmp;



				if (dev->class != ATA_DEV_ATA)

				if (dev->class != ATA_DEV_ATA &&

				    dev->class != ATA_DEV_ZAC)

					continue;

				if (!(ehc->i.dev_action[dev->devno] &

				      ATA_EH_PARK))
@@ -3873,7 +3875,8 @@ int ata_eh_recover(struct ata_port *ap, ata_prereset_fn_t prereset, 


		/* retry flush if necessary */

		ata_for_each_dev(dev, link, ALL) {

			if (dev->class != ATA_DEV_ATA)

			if (dev->class != ATA_DEV_ATA &&

			    dev->class != ATA_DEV_ZAC)

				continue;

			rc = ata_eh_maybe_retry_flush(dev);

			if (rc)

drivers/ata/libata-scsi.c

+27 −4
Original line number Diff line number Diff line
@@ -235,7 +235,8 @@ static ssize_t ata_scsi_park_store(struct device *device, 
		rc = -ENODEV;

		goto unlock;

	}

	if (dev->class != ATA_DEV_ATA) {

	if (dev->class != ATA_DEV_ATA &&

	    dev->class != ATA_DEV_ZAC) {

		rc = -EOPNOTSUPP;

		goto unlock;

	}
@@ -1961,6 +1962,7 @@ static void ata_scsi_rbuf_fill(struct ata_scsi_args *args, 
static unsigned int ata_scsiop_inq_std(struct ata_scsi_args *args, u8 *rbuf)

{

	const u8 versions[] = {

		0x00,

		0x60,	/* SAM-3 (no version claimed) */



		0x03,
@@ -1969,6 +1971,20 @@ static unsigned int ata_scsiop_inq_std(struct ata_scsi_args *args, u8 *rbuf) 
		0x02,

		0x60	/* SPC-3 (no version claimed) */

	};

	const u8 versions_zbc[] = {

		0x00,

		0xA0,	/* SAM-5 (no version claimed) */



		0x04,

		0xC0,	/* SBC-3 (no version claimed) */



		0x04,

		0x60,	/* SPC-4 (no version claimed) */



		0x60,

		0x20,   /* ZBC (no version claimed) */

	};



	u8 hdr[] = {

		TYPE_DISK,

		0,
@@ -1983,6 +1999,11 @@ static unsigned int ata_scsiop_inq_std(struct ata_scsi_args *args, u8 *rbuf) 
	if (ata_id_removeable(args->id))

		hdr[1] |= (1 << 7);



	if (args->dev->class == ATA_DEV_ZAC) {

		hdr[0] = TYPE_ZBC;

		hdr[2] = 0x6; /* ZBC is defined in SPC-4 */

	}



	memcpy(rbuf, hdr, sizeof(hdr));

	memcpy(&rbuf[8], "ATA     ", 8);

	ata_id_string(args->id, &rbuf[16], ATA_ID_PROD, 16);
@@ -1995,7 +2016,10 @@ static unsigned int ata_scsiop_inq_std(struct ata_scsi_args *args, u8 *rbuf) 
	if (rbuf[32] == 0 || rbuf[32] == ' ')

		memcpy(&rbuf[32], "n/a ", 4);



	memcpy(rbuf + 59, versions, sizeof(versions));

	if (args->dev->class == ATA_DEV_ZAC)

		memcpy(rbuf + 58, versions_zbc, sizeof(versions_zbc));

	else

		memcpy(rbuf + 58, versions, sizeof(versions));



	return 0;

}
@@ -2564,7 +2588,6 @@ static void atapi_request_sense(struct ata_queued_cmd *qc) 


	DPRINTK("ATAPI request sense\n");



	/* FIXME: is this needed? */

	memset(cmd->sense_buffer, 0, SCSI_SENSE_BUFFERSIZE);



#ifdef CONFIG_ATA_SFF
@@ -3405,7 +3428,7 @@ static inline int __ata_scsi_queuecmd(struct scsi_cmnd *scmd, 
	ata_xlat_func_t xlat_func;

	int rc = 0;



	if (dev->class == ATA_DEV_ATA) {

	if (dev->class == ATA_DEV_ATA || dev->class == ATA_DEV_ZAC) {

		if (unlikely(!scmd->cmd_len || scmd->cmd_len > dev->cdb_len))

			goto bad_cdb_len;

CRA Git | Maintained and supported by SUSTech CRA and CCSE