| From 5fc4b067ec082c3127e0156f800769b7e0dce078 Mon Sep 17 00:00:00 2001 |
| From: Andrey Utkin <andrey.utkin@corp.bluecherry.net> |
| Date: Sat, 22 Oct 2016 13:34:36 -0200 |
| Subject: [media] media: solo6x10: fix lockup by avoiding delayed register write |
| |
| From: Andrey Utkin <andrey.utkin@corp.bluecherry.net> |
| |
| 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. |
| |
| Fixes: e1ceb25a1569 ("[media] SOLO6x10: remove unneeded register locking and barriers") |
| |
| Signed-off-by: Andrey Utkin <andrey.utkin@corp.bluecherry.net> |
| Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/media/pci/solo6x10/solo6x10.h | 3 +++ |
| 1 file changed, 3 insertions(+) |
| |
| --- a/drivers/media/pci/solo6x10/solo6x10.h |
| +++ b/drivers/media/pci/solo6x10/solo6x10.h |
| @@ -284,7 +284,10 @@ static inline u32 solo_reg_read(struct s |
| static 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) |
