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

Pull libata fixes from Tejun Heo:
 "Three minor device-specific fixes and revert of NCQ autosense added
  during this -rc1.

  It turned out that NCQ autosense as currently implemented interferes
  with the usual error handling behavior.  It will be revisited in the
  near future"

* 'for-4.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  ata: ahci_brcmstb: Fix misuse of IS_ENABLED
  sata_sx4: Check return code from pdc20621_i2c_read()
  Revert "libata: Implement NCQ autosense"
  Revert "libata: Implement support for sense data reporting"
  Revert "libata-eh: Set 'information' field for autosense"
  ata: ahci_brcmstb: Fix warnings with CONFIG_PM_SLEEP=n

9 files changed, 24 insertions, 204 deletions

diff --git a/drivers/ata/ahci_brcmstb.c b/drivers/ata/ahci_brcmstb.c
index ce1e3a885981..14b7305d2ba0 100644
--- a/drivers/ata/ahci_brcmstb.c
+++ b/drivers/ata/ahci_brcmstb.c
@@ -92,7 +92,7 @@ static inline u32 brcm_sata_readreg(void __iomem *addr)
          * Other architectures (e.g., ARM) either do not support big endian, or
          * else leave I/O in little endian mode.
          */
-        if (IS_ENABLED(CONFIG_MIPS) && IS_ENABLED(__BIG_ENDIAN))
+        if (IS_ENABLED(CONFIG_MIPS) && IS_ENABLED(CONFIG_CPU_BIG_ENDIAN))
                 return __raw_readl(addr);
         else
                 return readl_relaxed(addr);
@@ -101,7 +101,7 @@ static inline u32 brcm_sata_readreg(void __iomem *addr)
 static inline void brcm_sata_writereg(u32 val, void __iomem *addr)
 {
         /* See brcm_sata_readreg() comments */
-        if (IS_ENABLED(CONFIG_MIPS) && IS_ENABLED(__BIG_ENDIAN))
+        if (IS_ENABLED(CONFIG_MIPS) && IS_ENABLED(CONFIG_CPU_BIG_ENDIAN))
                 __raw_writel(val, addr);
         else
                 writel_relaxed(val, addr);
@@ -209,6 +209,7 @@ static void brcm_sata_init(struct brcm_ahci_priv *priv)
                            priv->top_ctrl + SATA_TOP_CTRL_BUS_CTRL);
 }
 
+#ifdef CONFIG_PM_SLEEP
 static int brcm_ahci_suspend(struct device *dev)
 {
         struct ata_host *host = dev_get_drvdata(dev);
@@ -231,6 +232,7 @@ static int brcm_ahci_resume(struct device *dev)
         brcm_sata_phys_enable(priv);
         return ahci_platform_resume(dev);
 }
