Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SparkFun updates for the PSRAM draft/work #3

Open
wants to merge 88 commits into
base: feature/psram
Choose a base branch
from
Open

SparkFun updates for the PSRAM draft/work #3

wants to merge 88 commits into from

Conversation

gigapod
Copy link

@gigapod gigapod commented Aug 30, 2024

Hi Pimoroni -

This repo:branch looks like the best path to get our updates in the discussion around the PSRAM PR on the micropython/micropython repo.

This PR contains updates that reflect the work we've done to support PSRAM and continues on the discussion/work that took place prior to the RP2350 announcement. We

Updates of note:

  • The frequency of the PSRAM depends on the VDD to the IC (noted in data sheet) - so added a define for that, and made it a parameter to the PSRAM setup/timing functions
  • Separated out the timing setup logic into a separate function - this is called the system clock is changed and after flash is written/erased.
  • Removed all the magic numbers we had in our code - created a variety of constants based on the PSRAM datasheet ..etc
  • Add a variety of comments and supporting links to outline what is taking place ...etc
  • Added board file for our Pro Micro RP2350

-Kirk

dpgeorge and others added 30 commits August 22, 2024 15:11
@dpgeorge @Gadgetoid
lib/pico-sdk: Update to new rp2350 version.
5a032da 
Signed-off-by: Damien George <[email protected]>
@dpgeorge @Gadgetoid
lib/tinyusb: Update to support RP2350.
9a9ceeb 
Signed-off-by: Damien George <[email protected]>
@dpgeorge @Gadgetoid
shared/tinyusb: Use new persistent-tx-fifo configure interface.
72d47a7 
Signed-off-by: Damien George <[email protected]>
@peterharperuk @Gadgetoid
rp2/boards: Add RPI_PICO2 board.
eb9e471 
Signed-off-by: Damien George <[email protected]>
@peterharperuk @Gadgetoid
rp2/mpconfigport: Set MCU name for RP2350.
d259bed 
Signed-off-by: Damien George <[email protected]>
@peterharperuk @Gadgetoid
rp2: Update custom linker scripts for new pico-sdk.
c29c969 
Signed-off-by: Phil Howard <[email protected]>
Signed-off-by: Damien George <[email protected]>
@peterharperuk @Gadgetoid
rp2/modmachine: Implement lightsleep for RP2350.
c3a2bd2 
Signed-off-by: Damien George <[email protected]>
@peterharperuk @Gadgetoid
rp2/rp2_dma: Generalise DMA for RP2350.
e5c098e 
Signed-off-by: Damien George <[email protected]>
@peterharperuk @Gadgetoid
rp2: Integrate RP2350.
2931e13 
Remove references to hardware_rtc for rp2350
Reimplement time functioniality
Use hardware_powman instead
Define PICO_PLATFORM for RPI_PICO
move PICO_TINYUSB_PATH until PICO_PLATFORM is defined
PICO_TINYUSB_PATH has to be defined before calling pico_sdk_init
Make sure powerman timer is using xosc
ports/rp2: Updates for powman changes.
Probably another change coming to remove powman and use the new aon
    timer that supports both rp2040 and rp2350
ports/rps: Use aon_timer module.
ports/rp2: Remove rp2350 specific source.
ports/rp2: Use correct CMSIS header for rp2350.
ports/rp2: Add hardware_resets.
ports/rp2: For rp2350 just use aon timer
For rp2040 there's a workaround for RTC having only 1s resolution. This
    is not needed for rp2350
Stop setting PICO_RP2040_B* for rp2350
Only set PICO_RP2040_USB_DEVICE_ENUMERATION_FIX for rp2040

Signed-off-by: Damien George <[email protected]>
@Gadgetoid
rp2/CMakeLists.txt: Add float_conv_m33 for __aeabi_ul2f.
8d73218 
Signed-off-by: Phil Howard <[email protected]>
@Gadgetoid
py/usermod.cmake: Check target exists.
49f9458 
Check a target exists before accessing properties.

Usermod_gather_sources would recurse into garbage property names and
break.

Signed-off-by: Phil Howard <[email protected]>
@Gadgetoid
rp2: Add support for 48-pin RP2350 variant.
968086d 
Changes:
- NUM_BANK0_GPIOS > pins defined in pins.csv = hardfault
- make-pins.py: NUM_GPIOS is hard-coded in make-pins.py, make it bigger
- machine_pin.h: Pin "ID" must be six bits, not five (breaks bit packing?)
- mphalport.h/machine_pin.c: open drain mask must be 64bits.

Signed-off-by: Phil Howard <[email protected]>
@Gadgetoid
rp2/rp2_pio: Support RP2350A/B in rp2_pio.
7d90cf4 
Add support for 32 and 48 pin variants of RP2350.

