Merge branch 'tannewt-rpi' into generalize-synopsys-dwc2

.gitmodules

@@ -127,3 +127,7 @@
 [submodule "hw/mcu/mindmotion/mm32sdk"]
 	path = hw/mcu/mindmotion/mm32sdk
 	url = https://github.com/hathach/mm32sdk.git
+[submodule "hw/mcu/broadcom"]
+	path = hw/mcu/broadcom
+	url = git@github.com:adafruit/broadcom-peripherals.git
+	branch = main-build

examples/device/cdc_msc/src/tusb_config.h

@@ -48,7 +48,8 @@
 // Default to Highspeed for MCU with internal HighSpeed PHY (can be port specific), otherwise FullSpeed
 #ifndef BOARD_DEVICE_RHPORT_SPEED
   #if (CFG_TUSB_MCU == OPT_MCU_LPC18XX || CFG_TUSB_MCU == OPT_MCU_LPC43XX || CFG_TUSB_MCU == OPT_MCU_MIMXRT10XX || \
-       CFG_TUSB_MCU == OPT_MCU_NUC505  || CFG_TUSB_MCU == OPT_MCU_CXD56 || CFG_TUSB_MCU == OPT_MCU_SAMX7X)
+       CFG_TUSB_MCU == OPT_MCU_NUC505  || CFG_TUSB_MCU == OPT_MCU_CXD56 || CFG_TUSB_MCU == OPT_MCU_SAMX7X || \
+       CFG_TUSB_MCU == OPT_MCU_BCM2711)
     #define BOARD_DEVICE_RHPORT_SPEED   OPT_MODE_HIGH_SPEED
   #else
     #define BOARD_DEVICE_RHPORT_SPEED   OPT_MODE_FULL_SPEED

hw/bsp/raspberrypi4/boards/raspberrypi_cm4/board.h

@@ -0,0 +1,38 @@
+/* 
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020, Ha Thach (tinyusb.org)
+ *
+ * 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.
+ *
+ * This file is part of the TinyUSB stack.
+ */
+
+#ifndef BOARD_H_
+#define BOARD_H_
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+#ifdef __cplusplus
+ }
+#endif
+
+#endif /* BOARD_H_ */

hw/bsp/raspberrypi4/family.c

