Merge tag 'for-5.1/libata-20190301' of git://git.kernel.dk/linux-block

Pull libata updates from Jens Axboe:
 "Pretty quiet round: a few small fixes, comment typo, and most notably
  a low level driver for the PATA Buddha controller"

* tag 'for-5.1/libata-20190301' of git://git.kernel.dk/linux-block:
  ata: libahci: Only warn for AHCI_HFLAG_MULTI_MSI set when genuine custom irq handler implemented
  libata: fix a typo in comment
  ata: macio: Use of_node_name_eq for node name comparisons
  ata: pata_samsung_cf: simplify getting .driver_data
  ata: pata_platform: Add IRQF_SHARED to IRQ flags
  ata: pata_of_platform: Allow to use 16-bit wide data transfer
  ata: add Buddha PATA controller driver

10 files changed, 297 insertions, 21 deletions

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 8218db17ebdb..a6beb2c5a692 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -963,6 +963,18 @@ config PATA_GAYLE
 
           If unsure, say N.
 
+config PATA_BUDDHA
+        tristate "Buddha/Catweasel/X-Surf PATA support"
+        depends on ZORRO
+        help
+          This option enables support for the IDE interfaces
+          on the Buddha, Catweasel and X-Surf expansion boards
+          on the Zorro expansion bus. It supports up to two
+          interfaces on the Buddha, three on the Catweasel and
+          two on the X-Surf.
+
+          If unsure, say N.
+
 config PATA_ISAPNP
         tristate "ISA Plug and Play PATA support"
         depends on ISAPNP
diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile
index d21cdd83f7ab..d8cc2e04a6c7 100644
--- a/drivers/ata/Makefile
+++ b/drivers/ata/Makefile
@@ -98,6 +98,7 @@ obj-$(CONFIG_PATA_WINBOND)	+= pata_sl82c105.o
 obj-$(CONFIG_PATA_CMD640_PCI)   += pata_cmd640.o
 obj-$(CONFIG_PATA_FALCON)       += pata_falcon.o
 obj-$(CONFIG_PATA_GAYLE)        += pata_gayle.o
+obj-$(CONFIG_PATA_BUDDHA)       += pata_buddha.o
 obj-$(CONFIG_PATA_ISAPNP)       += pata_isapnp.o
 obj-$(CONFIG_PATA_IXP4XX_CF)    += pata_ixp4xx_cf.o
 obj-$(CONFIG_PATA_MPIIX)        += pata_mpiix.o
diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
index b5f57c69c487..692782dddc0f 100644
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -2599,7 +2599,8 @@ int ahci_host_activate(struct ata_host *host, struct scsi_host_template *sht)
         int rc;
 
         if (hpriv->flags & AHCI_HFLAG_MULTI_MSI) {
-                if (hpriv->irq_handler)
+                if (hpriv->irq_handler &&
+                    hpriv->irq_handler != ahci_single_level_irq_intr)
                         dev_warn(host->dev,
                                  "both AHCI_HFLAG_MULTI_MSI flag set and custom irq handler implemented\n");
                 if (!hpriv->get_irq_vector) {
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 3d4887d0e84a..c2adfd8486c4 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -2990,7 +2990,7 @@ static unsigned int atapi_xlat(struct ata_queued_cmd *qc)
          * This inconsistency confuses several controllers which
          * perform PIO using DMA such as Intel AHCIs and sil3124/32.
          * These controllers use actual number of transferred bytes to
-         * update DMA poitner and transfer of 4n+2 bytes make those
+         * update DMA pointer and transfer of 4n+2 bytes make those
          * controller push DMA pointer by 4n+4 bytes because SATA data
          * FISes are aligned to 4 bytes.  This causes data corruption
          * and buffer overrun.
diff --git a/drivers/ata/pata_buddha.c b/drivers/ata/pata_buddha.c
new file mode 100644
index 000000000000..11a8044ff633
--- /dev/null
+++ b/drivers/ata/pata_buddha.c
@@ -0,0 +1,257 @@
+// SPDX-License-Identifier: GPL-2.0
+
+/*
+ * Buddha, Catweasel and X-Surf PATA controller driver
+ *
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ *              http://www.samsung.com
+ *
+ * Based on buddha.c:
+ *
+ *      Copyright (C) 1997, 2001 by Geert Uytterhoeven and others
+ */
+
+#include <linux/ata.h>
+#include <linux/blkdev.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/kernel.h>
+#include <linux/libata.h>
+#include <linux/mm.h>
+#include <linux/module.h>
+#include <linux/zorro.h>
+#include <scsi/scsi_cmnd.h>
+#include <scsi/scsi_host.h>
+
+#include <asm/amigahw.h>
+#include <asm/amigaints.h>
+#include <asm/ide.h>
+#include <asm/setup.h>
+
+#define DRV_NAME "pata_buddha"
+#define DRV_VERSION "0.1.0"
+
+#define BUDDHA_BASE1    0x800
+#define BUDDHA_BASE2    0xa00
+#define BUDDHA_BASE3    0xc00
+#define XSURF_BASE1     0xb000 /* 2.5" interface */
+#define XSURF_BASE2     0xd000 /* 3.5" interface */
+#define BUDDHA_CONTROL  0x11a
+#define BUDDHA_IRQ      0xf00
+#define XSURF_IRQ       0x7e
+#define BUDDHA_IRQ_MR   0xfc0   /* master interrupt enable */
+
+enum {
+        BOARD_BUDDHA = 0,
+        BOARD_CATWEASEL,
+        BOARD_XSURF
+};
+
+static unsigned int buddha_bases[3] __initdata = {
+        BUDDHA_BASE1, BUDDHA_BASE2, BUDDHA_BASE3
+};
+
+static unsigned int xsurf_bases[2] __initdata = {
+        XSURF_BASE1, XSURF_BASE2
+};
+
+static struct scsi_host_template pata_buddha_sht = {
+        ATA_PIO_SHT(DRV_NAME),
+};
+
+/* FIXME: is this needed? */
+static unsigned int pata_buddha_data_xfer(struct ata_queued_cmd *qc,
+                                         unsigned char *buf,
+                                         unsigned int buflen, int rw)
+{
+        struct ata_device *dev = qc->dev;
+        struct ata_port *ap = dev->link->ap;
+        void __iomem *data_addr = ap->ioaddr.data_addr;
+        unsigned int words = buflen >> 1;
+
+        /* Transfer multiple of 2 bytes */
+        if (rw == READ)
+                raw_insw((u16 *)data_addr, (u16 *)buf, words);
+        else
+                raw_outsw((u16 *)data_addr, (u16 *)buf, words);
+
+        /* Transfer trailing byte, if any. */
+        if (unlikely(buflen & 0x01)) {
+                unsigned char pad[2] = { };
+
+                /* Point buf to the tail of buffer */
+                buf += buflen - 1;
+
+                if (rw == READ) {
+                        raw_insw((u16 *)data_addr, (u16 *)pad, 1);
+                        *buf = pad[0];
+                } else {
+                        pad[0] = *buf;
+                        raw_outsw((u16 *)data_addr, (u16 *)pad, 1);
+                }
+                words++;
+        }
+
+        return words << 1;
+}
+
+/*
+ * Provide our own set_mode() as we don't want to change anything that has
+ * already been configured..
+ */
+static int pata_buddha_set_mode(struct ata_link *link,
+                                struct ata_device **unused)
+{
+        struct ata_device *dev;
+
+        ata_for_each_dev(dev, link, ENABLED) {
+                /* We don't really care */
+                dev->pio_mode = dev->xfer_mode = XFER_PIO_0;
+                dev->xfer_shift = ATA_SHIFT_PIO;
+                dev->flags |= ATA_DFLAG_PIO;
+                ata_dev_info(dev, "configured for PIO\n");
+        }
+        return 0;
+}
+
+static bool pata_buddha_irq_check(struct ata_port *ap)
+{
+        u8 ch;
+
+        ch = z_readb((unsigned long)ap->private_data);
+
+        return !!(ch & 0x80);
+}
+
+static void pata_xsurf_irq_clear(struct ata_port *ap)
+{
+        z_writeb(0, (unsigned long)ap->private_data);
+}
+
+static struct ata_port_operations pata_buddha_ops = {
+        .inherits       = &ata_sff_port_ops,
+        .sff_data_xfer  = pata_buddha_data_xfer,
+        .sff_irq_check  = pata_buddha_irq_check,
+        .cable_detect   = ata_cable_unknown,
+        .set_mode       = pata_buddha_set_mode,
+};
+
+static struct ata_port_operations pata_xsurf_ops = {
+        .inherits       = &ata_sff_port_ops,
+        .sff_data_xfer  = pata_buddha_data_xfer,
+        .sff_irq_check  = pata_buddha_irq_check,
+        .sff_irq_clear  = pata_xsurf_irq_clear,
+        .cable_detect   = ata_cable_unknown,
+        .set_mode       = pata_buddha_set_mode,
+};
+
+static int __init pata_buddha_init_one(void)
+{
+        struct zorro_dev *z = NULL;
+
+        while ((z = zorro_find_device(ZORRO_WILDCARD, z))) {
+                static const char *board_name[]
+                        = { "Buddha", "Catweasel", "X-Surf" };
+                struct ata_host *host;
+                void __iomem *buddha_board;
+                unsigned long board;
+                unsigned int type, nr_ports = 2;
+                int i;
+
+                if (z->id == ZORRO_PROD_INDIVIDUAL_COMPUTERS_BUDDHA) {
+                        type = BOARD_BUDDHA;
+                } else if (z->id == ZORRO_PROD_INDIVIDUAL_COMPUTERS_CATWEASEL) {
+                        type = BOARD_CATWEASEL;
+                        nr_ports++;
+                } else if (z->id == ZORRO_PROD_INDIVIDUAL_COMPUTERS_X_SURF) {
+                        type = BOARD_XSURF;
+                } else
+                        continue;
+
+                dev_info(&z->dev, "%s IDE controller\n", board_name[type]);
+
+                board = z->resource.start;
+
+                if (type != BOARD_XSURF) {
+                        if (!devm_request_mem_region(&z->dev,
+                                                     board + BUDDHA_BASE1,
+                                                     0x800, DRV_NAME))
+                                continue;
+                } else {
+                        if (!devm_request_mem_region(&z->dev,
+                                                     board + XSURF_BASE1,
+                                                     0x1000, DRV_NAME))
+                                continue;
+                        if (!devm_request_mem_region(&z->dev,
+                                                     board + XSURF_BASE2,
+                                                     0x1000, DRV_NAME))
+                                continue;
+                }
+
+                /* allocate host */
+                host = ata_host_alloc(&z->dev, nr_ports);
+                if (!host)
+                        continue;
+
+                buddha_board = ZTWO_VADDR(board);
+
+                /* enable the board IRQ on Buddha/Catweasel */
+                if (type != BOARD_XSURF)
+                        z_writeb(0, buddha_board + BUDDHA_IRQ_MR);
+
+                for (i = 0; i < nr_ports; i++) {
+                        struct ata_port *ap = host->ports[i];
+                        void __iomem *base, *irqport;
+                        unsigned long ctl = 0;
+
+                        if (type != BOARD_XSURF) {
+                                ap->ops = &pata_buddha_ops;
+                                base = buddha_board + buddha_bases[i];
+                                ctl = BUDDHA_CONTROL;
+                                irqport = buddha_board + BUDDHA_IRQ + i * 0x40;
+                        } else {
+                                ap->ops = &pata_xsurf_ops;
+                                base = buddha_board + xsurf_bases[i];
+                                /* X-Surf has no CS1* (Control/AltStat) */
+                                irqport = buddha_board + XSURF_IRQ;
+                        }
+
+                        ap->pio_mask = ATA_PIO4;
+                        ap->flags |= ATA_FLAG_SLAVE_POSS | ATA_FLAG_NO_IORDY;
+
+                        ap->ioaddr.data_addr            = base;
+                        ap->ioaddr.error_addr           = base + 2 + 1 * 4;
+                        ap->ioaddr.feature_addr         = base + 2 + 1 * 4;
+                        ap->ioaddr.nsect_addr           = base + 2 + 2 * 4;
+                        ap->ioaddr.lbal_addr            = base + 2 + 3 * 4;
+                        ap->ioaddr.lbam_addr            = base + 2 + 4 * 4;
+                        ap->ioaddr.lbah_addr            = base + 2 + 5 * 4;
+                        ap->ioaddr.device_addr          = base + 2 + 6 * 4;
+                        ap->ioaddr.status_addr          = base + 2 + 7 * 4;
+                        ap->ioaddr.command_addr         = base + 2 + 7 * 4;
+
+                        if (ctl) {
+                                ap->ioaddr.altstatus_addr = base + ctl;
+                                ap->ioaddr.ctl_addr       = base + ctl;
+                        }
+
+                        ap->private_data = (void *)irqport;
+
+                        ata_port_desc(ap, "cmd 0x%lx ctl 0x%lx", board,
+                                      ctl ? board + buddha_bases[i] + ctl : 0);
+                }
+
+                ata_host_activate(host, IRQ_AMIGA_PORTS, ata_sff_interrupt,
+                                  IRQF_SHARED, &pata_buddha_sht);
+
+        }
+
+        return 0;
+}
+
+module_init(pata_buddha_init_one);
+
+MODULE_AUTHOR("Bartlomiej Zolnierkiewicz");
+MODULE_DESCRIPTION("low-level driver for Buddha/Catweasel/X-Surf PATA");
+MODULE_LICENSE("GPL v2");
+MODULE_VERSION(DRV_VERSION);
diff --git a/drivers/ata/pata_macio.c b/drivers/ata/pata_macio.c
index 9e7fc302430f..456ae7184f92 100644
--- a/drivers/ata/pata_macio.c
+++ b/drivers/ata/pata_macio.c
@@ -954,7 +954,7 @@ static void pata_macio_invariants(struct pata_macio_priv *priv)
                 priv->kind = controller_k2_ata6;
                 priv->timings = pata_macio_kauai_timings;
         } else if (of_device_is_compatible(priv->node, "keylargo-ata")) {
-                if (strcmp(priv->node->name, "ata-4") == 0) {
+                if (of_node_name_eq(priv->node, "ata-4")) {
                         priv->kind = controller_kl_ata4;
                         priv->timings = pata_macio_kl66_timings;
                 } else {
diff --git a/drivers/ata/pata_of_platform.c b/drivers/ata/pata_of_platform.c
index 01161c1aef4d..7a0b1759e5f0 100644
--- a/drivers/ata/pata_of_platform.c
+++ b/drivers/ata/pata_of_platform.c
@@ -32,6 +32,7 @@ static int pata_of_platform_probe(struct platform_device *ofdev)
         unsigned int reg_shift = 0;
         int pio_mode = 0;
         int pio_mask;
+        bool use16bit;
 
         ret = of_address_to_resource(dn, 0, &io_res);
         if (ret) {
@@ -60,11 +61,14 @@ static int pata_of_platform_probe(struct platform_device *ofdev)
                 dev_info(&ofdev->dev, "pio-mode unspecified, assuming PIO0\n");
         }
 
+        use16bit = of_property_read_bool(dn, "ata-generic,use16bit");
+
         pio_mask = 1 << pio_mode;
         pio_mask |= (1 << pio_mode) - 1;
 
         return __pata_platform_probe(&ofdev->dev, &io_res, &ctl_res, irq_res,
-                                     reg_shift, pio_mask, &pata_platform_sht);
+                                     reg_shift, pio_mask, &pata_platform_sht,
+                                     use16bit);
 }
 
 static const struct of_device_id pata_of_platform_match[] = {
diff --git a/drivers/ata/pata_platform.c b/drivers/ata/pata_platform.c
index d6f8f5406442..5aba691f09af 100644
--- a/drivers/ata/pata_platform.c
+++ b/drivers/ata/pata_platform.c
@@ -47,13 +47,6 @@ static struct scsi_host_template pata_platform_sht = {
         ATA_PIO_SHT(DRV_NAME),
 };
 
-static struct ata_port_operations pata_platform_port_ops = {
-        .inherits               = &ata_sff_port_ops,
-        .sff_data_xfer          = ata_sff_data_xfer32,
-        .cable_detect           = ata_cable_unknown,
-        .set_mode               = pata_platform_set_mode,
-};
-
 static void pata_platform_setup_port(struct ata_ioports *ioaddr,
                                      unsigned int shift)
 {
@@ -79,6 +72,7 @@ static void pata_platform_setup_port(struct ata_ioports *ioaddr,
  *      @ioport_shift: I/O port shift
  *      @__pio_mask: PIO mask
  *      @sht: scsi_host_template to use when registering
+ *      @use16bit: Flag to indicate 16-bit IO instead of 32-bit
  *
  *      Register a platform bus IDE interface. Such interfaces are PIO and we
  *      assume do not support IRQ sharing.
@@ -101,7 +95,7 @@ static void pata_platform_setup_port(struct ata_ioports *ioaddr,
 int __pata_platform_probe(struct device *dev, struct resource *io_res,
                           struct resource *ctl_res, struct resource *irq_res,
                           unsigned int ioport_shift, int __pio_mask,
-                          struct scsi_host_template *sht)
+                          struct scsi_host_template *sht, bool use16bit)
 {
         struct ata_host *host;
         struct ata_port *ap;
@@ -120,7 +114,7 @@ int __pata_platform_probe(struct device *dev, struct resource *io_res,
          */
         if (irq_res && irq_res->start > 0) {
                 irq = irq_res->start;
-                irq_flags = irq_res->flags & IRQF_TRIGGER_MASK;
+                irq_flags = (irq_res->flags & IRQF_TRIGGER_MASK) | IRQF_SHARED;
         }
 
         /*
@@ -131,7 +125,15 @@ int __pata_platform_probe(struct device *dev, struct resource *io_res,
                 return -ENOMEM;
         ap = host->ports[0];
 
-        ap->ops = &pata_platform_port_ops;
+        ap->ops = devm_kzalloc(dev, sizeof(*ap->ops), GFP_KERNEL);
+        ap->ops->inherits = &ata_sff_port_ops;
+        ap->ops->cable_detect = ata_cable_unknown;
+        ap->ops->set_mode = pata_platform_set_mode;
+        if (use16bit)
+                ap->ops->sff_data_xfer = ata_sff_data_xfer;
+        else
+                ap->ops->sff_data_xfer = ata_sff_data_xfer32;
+
         ap->pio_mask = __pio_mask;
         ap->flags |= ATA_FLAG_SLAVE_POSS;
 
@@ -218,7 +220,7 @@ static int pata_platform_probe(struct platform_device *pdev)
 
         return __pata_platform_probe(&pdev->dev, io_res, ctl_res, irq_res,
                                      pp_info ? pp_info->ioport_shift : 0,
-                                     pio_mask, &pata_platform_sht);
+                                     pio_mask, &pata_platform_sht, false);
 }
 
 static struct platform_driver pata_platform_driver = {
diff --git a/drivers/ata/pata_samsung_cf.c b/drivers/ata/pata_samsung_cf.c
index f5bd44b8bd63..1dc3361cb5a5 100644
--- a/drivers/ata/pata_samsung_cf.c
+++ b/drivers/ata/pata_samsung_cf.c
@@ -609,17 +609,15 @@ static int __exit pata_s3c_remove(struct platform_device *pdev)
 #ifdef CONFIG_PM_SLEEP
 static int pata_s3c_suspend(struct device *dev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct ata_host *host = platform_get_drvdata(pdev);
+        struct ata_host *host = dev_get_drvdata(dev);
 
         return ata_host_suspend(host, PMSG_SUSPEND);
 }
 
 static int pata_s3c_resume(struct device *dev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct ata_host *host = platform_get_drvdata(pdev);
-        struct s3c_ide_platdata *pdata = dev_get_platdata(&pdev->dev);
+        struct ata_host *host = dev_get_drvdata(dev);
+        struct s3c_ide_platdata *pdata = dev_get_platdata(dev);
         struct s3c_ide_info *info = host->private_data;
 
         pata_s3c_hwinit(info, pdata);
diff --git a/include/linux/ata_platform.h b/include/linux/ata_platform.h
index ff2120215dec..9cafec92282d 100644
--- a/include/linux/ata_platform.h
+++ b/include/linux/ata_platform.h
@@ -19,7 +19,8 @@ extern int __pata_platform_probe(struct device *dev,
                                  struct resource *irq_res,
                                  unsigned int ioport_shift,
                                  int __pio_mask,
-                                 struct scsi_host_template *sht);
+                                 struct scsi_host_template *sht,
+                                 bool use16bit);
 
 /*
  * Marvell SATA private data