+#endif
 
 static struct scsi_host_template ahci_platform_sht = {
         AHCI_SHT(DRV_NAME),
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index db5d9f79a247..19bcb80b2031 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -694,11 +694,11 @@ static int ata_rwcmd_protocol(struct ata_taskfile *tf, struct ata_device *dev)
  *      RETURNS:
  *      Block address read from @tf.
  */
-u64 ata_tf_read_block(const struct ata_taskfile *tf, struct ata_device *dev)
+u64 ata_tf_read_block(struct ata_taskfile *tf, struct ata_device *dev)
 {
         u64 block = 0;
 
-        if (!dev || tf->flags & ATA_TFLAG_LBA) {
+        if (tf->flags & ATA_TFLAG_LBA) {
                 if (tf->flags & ATA_TFLAG_LBA48) {
                         block |= (u64)tf->hob_lbah << 40;
                         block |= (u64)tf->hob_lbam << 32;
@@ -2147,24 +2147,6 @@ static int ata_dev_config_ncq(struct ata_device *dev,
         return 0;
 }
 
-static void ata_dev_config_sense_reporting(struct ata_device *dev)
-{
-        unsigned int err_mask;
-
-        if (!ata_id_has_sense_reporting(dev->id))
-                return;
-
-        if (ata_id_sense_reporting_enabled(dev->id))
-                return;
-
-        err_mask = ata_dev_set_feature(dev, SETFEATURE_SENSE_DATA, 0x1);
-        if (err_mask) {
-                ata_dev_dbg(dev,
-                            "failed to enable Sense Data Reporting, Emask 0x%x\n",
-                            err_mask);
-        }
-}
-
 /**
  *      ata_dev_configure - Configure the specified ATA/ATAPI device
  *      @dev: Target device to configure
@@ -2387,7 +2369,7 @@ int ata_dev_configure(struct ata_device *dev)
                                         dev->devslp_timing[i] = sata_setting[j];
                                 }
                 }
-                ata_dev_config_sense_reporting(dev);
+
                 dev->cdb_len = 16;
         }
 
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 7465031a893c..cb0508af1459 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -1592,8 +1592,6 @@ static int ata_eh_read_log_10h(struct ata_device *dev,
         tf->hob_lbah = buf[10];
         tf->nsect = buf[12];
         tf->hob_nsect = buf[13];
-        if (ata_id_has_ncq_autosense(dev->id))
-                tf->auxiliary = buf[14] << 16 | buf[15] << 8 | buf[16];
 
         return 0;
 }
@@ -1630,70 +1628,6 @@ unsigned int atapi_eh_tur(struct ata_device *dev, u8 *r_sense_key)
 }
 
 /**
- *      ata_eh_request_sense - perform REQUEST_SENSE_DATA_EXT
- *      @dev: device to perform REQUEST_SENSE_SENSE_DATA_EXT to
- *      @sense_buf: result sense data buffer (SCSI_SENSE_BUFFERSIZE bytes long)
- *      @dfl_sense_key: default sense key to use
- *
- *      Perform REQUEST_SENSE_DATA_EXT after the device reported CHECK
- *      SENSE.  This function is EH helper.
- *
- *      LOCKING:
- *      Kernel thread context (may sleep).
- *
- *      RETURNS:
- *      encoded sense data on success, 0 on failure or if sense data
- *      is not available.
- */
-static u32 ata_eh_request_sense(struct ata_queued_cmd *qc,
-                                struct scsi_cmnd *cmd)
-{
-        struct ata_device *dev = qc->dev;
-        struct ata_taskfile tf;
-        unsigned int err_mask;
-
-        if (!cmd)
-                return 0;
-
-        DPRINTK("ATA request sense\n");
-        ata_dev_warn(dev, "request sense\n");
-        if (!ata_id_sense_reporting_enabled(dev->id)) {
-                ata_dev_warn(qc->dev, "sense data reporting disabled\n");
-                return 0;
-        }
-        ata_tf_init(dev, &tf);
-
-        tf.flags |= ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE;
-        tf.flags |= ATA_TFLAG_LBA | ATA_TFLAG_LBA48;
-        tf.command = ATA_CMD_REQ_SENSE_DATA;
-        tf.protocol = ATA_PROT_NODATA;
-
-        err_mask = ata_exec_internal(dev, &tf, NULL, DMA_NONE, NULL, 0, 0);
-        /*
-         * ACS-4 states:
-         * The device may set the SENSE DATA AVAILABLE bit to one in the
-         * STATUS field and clear the ERROR bit to zero in the STATUS field
-         * to indicate that the command returned completion without an error
-         * and the sense data described in table 306 is available.
-         *
-         * IOW the 'ATA_SENSE' bit might not be set even though valid
-         * sense data is available.
-         * So check for both.
-         */
-        if ((tf.command & ATA_SENSE) ||
-                tf.lbah != 0 || tf.lbam != 0 || tf.lbal != 0) {
-                ata_scsi_set_sense(cmd, tf.lbah, tf.lbam, tf.lbal);
-                qc->flags |= ATA_QCFLAG_SENSE_VALID;
-                ata_dev_warn(dev, "sense data %02x/%02x/%02x\n",
-                             tf.lbah, tf.lbam, tf.lbal);
-        } else {
-                ata_dev_warn(dev, "request sense failed stat %02x emask %x\n",
-                             tf.command, err_mask);
-        }
-        return err_mask;
-}
-
-/**
  *      atapi_eh_request_sense - perform ATAPI REQUEST_SENSE
  *      @dev: device to perform REQUEST_SENSE to
  *      @sense_buf: result sense data buffer (SCSI_SENSE_BUFFERSIZE bytes long)
@@ -1855,19 +1789,6 @@ void ata_eh_analyze_ncq_error(struct ata_link *link)
         memcpy(&qc->result_tf, &tf, sizeof(tf));