@@ -0,0 +1,180 @@
+/* 
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Ha Thach (tinyusb.org)
+ *
+ * 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.
+ *
+ * This file is part of the TinyUSB stack.
+ */
+
+#include "bsp/board.h"
+#include "board.h"
+
+#include "broadcom/interrupts.h"
+#include "broadcom/io.h"
+#include "broadcom/mmu.h"
+#include "broadcom/vcmailbox.h"
+
+uint32_t SystemCoreClock = 700 * 1000 * 1000;
+
+//--------------------------------------------------------------------+
+// Forward USB interrupt events to TinyUSB IRQ Handler
+//--------------------------------------------------------------------+
+void USB_IRQHandler(void)
+{
+  tud_int_handler(0);
+}
+
+//--------------------------------------------------------------------+
+// MACRO TYPEDEF CONSTANT ENUM
+//--------------------------------------------------------------------+
+
+//--------------------------------------------------------------------+
+// Board porting API
+//--------------------------------------------------------------------+
+
+void print(const char* str) {
+  board_uart_write(str, strlen(str));
+}
+
+void board_init(void)
+{
+  gpio_initOutputPinWithPullNone(18);
+  gpio_initOutputPinWithPullNone(19);
+  gpio_initOutputPinWithPullNone(20);
+  gpio_initOutputPinWithPullNone(21);
+  gpio_setPinOutputBool(18, true);
+  gpio_initOutputPinWithPullNone(42);
+  setup_mmu_flat_map();
+  // gpio_initOutputPinWithPullNone(23);
+  // gpio_initOutputPinWithPullNone(24);
+  // gpio_initOutputPinWithPullNone(25);
+  gpio_setPinOutputBool(18, false);
+  uart_init();
+  gpio_setPinOutputBool(18, true);
+  const char* greeting = "hello to gdb2\r\n";
+  gpio_setPinOutputBool(18, false);
+  for (size_t i = 0; i < 5; i++) {
+  // while (true) {
+    for (size_t j = 0; j < 1000000; j++) {
+      __asm__("nop");
+    }
+    gpio_setPinOutputBool(42, true);
+    gpio_setPinOutputBool(18, true);
+    gpio_setPinOutputBool(19, true);
+    gpio_setPinOutputBool(20, true);
+    gpio_setPinOutputBool(21, true);
+    for (size_t j = 0; j < 1000000; j++) {
+      __asm__("nop");
+    }
+    gpio_setPinOutputBool(42, false);
+    gpio_setPinOutputBool(18, false);
+    gpio_setPinOutputBool(19, false);
+    gpio_setPinOutputBool(20, false);
+    gpio_setPinOutputBool(21, false);
+  }
+  // uart_writeText("hello from io\n");
+  // gpio_setPinOutputBool(24, true);
+  board_uart_write(greeting, strlen(greeting));
+  // gpio_setPinOutputBool(24, false);
+  // gpio_setPinOutputBool(25, true);
+  // print();
+  // gpio_setPinOutputBool(25, false);
+  // while (true) {
+  // // for (size_t i = 0; i < 5; i++) {
+  //   for (size_t j = 0; j < 10000000000; j++) {
+  //     __asm__("nop");
+  //   }
+  //   gpio_setPinOutputBool(42, true);
+  //   for (size_t j = 0; j < 10000000000; j++) {
+  //     __asm__("nop");
+  //   }
+  //   gpio_setPinOutputBool(42, false);
+  // }
+  // while (1) uart_update();
+
+  printf("hello %d\r\n", 21);
+
+  // Turn on USB peripheral.
+  print("Turning on USB power\r\n");
+
+  vcmailbox_set_power_state(VCMAILBOX_DEVICE_USB_HCD, true);
+  print("USB power on\r\n");
+
+  BP_SetPriority(USB_IRQn, 0x00);
+  BP_ClearPendingIRQ(USB_IRQn);
+  BP_EnableIRQ(USB_IRQn);
+  BP_EnableIRQs();
+}
+
+void board_led_write(bool state)
+{
+  gpio_setPinOutputBool(42, state);
+}
+
+uint32_t board_button_read(void)
+{
+  return 0;
+}
+
+int board_uart_read(uint8_t* buf, int len)
+{
+  (void) buf; (void) len;
+  return 0;
+}
+
+int board_uart_write(void const * buf, int len)
+{
+  for (int i = 0; i < len; i++) {
+    const char* cbuf = buf;
+    while (!UART1->STAT_b.TX_READY) {}
+    if (cbuf[i] == '\n') {
+      UART1->IO = '\r';
+      while (!UART1->STAT_b.TX_READY) {}
+    }
+    UART1->IO = cbuf[i];
+  }
+  return len;
+}
+
+#if CFG_TUSB_OS  == OPT_OS_NONE
+volatile uint32_t system_ticks = 0;
+void SysTick_Handler (void)
+{
+  system_ticks++;
+}
+
+uint32_t board_millis(void)
+{
+  return system_ticks;
+}
+#endif
+
+void HardFault_Handler (void)
+{
+  // asm("bkpt");
+}
+
+// Required by __libc_init_array in startup code if we are compiling using
+// -nostdlib/-nostartfiles.
+void _init(void)
+{
+
+}

hw/bsp/raspberrypi4/family.mk

@@ -0,0 +1,41 @@
+UF2_FAMILY_ID = 0x57755a57
+
+include $(TOP)/$(BOARD_PATH)/board.mk
+
+MCU_DIR = hw/mcu/broadcom
+
+CC = clang
+
+CFLAGS += \
+	-Wall \
+	-O0 \
+	-ffreestanding \
+	-nostdlib \
+	-nostartfiles \
+	-std=c17 \
+	-mgeneral-regs-only \
+	-DCFG_TUSB_MCU=OPT_MCU_BCM2711
+
+SRC_C += \
+	src/portable/broadcom/synopsys/dcd_synopsys.c \
+	$(MCU_DIR)/broadcom/gen/interrupt_handlers.c \
+	$(MCU_DIR)/broadcom/interrupts.c \
+	$(MCU_DIR)/broadcom/io.c \
+	$(MCU_DIR)/broadcom/mmu.c \
+	$(MCU_DIR)/broadcom/vcmailbox.c
+
+CROSS_COMPILE = aarch64-none-elf-
+
+SKIP_NANOLIB = 1
+
+LD_FILE = $(MCU_DIR)/broadcom/link.ld
+
+INC += \
+	$(TOP)/$(BOARD_PATH) \
+	$(TOP)/$(MCU_DIR) \
+	$(TOP)/lib/CMSIS_5/CMSIS/Core_A/Include
+
+SRC_S += $(MCU_DIR)/broadcom/boot.S
+
+$(BUILD)/kernel8.img: $(BUILD)/$(PROJECT).elf
+	$(OBJCOPY) -O binary $^ $@

hw/mcu/broadcom

@@ -0,0 +1 @@
+Subproject commit 55cd6f798a45cac905d7bf81baa2bcbf7de7c42e

src/class/msc/msc_device.c

@@ -481,7 +481,7 @@ bool mscd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t event, uint32_t
             if (p_cbw->total_bytes)
             {
               // 6.7 The 13 Cases: case 4 (Hi > Dn)
-              TU_LOG(MSC_DEBUG, "  SCSI case 4 (Hi > Dn): %lu\r\n", p_cbw->total_bytes);
+              // TU_LOG(MSC_DEBUG, "  SCSI case 4 (Hi > Dn): %lu\r\n", p_cbw->total_bytes);
               fail_scsi_op(rhport, p_msc, MSC_CSW_STATUS_FAILED);
             }else
             {
@@ -494,7 +494,7 @@ bool mscd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t event, uint32_t
             if ( p_cbw->total_bytes == 0 )
             {
               // 6.7 The 13 Cases: case 2 (Hn < Di)
-              TU_LOG(MSC_DEBUG, "  SCSI case 2 (Hn < Di): %lu\r\n", p_cbw->total_bytes);
+              // TU_LOG(MSC_DEBUG, "  SCSI case 2 (Hn < Di): %lu\r\n", p_cbw->total_bytes);
               fail_scsi_op(rhport, p_msc, MSC_CSW_STATUS_FAILED);
             }else
             {
@@ -609,7 +609,7 @@ bool mscd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t event, uint32_t
       if ( (p_cbw->total_bytes > p_msc->xferred_len) && is_data_in(p_cbw->dir) )
       {
         // 6.7 The 13 Cases: case 5 (Hi > Di): STALL before status
-        TU_LOG(MSC_DEBUG, "  SCSI case 5 (Hi > Di): %lu > %lu\r\n", p_cbw->total_bytes, p_msc->xferred_len);
+        // TU_LOG(MSC_DEBUG, "  SCSI case 5 (Hi > Di): %lu > %lu\r\n", p_cbw->total_bytes, p_msc->xferred_len);
         usbd_edpt_stall(rhport, p_msc->ep_in);
       }else
       {

src/device/dcd_attr.h

@@ -180,6 +180,10 @@
 #elif TU_CHECK_MCU(OPT_MCU_GD32VF103)
   #define DCD_ATTR_ENDPOINT_MAX   4
 
+//------------- Broadcom -------------//
+#elif TU_CHECK_MCU(BCM2711)
+  #define DCD_ATTR_ENDPOINT_MAX   8
+
 #else
   #warning "DCD_ATTR_ENDPOINT_MAX is not defined for this MCU, default to 8"
   #define DCD_ATTR_ENDPOINT_MAX   8

src/tusb_option.h

@@ -127,6 +127,8 @@
 // GigaDevice
 #define OPT_MCU_GD32VF103        1600 ///< GigaDevice GD32VF103
 
+// Broadcom
+#define OPT_MCU_BCM2711          1700 ///< Broadcom BCM2711
 
 // Helper to check if configured MCU is one of listed
 // Apply _TU_CHECK_MCU with || as separator to list of input