Skip to contentSkip to conversation

Microblaze updates

U-Boot New monstr at monstr.eu 1 participant 9 messages Apr 16, 2010

Subsystems (2)
lore
Share & tools
lore

monstr at monstr.eu

author maintainer
#0 lore raw

Hi All,

here is bunch of microblaze patches.

Thanks for your review,
Micha

author maintainer
#1 lore raw

PATCH 1/8 microblaze: Fix irq.S code

From: Michal Simek <[email protected]>

It is ancient code. There is possible to save several instructions just if we use offset instead of addik

---
 arch/microblaze/cpu/irq.S |  182 +++++++++++++++-----------------------------
 1 files changed, 62 insertions(+), 120 deletions(-)
arch/microblaze/cpu/irq.S +62 -120
index e1fc190..47bba36 100644
@@ -27,129 +27,71 @@
 	.text
 	.global _interrupt_handler
 _interrupt_handler:
-	addi	r1, r1, -4
-	swi	r2, r1, 0
-	addi	r1, r1, -4
-	swi	r3, r1, 0
-	addi	r1, r1, -4
-	swi	r4, r1, 0
-	addi	r1, r1, -4
-	swi	r5, r1, 0
-	addi	r1, r1, -4
-	swi	r6, r1, 0
-	addi	r1, r1, -4
-	swi	r7, r1, 0
-	addi	r1, r1, -4
-	swi	r8, r1, 0
-	addi	r1, r1, -4
-	swi	r9, r1, 0
-	addi	r1, r1, -4
-	swi	r10, r1, 0
-	addi	r1, r1, -4
-	swi	r11, r1, 0
-	addi	r1, r1, -4
-	swi	r12, r1, 0
-	addi	r1, r1, -4
-	swi	r13, r1, 0
-	addi	r1, r1, -4
-	swi	r14, r1, 0
-	addi	r1, r1, -4
-	swi	r15, r1, 0
-	addi	r1, r1, -4
-	swi	r16, r1, 0
-	addi	r1, r1, -4
-	swi	r17, r1, 0
-	addi	r1, r1, -4
-	swi	r18, r1, 0
-	addi	r1, r1, -4
-	swi	r19, r1, 0
-	addi	r1, r1, -4
-	swi	r20, r1, 0
-	addi	r1, r1, -4
-	swi	r21, r1, 0
-	addi	r1, r1, -4
-	swi	r22, r1, 0
-	addi	r1, r1, -4
-	swi	r23, r1, 0
-	addi	r1, r1, -4
-	swi	r24, r1, 0
-	addi	r1, r1, -4
-	swi	r25, r1, 0
-	addi	r1, r1, -4
-	swi	r26, r1, 0
-	addi	r1, r1, -4
-	swi	r27, r1, 0
-	addi	r1, r1, -4
-	swi	r28, r1, 0
-	addi	r1, r1, -4
-	swi	r29, r1, 0
-	addi	r1, r1, -4
-	swi	r30, r1, 0
-	addi	r1, r1, -4
-	swi	r31, r1, 0
+	swi	r2, r1, -4
+	swi	r3, r1, -8
+	swi	r4, r1, -12
+	swi	r5, r1, -16
+	swi	r6, r1, -20
+	swi	r7, r1, -24
+	swi	r8, r1, -28
+	swi	r9, r1, -32
+	swi	r10, r1, -36
+	swi	r11, r1, -40
+	swi	r12, r1, -44
+	swi	r13, r1, -48
+	swi	r14, r1, -52
+	swi	r15, r1, -56
+	swi	r16, r1, -60
+	swi	r17, r1, -64
+	swi	r18, r1, -68
+	swi	r19, r1, -72
+	swi	r20, r1, -76
+	swi	r21, r1, -80
+	swi	r22, r1, -84
+	swi	r23, r1, -88
+	swi	r24, r1, -92
+	swi	r25, r1, -96
+	swi	r26, r1, -100
+	swi	r27, r1, -104
+	swi	r28, r1, -108
+	swi	r29, r1, -112
+	swi	r30, r1, -116
+	swi	r31, r1, -120
+	addik	r1, r1, -124
 	brlid	r15, interrupt_handler
 	nop
 	nop
