Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: micropython/micropython
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: micropython/micropython
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.22-release
Choose a head ref
  • 19 commits
  • 31 files changed
  • 6 contributors

Commits on Jan 5, 2024

  1. rp2/rp2_flash: Lockout second core only when doing flash erase/write.

    Using the multicore lockout feature in the general atomic section makes it
    much more difficult to get correct.
    
    Signed-off-by: Damien George <[email protected]>
    dpgeorge committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    4b4f601 View commit details
    Browse the repository at this point in the history
  2. rp2/mutex_extra: Implement additional mutex functions.

    These allow entering/exiting a mutex and also disabling/restoring
    interrupts, in an atomic way.
    
    Signed-off-by: Damien George <[email protected]>
    dpgeorge committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    61b8361 View commit details
    Browse the repository at this point in the history
  3. rp2/mpthreadport: Fix race with IRQ when entering atomic section.

    Prior to this commit there is a potential deadlock in
    mp_thread_begin_atomic_section(), when obtaining the atomic_mutex, in the
    following situation:
    - main thread calls mp_thread_begin_atomic_section() (for whatever reason,
      doesn't matter)
    - the second core is running so the main thread grabs the mutex via the
      call mp_thread_mutex_lock(&atomic_mutex, 1), and this succeeds
    - before the main thread has a chance to run save_and_disable_interrupts()
      a USB IRQ comes in and the main thread jumps off to process this IRQ
    - that USB processing triggers a call to the dcd_event_handler() wrapper
      from commit bcbdee2
    - that then calls mp_sched_schedule_node()
    - that then attempts to obtain the atomic section, calling
      mp_thread_begin_atomic_section()
    - that call then blocks trying to obtain atomic_mutex
    - core0 is now deadlocked on itself, because the main thread has the mutex
      but the IRQ handler (which preempted the main thread) is blocked waiting
      for the mutex, which will never be free
    
    The solution in this commit is to use mutex enter/exit functions that also
    atomically disable/restore interrupts.
    
    Fixes issues #12980 and #13288.
    
    Signed-off-by: Damien George <[email protected]>
    dpgeorge committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    ac5e0b9 View commit details
    Browse the repository at this point in the history
  4. all: Bump version to 1.22.1.

    Signed-off-by: Damien George <[email protected]>
    dpgeorge committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    9b8c64c View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2024

  1. rp2/rp2_dma: Fix fetching 'write' buffers for writing not reading.

    Signed-off-by: Nicko van Someren <[email protected]>
    nickovs authored and dpgeorge committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    d5f3fcd View commit details
    Browse the repository at this point in the history
  2. rp2/machine_uart: Fix event wait in uart.flush() and uart.read().

    Do not wait in the worst case up to the timeout.
    
    Fixes issue #13377.
    
    Signed-off-by: robert-hh <[email protected]>
    robert-hh authored and dpgeorge committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    068aa28 View commit details
    Browse the repository at this point in the history
  3. renesas-ra/ra: Fix SysTick clock source.

    The SysTick_Config function must use the system/CPU clock to configure the
    ticks.
    
    Signed-off-by: iabdalkader <[email protected]>
    iabdalkader authored and dpgeorge committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    4c7d955 View commit details
    Browse the repository at this point in the history
  4. renesas-ra/boards/ARDUINO_PORTENTA_C33: Fix the RTC clock source.

    Switch the RTC clock source to Sub-clock (XCIN). This board has an
    accurate LSE crystal, and it should be used for the RTC clock
    source.
    
    Signed-off-by: iabdalkader <[email protected]>
    iabdalkader authored and dpgeorge committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    1e8cc6c View commit details
    Browse the repository at this point in the history
  5. extmod/asyncio: Support gather of tasks that finish early.

    Adds support to asyncio.gather() for the case that one or more (or all)
    sub-tasks finish and/or raise an exception before the gather starts.
    
    Signed-off-by: Damien George <[email protected]>
    dpgeorge committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    a2e9ab3 View commit details
    Browse the repository at this point in the history
  6. mimxrt/modmachine: Fix deepsleep wakeup pin ifdef.

    Signed-off-by: Kwabena W. Agyeman <[email protected]>
    kwagyeman authored and dpgeorge committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    8b6e89a View commit details
    Browse the repository at this point in the history
  7. extmod/modssl_mbedtls: Fix cipher iteration in SSLContext.get_ciphers.

    Prior to this commit it would skip every second cipher returned from
    mbedtls.
    
    The corresponding test is also updated and now passes on esp32, rp2, stm32
    and unix.
    
    Signed-off-by: Damien George <[email protected]>
    dpgeorge committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    2531a15 View commit details
    Browse the repository at this point in the history
  8. rp2: Change machine.I2S and rp2.DMA to use shared DMA IRQ handlers.

    These separate drivers must share the DMA resource with each other.
    
    Fixes issue #13380.
    
    Signed-off-by: Damien George <[email protected]>
    dpgeorge committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    f53ee9f View commit details
    Browse the repository at this point in the history
  9. py/compile: Fix potential Py-stack overflow in try-finally with return.

    If a return is executed within the try block of a try-finally then the
    return value is stored on the top of the Python stack during the execution
    of the finally block.  In this case the Python stack is one larger than it
    normally would be in the finally block.
    
    Prior to this commit, the compiler was not taking this case into account
    and could have a Python stack overflow if the Python stack used by the
    finally block was more than that used elsewhere in the function.  In such
    a scenario the last argument of the function would be clobbered by the
    top-most temporary value used in the deepest Python expression/statement.
    
    This commit fixes that case by making sure enough Python stack is allocated
    to the function.
    
    Fixes issue #13562.
    
    Signed-off-by: Damien George <[email protected]>
    dpgeorge committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    b979c5a View commit details
    Browse the repository at this point in the history
  10. renesas-ra/ra/ra_i2c: Fix 1 byte and 2 bytes read issue.

    Tested on Portenta C33 with AT24256B (addrsize=16) and SSD1306.
    
    Fixes issue #13280.
    
    Signed-off-by: Takeo Takahashi <[email protected]>
    TakeoTakahashi2020 authored and dpgeorge committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    cc7cfc7 View commit details
    Browse the repository at this point in the history
  11. extmod/btstack: Reset pending_value_handle before calling write-done cb.

    The pending_value_handle needs to be freed and reset before calling
    mp_bluetooth_gattc_on_read_write_status(), which will call the Python IRQ
    handler, which may in turn call back into BTstack to perform an action like
    a write.  In that case the pending_value_handle will need to be available
    for the write/read/etc to proceed.
    
    Fixes issue #13611.
    
    Signed-off-by: Damien George <[email protected]>
    dpgeorge committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    e7ff724 View commit details
    Browse the repository at this point in the history
  12. extmod/btstack: Reset pending_value_handle before calling read-done cb.

    Similar to the previous commit but for MP_BLUETOOTH_IRQ_GATTC_READ_DONE:
    the pending_value_handle needs to be reset before calling
    mp_bluetooth_gattc_on_read_write_status(), which will call the Python IRQ
    handler, which may in turn call back into BTstack to perform an action like
    a write.  In that case the pending_value_handle will need to be available
    for the write/read/etc to proceed.
    
    Fixes issue #13634.
    
    Signed-off-by: Damien George <[email protected]>
    dpgeorge committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    02df2b0 View commit details
    Browse the repository at this point in the history
  13. esp32/mpnimbleport: Release the GIL while doing NimBLE port deinit.

    In case callbacks must run (eg a disconnect event happens during the
    deinit) and the GIL must be obtained to run the callback.
    
    Fixes part of issue #12349.
    
    Signed-off-by: Damien George <[email protected]>
    dpgeorge committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    e72d038 View commit details
    Browse the repository at this point in the history
  14. esp32: Increase NimBLE task stack size and overflow detection headroom.

    The Python BLE IRQ handler will most likely run on the NimBLE task, so its
    C stack must be large enough to accommodate reasonably complicated Python
    code (eg a few call depths).  So increase this stack size.
    
    Also increase the headroom from 1024 to 2048 bytes.  This is needed because
    (1) the esp32 architecture uses a fair amount of stack in general; and (2)
    by the time execution gets to setting the Python stack top via
    `mp_stack_set_top()` in this interlock code, about 600 bytes of stack are
    already used, which reduces the amount available for Python.
    
    Fixes issue #12349.
    
    Signed-off-by: Damien George <[email protected]>
    dpgeorge committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    ee3c9cc View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2024

  1. all: Bump version to 1.22.2.

    Signed-off-by: Damien George <[email protected]>
    dpgeorge committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    8cd1582 View commit details
    Browse the repository at this point in the history
Loading