- Linux-stable-mirror - lists.linaro.org

[PATCH] drm/meson: Enable fast_io in meson_dw_hdmi_regmap_config

by Lyude Paul

Seeing as we use this registermap in the context of our IRQ handlers, we need to be using spinlocks for reading/writing registers so that we can still read them from IRQ handlers without having to grab any mutexes and accidentally sleep. We don't currently do this, as pointed out by lockdep: [ 18.403770] BUG: sleeping function called from invalid context at kernel/locking/mutex.c:908 [ 18.406744] in_atomic(): 1, irqs_disabled(): 128, pid: 68, name: kworker/u17:0 [ 18.413864] INFO: lockdep is turned off. [ 18.417675] irq event stamp: 12 [ 18.420778] hardirqs last enabled at (11): [<ffff000008a4f57c>] _raw_spin_unlock_irq+0x2c/0x60 [ 18.429510] hardirqs last disabled at (12): [<ffff000008a48914>] __schedule+0xc4/0xa60 [ 18.437345] softirqs last enabled at (0): [<ffff0000080b55e0>] copy_process.isra.4.part.5+0x4d8/0x1c50 [ 18.446684] softirqs last disabled at (0): [<0000000000000000>] (null) [ 18.453979] CPU: 0 PID: 68 Comm: kworker/u17:0 Tainted: G W O 4.20.0-rc3Lyude-Test+ #9 [ 18.469839] Hardware name: amlogic khadas-vim2/khadas-vim2, BIOS 2018.07-rc2-armbian 09/11/2018 [ 18.480037] Workqueue: hci0 hci_power_on [bluetooth] [ 18.487138] Call trace: [ 18.494192] dump_backtrace+0x0/0x1b8 [ 18.501280] show_stack+0x14/0x20 [ 18.508361] dump_stack+0xbc/0xf4 [ 18.515427] ___might_sleep+0x140/0x1d8 [ 18.522515] __might_sleep+0x50/0x88 [ 18.529582] __mutex_lock+0x60/0x870 [ 18.536621] mutex_lock_nested+0x1c/0x28 [ 18.543660] regmap_lock_mutex+0x10/0x18 [ 18.550696] regmap_read+0x38/0x70 [ 18.557727] dw_hdmi_hardirq+0x58/0x138 [dw_hdmi] [ 18.564804] __handle_irq_event_percpu+0xac/0x410 [ 18.571891] handle_irq_event_percpu+0x34/0x88 [ 18.578982] handle_irq_event+0x48/0x78 [ 18.586051] handle_fasteoi_irq+0xac/0x160 [ 18.593061] generic_handle_irq+0x24/0x38 [ 18.599989] __handle_domain_irq+0x60/0xb8 [ 18.606857] gic_handle_irq+0x50/0xa0 [ 18.613659] el1_irq+0xb4/0x130 [ 18.620394] debug_lockdep_rcu_enabled+0x2c/0x30 [ 18.627111] schedule+0x38/0xa0 [ 18.633781] schedule_timeout+0x3a8/0x510 [ 18.640389] wait_for_common+0x15c/0x180 [ 18.646905] wait_for_completion+0x14/0x20 [ 18.653319] mmc_wait_for_req_done+0x28/0x168 [ 18.659693] mmc_wait_for_req+0xa8/0xe8 [ 18.665978] mmc_wait_for_cmd+0x64/0x98 [ 18.672180] mmc_io_rw_direct_host+0x94/0x130 [ 18.678385] mmc_io_rw_direct+0x10/0x18 [ 18.684516] sdio_enable_func+0xe8/0x1d0 [ 18.690627] btsdio_open+0x24/0xc0 [btsdio] [ 18.696821] hci_dev_do_open+0x64/0x598 [bluetooth] [ 18.703025] hci_power_on+0x50/0x270 [bluetooth] [ 18.709163] process_one_work+0x2a0/0x6e0 [ 18.715252] worker_thread+0x40/0x448 [ 18.721310] kthread+0x12c/0x130 [ 18.727326] ret_from_fork+0x10/0x1c [ 18.735555] ------------[ cut here ]------------ [ 18.741430] do not call blocking ops when !TASK_RUNNING; state=2 set at [<000000006265ec59>] wait_for_common+0x140/0x180 [ 18.752417] WARNING: CPU: 0 PID: 68 at kernel/sched/core.c:6096 __might_sleep+0x7c/0x88 [ 18.760553] Modules linked in: dm_mirror dm_region_hash dm_log dm_mod btsdio bluetooth snd_soc_hdmi_codec dw_hdmi_i2s_audio ecdh_generic brcmfmac brcmutil cfg80211 rfkill ir_nec_decoder meson_dw_hdmi(O) dw_hdmi rc_geekbox meson_rng meson_ir ao_cec rng_core rc_core cec leds_pwm efivars nfsd ip_tables x_tables crc32_generic f2fs uas meson_gxbb_wdt pwm_meson efivarfs ipv6 [ 18.799469] CPU: 0 PID: 68 Comm: kworker/u17:0 Tainted: G W O 4.20.0-rc3Lyude-Test+ #9 [ 18.808858] Hardware name: amlogic khadas-vim2/khadas-vim2, BIOS 2018.07-rc2-armbian 09/11/2018 [ 18.818045] Workqueue: hci0 hci_power_on [bluetooth] [ 18.824088] pstate: 80000085 (Nzcv daIf -PAN -UAO) [ 18.829891] pc : __might_sleep+0x7c/0x88 [ 18.835722] lr : __might_sleep+0x7c/0x88 [ 18.841256] sp : ffff000008003cb0 [ 18.846751] x29: ffff000008003cb0 x28: 0000000000000000 [ 18.852269] x27: ffff00000938e000 x26: ffff800010283000 [ 18.857726] x25: ffff800010353280 x24: ffff00000868ef50 [ 18.863166] x23: 0000000000000000 x22: 0000000000000000 [ 18.868551] x21: 0000000000000000 x20: 000000000000038c [ 18.873850] x19: ffff000008cd08c0 x18: 0000000000000010 [ 18.879081] x17: ffff000008a68cb0 x16: 0000000000000000 [ 18.884197] x15: 0000000000aaaaaa x14: 0e200e200e200e20 [ 18.889239] x13: 0000000000000001 x12: 00000000ffffffff [ 18.894261] x11: ffff000008adfa48 x10: 0000000000000001 [ 18.899517] x9 : ffff0000092a0158 x8 : 0000000000000000 [ 18.904674] x7 : ffff00000812136c x6 : 0000000000000000 [ 18.909895] x5 : 0000000000000000 x4 : 0000000000000001 [ 18.915080] x3 : 0000000000000007 x2 : 0000000000000007 [ 18.920269] x1 : 99ab8e9ebb6c8500 x0 : 0000000000000000 [ 18.925443] Call trace: [ 18.929904] __might_sleep+0x7c/0x88 [ 18.934311] __mutex_lock+0x60/0x870 [ 18.938687] mutex_lock_nested+0x1c/0x28 [ 18.943076] regmap_lock_mutex+0x10/0x18 [ 18.947453] regmap_read+0x38/0x70 [ 18.951842] dw_hdmi_hardirq+0x58/0x138 [dw_hdmi] [ 18.956269] __handle_irq_event_percpu+0xac/0x410 [ 18.960712] handle_irq_event_percpu+0x34/0x88 [ 18.965176] handle_irq_event+0x48/0x78 [ 18.969612] handle_fasteoi_irq+0xac/0x160 [ 18.974058] generic_handle_irq+0x24/0x38 [ 18.978501] __handle_domain_irq+0x60/0xb8 [ 18.982938] gic_handle_irq+0x50/0xa0 [ 18.987351] el1_irq+0xb4/0x130 [ 18.991734] debug_lockdep_rcu_enabled+0x2c/0x30 [ 18.996180] schedule+0x38/0xa0 [ 19.000609] schedule_timeout+0x3a8/0x510 [ 19.005064] wait_for_common+0x15c/0x180 [ 19.009513] wait_for_completion+0x14/0x20 [ 19.013951] mmc_wait_for_req_done+0x28/0x168 [ 19.018402] mmc_wait_for_req+0xa8/0xe8 [ 19.022809] mmc_wait_for_cmd+0x64/0x98 [ 19.027177] mmc_io_rw_direct_host+0x94/0x130 [ 19.031563] mmc_io_rw_direct+0x10/0x18 [ 19.035922] sdio_enable_func+0xe8/0x1d0 [ 19.040294] btsdio_open+0x24/0xc0 [btsdio] [ 19.044742] hci_dev_do_open+0x64/0x598 [bluetooth] [ 19.049228] hci_power_on+0x50/0x270 [bluetooth] [ 19.053687] process_one_work+0x2a0/0x6e0 [ 19.058143] worker_thread+0x40/0x448 [ 19.062608] kthread+0x12c/0x130 [ 19.067064] ret_from_fork+0x10/0x1c [ 19.071513] irq event stamp: 12 [ 19.075937] hardirqs last enabled at (11): [<ffff000008a4f57c>] _raw_spin_unlock_irq+0x2c/0x60 [ 19.083560] hardirqs last disabled at (12): [<ffff000008a48914>] __schedule+0xc4/0xa60 [ 19.091401] softirqs last enabled at (0): [<ffff0000080b55e0>] copy_process.isra.4.part.5+0x4d8/0x1c50 [ 19.100801] softirqs last disabled at (0): [<0000000000000000>] (null) [ 19.108135] ---[ end trace 38c4920787b88c75 ]--- So, fix this by enabling the fast_io option in our regmap config so that regmap uses spinlocks for locking instead of mutexes. Signed-off-by: Lyude Paul <lyude(a)redhat.com> Fixes: 3f68be7d8e96 ("drm/meson: Add support for HDMI encoder and DW-HDMI bridge + PHY") Cc: Daniel Vetter <daniel.vetter(a)ffwll.ch> Cc: Neil Armstrong <narmstrong(a)baylibre.com> Cc: Carlo Caione <carlo(a)caione.org> Cc: Kevin Hilman <khilman(a)baylibre.com> Cc: dri-devel(a)lists.freedesktop.org Cc: linux-amlogic(a)lists.infradead.org Cc: linux-arm-kernel(a)lists.infradead.org Cc: <stable(a)vger.kernel.org> # v4.12+ --- drivers/gpu/drm/meson/meson_dw_hdmi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/meson/meson_dw_hdmi.c b/drivers/gpu/drm/meson/meson_dw_hdmi.c index df7247cd93f9..2cb2ad26d716 100644 --- a/drivers/gpu/drm/meson/meson_dw_hdmi.c +++ b/drivers/gpu/drm/meson/meson_dw_hdmi.c @@ -706,6 +706,7 @@ static const struct regmap_config meson_dw_hdmi_regmap_config = { .reg_read = meson_dw_hdmi_reg_read, .reg_write = meson_dw_hdmi_reg_write, .max_register = 0x10000, + .fast_io = true, }; static bool meson_hdmi_connector_is_available(struct device *dev) -- 2.19.1

