Patch "[media] media: solo6x10: fix lockup by avoiding delayed register write" has been added to the 4.8-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
[media] media: solo6x10: fix lockup by avoiding delayed register write
to the 4.8-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
media-solo6x10-fix-lockup-by-avoiding-delayed-register-write.patch
and it can be found in the queue-4.8 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
5fc4b067ec082c3127e0156f800769b7e0dce078Mon Sep 17 00:00:00 2001
From: Andrey Utkin <[email protected]>
Date: Sat, 22 Oct 2016 13:34:36 -0200
Subject: [media] media: solo6x10: fix lockup by avoiding delayed register write
From: Andrey Utkin <[email protected]>
commit 5fc4b067ec082c3127e0156f800769b7e0dce078 upstream.
This fixes a lockup at device probing which happens on some solo6010 hardware samples. This is a regression introduced by commit e1ceb25a1569 ("[media] SOLO6x10: remove unneeded register locking and barriers")
The observed lockup happens in solo_set_motion_threshold() called from solo_motion_config().
This extra "flushing" is not fundamentally needed for every write, but apparently the code in driver assumes such behaviour at last in some places.
Actual fix was proposed by Hans Verkuil.
--- drivers/media/pci/solo6x10/solo6x10.h | 3 +++ 1 file changed, 3 insertions(+)
drivers/media/pci/solo6x10/solo6x10.h +3 -0
@@ -284,7 +284,10 @@ static inline u32 solo_reg_read(struct sstatic inline void solo_reg_write (struct solo_dev *solo_dev,int reg,u32 data) { +u16 val; +writel (data, solo_dev->reg_base + reg); +pci_read_config_word (solo_dev->pdev,PCI_STATUS , &val); }static inline void solo_irq_on (struct solo_dev *dev,u32 mask)
Patches currently in stable-queue which might be from [email protected] are
queue-4.8/media-solo6x10-fix-lockup-by-avoiding-delayed-register-write.patch