-	lwi	r31, r1, 0
-	addi	r1, r1, 4
-	lwi	r30, r1, 0
-	addi	r1, r1, 4
-	lwi	r29, r1, 0
-	addi	r1, r1, 4
-	lwi	r28, r1, 0
-	addi	r1, r1, 4
-	lwi	r27, r1, 0
-	addi	r1, r1, 4
-	lwi	r26, r1, 0
-	addi	r1, r1, 4
-	lwi	r25, r1, 0
-	addi	r1, r1, 4
-	lwi	r24, r1, 0
-	addi	r1, r1, 4
-	lwi	r23, r1, 0
-	addi	r1, r1, 4
-	lwi	r22, r1, 0
-	addi	r1, r1, 4
-	lwi	r21, r1, 0
-	addi	r1, r1, 4
-	lwi	r20, r1, 0
-	addi	r1, r1, 4
-	lwi	r19, r1, 0
-	addi	r1, r1, 4
-	lwi	r18, r1, 0
-	addi	r1, r1, 4
-	lwi	r17, r1, 0
-	addi	r1, r1, 4
-	lwi	r16, r1, 0
-	addi	r1, r1, 4
-	lwi	r15, r1, 0
-	addi	r1, r1, 4
-	lwi	r14, r1, 0
-	addi	r1, r1, 4
-	lwi	r13, r1, 0
-	addi	r1, r1, 4
-	lwi	r12, r1, 0
-	addi	r1, r1, 4
-	lwi	r11, r1, 0
-	addi	r1, r1, 4
-	lwi	r10, r1, 0
-	addi	r1, r1, 4
-	lwi	r9, r1, 0
-	addi	r1, r1, 4
-	lwi	r8, r1, 0
-	addi	r1, r1, 4
-	lwi	r7, r1, 0
-	addi	r1, r1, 4
-	lwi	r6, r1, 0
-	addi	r1, r1, 4
-	lwi	r5, r1, 0
-	addi	r1, r1, 4
-	lwi	r4, r1, 0
-	addi	r1, r1, 4
-	lwi	r3, r1, 0
-	addi	r1, r1, 4
-	lwi	r2, r1, 0
-	addi	r1, r1, 4
+	addik	r1, r1, 124
+	lwi	r31, r1, -120
+	lwi	r30, r1, -116
+	lwi	r29, r1, -112
+	lwi	r28, r1, -108
+	lwi	r27, r1, -104
+	lwi	r26, r1, -100
+	lwi	r25, r1, -96
+	lwi	r24, r1, -92
+	lwi	r23, r1, -88
+	lwi	r22, r1, -84
+	lwi	r21, r1, -80
+	lwi	r20, r1, -76
+	lwi	r19, r1, -72
+	lwi	r18, r1, -68
+	lwi	r17, r1, -64
+	lwi	r16, r1, -60
+	lwi	r15, r1, -56
+	lwi	r14, r1, -52
+	lwi	r13, r1, -48
+	lwi	r12, r1, -44
+	lwi	r11, r1, -40
+	lwi	r10, r1, -36
+	lwi	r9, r1, -32
+	lwi	r8, r1, -28
+	lwi	r7, r1, -24
+	lwi	r6, r1, -20
+	lwi	r5, r1, -16
+	lwi	r4, r1, -12
+	lwi	r3, r1, -8
+	lwi	r2, r1, -4
 
 	/* enable_interrupt */
 #ifdef XILINX_USE_MSR_INSTR
Signature · 1 line
1.5.5.1
author maintainer
#2 lore raw

PATCH 2/8 microblaze: Move timer initialization to board.c

From: Michal Simek <[email protected]>

I would like to handle case where system doesn't contain intc that's why I need timer initialization out of intc code.

---
 arch/microblaze/cpu/interrupts.c |    6 ------
 arch/microblaze/cpu/timer.c      |    3 ++-
 arch/microblaze/lib/board.c      |    7 +++++++
 3 files changed, 9 insertions(+), 7 deletions(-)
arch/microblaze/cpu/interrupts.c +0 -6
index a6021c9..b8db68a 100644
@@ -46,9 +46,6 @@ int disable_interrupts (void)
 }
 
 #ifdef CONFIG_SYS_INTC_0
-#ifdef CONFIG_SYS_TIMER_0
-extern void timer_init (void);
-#endif
 #ifdef CONFIG_SYS_FSL_2
 extern void fsl_init2 (void);
 #endif
@@ -142,9 +139,6 @@ int interrupts_init (void)
 	}
 	/* initialize intc controller */
 	intc_init ();
-#ifdef CONFIG_SYS_TIMER_0
-	timer_init ();
-#endif
 #ifdef CONFIG_SYS_FSL_2
 	fsl_init2 ();
 #endif
arch/microblaze/cpu/timer.c +2 -1
index a91eabc..4936c62 100644
@@ -60,7 +60,7 @@ void timer_isr (void *arg)
 	tmr->control = tmr->control | TIMER_INTERRUPT;
 }
 
-void timer_init (void)
+int timer_init (void)
 {
 	tmr->loadreg = CONFIG_SYS_TIMER_0_PRELOAD;
 	tmr->control = TIMER_INTERRUPT | TIMER_RESET;
@@ -68,6 +68,7 @@ void timer_init (void)
 	    TIMER_ENABLE | TIMER_ENABLE_INTR | TIMER_RELOAD | TIMER_DOWN_COUNT;
 	reset_timer ();
 	install_interrupt_handler (CONFIG_SYS_TIMER_0_IRQ, timer_isr, (void *)tmr);
+	return 0;
 }
 #endif
 #endif