6 years, 9 months

2
1
0 0

[PATCH] ALSA: hda/realtek - fix the pop noise on headphone for lenovo laptops

by Hui Wang

We have several Lenovo laptops with the codec alc285, when playing sound via headphone, we can hear click/pop noise in the headphone, if we let the headphone share the DAC of NID 0x2 with the speaker, the noise disappears. The Lenovo laptops here include P52, P72, X1 yoda2 and X1 carbon. I have tried to set preferred_dacs and override_conn, but neither of them worked. Thanks for Kailang, he told me to invalidate the NID 0x3 through override_wcaps. BugLink: https://bugs.launchpad.net/bugs/1805079 Cc: <stable(a)vger.kernel.org> Signed-off-by: Kailang Yang <kailang(a)realtek.com> Signed-off-by: Hui Wang <hui.wang(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 1118fd1bbf1a..e66da22272fd 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -5358,6 +5358,16 @@ static void alc274_fixup_bind_dacs(struct hda_codec *codec, spec->gen.preferred_dacs = preferred_pairs; } +/* The DAC of NID 0x3 will introduce click/pop noise on headphones, so invalidate it */ +static void alc285_fixup_invalidate_dacs(struct hda_codec *codec, + const struct hda_fixup *fix, int action) +{ + if (action != HDA_FIXUP_ACT_PRE_PROBE) + return; + + snd_hda_override_wcaps(codec, 0x03, 0); +} + /* for hda_fixup_thinkpad_acpi() */ #include "thinkpad_helper.c" @@ -5495,6 +5505,7 @@ enum { ALC255_FIXUP_DELL_HEADSET_MIC, ALC295_FIXUP_HP_X360, ALC221_FIXUP_HP_HEADSET_MIC, + ALC285_FIXUP_LENOVO_HEADPHONE_NOISE, }; static const struct hda_fixup alc269_fixups[] = { @@ -6362,6 +6373,10 @@ static const struct hda_fixup alc269_fixups[] = { .chained = true, .chain_id = ALC269_FIXUP_HEADSET_MIC }, + [ALC285_FIXUP_LENOVO_HEADPHONE_NOISE] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc285_fixup_invalidate_dacs, + }, }; static const struct snd_pci_quirk alc269_fixup_tbl[] = { @@ -7035,6 +7050,11 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { {0x12, 0x90a60130}, {0x19, 0x03a11020}, {0x21, 0x0321101f}), + SND_HDA_PIN_QUIRK(0x10ec0285, 0x17aa, "Lenovo", ALC285_FIXUP_LENOVO_HEADPHONE_NOISE, + {0x12, 0x90a60130}, + {0x14, 0x90170110}, + {0x19, 0x04a11040}, + {0x21, 0x04211020}), SND_HDA_PIN_QUIRK(0x10ec0288, 0x1028, "Dell", ALC288_FIXUP_DELL1_MIC_NO_PRESENCE, {0x12, 0x90a60120}, {0x14, 0x90170110}, -- 2.17.1

