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

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.9.219 release. There are 32 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Mon, 13 Apr 2020 11:51:28 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.219-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.9.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.9.219-rc1 Hans Verkuil <hans.verkuil(a)cisco.com> drm_dp_mst_topology: fix broken drm_dp_sideband_parse_remote_dpcd_read() Roger Quadros <rogerq(a)ti.com> usb: dwc3: don't set gadget->is_otg flag Arun KS <arunks(a)codeaurora.org> arm64: Fix size of __early_cpu_boot_status Rob Clark <robdclark(a)chromium.org> drm/msm: stop abusing dma_map/unmap for cache Taniya Das <tdas(a)codeaurora.org> clk: qcom: rcg: Return failure for RCG update Avihai Horon <avihaih(a)mellanox.com> RDMA/cm: Update num_paths in cma_resolve_iboe_route error flow Qiujun Huang <hqjagain(a)gmail.com> Bluetooth: RFCOMM: fix ODEBUG bug in rfcomm_dev_ioctl Ilya Dryomov <idryomov(a)gmail.com> ceph: canonicalize server path in place Xiubo Li <xiubli(a)redhat.com> ceph: remove the extra slashes in the server path Kaike Wan <kaike.wan(a)intel.com> IB/hfi1: Fix memory leaks in sysfs registration and unregistration Kaike Wan <kaike.wan(a)intel.com> IB/hfi1: Call kobject_put() when kobject_init_and_add() fails Paul Cercueil <paul(a)crapouillou.net> ASoC: jz4740-i2s: Fix divider written at incorrect offset in register David Ahern <dsahern(a)kernel.org> tools/accounting/getdelays.c: fix netlink attribute length Jason A. Donenfeld <Jason(a)zx2c4.com> random: always use batched entropy for get_random_u{32,64} Oleksij Rempel <o.rempel(a)pengutronix.de> net: phy: micrel: kszphy_resume(): add delay after genphy_resume() before accessing PHY registers Richard Palethorpe <rpalethorpe(a)suse.com> slcan: Don't transmit uninitialized stack data in padding Jisheng Zhang <Jisheng.Zhang(a)synaptics.com> net: stmmac: dwmac1000: fix out-of-bounds mac address reg setting Florian Fainelli <f.fainelli(a)gmail.com> net: dsa: bcm_sf2: Ensure correct sub-node is parsed Randy Dunlap <rdunlap(a)infradead.org> mm: mempolicy: require at least one nodeid for MPOL_PREFERRED Daniel Jordan <daniel.m.jordan(a)oracle.com> padata: always acquire cpu_hotplug_lock before pinst->lock Florian Fainelli <f.fainelli(a)gmail.com> net: dsa: tag_brcm: Fix skb->fwd_offload_mark location Eugene Syromiatnikov <esyr(a)redhat.com> coresight: do not use the BIT() macro in the UAPI header Keith Busch <keith.busch(a)intel.com> blk-mq: Allow blocking queue tag iter callbacks Jianchao Wang <jianchao.w.wang(a)oracle.com> blk-mq: sync the update nr_hw_queues with blk_mq_queue_tag_busy_iter Lucas Stach <l.stach(a)pengutronix.de> drm/etnaviv: replace MMU flush marker with flush sequence Marcelo Ricardo Leitner <marcelo.leitner(a)gmail.com> sctp: fix possibly using a bad saddr with a given dst Qiujun Huang <hqjagain(a)gmail.com> sctp: fix refcount bug in sctp_wfree William Dauchy <w.dauchy(a)criteo.com> net, ip_tunnel: fix interface lookup with no key Qian Cai <cai(a)lca.pw> ipv4: fix a RCU-list lock in fib_triestat_seq_show Gerd Hoffmann <kraxel(a)redhat.com> drm/bochs: downgrade pci_request_region failure from error to warning Guillaume Nault <g.nault(a)alphalink.fr> l2tp: fix race between l2tp_session_delete() and l2tp_tunnel_closeall() Guillaume Nault <g.nault(a)alphalink.fr> l2tp: ensure sessions are freed after their PPPOL2TP socket ------------- Diffstat: Makefile | 4 +- arch/arm64/kernel/head.S | 2 +- block/blk-mq-tag.c | 9 +++- block/blk-mq.c | 4 ++ drivers/char/random.c | 10 +--- drivers/clk/qcom/clk-rcg2.c | 2 +- drivers/gpu/drm/bochs/bochs_hw.c | 6 +-- drivers/gpu/drm/drm_dp_mst_topology.c | 1 + drivers/gpu/drm/etnaviv/etnaviv_buffer.c | 10 ++-- drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 2 +- drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 1 + drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 6 +-- drivers/gpu/drm/etnaviv/etnaviv_mmu.h | 2 +- drivers/gpu/drm/msm/msm_gem.c | 4 +- drivers/infiniband/core/cma.c | 1 + drivers/infiniband/hw/hfi1/sysfs.c | 26 ++++++++--- drivers/net/can/slcan.c | 4 +- drivers/net/dsa/bcm_sf2.c | 7 ++- .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 2 +- drivers/net/phy/micrel.c | 7 +++ drivers/usb/dwc3/gadget.c | 1 - fs/ceph/super.c | 54 ++++++++++++++-------- fs/ceph/super.h | 2 +- include/uapi/linux/coresight-stm.h | 6 ++- kernel/padata.c | 4 +- mm/mempolicy.c | 6 ++- net/bluetooth/rfcomm/tty.c | 4 +- net/dsa/tag_brcm.c | 4 +- net/ipv4/fib_trie.c | 3 ++ net/ipv4/ip_tunnel.c | 6 +-- net/l2tp/l2tp_core.c | 6 +++ net/l2tp/l2tp_core.h | 1 + net/l2tp/l2tp_ppp.c | 8 ++-- net/sctp/ipv6.c | 20 +++++--- net/sctp/protocol.c | 28 +++++++---- net/sctp/socket.c | 31 +++++++++---- sound/soc/jz4740/jz4740-i2s.c | 2 +- tools/accounting/getdelays.c | 2 +- 38 files changed, 193 insertions(+), 105 deletions(-)

