[PATCH 0/2] microblaze: Fix timer and interrupt code

older
[PATCH v4 00/23] microblaze: Add...

Michal Simek

8 Jun 2022 8 Jun '22

12:38 p.m.

Hi,

this series is moving timer to generic drivers/timer/ location and it is removing unused interrupt code in architecture.

note: This patchset is based on rela and cache series.

Thanks, Michal

Michal Simek (2): microblaze: Convert axi timer to DM driver microblaze: Remove interrupt handler

MAINTAINERS | 1 + arch/Kconfig | 6 +- arch/microblaze/cpu/Makefile | 2 +- arch/microblaze/cpu/interrupts.c | 182 +----------------- arch/microblaze/cpu/timer.c | 123 ------------ arch/microblaze/include/asm/microblaze_intc.h | 37 ---- .../microblaze/include/asm/microblaze_timer.h | 26 --- drivers/timer/Kconfig | 8 + drivers/timer/Makefile | 1 + drivers/timer/xilinx-timer.c | 82 ++++++++ 10 files changed, 99 insertions(+), 369 deletions(-) delete mode 100644 arch/microblaze/cpu/timer.c delete mode 100644 arch/microblaze/include/asm/microblaze_intc.h delete mode 100644 arch/microblaze/include/asm/microblaze_timer.h create mode 100644 drivers/timer/xilinx-timer.c

-- 2.36.1

Show replies by date

Michal Simek

8 Jun 8 Jun

12:38 p.m.

New subject: [PATCH 1/2] microblaze: Convert axi timer to DM driver

Move axi timer driver from Microblaze to generic location. Origin implementation was irq based with counting down timer.

CONFIG_TIMER drivers are designed differently that timer is free running up timer with automatic reload without any interrupt. Information about clock rates are find out in timer_pre_probe() that's why there is no need to get any additional information from DT in the driver itself (only register offset).

Signed-off-by: Michal Simek michal.simek@amd.com ---

MAINTAINERS | 1 + arch/Kconfig | 5 + arch/microblaze/cpu/Makefile | 2 +- arch/microblaze/cpu/timer.c | 123 ------------------ .../microblaze/include/asm/microblaze_timer.h | 26 ---- drivers/timer/Kconfig | 8 ++ drivers/timer/Makefile | 1 + drivers/timer/xilinx-timer.c | 82 ++++++++++++ 8 files changed, 98 insertions(+), 150 deletions(-) delete mode 100644 arch/microblaze/cpu/timer.c delete mode 100644 arch/microblaze/include/asm/microblaze_timer.h create mode 100644 drivers/timer/xilinx-timer.c

diff --git a/MAINTAINERS b/MAINTAINERS index 28e4d3823861..a18762573d93 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -975,6 +975,7 @@ F: drivers/net/xilinx_emaclite.c F: drivers/serial/serial_xuartlite.c F: drivers/spi/xilinx_spi.c F: drivers/sysreset/sysreset_gpio.c +F: drivers/timer/xilinx-timer.c F: drivers/watchdog/xilinx_tb_wdt.c N: xilinx

diff --git a/arch/Kconfig b/arch/Kconfig index d91475d24747..3d02d8e71afa 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -75,6 +75,11 @@ config MICROBLAZE bool "MicroBlaze architecture" select SUPPORT_OF_CONTROL imply CMD_IRQ + imply CMD_TIMER + imply SPL_REGMAP if SPL + imply SPL_TIMER if SPL + imply TIMER + imply XILINX_TIMER

config MIPS bool "MIPS architecture" diff --git a/arch/microblaze/cpu/Makefile b/arch/microblaze/cpu/Makefile index ea65a0976eec..1c586a7de023 100644 --- a/arch/microblaze/cpu/Makefile +++ b/arch/microblaze/cpu/Makefile @@ -5,7 +5,7 @@

