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

Pull libata updates from Tejun Heo:
 "libata saw quite a bit of activities in this cycle:

   - SMR drive support still being worked on

   - bug fixes and improvements to misc SCSI command emulation

   - some low level driver updates"

* 'for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata: (39 commits)
  libata-scsi: better style in ata_msense_*()
  AHCI: Clear GHC.IS to prevent unexpectly asserting INTx
  ata: sata_dwc_460ex: remove redundant dev_err call
  ata: define ATA_PROT_* in terms of ATA_PROT_FLAG_*
  libata: remove ATA_PROT_FLAG_DATA
  libata: remove ata_is_nodata
  ata: make lba_{28,48}_ok() use ATA_MAX_SECTORS{,_LBA48}
  libata-scsi: minor cleanup for ata_scsi_zbc_out_xlat
  libata-scsi: Fix ZBC management out command translation
  libata-scsi: Fix translation of REPORT ZONES command
  ata: Handle ATA NCQ NO-DATA commands correctly
  libata-eh: decode all taskfile protocols
  ata: fixup ATA_PROT_NODATA
  libsas: use ata_is_ncq() and ata_has_dma() accessors
  libata: use ata_is_ncq() accessors
  libata: return boolean values from ata_is_*
  libata-scsi: avoid repeated calculation of number of TRIM ranges
  libata-scsi: reject WRITE SAME (16) with n_block that exceeds limit
  libata-scsi: rename ata_msense_ctl_mode() to ata_msense_control()
  libata-scsi: fix D_SENSE bit relection in control mode page
  ...

14 files changed, 129 insertions, 76 deletions

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index e2dc4c045146..2c8be74f401d 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -98,12 +98,12 @@ config SATA_AHCI_PLATFORM
 
           If unsure, say N.
 
-config AHCI_BRCMSTB
-        tristate "Broadcom STB AHCI SATA support"
-        depends on ARCH_BRCMSTB || BMIPS_GENERIC
+config AHCI_BRCM
+        tristate "Broadcom AHCI SATA support"
+        depends on ARCH_BRCMSTB || BMIPS_GENERIC || ARCH_BCM_NSP
         help
           This option enables support for the AHCI SATA3 controller found on
-          STB SoC's.
+          Broadcom SoC's.
 
           If unsure, say N.
 
diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile
index 0b2afb7e5f35..a46e6b784bda 100644
--- a/drivers/ata/Makefile
+++ b/drivers/ata/Makefile
@@ -11,7 +11,7 @@ obj-$(CONFIG_SATA_INIC162X)	+= sata_inic162x.o
 obj-$(CONFIG_SATA_SIL24)        += sata_sil24.o
 obj-$(CONFIG_SATA_DWC)          += sata_dwc_460ex.o
 obj-$(CONFIG_SATA_HIGHBANK)     += sata_highbank.o libahci.o
-obj-$(CONFIG_AHCI_BRCMSTB)      += ahci_brcmstb.o libahci.o libahci_platform.o
+obj-$(CONFIG_AHCI_BRCM)         += ahci_brcm.o libahci.o libahci_platform.o
 obj-$(CONFIG_AHCI_CEVA)         += ahci_ceva.o libahci.o libahci_platform.o
 obj-$(CONFIG_AHCI_DA850)        += ahci_da850.o libahci.o libahci_platform.o
 obj-$(CONFIG_AHCI_IMX)          += ahci_imx.o libahci.o libahci_platform.o
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index a83bbcc58b4c..90eabaf81215 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -580,7 +580,7 @@ static struct pci_driver ahci_pci_driver = {
         },
 };
 
-#if defined(CONFIG_PATA_MARVELL) || defined(CONFIG_PATA_MARVELL_MODULE)
+#if IS_ENABLED(CONFIG_PATA_MARVELL)
 static int marvell_enable;
 #else
 static int marvell_enable = 1;
diff --git a/drivers/ata/ahci_brcmstb.c b/drivers/ata/ahci_brcm.c
index e87bcec0fd7c..6f8a7341fa08 100644
--- a/drivers/ata/ahci_brcmstb.c
+++ b/drivers/ata/ahci_brcm.c
@@ -71,6 +71,12 @@
         (DATA_ENDIAN << DMADESC_ENDIAN_SHIFT) |         \
         (MMIO_ENDIAN << MMIO_ENDIAN_SHIFT))
 