arch/microblaze/lib/board.c +7 -0
index d4baea9..7dfa71c 100644
@@ -44,6 +44,10 @@ extern int interrupts_init (void);
 #if defined(CONFIG_CMD_NET)
 extern int eth_init (bd_t * bis);
 #endif
+#ifdef CONFIG_SYS_TIMER_0
+extern int timer_init (void);
+#endif
+
 
 /*
  * All attempts to come up with a "common" initialization sequence
@@ -68,6 +72,9 @@ init_fnc_t *init_sequence[] = {
 #ifdef CONFIG_SYS_INTC_0
 	interrupts_init,
 #endif
+#ifdef CONFIG_SYS_TIMER_0
+	timer_init,
+#endif
 	NULL,
 };
 
Signature · 1 line
1.5.5.1
author maintainer
#3 lore raw

PATCH 3/8 microblaze: Move FSL initialization to board.c

From: Michal Simek <[email protected]>

Move FSL out of interrupt controller.

---
 arch/microblaze/cpu/interrupts.c                   |    7 -------
 arch/microblaze/lib/board.c                        |    7 ++++++-
 .../xilinx/microblaze-generic/microblaze-generic.c |    7 +++----
 3 files changed, 9 insertions(+), 12 deletions(-)
arch/microblaze/cpu/interrupts.c +0 -7
index b8db68a..0fe9f5c 100644
@@ -46,10 +46,6 @@ int disable_interrupts (void)
 }
 
 #ifdef CONFIG_SYS_INTC_0
-#ifdef CONFIG_SYS_FSL_2
-extern void fsl_init2 (void);
-#endif
-
 
 static struct irq_action vecs[CONFIG_SYS_INTC_0_NUM];
 
@@ -139,9 +135,6 @@ int interrupts_init (void)
 	}
 	/* initialize intc controller */
 	intc_init ();
-#ifdef CONFIG_SYS_FSL_2
-	fsl_init2 ();
-#endif
 	enable_interrupts ();
 	return 0;
 }
arch/microblaze/lib/board.c +6 -1
index 7dfa71c..1d44a64 100644
@@ -47,7 +47,9 @@ extern int eth_init (bd_t * bis);
 #ifdef CONFIG_SYS_TIMER_0
 extern int timer_init (void);
 #endif
-
+#ifdef CONFIG_SYS_FSL_2
+extern void fsl_init2 (void);
+#endif
 
 /*
  * All attempts to come up with a "common" initialization sequence
@@ -75,6 +77,9 @@ init_fnc_t *init_sequence[] = {
 #ifdef CONFIG_SYS_TIMER_0
 	timer_init,
 #endif
+#ifdef CONFIG_SYS_FSL_2
+	fsl_init2,
+#endif
 	NULL,
 };
 
board/xilinx/microblaze-generic/microblaze-generic.c +3 -4
index f388b77..838f131 100644
@@ -60,10 +60,9 @@ void fsl_isr2 (void *arg) {
 	puts("*");
 }
 
-void fsl_init2 (void) {
+int fsl_init2 (void) {
 	puts("fsl_init2\n");
-	install_interrupt_handler (FSL_INTR_2,\
- fsl_isr2,\
- NULL);
+	install_interrupt_handler (FSL_INTR_2, fsl_isr2, NULL);
+	return 0;
 }
 #endif
Signature · 1 line
1.5.5.1
author maintainer
#4 lore raw

PATCH 4/8 microblaze: Fix interrupt handler code

From: Michal Simek <[email protected]>

It is better to read ivr and react on it than do long parsing from two regs. Interrupt controller returs actual irq number.

---
 arch/microblaze/cpu/interrupts.c |   28 +++++++++++-----------------
 1 files changed, 11 insertions(+), 17 deletions(-)
arch/microblaze/cpu/interrupts.c +11 -17
index 0fe9f5c..7a9d022 100644
@@ -141,8 +141,8 @@ int interrupts_init (void)
 
 void interrupt_handler (void)
 {
-	int irqs = (intc->isr & intc->ier);	/* find active interrupt */
-	int i = 1;
+	int irqs = intc->ivr;	/* find active interrupt */
+	int mask = 1;
 #ifdef DEBUG_INT
 	int value;
 	printf ("INTC isr %x, ier %x, iar %x, mer %x\n", intc->isr, intc->ier,
@@ -150,23 +150,17 @@ void interrupt_handler (void)
 	R14(value);
 	printf ("Interrupt handler on %x line, r14 %x\n", irqs, value);
 #endif
-	struct irq_action *act = vecs;
-	while (irqs) {
-		if (irqs & 1) {
+	struct irq_action *act = vecs + irqs;
+
+	intc->iar = mask << irqs;
+
 #ifdef DEBUG_INT
-			printf
-			    ("Jumping to interrupt handler rutine addr %x,count %x,arg %x\n",
-			     act->handler, act->count, act->arg);
+	printf
+	    ("Jumping to interrupt handler rutine addr %x,count %x,arg %x\n",
+	     act->handler, act->count, act->arg);
 #endif
-			act->handler (act->arg);
-			act->count++;
-			intc->iar = i;
-			return;
-		}
-		irqs >>= 1;
-		act++;
-		i <<= 1;
-	}
+	act->handler (act->arg);
+	act->count++;
 
 #ifdef DEBUG_INT
 	printf ("Dump INTC reg, isr %x, ier %x, iar %x, mer %x\n", intc->isr,
Signature · 1 line
1.5.5.1
author maintainer
#5 lore raw

PATCH 5/8 microblaze: Change cache report messages

From: Michal Simek <[email protected]>

It is more accurate to show that caches are OFF instead of FAIL.

---
 arch/microblaze/lib/board.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
arch/microblaze/lib/board.c +2 -2
index 1d44a64..41a1db6 100644
@@ -116,8 +116,8 @@ void board_init (void)
 	}
 
 	puts ("SDRAM :\n");
-	printf ("\t\tIcache:%s\n", icache_status() ? "OK" : "FAIL");
-	printf ("\t\tDcache:%s\n", dcache_status() ? "OK" : "FAIL");
+	printf ("\t\tIcache:%s\n", icache_status() ? "ON" : "OFF");
+	printf ("\t\tDcache:%s\n", dcache_status() ? "ON" : "OFF");
 	printf ("\tU-Boot Start:0x%08x\n", TEXT_BASE);
 
 #if defined(CONFIG_CMD_FLASH)
Signature · 1 line
1.5.5.1
author maintainer
#6 lore raw

PATCH 6/8 microblaze: Change initialization sequence

From: Michal Simek <[email protected]>

env_relocation should be called first.
Added stdio_init too.

---
 arch/microblaze/lib/board.c |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)