5 years, 8 months

4
35
0 0

[git:media_tree/master] media: ov5640: fix use of destroyed mutex

by Mauro Carvalho Chehab

This is an automatic generated email to let you know that the following patch were queued: Subject: media: ov5640: fix use of destroyed mutex Author: Tomi Valkeinen <tomi.valkeinen(a)ti.com> Date: Wed Mar 25 13:20:00 2020 +0100 v4l2_ctrl_handler_free() uses hdl->lock, which in ov5640 driver is set to sensor's own sensor->lock. In ov5640_remove(), the driver destroys the sensor->lock first, and then calls v4l2_ctrl_handler_free(), resulting in the use of the destroyed mutex. Fix this by calling moving the mutex_destroy() to the end of the cleanup sequence, as there's no need to destroy the mutex as early as possible. Signed-off-by: Tomi Valkeinen <tomi.valkeinen(a)ti.com> Reviewed-by: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> Cc: stable(a)vger.kernel.org # v4.14+ Reviewed-by: Benoit Parrot <bparrot(a)ti.com> Signed-off-by: Sakari Ailus <sakari.ailus(a)linux.intel.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei(a)kernel.org> drivers/media/i2c/ov5640.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/drivers/media/i2c/ov5640.c b/drivers/media/i2c/ov5640.c index 854031f0b64a..2fe4a7ac0592 100644 --- a/drivers/media/i2c/ov5640.c +++ b/drivers/media/i2c/ov5640.c @@ -3093,8 +3093,8 @@ static int ov5640_probe(struct i2c_client *client) free_ctrls: v4l2_ctrl_handler_free(&sensor->ctrls.handler); entity_cleanup: - mutex_destroy(&sensor->lock); media_entity_cleanup(&sensor->sd.entity); + mutex_destroy(&sensor->lock); return ret; } @@ -3104,9 +3104,9 @@ static int ov5640_remove(struct i2c_client *client) struct ov5640_dev *sensor = to_ov5640_dev(sd); v4l2_async_unregister_subdev(&sensor->sd); - mutex_destroy(&sensor->lock); media_entity_cleanup(&sensor->sd.entity); v4l2_ctrl_handler_free(&sensor->ctrls.handler); + mutex_destroy(&sensor->lock); return 0; }

5 years, 8 months

1
0
0 0

Patchset for CVE-2020-1749 Kernel 4.19

by Schmid, Carsten