6 years, 9 months

2
1
0 0

[PATCH v2 2/7] zram: fix double free backing device

by Minchan Kim

If blkdev_get fails, we shouldn't do blkdev_put. Otherwise, kernel emits below log. This patch fixes it. [ 31.073006] WARNING: CPU: 0 PID: 1893 at fs/block_dev.c:1828 blkdev_put+0x105/0x120 [ 31.075104] Modules linked in: [ 31.075898] CPU: 0 PID: 1893 Comm: swapoff Not tainted 4.19.0+ #453 [ 31.077484] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.2-1 04/01/2014 [ 31.079589] RIP: 0010:blkdev_put+0x105/0x120 [ 31.080606] Code: 48 c7 80 a0 00 00 00 00 00 00 00 48 c7 c7 40 e7 40 96 e8 6e 47 73 00 48 8b bb e0 00 00 00 e9 2c ff ff ff 0f 0b e9 75 ff ff ff <0f> 0b e9 5a ff ff ff 48 c7 80 a0 00 00 00 00 00 00 00 eb 87 0f 1f [ 31.085080] RSP: 0018:ffffb409005c7ed0 EFLAGS: 00010297 [ 31.086383] RAX: ffff9779fe5a8040 RBX: ffff9779fbc17300 RCX: 00000000b9fc37a4 [ 31.088105] RDX: 0000000000000001 RSI: 0000000000000000 RDI: ffffffff9640e740 [ 31.089850] RBP: ffff9779fbc17318 R08: ffffffff95499a89 R09: 0000000000000004 [ 31.091201] R10: ffffb409005c7e50 R11: 7a9ef6088ff4d4a1 R12: 0000000000000083 [ 31.092276] R13: ffff9779fe607b98 R14: 0000000000000000 R15: ffff9779fe607a38 [ 31.093355] FS: 00007fc118d9b840(0000) GS:ffff9779fc600000(0000) knlGS:0000000000000000 [ 31.094582] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 31.095541] CR2: 00007fc11894b8dc CR3: 00000000339f6001 CR4: 0000000000160ef0 [ 31.096781] Call Trace: [ 31.097212] __x64_sys_swapoff+0x46d/0x490 [ 31.097914] do_syscall_64+0x5a/0x190 [ 31.098550] entry_SYSCALL_64_after_hwframe+0x49/0xbe [ 31.099402] RIP: 0033:0x7fc11843ec27 [ 31.100013] Code: 73 01 c3 48 8b 0d 71 62 2c 00 f7 d8 64 89 01 48 83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 44 00 00 b8 a8 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 41 62 2c 00 f7 d8 64 89 01 48 [ 31.103149] RSP: 002b:00007ffdf69be648 EFLAGS: 00000206 ORIG_RAX: 00000000000000a8 [ 31.104425] RAX: ffffffffffffffda RBX: 00000000011d98c0 RCX: 00007fc11843ec27 [ 31.105627] RDX: 0000000000000001 RSI: 0000000000000001 RDI: 00000000011d98c0 [ 31.106847] RBP: 0000000000000001 R08: 00007ffdf69be690 R09: 0000000000000001 [ 31.108038] R10: 00000000000002b1 R11: 0000000000000206 R12: 0000000000000001 [ 31.109231] R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000 [ 31.110433] irq event stamp: 4466 [ 31.111001] hardirqs last enabled at (4465): [<ffffffff953ebd43>] __free_pages_ok+0x1e3/0x490 [ 31.112437] hardirqs last disabled at (4466): [<ffffffff95201b7a>] trace_hardirqs_off_thunk+0x1a/0x1c [ 31.113973] softirqs last enabled at (3420): [<ffffffff95e00333>] __do_softirq+0x333/0x446 [ 31.115364] softirqs last disabled at (3407): [<ffffffff9527aee1>] irq_exit+0xd1/0xe0 Cc: stable(a)vger.kernel.org # 4.14+ Signed-off-by: Minchan Kim <minchan(a)kernel.org> --- drivers/block/zram/zram_drv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 472027eaed60..514f5aaf6eff 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -387,8 +387,10 @@ static ssize_t backing_dev_store(struct device *dev, bdev = bdgrab(I_BDEV(inode)); err = blkdev_get(bdev, FMODE_READ | FMODE_WRITE | FMODE_EXCL, zram); - if (err < 0) + if (err < 0) { + bdev = NULL; goto out; + } nr_pages = i_size_read(inode) >> PAGE_SHIFT; bitmap_sz = BITS_TO_LONGS(nr_pages) * sizeof(long); -- 2.20.0.rc0.387.gc7a69e6b6c-goog

6 years, 9 months

1
0
0 0

[PATCH v3.16 1/2] v4l: event: Prevent freeing event subscriptions while accessed

by Sakari Ailus

