powerpc/powernv: Add PIO accessors for Power8 LPC bus

This uses the hooks provided by CONFIG_PPC_INDIRECT_PIO to
implement a set of hooks for IO port access to use the LPC
bus via OPAL calls for the first 64K of IO space

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/io.h
index 6cc61a3c43eedfd10db2de5145f51aeffda0f60b..5a64757dc0d1eb0206f2499a7e26e39fec7cda21 100644 (file)
--- a/arch/powerpc/include/asm/io.h
+++ b/arch/powerpc/include/asm/io.h
@@ -69,6 +69,14 @@ extern unsigned long pci_dram_offset;
 
 extern resource_size_t isa_mem_base;
 
+/* Boolean set by platform if PIO accesses are suppored while _IO_BASE
+ * is not set or addresses cannot be translated to MMIO. This is typically
+ * set when the platform supports "special" PIO accesses via a non memory
+ * mapped mechanism, and allows things like the early udbg UART code to
+ * function.
+ */
+extern bool isa_io_special;
+
 #ifdef CONFIG_PPC32
 #if defined(CONFIG_PPC_INDIRECT_PIO) || defined(CONFIG_PPC_INDIRECT_MMIO)
 #error CONFIG_PPC_INDIRECT_{PIO,MMIO} are not yet supported on 32 bits

diff --git a/arch/powerpc/include/asm/opal.h b/arch/powerpc/include/asm/opal.h
index c701e2be73b1ffed11aeed57824a5a8a9e4d0159..48ad6780c6d980d3fc5ac4921c0f3fdd12291e80 100644 (file)
--- a/arch/powerpc/include/asm/opal.h
+++ b/arch/powerpc/include/asm/opal.h
@@ -687,6 +687,8 @@ extern int opal_machine_check(struct pt_regs *regs);
 
 extern void opal_shutdown(void);
 
+extern void opal_lpc_init(void);
+
 #endif /* __ASSEMBLY__ */
 
 #endif /* __OPAL_H */

diff --git a/arch/powerpc/kernel/io.c b/arch/powerpc/kernel/io.c
index 886381f32c3d45e9988a614fd3ba58b04249a52f..2a2b4aeab80fd83ca276bcccfef6387f3324d565 100644 (file)
--- a/arch/powerpc/kernel/io.c
+++ b/arch/powerpc/kernel/io.c
@@ -25,6 +25,9 @@
 #include <asm/firmware.h>
 #include <asm/bug.h>
 