extra-y = start.o obj-y = irq.o -obj-y += interrupts.o cache.o exception.o timer.o cpuinfo.o +obj-y += interrupts.o cache.o exception.o cpuinfo.o obj-$(CONFIG_STATIC_RELA) += relocate.o obj-$(CONFIG_XILINX_MICROBLAZE0_PVR) += pvr.o obj-$(CONFIG_SPL_BUILD) += spl.o diff --git a/arch/microblaze/cpu/timer.c b/arch/microblaze/cpu/timer.c deleted file mode 100644 index 647bdcd5ba52..000000000000 --- a/arch/microblaze/cpu/timer.c +++ /dev/null @@ -1,123 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * (C) Copyright 2007 Michal Simek - * - * Michal SIMEK monstr@monstr.eu - */ - -#include <common.h> -#include <fdtdec.h> -#include <init.h> -#include <log.h> -#include <time.h> -#include <asm/global_data.h> -#include <asm/microblaze_timer.h> -#include <asm/microblaze_intc.h> -#include <linux/delay.h> - -DECLARE_GLOBAL_DATA_PTR; - -volatile int timestamp = 0; -microblaze_timer_t *tmr; - -ulong get_timer (ulong base) -{ - if (tmr) - return timestamp - base; - return timestamp++ - base; -} - -void __udelay(unsigned long usec) -{ - u32 i; - - if (tmr) { - i = get_timer(0); - while ((get_timer(0) - i) < (usec / 1000)) - ; - } -} - -#ifndef CONFIG_SPL_BUILD -static void timer_isr(void *arg) -{ - timestamp++; - tmr->control = tmr->control | TIMER_INTERRUPT; -} - -int timer_init (void) -{ - int irq = -1; - u32 preload = 0; - u32 ret = 0; - const void *blob = gd->fdt_blob; - int node = 0; - u32 cell[2]; - - debug("TIMER: Initialization\n"); - - /* Do not init before relocation */ - if (!(gd->flags & GD_FLG_RELOC)) - return 0; - - node = fdt_node_offset_by_compatible(blob, node, - "xlnx,xps-timer-1.00.a"); - if (node != -1) { - fdt_addr_t base = fdtdec_get_addr(blob, node, "reg"); - if (base == FDT_ADDR_T_NONE) - return -1; - - debug("TIMER: Base addr %lx\n", base); - tmr = (microblaze_timer_t *)base; - - ret = fdtdec_get_int_array(blob, node, "interrupts", - cell, ARRAY_SIZE(cell)); - if (ret) - return ret; - - irq = cell[0]; - debug("TIMER: IRQ %x\n", irq); - - preload = fdtdec_get_int(blob, node, "clock-frequency", 0); - preload /= CONFIG_SYS_HZ; - } else { - return node; - } - - if (tmr && preload && irq >= 0) { - tmr->loadreg = preload; - tmr->control = TIMER_INTERRUPT | TIMER_RESET; - tmr->control = TIMER_ENABLE | TIMER_ENABLE_INTR |\ - TIMER_RELOAD | TIMER_DOWN_COUNT; - timestamp = 0; - ret = install_interrupt_handler (irq, timer_isr, (void *)tmr); - if (ret) - tmr = NULL; - } - /* No problem if timer is not found/initialized */ - return 0; -} -#else -int timer_init(void) -{ - return 0; -} -#endif - -/* - * This function is derived from PowerPC code (read timebase as long long). - * On Microblaze it just returns the timer value. - */ -unsigned long long get_ticks(void) -{ - return get_timer(0); -} - -/* - * This function is derived from PowerPC code (timebase clock frequency). - * On Microblaze it returns the number of timer ticks per second. - */ -ulong get_tbclk(void) -{ - return CONFIG_SYS_HZ; -} diff --git a/arch/microblaze/include/asm/microblaze_timer.h b/arch/microblaze/include/asm/microblaze_timer.h deleted file mode 100644 index 2ed1651ffcfa..000000000000 --- a/arch/microblaze/include/asm/microblaze_timer.h +++ /dev/null @@ -1,26 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * (C) Copyright 2007 Michal Simek - * - * Michal SIMEK monstr@monstr.cz - */ - -#define TIMER_ENABLE_ALL 0x400 /* ENALL */ -#define TIMER_PWM 0x200 /* PWMA0 */ -#define TIMER_INTERRUPT 0x100 /* T0INT */ -#define TIMER_ENABLE 0x080 /* ENT0 */ -#define TIMER_ENABLE_INTR 0x040 /* ENIT0 */ -#define TIMER_RESET 0x020 /* LOAD0 */ -#define TIMER_RELOAD 0x010 /* ARHT0 */ -#define TIMER_EXT_CAPTURE 0x008 /* CAPT0 */ -#define TIMER_EXT_COMPARE 0x004 /* GENT0 */ -#define TIMER_DOWN_COUNT 0x002 /* UDT0 */ -#define TIMER_CAPTURE_MODE 0x001 /* MDT0 */ - -typedef volatile struct microblaze_timer_t { - int control; /* control/statuc register TCSR */ - int loadreg; /* load register TLR */ - int counter; /* timer/counter register */ -} microblaze_timer_t; - -int timer_init(void); diff --git a/drivers/timer/Kconfig b/drivers/timer/Kconfig index 7b8ab56ed323..44d1a81bad3d 100644 --- a/drivers/timer/Kconfig +++ b/drivers/timer/Kconfig @@ -272,4 +272,12 @@ config IMX_GPT_TIMER Select this to enable support for the timer found on NXP i.MX devices.

+config XILINX_TIMER + bool "Xilinx timer support" + depends on TIMER + select REGMAP + help + Select this to enable support for the timer found on + any Xilinx boards (axi timer). + endmenu diff --git a/drivers/timer/Makefile b/drivers/timer/Makefile index b2f002d59789..4d06375317e1 100644 --- a/drivers/timer/Makefile +++ b/drivers/timer/Makefile @@ -27,3 +27,4 @@ obj-$(CONFIG_X86_TSC_TIMER) += tsc_timer.o obj-$(CONFIG_MTK_TIMER) += mtk_timer.o obj-$(CONFIG_MCHP_PIT64B_TIMER) += mchp-pit64b-timer.o obj-$(CONFIG_IMX_GPT_TIMER) += imx-gpt-timer.o +obj-$(CONFIG_XILINX_TIMER) += xilinx-timer.o diff --git a/drivers/timer/xilinx-timer.c b/drivers/timer/xilinx-timer.c new file mode 100644 index 000000000000..75b4473b6397 --- /dev/null +++ b/drivers/timer/xilinx-timer.c @@ -0,0 +1,82 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * (C) Copyright 2022 Advanced Micro Devices, Inc + * Michal Simek michal.simek@amd.com + * + * (C) Copyright 2007 Michal Simek + * Michal SIMEK monstr@monstr.eu + */ + +#include <common.h> +#include <dm.h> +#include <timer.h> +#include <regmap.h> +#include <dm/device_compat.h> + +#define TIMER_ENABLE_ALL 0x400 /* ENALL */ +#define TIMER_PWM 0x200 /* PWMA0 */ +#define TIMER_INTERRUPT 0x100 /* T0INT */ +#define TIMER_ENABLE 0x080 /* ENT0 */ +#define TIMER_ENABLE_INTR 0x040 /* ENIT0 */ +#define TIMER_RESET 0x020 /* LOAD0 */ +#define TIMER_RELOAD 0x010 /* ARHT0 */ +#define TIMER_EXT_CAPTURE 0x008 /* CAPT0 */ +#define TIMER_EXT_COMPARE 0x004 /* GENT0 */ +#define TIMER_DOWN_COUNT 0x002 /* UDT0 */ +#define TIMER_CAPTURE_MODE 0x001 /* MDT0 */ + +#define TIMER_CONTROL_OFFSET 0 +#define TIMER_LOADREG_OFFSET 4 +#define TIMER_COUNTER_OFFSET 8 + +struct xilinx_timer_priv { + struct regmap *regs; +}; + +static u64 xilinx_timer_get_count(struct udevice *dev) +{ + struct xilinx_timer_priv *priv = dev_get_priv(dev); + u32 value; + + regmap_read(priv->regs, TIMER_COUNTER_OFFSET, &value); + + return value; +} + +static int xilinx_timer_probe(struct udevice *dev) +{ + struct xilinx_timer_priv *priv = dev_get_priv(dev); + int ret; + + /* uc_priv->clock_rate has already clock rate */ + ret = regmap_init_mem(dev_ofnode(dev), &priv->regs); + if (ret) { + dev_dbg(dev, "failed to get regbase of timer\n"); + return ret; + } + + regmap_write(priv->regs, TIMER_LOADREG_OFFSET, 0); + regmap_write(priv->regs, TIMER_CONTROL_OFFSET, TIMER_RESET); + regmap_write(priv->regs, TIMER_CONTROL_OFFSET, + TIMER_ENABLE | TIMER_RELOAD); + + return 0; +} + +static const struct timer_ops xilinx_timer_ops = { + .get_count = xilinx_timer_get_count, +}; + +static const struct udevice_id xilinx_timer_ids[] = { + { .compatible = "xlnx,xps-timer-1.00.a" }, + {} +}; + +U_BOOT_DRIVER(xilinx_timer) = { + .name = "xilinx_timer", + .id = UCLASS_TIMER, + .of_match = xilinx_timer_ids, + .priv_auto = sizeof(struct xilinx_timer_priv), + .probe = xilinx_timer_probe, + .ops = &xilinx_timer_ops, +};

