T3W1 PCB bring-up

core/SConscript.firmware

@@ -28,7 +28,7 @@ FEATURE_FLAGS = {
     "AES_GCM": BENCHMARK or THP,
 }
 
-FEATURES_WANTED = ["input", "sbu", "sd_card", "rgb_led", "dma2d", "consumption_mask", "usb" ,"optiga", "haptic"]
+FEATURES_WANTED = ["input", "sd_card", "rgb_led", "dma2d", "consumption_mask", "usb" ,"optiga", "haptic"]
 if DISABLE_OPTIGA and PYOPT == '0':
     FEATURES_WANTED.remove("optiga")
 

core/SConscript.kernel

@@ -23,7 +23,7 @@ FEATURE_FLAGS = {
     "AES_GCM": False,
 }
 
-FEATURES_WANTED = ["input", "sbu", "sd_card", "rgb_led", "dma2d", "consumption_mask", "usb" ,"optiga", "haptic"]
+FEATURES_WANTED = ["input", "sd_card", "rgb_led", "dma2d", "consumption_mask", "usb" ,"optiga", "haptic"]
 if DISABLE_OPTIGA and PYOPT == '0':
     FEATURES_WANTED.remove("optiga")
 

core/SConscript.unix

@@ -20,7 +20,7 @@ if BENCHMARK and PYOPT != '0':
   print("BENCHMARK=1 works only with PYOPT=0.")
   exit(1)
 
-FEATURES_WANTED = ["input", "sd_card", "dma2d", "optiga", "sbu"]
+FEATURES_WANTED = ["input", "sd_card", "dma2d", "optiga"]
 
 if not models.has_emulator(TREZOR_MODEL):
     # skip unix build

core/embed/io/display/st-7789/display_driver.c