[ upstream commit ad608fbcf166fec809e402d548761768f602702c ] The event subscriptions are added to the subscribed event list while holding a spinlock, but that lock is subsequently released while still accessing the subscription object. This makes it possible to unsubscribe the event --- and freeing the subscription object's memory --- while the subscription object is simultaneously accessed. Prevent this by adding a mutex to serialise the event subscription and unsubscription. This also gives a guarantee to the callback ops that the add op has returned before the del op is called. This change also results in making the elems field less special: subscriptions are only added to the event list once they are fully initialised. Signed-off-by: Sakari Ailus <sakari.ailus(a)linux.intel.com> Reviewed-by: Hans Verkuil <hans.verkuil(a)cisco.com> Reviewed-by: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> Cc: stable(a)vger.kernel.org # for 4.14 and up Fixes: c3b5b0241f62 ("V4L/DVB: V4L: Events: Add backend") Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung(a)kernel.org> --- drivers/media/v4l2-core/v4l2-event.c | 38 +++++++++++++++++++----------------- drivers/media/v4l2-core/v4l2-fh.c | 2 ++ include/media/v4l2-fh.h | 1 + 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-event.c b/drivers/media/v4l2-core/v4l2-event.c index 8761aab99de95..fcf65f131a2ac 100644 --- a/drivers/media/v4l2-core/v4l2-event.c +++ b/drivers/media/v4l2-core/v4l2-event.c @@ -119,14 +119,6 @@ static void __v4l2_event_queue_fh(struct v4l2_fh *fh, const struct v4l2_event *e if (sev == NULL) return; - /* - * If the event has been added to the fh->subscribed list, but its - * add op has not completed yet elems will be 0, treat this as - * not being subscribed. - */ - if (!sev->elems) - return; - /* Increase event sequence number on fh. */ fh->sequence++; @@ -209,6 +201,7 @@ int v4l2_event_subscribe(struct v4l2_fh *fh, struct v4l2_subscribed_event *sev, *found_ev; unsigned long flags; unsigned i; + int ret = 0; if (sub->type == V4L2_EVENT_ALL) return -EINVAL; @@ -226,31 +219,36 @@ int v4l2_event_subscribe(struct v4l2_fh *fh, sev->flags = sub->flags; sev->fh = fh; sev->ops = ops; + sev->elems = elems; + + mutex_lock(&fh->subscribe_lock); spin_lock_irqsave(&fh->vdev->fh_lock, flags); found_ev = v4l2_event_subscribed(fh, sub->type, sub->id); - if (!found_ev) - list_add(&sev->list, &fh->subscribed); spin_unlock_irqrestore(&fh->vdev->fh_lock, flags); if (found_ev) { + /* Already listening */ kfree(sev); - return 0; /* Already listening */ + goto out_unlock; } if (sev->ops && sev->ops->add) { - int ret = sev->ops->add(sev, elems); + ret = sev->ops->add(sev, elems); if (ret) { - sev->ops = NULL; - v4l2_event_unsubscribe(fh, sub); - return ret; + kfree(sev); + goto out_unlock; } } - /* Mark as ready for use */ - sev->elems = elems; + spin_lock_irqsave(&fh->vdev->fh_lock, flags); + list_add(&sev->list, &fh->subscribed); + spin_unlock_irqrestore(&fh->vdev->fh_lock, flags); - return 0; +out_unlock: + mutex_unlock(&fh->subscribe_lock); + + return ret; } EXPORT_SYMBOL_GPL(v4l2_event_subscribe); @@ -289,6 +287,8 @@ int v4l2_event_unsubscribe(struct v4l2_fh *fh, return 0; } + mutex_lock(&fh->subscribe_lock); + spin_lock_irqsave(&fh->vdev->fh_lock, flags); sev = v4l2_event_subscribed(fh, sub->type, sub->id); @@ -306,6 +306,8 @@ int v4l2_event_unsubscribe(struct v4l2_fh *fh, if (sev && sev->ops && sev->ops->del) sev->ops->del(sev); + mutex_unlock(&fh->subscribe_lock); + kfree(sev); return 0; diff --git a/drivers/media/v4l2-core/v4l2-fh.c b/drivers/media/v4l2-core/v4l2-fh.c index e57c002b41506..573ec2f192d44 100644 --- a/drivers/media/v4l2-core/v4l2-fh.c +++ b/drivers/media/v4l2-core/v4l2-fh.c @@ -42,6 +42,7 @@ void v4l2_fh_init(struct v4l2_fh *fh, struct video_device *vdev) INIT_LIST_HEAD(&fh->available); INIT_LIST_HEAD(&fh->subscribed); fh->sequence = -1; + mutex_init(&fh->subscribe_lock); } EXPORT_SYMBOL_GPL(v4l2_fh_init); @@ -88,6 +89,7 @@ void v4l2_fh_exit(struct v4l2_fh *fh) if (fh->vdev == NULL) return; v4l2_event_unsubscribe_all(fh); + mutex_destroy(&fh->subscribe_lock); fh->vdev = NULL; } EXPORT_SYMBOL_GPL(v4l2_fh_exit); diff --git a/include/media/v4l2-fh.h b/include/media/v4l2-fh.h index 803516775162d..a2777a324e083 100644 --- a/include/media/v4l2-fh.h +++ b/include/media/v4l2-fh.h @@ -41,6 +41,7 @@ struct v4l2_fh { /* Events */ wait_queue_head_t wait; + struct mutex subscribe_lock; struct list_head subscribed; /* Subscribed events */ struct list_head available; /* Dequeueable event */ unsigned int navailable; -- 2.11.0

6 years, 9 months

2
1
0 0

[PATCH v4.4 1/1] v4l: event: Add subscription to list before calling "add" operation

by Sakari Ailus

