Merge pull request #1107 from veremenko-y/pico1

pico: SD card speed improvement, rudimentary pico2 support, initial net support
EtchedPixels · Nov 18, 2024 · 9e6066d · 9e6066d
2 parents 1a6aeba + b886d1f
commit 9e6066d
Show file tree

Hide file tree

Showing 10 changed files with 54 additions and 170 deletions.
diff --git a/Kernel/platform/platform-rpipico/CMakeLists.txt b/Kernel/platform/platform-rpipico/CMakeLists.txt
@@ -71,6 +71,9 @@ add_executable(fuzix
 	../../tty.c
 	../../usermem.c
 	../../version.c
+	../../dev/net/net_native.c
+	../../syscall_net.c
+	../../network.c
 )
 
 target_link_libraries(fuzix

diff --git a/Kernel/platform/platform-rpipico/Makefile b/Kernel/platform/platform-rpipico/Makefile
@@ -1,6 +1,24 @@
 # Set one of these depending.
 export PICO_SDK_FETCH_FROM_GIT = yes
 #export PICO_SDK_PATH = ${HOME}/.pico-sdk/sdk/1.5.1
+#export PICO_SDK_PATH = ${HOME}/doclocal/pico-sdk
+SUBTARGET=pico
+
+# Set 'SUBTARGET' to one of pico-sdk compatible boards
+ifndef SUBTARGET
+$(error "Must set SUBTARGET to pico, pico_w or pico2")
+endif
+
+FSFAMILY=rp2040
+ifeq (SUBTARGET, 'pico2')
+FSFAMILY=data
+endif
+
+PICOTOOL=picotool
+
+ifeq (, $(shell which picotool))
+PICOTOOL=build/_deps/picotool/picotool
+endif
 
 include ../../../version.mk
 
@@ -12,16 +30,11 @@ build/fuzix.elf: ../../version.c build/Makefile
 
 build/Makefile: CMakeLists.txt $(wildcard ../../*.[chS]) $(wildcard ../../*/*.[chS])
 	mkdir -p build
-	(cd build && cmake ..)
+	(cd build && cmake -DPICO_BOARD=${SUBTARGET} ..)
 
-image:: world uf2conv
+image:: world
 	./update-flash.sh
 	../../../Standalone/mkftl -s 1952 -e 0x1000 -g 10 filesystem.img -o filesystem.ftl
-	arm-none-eabi-objcopy -I binary -O elf32-littlearm --change-section-vma .data=0x10018000 filesystem.ftl filesystem.elf
-	./uf2conv filesystem.ftl filesystem.uf2 0x10018000
-
-image-sd:: world uf2conv
-	./update-flash.sh sd
 
 diskimage:
 
@@ -50,7 +63,3 @@ world: build/fuzix.elf
 	$(MAKE) -C ../../../Applications/cursesgames -f Makefile.armm0
 	$(MAKE) -C ../../../Standalone
 	$(MAKE) -C utils
-
-uf2conv: tools/uf2conv.c
-	cc -O -g -o $@ $<
-
diff --git a/Kernel/platform/platform-rpipico/config.h b/Kernel/platform/platform-rpipico/config.h
@@ -28,6 +28,9 @@
 #undef CONFIG_IDUMP
 /* Enable to make ^A drop back into the monitor */
 #undef CONFIG_MONITOR
+/* Enable to support network stack */
+#undef CONFIG_NET
+#undef CONFIG_NET_NATIVE
 /* Profil syscall support (not yet complete) */
 #undef CONFIG_PROFIL
 /* Multiple processes in memory at once */
@@ -68,7 +71,17 @@
 
 #define UDATA_BLKS  3
 #define UDATA_SIZE  (UDATA_BLKS << BLKSHIFT)
-#define USERMEM (160*1024)
+
+#define TOTALMEM 160
+#define NETMEM 0
+
+#ifdef CONFIG_NET
+#undef NETMEM
+#define NETMEM 10
+#endif
+
+#define USERMEM ((TOTALMEM-NETMEM)*1024)
+
 #define PROGSIZE (65536 - UDATA_SIZE)
 extern uint8_t progbase[USERMEM];
 #define udata (*(struct u_data*)progbase)

diff --git a/Kernel/platform/platform-rpipico/devices.c b/Kernel/platform/platform-rpipico/devices.c
@@ -10,7 +10,6 @@
 #include "globals.h"
 #include "picosdk.h"
 #include <hardware/irq.h>
-#include <pico/multicore.h>
 #include "core1.h"
 
 struct devsw dev_tab[] =  /* The device driver switch table */
@@ -26,7 +25,7 @@ struct devsw dev_tab[] =  /* The device driver switch table */
   /* 3: /dev/lpr	Printer devices */
   {  no_open,     no_close,   no_rdwr,   no_rdwr,  no_ioctl  },
   /* 4: /dev/mem etc	System devices (one offs) */
-  {  no_open,      no_close,    sys_read, sys_write, sys_ioctl  },
+  {  no_open,      sys_close,    sys_read, sys_write, sys_ioctl  },
   /* Pack to 7 with nxio if adding private devices and start at 8 */
 };
 
