12 files changed, 316 insertions, 22 deletions

diff --git a/arch/powerpc/platforms/ps3/Kconfig b/arch/powerpc/platforms/ps3/Kconfig
index dfe316b161a9..476d9d9b2405 100644
--- a/arch/powerpc/platforms/ps3/Kconfig
+++ b/arch/powerpc/platforms/ps3/Kconfig
@@ -148,4 +148,16 @@ config PS3_LPM
           profiling support of the Cell processor with programs like
           oprofile and perfmon2, then say Y or M, otherwise say N.
 
+config PS3GELIC_UDBG
+        bool "PS3 udbg output via UDP broadcasts on Ethernet"
+        depends on PPC_PS3
+        help
+          Enables udbg early debugging output by sending broadcast UDP
+          via the Ethernet port (UDP port number 18194).
+
+          This driver uses a trivial implementation and is independent
+          from the main network driver.
+
+          If in doubt, say N here.
+
 endmenu
diff --git a/arch/powerpc/platforms/ps3/Makefile b/arch/powerpc/platforms/ps3/Makefile
index ac1bdf844eca..02b9e636dab7 100644
--- a/arch/powerpc/platforms/ps3/Makefile
+++ b/arch/powerpc/platforms/ps3/Makefile
@@ -2,6 +2,7 @@ obj-y += setup.o mm.o time.o hvcall.o htab.o repository.o
 obj-y += interrupt.o exports.o os-area.o
 obj-y += system-bus.o
 
+obj-$(CONFIG_PS3GELIC_UDBG) += gelic_udbg.o
 obj-$(CONFIG_SMP) += smp.o
 obj-$(CONFIG_SPU_BASE) += spu.o
 obj-y += device-init.o
diff --git a/arch/powerpc/platforms/ps3/device-init.c b/arch/powerpc/platforms/ps3/device-init.c
index 6c4b5837fc8a..3f175e8aedb4 100644
--- a/arch/powerpc/platforms/ps3/device-init.c
+++ b/arch/powerpc/platforms/ps3/device-init.c
@@ -825,7 +825,7 @@ static int ps3_probe_thread(void *data)
 
         spin_lock_init(&dev.lock);
 
