* [PATCH 0/2] powerpc: Add support for GE IMP3A @ 2012-02-07 11:28 Martyn Welch 2012-02-07 11:28 ` [PATCH 1/2] powerpc: Move GE GPIO and PIC drivers Martyn Welch 2012-02-07 11:28 ` [PATCH 2/2] powerpc: Board support for GE IMP3A Martyn Welch 0 siblings, 2 replies; 7+ messages in thread From: Martyn Welch @ 2012-02-07 11:28 UTC (permalink / raw) To: linuxppc-dev; +Cc: Martyn Welch, Wim Van Sebroeck, linux-kernel These patches add support for the GE IMP3A. This board (based on a Freescale P2020) uses some support for FPGA logic common with the PPC9A and other 86xx based boards, so this support has been moved out of the 86xx directory. A config option (GE_FPGA) has been added to reduce churn on dependant drivers (such as the watchdog timer) when further boards are added. ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/2] powerpc: Move GE GPIO and PIC drivers 2012-02-07 11:28 [PATCH 0/2] powerpc: Add support for GE IMP3A Martyn Welch @ 2012-02-07 11:28 ` Martyn Welch 2012-02-26 23:37 ` Benjamin Herrenschmidt 2012-02-07 11:28 ` [PATCH 2/2] powerpc: Board support for GE IMP3A Martyn Welch 1 sibling, 1 reply; 7+ messages in thread From: Martyn Welch @ 2012-02-07 11:28 UTC (permalink / raw) To: linuxppc-dev; +Cc: Martyn Welch, Wim Van Sebroeck, linux-kernel Move the GE GPIO and PIC drivers to allow these to be used by non-86xx boards. Signed-off-by: Martyn Welch <martyn.welch@ge.com> --- arch/powerpc/platforms/86xx/Kconfig | 3 + arch/powerpc/platforms/86xx/Makefile | 7 +- arch/powerpc/platforms/86xx/gef_gpio.c | 171 -------------------- arch/powerpc/platforms/86xx/gef_pic.c | 252 ------------------------------ arch/powerpc/platforms/86xx/gef_pic.h | 11 -- arch/powerpc/platforms/86xx/gef_ppc9a.c | 3 +- arch/powerpc/platforms/86xx/gef_sbc310.c | 3 +- arch/powerpc/platforms/86xx/gef_sbc610.c | 3 +- arch/powerpc/platforms/Kconfig | 7 + arch/powerpc/platforms/Makefile | 3 + arch/powerpc/platforms/ge_gpio.c | 171 ++++++++++++++++++++ arch/powerpc/platforms/ge_pic.c | 252 ++++++++++++++++++++++++++++++ arch/powerpc/platforms/ge_pic.h | 11 ++ drivers/watchdog/Kconfig | 2 +- 14 files changed, 457 insertions(+), 442 deletions(-) delete mode 100644 arch/powerpc/platforms/86xx/gef_gpio.c delete mode 100644 arch/powerpc/platforms/86xx/gef_pic.c delete mode 100644 arch/powerpc/platforms/86xx/gef_pic.h create mode 100644 arch/powerpc/platforms/ge_gpio.c create mode 100644 arch/powerpc/platforms/ge_pic.c create mode 100644 arch/powerpc/platforms/ge_pic.h diff --git a/arch/powerpc/platforms/86xx/Kconfig b/arch/powerpc/platforms/86xx/Kconfig index 8d6599d..2015022 100644 --- a/arch/powerpc/platforms/86xx/Kconfig +++ b/arch/powerpc/platforms/86xx/Kconfig @@ -39,6 +39,7 @@ config GEF_PPC9A select MMIO_NVRAM select GENERIC_GPIO select ARCH_REQUIRE_GPIOLIB + select GE_FPGA help This option enables support for the GE PPC9A. @@ -48,6 +49,7 @@ config GEF_SBC310 select MMIO_NVRAM select GENERIC_GPIO select ARCH_REQUIRE_GPIOLIB + select GE_FPGA help This option enables support for the GE SBC310. @@ -58,6 +60,7 @@ config GEF_SBC610 select GENERIC_GPIO select ARCH_REQUIRE_GPIOLIB select HAS_RAPIDIO + select GE_FPGA help This option enables support for the GE SBC610. diff --git a/arch/powerpc/platforms/86xx/Makefile b/arch/powerpc/platforms/86xx/Makefile index 4b0d7b1..ede815d 100644 --- a/arch/powerpc/platforms/86xx/Makefile +++ b/arch/powerpc/platforms/86xx/Makefile @@ -7,7 +7,6 @@ obj-$(CONFIG_SMP) += mpc86xx_smp.o obj-$(CONFIG_MPC8641_HPCN) += mpc86xx_hpcn.o obj-$(CONFIG_SBC8641D) += sbc8641d.o obj-$(CONFIG_MPC8610_HPCD) += mpc8610_hpcd.o -gef-gpio-$(CONFIG_GPIOLIB) += gef_gpio.o -obj-$(CONFIG_GEF_SBC610) += gef_sbc610.o gef_pic.o $(gef-gpio-y) -obj-$(CONFIG_GEF_SBC310) += gef_sbc310.o gef_pic.o $(gef-gpio-y) -obj-$(CONFIG_GEF_PPC9A) += gef_ppc9a.o gef_pic.o $(gef-gpio-y) +obj-$(CONFIG_GEF_SBC610) += gef_sbc610.o +obj-$(CONFIG_GEF_SBC310) += gef_sbc310.o +obj-$(CONFIG_GEF_PPC9A) += gef_ppc9a.o diff --git a/arch/powerpc/platforms/86xx/gef_gpio.c b/arch/powerpc/platforms/86xx/gef_gpio.c deleted file mode 100644 index 2a70336..0000000 --- a/arch/powerpc/platforms/86xx/gef_gpio.c +++ /dev/null @@ -1,171 +0,0 @@ -/* - * Driver for GE FPGA based GPIO - * - * Author: Martyn Welch <martyn.welch@ge.com> - * - * 2008 (c) GE Intelligent Platforms Embedded Systems, Inc. - * - * This file is licensed under the terms of the GNU General Public License - * version 2. This program is licensed "as is" without any warranty of any - * kind, whether express or implied. - */ - -/* TODO - * - * Configuration of output modes (totem-pole/open-drain) - * Interrupt configuration - interrupts are always generated the FPGA relies on - * the I/O interrupt controllers mask to stop them propergating - */ - -#include <linux/kernel.h> -#include <linux/compiler.h> -#include <linux/init.h> -#include <linux/io.h> -#include <linux/of.h> -#include <linux/of_device.h> -#include <linux/of_platform.h> -#include <linux/of_gpio.h> -#include <linux/gpio.h> -#include <linux/slab.h> -#include <linux/module.h> - -#define GEF_GPIO_DIRECT 0x00 -#define GEF_GPIO_IN 0x04 -#define GEF_GPIO_OUT 0x08 -#define GEF_GPIO_TRIG 0x0C -#define GEF_GPIO_POLAR_A 0x10 -#define GEF_GPIO_POLAR_B 0x14 -#define GEF_GPIO_INT_STAT 0x18 -#define GEF_GPIO_OVERRUN 0x1C -#define GEF_GPIO_MODE 0x20 - -static void _gef_gpio_set(void __iomem *reg, unsigned int offset, int value) -{ - unsigned int data; - - data = ioread32be(reg); - /* value: 0=low; 1=high */ - if (value & 0x1) - data = data | (0x1 << offset); - else - data = data & ~(0x1 << offset); - - iowrite32be(data, reg); -} - - -static int gef_gpio_dir_in(struct gpio_chip *chip, unsigned offset) -{ - unsigned int data; - struct of_mm_gpio_chip *mmchip = to_of_mm_gpio_chip(chip); - - data = ioread32be(mmchip->regs + GEF_GPIO_DIRECT); - data = data | (0x1 << offset); - iowrite32be(data, mmchip->regs + GEF_GPIO_DIRECT); - - return 0; -} - -static int gef_gpio_dir_out(struct gpio_chip *chip, unsigned offset, int value) -{ - unsigned int data; - struct of_mm_gpio_chip *mmchip = to_of_mm_gpio_chip(chip); - - /* Set direction before switching to input */ - _gef_gpio_set(mmchip->regs + GEF_GPIO_OUT, offset, value); - - data = ioread32be(mmchip->regs + GEF_GPIO_DIRECT); - data = data & ~(0x1 << offset); - iowrite32be(data, mmchip->regs + GEF_GPIO_DIRECT); - - return 0; -} - -static int gef_gpio_get(struct gpio_chip *chip, unsigned offset) -{ - unsigned int data; - int state = 0; - struct of_mm_gpio_chip *mmchip = to_of_mm_gpio_chip(chip); - - data = ioread32be(mmchip->regs + GEF_GPIO_IN); - state = (int)((data >> offset) & 0x1); - - return state; -} - -static void gef_gpio_set(struct gpio_chip *chip, unsigned offset, int value) -{ - struct of_mm_gpio_chip *mmchip = to_of_mm_gpio_chip(chip); - - _gef_gpio_set(mmchip->regs + GEF_GPIO_OUT, offset, value); -} - -static int __init gef_gpio_init(void) -{ - struct device_node *np; - int retval; - struct of_mm_gpio_chip *gef_gpio_chip; - - for_each_compatible_node(np, NULL, "gef,sbc610-gpio") { - - pr_debug("%s: Initialising GEF GPIO\n", np->full_name); - - /* Allocate chip structure */ - gef_gpio_chip = kzalloc(sizeof(*gef_gpio_chip), GFP_KERNEL); - if (!gef_gpio_chip) { - pr_err("%s: Unable to allocate structure\n", - np->full_name); - continue; - } - - /* Setup pointers to chip functions */ - gef_gpio_chip->gc.of_gpio_n_cells = 2; - gef_gpio_chip->gc.ngpio = 19; - gef_gpio_chip->gc.direction_input = gef_gpio_dir_in; - gef_gpio_chip->gc.direction_output = gef_gpio_dir_out; - gef_gpio_chip->gc.get = gef_gpio_get; - gef_gpio_chip->gc.set = gef_gpio_set; - - /* This function adds a memory mapped GPIO chip */ - retval = of_mm_gpiochip_add(np, gef_gpio_chip); - if (retval) { - kfree(gef_gpio_chip); - pr_err("%s: Unable to add GPIO\n", np->full_name); - } - } - - for_each_compatible_node(np, NULL, "gef,sbc310-gpio") { - - pr_debug("%s: Initialising GEF GPIO\n", np->full_name); - - /* Allocate chip structure */ - gef_gpio_chip = kzalloc(sizeof(*gef_gpio_chip), GFP_KERNEL); - if (!gef_gpio_chip) { - pr_err("%s: Unable to allocate structure\n", - np->full_name); - continue; - } - - /* Setup pointers to chip functions */ - gef_gpio_chip->gc.of_gpio_n_cells = 2; - gef_gpio_chip->gc.ngpio = 6; - gef_gpio_chip->gc.direction_input = gef_gpio_dir_in; - gef_gpio_chip->gc.direction_output = gef_gpio_dir_out; - gef_gpio_chip->gc.get = gef_gpio_get; - gef_gpio_chip->gc.set = gef_gpio_set; - - /* This function adds a memory mapped GPIO chip */ - retval = of_mm_gpiochip_add(np, gef_gpio_chip); - if (retval) { - kfree(gef_gpio_chip); - pr_err("%s: Unable to add GPIO\n", np->full_name); - } - } - - return 0; -}; -arch_initcall(gef_gpio_init); - -MODULE_DESCRIPTION("GE I/O FPGA GPIO driver"); -MODULE_AUTHOR("Martyn Welch <martyn.welch@ge.com"); -MODULE_LICENSE("GPL"); diff --git a/arch/powerpc/platforms/86xx/gef_pic.c b/arch/powerpc/platforms/86xx/gef_pic.c deleted file mode 100644 index 94594e5..0000000 --- a/arch/powerpc/platforms/86xx/gef_pic.c +++ /dev/null @@ -1,252 +0,0 @@ -/* - * Interrupt handling for GE FPGA based PIC - * - * Author: Martyn Welch <martyn.welch@ge.com> - * - * 2008 (c) GE Intelligent Platforms Embedded Systems, Inc. - * - * This file is licensed under the terms of the GNU General Public License - * version 2. This program is licensed "as is" without any warranty of any - * kind, whether express or implied. - */ - -#include <linux/stddef.h> -#include <linux/kernel.h> -#include <linux/init.h> -#include <linux/irq.h> -#include <linux/interrupt.h> -#include <linux/spinlock.h> - -#include <asm/byteorder.h> -#include <asm/io.h> -#include <asm/prom.h> -#include <asm/irq.h> - -#include "gef_pic.h" - -#define DEBUG -#undef DEBUG - -#ifdef DEBUG -#define DBG(fmt...) do { printk(KERN_DEBUG "gef_pic: " fmt); } while (0) -#else -#define DBG(fmt...) do { } while (0) -#endif - -#define GEF_PIC_NUM_IRQS 32 - -/* Interrupt Controller Interface Registers */ -#define GEF_PIC_INTR_STATUS 0x0000 - -#define GEF_PIC_INTR_MASK(cpu) (0x0010 + (0x4 * cpu)) -#define GEF_PIC_CPU0_INTR_MASK GEF_PIC_INTR_MASK(0) -#define GEF_PIC_CPU1_INTR_MASK GEF_PIC_INTR_MASK(1) - -#define GEF_PIC_MCP_MASK(cpu) (0x0018 + (0x4 * cpu)) -#define GEF_PIC_CPU0_MCP_MASK GEF_PIC_MCP_MASK(0) -#define GEF_PIC_CPU1_MCP_MASK GEF_PIC_MCP_MASK(1) - - -static DEFINE_RAW_SPINLOCK(gef_pic_lock); - -static void __iomem *gef_pic_irq_reg_base; -static struct irq_host *gef_pic_irq_host; -static int gef_pic_cascade_irq; - -/* - * Interrupt Controller Handling - * - * The interrupt controller handles interrupts for most on board interrupts, - * apart from PCI interrupts. For example on SBC610: - * - * 17:31 RO Reserved - * 16 RO PCI Express Doorbell 3 Status - * 15 RO PCI Express Doorbell 2 Status - * 14 RO PCI Express Doorbell 1 Status - * 13 RO PCI Express Doorbell 0 Status - * 12 RO Real Time Clock Interrupt Status - * 11 RO Temperature Interrupt Status - * 10 RO Temperature Critical Interrupt Status - * 9 RO Ethernet PHY1 Interrupt Status - * 8 RO Ethernet PHY3 Interrupt Status - * 7 RO PEX8548 Interrupt Status - * 6 RO Reserved - * 5 RO Watchdog 0 Interrupt Status - * 4 RO Watchdog 1 Interrupt Status - * 3 RO AXIS Message FIFO A Interrupt Status - * 2 RO AXIS Message FIFO B Interrupt Status - * 1 RO AXIS Message FIFO C Interrupt Status - * 0 RO AXIS Message FIFO D Interrupt Status - * - * Interrupts can be forwarded to one of two output lines. Nothing - * clever is done, so if the masks are incorrectly set, a single input - * interrupt could generate interrupts on both output lines! - * - * The dual lines are there to allow the chained interrupts to be easily - * passed into two different cores. We currently do not use this functionality - * in this driver. - * - * Controller can also be configured to generate Machine checks (MCP), again on - * two lines, to be attached to two different cores. It is suggested that these - * should be masked out. - */ - -void gef_pic_cascade(unsigned int irq, struct irq_desc *desc) -{ - struct irq_chip *chip = irq_desc_get_chip(desc); - unsigned int cascade_irq; - - /* - * See if we actually have an interrupt, call generic handling code if - * we do. - */ - cascade_irq = gef_pic_get_irq(); - - if (cascade_irq != NO_IRQ) - generic_handle_irq(cascade_irq); - - chip->irq_eoi(&desc->irq_data); -} - -static void gef_pic_mask(struct irq_data *d) -{ - unsigned long flags; - unsigned int hwirq = irqd_to_hwirq(d); - u32 mask; - - raw_spin_lock_irqsave(&gef_pic_lock, flags); - mask = in_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_MASK(0)); - mask &= ~(1 << hwirq); - out_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_MASK(0), mask); - raw_spin_unlock_irqrestore(&gef_pic_lock, flags); -} - -static void gef_pic_mask_ack(struct irq_data *d) -{ - /* Don't think we actually have to do anything to ack an interrupt, - * we just need to clear down the devices interrupt and it will go away - */ - gef_pic_mask(d); -} - -static void gef_pic_unmask(struct irq_data *d) -{ - unsigned long flags; - unsigned int hwirq = irqd_to_hwirq(d); - u32 mask; - - raw_spin_lock_irqsave(&gef_pic_lock, flags); - mask = in_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_MASK(0)); - mask |= (1 << hwirq); - out_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_MASK(0), mask); - raw_spin_unlock_irqrestore(&gef_pic_lock, flags); -} - -static struct irq_chip gef_pic_chip = { - .name = "gefp", - .irq_mask = gef_pic_mask, - .irq_mask_ack = gef_pic_mask_ack, - .irq_unmask = gef_pic_unmask, -}; - - -/* When an interrupt is being configured, this call allows some flexibilty - * in deciding which irq_chip structure is used - */ -static int gef_pic_host_map(struct irq_host *h, unsigned int virq, - irq_hw_number_t hwirq) -{ - /* All interrupts are LEVEL sensitive */ - irq_set_status_flags(virq, IRQ_LEVEL); - irq_set_chip_and_handler(virq, &gef_pic_chip, handle_level_irq); - - return 0; -} - -static int gef_pic_host_xlate(struct irq_host *h, struct device_node *ct, - const u32 *intspec, unsigned int intsize, - irq_hw_number_t *out_hwirq, unsigned int *out_flags) -{ - - *out_hwirq = intspec[0]; - if (intsize > 1) - *out_flags = intspec[1]; - else - *out_flags = IRQ_TYPE_LEVEL_HIGH; - - return 0; -} - -static struct irq_host_ops gef_pic_host_ops = { - .map = gef_pic_host_map, - .xlate = gef_pic_host_xlate, -}; - - -/* - * Initialisation of PIC, this should be called in BSP - */ -void __init gef_pic_init(struct device_node *np) -{ - unsigned long flags; - - /* Map the devices registers into memory */ - gef_pic_irq_reg_base = of_iomap(np, 0); - - raw_spin_lock_irqsave(&gef_pic_lock, flags); - - /* Initialise everything as masked. */ - out_be32(gef_pic_irq_reg_base + GEF_PIC_CPU0_INTR_MASK, 0); - out_be32(gef_pic_irq_reg_base + GEF_PIC_CPU1_INTR_MASK, 0); - - out_be32(gef_pic_irq_reg_base + GEF_PIC_CPU0_MCP_MASK, 0); - out_be32(gef_pic_irq_reg_base + GEF_PIC_CPU1_MCP_MASK, 0); - - raw_spin_unlock_irqrestore(&gef_pic_lock, flags); - - /* Map controller */ - gef_pic_cascade_irq = irq_of_parse_and_map(np, 0); - if (gef_pic_cascade_irq == NO_IRQ) { - printk(KERN_ERR "SBC610: failed to map cascade interrupt"); - return; - } - - /* Setup an irq_host structure */ - gef_pic_irq_host = irq_alloc_host(np, IRQ_HOST_MAP_LINEAR, - GEF_PIC_NUM_IRQS, - &gef_pic_host_ops, NO_IRQ); - if (gef_pic_irq_host == NULL) - return; - - /* Chain with parent controller */ - irq_set_chained_handler(gef_pic_cascade_irq, gef_pic_cascade); -} - -/* - * This is called when we receive an interrupt with apparently comes from this - * chip - check, returning the highest interrupt generated or return NO_IRQ - */ -unsigned int gef_pic_get_irq(void) -{ - u32 cause, mask, active; - unsigned int virq = NO_IRQ; - int hwirq; - - cause = in_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_STATUS); - - mask = in_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_MASK(0)); - - active = cause & mask; - - if (active) { - for (hwirq = GEF_PIC_NUM_IRQS - 1; hwirq > -1; hwirq--) { - if (active & (0x1 << hwirq)) - break; - } - virq = irq_linear_revmap(gef_pic_irq_host, - (irq_hw_number_t)hwirq); - } - - return virq; -} - diff --git a/arch/powerpc/platforms/86xx/gef_pic.h b/arch/powerpc/platforms/86xx/gef_pic.h deleted file mode 100644 index 6149916..0000000 --- a/arch/powerpc/platforms/86xx/gef_pic.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef __GEF_PIC_H__ -#define __GEF_PIC_H__ - -#include <linux/init.h> - -void gef_pic_cascade(unsigned int, struct irq_desc *); -unsigned int gef_pic_get_irq(void); -void gef_pic_init(struct device_node *); - -#endif /* __GEF_PIC_H__ */ - diff --git a/arch/powerpc/platforms/86xx/gef_ppc9a.c b/arch/powerpc/platforms/86xx/gef_ppc9a.c index 60ce07e..132917d 100644 --- a/arch/powerpc/platforms/86xx/gef_ppc9a.c +++ b/arch/powerpc/platforms/86xx/gef_ppc9a.c @@ -38,8 +38,9 @@ #include <sysdev/fsl_pci.h> #include <sysdev/fsl_soc.h> +#include <platforms/ge_pic.h> + #include "mpc86xx.h" -#include "gef_pic.h" #undef DEBUG diff --git a/arch/powerpc/platforms/86xx/gef_sbc310.c b/arch/powerpc/platforms/86xx/gef_sbc310.c index 3ecee25..3d7894d 100644 --- a/arch/powerpc/platforms/86xx/gef_sbc310.c +++ b/arch/powerpc/platforms/86xx/gef_sbc310.c @@ -38,8 +38,9 @@ #include <sysdev/fsl_pci.h> #include <sysdev/fsl_soc.h> +#include <platforms/ge_pic.h> + #include "mpc86xx.h" -#include "gef_pic.h" #undef DEBUG diff --git a/arch/powerpc/platforms/86xx/gef_sbc610.c b/arch/powerpc/platforms/86xx/gef_sbc610.c index 5090d60..4f6b6a4 100644 --- a/arch/powerpc/platforms/86xx/gef_sbc610.c +++ b/arch/powerpc/platforms/86xx/gef_sbc610.c @@ -38,8 +38,9 @@ #include <sysdev/fsl_pci.h> #include <sysdev/fsl_soc.h> +#include <platforms/ge_pic.h> + #include "mpc86xx.h" -#include "gef_pic.h" #undef DEBUG diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig index 0cfb46d..2578e82 100644 --- a/arch/powerpc/platforms/Kconfig +++ b/arch/powerpc/platforms/Kconfig @@ -363,4 +363,11 @@ config XILINX_PCI bool "Xilinx PCI host bridge support" depends on PCI && XILINX_VIRTEX +config GE_FPGA + bool + default n + help + Support for common GPIO and interrupt routing functionality provided + on some GE Single Board Computers. + endmenu diff --git a/arch/powerpc/platforms/Makefile b/arch/powerpc/platforms/Makefile index 2635a22..38742cf 100644 --- a/arch/powerpc/platforms/Makefile +++ b/arch/powerpc/platforms/Makefile @@ -3,6 +3,9 @@ subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror obj-$(CONFIG_FSL_ULI1575) += fsl_uli1575.o +gef-gpio-$(CONFIG_GPIOLIB) += ge_gpio.o +obj-$(CONFIG_GE_FPGA) += ge_pic.o $(gef-gpio-y) + obj-$(CONFIG_PPC_PMAC) += powermac/ obj-$(CONFIG_PPC_CHRP) += chrp/ obj-$(CONFIG_40x) += 40x/ diff --git a/arch/powerpc/platforms/ge_gpio.c b/arch/powerpc/platforms/ge_gpio.c new file mode 100644 index 0000000..2a70336 --- /dev/null +++ b/arch/powerpc/platforms/ge_gpio.c @@ -0,0 +1,171 @@ +/* + * Driver for GE FPGA based GPIO + * + * Author: Martyn Welch <martyn.welch@ge.com> + * + * 2008 (c) GE Intelligent Platforms Embedded Systems, Inc. + * + * This file is licensed under the terms of the GNU General Public License + * version 2. This program is licensed "as is" without any warranty of any + * kind, whether express or implied. + */ + +/* TODO + * + * Configuration of output modes (totem-pole/open-drain) + * Interrupt configuration - interrupts are always generated the FPGA relies on + * the I/O interrupt controllers mask to stop them propergating + */ + +#include <linux/kernel.h> +#include <linux/compiler.h> +#include <linux/init.h> +#include <linux/io.h> +#include <linux/of.h> +#include <linux/of_device.h> +#include <linux/of_platform.h> +#include <linux/of_gpio.h> +#include <linux/gpio.h> +#include <linux/slab.h> +#include <linux/module.h> + +#define GEF_GPIO_DIRECT 0x00 +#define GEF_GPIO_IN 0x04 +#define GEF_GPIO_OUT 0x08 +#define GEF_GPIO_TRIG 0x0C +#define GEF_GPIO_POLAR_A 0x10 +#define GEF_GPIO_POLAR_B 0x14 +#define GEF_GPIO_INT_STAT 0x18 +#define GEF_GPIO_OVERRUN 0x1C +#define GEF_GPIO_MODE 0x20 + +static void _gef_gpio_set(void __iomem *reg, unsigned int offset, int value) +{ + unsigned int data; + + data = ioread32be(reg); + /* value: 0=low; 1=high */ + if (value & 0x1) + data = data | (0x1 << offset); + else + data = data & ~(0x1 << offset); + + iowrite32be(data, reg); +} + + +static int gef_gpio_dir_in(struct gpio_chip *chip, unsigned offset) +{ + unsigned int data; + struct of_mm_gpio_chip *mmchip = to_of_mm_gpio_chip(chip); + + data = ioread32be(mmchip->regs + GEF_GPIO_DIRECT); + data = data | (0x1 << offset); + iowrite32be(data, mmchip->regs + GEF_GPIO_DIRECT); + + return 0; +} + +static int gef_gpio_dir_out(struct gpio_chip *chip, unsigned offset, int value) +{ + unsigned int data; + struct of_mm_gpio_chip *mmchip = to_of_mm_gpio_chip(chip); + + /* Set direction before switching to input */ + _gef_gpio_set(mmchip->regs + GEF_GPIO_OUT, offset, value); + + data = ioread32be(mmchip->regs + GEF_GPIO_DIRECT); + data = data & ~(0x1 << offset); + iowrite32be(data, mmchip->regs + GEF_GPIO_DIRECT); + + return 0; +} + +static int gef_gpio_get(struct gpio_chip *chip, unsigned offset) +{ + unsigned int data; + int state = 0; + struct of_mm_gpio_chip *mmchip = to_of_mm_gpio_chip(chip); + + data = ioread32be(mmchip->regs + GEF_GPIO_IN); + state = (int)((data >> offset) & 0x1); + + return state; +} + +static void gef_gpio_set(struct gpio_chip *chip, unsigned offset, int value) +{ + struct of_mm_gpio_chip *mmchip = to_of_mm_gpio_chip(chip); + + _gef_gpio_set(mmchip->regs + GEF_GPIO_OUT, offset, value); +} + +static int __init gef_gpio_init(void) +{ + struct device_node *np; + int retval; + struct of_mm_gpio_chip *gef_gpio_chip; + + for_each_compatible_node(np, NULL, "gef,sbc610-gpio") { + + pr_debug("%s: Initialising GEF GPIO\n", np->full_name); + + /* Allocate chip structure */ + gef_gpio_chip = kzalloc(sizeof(*gef_gpio_chip), GFP_KERNEL); + if (!gef_gpio_chip) { + pr_err("%s: Unable to allocate structure\n", + np->full_name); + continue; + } + + /* Setup pointers to chip functions */ + gef_gpio_chip->gc.of_gpio_n_cells = 2; + gef_gpio_chip->gc.ngpio = 19; + gef_gpio_chip->gc.direction_input = gef_gpio_dir_in; + gef_gpio_chip->gc.direction_output = gef_gpio_dir_out; + gef_gpio_chip->gc.get = gef_gpio_get; + gef_gpio_chip->gc.set = gef_gpio_set; + + /* This function adds a memory mapped GPIO chip */ + retval = of_mm_gpiochip_add(np, gef_gpio_chip); + if (retval) { + kfree(gef_gpio_chip); + pr_err("%s: Unable to add GPIO\n", np->full_name); + } + } + + for_each_compatible_node(np, NULL, "gef,sbc310-gpio") { + + pr_debug("%s: Initialising GEF GPIO\n", np->full_name); + + /* Allocate chip structure */ + gef_gpio_chip = kzalloc(sizeof(*gef_gpio_chip), GFP_KERNEL); + if (!gef_gpio_chip) { + pr_err("%s: Unable to allocate structure\n", + np->full_name); + continue; + } + + /* Setup pointers to chip functions */ + gef_gpio_chip->gc.of_gpio_n_cells = 2; + gef_gpio_chip->gc.ngpio = 6; + gef_gpio_chip->gc.direction_input = gef_gpio_dir_in; + gef_gpio_chip->gc.direction_output = gef_gpio_dir_out; + gef_gpio_chip->gc.get = gef_gpio_get; + gef_gpio_chip->gc.set = gef_gpio_set; + + /* This function adds a memory mapped GPIO chip */ + retval = of_mm_gpiochip_add(np, gef_gpio_chip); + if (retval) { + kfree(gef_gpio_chip); + pr_err("%s: Unable to add GPIO\n", np->full_name); + } + } + + return 0; +}; +arch_initcall(gef_gpio_init); + +MODULE_DESCRIPTION("GE I/O FPGA GPIO driver"); +MODULE_AUTHOR("Martyn Welch <martyn.welch@ge.com"); +MODULE_LICENSE("GPL"); diff --git a/arch/powerpc/platforms/ge_pic.c b/arch/powerpc/platforms/ge_pic.c new file mode 100644 index 0000000..a1ccef2 --- /dev/null +++ b/arch/powerpc/platforms/ge_pic.c @@ -0,0 +1,252 @@ +/* + * Interrupt handling for GE FPGA based PIC + * + * Author: Martyn Welch <martyn.welch@ge.com> + * + * 2008 (c) GE Intelligent Platforms Embedded Systems, Inc. + * + * This file is licensed under the terms of the GNU General Public License + * version 2. This program is licensed "as is" without any warranty of any + * kind, whether express or implied. + */ + +#include <linux/stddef.h> +#include <linux/kernel.h> +#include <linux/init.h> +#include <linux/irq.h> +#include <linux/interrupt.h> +#include <linux/spinlock.h> + +#include <asm/byteorder.h> +#include <asm/io.h> +#include <asm/prom.h> +#include <asm/irq.h> + +#include <platforms/ge_pic.h> + +#define DEBUG +#undef DEBUG + +#ifdef DEBUG +#define DBG(fmt...) do { printk(KERN_DEBUG "gef_pic: " fmt); } while (0) +#else +#define DBG(fmt...) do { } while (0) +#endif + +#define GEF_PIC_NUM_IRQS 32 + +/* Interrupt Controller Interface Registers */ +#define GEF_PIC_INTR_STATUS 0x0000 + +#define GEF_PIC_INTR_MASK(cpu) (0x0010 + (0x4 * cpu)) +#define GEF_PIC_CPU0_INTR_MASK GEF_PIC_INTR_MASK(0) +#define GEF_PIC_CPU1_INTR_MASK GEF_PIC_INTR_MASK(1) + +#define GEF_PIC_MCP_MASK(cpu) (0x0018 + (0x4 * cpu)) +#define GEF_PIC_CPU0_MCP_MASK GEF_PIC_MCP_MASK(0) +#define GEF_PIC_CPU1_MCP_MASK GEF_PIC_MCP_MASK(1) + + +static DEFINE_RAW_SPINLOCK(gef_pic_lock); + +static void __iomem *gef_pic_irq_reg_base; +static struct irq_host *gef_pic_irq_host; +static int gef_pic_cascade_irq; + +/* + * Interrupt Controller Handling + * + * The interrupt controller handles interrupts for most on board interrupts, + * apart from PCI interrupts. For example on SBC610: + * + * 17:31 RO Reserved + * 16 RO PCI Express Doorbell 3 Status + * 15 RO PCI Express Doorbell 2 Status + * 14 RO PCI Express Doorbell 1 Status + * 13 RO PCI Express Doorbell 0 Status + * 12 RO Real Time Clock Interrupt Status + * 11 RO Temperature Interrupt Status + * 10 RO Temperature Critical Interrupt Status + * 9 RO Ethernet PHY1 Interrupt Status + * 8 RO Ethernet PHY3 Interrupt Status + * 7 RO PEX8548 Interrupt Status + * 6 RO Reserved + * 5 RO Watchdog 0 Interrupt Status + * 4 RO Watchdog 1 Interrupt Status + * 3 RO AXIS Message FIFO A Interrupt Status + * 2 RO AXIS Message FIFO B Interrupt Status + * 1 RO AXIS Message FIFO C Interrupt Status + * 0 RO AXIS Message FIFO D Interrupt Status + * + * Interrupts can be forwarded to one of two output lines. Nothing + * clever is done, so if the masks are incorrectly set, a single input + * interrupt could generate interrupts on both output lines! + * + * The dual lines are there to allow the chained interrupts to be easily + * passed into two different cores. We currently do not use this functionality + * in this driver. + * + * Controller can also be configured to generate Machine checks (MCP), again on + * two lines, to be attached to two different cores. It is suggested that these + * should be masked out. + */ + +void gef_pic_cascade(unsigned int irq, struct irq_desc *desc) +{ + struct irq_chip *chip = irq_desc_get_chip(desc); + unsigned int cascade_irq; + + /* + * See if we actually have an interrupt, call generic handling code if + * we do. + */ + cascade_irq = gef_pic_get_irq(); + + if (cascade_irq != NO_IRQ) + generic_handle_irq(cascade_irq); + + chip->irq_eoi(&desc->irq_data); +} + +static void gef_pic_mask(struct irq_data *d) +{ + unsigned long flags; + unsigned int hwirq = irqd_to_hwirq(d); + u32 mask; + + raw_spin_lock_irqsave(&gef_pic_lock, flags); + mask = in_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_MASK(0)); + mask &= ~(1 << hwirq); + out_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_MASK(0), mask); + raw_spin_unlock_irqrestore(&gef_pic_lock, flags); +} + +static void gef_pic_mask_ack(struct irq_data *d) +{ + /* Don't think we actually have to do anything to ack an interrupt, + * we just need to clear down the devices interrupt and it will go away + */ + gef_pic_mask(d); +} + +static void gef_pic_unmask(struct irq_data *d) +{ + unsigned long flags; + unsigned int hwirq = irqd_to_hwirq(d); + u32 mask; + + raw_spin_lock_irqsave(&gef_pic_lock, flags); + mask = in_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_MASK(0)); + mask |= (1 << hwirq); + out_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_MASK(0), mask); + raw_spin_unlock_irqrestore(&gef_pic_lock, flags); +} + +static struct irq_chip gef_pic_chip = { + .name = "gefp", + .irq_mask = gef_pic_mask, + .irq_mask_ack = gef_pic_mask_ack, + .irq_unmask = gef_pic_unmask, +}; + + +/* When an interrupt is being configured, this call allows some flexibilty + * in deciding which irq_chip structure is used + */ +static int gef_pic_host_map(struct irq_host *h, unsigned int virq, + irq_hw_number_t hwirq) +{ + /* All interrupts are LEVEL sensitive */ + irq_set_status_flags(virq, IRQ_LEVEL); + irq_set_chip_and_handler(virq, &gef_pic_chip, handle_level_irq); + + return 0; +} + +static int gef_pic_host_xlate(struct irq_host *h, struct device_node *ct, + const u32 *intspec, unsigned int intsize, + irq_hw_number_t *out_hwirq, unsigned int *out_flags) +{ + + *out_hwirq = intspec[0]; + if (intsize > 1) + *out_flags = intspec[1]; + else + *out_flags = IRQ_TYPE_LEVEL_HIGH; + + return 0; +} + +static struct irq_host_ops gef_pic_host_ops = { + .map = gef_pic_host_map, + .xlate = gef_pic_host_xlate, +}; + + +/* + * Initialisation of PIC, this should be called in BSP + */ +void __init gef_pic_init(struct device_node *np) +{ + unsigned long flags; + + /* Map the devices registers into memory */ + gef_pic_irq_reg_base = of_iomap(np, 0); + + raw_spin_lock_irqsave(&gef_pic_lock, flags); + + /* Initialise everything as masked. */ + out_be32(gef_pic_irq_reg_base + GEF_PIC_CPU0_INTR_MASK, 0); + out_be32(gef_pic_irq_reg_base + GEF_PIC_CPU1_INTR_MASK, 0); + + out_be32(gef_pic_irq_reg_base + GEF_PIC_CPU0_MCP_MASK, 0); + out_be32(gef_pic_irq_reg_base + GEF_PIC_CPU1_MCP_MASK, 0); + + raw_spin_unlock_irqrestore(&gef_pic_lock, flags); + + /* Map controller */ + gef_pic_cascade_irq = irq_of_parse_and_map(np, 0); + if (gef_pic_cascade_irq == NO_IRQ) { + printk(KERN_ERR "SBC610: failed to map cascade interrupt"); + return; + } + + /* Setup an irq_host structure */ + gef_pic_irq_host = irq_alloc_host(np, IRQ_HOST_MAP_LINEAR, + GEF_PIC_NUM_IRQS, + &gef_pic_host_ops, NO_IRQ); + if (gef_pic_irq_host == NULL) + return; + + /* Chain with parent controller */ + irq_set_chained_handler(gef_pic_cascade_irq, gef_pic_cascade); +} + +/* + * This is called when we receive an interrupt with apparently comes from this + * chip - check, returning the highest interrupt generated or return NO_IRQ + */ +unsigned int gef_pic_get_irq(void) +{ + u32 cause, mask, active; + unsigned int virq = NO_IRQ; + int hwirq; + + cause = in_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_STATUS); + + mask = in_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_MASK(0)); + + active = cause & mask; + + if (active) { + for (hwirq = GEF_PIC_NUM_IRQS - 1; hwirq > -1; hwirq--) { + if (active & (0x1 << hwirq)) + break; + } + virq = irq_linear_revmap(gef_pic_irq_host, + (irq_hw_number_t)hwirq); + } + + return virq; +} + diff --git a/arch/powerpc/platforms/ge_pic.h b/arch/powerpc/platforms/ge_pic.h new file mode 100644 index 0000000..6149916 --- /dev/null +++ b/arch/powerpc/platforms/ge_pic.h @@ -0,0 +1,11 @@ +#ifndef __GEF_PIC_H__ +#define __GEF_PIC_H__ + +#include <linux/init.h> + +void gef_pic_cascade(unsigned int, struct irq_desc *); +unsigned int gef_pic_get_irq(void); +void gef_pic_init(struct device_node *); + +#endif /* __GEF_PIC_H__ */ + diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 877b107..2955c3f 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -1039,7 +1039,7 @@ config LANTIQ_WDT config GEF_WDT tristate "GE Watchdog Timer" - depends on GEF_SBC610 || GEF_SBC310 || GEF_PPC9A + depends on GE_FPGA ---help--- Watchdog timer found in a number of GE single board computers. -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] powerpc: Move GE GPIO and PIC drivers 2012-02-07 11:28 ` [PATCH 1/2] powerpc: Move GE GPIO and PIC drivers Martyn Welch @ 2012-02-26 23:37 ` Benjamin Herrenschmidt 2012-02-27 13:57 ` Martyn Welch 0 siblings, 1 reply; 7+ messages in thread From: Benjamin Herrenschmidt @ 2012-02-26 23:37 UTC (permalink / raw) To: Martyn Welch; +Cc: Wim Van Sebroeck, linuxppc-dev, linux-kernel On Tue, 2012-02-07 at 11:28 +0000, Martyn Welch wrote: > Move the GE GPIO and PIC drivers to allow these to be used by non-86xx > boards. Hi, Sorry for the late review... > Signed-off-by: Martyn Welch <martyn.welch@ge.com> > --- > arch/powerpc/platforms/86xx/Kconfig | 3 + > arch/powerpc/platforms/86xx/Makefile | 7 +- > arch/powerpc/platforms/86xx/gef_gpio.c | 171 -------------------- > arch/powerpc/platforms/86xx/gef_pic.c | 252 ------------------------------ > arch/powerpc/platforms/86xx/gef_pic.h | 11 -- > arch/powerpc/platforms/86xx/gef_ppc9a.c | 3 +- > arch/powerpc/platforms/86xx/gef_sbc310.c | 3 +- > arch/powerpc/platforms/86xx/gef_sbc610.c | 3 +- > arch/powerpc/platforms/Kconfig | 7 + > arch/powerpc/platforms/Makefile | 3 + > arch/powerpc/platforms/ge_gpio.c | 171 ++++++++++++++++++++ > arch/powerpc/platforms/ge_pic.c | 252 ++++++++++++++++++++++++++++++ > arch/powerpc/platforms/ge_pic.h | 11 ++ So I don't like having files showing up there. In fact, I want to move the only other one here, it's not the right place for it (fsl_uli1575.c). Please contemplate using arch/powerpc/sysdev instead. Maybe make a subdir in there (geip or something like that ?) Also, use git mv so that the file moves appear as such in the history, this will make review easier by clearly separating the move from actual changes to the files. Cheers, Ben. > drivers/watchdog/Kconfig | 2 +- > 14 files changed, 457 insertions(+), 442 deletions(-) > delete mode 100644 arch/powerpc/platforms/86xx/gef_gpio.c > delete mode 100644 arch/powerpc/platforms/86xx/gef_pic.c > delete mode 100644 arch/powerpc/platforms/86xx/gef_pic.h > create mode 100644 arch/powerpc/platforms/ge_gpio.c > create mode 100644 arch/powerpc/platforms/ge_pic.c > create mode 100644 arch/powerpc/platforms/ge_pic.h > > diff --git a/arch/powerpc/platforms/86xx/Kconfig b/arch/powerpc/platforms/86xx/Kconfig > index 8d6599d..2015022 100644 > --- a/arch/powerpc/platforms/86xx/Kconfig > +++ b/arch/powerpc/platforms/86xx/Kconfig > @@ -39,6 +39,7 @@ config GEF_PPC9A > select MMIO_NVRAM > select GENERIC_GPIO > select ARCH_REQUIRE_GPIOLIB > + select GE_FPGA > help > This option enables support for the GE PPC9A. > > @@ -48,6 +49,7 @@ config GEF_SBC310 > select MMIO_NVRAM > select GENERIC_GPIO > select ARCH_REQUIRE_GPIOLIB > + select GE_FPGA > help > This option enables support for the GE SBC310. > > @@ -58,6 +60,7 @@ config GEF_SBC610 > select GENERIC_GPIO > select ARCH_REQUIRE_GPIOLIB > select HAS_RAPIDIO > + select GE_FPGA > help > This option enables support for the GE SBC610. > > diff --git a/arch/powerpc/platforms/86xx/Makefile b/arch/powerpc/platforms/86xx/Makefile > index 4b0d7b1..ede815d 100644 > --- a/arch/powerpc/platforms/86xx/Makefile > +++ b/arch/powerpc/platforms/86xx/Makefile > @@ -7,7 +7,6 @@ obj-$(CONFIG_SMP) += mpc86xx_smp.o > obj-$(CONFIG_MPC8641_HPCN) += mpc86xx_hpcn.o > obj-$(CONFIG_SBC8641D) += sbc8641d.o > obj-$(CONFIG_MPC8610_HPCD) += mpc8610_hpcd.o > -gef-gpio-$(CONFIG_GPIOLIB) += gef_gpio.o > -obj-$(CONFIG_GEF_SBC610) += gef_sbc610.o gef_pic.o $(gef-gpio-y) > -obj-$(CONFIG_GEF_SBC310) += gef_sbc310.o gef_pic.o $(gef-gpio-y) > -obj-$(CONFIG_GEF_PPC9A) += gef_ppc9a.o gef_pic.o $(gef-gpio-y) > +obj-$(CONFIG_GEF_SBC610) += gef_sbc610.o > +obj-$(CONFIG_GEF_SBC310) += gef_sbc310.o > +obj-$(CONFIG_GEF_PPC9A) += gef_ppc9a.o > diff --git a/arch/powerpc/platforms/86xx/gef_gpio.c b/arch/powerpc/platforms/86xx/gef_gpio.c > deleted file mode 100644 > index 2a70336..0000000 > --- a/arch/powerpc/platforms/86xx/gef_gpio.c > +++ /dev/null > @@ -1,171 +0,0 @@ > -/* > - * Driver for GE FPGA based GPIO > - * > - * Author: Martyn Welch <martyn.welch@ge.com> > - * > - * 2008 (c) GE Intelligent Platforms Embedded Systems, Inc. > - * > - * This file is licensed under the terms of the GNU General Public License > - * version 2. This program is licensed "as is" without any warranty of any > - * kind, whether express or implied. > - */ > - > -/* TODO > - * > - * Configuration of output modes (totem-pole/open-drain) > - * Interrupt configuration - interrupts are always generated the FPGA relies on > - * the I/O interrupt controllers mask to stop them propergating > - */ > - > -#include <linux/kernel.h> > -#include <linux/compiler.h> > -#include <linux/init.h> > -#include <linux/io.h> > -#include <linux/of.h> > -#include <linux/of_device.h> > -#include <linux/of_platform.h> > -#include <linux/of_gpio.h> > -#include <linux/gpio.h> > -#include <linux/slab.h> > -#include <linux/module.h> > - > -#define GEF_GPIO_DIRECT 0x00 > -#define GEF_GPIO_IN 0x04 > -#define GEF_GPIO_OUT 0x08 > -#define GEF_GPIO_TRIG 0x0C > -#define GEF_GPIO_POLAR_A 0x10 > -#define GEF_GPIO_POLAR_B 0x14 > -#define GEF_GPIO_INT_STAT 0x18 > -#define GEF_GPIO_OVERRUN 0x1C > -#define GEF_GPIO_MODE 0x20 > - > -static void _gef_gpio_set(void __iomem *reg, unsigned int offset, int value) > -{ > - unsigned int data; > - > - data = ioread32be(reg); > - /* value: 0=low; 1=high */ > - if (value & 0x1) > - data = data | (0x1 << offset); > - else > - data = data & ~(0x1 << offset); > - > - iowrite32be(data, reg); > -} > - > - > -static int gef_gpio_dir_in(struct gpio_chip *chip, unsigned offset) > -{ > - unsigned int data; > - struct of_mm_gpio_chip *mmchip = to_of_mm_gpio_chip(chip); > - > - data = ioread32be(mmchip->regs + GEF_GPIO_DIRECT); > - data = data | (0x1 << offset); > - iowrite32be(data, mmchip->regs + GEF_GPIO_DIRECT); > - > - return 0; > -} > - > -static int gef_gpio_dir_out(struct gpio_chip *chip, unsigned offset, int value) > -{ > - unsigned int data; > - struct of_mm_gpio_chip *mmchip = to_of_mm_gpio_chip(chip); > - > - /* Set direction before switching to input */ > - _gef_gpio_set(mmchip->regs + GEF_GPIO_OUT, offset, value); > - > - data = ioread32be(mmchip->regs + GEF_GPIO_DIRECT); > - data = data & ~(0x1 << offset); > - iowrite32be(data, mmchip->regs + GEF_GPIO_DIRECT); > - > - return 0; > -} > - > -static int gef_gpio_get(struct gpio_chip *chip, unsigned offset) > -{ > - unsigned int data; > - int state = 0; > - struct of_mm_gpio_chip *mmchip = to_of_mm_gpio_chip(chip); > - > - data = ioread32be(mmchip->regs + GEF_GPIO_IN); > - state = (int)((data >> offset) & 0x1); > - > - return state; > -} > - > -static void gef_gpio_set(struct gpio_chip *chip, unsigned offset, int value) > -{ > - struct of_mm_gpio_chip *mmchip = to_of_mm_gpio_chip(chip); > - > - _gef_gpio_set(mmchip->regs + GEF_GPIO_OUT, offset, value); > -} > - > -static int __init gef_gpio_init(void) > -{ > - struct device_node *np; > - int retval; > - struct of_mm_gpio_chip *gef_gpio_chip; > - > - for_each_compatible_node(np, NULL, "gef,sbc610-gpio") { > - > - pr_debug("%s: Initialising GEF GPIO\n", np->full_name); > - > - /* Allocate chip structure */ > - gef_gpio_chip = kzalloc(sizeof(*gef_gpio_chip), GFP_KERNEL); > - if (!gef_gpio_chip) { > - pr_err("%s: Unable to allocate structure\n", > - np->full_name); > - continue; > - } > - > - /* Setup pointers to chip functions */ > - gef_gpio_chip->gc.of_gpio_n_cells = 2; > - gef_gpio_chip->gc.ngpio = 19; > - gef_gpio_chip->gc.direction_input = gef_gpio_dir_in; > - gef_gpio_chip->gc.direction_output = gef_gpio_dir_out; > - gef_gpio_chip->gc.get = gef_gpio_get; > - gef_gpio_chip->gc.set = gef_gpio_set; > - > - /* This function adds a memory mapped GPIO chip */ > - retval = of_mm_gpiochip_add(np, gef_gpio_chip); > - if (retval) { > - kfree(gef_gpio_chip); > - pr_err("%s: Unable to add GPIO\n", np->full_name); > - } > - } > - > - for_each_compatible_node(np, NULL, "gef,sbc310-gpio") { > - > - pr_debug("%s: Initialising GEF GPIO\n", np->full_name); > - > - /* Allocate chip structure */ > - gef_gpio_chip = kzalloc(sizeof(*gef_gpio_chip), GFP_KERNEL); > - if (!gef_gpio_chip) { > - pr_err("%s: Unable to allocate structure\n", > - np->full_name); > - continue; > - } > - > - /* Setup pointers to chip functions */ > - gef_gpio_chip->gc.of_gpio_n_cells = 2; > - gef_gpio_chip->gc.ngpio = 6; > - gef_gpio_chip->gc.direction_input = gef_gpio_dir_in; > - gef_gpio_chip->gc.direction_output = gef_gpio_dir_out; > - gef_gpio_chip->gc.get = gef_gpio_get; > - gef_gpio_chip->gc.set = gef_gpio_set; > - > - /* This function adds a memory mapped GPIO chip */ > - retval = of_mm_gpiochip_add(np, gef_gpio_chip); > - if (retval) { > - kfree(gef_gpio_chip); > - pr_err("%s: Unable to add GPIO\n", np->full_name); > - } > - } > - > - return 0; > -}; > -arch_initcall(gef_gpio_init); > - > -MODULE_DESCRIPTION("GE I/O FPGA GPIO driver"); > -MODULE_AUTHOR("Martyn Welch <martyn.welch@ge.com"); > -MODULE_LICENSE("GPL"); > diff --git a/arch/powerpc/platforms/86xx/gef_pic.c b/arch/powerpc/platforms/86xx/gef_pic.c > deleted file mode 100644 > index 94594e5..0000000 > --- a/arch/powerpc/platforms/86xx/gef_pic.c > +++ /dev/null > @@ -1,252 +0,0 @@ > -/* > - * Interrupt handling for GE FPGA based PIC > - * > - * Author: Martyn Welch <martyn.welch@ge.com> > - * > - * 2008 (c) GE Intelligent Platforms Embedded Systems, Inc. > - * > - * This file is licensed under the terms of the GNU General Public License > - * version 2. This program is licensed "as is" without any warranty of any > - * kind, whether express or implied. > - */ > - > -#include <linux/stddef.h> > -#include <linux/kernel.h> > -#include <linux/init.h> > -#include <linux/irq.h> > -#include <linux/interrupt.h> > -#include <linux/spinlock.h> > - > -#include <asm/byteorder.h> > -#include <asm/io.h> > -#include <asm/prom.h> > -#include <asm/irq.h> > - > -#include "gef_pic.h" > - > -#define DEBUG > -#undef DEBUG > - > -#ifdef DEBUG > -#define DBG(fmt...) do { printk(KERN_DEBUG "gef_pic: " fmt); } while (0) > -#else > -#define DBG(fmt...) do { } while (0) > -#endif > - > -#define GEF_PIC_NUM_IRQS 32 > - > -/* Interrupt Controller Interface Registers */ > -#define GEF_PIC_INTR_STATUS 0x0000 > - > -#define GEF_PIC_INTR_MASK(cpu) (0x0010 + (0x4 * cpu)) > -#define GEF_PIC_CPU0_INTR_MASK GEF_PIC_INTR_MASK(0) > -#define GEF_PIC_CPU1_INTR_MASK GEF_PIC_INTR_MASK(1) > - > -#define GEF_PIC_MCP_MASK(cpu) (0x0018 + (0x4 * cpu)) > -#define GEF_PIC_CPU0_MCP_MASK GEF_PIC_MCP_MASK(0) > -#define GEF_PIC_CPU1_MCP_MASK GEF_PIC_MCP_MASK(1) > - > - > -static DEFINE_RAW_SPINLOCK(gef_pic_lock); > - > -static void __iomem *gef_pic_irq_reg_base; > -static struct irq_host *gef_pic_irq_host; > -static int gef_pic_cascade_irq; > - > -/* > - * Interrupt Controller Handling > - * > - * The interrupt controller handles interrupts for most on board interrupts, > - * apart from PCI interrupts. For example on SBC610: > - * > - * 17:31 RO Reserved > - * 16 RO PCI Express Doorbell 3 Status > - * 15 RO PCI Express Doorbell 2 Status > - * 14 RO PCI Express Doorbell 1 Status > - * 13 RO PCI Express Doorbell 0 Status > - * 12 RO Real Time Clock Interrupt Status > - * 11 RO Temperature Interrupt Status > - * 10 RO Temperature Critical Interrupt Status > - * 9 RO Ethernet PHY1 Interrupt Status > - * 8 RO Ethernet PHY3 Interrupt Status > - * 7 RO PEX8548 Interrupt Status > - * 6 RO Reserved > - * 5 RO Watchdog 0 Interrupt Status > - * 4 RO Watchdog 1 Interrupt Status > - * 3 RO AXIS Message FIFO A Interrupt Status > - * 2 RO AXIS Message FIFO B Interrupt Status > - * 1 RO AXIS Message FIFO C Interrupt Status > - * 0 RO AXIS Message FIFO D Interrupt Status > - * > - * Interrupts can be forwarded to one of two output lines. Nothing > - * clever is done, so if the masks are incorrectly set, a single input > - * interrupt could generate interrupts on both output lines! > - * > - * The dual lines are there to allow the chained interrupts to be easily > - * passed into two different cores. We currently do not use this functionality > - * in this driver. > - * > - * Controller can also be configured to generate Machine checks (MCP), again on > - * two lines, to be attached to two different cores. It is suggested that these > - * should be masked out. > - */ > - > -void gef_pic_cascade(unsigned int irq, struct irq_desc *desc) > -{ > - struct irq_chip *chip = irq_desc_get_chip(desc); > - unsigned int cascade_irq; > - > - /* > - * See if we actually have an interrupt, call generic handling code if > - * we do. > - */ > - cascade_irq = gef_pic_get_irq(); > - > - if (cascade_irq != NO_IRQ) > - generic_handle_irq(cascade_irq); > - > - chip->irq_eoi(&desc->irq_data); > -} > - > -static void gef_pic_mask(struct irq_data *d) > -{ > - unsigned long flags; > - unsigned int hwirq = irqd_to_hwirq(d); > - u32 mask; > - > - raw_spin_lock_irqsave(&gef_pic_lock, flags); > - mask = in_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_MASK(0)); > - mask &= ~(1 << hwirq); > - out_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_MASK(0), mask); > - raw_spin_unlock_irqrestore(&gef_pic_lock, flags); > -} > - > -static void gef_pic_mask_ack(struct irq_data *d) > -{ > - /* Don't think we actually have to do anything to ack an interrupt, > - * we just need to clear down the devices interrupt and it will go away > - */ > - gef_pic_mask(d); > -} > - > -static void gef_pic_unmask(struct irq_data *d) > -{ > - unsigned long flags; > - unsigned int hwirq = irqd_to_hwirq(d); > - u32 mask; > - > - raw_spin_lock_irqsave(&gef_pic_lock, flags); > - mask = in_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_MASK(0)); > - mask |= (1 << hwirq); > - out_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_MASK(0), mask); > - raw_spin_unlock_irqrestore(&gef_pic_lock, flags); > -} > - > -static struct irq_chip gef_pic_chip = { > - .name = "gefp", > - .irq_mask = gef_pic_mask, > - .irq_mask_ack = gef_pic_mask_ack, > - .irq_unmask = gef_pic_unmask, > -}; > - > - > -/* When an interrupt is being configured, this call allows some flexibilty > - * in deciding which irq_chip structure is used > - */ > -static int gef_pic_host_map(struct irq_host *h, unsigned int virq, > - irq_hw_number_t hwirq) > -{ > - /* All interrupts are LEVEL sensitive */ > - irq_set_status_flags(virq, IRQ_LEVEL); > - irq_set_chip_and_handler(virq, &gef_pic_chip, handle_level_irq); > - > - return 0; > -} > - > -static int gef_pic_host_xlate(struct irq_host *h, struct device_node *ct, > - const u32 *intspec, unsigned int intsize, > - irq_hw_number_t *out_hwirq, unsigned int *out_flags) > -{ > - > - *out_hwirq = intspec[0]; > - if (intsize > 1) > - *out_flags = intspec[1]; > - else > - *out_flags = IRQ_TYPE_LEVEL_HIGH; > - > - return 0; > -} > - > -static struct irq_host_ops gef_pic_host_ops = { > - .map = gef_pic_host_map, > - .xlate = gef_pic_host_xlate, > -}; > - > - > -/* > - * Initialisation of PIC, this should be called in BSP > - */ > -void __init gef_pic_init(struct device_node *np) > -{ > - unsigned long flags; > - > - /* Map the devices registers into memory */ > - gef_pic_irq_reg_base = of_iomap(np, 0); > - > - raw_spin_lock_irqsave(&gef_pic_lock, flags); > - > - /* Initialise everything as masked. */ > - out_be32(gef_pic_irq_reg_base + GEF_PIC_CPU0_INTR_MASK, 0); > - out_be32(gef_pic_irq_reg_base + GEF_PIC_CPU1_INTR_MASK, 0); > - > - out_be32(gef_pic_irq_reg_base + GEF_PIC_CPU0_MCP_MASK, 0); > - out_be32(gef_pic_irq_reg_base + GEF_PIC_CPU1_MCP_MASK, 0); > - > - raw_spin_unlock_irqrestore(&gef_pic_lock, flags); > - > - /* Map controller */ > - gef_pic_cascade_irq = irq_of_parse_and_map(np, 0); > - if (gef_pic_cascade_irq == NO_IRQ) { > - printk(KERN_ERR "SBC610: failed to map cascade interrupt"); > - return; > - } > - > - /* Setup an irq_host structure */ > - gef_pic_irq_host = irq_alloc_host(np, IRQ_HOST_MAP_LINEAR, > - GEF_PIC_NUM_IRQS, > - &gef_pic_host_ops, NO_IRQ); > - if (gef_pic_irq_host == NULL) > - return; > - > - /* Chain with parent controller */ > - irq_set_chained_handler(gef_pic_cascade_irq, gef_pic_cascade); > -} > - > -/* > - * This is called when we receive an interrupt with apparently comes from this > - * chip - check, returning the highest interrupt generated or return NO_IRQ > - */ > -unsigned int gef_pic_get_irq(void) > -{ > - u32 cause, mask, active; > - unsigned int virq = NO_IRQ; > - int hwirq; > - > - cause = in_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_STATUS); > - > - mask = in_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_MASK(0)); > - > - active = cause & mask; > - > - if (active) { > - for (hwirq = GEF_PIC_NUM_IRQS - 1; hwirq > -1; hwirq--) { > - if (active & (0x1 << hwirq)) > - break; > - } > - virq = irq_linear_revmap(gef_pic_irq_host, > - (irq_hw_number_t)hwirq); > - } > - > - return virq; > -} > - > diff --git a/arch/powerpc/platforms/86xx/gef_pic.h b/arch/powerpc/platforms/86xx/gef_pic.h > deleted file mode 100644 > index 6149916..0000000 > --- a/arch/powerpc/platforms/86xx/gef_pic.h > +++ /dev/null > @@ -1,11 +0,0 @@ > -#ifndef __GEF_PIC_H__ > -#define __GEF_PIC_H__ > - > -#include <linux/init.h> > - > -void gef_pic_cascade(unsigned int, struct irq_desc *); > -unsigned int gef_pic_get_irq(void); > -void gef_pic_init(struct device_node *); > - > -#endif /* __GEF_PIC_H__ */ > - > diff --git a/arch/powerpc/platforms/86xx/gef_ppc9a.c b/arch/powerpc/platforms/86xx/gef_ppc9a.c > index 60ce07e..132917d 100644 > --- a/arch/powerpc/platforms/86xx/gef_ppc9a.c > +++ b/arch/powerpc/platforms/86xx/gef_ppc9a.c > @@ -38,8 +38,9 @@ > #include <sysdev/fsl_pci.h> > #include <sysdev/fsl_soc.h> > > +#include <platforms/ge_pic.h> > + > #include "mpc86xx.h" > -#include "gef_pic.h" > > #undef DEBUG > > diff --git a/arch/powerpc/platforms/86xx/gef_sbc310.c b/arch/powerpc/platforms/86xx/gef_sbc310.c > index 3ecee25..3d7894d 100644 > --- a/arch/powerpc/platforms/86xx/gef_sbc310.c > +++ b/arch/powerpc/platforms/86xx/gef_sbc310.c > @@ -38,8 +38,9 @@ > #include <sysdev/fsl_pci.h> > #include <sysdev/fsl_soc.h> > > +#include <platforms/ge_pic.h> > + > #include "mpc86xx.h" > -#include "gef_pic.h" > > #undef DEBUG > > diff --git a/arch/powerpc/platforms/86xx/gef_sbc610.c b/arch/powerpc/platforms/86xx/gef_sbc610.c > index 5090d60..4f6b6a4 100644 > --- a/arch/powerpc/platforms/86xx/gef_sbc610.c > +++ b/arch/powerpc/platforms/86xx/gef_sbc610.c > @@ -38,8 +38,9 @@ > #include <sysdev/fsl_pci.h> > #include <sysdev/fsl_soc.h> > > +#include <platforms/ge_pic.h> > + > #include "mpc86xx.h" > -#include "gef_pic.h" > > #undef DEBUG > > diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig > index 0cfb46d..2578e82 100644 > --- a/arch/powerpc/platforms/Kconfig > +++ b/arch/powerpc/platforms/Kconfig > @@ -363,4 +363,11 @@ config XILINX_PCI > bool "Xilinx PCI host bridge support" > depends on PCI && XILINX_VIRTEX > > +config GE_FPGA > + bool > + default n > + help > + Support for common GPIO and interrupt routing functionality provided > + on some GE Single Board Computers. > + > endmenu > diff --git a/arch/powerpc/platforms/Makefile b/arch/powerpc/platforms/Makefile > index 2635a22..38742cf 100644 > --- a/arch/powerpc/platforms/Makefile > +++ b/arch/powerpc/platforms/Makefile > @@ -3,6 +3,9 @@ subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror > > obj-$(CONFIG_FSL_ULI1575) += fsl_uli1575.o > > +gef-gpio-$(CONFIG_GPIOLIB) += ge_gpio.o > +obj-$(CONFIG_GE_FPGA) += ge_pic.o $(gef-gpio-y) > + > obj-$(CONFIG_PPC_PMAC) += powermac/ > obj-$(CONFIG_PPC_CHRP) += chrp/ > obj-$(CONFIG_40x) += 40x/ > diff --git a/arch/powerpc/platforms/ge_gpio.c b/arch/powerpc/platforms/ge_gpio.c > new file mode 100644 > index 0000000..2a70336 > --- /dev/null > +++ b/arch/powerpc/platforms/ge_gpio.c > @@ -0,0 +1,171 @@ > +/* > + * Driver for GE FPGA based GPIO > + * > + * Author: Martyn Welch <martyn.welch@ge.com> > + * > + * 2008 (c) GE Intelligent Platforms Embedded Systems, Inc. > + * > + * This file is licensed under the terms of the GNU General Public License > + * version 2. This program is licensed "as is" without any warranty of any > + * kind, whether express or implied. > + */ > + > +/* TODO > + * > + * Configuration of output modes (totem-pole/open-drain) > + * Interrupt configuration - interrupts are always generated the FPGA relies on > + * the I/O interrupt controllers mask to stop them propergating > + */ > + > +#include <linux/kernel.h> > +#include <linux/compiler.h> > +#include <linux/init.h> > +#include <linux/io.h> > +#include <linux/of.h> > +#include <linux/of_device.h> > +#include <linux/of_platform.h> > +#include <linux/of_gpio.h> > +#include <linux/gpio.h> > +#include <linux/slab.h> > +#include <linux/module.h> > + > +#define GEF_GPIO_DIRECT 0x00 > +#define GEF_GPIO_IN 0x04 > +#define GEF_GPIO_OUT 0x08 > +#define GEF_GPIO_TRIG 0x0C > +#define GEF_GPIO_POLAR_A 0x10 > +#define GEF_GPIO_POLAR_B 0x14 > +#define GEF_GPIO_INT_STAT 0x18 > +#define GEF_GPIO_OVERRUN 0x1C > +#define GEF_GPIO_MODE 0x20 > + > +static void _gef_gpio_set(void __iomem *reg, unsigned int offset, int value) > +{ > + unsigned int data; > + > + data = ioread32be(reg); > + /* value: 0=low; 1=high */ > + if (value & 0x1) > + data = data | (0x1 << offset); > + else > + data = data & ~(0x1 << offset); > + > + iowrite32be(data, reg); > +} > + > + > +static int gef_gpio_dir_in(struct gpio_chip *chip, unsigned offset) > +{ > + unsigned int data; > + struct of_mm_gpio_chip *mmchip = to_of_mm_gpio_chip(chip); > + > + data = ioread32be(mmchip->regs + GEF_GPIO_DIRECT); > + data = data | (0x1 << offset); > + iowrite32be(data, mmchip->regs + GEF_GPIO_DIRECT); > + > + return 0; > +} > + > +static int gef_gpio_dir_out(struct gpio_chip *chip, unsigned offset, int value) > +{ > + unsigned int data; > + struct of_mm_gpio_chip *mmchip = to_of_mm_gpio_chip(chip); > + > + /* Set direction before switching to input */ > + _gef_gpio_set(mmchip->regs + GEF_GPIO_OUT, offset, value); > + > + data = ioread32be(mmchip->regs + GEF_GPIO_DIRECT); > + data = data & ~(0x1 << offset); > + iowrite32be(data, mmchip->regs + GEF_GPIO_DIRECT); > + > + return 0; > +} > + > +static int gef_gpio_get(struct gpio_chip *chip, unsigned offset) > +{ > + unsigned int data; > + int state = 0; > + struct of_mm_gpio_chip *mmchip = to_of_mm_gpio_chip(chip); > + > + data = ioread32be(mmchip->regs + GEF_GPIO_IN); > + state = (int)((data >> offset) & 0x1); > + > + return state; > +} > + > +static void gef_gpio_set(struct gpio_chip *chip, unsigned offset, int value) > +{ > + struct of_mm_gpio_chip *mmchip = to_of_mm_gpio_chip(chip); > + > + _gef_gpio_set(mmchip->regs + GEF_GPIO_OUT, offset, value); > +} > + > +static int __init gef_gpio_init(void) > +{ > + struct device_node *np; > + int retval; > + struct of_mm_gpio_chip *gef_gpio_chip; > + > + for_each_compatible_node(np, NULL, "gef,sbc610-gpio") { > + > + pr_debug("%s: Initialising GEF GPIO\n", np->full_name); > + > + /* Allocate chip structure */ > + gef_gpio_chip = kzalloc(sizeof(*gef_gpio_chip), GFP_KERNEL); > + if (!gef_gpio_chip) { > + pr_err("%s: Unable to allocate structure\n", > + np->full_name); > + continue; > + } > + > + /* Setup pointers to chip functions */ > + gef_gpio_chip->gc.of_gpio_n_cells = 2; > + gef_gpio_chip->gc.ngpio = 19; > + gef_gpio_chip->gc.direction_input = gef_gpio_dir_in; > + gef_gpio_chip->gc.direction_output = gef_gpio_dir_out; > + gef_gpio_chip->gc.get = gef_gpio_get; > + gef_gpio_chip->gc.set = gef_gpio_set; > + > + /* This function adds a memory mapped GPIO chip */ > + retval = of_mm_gpiochip_add(np, gef_gpio_chip); > + if (retval) { > + kfree(gef_gpio_chip); > + pr_err("%s: Unable to add GPIO\n", np->full_name); > + } > + } > + > + for_each_compatible_node(np, NULL, "gef,sbc310-gpio") { > + > + pr_debug("%s: Initialising GEF GPIO\n", np->full_name); > + > + /* Allocate chip structure */ > + gef_gpio_chip = kzalloc(sizeof(*gef_gpio_chip), GFP_KERNEL); > + if (!gef_gpio_chip) { > + pr_err("%s: Unable to allocate structure\n", > + np->full_name); > + continue; > + } > + > + /* Setup pointers to chip functions */ > + gef_gpio_chip->gc.of_gpio_n_cells = 2; > + gef_gpio_chip->gc.ngpio = 6; > + gef_gpio_chip->gc.direction_input = gef_gpio_dir_in; > + gef_gpio_chip->gc.direction_output = gef_gpio_dir_out; > + gef_gpio_chip->gc.get = gef_gpio_get; > + gef_gpio_chip->gc.set = gef_gpio_set; > + > + /* This function adds a memory mapped GPIO chip */ > + retval = of_mm_gpiochip_add(np, gef_gpio_chip); > + if (retval) { > + kfree(gef_gpio_chip); > + pr_err("%s: Unable to add GPIO\n", np->full_name); > + } > + } > + > + return 0; > +}; > +arch_initcall(gef_gpio_init); > + > +MODULE_DESCRIPTION("GE I/O FPGA GPIO driver"); > +MODULE_AUTHOR("Martyn Welch <martyn.welch@ge.com"); > +MODULE_LICENSE("GPL"); > diff --git a/arch/powerpc/platforms/ge_pic.c b/arch/powerpc/platforms/ge_pic.c > new file mode 100644 > index 0000000..a1ccef2 > --- /dev/null > +++ b/arch/powerpc/platforms/ge_pic.c > @@ -0,0 +1,252 @@ > +/* > + * Interrupt handling for GE FPGA based PIC > + * > + * Author: Martyn Welch <martyn.welch@ge.com> > + * > + * 2008 (c) GE Intelligent Platforms Embedded Systems, Inc. > + * > + * This file is licensed under the terms of the GNU General Public License > + * version 2. This program is licensed "as is" without any warranty of any > + * kind, whether express or implied. > + */ > + > +#include <linux/stddef.h> > +#include <linux/kernel.h> > +#include <linux/init.h> > +#include <linux/irq.h> > +#include <linux/interrupt.h> > +#include <linux/spinlock.h> > + > +#include <asm/byteorder.h> > +#include <asm/io.h> > +#include <asm/prom.h> > +#include <asm/irq.h> > + > +#include <platforms/ge_pic.h> > + > +#define DEBUG > +#undef DEBUG > + > +#ifdef DEBUG > +#define DBG(fmt...) do { printk(KERN_DEBUG "gef_pic: " fmt); } while (0) > +#else > +#define DBG(fmt...) do { } while (0) > +#endif > + > +#define GEF_PIC_NUM_IRQS 32 > + > +/* Interrupt Controller Interface Registers */ > +#define GEF_PIC_INTR_STATUS 0x0000 > + > +#define GEF_PIC_INTR_MASK(cpu) (0x0010 + (0x4 * cpu)) > +#define GEF_PIC_CPU0_INTR_MASK GEF_PIC_INTR_MASK(0) > +#define GEF_PIC_CPU1_INTR_MASK GEF_PIC_INTR_MASK(1) > + > +#define GEF_PIC_MCP_MASK(cpu) (0x0018 + (0x4 * cpu)) > +#define GEF_PIC_CPU0_MCP_MASK GEF_PIC_MCP_MASK(0) > +#define GEF_PIC_CPU1_MCP_MASK GEF_PIC_MCP_MASK(1) > + > + > +static DEFINE_RAW_SPINLOCK(gef_pic_lock); > + > +static void __iomem *gef_pic_irq_reg_base; > +static struct irq_host *gef_pic_irq_host; > +static int gef_pic_cascade_irq; > + > +/* > + * Interrupt Controller Handling > + * > + * The interrupt controller handles interrupts for most on board interrupts, > + * apart from PCI interrupts. For example on SBC610: > + * > + * 17:31 RO Reserved > + * 16 RO PCI Express Doorbell 3 Status > + * 15 RO PCI Express Doorbell 2 Status > + * 14 RO PCI Express Doorbell 1 Status > + * 13 RO PCI Express Doorbell 0 Status > + * 12 RO Real Time Clock Interrupt Status > + * 11 RO Temperature Interrupt Status > + * 10 RO Temperature Critical Interrupt Status > + * 9 RO Ethernet PHY1 Interrupt Status > + * 8 RO Ethernet PHY3 Interrupt Status > + * 7 RO PEX8548 Interrupt Status > + * 6 RO Reserved > + * 5 RO Watchdog 0 Interrupt Status > + * 4 RO Watchdog 1 Interrupt Status > + * 3 RO AXIS Message FIFO A Interrupt Status > + * 2 RO AXIS Message FIFO B Interrupt Status > + * 1 RO AXIS Message FIFO C Interrupt Status > + * 0 RO AXIS Message FIFO D Interrupt Status > + * > + * Interrupts can be forwarded to one of two output lines. Nothing > + * clever is done, so if the masks are incorrectly set, a single input > + * interrupt could generate interrupts on both output lines! > + * > + * The dual lines are there to allow the chained interrupts to be easily > + * passed into two different cores. We currently do not use this functionality > + * in this driver. > + * > + * Controller can also be configured to generate Machine checks (MCP), again on > + * two lines, to be attached to two different cores. It is suggested that these > + * should be masked out. > + */ > + > +void gef_pic_cascade(unsigned int irq, struct irq_desc *desc) > +{ > + struct irq_chip *chip = irq_desc_get_chip(desc); > + unsigned int cascade_irq; > + > + /* > + * See if we actually have an interrupt, call generic handling code if > + * we do. > + */ > + cascade_irq = gef_pic_get_irq(); > + > + if (cascade_irq != NO_IRQ) > + generic_handle_irq(cascade_irq); > + > + chip->irq_eoi(&desc->irq_data); > +} > + > +static void gef_pic_mask(struct irq_data *d) > +{ > + unsigned long flags; > + unsigned int hwirq = irqd_to_hwirq(d); > + u32 mask; > + > + raw_spin_lock_irqsave(&gef_pic_lock, flags); > + mask = in_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_MASK(0)); > + mask &= ~(1 << hwirq); > + out_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_MASK(0), mask); > + raw_spin_unlock_irqrestore(&gef_pic_lock, flags); > +} > + > +static void gef_pic_mask_ack(struct irq_data *d) > +{ > + /* Don't think we actually have to do anything to ack an interrupt, > + * we just need to clear down the devices interrupt and it will go away > + */ > + gef_pic_mask(d); > +} > + > +static void gef_pic_unmask(struct irq_data *d) > +{ > + unsigned long flags; > + unsigned int hwirq = irqd_to_hwirq(d); > + u32 mask; > + > + raw_spin_lock_irqsave(&gef_pic_lock, flags); > + mask = in_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_MASK(0)); > + mask |= (1 << hwirq); > + out_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_MASK(0), mask); > + raw_spin_unlock_irqrestore(&gef_pic_lock, flags); > +} > + > +static struct irq_chip gef_pic_chip = { > + .name = "gefp", > + .irq_mask = gef_pic_mask, > + .irq_mask_ack = gef_pic_mask_ack, > + .irq_unmask = gef_pic_unmask, > +}; > + > + > +/* When an interrupt is being configured, this call allows some flexibilty > + * in deciding which irq_chip structure is used > + */ > +static int gef_pic_host_map(struct irq_host *h, unsigned int virq, > + irq_hw_number_t hwirq) > +{ > + /* All interrupts are LEVEL sensitive */ > + irq_set_status_flags(virq, IRQ_LEVEL); > + irq_set_chip_and_handler(virq, &gef_pic_chip, handle_level_irq); > + > + return 0; > +} > + > +static int gef_pic_host_xlate(struct irq_host *h, struct device_node *ct, > + const u32 *intspec, unsigned int intsize, > + irq_hw_number_t *out_hwirq, unsigned int *out_flags) > +{ > + > + *out_hwirq = intspec[0]; > + if (intsize > 1) > + *out_flags = intspec[1]; > + else > + *out_flags = IRQ_TYPE_LEVEL_HIGH; > + > + return 0; > +} > + > +static struct irq_host_ops gef_pic_host_ops = { > + .map = gef_pic_host_map, > + .xlate = gef_pic_host_xlate, > +}; > + > + > +/* > + * Initialisation of PIC, this should be called in BSP > + */ > +void __init gef_pic_init(struct device_node *np) > +{ > + unsigned long flags; > + > + /* Map the devices registers into memory */ > + gef_pic_irq_reg_base = of_iomap(np, 0); > + > + raw_spin_lock_irqsave(&gef_pic_lock, flags); > + > + /* Initialise everything as masked. */ > + out_be32(gef_pic_irq_reg_base + GEF_PIC_CPU0_INTR_MASK, 0); > + out_be32(gef_pic_irq_reg_base + GEF_PIC_CPU1_INTR_MASK, 0); > + > + out_be32(gef_pic_irq_reg_base + GEF_PIC_CPU0_MCP_MASK, 0); > + out_be32(gef_pic_irq_reg_base + GEF_PIC_CPU1_MCP_MASK, 0); > + > + raw_spin_unlock_irqrestore(&gef_pic_lock, flags); > + > + /* Map controller */ > + gef_pic_cascade_irq = irq_of_parse_and_map(np, 0); > + if (gef_pic_cascade_irq == NO_IRQ) { > + printk(KERN_ERR "SBC610: failed to map cascade interrupt"); > + return; > + } > + > + /* Setup an irq_host structure */ > + gef_pic_irq_host = irq_alloc_host(np, IRQ_HOST_MAP_LINEAR, > + GEF_PIC_NUM_IRQS, > + &gef_pic_host_ops, NO_IRQ); > + if (gef_pic_irq_host == NULL) > + return; > + > + /* Chain with parent controller */ > + irq_set_chained_handler(gef_pic_cascade_irq, gef_pic_cascade); > +} > + > +/* > + * This is called when we receive an interrupt with apparently comes from this > + * chip - check, returning the highest interrupt generated or return NO_IRQ > + */ > +unsigned int gef_pic_get_irq(void) > +{ > + u32 cause, mask, active; > + unsigned int virq = NO_IRQ; > + int hwirq; > + > + cause = in_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_STATUS); > + > + mask = in_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_MASK(0)); > + > + active = cause & mask; > + > + if (active) { > + for (hwirq = GEF_PIC_NUM_IRQS - 1; hwirq > -1; hwirq--) { > + if (active & (0x1 << hwirq)) > + break; > + } > + virq = irq_linear_revmap(gef_pic_irq_host, > + (irq_hw_number_t)hwirq); > + } > + > + return virq; > +} > + > diff --git a/arch/powerpc/platforms/ge_pic.h b/arch/powerpc/platforms/ge_pic.h > new file mode 100644 > index 0000000..6149916 > --- /dev/null > +++ b/arch/powerpc/platforms/ge_pic.h > @@ -0,0 +1,11 @@ > +#ifndef __GEF_PIC_H__ > +#define __GEF_PIC_H__ > + > +#include <linux/init.h> > + > +void gef_pic_cascade(unsigned int, struct irq_desc *); > +unsigned int gef_pic_get_irq(void); > +void gef_pic_init(struct device_node *); > + > +#endif /* __GEF_PIC_H__ */ > + > diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig > index 877b107..2955c3f 100644 > --- a/drivers/watchdog/Kconfig > +++ b/drivers/watchdog/Kconfig > @@ -1039,7 +1039,7 @@ config LANTIQ_WDT > > config GEF_WDT > tristate "GE Watchdog Timer" > - depends on GEF_SBC610 || GEF_SBC310 || GEF_PPC9A > + depends on GE_FPGA > ---help--- > Watchdog timer found in a number of GE single board computers. > ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] powerpc: Move GE GPIO and PIC drivers 2012-02-26 23:37 ` Benjamin Herrenschmidt @ 2012-02-27 13:57 ` Martyn Welch 2012-02-27 21:32 ` Benjamin Herrenschmidt 0 siblings, 1 reply; 7+ messages in thread From: Martyn Welch @ 2012-02-27 13:57 UTC (permalink / raw) To: Benjamin Herrenschmidt; +Cc: Wim Van Sebroeck, linuxppc-dev, linux-kernel On 26/02/12 23:37, Benjamin Herrenschmidt wrote: > On Tue, 2012-02-07 at 11:28 +0000, Martyn Welch wrote: >> Move the GE GPIO and PIC drivers to allow these to be used by non-86xx >> boards. > > Hi, Sorry for the late review... > No problem, thanks for the review! >> Signed-off-by: Martyn Welch <martyn.welch@ge.com> >> --- >> arch/powerpc/platforms/86xx/Kconfig | 3 + >> arch/powerpc/platforms/86xx/Makefile | 7 +- >> arch/powerpc/platforms/86xx/gef_gpio.c | 171 -------------------- >> arch/powerpc/platforms/86xx/gef_pic.c | 252 ------------------------------ >> arch/powerpc/platforms/86xx/gef_pic.h | 11 -- >> arch/powerpc/platforms/86xx/gef_ppc9a.c | 3 +- >> arch/powerpc/platforms/86xx/gef_sbc310.c | 3 +- >> arch/powerpc/platforms/86xx/gef_sbc610.c | 3 +- >> arch/powerpc/platforms/Kconfig | 7 + >> arch/powerpc/platforms/Makefile | 3 + >> arch/powerpc/platforms/ge_gpio.c | 171 ++++++++++++++++++++ >> arch/powerpc/platforms/ge_pic.c | 252 ++++++++++++++++++++++++++++++ >> arch/powerpc/platforms/ge_pic.h | 11 ++ > > So I don't like having files showing up there. In fact, I want to move > the only other one here, it's not the right place for it > (fsl_uli1575.c). > This patch (or one like it) has been around for a while now. Kumar wanted me to put them here rather than sysdev[1], but I'm easy either way. > Please contemplate using arch/powerpc/sysdev instead. Maybe make a > subdir in there (geip or something like that ?) > I'd rather avoid "geip" (we seem to have a habit of renaming divisions), would "ge" be acceptable? > Also, use git mv so that the file moves appear as such in the history, > this will make review easier by clearly separating the move from actual > changes to the files. > Hmm, thought I'd done that. Will try again. Martyn [1] http://old.nabble.com/GE-GPIO-and-PIC-support.-td27212938.html -- Martyn Welch (Lead Software Engineer) | Registered in England and Wales GE Intelligent Platforms | (3828642) at 100 Barbirolli Square T +44(0)1327322748 | Manchester, M2 3AB E martyn.welch@ge.com | VAT:GB 927559189 ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] powerpc: Move GE GPIO and PIC drivers 2012-02-27 13:57 ` Martyn Welch @ 2012-02-27 21:32 ` Benjamin Herrenschmidt 0 siblings, 0 replies; 7+ messages in thread From: Benjamin Herrenschmidt @ 2012-02-27 21:32 UTC (permalink / raw) To: Martyn Welch; +Cc: Wim Van Sebroeck, linuxppc-dev, linux-kernel On Mon, 2012-02-27 at 13:57 +0000, Martyn Welch wrote: > This patch (or one like it) has been around for a while now. Kumar wanted me > to put them here rather than sysdev[1], but I'm easy either way. Ah well, I disagree with Kumar here :-) One thing you can do is put all your platforms files including the drivers in platforms/ge, that works too. What I don't want is to have stray files at the top-level of platforms. > > Also, use git mv so that the file moves appear as such in the history, > > this will make review easier by clearly separating the move from actual > > changes to the files. > > > > Hmm, thought I'd done that. Will try again. Could be the way you exported the patch, I don't remember the git option off the top of my head but there's a way to make it show the moves as such. Cheers, Ben. ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 2/2] powerpc: Board support for GE IMP3A 2012-02-07 11:28 [PATCH 0/2] powerpc: Add support for GE IMP3A Martyn Welch 2012-02-07 11:28 ` [PATCH 1/2] powerpc: Move GE GPIO and PIC drivers Martyn Welch @ 2012-02-07 11:28 ` Martyn Welch 2012-02-26 23:42 ` Benjamin Herrenschmidt 1 sibling, 1 reply; 7+ messages in thread From: Martyn Welch @ 2012-02-07 11:28 UTC (permalink / raw) To: linuxppc-dev; +Cc: Martyn Welch, Wim Van Sebroeck, linux-kernel Initial board support for the GE IMP3A, a 3U compactPCI card with a p2020 processor. Signed-off-by: Martyn Welch <martyn.welch@ge.com> --- arch/powerpc/boot/dts/ge_imp3a.dts | 254 ++++++++++++++++++++++++++++++ arch/powerpc/configs/ge_imp3a_defconfig | 256 ++++++++++++++++++++++++++++++ arch/powerpc/platforms/85xx/Kconfig | 12 ++ arch/powerpc/platforms/85xx/Makefile | 1 + arch/powerpc/platforms/85xx/ge_imp3a.c | 258 +++++++++++++++++++++++++++++++ arch/powerpc/platforms/ge_gpio.c | 28 ++++ 6 files changed, 809 insertions(+), 0 deletions(-) create mode 100644 arch/powerpc/boot/dts/ge_imp3a.dts create mode 100644 arch/powerpc/configs/ge_imp3a_defconfig create mode 100644 arch/powerpc/platforms/85xx/ge_imp3a.c diff --git a/arch/powerpc/boot/dts/ge_imp3a.dts b/arch/powerpc/boot/dts/ge_imp3a.dts new file mode 100644 index 0000000..f30fadb --- /dev/null +++ b/arch/powerpc/boot/dts/ge_imp3a.dts @@ -0,0 +1,254 @@ +/* + * GE IMP3A Device Tree Source + * + * Copyright 2010-2011 GE Intelligent Platforms Embedded Systems, Inc. + * + * 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. + * + * Based on: P2020 DS Device Tree Source + * Copyright 2009 Freescale Semiconductor Inc. + */ + +/include/ "fsl/p2020si-pre.dtsi" + +/ { + model = "GE_IMP3A"; + compatible = "ge,imp3a"; + + memory { + device_type = "memory"; + }; + + lbc: localbus@fef05000 { + reg = <0 0xfef05000 0 0x1000>; + + ranges = <0x0 0x0 0x0 0xff000000 0x01000000 + 0x1 0x0 0x0 0xe0000000 0x08000000 + 0x2 0x0 0x0 0xe8000000 0x08000000 + 0x3 0x0 0x0 0xfc100000 0x00020000 + 0x4 0x0 0x0 0xfc000000 0x00008000 + 0x5 0x0 0x0 0xfc008000 0x00008000 + 0x6 0x0 0x0 0xfee00000 0x00040000 + 0x7 0x0 0x0 0xfee80000 0x00040000>; + + /* nor@0,0 is a mirror of part of the memory in nor@1,0 + nor@0,0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "ge,imp3a-firmware-mirror", "cfi-flash"; + reg = <0x0 0x0 0x1000000>; + bank-width = <2>; + device-width = <1>; + + partition@0 { + label = "firmware"; + reg = <0x0 0x1000000>; + read-only; + }; + }; + */ + + nor@1,0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "ge,imp3a-paged-flash", "cfi-flash"; + reg = <0x1 0x0 0x8000000>; + bank-width = <2>; + device-width = <1>; + + partition@0 { + label = "user"; + reg = <0x0 0x7800000>; + }; + + partition@7800000 { + label = "firmware"; + reg = <0x7800000 0x800000>; + read-only; + }; + }; + + nvram@3,0 { + device_type = "nvram"; + compatible = "simtek,stk14ca8"; + reg = <0x3 0x0 0x20000>; + }; + + fpga@4,0 { + compatible = "ge,imp3a-fpga-regs"; + reg = <0x4 0x0 0x20>; + }; + + gef_pic: pic@4,20 { + #interrupt-cells = <1>; + interrupt-controller; + compatible = "ge,imp3a-fpga-pic", "gef,fpga-pic-1.00"; + reg = <0x4 0x20 0x20>; + interrupts = <6 7 0 0>; + }; + + gef_gpio: gpio@4,400 { + #gpio-cells = <2>; + compatible = "ge,imp3a-gpio"; + reg = <0x4 0x400 0x24>; + gpio-controller; + }; + + wdt@4,800 { + compatible = "ge,imp3a-fpga-wdt", "gef,fpga-wdt-1.00", + "gef,fpga-wdt"; + reg = <0x4 0x800 0x8>; + interrupts = <10 4>; + interrupt-parent = <&gef_pic>; + }; + + /* Second watchdog available, driver currently supports one. + wdt@4,808 { + compatible = "gef,imp3a-fpga-wdt", "gef,fpga-wdt-1.00", + "gef,fpga-wdt"; + reg = <0x4 0x808 0x8>; + interrupts = <9 4>; + interrupt-parent = <&gef_pic>; + }; + */ + + nand@6,0 { + compatible = "fsl,elbc-fcm-nand"; + reg = <0x6 0x0 0x40000>; + }; + + nand@7,0 { + compatible = "fsl,elbc-fcm-nand"; + reg = <0x7 0x0 0x40000>; + }; + }; + + soc: soc@fef00000 { + ranges = <0x0 0 0xfef00000 0x100000>; + + i2c@3000 { + hwmon@48 { + compatible = "national,lm92"; + reg = <0x48>; + }; + + hwmon@4c { + compatible = "adi,adt7461"; + reg = <0x4c>; + }; + + rtc@51 { + compatible = "epson,rx8581"; + reg = <0x51>; + }; + + eti@6b { + compatible = "dallas,ds1682"; + reg = <0x6b>; + }; + }; + + usb@22000 { + phy_type = "ulpi"; + dr_mode = "host"; + }; + + mdio@24520 { + phy0: ethernet-phy@0 { + interrupt-parent = <&gef_pic>; + interrupts = <0xc 0x4>; + reg = <0x1>; + }; + phy1: ethernet-phy@1 { + interrupt-parent = <&gef_pic>; + interrupts = <0xb 0x4>; + reg = <0x2>; + }; + tbi0: tbi-phy@11 { + reg = <0x11>; + device_type = "tbi-phy"; + }; + }; + + mdio@25520 { + tbi1: tbi-phy@11 { + reg = <0x11>; + device_type = "tbi-phy"; + }; + }; + + mdio@26520 { + status = "disabled"; + }; + + enet0: ethernet@24000 { + tbi-handle = <&tbi0>; + phy-handle = <&phy0>; + phy-connection-type = "gmii"; + }; + + enet1: ethernet@25000 { + tbi-handle = <&tbi1>; + phy-handle = <&phy1>; + phy-connection-type = "gmii"; + }; + + enet2: ethernet@26000 { + status = "disabled"; + }; + }; + + pci0: pcie@fef08000 { + ranges = <0x2000000 0x0 0xc0000000 0 0xc0000000 0x0 0x20000000 + 0x1000000 0x0 0x00000000 0 0xfe020000 0x0 0x10000>; + reg = <0 0xfef08000 0 0x1000>; + + pcie@0 { + ranges = <0x2000000 0x0 0xc0000000 + 0x2000000 0x0 0xc0000000 + 0x0 0x20000000 + + 0x1000000 0x0 0x0 + 0x1000000 0x0 0x0 + 0x0 0x10000>; + }; + }; + + pci1: pcie@fef09000 { + reg = <0 0xfef09000 0 0x1000>; + ranges = <0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x20000000 + 0x1000000 0x0 0x00000000 0 0xfe010000 0x0 0x10000>; + + pcie@0 { + ranges = <0x2000000 0x0 0xa0000000 + 0x2000000 0x0 0xa0000000 + 0x0 0x20000000 + + 0x1000000 0x0 0x0 + 0x1000000 0x0 0x0 + 0x0 0x10000>; + }; + + }; + + pci2: pcie@fef0a000 { + reg = <0 0xfef0a000 0 0x1000>; + ranges = <0x2000000 0x0 0x80000000 0 0x80000000 0x0 0x20000000 + 0x1000000 0x0 0x00000000 0 0xfe000000 0x0 0x10000>; + + pcie@0 { + ranges = <0x2000000 0x0 0x80000000 + 0x2000000 0x0 0x80000000 + 0x0 0x20000000 + + 0x1000000 0x0 0x0 + 0x1000000 0x0 0x0 + 0x0 0x10000>; + }; + }; +}; + +/include/ "fsl/p2020si-post.dtsi" diff --git a/arch/powerpc/configs/ge_imp3a_defconfig b/arch/powerpc/configs/ge_imp3a_defconfig new file mode 100644 index 0000000..ca4c5cb --- /dev/null +++ b/arch/powerpc/configs/ge_imp3a_defconfig @@ -0,0 +1,256 @@ +CONFIG_PPC_85xx=y +CONFIG_SMP=y +CONFIG_NR_CPUS=2 +CONFIG_EXPERIMENTAL=y +CONFIG_SYSVIPC=y +CONFIG_POSIX_MQUEUE=y +CONFIG_BSD_PROCESS_ACCT=y +CONFIG_BSD_PROCESS_ACCT_V3=y +CONFIG_SPARSE_IRQ=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +# CONFIG_UTS_NS is not set +# CONFIG_IPC_NS is not set +# CONFIG_USER_NS is not set +# CONFIG_PID_NS is not set +# CONFIG_NET_NS is not set +CONFIG_SYSFS_DEPRECATED=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_RELAY=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_PERF_EVENTS=y +CONFIG_SLAB=y +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_BLK_DEV_BSG is not set +CONFIG_GE_IMP3A=y +CONFIG_QUICC_ENGINE=y +CONFIG_QE_GPIO=y +CONFIG_CPM2=y +CONFIG_HIGHMEM=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_HZ_1000=y +CONFIG_PREEMPT=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_BINFMT_MISC=m +CONFIG_MATH_EMULATION=y +CONFIG_IRQ_ALL_CPUS=y +CONFIG_FORCE_MAX_ZONEORDER=17 +CONFIG_PCI=y +CONFIG_PCIEPORTBUS=y +CONFIG_PCI_MSI=y +CONFIG_PCCARD=y +# CONFIG_PCMCIA_LOAD_CIS is not set +CONFIG_YENTA=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_XFRM_USER=m +CONFIG_NET_KEY=y +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_ROUTE_MULTIPATH=y +CONFIG_IP_ROUTE_VERBOSE=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +CONFIG_IP_PNP_RARP=y +CONFIG_NET_IPIP=m +CONFIG_IP_MROUTE=y +CONFIG_IP_PIMSM_V1=y +CONFIG_IP_PIMSM_V2=y +CONFIG_SYN_COOKIES=y +CONFIG_INET_AH=m +CONFIG_INET_ESP=m +CONFIG_INET_IPCOMP=m +# CONFIG_INET_XFRM_MODE_BEET is not set +CONFIG_INET6_AH=m +CONFIG_INET6_IPCOMP=m +CONFIG_IPV6_TUNNEL=m +CONFIG_NET_PKTGEN=m +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +CONFIG_MTD=y +CONFIG_MTD_OF_PARTS=y +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_CFI=y +CONFIG_MTD_JEDECPROBE=y +CONFIG_MTD_CFI_INTELEXT=y +CONFIG_MTD_CFI_AMDSTD=y +CONFIG_MTD_PHYSMAP_OF=y +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_FSL_ELBC=y +CONFIG_PROC_DEVICETREE=y +CONFIG_BLK_DEV_LOOP=m +CONFIG_BLK_DEV_CRYPTOLOOP=m +CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_SIZE=131072 +CONFIG_MISC_DEVICES=y +CONFIG_DS1682=y +CONFIG_BLK_DEV_SD=y +CONFIG_CHR_DEV_ST=y +CONFIG_BLK_DEV_SR=y +CONFIG_ATA=y +CONFIG_SATA_AHCI=y +CONFIG_SATA_SIL24=y +# CONFIG_ATA_SFF is not set +CONFIG_NETDEVICES=y +CONFIG_BONDING=m +CONFIG_DUMMY=m +CONFIG_NETCONSOLE=y +CONFIG_NETPOLL_TRAP=y +CONFIG_TUN=m +# CONFIG_NET_VENDOR_3COM is not set +CONFIG_FS_ENET=y +CONFIG_UCC_GETH=y +CONFIG_GIANFAR=y +CONFIG_PPP=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_FILTER=y +CONFIG_PPP_MULTILINK=y +CONFIG_PPPOE=m +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_SLIP=m +CONFIG_SLIP_COMPRESSED=y +CONFIG_SLIP_SMART=y +CONFIG_SLIP_MODE_SLIP6=y +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_SERIO is not set +# CONFIG_LEGACY_PTYS is not set +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_NR_UARTS=2 +CONFIG_SERIAL_8250_RUNTIME_UARTS=2 +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_MANY_PORTS=y +CONFIG_SERIAL_8250_DETECT_IRQ=y +CONFIG_SERIAL_8250_RSA=y +CONFIG_SERIAL_QE=m +CONFIG_NVRAM=y +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_CPM=m +CONFIG_I2C_MPC=y +CONFIG_GPIO_SYSFS=y +CONFIG_SENSORS_LM90=y +CONFIG_SENSORS_LM92=y +CONFIG_WATCHDOG=y +CONFIG_GEF_WDT=y +CONFIG_VIDEO_OUTPUT_CONTROL=m +CONFIG_HID_DRAGONRISE=y +CONFIG_HID_GYRATION=y +CONFIG_HID_TWINHAN=y +CONFIG_HID_ORTEK=y +CONFIG_HID_PANTHERLORD=y +CONFIG_HID_PETALYNX=y +CONFIG_HID_SAMSUNG=y +CONFIG_HID_SONY=y +CONFIG_HID_SUNPLUS=y +CONFIG_HID_GREENASIA=y +CONFIG_HID_SMARTJOYPLUS=y +CONFIG_HID_TOPSEED=y +CONFIG_HID_THRUSTMASTER=y +CONFIG_HID_ZEROPLUS=y +CONFIG_USB=y +CONFIG_USB_DEVICEFS=y +CONFIG_USB_EHCI_HCD=y +# CONFIG_USB_EHCI_TT_NEWSCHED is not set +CONFIG_USB_EHCI_FSL=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_HCD_PPC_OF_BE=y +CONFIG_USB_OHCI_HCD_PPC_OF_LE=y +CONFIG_USB_STORAGE=y +CONFIG_EDAC=y +CONFIG_EDAC_MM_EDAC=y +CONFIG_EDAC_MPC85XX=y +CONFIG_RTC_CLASS=y +# CONFIG_RTC_INTF_PROC is not set +CONFIG_RTC_DRV_RX8581=y +CONFIG_DMADEVICES=y +CONFIG_FSL_DMA=y +# CONFIG_NET_DMA is not set +CONFIG_EXT2_FS=y +CONFIG_EXT2_FS_XATTR=y +CONFIG_EXT2_FS_POSIX_ACL=y +CONFIG_EXT3_FS=y +# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set +CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT4_FS=y +CONFIG_FUSE_FS=y +CONFIG_ISO9660_FS=y +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=850 +CONFIG_FAT_DEFAULT_IOCHARSET="ascii" +CONFIG_NTFS_FS=y +CONFIG_PROC_KCORE=y +CONFIG_TMPFS=y +CONFIG_JFFS2_FS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +CONFIG_NFS_V4=y +CONFIG_ROOT_NFS=y +CONFIG_NFSD=y +CONFIG_NFSD_V4=y +CONFIG_CIFS=m +CONFIG_CIFS_XATTR=y +CONFIG_CIFS_POSIX=y +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=y +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ASCII=y +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=y +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_UTF8=y +CONFIG_CRC_CCITT=y +CONFIG_CRC_T10DIF=y +CONFIG_LIBCRC32C=y +CONFIG_MAGIC_SYSRQ=y +CONFIG_SYSCTL_SYSCALL_CHECK=y +CONFIG_CRYPTO_CBC=y +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_DES=y +# CONFIG_CRYPTO_ANSI_CPRNG is not set +CONFIG_CRYPTO_DEV_TALITOS=y diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig index d7946be..96ae241 100644 --- a/arch/powerpc/platforms/85xx/Kconfig +++ b/arch/powerpc/platforms/85xx/Kconfig @@ -171,6 +171,18 @@ config SBC8560 help This option enables support for the Wind River SBC8560 board +config GE_IMP3A + bool "GE Intelligent Platforms IMP3A" + select DEFAULT_UIMAGE + select SWIOTLB + select MMIO_NVRAM + select GENERIC_GPIO + select ARCH_REQUIRE_GPIOLIB + select GE_FPGA + help + This option enables support for the GE Intelligent Platforms IMP3A + board. + config P2041_RDB bool "Freescale P2041 RDB" select DEFAULT_UIMAGE diff --git a/arch/powerpc/platforms/85xx/Makefile b/arch/powerpc/platforms/85xx/Makefile index 9cb2d43..2125d4c 100644 --- a/arch/powerpc/platforms/85xx/Makefile +++ b/arch/powerpc/platforms/85xx/Makefile @@ -27,3 +27,4 @@ obj-$(CONFIG_SBC8548) += sbc8548.o obj-$(CONFIG_SOCRATES) += socrates.o socrates_fpga_pic.o obj-$(CONFIG_KSI8560) += ksi8560.o obj-$(CONFIG_XES_MPC85xx) += xes_mpc85xx.o +obj-$(CONFIG_GE_IMP3A) += ge_imp3a.o diff --git a/arch/powerpc/platforms/85xx/ge_imp3a.c b/arch/powerpc/platforms/85xx/ge_imp3a.c new file mode 100644 index 0000000..cae3e15 --- /dev/null +++ b/arch/powerpc/platforms/85xx/ge_imp3a.c @@ -0,0 +1,258 @@ +/* + * GE IMP3A Board Setup + * + * Author Martyn Welch <martyn.welch@ge.com> + * + * Copyright 2010 GE Intelligent Platforms Embedded Systems, Inc. + * + * 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. + * + * Based on: mpc85xx_ds.c (MPC85xx DS Board Setup) + * Copyright 2007 Freescale Semiconductor Inc. + */ + +#include <linux/stddef.h> +#include <linux/kernel.h> +#include <linux/pci.h> +#include <linux/kdev_t.h> +#include <linux/delay.h> +#include <linux/seq_file.h> +#include <linux/interrupt.h> +#include <linux/of_platform.h> +#include <linux/memblock.h> + +#include <asm/system.h> +#include <asm/time.h> +#include <asm/machdep.h> +#include <asm/pci-bridge.h> +#include <mm/mmu_decl.h> +#include <asm/prom.h> +#include <asm/udbg.h> +#include <asm/mpic.h> +#include <asm/swiotlb.h> +#include <asm/nvram.h> + +#include <sysdev/fsl_soc.h> +#include <sysdev/fsl_pci.h> + +#include "mpc85xx.h" +#include <platforms/ge_pic.h> + +#undef DEBUG + +#ifdef DEBUG +#define DBG(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args) +#else +#define DBG(fmt, args...) +#endif + +void __iomem *imp3a_regs; + +void __init ge_imp3a_pic_init(void) +{ + struct mpic *mpic; + struct device_node *np; + struct device_node *cascade_node = NULL; + unsigned long root = of_get_flat_dt_root(); + + if (of_flat_dt_is_compatible(root, "fsl,MPC8572DS-CAMP")) { + mpic = mpic_alloc(NULL, 0, + MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS | + MPIC_SINGLE_DEST_CPU, + 0, 256, " OpenPIC "); + } else { + mpic = mpic_alloc(NULL, 0, + MPIC_WANTS_RESET | + MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS | + MPIC_SINGLE_DEST_CPU, + 0, 256, " OpenPIC "); + } + + BUG_ON(mpic == NULL); + mpic_init(mpic); + /* + * There is a simple interrupt handler in the main FPGA, this needs + * to be cascaded into the MPIC + */ + for_each_node_by_type(np, "interrupt-controller") + if (of_device_is_compatible(np, "gef,fpga-pic-1.00")) { + cascade_node = np; + break; + } + + if (cascade_node == NULL) { + printk(KERN_WARNING "IMP3A: No FPGA PIC\n"); + return; + } + + gef_pic_init(cascade_node); + of_node_put(cascade_node); +} + +#ifdef CONFIG_PCI +static int primary_phb_addr; +#endif /* CONFIG_PCI */ + +/* + * Setup the architecture + */ +#ifdef CONFIG_SMP +extern void __init mpc85xx_smp_init(void); +#endif +static void __init ge_imp3a_setup_arch(void) +{ + struct device_node *regs; +#ifdef CONFIG_PCI + struct device_node *np; + struct pci_controller *hose; +#endif + dma_addr_t max = 0xffffffff; + + if (ppc_md.progress) + ppc_md.progress("ge_imp3a_setup_arch()", 0); + +#ifdef CONFIG_PCI + for_each_node_by_type(np, "pci") { + if (of_device_is_compatible(np, "fsl,mpc8540-pci") || + of_device_is_compatible(np, "fsl,mpc8548-pcie") || + of_device_is_compatible(np, "fsl,p2020-pcie")) { + struct resource rsrc; + of_address_to_resource(np, 0, &rsrc); + if ((rsrc.start & 0xfffff) == primary_phb_addr) + fsl_add_bridge(np, 1); + else + fsl_add_bridge(np, 0); + + hose = pci_find_hose_for_OF_device(np); + max = min(max, hose->dma_window_base_cur + + hose->dma_window_size); + } + } +#endif + +#ifdef CONFIG_SMP + mpc85xx_smp_init(); +#endif + +#ifdef CONFIG_SWIOTLB + if (memblock_end_of_DRAM() > max) { + ppc_swiotlb_enable = 1; + set_pci_dma_ops(&swiotlb_dma_ops); + ppc_md.pci_dma_dev_setup = pci_dma_dev_setup_swiotlb; + } +#endif + + /* Remap basic board registers */ + regs = of_find_compatible_node(NULL, NULL, "ge,imp3a-fpga-regs"); + if (regs) { + imp3a_regs = of_iomap(regs, 0); + if (imp3a_regs == NULL) + printk(KERN_WARNING "Unable to map board registers\n"); + of_node_put(regs); + } + +#if defined(CONFIG_MMIO_NVRAM) + mmio_nvram_init(); +#endif + + printk("GE Intelligent Platforms IMP3A 3U cPCI SBC\n"); +} + +/* Return the PCB revision */ +static unsigned int ge_imp3a_get_pcb_rev(void) +{ + unsigned int reg; + + reg = ioread16(imp3a_regs); + return (reg >> 8) & 0xff; +} + +/* Return the board (software) revision */ +static unsigned int ge_imp3a_get_board_rev(void) +{ + unsigned int reg; + + reg = ioread16(imp3a_regs + 0x2); + return reg & 0xff; +} + +/* Return the FPGA revision */ +static unsigned int ge_imp3a_get_fpga_rev(void) +{ + unsigned int reg; + + reg = ioread16(imp3a_regs + 0x2); + return (reg >> 8) & 0xff; +} + +/* Return compactPCI Geographical Address */ +static unsigned int ge_imp3a_get_cpci_geo_addr(void) +{ + unsigned int reg; + + reg = ioread16(imp3a_regs + 0x6); + return ((reg & 0x0f00) >> 8); +} + +/* Return compactPCI System Controller Status */ +static unsigned int ge_imp3a_get_cpci_is_syscon(void) +{ + unsigned int reg; + + reg = ioread16(imp3a_regs + 0x6); + return reg & (1 << 12); +} + +static void ge_imp3a_show_cpuinfo(struct seq_file *m) +{ + seq_printf(m, "Vendor\t\t: GE Intelligent Platforms\n"); + + seq_printf(m, "Revision\t: %u%c\n", ge_imp3a_get_pcb_rev(), + ('A' + ge_imp3a_get_board_rev() - 1)); + + seq_printf(m, "FPGA Revision\t: %u\n", ge_imp3a_get_fpga_rev()); + + seq_printf(m, "cPCI geo. addr\t: %u\n", ge_imp3a_get_cpci_geo_addr()); + + seq_printf(m, "cPCI syscon\t: %s\n", + ge_imp3a_get_cpci_is_syscon() ? "yes" : "no"); +} + +/* + * Called very early, device-tree isn't unflattened + */ +static int __init ge_imp3a_probe(void) +{ + unsigned long root = of_get_flat_dt_root(); + + if (of_flat_dt_is_compatible(root, "ge,IMP3A")) { +#ifdef CONFIG_PCI + primary_phb_addr = 0x9000; +#endif + return 1; + } + + return 0; +} + +machine_device_initcall(ge_imp3a, mpc85xx_common_publish_devices); + +machine_arch_initcall(ge_imp3a, swiotlb_setup_bus_notifier); + +define_machine(ge_imp3a) { + .name = "GE_IMP3A", + .probe = ge_imp3a_probe, + .setup_arch = ge_imp3a_setup_arch, + .init_IRQ = ge_imp3a_pic_init, + .show_cpuinfo = ge_imp3a_show_cpuinfo, +#ifdef CONFIG_PCI + .pcibios_fixup_bus = fsl_pcibios_fixup_bus, +#endif + .get_irq = mpic_get_irq, + .restart = fsl_rstcr_restart, + .calibrate_decr = generic_calibrate_decr, + .progress = udbg_progress, +}; diff --git a/arch/powerpc/platforms/ge_gpio.c b/arch/powerpc/platforms/ge_gpio.c index 2a70336..a017def 100644 --- a/arch/powerpc/platforms/ge_gpio.c +++ b/arch/powerpc/platforms/ge_gpio.c @@ -162,6 +162,34 @@ static int __init gef_gpio_init(void) } } + for_each_compatible_node(np, NULL, "ge,imp3a-gpio") { + + pr_debug("%s: Initialising GE GPIO\n", np->full_name); + + /* Allocate chip structure */ + gef_gpio_chip = kzalloc(sizeof(*gef_gpio_chip), GFP_KERNEL); + if (!gef_gpio_chip) { + pr_err("%s: Unable to allocate structure\n", + np->full_name); + continue; + } + + /* Setup pointers to chip functions */ + gef_gpio_chip->gc.of_gpio_n_cells = 2; + gef_gpio_chip->gc.ngpio = 16; + gef_gpio_chip->gc.direction_input = gef_gpio_dir_in; + gef_gpio_chip->gc.direction_output = gef_gpio_dir_out; + gef_gpio_chip->gc.get = gef_gpio_get; + gef_gpio_chip->gc.set = gef_gpio_set; + + /* This function adds a memory mapped GPIO chip */ + retval = of_mm_gpiochip_add(np, gef_gpio_chip); + if (retval) { + kfree(gef_gpio_chip); + pr_err("%s: Unable to add GPIO\n", np->full_name); + } + } + return 0; }; arch_initcall(gef_gpio_init); -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] powerpc: Board support for GE IMP3A 2012-02-07 11:28 ` [PATCH 2/2] powerpc: Board support for GE IMP3A Martyn Welch @ 2012-02-26 23:42 ` Benjamin Herrenschmidt 0 siblings, 0 replies; 7+ messages in thread From: Benjamin Herrenschmidt @ 2012-02-26 23:42 UTC (permalink / raw) To: Martyn Welch; +Cc: Wim Van Sebroeck, linuxppc-dev, linux-kernel On Tue, 2012-02-07 at 11:28 +0000, Martyn Welch wrote: > + > + if (of_flat_dt_is_compatible(root, "fsl,MPC8572DS-CAMP")) { > + mpic = mpic_alloc(NULL, 0, > + MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS | > + MPIC_SINGLE_DEST_CPU, > + 0, 256, " OpenPIC "); > + } else { > + mpic = mpic_alloc(NULL, 0, > + MPIC_WANTS_RESET | > + MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS | > + MPIC_SINGLE_DEST_CPU, > + 0, 256, " OpenPIC "); > + } > + Can you rebase this on top of powerpc-next ? There have been some mpic changes from Kyle Moffett that clash with this (mostly some of the flags are gone, the remaining ones you should just put in the device-tree). Cheers, Ben. ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2012-02-27 22:01 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-02-07 11:28 [PATCH 0/2] powerpc: Add support for GE IMP3A Martyn Welch 2012-02-07 11:28 ` [PATCH 1/2] powerpc: Move GE GPIO and PIC drivers Martyn Welch 2012-02-26 23:37 ` Benjamin Herrenschmidt 2012-02-27 13:57 ` Martyn Welch 2012-02-27 21:32 ` Benjamin Herrenschmidt 2012-02-07 11:28 ` [PATCH 2/2] powerpc: Board support for GE IMP3A Martyn Welch 2012-02-26 23:42 ` Benjamin Herrenschmidt
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).