+/* See definition in io.h */
+bool isa_io_special;
+
 void _insb(const volatile u8 __iomem *port, void *buf, long count)
 {
        u8 *tbuf = buf;

diff --git a/arch/powerpc/platforms/powernv/Kconfig b/arch/powerpc/platforms/powernv/Kconfig
index c24684c818ab015cc9140d9870f26dc97bfb162a..65295870766d3663fd8c22f25349ea2f5c5b3de4 100644 (file)
--- a/arch/powerpc/platforms/powernv/Kconfig
+++ b/arch/powerpc/platforms/powernv/Kconfig
@@ -7,6 +7,7 @@ config PPC_POWERNV
        select PPC_P7_NAP
        select PPC_PCI_CHOICE if EMBEDDED
        select EPAPR_BOOT
+       select PPC_INDIRECT_PIO
        default y
 
 config POWERNV_MSI

diff --git a/arch/powerpc/platforms/powernv/Makefile b/arch/powerpc/platforms/powernv/Makefile
index 7fe595152478a08a756d89277a993cf2650d42ef..300c437d713cf1a6b4c73d2b2bb58830483219fe 100644 (file)
--- a/arch/powerpc/platforms/powernv/Makefile
+++ b/arch/powerpc/platforms/powernv/Makefile
@@ -1,5 +1,5 @@
 obj-y                  += setup.o opal-takeover.o opal-wrappers.o opal.o
-obj-y                  += opal-rtc.o opal-nvram.o
+obj-y                  += opal-rtc.o opal-nvram.o opal-lpc.o
 
 obj-$(CONFIG_SMP)      += smp.o
 obj-$(CONFIG_PCI)      += pci.o pci-p5ioc2.o pci-ioda.o

diff --git a/arch/powerpc/platforms/powernv/opal-lpc.c b/arch/powerpc/platforms/powernv/opal-lpc.c
new file mode 100644 (file)
index 0000000..a7614bb
--- /dev/null
+++ b/arch/powerpc/platforms/powernv/opal-lpc.c
@@ -0,0 +1,203 @@
+/*
+ * PowerNV LPC bus handling.
+ *
+ * Copyright 2013 IBM Corp.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#include <linux/kernel.h>
+#include <linux/of.h>
+#include <linux/bug.h>
+
+#include <asm/machdep.h>
+#include <asm/firmware.h>
+#include <asm/xics.h>
+#include <asm/opal.h>
+
+static int opal_lpc_chip_id = -1;
+
+static u8 opal_lpc_inb(unsigned long port)
+{
+       int64_t rc;
+       uint32_t data;
+
+       if (opal_lpc_chip_id < 0 || port > 0xffff)
+               return 0xff;
+       rc = opal_lpc_read(opal_lpc_chip_id, OPAL_LPC_IO, port, &data, 1);
+       return rc ? 0xff : data;
+}
+
+static __le16 __opal_lpc_inw(unsigned long port)
+{
+       int64_t rc;
+       uint32_t data;
+
+       if (opal_lpc_chip_id < 0 || port > 0xfffe)
+               return 0xffff;
+       if (port & 1)
+               return (__le16)opal_lpc_inb(port) << 8 | opal_lpc_inb(port + 1);
+       rc = opal_lpc_read(opal_lpc_chip_id, OPAL_LPC_IO, port, &data, 2);
+       return rc ? 0xffff : data;
+}
+static u16 opal_lpc_inw(unsigned long port)
+{
+       return le16_to_cpu(__opal_lpc_inw(port));
+}
+
+static __le32 __opal_lpc_inl(unsigned long port)
+{
+       int64_t rc;
+       uint32_t data;
+
+       if (opal_lpc_chip_id < 0 || port > 0xfffc)
+               return 0xffffffff;
+       if (port & 3)
+               return (__le32)opal_lpc_inb(port    ) << 24 |
+                      (__le32)opal_lpc_inb(port + 1) << 16 |
+                      (__le32)opal_lpc_inb(port + 2) <<  8 |
+                              opal_lpc_inb(port + 3);
+       rc = opal_lpc_read(opal_lpc_chip_id, OPAL_LPC_IO, port, &data, 4);
+       return rc ? 0xffffffff : data;
+}
+
+static u32 opal_lpc_inl(unsigned long port)
+{
+       return le32_to_cpu(__opal_lpc_inl(port));
+}
+
+static void opal_lpc_outb(u8 val, unsigned long port)
+{
+       if (opal_lpc_chip_id < 0 || port > 0xffff)
+               return;
+       opal_lpc_write(opal_lpc_chip_id, OPAL_LPC_IO, port, val, 1);
+}
+
+static void __opal_lpc_outw(__le16 val, unsigned long port)
+{
+       if (opal_lpc_chip_id < 0 || port > 0xfffe)
+               return;
+       if (port & 1) {
+               opal_lpc_outb(val >> 8, port);
+               opal_lpc_outb(val     , port + 1);
+               return;
+       }
+       opal_lpc_write(opal_lpc_chip_id, OPAL_LPC_IO, port, val, 2);
+}
+
+static void opal_lpc_outw(u16 val, unsigned long port)
+{
+       __opal_lpc_outw(cpu_to_le16(val), port);
+}
+
+static void __opal_lpc_outl(__le32 val, unsigned long port)
+{
+       if (opal_lpc_chip_id < 0 || port > 0xfffc)
+               return;
+       if (port & 3) {
+               opal_lpc_outb(val >> 24, port);
+               opal_lpc_outb(val >> 16, port + 1);
+               opal_lpc_outb(val >>  8, port + 2);
+               opal_lpc_outb(val      , port + 3);
+               return;
+       }
+       opal_lpc_write(opal_lpc_chip_id, OPAL_LPC_IO, port, val, 4);
+}
+
+static void opal_lpc_outl(u32 val, unsigned long port)
+{
+       __opal_lpc_outl(cpu_to_le32(val), port);
+}
+
+static void opal_lpc_insb(unsigned long p, void *b, unsigned long c)
+{
+       u8 *ptr = b;
+
+       while(c--)
+               *(ptr++) = opal_lpc_inb(p);
+}
+
+static void opal_lpc_insw(unsigned long p, void *b, unsigned long c)
+{
+       __le16 *ptr = b;
+
+       while(c--)
+               *(ptr++) = __opal_lpc_inw(p);
+}
+
+static void opal_lpc_insl(unsigned long p, void *b, unsigned long c)
+{
+       __le32 *ptr = b;
+
+       while(c--)
+               *(ptr++) = __opal_lpc_inl(p);
+}
+
+static void opal_lpc_outsb(unsigned long p, const void *b, unsigned long c)
+{
+       const u8 *ptr = b;
+
+       while(c--)
+               opal_lpc_outb(*(ptr++), p);
+}
+
+static void opal_lpc_outsw(unsigned long p, const void *b, unsigned long c)
+{
+       const __le16 *ptr = b;
+
+       while(c--)
+               __opal_lpc_outw(*(ptr++), p);
+}
+
+static void opal_lpc_outsl(unsigned long p, const void *b, unsigned long c)
+{
+       const __le32 *ptr = b;
+
+       while(c--)
+               __opal_lpc_outl(*(ptr++), p);
+}
+
+static const struct ppc_pci_io opal_lpc_io = {
+       .inb    = opal_lpc_inb,
+       .inw    = opal_lpc_inw,
+       .inl    = opal_lpc_inl,
+       .outb   = opal_lpc_outb,
+       .outw   = opal_lpc_outw,
+       .outl   = opal_lpc_outl,
+       .insb   = opal_lpc_insb,
+       .insw   = opal_lpc_insw,
+       .insl   = opal_lpc_insl,
+       .outsb  = opal_lpc_outsb,
+       .outsw  = opal_lpc_outsw,
+       .outsl  = opal_lpc_outsl,
+};
+
+void opal_lpc_init(void)
+{
+       struct device_node *np;
+
+       /*
+        * Look for a Power8 LPC bus tagged as "primary",
+        * we currently support only one though the OPAL APIs
+        * support any number.
+        */
+       for_each_compatible_node(np, NULL, "ibm,power8-lpc") {
+               if (!of_device_is_available(np))
+                       continue;
+               if (!of_get_property(np, "primary", NULL))
+                       continue;
+               opal_lpc_chip_id = of_get_ibm_chip_id(np);
+               break;
+       }
+       if (opal_lpc_chip_id < 0)
+               return;
+
+       /* Setup special IO ops */
+       ppc_pci_io = opal_lpc_io;
+       isa_io_special = true;
+
+       pr_info("OPAL: Power8 LPC bus found, chip ID %d\n", opal_lpc_chip_id);
+}

