Rollback #7967, ChibiOS thread safety #8173
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Looks like this will need to be looked at sooner rather than later, testing #7769 showed that the Qwiic OLED driver does the start->transmit pattern, so it attempts to acquire the lock twice and fails as it's not recursive. |
|
At this point it's likely builds for boards using the OLED after #7967 got merged are locking up. |
… in a followup PR.
tzarc
changed the title
|
Modified this PR to rollback #7967, specifically to fix the Qwiic OLED issue. Will do a new followup PR to fix all I2C usage across the platform to correctly invoke start/stop, and only perform lock acquisition in those functions. |
drashna
approved these changes
Feb 23, 2020
Shinichi-Ohki
added a commit
to Shinichi-Ohki/qmk_firmware
that referenced
this pull request
Feb 25, 2020
* 'master' of https://github.com/qmk/qmk_firmware: (108 commits) `send_unicode_string()`: Add support for code points > 0xFFFF (qmk#8236) [Keyboard] Add Wete (qmk#8229) Improvements to extrakey HID descriptors (qmk#8156) Hineybush h87a lock indicators (qmk#8237) Add VIA support for Prime_L (qmk#8233) Hub16 - Bug removal + clean up code (qmk#8227) [Keyboard] ai03 Equinox (qmk#8224) [Keyboard] Add zfrontier/big_switch (qmk#8205) Gingham Update (qmk#8225) A proper `send_string()` for the Unicode feature (qmk#8155) Rollback PR qmk#7967 in preference of fixing I2C start/stop properly, in a followup PR. (qmk#8173) Add mouse support to SEND_STRING (qmk#8223) Add link to "Useful functions" in macro docs (qmk#7446) New functionality for cformat (qmk#7893) Update main.c (qmk#8198) format code according to conventions [skip ci] Fix QWIIC OLED for AVR (qmk#7769) VIA Support: KBD75 rev1/rev2 (qmk#8214) Update TMOv2 for new key (qmk#7759) Added custom keymap for preonic (qmk#7548) ...
nesth
pushed a commit
to nesth/qmk_firmware
that referenced
this pull request
Feb 27, 2020
* upstream/master: (26 commits) Fixed OS detection such that OSX doesn't take over the world (qmk#8248) [Keyboard] Add Prime_EXL Plus to handwired (qmk#8238) format code according to conventions [skip ci] New feature: PERMISSIVE_HOLD_PER_KEY (qmk#7994) Split - Avoid race condition during matrix_init_quantum (qmk#8235) Acheron VIA support (qmk#8204) `send_unicode_string()`: Add support for code points > 0xFFFF (qmk#8236) [Keyboard] Add Wete (qmk#8229) Improvements to extrakey HID descriptors (qmk#8156) Hineybush h87a lock indicators (qmk#8237) Add VIA support for Prime_L (qmk#8233) Hub16 - Bug removal + clean up code (qmk#8227) [Keyboard] ai03 Equinox (qmk#8224) [Keyboard] Add zfrontier/big_switch (qmk#8205) Gingham Update (qmk#8225) A proper `send_string()` for the Unicode feature (qmk#8155) Rollback PR qmk#7967 in preference of fixing I2C start/stop properly, in a followup PR. (qmk#8173) Add mouse support to SEND_STRING (qmk#8223) Add link to "Useful functions" in macro docs (qmk#7446) New functionality for cformat (qmk#7893) ...
HokieGeek
pushed a commit
to HokieGeek/qmk_firmware
that referenced
this pull request
Mar 5, 2020
… in a followup PR. (qmk#8173)
c0psrul3
pushed a commit
to c0psrul3/qmk_firmware
that referenced
this pull request
Mar 23, 2020
… in a followup PR. (qmk#8173)
sowbug
pushed a commit
to sowbug/qmk_firmware
that referenced
this pull request
Apr 2, 2020
… in a followup PR. (qmk#8173)
kylekuj
pushed a commit
to kylekuj/qmk_firmware
that referenced
this pull request
Apr 21, 2020
… in a followup PR. (qmk#8173)
jakeisnt
pushed a commit
to jakeisnt/qmk_firmware
that referenced
this pull request
Aug 20, 2020
… in a followup PR. (qmk#8173)
BorisTestov
pushed a commit
to BorisTestov/qmk_firmware
that referenced
this pull request
May 23, 2024
… in a followup PR. (qmk#8173)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
i2c_startandi2c_stopwere actually only really useful for people who want to explicitly invoke ChibiOS i2c functions. With mutual exclusion enabled, there were instances ofi2c_start->i2c_transmitwhich would deadlock as the mutexes are non-recursive.This PR turnsi2c_startandi2c_stopinto no-ops in order to maintain the previous interface, and folds thei2c_stopfunctionality into the other transmission functions -- they were already effectively doingi2c_startanyway.Modified this PR to rollback #7967, specifically to fix the Qwiic OLED issue. Will do a new followup PR to fix all I2C usage across the platform to correctly invoke start/stop, and only perform lock acquisition in those functions.
Types of Changes
Checklist