Add new gpio_base, mirroring the Pico SDK.

Signed-off-by: Phil Howard <[email protected]>
@peterharperuk @Gadgetoid
rp2: Pass gpio-num into make-pins.
9d1045c 
NUM_GPIOS amd NUM_EXT_GPIOS is currently hardcoded in this python
script.

Pass the count in via the new parameters num-gpios and num-ext-gpios.
These default to the current values supported by Pico 30/10. This can be
changed with PICO_NUM_GPIOS and PICO_NUM_EXT_GPIOS in
mpconfigboard.cmake. Without this you will get a build error because
NUM_BANK0_GPIOS can be too small.

Signed-off-by: Damien George <[email protected]>
@peterharperuk @Gadgetoid
rp2: Fix RP2040 build issues.
9de998a 
Signed-off-by: Damien George <[email protected]>
@peterharperuk @Gadgetoid
rp2/machine_pin: Allow gpios >=32 to work.
b223805 
Signed-off-by: Damien George <[email protected]>
@peterharperuk @Gadgetoid
rp2/rp2_pio: Raise error if pio_set_gpio_base fails.
3d84f06 
Signed-off-by: Damien George <[email protected]>
@Gadgetoid
rp2/machine_pin: Fix pin irq for pins > 32.
1ebf9ec 
Fix the gpio_irq function so that it looks at all six
iobank0_hw->intr[n] registers, for up to 48 IOs.

Signed-off-by: Phil Howard <[email protected]>
@peterharperuk @Gadgetoid
rp2/clocks_extra: Update runtime_clocks_init.
e952692 
Note: This might be a tempoarary measure until we might fix this
properly to avoid copying code.

Signed-off-by: Damien George <[email protected]>
@Gadgetoid
rp2/machine_adc: Add ADC support for RP2350B.
c7e7106 
Signed-off-by: Damien George <[email protected]>
@dpgeorge @Gadgetoid
rp2: Update to support RP2350-RISCV.
cef1b3c 
Signed-off-by: Damien George <[email protected]>
@dpgeorge @Gadgetoid
rp2/mpconfigport: Enable RV32I native emitter on RISCV variants.
dec2561 
Signed-off-by: Damien George <[email protected]>
@dpgeorge @Gadgetoid
rp2/Makefile: Allow CMAKE_ARGS to be set by user.
b42ad62 
Signed-off-by: Damien George <[email protected]>
@sfe-SparkFro @Gadgetoid
rp2/machine_bitstream: Set SysTick reset value.
1d5f792 
Signed-off-by: Damien George <[email protected]>
@sfe-SparkFro @Gadgetoid
rp2/machine_uart: Allow new TX/RX pins on RP2350.
19251f7 
Signed-off-by: Damien George <[email protected]>
@dpgeorge @Gadgetoid
rp2/mphalport: Implement mp_hal_ticks_cpu for RISCV using mcycle.
6b4054c 
Signed-off-by: Damien George <[email protected]>
@dpgeorge @Gadgetoid
rp2/machine_bitstream: Implement bitstream for RISC-V using mcycle.
d99bd34 
Signed-off-by: Damien George <[email protected]>
@dpgeorge @Gadgetoid
tests/ports/rp2: Update DMA test for higher freq CPU.
b10eec3 
Signed-off-by: Damien George <[email protected]>
@dpgeorge @Gadgetoid
tests/ports/rp2: Add simple UART test.
8e42463 
Signed-off-by: Damien George <[email protected]>
@dpgeorge @Gadgetoid
tools/ci.sh: Add RPI_PICO2 to CI.
d06bf71 
Signed-off-by: Damien George <[email protected]>
dpgeorge and others added 25 commits August 30, 2024 15:18
@dpgeorge
rp2: Update to support RP2350-RISCV.
cc214b1 
Signed-off-by: Damien George <[email protected]>
@dpgeorge
rp2/mpconfigport: Enable RV32I native emitter on RISCV variants.
c056e80 
Signed-off-by: Damien George <[email protected]>
@dpgeorge
rp2/Makefile: Allow CMAKE_ARGS to be set by user.
1275812 
Signed-off-by: Damien George <[email protected]>
@sfe-SparkFro @dpgeorge
rp2/machine_bitstream: Set SysTick reset value.
9322e27 
Signed-off-by: Damien George <[email protected]>
@sfe-SparkFro @dpgeorge
rp2/machine_uart: Allow new TX/RX pins on RP2350.
00f3223 
Signed-off-by: Damien George <[email protected]>
@dpgeorge
rp2/mphalport: Implement mp_hal_ticks_cpu for RISCV using mcycle.
2393213 
Signed-off-by: Damien George <[email protected]>
@dpgeorge
rp2/machine_bitstream: Implement bitstream for RISC-V using mcycle.
6d027de 
Signed-off-by: Damien George <[email protected]>
@dpgeorge
tests/ports/rp2: Update DMA test for higher freq CPU.
e008dbb 
Signed-off-by: Damien George <[email protected]>
@dpgeorge
tests/ports/rp2: Add simple rp2-specific UART test.
22b2f73 
To test construction of UART instances.