Hi Greg, as announced i have backported the identified patches for CVE-2020-1749 from kernel 5.x into v4.19. Applies to stable linux-v4.19.y (with y=114). Please find the patches for 4.19 appended. Best regards Carsten ----------------- Mentor Graphics (Deutschland) GmbH, Arnulfstraße 201, 80634 München / Germany Registergericht München HRB 106955, Geschäftsführer: Thomas Heurung, Alexander Walter

5 years, 8 months

2
3
0 0

[PATCH 0/4] Fixes for ASoC DPCM and topology

by Gyeongtaek Lee

Hi, I'd like to request cherry-picking some fixes for ALSA SoC to stable branch. Those patches are fix or add couple of functions which are essential when ALSA topology and Compress offload is used with Dynamic PCM. All fixes are tested on 4.19 and 5.4. 1. Fix overflow of register mask when shift value is set to 32. 2. Default value setting for virtual kcontrol 3. Error on offload playback start or stop after pause 4. Prefix missing when a kcontrol is created with ASoC component with name prefix. Commit ID: 0ab070917afdc93670c2d0ea02ab6defb6246a7c 3bbbb7728fc853d71dbce4073fef9f281fbfb4dd 21fca8bdbb64df1297e8c65a746c4c9f4a689751 abca9e4a04fbe9c6df4d48ca7517e1611812af25 Kernel version wish it to be applied: 5.4 Subject: 이경택 (4): ASoC: fix regwmask ASoC: dapm: connect virtual mux with default value ASoC: dpcm: allow start or stop during pause for backend ASoC: topology: use name_prefix for new kcontrol sound/soc/soc-dapm.c | 8 +++++++- sound/soc/soc-ops.c | 4 ++-- sound/soc/soc-pcm.c | 6 ++++-- sound/soc/soc-topology.c | 2 +- 4 files changed, 14 insertions(+), 6 deletions(-) base-commit: bc844d58f697dff3ded4b410094ee89f5cedc04c -- 2.21.0

5 years, 8 months

2
4
0 0

[PATCH] KVM: VMX: Enable machine check support for 32bit targets

by Uros Bizjak