@@ -99,7 +99,7 @@ void display_deinit(display_content_mode_t mode) {
 #endif
 #endif
 
-  mpu_set_unpriv_fb(NULL, 0);
+  mpu_set_active_fb(NULL, 0);
 
   backlight_pwm_deinit(mode == DISPLAY_RESET_CONTENT ? BACKLIGHT_RESET
                                                      : BACKLIGHT_RETAIN);

core/embed/io/display/st-7789/display_fb.c

@@ -107,8 +107,10 @@ static uint8_t *get_fb_ptr(uint32_t index) {
 
 void display_physical_fb_clear(void) {
   for (int i = 0; i < FRAME_BUFFER_COUNT; i++) {
+    mpu_set_active_fb(get_fb_ptr(i), PHYSICAL_FRAME_BUFFER_SIZE);
     memset(get_fb_ptr(i), 0, PHYSICAL_FRAME_BUFFER_SIZE);
   }
+  mpu_set_active_fb(NULL, 0);
 }
 
 #ifndef BOARDLOADER
@@ -198,7 +200,7 @@ bool display_get_frame_buffer(display_fb_info_t *fb) {
   fb->ptr = get_fb_ptr(drv->queue.wix);
   fb->stride = DISPLAY_RESX * sizeof(uint16_t);
   // Enable access to the frame buffer from the unprivileged code
-  mpu_set_unpriv_fb(fb->ptr, PHYSICAL_FRAME_BUFFER_SIZE);
+  mpu_set_active_fb(fb->ptr, PHYSICAL_FRAME_BUFFER_SIZE);
 
   return true;
 }
@@ -208,12 +210,15 @@ static void copy_fb_to_display(uint8_t index) {
   uint16_t *fb = (uint16_t *)get_fb_ptr(index);
 
   if (fb != NULL) {
+    mpu_set_active_fb(fb, PHYSICAL_FRAME_BUFFER_SIZE);
     display_panel_set_window(0, 0, DISPLAY_RESX - 1, DISPLAY_RESY - 1);
     for (int i = 0; i < DISPLAY_RESX * DISPLAY_RESY; i++) {
       // 2 bytes per pixel because we're using RGB 5-6-5 format
       ISSUE_PIXEL_DATA(fb[i]);
     }
   }
+
+  mpu_set_active_fb(NULL, 0);
 }
 
 static void wait_for_te_signal(void) {
@@ -238,7 +243,7 @@ void display_refresh(void) {
   }
 
   // Disable access to the frame buffer from the unprivileged code
-  mpu_set_unpriv_fb(NULL, 0);
+  mpu_set_active_fb(NULL, 0);
 
 #ifndef BOARDLOADER
   if (is_mode_exception()) {

core/embed/io/display/st7785ma/display_driver.c

@@ -1,24 +1,88 @@
 
+#include <sys/systick.h>
+#ifdef KERNEL_MODE
+
 #include <trezor_bsp.h>
 #include <trezor_model.h>
 #include <trezor_rtl.h>
 
 #include <io/display.h>
+#include <sys/mpu.h>
+#include <sys/trustzone.h>
+#include "../backlight/backlight_pwm.h"
 
-#ifdef KERNEL_MODE
-void display_init(display_content_mode_t mode) {}
+// Hardware requires physical frame buffer alignment
+#ifdef USE_TRUSTZONE
+#define PHYSICAL_FRAME_BUFFER_ALIGNMENT TZ_SRAM_ALIGNMENT
+#else
+#define PHYSICAL_FRAME_BUFFER_ALIGNMENT 32
+#endif
+
+// Size of the physical frame buffer in bytes
+#define PHYSICAL_FRAME_BUFFER_SIZE               \
+  ALIGN_UP_CONST(DISPLAY_RESX *DISPLAY_RESY * 2, \
+                 PHYSICAL_FRAME_BUFFER_ALIGNMENT)
+
+static
+    __attribute__((section(".fb1"), aligned(PHYSICAL_FRAME_BUFFER_ALIGNMENT)))
+    uint8_t physical_frame_buffer_0[PHYSICAL_FRAME_BUFFER_SIZE];
+
+#if (FRAME_BUFFER_COUNT > 1)
+static
+    __attribute__((section(".fb2"), aligned(PHYSICAL_FRAME_BUFFER_ALIGNMENT)))
+    uint8_t physical_frame_buffer_1[PHYSICAL_FRAME_BUFFER_SIZE];
+#endif
+
+void display_init(display_content_mode_t mode) {
+  __HAL_RCC_GPIOE_CLK_ENABLE();
 
-void display_deinit(display_content_mode_t mode) {}
+  GPIO_InitTypeDef GPIO_InitStructure;
+
+  GPIO_InitStructure.Mode = GPIO_MODE_OUTPUT_PP;
+  GPIO_InitStructure.Pull = GPIO_NOPULL;
+  GPIO_InitStructure.Speed = GPIO_SPEED_FREQ_LOW;
+  GPIO_InitStructure.Alternate = 0;
+  GPIO_InitStructure.Pin = GPIO_PIN_2;
+  HAL_GPIO_WritePin(GPIOE, GPIO_PIN_2, GPIO_PIN_RESET);
+  HAL_GPIO_Init(GPIOE, &GPIO_InitStructure);
+
+  GPIO_InitStructure.Pin = GPIO_PIN_0;
+  // default to keeping display in reset
+  HAL_GPIO_WritePin(GPIOE, GPIO_PIN_0, GPIO_PIN_RESET);
+  HAL_GPIO_Init(GPIOE, &GPIO_InitStructure);
+
+  hal_delay(100);
+  HAL_GPIO_WritePin(GPIOE, GPIO_PIN_2, GPIO_PIN_SET);
+
+  backlight_pwm_init(mode);
+}
+
+void display_deinit(display_content_mode_t mode) { backlight_pwm_deinit(mode); }
 
 void display_set_unpriv_access(bool unpriv) {}
 
-int display_set_backlight(int level) { return level; }
+int display_set_backlight(int level) {
+  return 0;
+  // return backlight_pwm_set(level);
+}
 
-int display_get_backlight(void) { return 0; }
+int display_get_backlight(void) { return backlight_pwm_get(); }
 
 int display_set_orientation(int angle) { return angle; }
 int display_get_orientation(void) { return 0; }
-bool display_get_frame_buffer(display_fb_info_t *fb) { return true; }
+
+// Returns the pointer to the physical frame buffer (0.. FRAME_BUFFER_COUNT-1)
+// Returns NULL if the framebuffer index is out of range.
+static uint8_t *get_fb_ptr(uint32_t index) { return physical_frame_buffer_0; }
+
+bool display_get_frame_buffer(display_fb_info_t *fb) {
+  fb->ptr = get_fb_ptr(0);
+  fb->stride = DISPLAY_RESX * sizeof(uint16_t);
+  // Enable access to the frame buffer from the unprivileged code
+  mpu_set_active_fb(fb->ptr, PHYSICAL_FRAME_BUFFER_SIZE);
+
+  return true;
+}
 
 void display_refresh(void) {}
 void display_fill(const gfx_bitblt_t *bb) {}

core/embed/io/display/stm32f429i-disc1/display_driver.c

@@ -73,7 +73,7 @@ void display_init(display_content_mode_t mode) {
 void display_deinit(display_content_mode_t mode) {
   display_driver_t *drv = &g_display_driver;
 
-  mpu_set_unpriv_fb(NULL, 0);
+  mpu_set_active_fb(NULL, 0);
 
   drv->initialized = false;
 }
@@ -136,7 +136,7 @@ bool display_get_frame_buffer(display_fb_info_t *fb) {
     fb->ptr = (void *)drv->framebuf;
     fb->stride = DISPLAY_RESX * sizeof(uint16_t);
     // Enable access to the frame buffer from the unprivileged code
-    mpu_set_unpriv_fb(fb->ptr, FRAME_BUFFER_SIZE);
+    mpu_set_active_fb(fb->ptr, FRAME_BUFFER_SIZE);
     return true;
   }
 }
@@ -145,7 +145,7 @@ void display_refresh(void) {
   // Do nothing as using just a single frame buffer
 
   // Disable access to the frame buffer from the unprivileged code
-  mpu_set_unpriv_fb(NULL, 0);
+  mpu_set_active_fb(NULL, 0);
 }
 
 void display_fill(const gfx_bitblt_t *bb) {

core/embed/io/display/stm32u5a9j-dk/display_driver.c

@@ -70,16 +70,21 @@ void display_init(display_content_mode_t mode) {
     HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit);
 
     // Clear framebuffers
+    mpu_set_active_fb(physical_frame_buffer_0, PHYSICAL_FRAME_BUFFER_SIZE);
     memset(physical_frame_buffer_0, 0x00, PHYSICAL_FRAME_BUFFER_SIZE);
+
+    mpu_set_active_fb(physical_frame_buffer_1, PHYSICAL_FRAME_BUFFER_SIZE);
     memset(physical_frame_buffer_1, 0x00, PHYSICAL_FRAME_BUFFER_SIZE);
 
+    mpu_set_active_fb(NULL, 0);
+
     BSP_LCD_Init(0, LCD_ORIENTATION_PORTRAIT);
     BSP_LCD_SetBrightness(0, 100);
     BSP_LCD_DisplayOn(0);
   } else {
     // Retain display content
     BSP_LCD_Reinit(0);
-    if (current_frame_buffer == 0) {
+    if (drv->current_frame_buffer == 0) {
       BSP_LCD_SetFrameBuffer(0, GFXMMU_VIRTUAL_BUFFER1_BASE_S);
     } else {
       BSP_LCD_SetFrameBuffer(0, GFXMMU_VIRTUAL_BUFFER0_BASE_S);
@@ -110,7 +115,7 @@ void display_deinit(display_content_mode_t mode) {
     BSP_LCD_DeInit(0);
   }
 
-  mpu_set_unpriv_fb(NULL, 0);
+  mpu_set_active_fb(NULL, 0);
 
   drv->initialized = false;
 }

core/embed/io/display/stm32u5a9j-dk/display_fb.c

@@ -39,11 +39,6 @@ uint8_t physical_frame_buffer_0[PHYSICAL_FRAME_BUFFER_SIZE];
 __attribute__((section(".fb2"), aligned(PHYSICAL_FRAME_BUFFER_ALIGNMENT)))
 uint8_t physical_frame_buffer_1[PHYSICAL_FRAME_BUFFER_SIZE];
 
-// The current frame buffer selector at fixed memory address
-// It's shared between bootloaders and the firmware
-__attribute__((section(".framebuffer_select"))) uint32_t current_frame_buffer =
-    0;
-
 #ifdef USE_TRUSTZONE
 void display_set_unpriv_access(bool unpriv) {
   // To allow unprivileged access both GFXMMU virtual buffers area and
@@ -85,7 +80,7 @@ bool display_get_frame_buffer(display_fb_info_t *fb) {
 
   uintptr_t addr;
 
-  if (current_frame_buffer == 0) {
+  if (drv->current_frame_buffer == 0) {
     addr = GFXMMU_VIRTUAL_BUFFER1_BASE_S;
   } else {
     addr = GFXMMU_VIRTUAL_BUFFER0_BASE_S;
@@ -102,7 +97,7 @@ bool display_get_frame_buffer(display_fb_info_t *fb) {
   fb->stride = fb_stride;
 
   // Enable access to the frame buffer from the unprivileged code
-  mpu_set_unpriv_fb(fb->ptr, VIRTUAL_FRAME_BUFFER_SIZE);
+  mpu_set_active_fb(fb->ptr, VIRTUAL_FRAME_BUFFER_SIZE);
 
   return true;
 }
@@ -115,13 +110,13 @@ void display_refresh(void) {
   }
 
   // Disable access to the frame buffer from the unprivileged code
-  mpu_set_unpriv_fb(NULL, 0);
+  mpu_set_active_fb(NULL, 0);
 
-  if (current_frame_buffer == 0) {
-    current_frame_buffer = 1;
+  if (drv->current_frame_buffer == 0) {
+    drv->current_frame_buffer = 1;
     BSP_LCD_SetFrameBuffer(0, GFXMMU_VIRTUAL_BUFFER1_BASE_S);
   } else {
-    current_frame_buffer = 0;
+    drv->current_frame_buffer = 0;
     BSP_LCD_SetFrameBuffer(0, GFXMMU_VIRTUAL_BUFFER0_BASE_S);
   }
 }

core/embed/io/display/stm32u5a9j-dk/display_internal.h

@@ -36,6 +36,8 @@ typedef struct {
   int orientation_angle;
   // Current backlight level ranging from 0 to 255
   int backlight_level;
+  // The current frame buffer selector
+  uint32_t current_frame_buffer;
 } display_driver_t;
 
 // Display driver instance
@@ -64,16 +66,11 @@ extern display_driver_t g_display_driver;
 
 // Physical frame buffers in internal SRAM memory
 //
-// Both frame buffers layes in the fixed addresses that
+// Both frame buffers layers in the fixed addresses that
 // are shared between bootloaders and the firmware.
 extern uint8_t physical_frame_buffer_0[PHYSICAL_FRAME_BUFFER_SIZE];
 extern uint8_t physical_frame_buffer_1[PHYSICAL_FRAME_BUFFER_SIZE];
 
-// The current frame buffer selector at fixed memory address
-//
-// The variable address is shared between bootloaders and the firmware
-extern uint32_t current_frame_buffer;
-
 // LCD orientations
 #define LCD_ORIENTATION_PORTRAIT 0U
 #define LCD_ORIENTATION_LANDSCAPE 1U

core/embed/io/display/stm32u5a9j-dk/display_ltdc_dsi.c

@@ -164,9 +164,6 @@ LTDC_HandleTypeDef hlcd_ltdc = {0};
 DSI_HandleTypeDef hlcd_dsi = {0};
 static DSI_VidCfgTypeDef DSIVidCfg = {0};
 
-__attribute__((section(".gfxmmu_table")))
-uint32_t gfxmmu_lut[2 * GFXMMU_LUT_SIZE];
-
 /**
  * @}
  */
@@ -207,7 +204,6 @@ int32_t BSP_LCD_Init(uint32_t Instance, uint32_t Orientation) {
   memset(&hlcd_ltdc, 0, sizeof(hlcd_ltdc));
   memset(&hlcd_dsi, 0, sizeof(hlcd_dsi));
   memset(&DSIVidCfg, 0, sizeof(DSIVidCfg));
-  memcpy(gfxmmu_lut, gfxmmu_lut_config, sizeof(gfxmmu_lut));
 
   int32_t status = BSP_ERROR_NONE;
 
@@ -989,7 +985,7 @@ static int32_t LCD_Init(void) {
     }
     /* Initialize LUT */
     else if (HAL_GFXMMU_ConfigLut(&hlcd_gfxmmu, 0, LCD_WIDTH,
-                                  (uint32_t)&gfxmmu_lut) != HAL_OK) {
+                                  (uint32_t)&gfxmmu_lut_config) != HAL_OK) {
       status = BSP_ERROR_PERIPH_FAILURE;
     } else {
       /* Disable non visible lines : from line 480 to 1023 */

core/embed/io/display/vg-2864/display_driver.c

@@ -199,6 +199,8 @@ static void display_sync_with_fb(display_driver_t *drv) {
 
   // Send whole framebuffer to the display
 
+  mpu_set_active_fb(drv->framebuf, FRAME_BUFFER_SIZE);
+
   if (drv->orientation_angle == 0) {
     for (int y = DISPLAY_RESY / 8 - 1; y >= 0; y--) {
       uint8_t buff[DISPLAY_RESX];
@@ -233,6 +235,7 @@ static void display_sync_with_fb(display_driver_t *drv) {
 
   while (HAL_SPI_STATE_READY != HAL_SPI_GetState(&drv->spi)) {
   }
+  mpu_set_active_fb(NULL, 0);
 
   // SPI deselect
   HAL_GPIO_WritePin(OLED_CS_PORT, OLED_CS_PIN, GPIO_PIN_SET);
@@ -321,7 +324,7 @@ void display_init(display_content_mode_t mode) {
 void display_deinit(display_content_mode_t mode) {
   display_driver_t *drv = &g_display_driver;
 
-  mpu_set_unpriv_fb(NULL, 0);
+  mpu_set_active_fb(NULL, 0);
 
   drv->initialized = false;
 }
@@ -391,7 +394,7 @@ bool display_get_frame_buffer(display_fb_info_t *fb) {
     fb->ptr = &drv->framebuf[0];
     fb->stride = DISPLAY_RESX;
     // Enable access to the frame buffer from the unprivileged code
-    mpu_set_unpriv_fb(fb->ptr, FRAME_BUFFER_SIZE);
+    mpu_set_active_fb(fb->ptr, FRAME_BUFFER_SIZE);
     return true;
   }
 }
@@ -410,7 +413,7 @@ void display_refresh(void) {
 #endif
 
   // Disable access to the frame buffer from the unprivileged code
-  mpu_set_unpriv_fb(NULL, 0);
+  mpu_set_active_fb(NULL, 0);
 
   // Copy the frame buffer to the display
   display_sync_with_fb(drv);

core/embed/io/rgb_led/inc/io/rgb_led.h

@@ -24,10 +24,16 @@
 
 #ifdef KERNEL_MODE
 
+// Initialize RGB LED driver
 void rgb_led_init(void);
 
+// Deinitialize RGB LED driver
+void rgb_led_deinit(void);
+
 #endif
 
+// Set RGB LED color
+// color: 24-bit RGB color, 0x00RRGGBB
 void rgb_led_set_color(uint32_t color);
 
 #endif  // TREZORHAL_RGB_LED_H