Signed-off-by: Damien George <[email protected]>
@dpgeorge
tools/ci.sh: Add RPI_PICO2 to CI.
df545f4 
Signed-off-by: Damien George <[email protected]>
@projectgus @dpgeorge
rp2: Workaround pico_aon_timer timezone binary size increase.
89b17d1 
Provide stub implementations of localtime_r() and mktime() to avoid
code size increase.

Reported upstream at raspberrypi/pico-sdk#1810

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <[email protected]>
@Gadgetoid @gigapod @MichaelBell
ports/rp2: PSRAM support.
a81963c 
Add PSRAM support with auto detection.

Performs a best-effort attempt to detect attached PSRAM,
configure it and *add* it to the MicroPython heap.

If PSRAM is not present, should fall back to use internal
RAM.

Introduce two new port/board defines:

* MICROPY_HW_ENABLE_PSRAM to enable PSRAM.
* MICROPY_HW_PSRAM_CS_PIN to define the chip-select pin.

Changes:

ports/rp2/rp2_psram.c/h: Add new PSRAM module.
ports/rp2/main.c: Add optional PSRAM support.
ports/rp2/CMakeLists.txt: Include rp2_psram.c.
ports/rp2/rp2_flash.c: Add buffered write to avoid reads from PSRAM.
ports/rp2/mpconfigport.h: Enable MICROPY_GC_SPLIT_HEAP
for boards that set MICROPY_HW_ENABLE_PSRAM.

Co-authored-by: Kirk Benell <[email protected]>
Co-authored-by: Mike Bell <[email protected]>
Signed-off-by: Phil Howard <[email protected]>
@Gadgetoid
ports/rp2: PSRAM: Fix RP2040/Pico build.
360e6ed 
Signed-off-by: Phil Howard <[email protected]>
@Gadgetoid
ports/rp2: Re-init PSRAM on CPU freq change.
3cad8bb 
Signed-off-by: Phil Howard <[email protected]>
@Gadgetoid
ports/rp2: Make split-heap optional.
562b929 
My tests found issues when PSRAM is combined with the existing
RAM in a split-heap configuration. Since this option is not
enabled by default on RP2 I have changed it to be optional.

PSRAM will be used exclusively if MICROPY_GC_SPLIT_HEAP == 0,
it will be added to RAM if MICROPY_GC_SPLIT_HEAP == 1,
and the system will fall back to RAM only if it's not detected.

Signed-off-by: Phil Howard <[email protected]>
@MichaelBell @Gadgetoid
ports/rp2: Compute QMI timing based on system clock.
aee2331 
Signed-off-by: Mike Bell <[email protected]>
@MichaelBell @Gadgetoid
ports/rp2: Fix garbage collection with large heap.
03c5d9f 
Signed-off-by: Mike Bell <[email protected]>
@MichaelBell @Gadgetoid
ports/rp2: Remove flash timing control from PSRAM.
50dee90 
Signed-off-by: Mike Bell <[email protected]>
@MichaelBell @Gadgetoid
ports/rp2: Set flash divisor appropriately.
8070c71 
Signed-off-by: Mike Bell <[email protected]>
@MichaelBell @Gadgetoid
ports/rp2: Reset flash timing before PSRAM timing.
291ca79 
Signed-off-by: Mike Bell <[email protected]>
@Gadgetoid
ports/rp2: Add RP2350 slices to machine_pwm.
51cd340 
Signed-off-by: Phil Howard <[email protected]>
@Gadgetoid
ports/rp2: Fix rp2_pio for 48-pin RP2350B.
4010a9f 
Signed-off-by: Phil Howard <[email protected]>
@gigapod
comment tweak
ed4c0d2
@gigapod
updates/results from merge with the latest on the pimoroni-feature/ps…
c399dd2 
…ram branch
@gigapod
results of merge
e77a787
@Gadgetoid Gadgetoid force-pushed the feature/psram branch 2 times, most recently from 2fae3a9 to 3cd6781 Compare September 5, 2024 08:24
@Gadgetoid Gadgetoid force-pushed the feature/psram branch 2 times, most recently from b504e66 to c98c139 Compare September 27, 2024 13:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@gigapod @AeroSynth @dpgeorge @peterharperuk @Gadgetoid @sfe-SparkFro @MichaelBell @projectgus