-- 2.36.1

Ovidiu Panait

23 Jun 23 Jun

10:37 a.m.

New subject: [PATCH 1/2] microblaze: Convert axi timer to DM driver

Hi Michal,

On 6/8/22 13:38, Michal Simek wrote: [...]

...

diff --git a/drivers/timer/Kconfig b/drivers/timer/Kconfig index 7b8ab56ed323..44d1a81bad3d 100644 --- a/drivers/timer/Kconfig +++ b/drivers/timer/Kconfig @@ -272,4 +272,12 @@ config IMX_GPT_TIMER Select this to enable support for the timer found on NXP i.MX devices.

+config XILINX_TIMER
  bool "Xilinx timer support"
  depends on TIMER
  select REGMAP

Tested-by: Ovidiu Panait ovidiu.panait@windriver.com

I think the SPL select should also be added:

select SPL_REGMAP if SPL

This will fix the spl link errors with the following config:

CONFIG_TIMER=y

CONFIG_SPL_TIMER=y

CONFIG_XILINX_TIMER=y

...

microblazeel-linux-ld.bfd: drivers/timer/xilinx-timer.o: in function `xilinx_timer_get_count': drivers/timer/xilinx-timer.c:41: undefined reference to `regmap_read' microblazeel-linux-ld.bfd: drivers/timer/xilinx-timer.o: in function `xilinx_timer_probe': drivers/timer/xilinx-timer.c:52: undefined reference to `regmap_init_mem' microblazeel-linux-ld.bfd: drivers/timer/xilinx-timer.c:58: undefined reference to `regmap_write' microblazeel-linux-ld.bfd: drivers/timer/xilinx-timer.c:59: undefined reference to `regmap_write' microblazeel-linux-ld.bfd: drivers/timer/xilinx-timer.c:60: undefined reference to `regmap_write' make[1]: *** [scripts/Makefile.spl:525: spl/u-boot-spl] Error 1

Thanks,

Ovidiu

...

  help
    Select this to enable support for the timer found on
    any Xilinx boards (axi timer).
endmenu
diff --git a/drivers/timer/Makefile b/drivers/timer/Makefile index b2f002d59789..4d06375317e1 100644 --- a/drivers/timer/Makefile +++ b/drivers/timer/Makefile @@ -27,3 +27,4 @@ obj-$(CONFIG_X86_TSC_TIMER) += tsc_timer.o obj-$(CONFIG_MTK_TIMER) += mtk_timer.o obj-$(CONFIG_MCHP_PIT64B_TIMER) += mchp-pit64b-timer.o obj-$(CONFIG_IMX_GPT_TIMER) += imx-gpt-timer.o +obj-$(CONFIG_XILINX_TIMER) += xilinx-timer.o diff --git a/drivers/timer/xilinx-timer.c b/drivers/timer/xilinx-timer.c new file mode 100644 index 000000000000..75b4473b6397 --- /dev/null +++ b/drivers/timer/xilinx-timer.c @@ -0,0 +1,82 @@ +// SPDX-License-Identifier: GPL-2.0+ +/*

(C) Copyright 2022 Advanced Micro Devices, Inc

Michal Simek michal.simek@amd.com

(C) Copyright 2007 Michal Simek

Michal SIMEK monstr@monstr.eu

*/

+#include <common.h> +#include <dm.h> +#include <timer.h> +#include <regmap.h> +#include <dm/device_compat.h>

+#define TIMER_ENABLE_ALL 0x400 /* ENALL */ +#define TIMER_PWM 0x200 /* PWMA0 */ +#define TIMER_INTERRUPT 0x100 /* T0INT */ +#define TIMER_ENABLE 0x080 /* ENT0 */ +#define TIMER_ENABLE_INTR 0x040 /* ENIT0 */ +#define TIMER_RESET 0x020 /* LOAD0 */ +#define TIMER_RELOAD 0x010 /* ARHT0 */ +#define TIMER_EXT_CAPTURE 0x008 /* CAPT0 */ +#define TIMER_EXT_COMPARE 0x004 /* GENT0 */ +#define TIMER_DOWN_COUNT 0x002 /* UDT0 */ +#define TIMER_CAPTURE_MODE 0x001 /* MDT0 */

+#define TIMER_CONTROL_OFFSET 0 +#define TIMER_LOADREG_OFFSET 4 +#define TIMER_COUNTER_OFFSET 8

+struct xilinx_timer_priv {
  struct regmap *regs;
+};

+static u64 xilinx_timer_get_count(struct udevice *dev) +{
  struct xilinx_timer_priv *priv = dev_get_priv(dev);
  u32 value;
  regmap_read(priv->regs, TIMER_COUNTER_OFFSET, &value);
  return value;
+}

+static int xilinx_timer_probe(struct udevice *dev) +{
  struct xilinx_timer_priv *priv = dev_get_priv(dev);
  int ret;
  /* uc_priv->clock_rate has already clock rate */
  ret = regmap_init_mem(dev_ofnode(dev), &priv->regs);
  if (ret) {
          dev_dbg(dev, "failed to get regbase of timer\n");
          return ret;
  }
  regmap_write(priv->regs, TIMER_LOADREG_OFFSET, 0);
  regmap_write(priv->regs, TIMER_CONTROL_OFFSET, TIMER_RESET);
  regmap_write(priv->regs, TIMER_CONTROL_OFFSET,
               TIMER_ENABLE | TIMER_RELOAD);
  return 0;
+}

+static const struct timer_ops xilinx_timer_ops = {
  .get_count = xilinx_timer_get_count,
+};

+static const struct udevice_id xilinx_timer_ids[] = {
  { .compatible = "xlnx,xps-timer-1.00.a" },
  {}
+};

+U_BOOT_DRIVER(xilinx_timer) = {
  .name = "xilinx_timer",
  .id = UCLASS_TIMER,
  .of_match = xilinx_timer_ids,
  .priv_auto = sizeof(struct xilinx_timer_priv),
  .probe = xilinx_timer_probe,
  .ops = &xilinx_timer_ops,
+};

2.36.1

Michal Simek

1:09 p.m.

New subject: [PATCH 1/2] microblaze: Convert axi timer to DM driver

On 6/23/22 10:37, Ovidiu Panait wrote:

...

CAUTION: This message has originated from an External Source. Please use proper judgment and caution when opening attachments, clicking links, or responding to this email.

Hi Michal,

On 6/8/22 13:38, Michal Simek wrote: [...]

...
diff --git a/drivers/timer/Kconfig b/drivers/timer/Kconfig index 7b8ab56ed323..44d1a81bad3d 100644 --- a/drivers/timer/Kconfig +++ b/drivers/timer/Kconfig @@ -272,4 +272,12 @@ config IMX_GPT_TIMER Select this to enable support for the timer found on NXP i.MX devices.

+config XILINX_TIMER + bool "Xilinx timer support" + depends on TIMER + select REGMAP

Tested-by: Ovidiu Panait ovidiu.panait@windriver.com

I think the SPL select should also be added:

select SPL_REGMAP if SPL

No problem with it. Patch sent.

Thanks, Michal

Michal Simek

8 Jun 8 Jun

12:38 p.m.

New subject: [PATCH 2/2] microblaze: Remove interrupt handler

The primary purpose for this code was timer. By converting it to CONFIG_TIMER there is no code which uses this implementation that's why remove it. If there is a need to handle interrupts this patch can be reverted in future.

Signed-off-by: Michal Simek michal.simek@amd.com ---

arch/Kconfig | 1 - arch/microblaze/cpu/interrupts.c | 182 +----------------- arch/microblaze/include/asm/microblaze_intc.h | 37 ---- 3 files changed, 1 insertion(+), 219 deletions(-) delete mode 100644 arch/microblaze/include/asm/microblaze_intc.h

diff --git a/arch/Kconfig b/arch/Kconfig index 3d02d8e71afa..a8d0123b8106 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -74,7 +74,6 @@ config M68K config MICROBLAZE bool "MicroBlaze architecture" select SUPPORT_OF_CONTROL - imply CMD_IRQ imply CMD_TIMER imply SPL_REGMAP if SPL imply SPL_TIMER if SPL diff --git a/arch/microblaze/cpu/interrupts.c b/arch/microblaze/cpu/interrupts.c index fe65f3728fdb..ac53208bda67 100644 --- a/arch/microblaze/cpu/interrupts.c +++ b/arch/microblaze/cpu/interrupts.c @@ -8,17 +8,8 @@ */

#include <common.h> -#include <command.h> -#include <fdtdec.h> -#include <irq_func.h> -#include <log.h> -#include <malloc.h> -#include <asm/global_data.h> -#include <asm/microblaze_intc.h> #include <asm/asm.h>

-DECLARE_GLOBAL_DATA_PTR; - void enable_interrupts(void) { debug("Enable interrupts for the whole CPU\n"); @@ -34,183 +25,12 @@ int disable_interrupts(void) return (msr & 0x2) != 0; }

-static struct irq_action *vecs; -static u32 irq_no; - -/* mapping structure to interrupt controller */ -microblaze_intc_t *intc; - -/* default handler */ -static void def_hdlr(void) -{ - puts("def_hdlr\n"); -} - -static void enable_one_interrupt(int irq) -{ - int mask; - int offset = 1; - - offset <<= irq; - mask = intc->ier; - intc->ier = (mask | offset); - - debug("Enable one interrupt irq %x - mask %x,ier %x\n", offset, mask, - intc->ier); - debug("INTC isr %x, ier %x, iar %x, mer %x\n", intc->isr, intc->ier, - intc->iar, intc->mer); -} - -static void disable_one_interrupt(int irq) -{ - int mask; - int offset = 1; - - offset <<= irq; - mask = intc->ier; - intc->ier = (mask & ~offset); - - debug("Disable one interrupt irq %x - mask %x,ier %x\n", irq, mask, - intc->ier); - debug("INTC isr %x, ier %x, iar %x, mer %x\n", intc->isr, intc->ier, - intc->iar, intc->mer); -} - -int install_interrupt_handler(int irq, interrupt_handler_t *hdlr, void *arg) -{ - struct irq_action *act; - - /* irq out of range */ - if ((irq < 0) || (irq > irq_no)) { - puts("IRQ out of range\n"); - return -1; - } - act = &vecs[irq]; - if (hdlr) { /* enable */ - act->handler = hdlr; - act->arg = arg; - act->count = 0; - enable_one_interrupt(irq); - return 0; - } - - /* Disable */ - act->handler = (interrupt_handler_t *)def_hdlr; - act->arg = (void *)irq; - disable_one_interrupt(irq); - return 1; -} - -/* initialization interrupt controller - hardware */ -static void intc_init(void) -{ - intc->mer = 0; - intc->ier = 0; - intc->iar = 0xFFFFFFFF; - /* XIntc_Start - hw_interrupt enable and all interrupt enable */ - intc->mer = 0x3; - - debug("INTC isr %x, ier %x, iar %x, mer %x\n", intc->isr, intc->ier, - intc->iar, intc->mer); -} - int interrupt_init(void) { - int i; - const void *blob = gd->fdt_blob; - int node = 0; - - debug("INTC: Initialization\n"); - - node = fdt_node_offset_by_compatible(blob, node, - "xlnx,xps-intc-1.00.a"); - if (node != -1) { - fdt_addr_t base = fdtdec_get_addr(blob, node, "reg"); - if (base == FDT_ADDR_T_NONE) - return -1; - - debug("INTC: Base addr %lx\n", base); - intc = (microblaze_intc_t *)base; - irq_no = fdtdec_get_int(blob, node, "xlnx,num-intr-inputs", 0); - debug("INTC: IRQ NO %x\n", irq_no); - } else { - return node; - } - - if (irq_no) { - vecs = calloc(1, sizeof(struct irq_action) * irq_no); - if (vecs == NULL) { - puts("Interrupt vector allocation failed\n"); - return -1; - } - - /* initialize irq list */ - for (i = 0; i < irq_no; i++) { - vecs[i].handler = (interrupt_handler_t *)def_hdlr; - vecs[i].arg = (void *)i; - vecs[i].count = 0; - } - /* initialize intc controller */ - intc_init(); - enable_interrupts(); - } else { - puts("Undefined interrupt controller\n"); - } return 0; }

void interrupt_handler(void) { - int irqs = intc->ivr; /* find active interrupt */ - int mask = 1; - int value; - struct irq_action *act = vecs + irqs; - - debug("INTC isr %x, ier %x, iar %x, mer %x\n", intc->isr, intc->ier, - intc->iar, intc->mer); -#ifdef DEBUG - R14(value); -#endif - debug("Interrupt handler on %x line, r14 %x\n", irqs, value); - - debug("Jumping to interrupt handler rutine addr %x,count %x,arg %x\n", - (u32)act->handler, act->count, (u32)act->arg); - act->handler(act->arg); - act->count++; - - intc->iar = mask << irqs; - - debug("Dump INTC reg, isr %x, ier %x, iar %x, mer %x\n", intc->isr, - intc->ier, intc->iar, intc->mer); -#ifdef DEBUG - R14(value); -#endif - debug("Interrupt handler on %x line, r14 %x\n", irqs, value); -} - -#if defined(CONFIG_CMD_IRQ) -int do_irqinfo(struct cmd_tbl *cmdtp, int flag, int argc, const char *argv[]) -{ - int i; - struct irq_action *act = vecs; - - if (irq_no) { - puts("\nInterrupt-Information:\n\n" - "Nr Routine Arg Count\n" - "-----------------------------\n"); - - for (i = 0; i < irq_no; i++) { - if (act->handler != (interrupt_handler_t *)def_hdlr) { - printf("%02d %08x %08x %d\n", i, - (int)act->handler, (int)act->arg, - act->count); - } - act++; - } - puts("\n"); - } else { - puts("Undefined interrupt controller\n"); - } - return 0; + panic("Interrupt occurred\n"); } -#endif diff --git a/arch/microblaze/include/asm/microblaze_intc.h b/arch/microblaze/include/asm/microblaze_intc.h deleted file mode 100644 index a7e8715851ea..000000000000 --- a/arch/microblaze/include/asm/microblaze_intc.h +++ /dev/null @@ -1,37 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * (C) Copyright 2007 Michal Simek - * - * Michal SIMEK monstr@monstr.cz - */ - -#include <irq_func.h> - -typedef volatile struct microblaze_intc_t { - int isr; /* interrupt status register */ - int ipr; /* interrupt pending register */ - int ier; /* interrupt enable register */ - int iar; /* interrupt acknowledge register */ - int sie; /* set interrupt enable bits */ - int cie; /* clear interrupt enable bits */ - int ivr; /* interrupt vector register */ - int mer; /* master enable register */ -} microblaze_intc_t; - -struct irq_action { - interrupt_handler_t *handler; /* pointer to interrupt rutine */ - void *arg; - int count; /* number of interrupt */ -}; - -/** - * Register and unregister interrupt handler rutines - * - * @param irq IRQ number - * @param hdlr Interrupt handler rutine - * @param arg Pointer to argument which is passed to int. handler rutine - * Return: 0 if registration pass, 1 if unregistration pass, - * or an error code < 0 otherwise - */ -int install_interrupt_handler(int irq, interrupt_handler_t *hdlr, - void *arg);

-- 2.36.1

Michal Simek

24 Jun 24 Jun

2:16 p.m.

st 8. 6. 2022 v 12:39 odesílatel Michal Simek monstr@monstr.eu napsal:

...

Hi,

this series is moving timer to generic drivers/timer/ location and it is removing unused interrupt code in architecture.

note: This patchset is based on rela and cache series.

Thanks, Michal

Michal Simek (2): microblaze: Convert axi timer to DM driver microblaze: Remove interrupt handler

MAINTAINERS | 1 + arch/Kconfig | 6 +- arch/microblaze/cpu/Makefile | 2 +- arch/microblaze/cpu/interrupts.c | 182 +----------------- arch/microblaze/cpu/timer.c | 123 ------------ arch/microblaze/include/asm/microblaze_intc.h | 37 ---- .../microblaze/include/asm/microblaze_timer.h | 26 --- drivers/timer/Kconfig | 8 + drivers/timer/Makefile | 1 + drivers/timer/xilinx-timer.c | 82 ++++++++ 10 files changed, 99 insertions(+), 369 deletions(-) delete mode 100644 arch/microblaze/cpu/timer.c delete mode 100644 arch/microblaze/include/asm/microblaze_intc.h delete mode 100644 arch/microblaze/include/asm/microblaze_timer.h create mode 100644 drivers/timer/xilinx-timer.c

-- 2.36.1

Applied. M

-- Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Xilinx Microblaze Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs

1052

Age (days ago)

1068

Last active (days ago)

List overview

Download

5 comments

3 participants

tags (0)

participants (3)

Michal Simek
Michal Simek
Ovidiu Panait