-        res = request_irq(irq, ps3_notification_interrupt, IRQF_DISABLED,
+        res = request_irq(irq, ps3_notification_interrupt, 0,
                           "ps3_notification", &dev);
         if (res) {
                 pr_err("%s:%u: request_irq failed %d\n", __func__, __LINE__,
diff --git a/arch/powerpc/platforms/ps3/exports.c b/arch/powerpc/platforms/ps3/exports.c
index a7e8ffd24a65..7df5b7d8fc66 100644
--- a/arch/powerpc/platforms/ps3/exports.c
+++ b/arch/powerpc/platforms/ps3/exports.c
@@ -18,8 +18,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <linux/module.h>
-
 #define LV1_CALL(name, in, out, num)                          \
   extern s64 _lv1_##name(LV1_##in##_IN_##out##_OUT_ARG_DECL); \
   EXPORT_SYMBOL(_lv1_##name);
diff --git a/arch/powerpc/platforms/ps3/gelic_udbg.c b/arch/powerpc/platforms/ps3/gelic_udbg.c
new file mode 100644
index 000000000000..20b46a19a48f
--- /dev/null
+++ b/arch/powerpc/platforms/ps3/gelic_udbg.c
@@ -0,0 +1,273 @@
+/*
+ * udbg debug output routine via GELIC UDP broadcasts
+ *
+ * Copyright (C) 2007 Sony Computer Entertainment Inc.
+ * Copyright 2006, 2007 Sony Corporation
+ * Copyright (C) 2010 Hector Martin <hector@marcansoft.com>
+ * Copyright (C) 2011 Andre Heider <a.heider@gmail.com>
+ *
+ * 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 <asm/io.h>
+#include <asm/udbg.h>
+#include <asm/lv1call.h>
+
+#define GELIC_BUS_ID 1
+#define GELIC_DEVICE_ID 0
+#define GELIC_DEBUG_PORT 18194
+#define GELIC_MAX_MESSAGE_SIZE 1000
+
+#define GELIC_LV1_GET_MAC_ADDRESS 1
+#define GELIC_LV1_GET_VLAN_ID 4
+#define GELIC_LV1_VLAN_TX_ETHERNET_0 2
+
+#define GELIC_DESCR_DMA_STAT_MASK 0xf0000000
+#define GELIC_DESCR_DMA_CARDOWNED 0xa0000000
+
+#define GELIC_DESCR_TX_DMA_IKE 0x00080000
+#define GELIC_DESCR_TX_DMA_NO_CHKSUM 0x00000000
+#define GELIC_DESCR_TX_DMA_FRAME_TAIL 0x00040000
+
+#define GELIC_DESCR_DMA_CMD_NO_CHKSUM (GELIC_DESCR_DMA_CARDOWNED | \
+                                       GELIC_DESCR_TX_DMA_IKE | \
+                                       GELIC_DESCR_TX_DMA_NO_CHKSUM)
+
+static u64 bus_addr;
+
+struct gelic_descr {
+        /* as defined by the hardware */
+        __be32 buf_addr;
+        __be32 buf_size;
+        __be32 next_descr_addr;
+        __be32 dmac_cmd_status;
+        __be32 result_size;
+        __be32 valid_size;      /* all zeroes for tx */
+        __be32 data_status;
+        __be32 data_error;      /* all zeroes for tx */
+} __attribute__((aligned(32)));
+
+struct debug_block {
+        struct gelic_descr descr;
+        u8 pkt[1520];
+} __packed;
+
+struct ethhdr {
+        u8 dest[6];
+        u8 src[6];
+        u16 type;
+} __packed;
+
+struct vlantag {
+        u16 vlan;
+        u16 subtype;
+} __packed;
+
+struct iphdr {
+        u8 ver_len;
+        u8 dscp_ecn;
+        u16 total_length;
+        u16 ident;
+        u16 frag_off_flags;
+        u8 ttl;
+        u8 proto;
+        u16 checksum;
+        u32 src;
+        u32 dest;
+} __packed;
+
+struct udphdr {
+        u16 src;
+        u16 dest;
+        u16 len;
+        u16 checksum;
+} __packed;
+
+static __iomem struct ethhdr *h_eth;
+static __iomem struct vlantag *h_vlan;
+static __iomem struct iphdr *h_ip;
+static __iomem struct udphdr *h_udp;
+
+static __iomem char *pmsg;
+static __iomem char *pmsgc;
+
+static __iomem struct debug_block dbg __attribute__((aligned(32)));
+
+static int header_size;
+
+static void map_dma_mem(int bus_id, int dev_id, void *start, size_t len,
+                        u64 *real_bus_addr)
+{
+        s64 result;
+        u64 real_addr = ((u64)start) & 0x0fffffffffffffffUL;
+        u64 real_end = real_addr + len;
+        u64 map_start = real_addr & ~0xfff;
+        u64 map_end = (real_end + 0xfff) & ~0xfff;
+        u64 bus_addr = 0;
+
+        u64 flags = 0xf800000000000000UL;
+
+        result = lv1_allocate_device_dma_region(bus_id, dev_id,
+                                                map_end - map_start, 12, 0,
+                                                &bus_addr);
+        if (result)
+                lv1_panic(0);
+
+        result = lv1_map_device_dma_region(bus_id, dev_id, map_start,
+                                           bus_addr, map_end - map_start,
+                                           flags);
+        if (result)
+                lv1_panic(0);
+
+        *real_bus_addr = bus_addr + real_addr - map_start;
+}
+
+static int unmap_dma_mem(int bus_id, int dev_id, u64 bus_addr, size_t len)
+{
+        s64 result;
+        u64 real_bus_addr;
+
+        real_bus_addr = bus_addr & ~0xfff;
+        len += bus_addr - real_bus_addr;
+        len = (len + 0xfff) & ~0xfff;
+
+        result = lv1_unmap_device_dma_region(bus_id, dev_id, real_bus_addr,
+                                             len);
+        if (result)
+                return result;
+
+        return lv1_free_device_dma_region(bus_id, dev_id, real_bus_addr);
+}
+
+static void gelic_debug_init(void)
+{
+        s64 result;
+        u64 v2;
+        u64 mac;
+        u64 vlan_id;
+
+        result = lv1_open_device(GELIC_BUS_ID, GELIC_DEVICE_ID, 0);
+        if (result)
+                lv1_panic(0);
+
+        map_dma_mem(GELIC_BUS_ID, GELIC_DEVICE_ID, &dbg, sizeof(dbg),
+                    &bus_addr);
+
+        memset(&dbg, 0, sizeof(dbg));
+
+        dbg.descr.buf_addr = bus_addr + offsetof(struct debug_block, pkt);
+
+        wmb();
+
+        result = lv1_net_control(GELIC_BUS_ID, GELIC_DEVICE_ID,
+                                 GELIC_LV1_GET_MAC_ADDRESS, 0, 0, 0,
+                                 &mac, &v2);
+        if (result)
+                lv1_panic(0);
+
+        mac <<= 16;
+
+        h_eth = (struct ethhdr *)dbg.pkt;
+
+        memset(&h_eth->dest, 0xff, 6);
+        memcpy(&h_eth->src, &mac, 6);
+
+        header_size = sizeof(struct ethhdr);
+
+        result = lv1_net_control(GELIC_BUS_ID, GELIC_DEVICE_ID,
+                                 GELIC_LV1_GET_VLAN_ID,
+                                 GELIC_LV1_VLAN_TX_ETHERNET_0, 0, 0,
+                                 &vlan_id, &v2);
+        if (!result) {
+                h_eth->type = 0x8100;
+
+                header_size += sizeof(struct vlantag);
+                h_vlan = (struct vlantag *)(h_eth + 1);
+                h_vlan->vlan = vlan_id;
+                h_vlan->subtype = 0x0800;
+                h_ip = (struct iphdr *)(h_vlan + 1);
+        } else {
+                h_eth->type = 0x0800;
+                h_ip = (struct iphdr *)(h_eth + 1);
+        }
+
+        header_size += sizeof(struct iphdr);
+        h_ip->ver_len = 0x45;
+        h_ip->ttl = 10;
+        h_ip->proto = 0x11;
+        h_ip->src = 0x00000000;
+        h_ip->dest = 0xffffffff;
+
+        header_size += sizeof(struct udphdr);
+        h_udp = (struct udphdr *)(h_ip + 1);
+        h_udp->src = GELIC_DEBUG_PORT;
+        h_udp->dest = GELIC_DEBUG_PORT;
+
+        pmsgc = pmsg = (char *)(h_udp + 1);
+}
+
+static void gelic_debug_shutdown(void)
+{
+        if (bus_addr)
+                unmap_dma_mem(GELIC_BUS_ID, GELIC_DEVICE_ID,
+                              bus_addr, sizeof(dbg));
+        lv1_close_device(GELIC_BUS_ID, GELIC_DEVICE_ID);
+}
+
+static void gelic_sendbuf(int msgsize)
+{
+        u16 *p;
+        u32 sum;
+        int i;
+
+        dbg.descr.buf_size = header_size + msgsize;
+        h_ip->total_length = msgsize + sizeof(struct udphdr) +
+                             sizeof(struct iphdr);
+        h_udp->len = msgsize + sizeof(struct udphdr);
+
+        h_ip->checksum = 0;
+        sum = 0;
+        p = (u16 *)h_ip;
+        for (i = 0; i < 5; i++)
+                sum += *p++;
+        h_ip->checksum = ~(sum + (sum >> 16));
+
+        dbg.descr.dmac_cmd_status = GELIC_DESCR_DMA_CMD_NO_CHKSUM |
+                                    GELIC_DESCR_TX_DMA_FRAME_TAIL;
+        dbg.descr.result_size = 0;
+        dbg.descr.data_status = 0;
+
+        wmb();
+
+        lv1_net_start_tx_dma(GELIC_BUS_ID, GELIC_DEVICE_ID, bus_addr, 0);
+
+        while ((dbg.descr.dmac_cmd_status & GELIC_DESCR_DMA_STAT_MASK) ==
+               GELIC_DESCR_DMA_CARDOWNED)
+                cpu_relax();
+}
+
+static void ps3gelic_udbg_putc(char ch)
+{
+        *pmsgc++ = ch;
+        if (ch == '\n' || (pmsgc-pmsg) >= GELIC_MAX_MESSAGE_SIZE) {
+                gelic_sendbuf(pmsgc-pmsg);
+                pmsgc = pmsg;
+        }
+}
+
+void __init udbg_init_ps3gelic(void)
+{
+        gelic_debug_init();
+        udbg_putc = ps3gelic_udbg_putc;
+}
+
+void udbg_shutdown_ps3gelic(void)
+{
+        udbg_putc = NULL;
+        gelic_debug_shutdown();
+}
+EXPORT_SYMBOL(udbg_shutdown_ps3gelic);
diff --git a/arch/powerpc/platforms/ps3/interrupt.c b/arch/powerpc/platforms/ps3/interrupt.c
index 600ed2c0ed59..404bc52b7806 100644
--- a/arch/powerpc/platforms/ps3/interrupt.c
+++ b/arch/powerpc/platforms/ps3/interrupt.c
@@ -19,7 +19,7 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/irq.h>
 
 #include <asm/machdep.h>
diff --git a/arch/powerpc/platforms/ps3/mm.c b/arch/powerpc/platforms/ps3/mm.c
index c2045880e674..72714ad27842 100644
--- a/arch/powerpc/platforms/ps3/mm.c
+++ b/arch/powerpc/platforms/ps3/mm.c
@@ -19,7 +19,7 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/memory_hotplug.h>
 #include <linux/memblock.h>
 #include <linux/slab.h>
diff --git a/arch/powerpc/platforms/ps3/os-area.c b/arch/powerpc/platforms/ps3/os-area.c
index 5b759b669598..56d26bc4fd41 100644
--- a/arch/powerpc/platforms/ps3/os-area.c
+++ b/arch/powerpc/platforms/ps3/os-area.c
@@ -23,6 +23,7 @@
 #include <linux/workqueue.h>
 #include <linux/fs.h>
 #include <linux/syscalls.h>
+#include <linux/export.h>
 #include <linux/ctype.h>
 #include <linux/memblock.h>
 #include <linux/of.h>
diff --git a/arch/powerpc/platforms/ps3/repository.c b/arch/powerpc/platforms/ps3/repository.c
index 5e304c292f68..ca40f6afd35d 100644
--- a/arch/powerpc/platforms/ps3/repository.c
+++ b/arch/powerpc/platforms/ps3/repository.c
@@ -184,7 +184,7 @@ int ps3_repository_read_bus_type(unsigned int bus_index,
         enum ps3_bus_type *bus_type)
 {
         int result;
-        u64 v1;
+        u64 v1 = 0;
 
         result = read_node(PS3_LPAR_ID_PME,
                 make_first_field("bus", bus_index),
@@ -199,7 +199,7 @@ int ps3_repository_read_bus_num_dev(unsigned int bus_index,
         unsigned int *num_dev)
 {
         int result;
-        u64 v1;
+        u64 v1 = 0;
 
         result = read_node(PS3_LPAR_ID_PME,
                 make_first_field("bus", bus_index),
@@ -239,7 +239,7 @@ int ps3_repository_read_dev_type(unsigned int bus_index,
         unsigned int dev_index, enum ps3_dev_type *dev_type)
 {
         int result;
-        u64 v1;
+        u64 v1 = 0;
 
         result = read_node(PS3_LPAR_ID_PME,
                 make_first_field("bus", bus_index),
@@ -256,8 +256,8 @@ int ps3_repository_read_dev_intr(unsigned int bus_index,
         enum ps3_interrupt_type *intr_type, unsigned int *interrupt_id)
 {
         int result;
-        u64 v1;
-        u64 v2;
+        u64 v1 = 0;
+        u64 v2 = 0;
 
         result = read_node(PS3_LPAR_ID_PME,
                 make_first_field("bus", bus_index),
@@ -275,7 +275,7 @@ int ps3_repository_read_dev_reg_type(unsigned int bus_index,
         enum ps3_reg_type *reg_type)
 {
         int result;
-        u64 v1;
+        u64 v1 = 0;
 
         result = read_node(PS3_LPAR_ID_PME,
                 make_first_field("bus", bus_index),
@@ -615,7 +615,7 @@ int ps3_repository_read_stor_dev_num_regions(unsigned int bus_index,
         unsigned int dev_index, unsigned int *num_regions)
 {
         int result;
-        u64 v1;
+        u64 v1 = 0;
 
         result = read_node(PS3_LPAR_ID_PME,
                 make_first_field("bus", bus_index),
@@ -631,7 +631,7 @@ int ps3_repository_read_stor_dev_region_id(unsigned int bus_index,
         unsigned int *region_id)
 {
         int result;
-        u64 v1;
+        u64 v1 = 0;
 
         result = read_node(PS3_LPAR_ID_PME,
             make_first_field("bus", bus_index),
@@ -786,7 +786,7 @@ int ps3_repository_read_mm_info(u64 *rm_base, u64 *rm_size, u64 *region_total)
 int ps3_repository_read_num_spu_reserved(unsigned int *num_spu_reserved)
 {
         int result;
-        u64 v1;
+        u64 v1 = 0;
 
         result = read_node(PS3_LPAR_ID_CURRENT,
                 make_first_field("bi", 0),
@@ -805,7 +805,7 @@ int ps3_repository_read_num_spu_reserved(unsigned int *num_spu_reserved)
 int ps3_repository_read_num_spu_resource_id(unsigned int *num_resource_id)
 {
         int result;
-        u64 v1;
+        u64 v1 = 0;
 
         result = read_node(PS3_LPAR_ID_CURRENT,
                 make_first_field("bi", 0),
@@ -827,8 +827,8 @@ int ps3_repository_read_spu_resource_id(unsigned int res_index,
         enum ps3_spu_resource_type *resource_type, unsigned int *resource_id)
 {
         int result;
-        u64 v1;
-        u64 v2;
+        u64 v1 = 0;
+        u64 v2 = 0;
 
         result = read_node(PS3_LPAR_ID_CURRENT,
                 make_first_field("bi", 0),
@@ -854,7 +854,7 @@ static int ps3_repository_read_boot_dat_address(u64 *address)
 int ps3_repository_read_boot_dat_size(unsigned int *size)
 {
         int result;
-        u64 v1;
+        u64 v1 = 0;
 
         result = read_node(PS3_LPAR_ID_CURRENT,
                 make_first_field("bi", 0),
@@ -869,7 +869,7 @@ int ps3_repository_read_boot_dat_size(unsigned int *size)
 int ps3_repository_read_vuart_av_port(unsigned int *port)
 {
         int result;
-        u64 v1;
+        u64 v1 = 0;
 
         result = read_node(PS3_LPAR_ID_CURRENT,
                 make_first_field("bi", 0),
@@ -884,7 +884,7 @@ int ps3_repository_read_vuart_av_port(unsigned int *port)
 int ps3_repository_read_vuart_sysmgr_port(unsigned int *port)
 {
         int result;
-        u64 v1;
+        u64 v1 = 0;
 
         result = read_node(PS3_LPAR_ID_CURRENT,
                 make_first_field("bi", 0),
@@ -919,7 +919,7 @@ int ps3_repository_read_boot_dat_info(u64 *lpar_addr, unsigned int *size)
 int ps3_repository_read_num_be(unsigned int *num_be)
 {
         int result;
-        u64 v1;
+        u64 v1 = 0;
 
         result = read_node(PS3_LPAR_ID_PME,
                 make_first_field("ben", 0),
diff --git a/arch/powerpc/platforms/ps3/setup.c b/arch/powerpc/platforms/ps3/setup.c
index 149bea2ce583..e8ec1b2bfffd 100644
--- a/arch/powerpc/platforms/ps3/setup.c
+++ b/arch/powerpc/platforms/ps3/setup.c
@@ -23,6 +23,7 @@
 #include <linux/fs.h>
 #include <linux/root_dev.h>
 #include <linux/console.h>
+#include <linux/export.h>
 #include <linux/bootmem.h>
 
 #include <asm/machdep.h>
diff --git a/arch/powerpc/platforms/ps3/spu.c b/arch/powerpc/platforms/ps3/spu.c
index 375a9f92158d..451fad1c92a8 100644
--- a/arch/powerpc/platforms/ps3/spu.c
+++ b/arch/powerpc/platforms/ps3/spu.c
@@ -22,6 +22,7 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/mmzone.h>
+#include <linux/export.h>
 #include <linux/io.h>
 #include <linux/mm.h>
 
diff --git a/arch/powerpc/platforms/ps3/system-bus.c b/arch/powerpc/platforms/ps3/system-bus.c
index 23083c397528..880eb9ce22c5 100644
--- a/arch/powerpc/platforms/ps3/system-bus.c
+++ b/arch/powerpc/platforms/ps3/system-bus.c
@@ -20,7 +20,7 @@
 
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/dma-mapping.h>
 #include <linux/err.h>
 #include <linux/slab.h>
@@ -695,12 +695,18 @@ static int ps3_dma_supported(struct device *_dev, u64 mask)
         return mask >= DMA_BIT_MASK(32);
 }
 
+static u64 ps3_dma_get_required_mask(struct device *_dev)
+{
+        return DMA_BIT_MASK(32);
+}
+
 static struct dma_map_ops ps3_sb_dma_ops = {
         .alloc_coherent = ps3_alloc_coherent,
         .free_coherent = ps3_free_coherent,
         .map_sg = ps3_sb_map_sg,
         .unmap_sg = ps3_sb_unmap_sg,
         .dma_supported = ps3_dma_supported,
+        .get_required_mask = ps3_dma_get_required_mask,
         .map_page = ps3_sb_map_page,
         .unmap_page = ps3_unmap_page,
 };
@@ -711,6 +717,7 @@ static struct dma_map_ops ps3_ioc0_dma_ops = {
         .map_sg = ps3_ioc0_map_sg,
         .unmap_sg = ps3_ioc0_unmap_sg,
         .dma_supported = ps3_dma_supported,
+        .get_required_mask = ps3_dma_get_required_mask,
         .map_page = ps3_ioc0_map_page,
         .unmap_page = ps3_unmap_page,
 };