There is no reason to limit the use of do_machine_check to 64bit targets. MCE handling works for both target familes. Cc: Paolo Bonzini <pbonzini(a)redhat.com> Cc: Sean Christopherson <sean.j.christopherson(a)intel.com> Cc: stable(a)vger.kernel.org Fixes: a0861c02a981 ("KVM: Add VT-x machine check support") Signed-off-by: Uros Bizjak <ubizjak(a)gmail.com> --- arch/x86/kvm/vmx/vmx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index 8959514eaf0f..01330096ff3e 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -4572,7 +4572,7 @@ static int handle_rmode_exception(struct kvm_vcpu *vcpu, */ static void kvm_machine_check(void) { -#if defined(CONFIG_X86_MCE) && defined(CONFIG_X86_64) +#if defined(CONFIG_X86_MCE) struct pt_regs regs = { .cs = 3, /* Fake ring 3 no matter what the guest ran on */ .flags = X86_EFLAGS_IF, -- 2.25.2

5 years, 8 months

2
1
0 0

[tip: core/urgent] rcu: Don't acquire lock in NMI handler in rcu_nmi_enter_common()

by tip-bot2 for Paul E. McKenney

The following commit has been merged into the core/urgent branch of tip: Commit-ID: bf37da98c51825c90432d340e135cced37a7460d Gitweb: https://git.kernel.org/tip/bf37da98c51825c90432d340e135cced37a7460d Author: Paul E. McKenney <paulmck(a)kernel.org> AuthorDate: Thu, 12 Mar 2020 16:55:07 -07:00 Committer: Paul E. McKenney <paulmck(a)kernel.org> CommitterDate: Sun, 05 Apr 2020 14:22:15 -07:00 rcu: Don't acquire lock in NMI handler in rcu_nmi_enter_common() The rcu_nmi_enter_common() function can be invoked both in interrupt and NMI handlers. If it is invoked from process context (as opposed to userspace or idle context) on a nohz_full CPU, it might acquire the CPU's leaf rcu_node structure's ->lock. Because this lock is held only with interrupts disabled, this is safe from an interrupt handler, but doing so from an NMI handler can result in self-deadlock. This commit therefore adds "irq" to the "if" condition so as to only acquire the ->lock from irq handlers or process context, never from an NMI handler. Fixes: 5b14557b073c ("rcu: Avoid tick_dep_set_cpu() misordering") Reported-by: Thomas Gleixner <tglx(a)linutronix.de> Signed-off-by: Paul E. McKenney <paulmck(a)kernel.org> Reviewed-by: Joel Fernandes (Google) <joel(a)joelfernandes.org> Cc: <stable(a)vger.kernel.org> # 5.5.x --- kernel/rcu/tree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c index 550193a..2c17859 100644 --- a/kernel/rcu/tree.c +++ b/kernel/rcu/tree.c @@ -825,7 +825,7 @@ static __always_inline void rcu_nmi_enter_common(bool irq) rcu_cleanup_after_idle(); incby = 1; - } else if (tick_nohz_full_cpu(rdp->cpu) && + } else if (irq && tick_nohz_full_cpu(rdp->cpu) && rdp->dynticks_nmi_nesting == DYNTICK_IRQ_NONIDLE && READ_ONCE(rdp->rcu_urgent_qs) && !READ_ONCE(rdp->rcu_forced_tick)) {

5 years, 8 months

1
0
0 0

FAILED: patch "[PATCH] slub: improve bit diffusion for freelist ptr obfuscation" failed to apply to 4.19-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.19-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 1ad53d9fa3f6168ebcf48a50e08b170432da2257 Mon Sep 17 00:00:00 2001 From: Kees Cook <keescook(a)chromium.org> Date: Wed, 1 Apr 2020 21:04:23 -0700 Subject: [PATCH] slub: improve bit diffusion for freelist ptr obfuscation Under CONFIG_SLAB_FREELIST_HARDENED=y, the obfuscation was relatively weak in that the ptr and ptr address were usually so close that the first XOR would result in an almost entirely 0-byte value[1], leaving most of the "secret" number ultimately being stored after the third XOR. A single blind memory content exposure of the freelist was generally sufficient to learn the secret. Add a swab() call to mix bits a little more. This is a cheap way (1 cycle) to make attacks need more than a single exposure to learn the secret (or to know _where_ the exposure is in memory). kmalloc-32 freelist walk, before: ptr ptr_addr stored value secret ffff90c22e019020@ffff90c22e019000 is 86528eb656b3b5bd (86528eb656b3b59d) ffff90c22e019040@ffff90c22e019020 is 86528eb656b3b5fd (86528eb656b3b59d) ffff90c22e019060@ffff90c22e019040 is 86528eb656b3b5bd (86528eb656b3b59d) ffff90c22e019080@ffff90c22e019060 is 86528eb656b3b57d (86528eb656b3b59d) ffff90c22e0190a0@ffff90c22e019080 is 86528eb656b3b5bd (86528eb656b3b59d) ... after: ptr ptr_addr stored value secret ffff9eed6e019020@ffff9eed6e019000 is 793d1135d52cda42 (86528eb656b3b59d) ffff9eed6e019040@ffff9eed6e019020 is 593d1135d52cda22 (86528eb656b3b59d) ffff9eed6e019060@ffff9eed6e019040 is 393d1135d52cda02 (86528eb656b3b59d) ffff9eed6e019080@ffff9eed6e019060 is 193d1135d52cdae2 (86528eb656b3b59d) ffff9eed6e0190a0@ffff9eed6e019080 is f93d1135d52cdac2 (86528eb656b3b59d) [1] https://blog.infosectcbr.com.au/2020/03/weaknesses-in-linux-kernel-heap.html Fixes: 2482ddec670f ("mm: add SLUB free list pointer obfuscation") Reported-by: Silvio Cesare <silvio.cesare(a)gmail.com> Signed-off-by: Kees Cook <keescook(a)chromium.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> Cc: Christoph Lameter <cl(a)linux.com> Cc: Pekka Enberg <penberg(a)kernel.org> Cc: David Rientjes <rientjes(a)google.com> Cc: Joonsoo Kim <iamjoonsoo.kim(a)lge.com> Cc: <stable(a)vger.kernel.org> Link: http://lkml.kernel.org/r/202003051623.AF4F8CB@keescook Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> diff --git a/mm/slub.c b/mm/slub.c index fc911c222b11..bc949e3428c9 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -259,7 +259,7 @@ static inline void *freelist_ptr(const struct kmem_cache *s, void *ptr, * freepointer to be restored incorrectly. */ return (void *)((unsigned long)ptr ^ s->random ^ - (unsigned long)kasan_reset_tag((void *)ptr_addr)); + swab((unsigned long)kasan_reset_tag((void *)ptr_addr))); #else return ptr; #endif

5 years, 8 months

4
4
0 0

[PATCH][v4.19][v4.14] slub: improve bit diffusion for freelist ptr obfuscation

by Kees Cook

commit 1ad53d9fa3f6168ebcf48a50e08b170432da2257 upstream. Under CONFIG_SLAB_FREELIST_HARDENED=y, the obfuscation was relatively weak in that the ptr and ptr address were usually so close that the first XOR would result in an almost entirely 0-byte value[1], leaving most of the "secret" number ultimately being stored after the third XOR. A single blind memory content exposure of the freelist was generally sufficient to learn the secret. Add a swab() call to mix bits a little more. This is a cheap way (1 cycle) to make attacks need more than a single exposure to learn the secret (or to know _where_ the exposure is in memory). kmalloc-32 freelist walk, before: ptr ptr_addr stored value secret ffff90c22e019020@ffff90c22e019000 is 86528eb656b3b5bd (86528eb656b3b59d) ffff90c22e019040@ffff90c22e019020 is 86528eb656b3b5fd (86528eb656b3b59d) ffff90c22e019060@ffff90c22e019040 is 86528eb656b3b5bd (86528eb656b3b59d) ffff90c22e019080@ffff90c22e019060 is 86528eb656b3b57d (86528eb656b3b59d) ffff90c22e0190a0@ffff90c22e019080 is 86528eb656b3b5bd (86528eb656b3b59d) ... after: ptr ptr_addr stored value secret ffff9eed6e019020@ffff9eed6e019000 is 793d1135d52cda42 (86528eb656b3b59d) ffff9eed6e019040@ffff9eed6e019020 is 593d1135d52cda22 (86528eb656b3b59d) ffff9eed6e019060@ffff9eed6e019040 is 393d1135d52cda02 (86528eb656b3b59d) ffff9eed6e019080@ffff9eed6e019060 is 193d1135d52cdae2 (86528eb656b3b59d) ffff9eed6e0190a0@ffff9eed6e019080 is f93d1135d52cdac2 (86528eb656b3b59d) [1] https://blog.infosectcbr.com.au/2020/03/weaknesses-in-linux-kernel-heap.html Fixes: 2482ddec670f ("mm: add SLUB free list pointer obfuscation") Reported-by: Silvio Cesare <silvio.cesare(a)gmail.com> Signed-off-by: Kees Cook <keescook(a)chromium.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> Cc: Christoph Lameter <cl(a)linux.com> Cc: Pekka Enberg <penberg(a)kernel.org> Cc: David Rientjes <rientjes(a)google.com> Cc: Joonsoo Kim <iamjoonsoo.kim(a)lge.com> Cc: <stable(a)vger.kernel.org> Link: http://lkml.kernel.org/r/202003051623.AF4F8CB@keescook Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> [kees: Backport to v4.19 which doesn't call kasan_reset_untag()] Signed-off-by: Kees Cook <keescook(a)chromium.org> --- This requires that commit d5767057c9a76a29f073dad66b7fa12a90e8c748 is also cherry-picked into -stable. --- mm/slub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/slub.c b/mm/slub.c index 9b7b989273d4..d8116a43a287 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -249,7 +249,7 @@ static inline void *freelist_ptr(const struct kmem_cache *s, void *ptr, unsigned long ptr_addr) { #ifdef CONFIG_SLAB_FREELIST_HARDENED - return (void *)((unsigned long)ptr ^ s->random ^ ptr_addr); + return (void *)((unsigned long)ptr ^ s->random ^ swab(ptr_addr)); #else return ptr; #endif -- 2.20.1 -- Kees Cook

5 years, 8 months

2
1
0 0

FAILED: patch "[PATCH] IB/mlx5: Replace tunnel mpls capability bits for" failed to apply to 4.19-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.19-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 41e684ef3f37ce6e5eac3fb5b9c7c1853f4b0447 Mon Sep 17 00:00:00 2001 From: Alex Vesker <valex(a)mellanox.com> Date: Thu, 5 Mar 2020 14:38:41 +0200 Subject: [PATCH] IB/mlx5: Replace tunnel mpls capability bits for tunnel_offloads Until now the flex parser capability was used in ib_query_device() to indicate tunnel_offloads_caps support for mpls_over_gre/mpls_over_udp. Newer devices and firmware will have configurations with the flexparser but without mpls support. Testing for the flex parser capability was a mistake, the tunnel_stateless capability was intended for detecting mpls and was introduced at the same time as the flex parser capability. Otherwise userspace will be incorrectly informed that a future device supports MPLS when it does not. Link: https://lore.kernel.org/r/20200305123841.196086-1-leon@kernel.org Cc: <stable(a)vger.kernel.org> # 4.17 Fixes: e818e255a58d ("IB/mlx5: Expose MPLS related tunneling offloads") Signed-off-by: Alex Vesker <valex(a)mellanox.com> Reviewed-by: Ariel Levkovich <lariel(a)mellanox.com> Signed-off-by: Leon Romanovsky <leonro(a)mellanox.com> Signed-off-by: Jason Gunthorpe <jgg(a)mellanox.com> diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c index eba7604eaa76..9c3993c7e9a1 100644 --- a/drivers/infiniband/hw/mlx5/main.c +++ b/drivers/infiniband/hw/mlx5/main.c @@ -1192,12 +1192,10 @@ static int mlx5_ib_query_device(struct ib_device *ibdev, if (MLX5_CAP_ETH(mdev, tunnel_stateless_gre)) resp.tunnel_offloads_caps |= MLX5_IB_TUNNELED_OFFLOADS_GRE; - if (MLX5_CAP_GEN(mdev, flex_parser_protocols) & - MLX5_FLEX_PROTO_CW_MPLS_GRE) + if (MLX5_CAP_ETH(mdev, tunnel_stateless_mpls_over_gre)) resp.tunnel_offloads_caps |= MLX5_IB_TUNNELED_OFFLOADS_MPLS_GRE; - if (MLX5_CAP_GEN(mdev, flex_parser_protocols) & - MLX5_FLEX_PROTO_CW_MPLS_UDP) + if (MLX5_CAP_ETH(mdev, tunnel_stateless_mpls_over_udp)) resp.tunnel_offloads_caps |= MLX5_IB_TUNNELED_OFFLOADS_MPLS_UDP; } diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h index f9bcbe653fda..f3a7189f9d6d 100644 --- a/include/linux/mlx5/mlx5_ifc.h +++ b/include/linux/mlx5/mlx5_ifc.h @@ -877,7 +877,11 @@ struct mlx5_ifc_per_protocol_networking_offload_caps_bits { u8 swp_csum[0x1]; u8 swp_lso[0x1]; u8 cqe_checksum_full[0x1]; - u8 reserved_at_24[0x5]; + u8 tunnel_stateless_geneve_tx[0x1]; + u8 tunnel_stateless_mpls_over_udp[0x1]; + u8 tunnel_stateless_mpls_over_gre[0x1]; + u8 tunnel_stateless_vxlan_gpe[0x1]; + u8 tunnel_stateless_ipv4_over_vxlan[0x1]; u8 tunnel_stateless_ip_over_ip[0x1]; u8 reserved_at_2a[0x6]; u8 max_vxlan_udp_ports[0x8];

5 years, 8 months

3
2
0 0

[PATCH 4/4] ASoC: topology: use name_prefix for new kcontrol

by Gyeongtaek Lee

Current topology doesn't add prefix of component to new kcontrol. Signed-off-by: Gyeongtaek Lee <gt82.lee(a)samsung.com> Link: https://lore.kernel.org/r/009b01d60804$ae25c2d0$0a714870$@samsung.com Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/soc-topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index b19ecaf0febf..17556a47f727 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -362,7 +362,7 @@ static int soc_tplg_add_kcontrol(struct soc_tplg *tplg, struct snd_soc_component *comp = tplg->comp; return soc_tplg_add_dcontrol(comp->card->snd_card, - comp->dev, k, NULL, comp, kcontrol); + comp->dev, k, comp->name_prefix, comp, kcontrol); } /* remove a mixer kcontrol */ -- 2.21.0

5 years, 8 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror