w1_therm: Back-port locking improvements from 4.2-rc1 #1059
Conversation
This file contains hidden or 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
A temperature conversion can take 750 ms and when possible the w1_therm slave driver drops the bus_mutex to allow other bus operations, but that includes operations such as a periodic slave search, which can remove this slave when it is no longer detected. If that happens the sl->family_data will be freed and set to NULL causing w1_slave_show to crash when it wakes up. Signed-off-by: David Fries <[email protected]> Reported-By: Thorsten Bschorr <[email protected]> Tested-by: Thorsten Bschorr <[email protected]> Acked-by: Evgeniy Polyakov <[email protected]> Cc: stable <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
This patch provides support for the DS28EA00 digital thermometer. The DS28EA00 provides an additional two pins for implementing a sequence detection algorithm. This feature allows you to determine the physical location of the chip in the 1-wire bus without needing pre-existing knowledge of the bus ordering. Support is provided through the sysfs w1_seq file. The file will contain a single line with an integer value representing the device index in the bus starting at 0. Signed-off-by: Matt Campbell <[email protected]> Acked-by: Evgeniy Polyakov <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
The W1_42_FINISHED_BYTE is 0xFF so the cast means the condition is never true. Fixes: d9411e5 ('w1: Add support for DS28EA00 sequence to w1-therm') Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
I noticed there was a problem here because Smatch complained: drivers/w1/slaves/w1_therm.c:416 w1_seq_show() warn: inconsistent returns 'mutex:&sl->master->mutex'. Locked on: line 416 Unlocked on: line 413 The problem is that we lock ->mutex but we unlock ->bus_mutex on error. David Fries says that ->bus_mutex is correct and ->mutex is incorrect. Fixes: d9411e5 ('w1: Add support for DS28EA00 sequence to w1-therm') Signed-off-by: Dan Carpenter <[email protected]> Acked-by: Evgeniy Polyakov <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
|
No objections from me. |
pelwell
added a commit
that referenced
this pull request
Jul 13, 2015
w1_therm: Back-port locking improvements from 4.2-rc1
pelwell
added a commit
that referenced
this pull request
Jul 13, 2015
w1_therm: Back-port locking improvements from 4.2-rc1
popcornmix
added a commit
to raspberrypi/firmware
that referenced
this pull request
Jul 13, 2015
kernel: w1_therm: Back-port locking improvements from 4.2-rc1 See: raspberrypi/linux#1059 kernel: Added support for 2 mcp2515 CAN Bus IC See: raspberrypi/linux#1018 kernel: BCM270X_DT: Overlay for the Fen Logic VGA666 board (really added this time) firmware: di_adv: Add qpu shader code to implement deinterlace firmware: image_fx: Support YUV_UV as destination format if requested firmware: dmalib: Reduce default priority and burst size of 2d memcpy arm_loader: Ensure reserved qpus are freed and ISR blocks until interrupt cleared gpioman: If dt-blob.bin file is incompatible, use built-in See: https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=113753&start=75#p788079
popcornmix
added a commit
to Hexxeh/rpi-firmware
that referenced
this pull request
Jul 13, 2015
kernel: w1_therm: Back-port locking improvements from 4.2-rc1 See: raspberrypi/linux#1059 kernel: Added support for 2 mcp2515 CAN Bus IC See: raspberrypi/linux#1018 kernel: BCM270X_DT: Overlay for the Fen Logic VGA666 board (really added this time) firmware: di_adv: Add qpu shader code to implement deinterlace firmware: image_fx: Support YUV_UV as destination format if requested firmware: dmalib: Reduce default priority and burst size of 2d memcpy arm_loader: Ensure reserved qpus are freed and ISR blocks until interrupt cleared gpioman: If dt-blob.bin file is incompatible, use built-in See: https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=113753&start=75#p788079
pelwell
added a commit
that referenced
this pull request
Jul 24, 2015
w1_therm: Back-port locking improvements from 4.2-rc1
pelwell
added a commit
that referenced
this pull request
Aug 5, 2015
w1_therm: Back-port locking improvements from 4.2-rc1
pelwell
added a commit
that referenced
this pull request
Aug 17, 2015
w1_therm: Back-port locking improvements from 4.2-rc1
pelwell
added a commit
that referenced
this pull request
Sep 14, 2015
w1_therm: Back-port locking improvements from 4.2-rc1
pelwell
added a commit
that referenced
this pull request
Sep 14, 2015
w1_therm: Back-port locking improvements from 4.2-rc1
pelwell
added a commit
that referenced
this pull request
Sep 22, 2015
w1_therm: Back-port locking improvements from 4.2-rc1
pelwell
added a commit
that referenced
this pull request
Oct 3, 2015
w1_therm: Back-port locking improvements from 4.2-rc1
pelwell
added a commit
that referenced
this pull request
Oct 6, 2015
w1_therm: Back-port locking improvements from 4.2-rc1
pelwell
added a commit
that referenced
this pull request
Oct 7, 2015
w1_therm: Back-port locking improvements from 4.2-rc1
pelwell
added a commit
that referenced
this pull request
Oct 8, 2015
w1_therm: Back-port locking improvements from 4.2-rc1
pelwell
added a commit
that referenced
this pull request
Oct 8, 2015
w1_therm: Back-port locking improvements from 4.2-rc1
pelwell
added a commit
that referenced
this pull request
Oct 9, 2015
w1_therm: Back-port locking improvements from 4.2-rc1
pelwell
added a commit
that referenced
this pull request
Oct 25, 2015
w1_therm: Back-port locking improvements from 4.2-rc1
pelwell
added a commit
that referenced
this pull request
Oct 28, 2015
w1_therm: Back-port locking improvements from 4.2-rc1
popcornmix
pushed a commit
that referenced
this pull request
Feb 20, 2016
w1_therm: Back-port locking improvements from 4.2-rc1
neuschaefer
pushed a commit
to neuschaefer/raspi-binary-firmware
that referenced
this pull request
Feb 27, 2017
kernel: w1_therm: Back-port locking improvements from 4.2-rc1 See: raspberrypi/linux#1059 kernel: Added support for 2 mcp2515 CAN Bus IC See: raspberrypi/linux#1018 kernel: BCM270X_DT: Overlay for the Fen Logic VGA666 board (really added this time) firmware: di_adv: Add qpu shader code to implement deinterlace firmware: image_fx: Support YUV_UV as destination format if requested firmware: dmalib: Reduce default priority and burst size of 2d memcpy arm_loader: Ensure reserved qpus are freed and ISR blocks until interrupt cleared gpioman: If dt-blob.bin file is incompatible, use built-in See: https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=113753&start=75#p788079
|
Hi, |
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.
It is possible to crash the w1_therm module by removing a node
(echo $slave >/sys/devices/w1_bus_master/w1_master_remove) while a read
is in progress. The 4.2-rc1 release contains a patch adding reference
counting to avoid this problem. Back-port that patch along with other
upstream improvements.
See: #872