Merge pull request #39 from adafruit/main

Merge from adafruit main for RP2040

6 files changed, 488 insertions, 0 deletions

diff --git a/ports/raspberrypi/supervisor/internal_flash.c b/ports/raspberrypi/supervisor/internal_flash.c
new file mode 100644
index 000000000..d333830de
--- /dev/null
+++ b/ports/raspberrypi/supervisor/internal_flash.c
@@ -0,0 +1,131 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "supervisor/internal_flash.h"
+
+#include <stdint.h>
+#include <string.h>
+#include <stdbool.h>
+
+#include "extmod/vfs.h"
+#include "extmod/vfs_fat.h"
+#include "py/mphal.h"
+#include "py/obj.h"
+#include "py/runtime.h"
+#include "lib/oofatfs/ff.h"
+#include "shared-bindings/microcontroller/__init__.h"
+
+#include "supervisor/usb.h"
+
+#include "src/rp2040/hardware_structs/include/hardware/structs/sio.h"
+#include "src/rp2_common/hardware_flash/include/hardware/flash.h"
+#include "src/common/pico_binary_info/include/pico/binary_info.h"
+
+#define RESERVED_FLASH 1 * 1024 * 1024
+
+// TODO: Parameterize flash size based on the configured flash.
+#define TOTAL_FLASH_SIZE 2 * 1024 * 1024
+
+// TODO: Split the caching out of supervisor/shared/external_flash so we can use it.
+#define SECTOR_SIZE 4096
+#define NO_CACHE 0xffffffff
+STATIC uint8_t _cache[SECTOR_SIZE];
+STATIC uint32_t _cache_lba = NO_CACHE;
+
+void supervisor_flash_init(void) {
+    bi_decl_if_func_used(bi_block_device(
+        BINARY_INFO_MAKE_TAG('C', 'P'),
+        "CircuitPython",
+        RESERVED_FLASH,
+        TOTAL_FLASH_SIZE - RESERVED_FLASH,
+        NULL,
+        BINARY_INFO_BLOCK_DEV_FLAG_READ |
+        BINARY_INFO_BLOCK_DEV_FLAG_WRITE |
+        BINARY_INFO_BLOCK_DEV_FLAG_PT_UNKNOWN));
+}
+
+uint32_t supervisor_flash_get_block_size(void) {
+    return FILESYSTEM_BLOCK_SIZE;
+}
+
+uint32_t supervisor_flash_get_block_count(void) {
+    return (TOTAL_FLASH_SIZE - RESERVED_FLASH) / FILESYSTEM_BLOCK_SIZE;
+}
+
+void port_internal_flash_flush(void) {
+    if (_cache_lba == NO_CACHE) {
+        return;
+    }
+    common_hal_mcu_disable_interrupts();
+    flash_range_erase(RESERVED_FLASH + _cache_lba, SECTOR_SIZE);
+    flash_range_program(RESERVED_FLASH + _cache_lba, _cache, SECTOR_SIZE);
+    common_hal_mcu_enable_interrupts();
+    _cache_lba = NO_CACHE;
+}
+
+mp_uint_t supervisor_flash_read_blocks(uint8_t *dest, uint32_t block, uint32_t num_blocks) {
+    memcpy(dest,
+           (void*)(XIP_BASE + RESERVED_FLASH + block * FILESYSTEM_BLOCK_SIZE),
+           num_blocks * FILESYSTEM_BLOCK_SIZE);
+    return 0;
+}
+
+mp_uint_t supervisor_flash_write_blocks(const uint8_t *src, uint32_t lba, uint32_t num_blocks) {
+    uint32_t blocks_per_sector = SECTOR_SIZE / FILESYSTEM_BLOCK_SIZE;
+    uint32_t block = 0;
+    while (block < num_blocks) {
+        uint32_t block_address = lba + block;
+        uint32_t sector_offset = block_address / blocks_per_sector * SECTOR_SIZE;
+        uint8_t block_offset = block_address % blocks_per_sector;
+
+        if (_cache_lba != block_address) {
+            memcpy(_cache,
+                   (void*)(XIP_BASE + RESERVED_FLASH + sector_offset),
+                   SECTOR_SIZE);
+            _cache_lba = sector_offset;
+        }
+        for (uint8_t b = block_offset; b < blocks_per_sector; b++) {
+            // Stop copying after the last block.
+            if (block >= num_blocks) {
+              break;
+            }
+            memcpy(_cache + b * FILESYSTEM_BLOCK_SIZE,
+                   src + block * FILESYSTEM_BLOCK_SIZE,
+                   FILESYSTEM_BLOCK_SIZE);
+            block++;
+        }
+        // Make sure we don't have an interrupt while we do flash operations.
+        common_hal_mcu_disable_interrupts();
+        flash_range_erase(RESERVED_FLASH + sector_offset, SECTOR_SIZE);
+        flash_range_program(RESERVED_FLASH + sector_offset, _cache, SECTOR_SIZE);
+        common_hal_mcu_enable_interrupts();
+    }
+
+    return 0; // success
+}
+
+void supervisor_flash_release_cache(void) {
+}
diff --git a/ports/raspberrypi/supervisor/internal_flash.h b/ports/raspberrypi/supervisor/internal_flash.h
new file mode 100644
index 000000000..0dc9f1545
--- /dev/null
+++ b/ports/raspberrypi/supervisor/internal_flash.h
@@ -0,0 +1,38 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_RASPBERRYPI_INTERNAL_FLASH_H
+#define MICROPY_INCLUDED_RASPBERRYPI_INTERNAL_FLASH_H
+
+#include <stdbool.h>
+
+#include "mpconfigport.h"
+
+// #define INTERNAL_FLASH_PART1_NUM_BLOCKS (CIRCUITPY_INTERNAL_FLASH_FILESYSTEM_SIZE / FILESYSTEM_BLOCK_SIZE)
+
+// #define INTERNAL_FLASH_SYSTICK_MASK    (0x1ff) // 512ms
+// #define INTERNAL_FLASH_IDLE_TICK(tick) (((tick) & INTERNAL_FLASH_SYSTICK_MASK) == 2)
+
+#endif  // MICROPY_INCLUDED_RASPBERRYPI_INTERNAL_FLASH_H
diff --git a/ports/raspberrypi/supervisor/internal_flash_root_pointers.h b/ports/raspberrypi/supervisor/internal_flash_root_pointers.h
new file mode 100644
index 000000000..419a4c943
--- /dev/null
+++ b/ports/raspberrypi/supervisor/internal_flash_root_pointers.h
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_RASPBERRYPI_INTERNAL_FLASH_ROOT_POINTERS_H
+#define MICROPY_INCLUDED_RASPBERRYPI_INTERNAL_FLASH_ROOT_POINTERS_H
+
+#define FLASH_ROOT_POINTERS
+
+#endif  // MICROPY_INCLUDED_RASPBERRYPI_INTERNAL_FLASH_ROOT_POINTERS_H
diff --git a/ports/raspberrypi/supervisor/port.c b/ports/raspberrypi/supervisor/port.c
new file mode 100644
index 000000000..b2f73c7b4
--- /dev/null
+++ b/ports/raspberrypi/supervisor/port.c
@@ -0,0 +1,200 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <string.h>
+#include <stdlib.h>
+
+#include "supervisor/board.h"
+#include "supervisor/port.h"
+
+#include "bindings/rp2pio/StateMachine.h"
+#include "genhdr/mpversion.h"
+#include "shared-bindings/busio/I2C.h"
+#include "shared-bindings/busio/SPI.h"
+#include "shared-bindings/microcontroller/__init__.h"
+#include "shared-bindings/rtc/__init__.h"
+#include "shared-bindings/pwmio/PWMOut.h"
+
+#include "supervisor/shared/safe_mode.h"
+#include "supervisor/shared/stack.h"
+#include "supervisor/shared/tick.h"
+
+#include "src/rp2040/hardware_structs/include/hardware/structs/watchdog.h"
+#include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
+#include "src/rp2_common/hardware_uart/include/hardware/uart.h"
+#include "src/rp2_common/hardware_sync/include/hardware/sync.h"
+#include "src/rp2_common/hardware_timer/include/hardware/timer.h"
+#include "src/common/pico_time/include/pico/time.h"
+#include "src/common/pico_binary_info/include/pico/binary_info.h"
+
+#include "tusb.h"
+
+
+extern volatile bool mp_msc_enabled;
+
+STATIC void _tick_callback(uint alarm_num);
+
+STATIC void _binary_info(void) {
+    // Binary info readable with `picotool`.
+    bi_decl(bi_program_name("CircuitPython"));
+    bi_decl(bi_program_version_string(MICROPY_GIT_TAG));
+    bi_decl(bi_program_build_date_string(MICROPY_BUILD_DATE));
+    bi_decl(bi_program_url("https://circuitpython.org"));
+
+    bi_decl(bi_program_build_attribute("BOARD=" CIRCUITPY_BOARD_ID));
+    // TODO: Add build attribute for debug builds. Needs newer CircuitPython with CIRCUITPY_DEBUG.
+}
+
+safe_mode_t port_init(void) {
+    _binary_info();
+    // Set brown out.
+
+    // Reset everything into a known state before board_init.
+    reset_port();
+
+    // For the tick.
+    hardware_alarm_claim(0);
+    hardware_alarm_set_callback(0, _tick_callback);
+
+    // Check brownout.
+
+    if (board_requests_safe_mode()) {
+        return USER_SAFE_MODE;
+    }
+
+    return NO_SAFE_MODE;
+}
+
+void reset_port(void) {
+    #if CIRCUITPY_BUSIO
+    reset_i2c();
+    reset_spi();
+    #endif
+
+    #if CIRCUITPY_RP2PIO
+    reset_rp2pio_statemachine();
+    #endif
+
+    #if CIRCUITPY_PWMIO
+    pwmout_reset();
+    #endif
+
+    reset_all_pins();
+}
+
+void reset_to_bootloader(void) {
+    // reset();
+    while (true) {}
+}
+
+void reset_cpu(void) {
+    // reset();
+    while (true) {}
+}
+
+bool port_has_fixed_stack(void) {
+    return false;
+}
+
+// From the linker script
+extern uint32_t __HeapLimit;
+extern uint32_t __StackTop;
+uint32_t *port_stack_get_limit(void) {
+    return &__HeapLimit;
+}
+
+uint32_t *port_stack_get_top(void) {
+    return &__StackTop;
+}
+
+uint32_t *port_heap_get_bottom(void) {
+    return port_stack_get_limit();
+}
+
+uint32_t *port_heap_get_top(void) {
+    return port_stack_get_top();
+}
+
+void port_set_saved_word(uint32_t value) {
+    // NOTE: This doesn't survive pressing the reset button (aka toggling RUN).
+    watchdog_hw->scratch[0] = value;
+}
+
+uint32_t port_get_saved_word(void) {
+    return watchdog_hw->scratch[0];
+}
+
+uint64_t port_get_raw_ticks(uint8_t* subticks) {
+    uint64_t microseconds = time_us_64();
+    return 1024 * (microseconds / 1000000) + (microseconds % 1000000) / 977;
+}
+
+STATIC void _tick_callback(uint alarm_num) {
+    supervisor_tick();
+    hardware_alarm_set_target(0, delayed_by_us(get_absolute_time(), 977));
+}
+
+// Enable 1/1024 second tick.
+void port_enable_tick(void) {
+    hardware_alarm_set_target(0, delayed_by_us(get_absolute_time(), 977));
+}
+
+// Disable 1/1024 second tick.
+void port_disable_tick(void) {
+    // hardware_alarm_cancel(0);
+}
+
+// This is called by sleep, we ignore it when our ticks are enabled because
+// they'll wake us up earlier. If we don't, we'll mess up ticks by overwriting
+// the next RTC wake up time.
+void port_interrupt_after_ticks(uint32_t ticks) {
+}
+
+void port_idle_until_interrupt(void) {
+    common_hal_mcu_disable_interrupts();
+    if (!tud_task_event_ready()) {
+//	asm volatile ("dsb 0xF":::"memory");
+//        __wfi();
+    }
+    common_hal_mcu_enable_interrupts();
+}
+
+/**
+ * \brief Default interrupt handler for unused IRQs.
+ */
+__attribute__((used)) void HardFault_Handler(void)
+{
+#ifdef ENABLE_MICRO_TRACE_BUFFER
+    // Turn off the micro trace buffer so we don't fill it up in the infinite
+    // loop below.
+    REG_MTB_MASTER = 0x00000000 + 6;
+#endif
+
+    reset_into_safe_mode(HARD_CRASH);
+    while (true) {
+        asm("nop;");
+    }
+}
diff --git a/ports/raspberrypi/supervisor/rp2_cpu.s b/ports/raspberrypi/supervisor/rp2_cpu.s
new file mode 100755
index 000000000..741bb2135
--- /dev/null
+++ b/ports/raspberrypi/supervisor/rp2_cpu.s
@@ -0,0 +1,35 @@
+.syntax unified
+.cpu cortex-m0
+.thumb
+.text
+.align  2
+
+@ uint cpu_get_regs_and_sp(r0=uint regs[10])
+.global cpu_get_regs_and_sp
+.thumb
+.thumb_func
+.type   cpu_get_regs_and_sp, %function
+cpu_get_regs_and_sp:
+@ store registers into given array
+str     r4, [r0, #0]
+str     r5, [r0, #4]
+str     r6, [r0, #8]
+str     r7, [r0, #12]
+push {r1}
+mov     r1, r8
+str     r1, [r0, #16]
+mov     r1, r9
+str     r1, [r0, #20]
+mov     r1, r10
+str     r1, [r0, #24]
+mov     r1, r11
+str     r1, [r0, #28]
+mov     r1, r12
+str     r1, [r0, #32]
+mov     r1, r13
+str     r1, [r0, #36]
+pop {r1}
+
+@ return the sp
+mov     r0, sp
+bx      lr
diff --git a/ports/raspberrypi/supervisor/usb.c b/ports/raspberrypi/supervisor/usb.c
new file mode 100644
index 000000000..1d2425aed
--- /dev/null
+++ b/ports/raspberrypi/supervisor/usb.c
@@ -0,0 +1,53 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "lib/tinyusb/src/device/usbd.h"
+#include "supervisor/background_callback.h"
+#include "supervisor/usb.h"
+#include "src/rp2_common/hardware_irq/include/hardware/irq.h"
+#include "src/rp2_common/pico_platform/include/pico/platform.h"
+#include "src/rp2040/hardware_regs/include/hardware/regs/intctrl.h"
+
+static background_callback_t usb_callback;
+static void usb_background_do(void* unused) {
+    usb_background();
+}
+
+static void queue_background(void) {
+    background_callback_add(&usb_callback, usb_background_do, NULL);
+}
+
+void init_usb_hardware(void) {
+}
+
+void post_usb_init(void) {
+    irq_handler_t usb_handler = irq_get_exclusive_handler(USBCTRL_IRQ);
+    if (usb_handler) {
+        irq_remove_handler(USBCTRL_IRQ, usb_handler);
+        irq_add_shared_handler(USBCTRL_IRQ, usb_handler, PICO_DEFAULT_IRQ_PRIORITY);
+    }
+    irq_add_shared_handler(USBCTRL_IRQ, queue_background, PICO_LOWEST_IRQ_PRIORITY);
+}