arch/microblaze/lib/board.c +11 -3
index 41a1db6..6c03297 100644
@@ -30,6 +30,7 @@
 #include <timestamp.h>
 #include <version.h>
 #include <watchdog.h>
+#include <stdio_dev.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -151,15 +152,22 @@ void board_init (void)
 	}
 #endif
 
+	/* relocate environment function pointers etc. */
+	env_relocate ();
+
+	/* Initialize stdio devices */
+	stdio_init ();
+
+	if ((s = getenv ("loadaddr")) != NULL) {
+		load_addr = simple_strtoul (s, NULL, 16);
+	}
+
 #if defined(CONFIG_CMD_NET)
 	/* IP Address */
 	bd->bi_ip_addr = getenv_IPaddr ("ipaddr");
 	eth_init (bd);
 #endif
 
-	/* relocate environment function pointers etc. */
-	env_relocate ();
-
 	/* main_loop */
 	for (;;) {
 		WATCHDOG_RESET ();
Signature · 1 line
1.5.5.1
author maintainer
#7 lore raw

PATCH 7/8 microblaze: Support system with WB cache

From: Michal Simek <[email protected]>

WB cache use different instruction that WT cache but the major code is that same. That means that wdc.flush on system with WT cache do the same thing as before.

You need newer toolchain with wdc.flush support.

---
 arch/microblaze/lib/cache.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/microblaze/lib/cache.c +1 -1
index 4b2e8e3..9b6b60f 100644
@@ -34,7 +34,7 @@ void flush_cache (ulong addr, ulong size)
 #endif
 				"nop;"
 #ifdef CONFIG_DCACHE
-				"wdc	%0, r0;"
+				"wdc.flush	%0, r0;"
 #endif
 				"nop;"
 				:
Signature · 1 line
1.5.5.1
author maintainer
#8 lore raw

PATCH 8/8 microblaze: Flush cache before jumping to kernel

From: Michal Simek <[email protected]>

There is used max cache size on system which doesn't define cache size.

---
 arch/microblaze/lib/bootm.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
arch/microblaze/lib/bootm.c +8 -0
index 0c2c5e8..8892a7a 100644
@@ -73,6 +73,14 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
 		(ulong) theKernel, rd_data_start, (ulong) of_flat_tree);
 #endif
 
+#ifdef XILINX_USE_DCACHE
+#ifdef XILINX_DCACHE_BYTE_SIZE
+	flush_cache(0, XILINX_DCACHE_BYTE_SIZE);
+#else
+#warning please rebuild BSPs and update configuration
+	flush_cache(0, 32768);
+#endif
+#endif
 	/*
 	 * Linux Kernel Parameters (passing device tree):
 	 * r5: pointer to command line
Signature · 1 line
1.5.5.1