Merge pull request s-matyukevich#174 from stefanJi/feat/stefanji_lesson01_3

s-matyukevich · web-flow · commit dcef9252c610 · 2020-03-24T09:38:54.000-06:00
feat: implement lesson01-3
diff --git a/exercises/lesson01/3/stefanji/Makefile b/exercises/lesson01/3/stefanji/Makefile
@@ -0,0 +1,31 @@
+ARMGNU ?= aarch64-linux-gnu
+
+COPS = -Wall -nostdlib -nostartfiles -ffreestanding -Iinclude -mgeneral-regs-only
+ASMOPS = -Iinclude 
+
+BUILD_DIR = build
+SRC_DIR = src
+
+all : kernel8.img
+
+clean :
+	rm -rf $(BUILD_DIR) *.img 
+
+$(BUILD_DIR)/%_c.o: $(SRC_DIR)/%.c
+	mkdir -p $(@D)
+	$(ARMGNU)-gcc $(COPS) -MMD -c $< -o $@
+
+$(BUILD_DIR)/%_s.o: $(SRC_DIR)/%.S
+	$(ARMGNU)-gcc $(ASMOPS) -MMD -c $< -o $@
+
+C_FILES = $(wildcard $(SRC_DIR)/*.c)
+ASM_FILES = $(wildcard $(SRC_DIR)/*.S)
+OBJ_FILES = $(C_FILES:$(SRC_DIR)/%.c=$(BUILD_DIR)/%_c.o)
+OBJ_FILES += $(ASM_FILES:$(SRC_DIR)/%.S=$(BUILD_DIR)/%_s.o)
+
+DEP_FILES = $(OBJ_FILES:%.o=%.d)
+-include $(DEP_FILES)
+
+kernel8.img: $(SRC_DIR)/linker.ld $(OBJ_FILES)
+	$(ARMGNU)-ld -T $(SRC_DIR)/linker.ld -o $(BUILD_DIR)/kernel8.elf  $(OBJ_FILES)
+	$(ARMGNU)-objcopy $(BUILD_DIR)/kernel8.elf -O binary kernel8.img
diff --git a/exercises/lesson01/3/stefanji/build.bat b/exercises/lesson01/3/stefanji/build.bat
@@ -0,0 +1 @@
+docker run --rm -v %cd%:/app -w /app smatyukevich/raspberry-pi-os-builder make %1
diff --git a/exercises/lesson01/3/stefanji/build.sh b/exercises/lesson01/3/stefanji/build.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker run --rm -v $(pwd):/app -w /app smatyukevich/raspberry-pi-os-builder make $1
diff --git a/exercises/lesson01/3/stefanji/include/mini_uart.h b/exercises/lesson01/3/stefanji/include/mini_uart.h
@@ -0,0 +1,9 @@
+#ifndef	_MINI_UART_H
+#define	_MINI_UART_H
+
+void uart_init ( void );
+char uart_recv ( void );
+void uart_send ( char c );
+void uart_send_string(char* str);
+
+#endif  /*_MINI_UART_H */
diff --git a/exercises/lesson01/3/stefanji/include/mm.h b/exercises/lesson01/3/stefanji/include/mm.h
@@ -0,0 +1,25 @@
+#ifndef	_MM_H
+#define	_MM_H
+
+#define PAGE_SHIFT	 		12
+#define TABLE_SHIFT 			9
+#define SECTION_SHIFT			(PAGE_SHIFT + TABLE_SHIFT)
+
+#define PAGE_SIZE   			(1 << PAGE_SHIFT)	
+#define SECTION_SIZE			(1 << SECTION_SHIFT)	
+
+#define LOW_MEMORY              	(2 * SECTION_SIZE)
+
+#define STACK_OFFSET			1 << 10 // 1KB
+
+#ifndef __ASSEMBLER__
+
+void memzero(unsigned long src, unsigned long n);
+
+void init_memory(unsigned long begin, unsigned long end);
+void init_stack(unsigned int cort_id);
+int get_core_id();
+
+#endif
+
+#endif  /*_MM_H */
diff --git a/exercises/lesson01/3/stefanji/include/peripherals/base.h b/exercises/lesson01/3/stefanji/include/peripherals/base.h
@@ -0,0 +1,6 @@
+#ifndef	_P_BASE_H
+#define	_P_BASE_H
+
+#define PBASE 0x3F000000
+
+#endif  /*_P_BASE_H */
diff --git a/exercises/lesson01/3/stefanji/include/peripherals/gpio.h b/exercises/lesson01/3/stefanji/include/peripherals/gpio.h
@@ -0,0 +1,12 @@
+#ifndef	_P_GPIO_H
+#define	_P_GPIO_H
+
+#include "peripherals/base.h"
+
+#define GPFSEL1         (PBASE+0x00200004)
+#define GPSET0          (PBASE+0x0020001C)
+#define GPCLR0          (PBASE+0x00200028)
+#define GPPUD           (PBASE+0x00200094)
+#define GPPUDCLK0       (PBASE+0x00200098)
+
+#endif  /*_P_GPIO_H */
diff --git a/exercises/lesson01/3/stefanji/include/peripherals/mini_uart.h b/exercises/lesson01/3/stefanji/include/peripherals/mini_uart.h
@@ -0,0 +1,19 @@
+#ifndef	_P_MINI_UART_H
+#define	_P_MINI_UART_H
+
+#include "peripherals/base.h"
+
+#define AUX_ENABLES     (PBASE+0x00215004)
+#define AUX_MU_IO_REG   (PBASE+0x00215040)
+#define AUX_MU_IER_REG  (PBASE+0x00215044)
+#define AUX_MU_IIR_REG  (PBASE+0x00215048)
+#define AUX_MU_LCR_REG  (PBASE+0x0021504C)
+#define AUX_MU_MCR_REG  (PBASE+0x00215050)
+#define AUX_MU_LSR_REG  (PBASE+0x00215054)
+#define AUX_MU_MSR_REG  (PBASE+0x00215058)
+#define AUX_MU_SCRATCH  (PBASE+0x0021505C)
+#define AUX_MU_CNTL_REG (PBASE+0x00215060)
+#define AUX_MU_STAT_REG (PBASE+0x00215064)
+#define AUX_MU_BAUD_REG (PBASE+0x00215068)
+
+#endif  /*_P_MINI_UART_H */
diff --git a/exercises/lesson01/3/stefanji/include/utils.h b/exercises/lesson01/3/stefanji/include/utils.h
@@ -0,0 +1,8 @@
+#ifndef	_BOOT_H
+#define	_BOOT_H
+
+extern void delay ( unsigned long);
+extern void put32 ( unsigned long, unsigned int );
+extern unsigned int get32 ( unsigned long );
+
+#endif  /*_BOOT_H */
diff --git a/exercises/lesson01/3/stefanji/src/boot.S b/exercises/lesson01/3/stefanji/src/boot.S
@@ -0,0 +1,18 @@
+#include "mm.h"
+
+.section ".text.boot"
+
+.globl _start
+_start:
+	b	master
+
+proc_hang: 
+	b 	proc_hang
+
+master:
+	bl 	get_core_id
+	cbz	x0, init_memory
+	bl	get_core_id
+	bl	init_stack
+	bl	get_core_id
+	bl	kernel_main
diff --git a/exercises/lesson01/3/stefanji/src/config.txt b/exercises/lesson01/3/stefanji/src/config.txt
@@ -0,0 +1,2 @@
+kernel_old=1
+disable_commandline_tags=1
diff --git a/exercises/lesson01/3/stefanji/src/kernel.c b/exercises/lesson01/3/stefanji/src/kernel.c
@@ -0,0 +1,17 @@
+#include "mini_uart.h"
+#include "utils.h"
+
+void kernel_main(unsigned int core_id)
+{
+	if(core_id == 0){ uart_init(); }
+	else { delay(300000 * core_id); } //TODO find a better way
+
+	uart_send_string("Hello Word From #");
+	uart_send(core_id + '0');
+	uart_send_string(" Processor Core.\r\n");
+	
+	if(core_id == 0) while (1) {
+		uart_send(uart_recv());
+	}
+	else while(1) {};
+}
diff --git a/exercises/lesson01/3/stefanji/src/linker.ld b/exercises/lesson01/3/stefanji/src/linker.ld
@@ -0,0 +1,11 @@
+SECTIONS
+{
+	.text.boot : { *(.text.boot) }
+	.text : { *(.text) }
+	.rodata : { *(.rodata) }
+	.data : { *(.data) }
+	. = ALIGN(0x8);
+	bss_begin = .;
+	.bss : { *(.bss*) } 
+	bss_end = .;
+}
diff --git a/exercises/lesson01/3/stefanji/src/mini_uart.c b/exercises/lesson01/3/stefanji/src/mini_uart.c
@@ -0,0 +1,55 @@
+#include "utils.h"
+#include "peripherals/mini_uart.h"
+#include "peripherals/gpio.h"
+
+void uart_send ( char c )
+{
+	while(1) {
+		if(get32(AUX_MU_LSR_REG)&0x20) 
+			break;
+	}
+	put32(AUX_MU_IO_REG,c);
+}
+
+char uart_recv ( void )
+{
+	while(1) {
+		if(get32(AUX_MU_LSR_REG)&0x01) 
+			break;
+	}
+	return(get32(AUX_MU_IO_REG)&0xFF);
+}
+
+void uart_send_string(char* str)
+{
+	for (int i = 0; str[i] != '\0'; i ++) {
+		uart_send((char)str[i]);
+	}
+}
+
+void uart_init ( void )
+{
+	unsigned int selector;
+
+	selector = get32(GPFSEL1);
+	selector &= ~(7<<12);                   // clean gpio14
+	selector |= 2<<12;                      // set alt5 for gpio14
+	selector &= ~(7<<15);                   // clean gpio15
+	selector |= 2<<15;                      // set alt5 for gpio15
+	put32(GPFSEL1,selector);
+
+	put32(GPPUD,0);
+	delay(150);
+	put32(GPPUDCLK0,(1<<14)|(1<<15));
+	delay(150);
+	put32(GPPUDCLK0,0);
+
+	put32(AUX_ENABLES,1);                   //Enable mini uart (this also enables access to it registers)
+	put32(AUX_MU_CNTL_REG,0);               //Disable auto flow control and disable receiver and transmitter (for now)
+	put32(AUX_MU_IER_REG,0);                //Disable receive and transmit interrupts
+	put32(AUX_MU_LCR_REG,3);                //Enable 8 bit mode
+	put32(AUX_MU_MCR_REG,0);                //Set RTS line to be always high
+	put32(AUX_MU_BAUD_REG,270);             //Set baud rate to 115200
+
+	put32(AUX_MU_CNTL_REG,3);               //Finally, enable transmitter and receiver
+}
diff --git a/exercises/lesson01/3/stefanji/src/mm.S b/exercises/lesson01/3/stefanji/src/mm.S
@@ -0,0 +1,30 @@
+#include "mm.h"
+
+.globl memzero
+memzero:
+	str xzr, [x0], #8
+	subs x1, x1, #8
+	b.gt memzero
+	ret
+
+.global init_memory
+init_memory:
+	adr x0, bss_begin
+	adr x1, bss_end
+	sub x1, x1, x0
+	b memzero
+	ret
+
+.global get_core_id
+get_core_id:
+	mrs x0, mpidr_el1
+	and x0, x0, #0xFF
+	ret
+
+.global init_stack
+init_stack:
+	mov x1, #STACK_OFFSET
+	mul x1, x1,x0
+	add x1, x1,#LOW_MEMORY
+	mov sp, x1
+	ret
diff --git a/exercises/lesson01/3/stefanji/src/utils.S b/exercises/lesson01/3/stefanji/src/utils.S
@@ -0,0 +1,15 @@
+.globl put32
+put32:
+	str w1,[x0]
+	ret
+
+.globl get32
+get32:
+	ldr w0,[x0]
+	ret
+
+.globl delay
+delay:
+	subs x0, x0, #1
+	bne delay
+	ret

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+docker run --rm -v %cd%:/app -w /app smatyukevich/raspberry-pi-os-builder make %1`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+#!/bin/bash`
	`2`	`+`
	`3`	`+docker run --rm -v $(pwd):/app -w /app smatyukevich/raspberry-pi-os-builder make $1`