[ upstream commit 92539d3eda2c090b382699bbb896d4b54e9bdece ] Patch ad608fbcf166 changed how events were subscribed to address an issue elsewhere. As a side effect of that change, the "add" callback was called before the event subscription was added to the list of subscribed events, causing the first event queued by the add callback (and possibly other events arriving soon afterwards) to be lost. Fix this by adding the subscription to the list before calling the "add" callback, and clean up afterwards if that fails. Fixes: ad608fbcf166 ("media: v4l: event: Prevent freeing event subscriptions while accessed") Reported-by: Dave Stevenson <dave.stevenson(a)raspberrypi.org> Signed-off-by: Sakari Ailus <sakari.ailus(a)linux.intel.com> Tested-by: Dave Stevenson <dave.stevenson(a)raspberrypi.org> Reviewed-by: Hans Verkuil <hans.verkuil(a)cisco.com> Tested-by: Hans Verkuil <hans.verkuil(a)cisco.com> Cc: stable(a)vger.kernel.org (for 4.14 and up) Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung(a)kernel.org> --- drivers/media/v4l2-core/v4l2-event.c | 43 ++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-event.c b/drivers/media/v4l2-core/v4l2-event.c index b47ac4e053d0e..f5c8a952f0aa3 100644 --- a/drivers/media/v4l2-core/v4l2-event.c +++ b/drivers/media/v4l2-core/v4l2-event.c @@ -197,6 +197,22 @@ int v4l2_event_pending(struct v4l2_fh *fh) } EXPORT_SYMBOL_GPL(v4l2_event_pending); +static void __v4l2_event_unsubscribe(struct v4l2_subscribed_event *sev) +{ + struct v4l2_fh *fh = sev->fh; + unsigned int i; + + lockdep_assert_held(&fh->subscribe_lock); + assert_spin_locked(&fh->vdev->fh_lock); + + /* Remove any pending events for this subscription */ + for (i = 0; i < sev->in_use; i++) { + list_del(&sev->events[sev_pos(sev, i)].list); + fh->navailable--; + } + list_del(&sev->list); +} + int v4l2_event_subscribe(struct v4l2_fh *fh, const struct v4l2_event_subscription *sub, unsigned elems, const struct v4l2_subscribed_event_ops *ops) @@ -228,27 +244,23 @@ int v4l2_event_subscribe(struct v4l2_fh *fh, spin_lock_irqsave(&fh->vdev->fh_lock, flags); found_ev = v4l2_event_subscribed(fh, sub->type, sub->id); + if (!found_ev) + list_add(&sev->list, &fh->subscribed); spin_unlock_irqrestore(&fh->vdev->fh_lock, flags); if (found_ev) { /* Already listening */ kfree(sev); - goto out_unlock; - } - - if (sev->ops && sev->ops->add) { + } else if (sev->ops && sev->ops->add) { ret = sev->ops->add(sev, elems); if (ret) { + spin_lock_irqsave(&fh->vdev->fh_lock, flags); + __v4l2_event_unsubscribe(sev); + spin_unlock_irqrestore(&fh->vdev->fh_lock, flags); kfree(sev); - goto out_unlock; } } - spin_lock_irqsave(&fh->vdev->fh_lock, flags); - list_add(&sev->list, &fh->subscribed); - spin_unlock_irqrestore(&fh->vdev->fh_lock, flags); - -out_unlock: mutex_unlock(&fh->subscribe_lock); return ret; @@ -283,7 +295,6 @@ int v4l2_event_unsubscribe(struct v4l2_fh *fh, { struct v4l2_subscribed_event *sev; unsigned long flags; - int i; if (sub->type == V4L2_EVENT_ALL) { v4l2_event_unsubscribe_all(fh); @@ -295,14 +306,8 @@ int v4l2_event_unsubscribe(struct v4l2_fh *fh, spin_lock_irqsave(&fh->vdev->fh_lock, flags); sev = v4l2_event_subscribed(fh, sub->type, sub->id); - if (sev != NULL) { - /* Remove any pending events for this subscription */ - for (i = 0; i < sev->in_use; i++) { - list_del(&sev->events[sev_pos(sev, i)].list); - fh->navailable--; - } - list_del(&sev->list); - } + if (sev != NULL) + __v4l2_event_unsubscribe(sev); spin_unlock_irqrestore(&fh->vdev->fh_lock, flags); -- 2.11.0

6 years, 9 months

2
1
0 0

[PATCH] xtensa: fix coprocessor_load and coprocessor_restore

by Max Filippov

coprocessor_load and coprocessor_restore incorrectly use factor 4 to load address of the state loading code from the table where factor 8 must be used. This results in crash or incorrect coprocessor data when used with coprocessors 1..7. Cc: stable(a)vger.kernel.org Signed-off-by: Max Filippov <jcmvbkbc(a)gmail.com> --- arch/xtensa/kernel/coprocessor.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/xtensa/kernel/coprocessor.S b/arch/xtensa/kernel/coprocessor.S index 4f8b52d575a2..93ee66322f07 100644 --- a/arch/xtensa/kernel/coprocessor.S +++ b/arch/xtensa/kernel/coprocessor.S @@ -137,7 +137,7 @@ ENTRY(coprocessor_load) entry a1, 32 s32i a0, a1, 0 movi a0, .Lload_cp_regs_jump_table - addx4 a3, a3, a0 + addx8 a3, a3, a0 l32i a3, a3, 0 beqz a3, 1f add a0, a0, a3 @@ -183,7 +183,7 @@ ENTRY(coprocessor_restore) entry a1, 32 s32i a0, a1, 0 movi a0, .Lload_cp_regs_jump_table - addx4 a3, a3, a0 + addx8 a3, a3, a0 l32i a4, a3, 4 l32i a3, a3, 0 add a2, a2, a4 -- 2.11.0

6 years, 9 months

1
0
0 0

stable/linux-4.9.y, Bluetooth: h5: Fix missing dependency on BT_HCIUART_SERDEV

by youling 257

It should not appear in the 4.9 kernel, https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=… it cause Can't set device: Protocol not supported Can't initialize device: Protocol not supported # rtk_hciattach -n -s 115200 /dev/ttyS1 rtk_h5 Realtek Bluetooth init uart with init speed:115200, final_speed:115200, type:HCI UART H5 Realtek Bluetooth :Realtek hciattach version 2.5 Realtek Bluetooth :3-wire sync pattern resend : 1, len: 8 Realtek Bluetooth :Get SYNC Resp Pkt Realtek Bluetooth :Get SYNC pkt-active mode Realtek Bluetooth :3-wire config pattern resend : 1 , len: 10 Realtek Bluetooth :Get CONFG pkt-active mode Realtek Bluetooth :Get CONFG resp pkt-active mode Realtek Bluetooth :H5 init finished Realtek Bluetooth :config offset(f4),length(8) Realtek Bluetooth :config baud rate to :4928002, hwflowcontrol:5f, 1 Realtek Bluetooth :config offset(27),length(1) Realtek Bluetooth :config offset(fe),length(1) Realtek Bluetooth :config offset(15b),length(4) Realtek Bluetooth :config offset(1e3),length(1) Realtek Bluetooth :Get config baud rate from config file:4928002 Realtek Bluetooth :Load FW OK Realtek Bluetooth :RTK send HCI_VENDOR_READ_RTK_ROM_VERISION_Command Realtek Bluetooth :Received reliable seqno 0 from card Realtek Bluetooth :receive hci command complete event with command:1001 Realtek Bluetooth :Read RTK LMP version with Status:0 Realtek Bluetooth :gLmpVersion = 0x8723 Realtek Bluetooth :RTK send HCI_VENDOR_READ_RTK_ROM_VERISION_Command Realtek Bluetooth :Received reliable seqno 1 from card Realtek Bluetooth :receive hci command complete event with command:fc6d Realtek Bluetooth :Read RTK rom version with Status:0 Realtek Bluetooth :rtk_hw_cfg.eversion = 1 Realtek Bluetooth :rtk_get_fw_project_id: opcode 0, len 1, data 1 Realtek Bluetooth :fw_ver 0x1e3ee40e, patch_num 2 Realtek Bluetooth :patch length is 0x5e90 Realtek Bluetooth :start offset is 0x4f00 Realtek Bluetooth :fw: exists, config file: exists Realtek Bluetooth :baudrate in change speed command: 0x2 0x80 0x92 0x4 Realtek Bluetooth :Received reliable seqno 2 from card Realtek Bluetooth :receive hci command complete event with command:fc17 Realtek Bluetooth :Change BD Rate with status:0 Realtek Bluetooth :final_speed 1500000 Realtek Bluetooth :hw flow control enable Realtek Bluetooth :iEndIndex:96 iLastPacketLen:71 iAdditionpkt:4 Realtek Bluetooth :hci_download_patch tx_index:0 rx_index: -1 Realtek Bluetooth :Received reliable seqno 3 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 0 Realtek Bluetooth :hci_download_patch tx_index:1 rx_index: 0 Realtek Bluetooth :Received reliable seqno 4 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 1 Realtek Bluetooth :hci_download_patch tx_index:2 rx_index: 1 Realtek Bluetooth :Received reliable seqno 5 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 2 Realtek Bluetooth :hci_download_patch tx_index:3 rx_index: 2 Realtek Bluetooth :Received reliable seqno 6 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 3 Realtek Bluetooth :hci_download_patch tx_index:4 rx_index: 3 Realtek Bluetooth :Received reliable seqno 7 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 4 Realtek Bluetooth :hci_download_patch tx_index:5 rx_index: 4 Realtek Bluetooth :Received reliable seqno 0 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 5 Realtek Bluetooth :hci_download_patch tx_index:6 rx_index: 5 Realtek Bluetooth :Received reliable seqno 1 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 6 Realtek Bluetooth :hci_download_patch tx_index:7 rx_index: 6 Realtek Bluetooth :Received reliable seqno 2 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 7 Realtek Bluetooth :hci_download_patch tx_index:8 rx_index: 7 Realtek Bluetooth :Received reliable seqno 3 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 8 Realtek Bluetooth :hci_download_patch tx_index:9 rx_index: 8 Realtek Bluetooth :Received reliable seqno 4 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 9 Realtek Bluetooth :hci_download_patch tx_index:10 rx_index: 9 Realtek Bluetooth :Received reliable seqno 5 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 10 Realtek Bluetooth :hci_download_patch tx_index:11 rx_index: 10 Realtek Bluetooth :Received reliable seqno 6 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 11 Realtek Bluetooth :hci_download_patch tx_index:12 rx_index: 11 Realtek Bluetooth :Received reliable seqno 7 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 12 Realtek Bluetooth :hci_download_patch tx_index:13 rx_index: 12 Realtek Bluetooth :Received reliable seqno 0 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 13 Realtek Bluetooth :hci_download_patch tx_index:14 rx_index: 13 Realtek Bluetooth :Received reliable seqno 1 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 14 Realtek Bluetooth :hci_download_patch tx_index:15 rx_index: 14 Realtek Bluetooth :Received reliable seqno 2 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 15 Realtek Bluetooth :hci_download_patch tx_index:16 rx_index: 15 Realtek Bluetooth :Received reliable seqno 3 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 16 Realtek Bluetooth :hci_download_patch tx_index:17 rx_index: 16 Realtek Bluetooth :Received reliable seqno 4 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 17 Realtek Bluetooth :hci_download_patch tx_index:18 rx_index: 17 Realtek Bluetooth :Received reliable seqno 5 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 18 Realtek Bluetooth :hci_download_patch tx_index:19 rx_index: 18 Realtek Bluetooth :Received reliable seqno 6 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 19 Realtek Bluetooth :hci_download_patch tx_index:20 rx_index: 19 Realtek Bluetooth :Received reliable seqno 7 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 20 Realtek Bluetooth :hci_download_patch tx_index:21 rx_index: 20 Realtek Bluetooth :Received reliable seqno 0 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 21 Realtek Bluetooth :hci_download_patch tx_index:22 rx_index: 21 Realtek Bluetooth :Received reliable seqno 1 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 22 Realtek Bluetooth :hci_download_patch tx_index:23 rx_index: 22 Realtek Bluetooth :Received reliable seqno 2 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 23 Realtek Bluetooth :hci_download_patch tx_index:24 rx_index: 23 Realtek Bluetooth :Received reliable seqno 3 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 24 Realtek Bluetooth :hci_download_patch tx_index:25 rx_index: 24 Realtek Bluetooth :Received reliable seqno 4 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 25 Realtek Bluetooth :hci_download_patch tx_index:26 rx_index: 25 Realtek Bluetooth :Received reliable seqno 5 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 26 Realtek Bluetooth :hci_download_patch tx_index:27 rx_index: 26 Realtek Bluetooth :Received reliable seqno 6 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 27 Realtek Bluetooth :hci_download_patch tx_index:28 rx_index: 27 Realtek Bluetooth :Received reliable seqno 7 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 28 Realtek Bluetooth :hci_download_patch tx_index:29 rx_index: 28 Realtek Bluetooth :Received reliable seqno 0 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 29 Realtek Bluetooth :hci_download_patch tx_index:30 rx_index: 29 Realtek Bluetooth :Received reliable seqno 1 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 30 Realtek Bluetooth :hci_download_patch tx_index:31 rx_index: 30 Realtek Bluetooth :Received reliable seqno 2 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 31 Realtek Bluetooth :hci_download_patch tx_index:32 rx_index: 31 Realtek Bluetooth :Received reliable seqno 3 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 32 Realtek Bluetooth :hci_download_patch tx_index:33 rx_index: 32 Realtek Bluetooth :Received reliable seqno 4 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 33 Realtek Bluetooth :hci_download_patch tx_index:34 rx_index: 33 Realtek Bluetooth :Received reliable seqno 5 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 34 Realtek Bluetooth :hci_download_patch tx_index:35 rx_index: 34 Realtek Bluetooth :Received reliable seqno 6 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 35 Realtek Bluetooth :hci_download_patch tx_index:36 rx_index: 35 Realtek Bluetooth :Received reliable seqno 7 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 36 Realtek Bluetooth :hci_download_patch tx_index:37 rx_index: 36 Realtek Bluetooth :Received reliable seqno 0 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 37 Realtek Bluetooth :hci_download_patch tx_index:38 rx_index: 37 Realtek Bluetooth :Received reliable seqno 1 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 38 Realtek Bluetooth :hci_download_patch tx_index:39 rx_index: 38 Realtek Bluetooth :Received reliable seqno 2 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 39 Realtek Bluetooth :hci_download_patch tx_index:40 rx_index: 39 Realtek Bluetooth :Received reliable seqno 3 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 40 Realtek Bluetooth :hci_download_patch tx_index:41 rx_index: 40 Realtek Bluetooth :Received reliable seqno 4 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 41 Realtek Bluetooth :hci_download_patch tx_index:42 rx_index: 41 Realtek Bluetooth :Received reliable seqno 5 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 42 Realtek Bluetooth :hci_download_patch tx_index:43 rx_index: 42 Realtek Bluetooth :Received reliable seqno 6 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 43 Realtek Bluetooth :hci_download_patch tx_index:44 rx_index: 43 Realtek Bluetooth :Received reliable seqno 7 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 44 Realtek Bluetooth :hci_download_patch tx_index:45 rx_index: 44 Realtek Bluetooth :Received reliable seqno 0 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 45 Realtek Bluetooth :hci_download_patch tx_index:46 rx_index: 45 Realtek Bluetooth :Received reliable seqno 1 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 46 Realtek Bluetooth :hci_download_patch tx_index:47 rx_index: 46 Realtek Bluetooth :Received reliable seqno 2 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 47 Realtek Bluetooth :hci_download_patch tx_index:48 rx_index: 47 Realtek Bluetooth :Received reliable seqno 3 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 48 Realtek Bluetooth :hci_download_patch tx_index:49 rx_index: 48 Realtek Bluetooth :Received reliable seqno 4 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 49 Realtek Bluetooth :hci_download_patch tx_index:50 rx_index: 49 Realtek Bluetooth :Received reliable seqno 5 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 50 Realtek Bluetooth :hci_download_patch tx_index:51 rx_index: 50 Realtek Bluetooth :Received reliable seqno 6 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 51 Realtek Bluetooth :hci_download_patch tx_index:52 rx_index: 51 Realtek Bluetooth :Received reliable seqno 7 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 52 Realtek Bluetooth :hci_download_patch tx_index:53 rx_index: 52 Realtek Bluetooth :Received reliable seqno 0 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 53 Realtek Bluetooth :hci_download_patch tx_index:54 rx_index: 53 Realtek Bluetooth :Received reliable seqno 1 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 54 Realtek Bluetooth :hci_download_patch tx_index:55 rx_index: 54 Realtek Bluetooth :Received reliable seqno 2 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 55 Realtek Bluetooth :hci_download_patch tx_index:56 rx_index: 55 Realtek Bluetooth :Received reliable seqno 3 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 56 Realtek Bluetooth :hci_download_patch tx_index:57 rx_index: 56 Realtek Bluetooth :Received reliable seqno 4 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 57 Realtek Bluetooth :hci_download_patch tx_index:58 rx_index: 57 Realtek Bluetooth :Received reliable seqno 5 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 58 Realtek Bluetooth :hci_download_patch tx_index:59 rx_index: 58 Realtek Bluetooth :Received reliable seqno 6 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 59 Realtek Bluetooth :hci_download_patch tx_index:60 rx_index: 59 Realtek Bluetooth :Received reliable seqno 7 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 60 Realtek Bluetooth :hci_download_patch tx_index:61 rx_index: 60 Realtek Bluetooth :Received reliable seqno 0 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 61 Realtek Bluetooth :hci_download_patch tx_index:62 rx_index: 61 Realtek Bluetooth :Received reliable seqno 1 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 62 Realtek Bluetooth :hci_download_patch tx_index:63 rx_index: 62 Realtek Bluetooth :Received reliable seqno 2 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 63 Realtek Bluetooth :hci_download_patch tx_index:64 rx_index: 63 Realtek Bluetooth :Received reliable seqno 3 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 64 Realtek Bluetooth :hci_download_patch tx_index:65 rx_index: 64 Realtek Bluetooth :Received reliable seqno 4 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 65 Realtek Bluetooth :hci_download_patch tx_index:66 rx_index: 65 Realtek Bluetooth :Received reliable seqno 5 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 66 Realtek Bluetooth :hci_download_patch tx_index:67 rx_index: 66 Realtek Bluetooth :Received reliable seqno 6 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 67 Realtek Bluetooth :hci_download_patch tx_index:68 rx_index: 67 Realtek Bluetooth :Received reliable seqno 7 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 68 Realtek Bluetooth :hci_download_patch tx_index:69 rx_index: 68 Realtek Bluetooth :Received reliable seqno 0 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 69 Realtek Bluetooth :hci_download_patch tx_index:70 rx_index: 69 Realtek Bluetooth :Received reliable seqno 1 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 70 Realtek Bluetooth :hci_download_patch tx_index:71 rx_index: 70 Realtek Bluetooth :Received reliable seqno 2 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 71 Realtek Bluetooth :hci_download_patch tx_index:72 rx_index: 71 Realtek Bluetooth :Received reliable seqno 3 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 72 Realtek Bluetooth :hci_download_patch tx_index:73 rx_index: 72 Realtek Bluetooth :Received reliable seqno 4 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 73 Realtek Bluetooth :hci_download_patch tx_index:74 rx_index: 73 Realtek Bluetooth :Received reliable seqno 5 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 74 Realtek Bluetooth :hci_download_patch tx_index:75 rx_index: 74 Realtek Bluetooth :Received reliable seqno 6 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 75 Realtek Bluetooth :hci_download_patch tx_index:76 rx_index: 75 Realtek Bluetooth :Received reliable seqno 7 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 76 Realtek Bluetooth :hci_download_patch tx_index:77 rx_index: 76 Realtek Bluetooth :Received reliable seqno 0 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 77 Realtek Bluetooth :hci_download_patch tx_index:78 rx_index: 77 Realtek Bluetooth :Received reliable seqno 1 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 78 Realtek Bluetooth :hci_download_patch tx_index:79 rx_index: 78 Realtek Bluetooth :Received reliable seqno 2 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 79 Realtek Bluetooth :hci_download_patch tx_index:80 rx_index: 79 Realtek Bluetooth :Received reliable seqno 3 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 80 Realtek Bluetooth :hci_download_patch tx_index:81 rx_index: 80 Realtek Bluetooth :Received reliable seqno 4 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 81 Realtek Bluetooth :hci_download_patch tx_index:82 rx_index: 81 Realtek Bluetooth :Received reliable seqno 5 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 82 Realtek Bluetooth :hci_download_patch tx_index:83 rx_index: 82 Realtek Bluetooth :Received reliable seqno 6 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 83 Realtek Bluetooth :hci_download_patch tx_index:84 rx_index: 83 Realtek Bluetooth :Received reliable seqno 7 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 84 Realtek Bluetooth :hci_download_patch tx_index:85 rx_index: 84 Realtek Bluetooth :Received reliable seqno 0 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 85 Realtek Bluetooth :hci_download_patch tx_index:86 rx_index: 85 Realtek Bluetooth :Received reliable seqno 1 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 86 Realtek Bluetooth :hci_download_patch tx_index:87 rx_index: 86 Realtek Bluetooth :Received reliable seqno 2 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 87 Realtek Bluetooth :hci_download_patch tx_index:88 rx_index: 87 Realtek Bluetooth :Received reliable seqno 3 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 88 Realtek Bluetooth :hci_download_patch tx_index:89 rx_index: 88 Realtek Bluetooth :Received reliable seqno 4 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 89 Realtek Bluetooth :hci_download_patch tx_index:90 rx_index: 89 Realtek Bluetooth :Received reliable seqno 5 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 90 Realtek Bluetooth :hci_download_patch tx_index:91 rx_index: 90 Realtek Bluetooth :Received reliable seqno 6 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 91 Realtek Bluetooth :hci_download_patch tx_index:92 rx_index: 91 Realtek Bluetooth :Received reliable seqno 7 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 92 Realtek Bluetooth :hci_download_patch tx_index:93 rx_index: 92 Realtek Bluetooth :Received reliable seqno 0 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 93 Realtek Bluetooth :hci_download_patch tx_index:94 rx_index: 93 Realtek Bluetooth :Received reliable seqno 1 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 94 Realtek Bluetooth :hci_download_patch tx_index:95 rx_index: 94 Realtek Bluetooth :Received reliable seqno 2 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 95 Realtek Bluetooth :hci_download_patch tx_index:96 rx_index: 95 Realtek Bluetooth :Received reliable seqno 3 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 96 Realtek Bluetooth :hci_download_patch tx_index:97 rx_index: 96 Realtek Bluetooth :Received reliable seqno 4 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 97 Realtek Bluetooth :hci_download_patch tx_index:98 rx_index: 97 Realtek Bluetooth :Received reliable seqno 5 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 98 Realtek Bluetooth :hci_download_patch tx_index:99 rx_index: 98 Realtek Bluetooth :Received reliable seqno 6 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 99 Realtek Bluetooth :Send FW last command Realtek Bluetooth :hci_download_patch tx_index:100 rx_index: 99 Realtek Bluetooth :Received reliable seqno 7 from card Realtek Bluetooth :rtk_hw_cfg.rx_index 100 Realtek Bluetooth :Init Process finished Can't set device: Protocol not supported Can't initialize device: Protocol not supported

6 years, 9 months

2
3
0 0

patch "usb: core: quirks: add RESET_RESUME quirk for Cherry G230 Stream" added to usb-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled usb: core: quirks: add RESET_RESUME quirk for Cherry G230 Stream to my usb git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git in the usb-linus branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will hopefully also be merged in Linus's tree for the next -rc kernel release. If you have any questions about this process, please let me know. >From effd14f66cc1ef6701a19c5a56e39c35f4d395a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Niew=C3=B6hner?= <linux(a)mniewoehner.de> Date: Sun, 25 Nov 2018 17:57:33 +0100 Subject: usb: core: quirks: add RESET_RESUME quirk for Cherry G230 Stream series MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cherry G230 Stream 2.0 (G85-231) and 3.0 (G85-232) need this quirk to function correctly. This fixes a but where double pressing numlock locks up the device completely with need to replug the keyboard. Signed-off-by: Michael Niewöhner <linux(a)mniewoehner.de> Tested-by: Michael Niewöhner <linux(a)mniewoehner.de> Cc: stable <stable(a)vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/usb/core/quirks.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c index f9ff03e6af93..0690fcff0ea2 100644 --- a/drivers/usb/core/quirks.c +++ b/drivers/usb/core/quirks.c @@ -209,6 +209,9 @@ static const struct usb_device_id usb_quirk_list[] = { /* Microsoft LifeCam-VX700 v2.0 */ { USB_DEVICE(0x045e, 0x0770), .driver_info = USB_QUIRK_RESET_RESUME }, + /* Cherry Stream G230 2.0 (G85-231) and 3.0 (G85-232) */ + { USB_DEVICE(0x046a, 0x0023), .driver_info = USB_QUIRK_RESET_RESUME }, + /* Logitech HD Pro Webcams C920, C920-C, C925e and C930e */ { USB_DEVICE(0x046d, 0x082d), .driver_info = USB_QUIRK_DELAY_INIT }, { USB_DEVICE(0x046d, 0x0841), .driver_info = USB_QUIRK_DELAY_INIT }, -- 2.19.2

6 years, 9 months

1
0
0 0

patch "USB: usb-storage: Add new IDs to ums-realtek" added to usb-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled USB: usb-storage: Add new IDs to ums-realtek to my usb git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git in the usb-linus branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will hopefully also be merged in Linus's tree for the next -rc kernel release. If you have any questions about this process, please let me know. >From a84a1bcc992f0545a51d2e120b8ca2ef20e2ea97 Mon Sep 17 00:00:00 2001 From: Kai-Heng Feng <kai.heng.feng(a)canonical.com> Date: Fri, 23 Nov 2018 08:42:19 +0000 Subject: USB: usb-storage: Add new IDs to ums-realtek There are two new Realtek card readers require ums-realtek to work correctly. Add the new IDs to support them. Signed-off-by: Kai-Heng Feng <kai.heng.feng(a)canonical.com> Acked-by: Alan Stern <stern(a)rowland.harvard.edu> Cc: stable <stable(a)vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/usb/storage/unusual_realtek.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/usb/storage/unusual_realtek.h b/drivers/usb/storage/unusual_realtek.h index d17cd95b55bb..6b2140f966ef 100644 --- a/drivers/usb/storage/unusual_realtek.h +++ b/drivers/usb/storage/unusual_realtek.h @@ -27,4 +27,14 @@ UNUSUAL_DEV(0x0bda, 0x0159, 0x0000, 0x9999, "USB Card Reader", USB_SC_DEVICE, USB_PR_DEVICE, init_realtek_cr, 0), +UNUSUAL_DEV(0x0bda, 0x0177, 0x0000, 0x9999, + "Realtek", + "USB Card Reader", + USB_SC_DEVICE, USB_PR_DEVICE, init_realtek_cr, 0), + +UNUSUAL_DEV(0x0bda, 0x0184, 0x0000, 0x9999, + "Realtek", + "USB Card Reader", + USB_SC_DEVICE, USB_PR_DEVICE, init_realtek_cr, 0), + #endif /* defined(CONFIG_USB_STORAGE_REALTEK) || ... */ -- 2.19.2

6 years, 9 months

1
0
0 0