+enum brcm_ahci_version {
+        BRCM_SATA_BCM7425 = 1,
+        BRCM_SATA_BCM7445,
+        BRCM_SATA_NSP,
+};
+
 enum brcm_ahci_quirks {
         BRCM_AHCI_QUIRK_NO_NCQ          = BIT(0),
         BRCM_AHCI_QUIRK_SKIP_PHY_ENABLE = BIT(1),
@@ -81,6 +87,7 @@ struct brcm_ahci_priv {
         void __iomem *top_ctrl;
         u32 port_mask;
         u32 quirks;
+        enum brcm_ahci_version version;
 };
 
 static const struct ata_port_info ahci_brcm_port_info = {
@@ -247,9 +254,19 @@ static u32 brcm_ahci_get_portmask(struct platform_device *pdev,
 
 static void brcm_sata_init(struct brcm_ahci_priv *priv)
 {
+        void __iomem *ctrl = priv->top_ctrl + SATA_TOP_CTRL_BUS_CTRL;
+
         /* Configure endianness */
-        brcm_sata_writereg(BUS_CTRL_ENDIAN_CONF,
-                           priv->top_ctrl + SATA_TOP_CTRL_BUS_CTRL);
+        if (priv->version ==  BRCM_SATA_NSP) {
+                u32 data = brcm_sata_readreg(ctrl);
+
+                data &= ~((0x03 << DMADATA_ENDIAN_SHIFT) |
+                        (0x03 << DMADESC_ENDIAN_SHIFT));
+                data |= (0x02 << DMADATA_ENDIAN_SHIFT) |
+                        (0x02 << DMADESC_ENDIAN_SHIFT);
+                brcm_sata_writereg(data, ctrl);
+        } else
+                brcm_sata_writereg(BUS_CTRL_ENDIAN_CONF, ctrl);
 }
 
 #ifdef CONFIG_PM_SLEEP
@@ -282,8 +299,17 @@ static struct scsi_host_template ahci_platform_sht = {
         AHCI_SHT(DRV_NAME),
 };
 
+static const struct of_device_id ahci_of_match[] = {
+        {.compatible = "brcm,bcm7425-ahci", .data = (void *)BRCM_SATA_BCM7425},
+        {.compatible = "brcm,bcm7445-ahci", .data = (void *)BRCM_SATA_BCM7445},
+        {.compatible = "brcm,bcm-nsp-ahci", .data = (void *)BRCM_SATA_NSP},
+        {},
+};
+MODULE_DEVICE_TABLE(of, ahci_of_match);
+
 static int brcm_ahci_probe(struct platform_device *pdev)
 {
+        const struct of_device_id *of_id;
         struct device *dev = &pdev->dev;
         struct brcm_ahci_priv *priv;
         struct ahci_host_priv *hpriv;
@@ -293,6 +319,12 @@ static int brcm_ahci_probe(struct platform_device *pdev)
         priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
         if (!priv)
                 return -ENOMEM;
+
+        of_id = of_match_node(ahci_of_match, pdev->dev.of_node);
+        if (!of_id)
+                return -ENODEV;
+
+        priv->version = (enum brcm_ahci_version)of_id->data;
         priv->dev = dev;
 
         res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "top-ctrl");
@@ -300,7 +332,8 @@ static int brcm_ahci_probe(struct platform_device *pdev)
         if (IS_ERR(priv->top_ctrl))
                 return PTR_ERR(priv->top_ctrl);
 
-        if (of_device_is_compatible(dev->of_node, "brcm,bcm7425-ahci")) {
+        if ((priv->version == BRCM_SATA_BCM7425) ||
+                (priv->version == BRCM_SATA_NSP)) {
                 priv->quirks |= BRCM_AHCI_QUIRK_NO_NCQ;
                 priv->quirks |= BRCM_AHCI_QUIRK_SKIP_PHY_ENABLE;
         }
@@ -354,13 +387,6 @@ static int brcm_ahci_remove(struct platform_device *pdev)
         return 0;
 }
 
-static const struct of_device_id ahci_of_match[] = {
-        {.compatible = "brcm,bcm7425-ahci"},
-        {.compatible = "brcm,bcm7445-ahci"},
-        {},
-};
-MODULE_DEVICE_TABLE(of, ahci_of_match);
-
 static SIMPLE_DEV_PM_OPS(ahci_brcm_pm_ops, brcm_ahci_suspend, brcm_ahci_resume);
 
 static struct platform_driver brcm_ahci_driver = {
diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
index 71b07198e207..7461a587b39b 100644
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -1975,7 +1975,7 @@ unsigned int ahci_qc_issue(struct ata_queued_cmd *qc)
          */
         pp->active_link = qc->dev->link;
 
-        if (qc->tf.protocol == ATA_PROT_NCQ)
+        if (ata_is_ncq(qc->tf.protocol))
                 writel(1 << qc->tag, port_mmio + PORT_SCR_ACT);
 
         if (pp->fbs_enabled && pp->fbs_last_dev != qc->dev->link->pmp) {
@@ -2392,12 +2392,20 @@ static int ahci_port_start(struct ata_port *ap)
 static void ahci_port_stop(struct ata_port *ap)
 {