commit | 4a5a417a2feb795a069c361fbf0ac564da493428 | [log] [tgz] |
---|---|---|
author | Eli Lipsitz <elipsitz@pigweed.infra.roller.google.com> | Mon Sep 26 23:45:19 2022 +0000 |
committer | CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> | Mon Sep 26 23:45:19 2022 +0000 |
tree | 82ae3759bf552f7dfb4fcd00ab788e10963d4d37 | |
parent | 4bcce89e25a63ec49661ec55406d541cb5f412d3 [diff] |
[roll third_party/pigweed] pw_software_update: Fix recursive lock acquisition A recent change (I278f16834e95a4020bd7b8586f1878a475b82d60) added a lock acquisition to BundledUpdateService::SetTransferred, because the SET_ERROR macro requires the internal lock. However, it calls NotifyTransferSucceeded, which also acquires the lock. This means that any calls to SetTransferred deadlock on a recursive acquisition. This commit fixes the issue by moving the outer lock acquisition into the if statement that calls SET_ERROR, which is mutually exclusive with the call to NotifyTransferSucceeded. Tested: The SetTransferred RPC method no longer hangs. Original-Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/112170 https://pigweed.googlesource.com/pigweed/pigweed third_party/pigweed Rolled-Commits: 37d9c872d26018b..89056eab62bab00 Roller-URL: https://ci.chromium.org/b/8801916288146397905 GitWatcher: ignore CQ-Do-Not-Cancel-Tryjobs: true Change-Id: I158dfa81c64f2c64cede4aed83208b4208ef3649 Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/experimental/+/112145 Bot-Commit: Pigweed Integration Roller <pigweed-integration-roller@pigweed.google.com.iam.gserviceaccount.com> Commit-Queue: Pigweed Integration Roller <pigweed-integration-roller@pigweed.google.com.iam.gserviceaccount.com>
This repository contains experimental pigweed modules.
Clone this repo with --recursive
to get all required submodules.
git clone --recursive https://pigweed.googlesource.com/pigweed/experimental
This will pull the Pigweed source repository into third_party/pigweed
. If you already cloned but forgot to --recursive
run git submodule update --init
to pull all submodules.
The //pw_graphics folder contains some libraries for drawing to an RGB565 framebuffer and displaying it on various platforms.
The demo applications that make use of these libraries are:
First time setup:
git clone --recursive https://pigweed.googlesource.com/pigweed/experimental cd experimental . ./bootstrap.sh pw package install imgui pw package install glfw pw package install stm32cube_f4 pw package install pico_sdk
Compile:
gn gen out --export-compile-commands --args=" dir_pw_third_party_stm32cube_f4=\"$PW_PROJECT_ROOT/environment/packages/stm32cube_f4\" " ninja -C out
Flash:
openocd -f third_party/pigweed/targets/stm32f429i_disc1/py/stm32f429i_disc1_utils/openocd_stm32f4xx.cfg -c "program out/stm32f429i_disc1_stm32cube_debug/obj/applications/terminal_display/bin/terminal_demo.elf verify reset exit"
Compile:
gn gen out --export-compile-commands --args=" dir_pw_third_party_imgui=\"$PW_PROJECT_ROOT/environment/packages/imgui\" dir_pw_third_party_glfw=\"$PW_PROJECT_ROOT/environment/packages/glfw\" " ninja -C out
Run:
out/host_debug/obj/applications/terminal_display/bin/terminal_demo
Working displays:
Compile:
gn gen out --export-compile-commands --args=" PICO_SRC_DIR=\"$PW_PROJECT_ROOT/environment/packages/pico_sdk\" " ninja -C out
Flash:
Using a uf2 file:
./out/host_debug/obj/targets/rp2040/bin/elf2uf2 ./out/rp2040/obj/applications/terminal_display/bin/terminal_demo.elf ./out/rp2040/obj/applications/terminal_display/bin/terminal_demo.uf2
Copy ./out/rp2040/obj/applications/terminal_display/bin/terminal_demo.uf2
to your Pi Pico.
Using a Pico Probe and openocd:
This requires installing the Raspberry Pi foundation's OpenOCD fork for the Pico probe. More details including how to connect the two Pico boards is available at Raspberry Pi Pico and RP2040 - C/C++ Part 2: Debugging with VS Code
Install RaspberryPi's OpenOCD Fork:
git clone https://github.com/raspberrypi/openocd.git \ --branch picoprobe \ --depth=1 \ --no-single-branch \ openocd-picoprobe cd openocd-picoprobe ./bootstrap ./configure --enable-picoprobe --prefix=$HOME/apps/openocd --disable-werror make -j2 make install
Setup udev rules (Linux only):
cat <<EOF > 49-picoprobe.rules SUBSYSTEMS=="usb", ATTRS{idVendor}=="2e8a", ATTRS{idProduct}=="0004", MODE:="0666" KERNEL=="ttyACM*", ATTRS{idVendor}=="2e8a", ATTRS{idProduct}=="0004", MODE:="0666" EOF sudo cp 49-picoprobe.rules /usr/lib/udev/rules.d/49-picoprobe.rules sudo udevadm control --reload-rules
Flash the Pico:
~/apps/openocd/bin/openocd -f ~/apps/openocd/share/openocd/scripts/interface/picoprobe.cfg -f ~/apps/openocd/share/openocd/scripts/target/rp2040.cfg -c 'program out/rp2040/obj/applications/terminal_display/bin/terminal_demo.elf verify reset exit'