diff --git a/arch/powerpc/platforms/powernv/powernv.h b/arch/powerpc/platforms/powernv/powernv.h
index a1c6f83fc3916efab1a092e1c7b102ff4a3c788a..de6819be1f95ea11911bbadd5080fb05db66e884 100644 (file)
--- a/arch/powerpc/platforms/powernv/powernv.h
+++ b/arch/powerpc/platforms/powernv/powernv.h
@@ -15,4 +15,6 @@ static inline void pnv_pci_init(void) { }
 static inline void pnv_pci_shutdown(void) { }
 #endif
 
+extern void pnv_lpc_init(void);
+
 #endif /* _POWERNV_H */

diff --git a/arch/powerpc/platforms/powernv/setup.c b/arch/powerpc/platforms/powernv/setup.c
index 84438af96c052b7e465d6b6a03d333ba9e7b37ba..4ddb339700b9453b1c02b793a0d03b302984c570 100644 (file)
--- a/arch/powerpc/platforms/powernv/setup.c
+++ b/arch/powerpc/platforms/powernv/setup.c
@@ -54,6 +54,12 @@ static void __init pnv_setup_arch(void)
 
 static void __init pnv_init_early(void)
 {
+       /*
+        * Initialize the LPC bus now so that legacy serial
+        * ports can be found on it
+        */
+       opal_lpc_init();
+
 #ifdef CONFIG_HVC_OPAL
        if (firmware_has_feature(FW_FEATURE_OPAL))
                hvc_opal_init_early();