Fix PSRAM so readback test passes

tannewt · tannewt · commit fd1a730dbc18 · 2024-08-08T11:07:58.000-07:00
diff --git a/ports/raspberrypi/supervisor/port.c b/ports/raspberrypi/supervisor/port.c
@@ -225,6 +225,9 @@ static void __no_inline_not_in_flash_func(setup_psram)(void) {
         _psram_size *= 4;
     }
 
+    // Mark that we can write to PSRAM.
+    xip_ctrl_hw->ctrl |= XIP_CTRL_WRITABLE_M1_BITS;
+
     // Test write to the PSRAM.
     volatile uint32_t *psram_nocache = (volatile uint32_t *)0x15000000;
     psram_nocache[0] = 0x12345678;
@@ -233,9 +236,6 @@ static void __no_inline_not_in_flash_func(setup_psram)(void) {
         _psram_size = 0;
         return;
     }
-
-    // Mark that we can write to PSRAM.
-    xip_ctrl_hw->ctrl |= XIP_CTRL_WRITABLE_M1_BITS;
 }
 
 void port_heap_init(void) {

Original file line number	Diff line number	Diff line change
`@@ -225,6 +225,9 @@ static void __no_inline_not_in_flash_func(setup_psram)(void) {`
`225`	`225`	`_psram_size *= 4;`
`226`	`226`	`}`
`227`	`227`
	`228`	`+ // Mark that we can write to PSRAM.`
	`229`	`+ xip_ctrl_hw->ctrl \|= XIP_CTRL_WRITABLE_M1_BITS;`
	`230`	`+`
`228`	`231`	`// Test write to the PSRAM.`
`229`	`232`	`volatile uint32_t psram_nocache = (volatile uint32_t )0x15000000;`
`230`	`233`	`psram_nocache[0] = 0x12345678;`
`@@ -233,9 +236,6 @@ static void __no_inline_not_in_flash_func(setup_psram)(void) {`
`233`	`236`	`_psram_size = 0;`
`234`	`237`	`return;`
`235`	`238`	`}`
`236`		`-`
`237`		`- // Mark that we can write to PSRAM.`
`238`		`- xip_ctrl_hw->ctrl \|= XIP_CTRL_WRITABLE_M1_BITS;`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`void port_heap_init(void) {`