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.

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

Cherrypick important w1 fixes #2958

Closed
manio opened this issue May 10, 2019 · 11 comments
Closed

Cherrypick important w1 fixes #2958

manio opened this issue May 10, 2019 · 11 comments

Comments

@manio
Copy link
Contributor

manio commented May 10, 2019

Hi,
@pelwell, can you please cherry-pick those three fixes which are upstreamed already?
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/drivers/w1?id=49695ac46861180baf2b2b92c62da8619b6bf28f
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/drivers/w1?id=62909da8aca048ecf9fbd7e484e5100608f40a63
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/drivers/w1?id=5cb27d30fc3a281e830a2099d520b469e2b82008

It is working wrongly (w1 protocol errors) without this in certain circumstances (eg single DS2408 slave on w1 bus).

@pelwell
Copy link
Contributor

pelwell commented May 15, 2019

Hi @manio - sorry for the delay. I've merged those patches into rpi-4.19.y, but beware - I think the first patch contains a typo. Where the code says:

#ifdef fCONFIG_W1_SLAVE_DS2408_READBACK

Note the f in front of CONFIG_. I think it should say:

#ifdef CONFIG_W1_SLAVE_DS2408_READBACK

Watch out for (or create - I think you are the original author) an upstream fix for this (if indeed it is an error) and we can cherry-pick that as well.

@manio
Copy link
Contributor Author

manio commented May 16, 2019

@pelwell
Thank you! You are damn right about this typo! At least three developers was reviewing this patch and didn't spot this until you! :)
Yes, I am the original author but then it was reworked by Jean-Francois Dagenais several times. As it is now commited in main kernel tree I just created another patch for fixing this as we cannot prepare another version. Big thanks!
https://lore.kernel.org/lkml/[email protected]/T/#u

Regarding this patch here in the rpi kernel - please do what is more proper in your development flow. Please either fix this typo yourself during/after cherry-picking or please just apply my fix. I hope it will be merged upstream without any objections but it will surely take some time...

regards!

@pelwell
Copy link
Contributor

pelwell commented May 16, 2019

For back-ports we like to keep the same number of commits as appear upstream so that they are skipped without conflicts when we port our downstream patches to an upstream kernel that already includes them. If it's alright with you I'll wait until your fix is accepted, if only to get a commit hash for it.

BTW Your patch should really have a "Fixes: " tag to make it clear it isn't a new feature and to ensure it is replicated everywhere the original patch ends up.

@manio
Copy link
Contributor Author

manio commented May 16, 2019

I see. I've just posted PATCH v2 with the "Fixes" tag. I am now closing this issue and I will reply here with the commit hash when it will upstreamed :)
Thanks!

@manio manio closed this as completed May 16, 2019
@pelwell
Copy link
Contributor

pelwell commented May 24, 2019

Fix cherry-picked - see 1694cf0.

@manio
Copy link
Contributor Author

manio commented May 25, 2019

Thank you! :)

popcornmix added a commit to raspberrypi/firmware that referenced this issue May 28, 2019
kernel rpi-4.19.y changes for common DTS+overlays

kernel: Cherrypick important w1 fixes
See: raspberrypi/linux#2958

kernel: usb: dwc_otg: Clean up interrupt claiming code
See: raspberrypi/linux#2612

kernel: ASoC: decommissioning driver for 3Dlab Nano soundcard
See: raspberrypi/linux#2923

kernel: sound: pcm512x-codec: Adding 352.8kHz samplerate support
See: raspberrypi/linux#2975

kernel: configs: Enable PIDs cgroup
See: raspberrypi/linux#2968
popcornmix added a commit to Hexxeh/rpi-firmware that referenced this issue May 28, 2019
kernel rpi-4.19.y changes for common DTS+overlays

kernel: Cherrypick important w1 fixes
See: raspberrypi/linux#2958

kernel: usb: dwc_otg: Clean up interrupt claiming code
See: raspberrypi/linux#2612

kernel: ASoC: decommissioning driver for 3Dlab Nano soundcard
See: raspberrypi/linux#2923

kernel: sound: pcm512x-codec: Adding 352.8kHz samplerate support
See: raspberrypi/linux#2975

kernel: configs: Enable PIDs cgroup
See: raspberrypi/linux#2968
@afullagar
Copy link

Having an issue with a temp sensor /sys/bus/w1/devices/28-0417c1d913ff/w1_slave (
DS18B20)

Had to revert to 4.14.98 for now as the temp reading stays at 86 degrees celsius. After roll back now ok.

@manio
Copy link
Contributor Author

manio commented May 31, 2019

@afullagar
Why are you thinking that this is related to this issue. This changes doesn't touch the w1_therm at all...

ps. I also can't see any recent changes in this module:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/log/drivers/w1/slaves/w1_therm.c?h=linux-4.19.y
If you are talking about 4.14 this is the only commit which is not in 4.19 tree:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/drivers/w1/slaves/w1_therm.c?h=linux-4.19.y&id=f53459c00871a7c3db5b69b49d840ca9d497a695

@manio manio reopened this Jun 23, 2019
@pelwell
Copy link
Contributor

pelwell commented Jun 25, 2019

Cherry-picked to the 4.19 tree.

@manio
Copy link
Contributor Author

manio commented Jun 25, 2019

Great! Thank you! :)

@manio manio closed this as completed Jun 25, 2019
popcornmix added a commit to raspberrypi/firmware that referenced this issue Jun 25, 2019
See: raspberrypi/linux#2958

firmware: 2711: CORE, EMMC & BVB clock updates for WiFi / 4Kp60
firmware: 711: Use boost instead of fixed freq for 4Kp60
popcornmix added a commit to Hexxeh/rpi-firmware that referenced this issue Jun 25, 2019
See: raspberrypi/linux#2958

firmware: 2711: CORE, EMMC & BVB clock updates for WiFi / 4Kp60
firmware: 711: Use boost instead of fixed freq for 4Kp60
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

3 participants