@@ -63,6 +62,10 @@ static void timer_tick_cb(unsigned alarm)
     irqrestore(irq);
 }
 
+#ifdef CONFIG_NET
+extern void netdev_init(void);
+#endif
+
 void device_init(void)
 {
     /* Timer interrup must be initialized before blcok devices.
@@ -76,6 +79,9 @@ void device_init(void)
      * cause a crash on startup... oddly. */
 #ifdef CONFIG_PICO_FLASH
     flash_dev_init();
+#endif
+#ifdef CONFIG_NET
+	netdev_init();
 #endif
     sd_rawinit();
     devsd_init();

diff --git a/Kernel/platform/platform-rpipico/devsdspi.c b/Kernel/platform/platform-rpipico/devsdspi.c
@@ -46,6 +46,9 @@
 
 #endif
 
+#define SLOW_SPEED 250000
+#define FAST_SPEED 4000000
+
 void sd_rawinit(void)
 {
     //initilase GPIO ports
@@ -62,13 +65,15 @@ void sd_rawinit(void)
     gpio_set_dir(Pico_SD_CS, true);
 
     //initalise SPI module
-    spi_init(Pico_SD_SPI_MOD, 250000);
+
+    spi_init(Pico_SD_SPI_MOD, SLOW_SPEED);
     spi_set_format(Pico_SD_SPI_MOD, 8, 0, 0, SPI_MSB_FIRST);
 }
 
 void sd_spi_clock(bool go_fast)
 {
-    spi_set_baudrate(Pico_SD_SPI_MOD, 250000);
+    spi_set_baudrate(Pico_SD_SPI_MOD,
+        go_fast ? FAST_SPEED : SLOW_SPEED);
 }
 
 void sd_spi_raise_cs(void)

diff --git a/Kernel/platform/platform-rpipico/swapper.c b/Kernel/platform/platform-rpipico/swapper.c
@@ -32,6 +32,7 @@ static uint8_t get_slot(ptptr p)
 	uint8_t slot = p - ptab;
     if (slot >= PTABSIZE)
         panic("bad ptab");
+    return slot;
 }
 
 static uaddr_t get_proc_size(ptptr p)

diff --git a/Kernel/platform/platform-rpipico/tools/uf2conv.c b/Kernel/platform/platform-rpipico/tools/uf2conv.c
diff --git a/Kernel/platform/platform-rpipico/tools/uf2format.h b/Kernel/platform/platform-rpipico/tools/uf2format.h
diff --git a/Kernel/platform/platform-rpipico/update-flash.sh b/Kernel/platform/platform-rpipico/update-flash.sh
@@ -5,10 +5,6 @@ IMG=filesystem.img
 
 FSSIZE=2547
 
-if [ "$1" = "sd" ]; then
-    FSSIZE=65535
-fi
-
 rm -f ${IMG}
 ../../../Standalone/mkfs ${IMG} 32 $FSSIZE
 ../../../Standalone/ucp ${IMG} <<EOF

diff --git a/Kernel/syscall_net.c b/Kernel/syscall_net.c
@@ -13,6 +13,7 @@
 
 #ifdef CONFIG_NET
 
+extern void netdev_init(void);
 
 #define N_MAKE		0x80
 #define N_SOCKFD	0x40