From: Benjamin Herrenschmidt Date: Fri, 8 May 2020 00:42:01 +0000 (+1000) Subject: hello_world: Use new headers and frequency from syscon X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c5f5f507385dd9d2dad62908c79d911d237a4eda;p=microwatt.git hello_world: Use new headers and frequency from syscon This uses the new header files for register definitions and extracts the core frequency from syscon rather than hard coding it. Signed-off-by: Benjamin Herrenschmidt --- diff --git a/fpga/hello_world.hex b/fpga/hello_world.hex index 6bbe412..6098247 100644 --- a/fpga/hello_world.hex +++ b/fpga/hello_world.hex @@ -1,23 +1,11 @@ +000000004800012c +0000000000000000 4800002408000048 01006b69a600607d a602487d05009f42 a64b5a7d14004a39 2402004ca64b7b7d -3c20000048000004 -782107c660210000 -60212f0064210000 -618c00003d800000 -658c0000798c07c6 -7d8903a6618c113c -480000004e800421 -0000000000000000 -0000000000000000 -0000000000000000 -0000000000000000 -0000000000000000 -0000000000000000 -0000000000000000 -0000000000000000 +00000000480000f4 0000000000000000 0000000000000000 0000000000000000 @@ -42,6 +30,18 @@ a64b5a7d14004a39 0000000000000000 0000000000000000 0000000000000000 +4800002408000048 +01006b69a600607d +a602487d05009f42 +a64b5a7d14004a39 +2402004ca64b7b7d +3c20000048000004 +782107c660210000 +60211f0064210000 +618c00003d800000 +658c0000798c07c6 +7d8903a6618c1014 +480000004e800421 0000000000000000 0000000000000000 0000000000000000 @@ -513,52 +513,74 @@ a64b5a7d14004a39 e8010010ebc1fff0 7c0803a6ebe1fff8 3c4000014e800020 +7c0802a63842a000 +3fe2fffffbe1fff8 +f80100103bff7240 +48000051f821ffd1 +7fe3fb7860000000 +60000000480001d5 +7fe3fb787c641b78 +600000004800017d +60000000480000ed +480001295463063e +4bffffec60000000 +0100000000000000 +3c40000100000180 3d20c0003842a000 6129200060000000 f922800079290020 -394000353d20c000 -7929002061292018 -4e800020f9490000 +612900203d20c000 +7c0004ac79290020 +3d40001c7d204eea +7d295392614a2000 +394a0018e9428000 +7c0004ac3929ffff +4e8000207d2057ea 0000000000000000 3c40000100000000 600000003842a000 -390a0010e9428000 -71290001e9280000 -e86a00084082fff8 +394000ffe9228000 +7c0004ac39290020 +4e8000207d404fea +0000000000000000 +3c40000100000000 +600000003842a000 +39400000e9228000 +7c0004ac39290020 +4e8000207d404fea +0000000000000000 +3c40000100000000 +600000003842a000 +39290010e9228000 +7d204eea7c0004ac +4082ffe871290001 +38630008e8628000 +7c601eea7c0004ac 4e8000205463063e 0000000000000000 3c40000100000000 600000003842a000 -390a0010e9428000 -71290008e9280000 -f86a00004082fff8 -000000004e800020 -0000000000000000 -3842a0003c400001 -fbc1fff07c0802a6 -7fc32214fbe1fff8 -f80100107c7f1b78 -7fbff040f821ffd1 -38210030409e000c -887f00004bffff10 -4bffff993bff0001 -000000004bffffe4 -0000028001000000 -7d4348ae39200000 -409e000c2f8a0000 -4e8000207d234b78 -4bffffe839290001 +39290010e9228000 +7d204eea7c0004ac +4082ffe871290008 +7c0004ace9228000 +4e8000207c604fea 0000000000000000 3c40000100000000 7c0802a63842a000 -3fe2fffffbe1fff8 -f80100103bff7190 -4bfffec1f821ffd1 -4bffffad7fe3fb78 -7fe3fb787c641b78 -4bfffee94bffff59 -4bffff195463063e -000000004bfffff4 -0000018001000000 +fbe1fff8fbc1fff0 +7c7f1b787fc32214 +f821ffd1f8010010 +409e000c7fbff040 +4bfffe0c38210030 +3bff0001887f0000 +4bffffe44bffff8d +0100000000000000 +3920000000000280 +2f8a00007d4348ae +7d234b78409e000c +392900014e800020 +000000004bffffe8 +0000000000000000 6f57206f6c6c6548 0000000a0d646c72 diff --git a/hello_world/Makefile b/hello_world/Makefile index a609199..9051e7d 100644 --- a/hello_world/Makefile +++ b/hello_world/Makefile @@ -9,7 +9,7 @@ CC = $(CROSS_COMPILE)gcc LD = $(CROSS_COMPILE)ld OBJCOPY = $(CROSS_COMPILE)objcopy -CFLAGS = -Os -g -Wall -std=c99 -msoft-float -mno-string -mno-multiple -mno-vsx -mno-altivec -mlittle-endian -fno-stack-protector -mstrict-align -ffreestanding -fdata-sections -ffunction-sections +CFLAGS = -Os -g -Wall -std=c99 -msoft-float -mno-string -mno-multiple -mno-vsx -mno-altivec -mlittle-endian -fno-stack-protector -mstrict-align -ffreestanding -fdata-sections -ffunction-sections -I../include ASFLAGS = $(CFLAGS) LDFLAGS = -T powerpc.lds diff --git a/hello_world/console.c b/hello_world/console.c index 4069244..6c1c311 100644 --- a/hello_world/console.c +++ b/hello_world/console.c @@ -2,6 +2,10 @@ #include #include "console.h" +#include "microwatt_soc.h" +#include "io.h" + +#define UART_FREQ 115200 /* * Core UART functions to implement for a port @@ -9,32 +13,14 @@ static uint64_t potato_uart_base; -#define PROC_FREQ 100000000 -#define UART_FREQ 115200 -#define UART_BASE 0xc0002000 - -#define POTATO_CONSOLE_TX 0x00 -#define POTATO_CONSOLE_RX 0x08 -#define POTATO_CONSOLE_STATUS 0x10 -#define POTATO_CONSOLE_STATUS_RX_EMPTY 0x01 -#define POTATO_CONSOLE_STATUS_TX_EMPTY 0x02 -#define POTATO_CONSOLE_STATUS_RX_FULL 0x04 -#define POTATO_CONSOLE_STATUS_TX_FULL 0x08 -#define POTATO_CONSOLE_CLOCK_DIV 0x18 -#define POTATO_CONSOLE_IRQ_EN 0x20 - static uint64_t potato_uart_reg_read(int offset) { - uint64_t val; - - __asm__ volatile("ldcix %0,%1,%2" : "=r" (val) : "b" (potato_uart_base), "r" (offset)); - - return val; + return readq(potato_uart_base + offset); } static void potato_uart_reg_write(int offset, uint64_t val) { - __asm__ volatile("stdcix %0,%1,%2" : : "r" (val), "b" (potato_uart_base), "r" (offset)); + writeq(val, potato_uart_base + offset); } static int potato_uart_rx_empty(void) @@ -86,9 +72,12 @@ static unsigned long potato_uart_divisor(unsigned long proc_freq, unsigned long void potato_uart_init(void) { + uint64_t proc_freq; + potato_uart_base = UART_BASE; + proc_freq = readq(SYSCON_BASE + SYS_REG_CLKINFO); - potato_uart_reg_write(POTATO_CONSOLE_CLOCK_DIV, potato_uart_divisor(PROC_FREQ, UART_FREQ)); + potato_uart_reg_write(POTATO_CONSOLE_CLOCK_DIV, potato_uart_divisor(proc_freq, UART_FREQ)); } void potato_uart_irq_en(void) diff --git a/hello_world/hello_world.bin b/hello_world/hello_world.bin index 73bc181..ae4c4a8 100755 Binary files a/hello_world/hello_world.bin and b/hello_world/hello_world.bin differ diff --git a/hello_world/hello_world.elf b/hello_world/hello_world.elf index 02a362d..e658438 100755 Binary files a/hello_world/hello_world.elf and b/hello_world/hello_world.elf differ diff --git a/hello_world/hello_world.hex b/hello_world/hello_world.hex index 633e218..6098247 100644 --- a/hello_world/hello_world.hex +++ b/hello_world/hello_world.hex @@ -515,53 +515,72 @@ e8010010ebc1fff0 3c4000014e800020 7c0802a63842a000 3fe2fffffbe1fff8 -f80100103bff71a8 +f80100103bff7240 48000051f821ffd1 7fe3fb7860000000 -6000000048000139 +60000000480001d5 7fe3fb787c641b78 -60000000480000e1 -6000000048000065 -480000955463063e +600000004800017d +60000000480000ed +480001295463063e 4bffffec60000000 0100000000000000 3c40000100000180 3d20c0003842a000 6129200060000000 -7929002039000018 -3940001af9228000 -4e8000207d4947ea +f922800079290020 +612900203d20c000 +7c0004ac79290020 +3d40001c7d204eea +7d295392614a2000 +394a0018e9428000 +7c0004ac3929ffff +4e8000207d2057ea 0000000000000000 3c40000100000000 600000003842a000 -39000010e9228000 -794707e17d4946ea -386000084082fff8 -5463063e7c691eea -000000004e800020 -0000000000000000 -3842a0003c400001 -e942800060000000 -7d2a46ea39000010 -4082fff87927efe3 -7c6a4fea39200000 -000000004e800020 -0000000000000000 -3842a0003c400001 -fbc1fff07c0802a6 -3884fffffbe1fff8 -7fe322143bc3ffff -f821ffd1f8010010 -419e00107fbef840 -4bffff9d8c7e0001 -382100304bfffff0 -000000004bfffe98 -0000028001000000 -7d4348ae39200000 -419e000c2f8a0000 -4bfffff039290001 -4e8000207d234b78 +394000ffe9228000 +7c0004ac39290020 +4e8000207d404fea +0000000000000000 +3c40000100000000 +600000003842a000 +39400000e9228000 +7c0004ac39290020 +4e8000207d404fea +0000000000000000 +3c40000100000000 +600000003842a000 +39290010e9228000 +7d204eea7c0004ac +4082ffe871290001 +38630008e8628000 +7c601eea7c0004ac +4e8000205463063e 0000000000000000 +3c40000100000000 +600000003842a000 +39290010e9228000 +7d204eea7c0004ac +4082ffe871290008 +7c0004ace9228000 +4e8000207c604fea +0000000000000000 +3c40000100000000 +7c0802a63842a000 +fbe1fff8fbc1fff0 +7c7f1b787fc32214 +f821ffd1f8010010 +409e000c7fbff040 +4bfffe0c38210030 +3bff0001887f0000 +4bffffe44bffff8d +0100000000000000 +3920000000000280 +2f8a00007d4348ae +7d234b78409e000c +392900014e800020 +000000004bffffe8 0000000000000000 6f57206f6c6c6548 0000000a0d646c72 diff --git a/rust_lib_demo/Makefile b/rust_lib_demo/Makefile index fdbb18b..607b533 100644 --- a/rust_lib_demo/Makefile +++ b/rust_lib_demo/Makefile @@ -9,7 +9,7 @@ CC = $(CROSS_COMPILE)gcc LD = $(CROSS_COMPILE)ld OBJCOPY = $(CROSS_COMPILE)objcopy -CFLAGS = -Os -g -Wall -std=c99 -msoft-float -mno-string -mno-multiple -mno-vsx -mno-altivec -mlittle-endian -fno-stack-protector -mstrict-align -ffreestanding -fdata-sections -ffunction-sections +CFLAGS = -Os -g -Wall -std=c99 -msoft-float -mno-string -mno-multiple -mno-vsx -mno-altivec -mlittle-endian -fno-stack-protector -mstrict-align -ffreestanding -fdata-sections -ffunction-sections -I../include ASFLAGS = $(CFLAGS) LDFLAGS = -T powerpc.lds diff --git a/tests/Makefile.test b/tests/Makefile.test index 250135d..9241e3f 100644 --- a/tests/Makefile.test +++ b/tests/Makefile.test @@ -9,7 +9,7 @@ CC = $(CROSS_COMPILE)gcc LD = $(CROSS_COMPILE)ld OBJCOPY = $(CROSS_COMPILE)objcopy -CFLAGS = -Os -g -Wall -std=c99 -msoft-float -mno-string -mno-multiple -mno-vsx -mno-altivec -mlittle-endian -fno-stack-protector -mstrict-align -ffreestanding -fdata-sections -ffunction-sections -I ../../hello_world +CFLAGS = -Os -g -Wall -std=c99 -msoft-float -mno-string -mno-multiple -mno-vsx -mno-altivec -mlittle-endian -fno-stack-protector -mstrict-align -ffreestanding -fdata-sections -ffunction-sections -I ../../hello_world -I ../../include ASFLAGS = $(CFLAGS) LDFLAGS = -T powerpc.lds