June 2022 - Linux-stable-mirror

[PATCH] net: dsa: qca8k: reset cpu port on MTU change

by Christian Marangi

commit 386228c694bf1e7a7688e44412cb33500b0ac585 upstream. It was discovered that the Documentation lacks of a fundamental detail on how to correctly change the MAX_FRAME_SIZE of the switch. In fact if the MAX_FRAME_SIZE is changed while the cpu port is on, the switch panics and cease to send any packet. This cause the mgmt ethernet system to not receive any packet (the slow fallback still works) and makes the device not reachable. To recover from this a switch reset is required. To correctly handle this, turn off the cpu ports before changing the MAX_FRAME_SIZE and turn on again after the value is applied. Fixes: f58d2598cf70 ("net: dsa: qca8k: implement the port MTU callbacks") Cc: stable(a)vger.kernel.org Signed-off-by: Christian Marangi <ansuelsmth(a)gmail.com> Link: https://lore.kernel.org/r/20220621151122.10220-1-ansuelsmth@gmail.com Signed-off-by: Jakub Kicinski <kuba(a)kernel.org> [ backport: fix conflict using the old port_sts struct instead of bitmap ] --- drivers/net/dsa/qca8k.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c index a984f06f6f04..67869c8cbeaa 100644 --- a/drivers/net/dsa/qca8k.c +++ b/drivers/net/dsa/qca8k.c @@ -1599,7 +1599,7 @@ static int qca8k_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu) { struct qca8k_priv *priv = ds->priv; - int i, mtu = 0; + int ret, i, mtu = 0; priv->port_mtu[port] = new_mtu; @@ -1607,8 +1607,27 @@ qca8k_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu) if (priv->port_mtu[i] > mtu) mtu = priv->port_mtu[i]; + /* To change the MAX_FRAME_SIZE the cpu ports must be off or + * the switch panics. + * Turn off both cpu ports before applying the new value to prevent + * this. + */ + if (priv->port_sts[0].enabled) + qca8k_port_set_status(priv, 0, 0); + + if (priv->port_sts[6].enabled) + qca8k_port_set_status(priv, 6, 0); + /* Include L2 header / FCS length */ - return qca8k_write(priv, QCA8K_MAX_FRAME_SIZE, mtu + ETH_HLEN + ETH_FCS_LEN); + ret = qca8k_write(priv, QCA8K_MAX_FRAME_SIZE, mtu + ETH_HLEN + ETH_FCS_LEN); + + if (priv->port_sts[0].enabled) + qca8k_port_set_status(priv, 0, 1); + + if (priv->port_sts[6].enabled) + qca8k_port_set_status(priv, 6, 1); + + return ret; } static int -- 2.36.1

1 year, 10 months

2
2
0 0

[PATCH AUTOSEL 5.17 01/43] LSM: general protection fault in legacy_parse_param

by Sasha Levin

From: Casey Schaufler <casey(a)schaufler-ca.com> [ Upstream commit ecff30575b5ad0eda149aadad247b7f75411fd47 ] The usual LSM hook "bail on fail" scheme doesn't work for cases where a security module may return an error code indicating that it does not recognize an input. In this particular case Smack sees a mount option that it recognizes, and returns 0. A call to a BPF hook follows, which returns -ENOPARAM, which confuses the caller because Smack has processed its data. The SELinux hook incorrectly returns 1 on success. There was a time when this was correct, however the current expectation is that it return 0 on success. This is repaired. Reported-by: syzbot+d1e3b1d92d25abf97943(a)syzkaller.appspotmail.com Signed-off-by: Casey Schaufler <casey(a)schaufler-ca.com> Acked-by: James Morris <jamorris(a)linux.microsoft.com> Signed-off-by: Paul Moore <paul(a)paul-moore.com> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- security/security.c | 17 +++++++++++++++-- security/selinux/hooks.c | 5 ++--- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/security/security.c b/security/security.c index 22261d79f333..f101a53a63ed 100644 --- a/security/security.c +++ b/security/security.c @@ -884,9 +884,22 @@ int security_fs_context_dup(struct fs_context *fc, struct fs_context *src_fc) return call_int_hook(fs_context_dup, 0, fc, src_fc); } -int security_fs_context_parse_param(struct fs_context *fc, struct fs_parameter *param) +int security_fs_context_parse_param(struct fs_context *fc, + struct fs_parameter *param) { - return call_int_hook(fs_context_parse_param, -ENOPARAM, fc, param); + struct security_hook_list *hp; + int trc; + int rc = -ENOPARAM; + + hlist_for_each_entry(hp, &security_hook_heads.fs_context_parse_param, + list) { + trc = hp->hook.fs_context_parse_param(fc, param); + if (trc == 0) + rc = 0; + else if (trc != -ENOPARAM) + return trc; + } + return rc; } int security_sb_alloc(struct super_block *sb) diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 5b6895e4fc29..371f67a37f9a 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -2860,10 +2860,9 @@ static int selinux_fs_context_parse_param(struct fs_context *fc, return opt; rc = selinux_add_opt(opt, param->string, &fc->security); - if (!rc) { + if (!rc) param->string = NULL; - rc = 1; - } + return rc; } -- 2.34.1

1 year, 10 months

11
61
0 0

[merged mm-nonmm-stable] fs-sendfile-handles-o_nonblock-of-out_fd.patch removed from -mm tree

by Andrew Morton

The quilt patch titled Subject: fs: sendfile handles O_NONBLOCK of out_fd has been removed from the -mm tree. Its filename was fs-sendfile-handles-o_nonblock-of-out_fd.patch This patch was dropped because it was merged into the mm-nonmm-stable branch\nof git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: Andrei Vagin <avagin(a)gmail.com> Subject: fs: sendfile handles O_NONBLOCK of out_fd sendfile has to return EAGAIN if out_fd is nonblocking and the write into it would block. Here is a small reproducer for the problem: #define _GNU_SOURCE /* See feature_test_macros(7) */ #include <fcntl.h> #include <stdio.h> #include <unistd.h> #include <errno.h> #include <sys/stat.h> #include <sys/types.h> #include <sys/sendfile.h> #define FILE_SIZE (1UL << 30) int main(int argc, char **argv) { int p[2], fd; if (pipe2(p, O_NONBLOCK)) return 1; fd = open(argv[1], O_RDWR | O_TMPFILE, 0666); if (fd < 0) return 1; ftruncate(fd, FILE_SIZE); if (sendfile(p[1], fd, 0, FILE_SIZE) == -1) { fprintf(stderr, "FAIL\n"); } if (sendfile(p[1], fd, 0, FILE_SIZE) != -1 || errno != EAGAIN) { fprintf(stderr, "FAIL\n"); } return 0; } It worked before b964bf53e540, it is stuck after b964bf53e540, and it works again with this fix. This regression occurred because do_splice_direct() calls pipe_write that handles O_NONBLOCK. Here is a trace log from the reproducer: 1) | __x64_sys_sendfile64() { 1) | do_sendfile() { 1) | __fdget() 1) | rw_verify_area() 1) | __fdget() 1) | rw_verify_area() 1) | do_splice_direct() { 1) | rw_verify_area() 1) | splice_direct_to_actor() { 1) | do_splice_to() { 1) | rw_verify_area() 1) | generic_file_splice_read() 1) + 74.153 us | } 1) | direct_splice_actor() { 1) | iter_file_splice_write() { 1) | __kmalloc() 1) 0.148 us | pipe_lock(); 1) 0.153 us | splice_from_pipe_next.part.0(); 1) 0.162 us | page_cache_pipe_buf_confirm(); ... 16 times 1) 0.159 us | page_cache_pipe_buf_confirm(); 1) | vfs_iter_write() { 1) | do_iter_write() { 1) | rw_verify_area() 1) | do_iter_readv_writev() { 1) | pipe_write() { 1) | mutex_lock() 1) 0.153 us | mutex_unlock(); 1) 1.368 us | } 1) 1.686 us | } 1) 5.798 us | } 1) 6.084 us | } 1) 0.174 us | kfree(); 1) 0.152 us | pipe_unlock(); 1) + 14.461 us | } 1) + 14.783 us | } 1) 0.164 us | page_cache_pipe_buf_release(); ... 16 times 1) 0.161 us | page_cache_pipe_buf_release(); 1) | touch_atime() 1) + 95.854 us | } 1) + 99.784 us | } 1) ! 107.393 us | } 1) ! 107.699 us | } Link: https://lkml.kernel.org/r/20220415005015.525191-1-avagin@gmail.com Fixes: b964bf53e540 ("teach sendfile(2) to handle send-to-pipe directly") Signed-off-by: Andrei Vagin <avagin(a)gmail.com> Cc: Al Viro <viro(a)zeniv.linux.org.uk> Cc: <stable(a)vger.kernel.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- fs/read_write.c | 3 +++ 1 file changed, 3 insertions(+) --- a/fs/read_write.c~fs-sendfile-handles-o_nonblock-of-out_fd +++ a/fs/read_write.c @@ -1247,6 +1247,9 @@ static ssize_t do_sendfile(int out_fd, i count, fl); file_end_write(out.file); } else { + if (out.file->f_flags & O_NONBLOCK) + fl |= SPLICE_F_NONBLOCK; + retval = splice_file_to_pipe(in.file, opipe, &pos, count, fl); } _ Patches currently in -mm which might be from avagin(a)gmail.com are

1 year, 10 months

2
2
0 0

[PATCH] x86/Kconfig: Fix CONFIG_CC_HAS_SANE_STACKPROTECTOR when cross compiling with clang

by Nathan Chancellor

Chimera Linux notes that CONFIG_CC_HAS_SANE_STACKPROTECTOR cannot be enabled when cross compiling an x86_64 kernel with clang, even though it does work when natively compiling. When building on aarch64: $ make -sj"$(nproc)" ARCH=x86_64 LLVM=1 defconfig $ grep STACKPROTECTOR .config When building on x86_64: $ make -sj"$(nproc)" ARCH=x86_64 LLVM=1 defconfig $ grep STACKPROTECTOR .config CONFIG_CC_HAS_SANE_STACKPROTECTOR=y CONFIG_HAVE_STACKPROTECTOR=y CONFIG_STACKPROTECTOR=y CONFIG_STACKPROTECTOR_STRONG=y When clang is invoked without a '--target' flag, code is generated for the default target, which is usually the host (it is configurable via cmake). As a result, the has-stack-protector scripts will generate code for the default target but check for x86 specific segment registers, which cannot succeed if the default target is not x86. $(CLANG_FLAGS) contains an explicit '--target' flag so pass that variable along to the has-stack-protector scripts so that the stack protector can be enabled when cross compiling with clang. The 32-bit stack protector cannot currently be enabled with clang, as it does not support '-mstack-protector-guard-symbol', so this results in no functional change for ARCH=i386 when cross compiling. Link: https://github.com/chimera-linux/cports/commit/0fb7e506d5f83fdf2104feb22cda… Link: https://github.com/llvm/llvm-project/issues/48553 Signed-off-by: Nathan Chancellor <nathan(a)kernel.org> --- Fixes: 2a61f4747eea ("stack-protector: test compiler capability in Kconfig and drop AUTO mode") might be appropriate; I am conflicted on fixes tags for problems that that arise due to use cases that were not considered at the time of a change, as it feels wrong to blame the commit for not looking far enough into the future where it might be common for people to have workstations running another architecture other than x86_64. Chimera appears to use a 5.15 kernel so a Cc: stable(a)vger.kernel.org might be nice but some maintainers are picky about that so I leave it up to you all. arch/x86/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index be0b95e51df6..076adde7ead9 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -391,8 +391,8 @@ config PGTABLE_LEVELS config CC_HAS_SANE_STACKPROTECTOR bool - default $(success,$(srctree)/scripts/gcc-x86_64-has-stack-protector.sh $(CC)) if 64BIT - default $(success,$(srctree)/scripts/gcc-x86_32-has-stack-protector.sh $(CC)) + default $(success,$(srctree)/scripts/gcc-x86_64-has-stack-protector.sh $(CC) $(CLANG_FLAGS)) if 64BIT + default $(success,$(srctree)/scripts/gcc-x86_32-has-stack-protector.sh $(CC) $(CLANG_FLAGS)) help We have to make sure stack protector is unconditionally disabled if the compiler produces broken code or if it does not let us control base-commit: b13baccc3850ca8b8cccbf8ed9912dbaa0fdf7f3 -- 2.36.1

1 year, 10 months

2
3
0 0

[PATCH 5.18 000/181] 5.18.8-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.18.8 release. There are 181 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 Wed, 29 Jun 2022 11:19:09 +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/v5.x/stable-review/patch-5.18.8-rc1… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.18.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 5.18.8-rc1 Jason A. Donenfeld <Jason(a)zx2c4.com> powerpc/pseries: wire up rng during setup_arch() Masahiro Yamada <masahiroy(a)kernel.org> kbuild: link vmlinux only once for CONFIG_TRIM_UNUSED_KSYMS (2nd attempt) Dexuan Cui <decui(a)microsoft.com> dma-direct: use the correct size for dma_set_encrypted() Shyam Prasad N <sprasad(a)microsoft.com> smb3: use netname when available on secondary channels Adrian Hunter <adrian.hunter(a)intel.com> perf build-id: Fix caching files with a wrong build ID Jason A. Donenfeld <Jason(a)zx2c4.com> random: update comment from copy_to_user() -> copy_to_iter() Steve French <stfrench(a)microsoft.com> smb3: fix empty netname context on secondary channels Stefan Wahren <stefan.wahren(a)i2se.com> ARM: dts: bcm2711-rpi-400: Fix GPIO line names Masahiro Yamada <masahiroy(a)kernel.org> modpost: fix section mismatch check for exported init/exit sections Miaoqian Lin <linmq006(a)gmail.com> ARM: cns3xxx: Fix refcount leak in cns3xxx_init Miaoqian Lin <linmq006(a)gmail.com> memory: samsung: exynos5422-dmc: Fix refcount leak in of_get_dram_timings Miaoqian Lin <linmq006(a)gmail.com> memory: mtk-smi: add missing put_device() call in mtk_smi_device_link_common Miaoqian Lin <linmq006(a)gmail.com> ARM: Fix refcount leak in axxia_boot_secondary Miaoqian Lin <linmq006(a)gmail.com> soc: bcm: brcmstb: pm: pm-arm: Fix refcount leak in brcmstb_pm_probe David Virag <virag.david003(a)gmail.com> arm64: dts: exynos: Correct UART clocks on Exynos7885 Miaoqian Lin <linmq006(a)gmail.com> ARM: exynos: Fix refcount leak in exynos_map_pmu Aswath Govindraju <a-govindraju(a)ti.com> arm64: dts: ti: k3-am64-main: Remove support for HS400 speed mode Lucas Stach <l.stach(a)pengutronix.de> ARM: dts: imx6qdl: correct PU regulator ramp delay Alexander Stein <alexander.stein(a)ew.tq-group.com> ARM: dts: imx7: Move hsic_phy power domain to HSIC PHY node Marcelo Tosatti <mtosatti(a)redhat.com> mm: lru_cache_disable: use synchronize_rcu_expedited zhenwei pi <pizhenwei(a)bytedance.com> mm/memory-failure: disable unpoison once hw error happens Jason A. Donenfeld <Jason(a)zx2c4.com> powerpc/powernv: wire up rng during setup_arch Andrew Donnellan <ajd(a)linux.ibm.com> powerpc/rtas: Allow ibm,platform-dump RTAS call with null buffer address Naveen N. Rao <naveen.n.rao(a)linux.vnet.ibm.com> powerpc: Enable execve syscall exit tracepoint Jason A. Donenfeld <Jason(a)zx2c4.com> powerpc/microwatt: wire up rng during setup_arch() Matt Ranostay <mranostay(a)ti.com> arm64: dts: ti: k3-j721s2: Fix overlapping GICD memory region Helge Deller <deller(a)gmx.de> parisc: Enable ARCH_HAS_STRICT_MODULE_RWX John David Anglin <dave.anglin(a)bell.net> parisc: Fix flush_anon_page on PA8800/PA8900 Helge Deller <deller(a)gmx.de> parisc/stifb: Fix fb_is_primary_device() only available with CONFIG_FB_STI Liang He <windhl(a)126.com> xtensa: Fix refcount leak bug in time.c Liang He <windhl(a)126.com> xtensa: xtfpga: Fix refcount leak bug in setup Jialin Zhang <zhangjialin11(a)huawei.com> iio: adc: ti-ads131e08: add missing fwnode_handle_put() in ads131e08_alloc_channels() Miaoqian Lin <linmq006(a)gmail.com> iio: adc: adi-axi-adc: Fix refcount leak in adi_axi_adc_attach_client Jialin Zhang <zhangjialin11(a)huawei.com> iio: adc: rzg2l_adc: add missing fwnode_handle_put() in rzg2l_adc_parse_properties() Hans de Goede <hdegoede(a)redhat.com> iio: adc: axp288: Override TS pin bias current for some models Olivier Moysan <olivier.moysan(a)foss.st.com> iio: adc: stm32: fix vrefint wrong calibration value handling Yannick Brosseau <yannick.brosseau(a)gmail.com> iio: adc: stm32: Fix IRQs on STM32F4 by removing custom spurious IRQs message Yannick Brosseau <yannick.brosseau(a)gmail.com> iio: adc: stm32: Fix ADCs iteration in irq handler Miaoqian Lin <linmq006(a)gmail.com> iio: adc: aspeed: Fix refcount leak in aspeed_adc_set_trim_data Liam Beguin <liambeguin(a)gmail.com> iio: test: fix missing MODULE_LICENSE for IIO_RESCALE=m Linus Walleij <linus.walleij(a)linaro.org> iio: afe: rescale: Fix boolean logic bug Jean-Baptiste Maneyrol <jean-baptiste.maneyrol(a)tdk.com> iio: imu: inv_icm42600: Fix broken icm42600 (chip id 0 value) Olivier Moysan <olivier.moysan(a)foss.st.com> iio: adc: stm32: fix maximum clock rate for stm32mp15x Vincent Whitchurch <vincent.whitchurch(a)axis.com> iio: trigger: sysfs: fix use-after-free on remove Zheyu Ma <zheyuma97(a)gmail.com> iio: gyro: mpu3050: Fix the error handling in mpu3050_power_up() Haibo Chen <haibo.chen(a)nxp.com> iio: accel: mma8452: ignore the return value of reset operation Dmitry Rokosov <DDRokosov(a)sberdevices.ru> iio:accel:mxc4005: rearrange iio trigger get and register Dmitry Rokosov <DDRokosov(a)sberdevices.ru> iio:accel:bma180: rearrange iio trigger get and register Dmitry Rokosov <DDRokosov(a)sberdevices.ru> iio:accel:kxcjk-1013: rearrange iio trigger get and register Dmitry Rokosov <DDRokosov(a)sberdevices.ru> iio:chemical:ccs811: rearrange iio trigger get and register Aashish Sharma <shraash(a)google.com> iio:proximity:sx9324: Check ret value of device_property_read_u32_array() Dmitry Rokosov <DDRokosov(a)sberdevices.ru> iio:humidity:hts221: rearrange iio trigger get and register Jaegeuk Kim <jaegeuk(a)kernel.org> f2fs: do not count ENOENT for error case Daeho Jeong <daehojeong(a)google.com> f2fs: fix iostat related lock protection Jaegeuk Kim <jaegeuk(a)kernel.org> f2fs: attach inline_data after setting compression Josef Bacik <josef(a)toxicpanda.com> btrfs: fix deadlock with fsync+fiemap+transaction commit Zygo Blaxell <ce3g8jdj(a)umail.furryterror.org> btrfs: don't set lock_owner when locking extent buffer for reading Filipe Manana <fdmanana(a)suse.com> btrfs: fix race between reflinking and ordered extent completion Geert Uytterhoeven <geert+renesas(a)glider.be> dt-bindings: usb: ehci: Increase the number of PHYs Geert Uytterhoeven <geert+renesas(a)glider.be> dt-bindings: usb: ohci: Increase the number of PHYs Xu Yang <xu.yang_2(a)nxp.com> usb: chipidea: udc: check request status before setting device address Alan Stern <stern(a)rowland.harvard.edu> USB: gadget: Fix double-free bug in raw_gadget driver Alan Stern <stern(a)rowland.harvard.edu> usb: gadget: Fix non-unique driver names in raw-gadget driver Dan Vacura <w36195(a)motorola.com> usb: gadget: uvc: fix list double add in uvcg_video_pump Utkarsh Patel <utkarsh.h.patel(a)intel.com> xhci-pci: Allow host runtime PM as default for Intel Meteor Lake xHCI Tanveer Alam <tanveer1.alam(a)intel.com> xhci-pci: Allow host runtime PM as default for Intel Raptor Lake xHCI Mathias Nyman <mathias.nyman(a)linux.intel.com> xhci: turn off port power in shutdown Alexander Gordeev <agordeev(a)linux.ibm.com> s390/crash: make copy_oldmem_page() return number of bytes copied Alexander Gordeev <agordeev(a)linux.ibm.com> s390/crash: add missing iterator advance in copy_oldmem_page() Matthew Wilcox (Oracle) <willy(a)infradead.org> vmcore: convert copy_oldmem_page() to take an iov_iter Pavel Begunkov <asml.silence(a)gmail.com> io_uring: fix wrong arm_poll error handling Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> usb: typec: wcove: Drop wrong dependency to INTEL_SOC_PMIC Pavel Begunkov <asml.silence(a)gmail.com> io_uring: fix req->apoll_events Christoph Hellwig <hch(a)lst.de> io_uring: make apoll_events a __poll_t Baruch Siach <baruch(a)tkos.co.il> iio: adc: vf610: fix conversion mode sysfs node name Lv Ruyi <lv.ruyi(a)zte.com.cn> iio: adc: xilinx-ams: fix return error variable Linus Walleij <linus.walleij(a)linaro.org> iio: magnetometer: yas530: Fix memchr_inv() misuse Haibo Chen <haibo.chen(a)nxp.com> iio: mma8452: fix probe fail when device tree compatible is used. Peter Gonda <pgonda(a)google.com> KVM: SEV: Init target VMCBs in sev_migrate_from Alistair Popple <apopple(a)nvidia.com> filemap: Fix serialization adding transparent huge pages to page cache Thomas Richter <tmricht(a)linux.ibm.com> s390/cpumf: Handle events cycles and instructions identical Dan Carpenter <dan.carpenter(a)oracle.com> gpio: winbond: Fix error code in winbond_gpio_get() Christoph Hellwig <hch(a)lst.de> nvme: move the Samsung X5 quirk entry to the core quirks Jakub Kicinski <kuba(a)kernel.org> sock: redo the psock vs ULP protection check Jakub Kicinski <kuba(a)kernel.org> Revert "net/tls: fix tls_sk_proto_close executed repeatedly" Stephan Gerhold <stephan.gerhold(a)kernkonzept.com> virtio_net: fix xdp_rxq_info bug after suspend/resume Kai-Heng Feng <kai.heng.feng(a)canonical.com> igb: Make DMA faster when CPU is active on the PCIe link Christian Marangi <ansuelsmth(a)gmail.com> net: dsa: qca8k: reduce mgmt ethernet timeout Mario Limonciello <mario.limonciello(a)amd.com> drm/amd: Revert "drm/amd/display: keep eDP Vdd on when eDP stream is already enabled" Yoshihiro Shimoda <yoshihiro.shimoda.uh(a)renesas.com> iommu/ipmmu-vmsa: Fix compatible for rcar-gen4 Aidan MacDonald <aidanmacdonald.0x0(a)gmail.com> regmap-irq: Fix offset/index mismatch in read_sub_irq_data() Aidan MacDonald <aidanmacdonald.0x0(a)gmail.com> regmap-irq: Fix a bug in regmap_irq_enable() for type_in_mask chips Pavel Begunkov <asml.silence(a)gmail.com> io_uring: fail links when poll fails Anatolii Gerasymenko <anatolii.gerasymenko(a)intel.com> ice: ethtool: Prohibit improper channel config for DCB Anatolii Gerasymenko <anatolii.gerasymenko(a)intel.com> ice: ethtool: advertise 1000M speeds properly Wojciech Drewek <wojciech.drewek(a)intel.com> ice: Fix switchdev rules book keeping Marcin Szycik <marcin.szycik(a)linux.intel.com> ice: ignore protocol field in GTP offload Jens Axboe <axboe(a)kernel.dk> block: pop cached rq before potentially blocking rq_qos_throttle() David Howells <dhowells(a)redhat.com> afs: Fix dynamic root getattr huhai <huhai(a)kylinos.cn> MIPS: Remove repetitive increase irq_err_count Julien Grall <jgrall(a)amazon.com> x86/xen: Remove undefined behavior in setup_features() Jason Andryuk <jandryuk(a)gmail.com> xen-blkfront: Handle NULL gendisk Florian Westphal <fw(a)strlen.de> netfilter: nf_dup_netdev: add and use recursion counter Florian Westphal <fw(a)strlen.de> netfilter: nf_dup_netdev: do not push mac header a second time Jie2x Zhou <jie2x.zhou(a)intel.com> selftests: netfilter: correct PKTGEN_SCRIPT_PATHS in nft_concat_range.sh Gerd Hoffmann <kraxel(a)redhat.com> udmabuf: add back sanity check Ziyang Xuan <william.xuanziyang(a)huawei.com> net/tls: fix tls_sk_proto_close executed repeatedly Eric Dumazet <edumazet(a)google.com> erspan: do not assume transport header is always set Riccardo Paolo Bestetti <pbl(a)bestov.io> ipv4: fix bind address validity regression tests Leo Yan <leo.yan(a)linaro.org> perf arm-spe: Don't set data source if it's not a memory operation Athira Rajeev <atrajeev(a)linux.vnet.ibm.com> perf test topology: Use !strncmp(right platform) to fix guest PPC comparision check Michael Petlan <mpetlan(a)redhat.com> perf test: Record only user callchains on the "Check Arm64 callgraphs are complete in fp mode" test Oleksij Rempel <linux(a)rempel-privat.de> net: phy: at803x: fix NULL pointer dereference on AR9331 PHY Kuogee Hsieh <quic_khsieh(a)quicinc.com> drm/msm/dp: force link training for display resolution change Kuogee Hsieh <quic_khsieh(a)quicinc.com> drm/msm/dp: check core_initialized before disable interrupts at dp_display_unbind() Miaoqian Lin <linmq006(a)gmail.com> drm/msm/mdp4: Fix refcount leak in mdp4_modeset_init_intf Peilin Ye <peilin.ye(a)bytedance.com> net/sched: sch_netem: Fix arithmetic in netem_dump() for 32-bit platforms Ivan Vecera <ivecera(a)redhat.com> ethtool: Fix get module eeprom fallback Jay Vosburgh <jay.vosburgh(a)canonical.com> bonding: ARP monitor spams NETDEV_NOTIFY_PEERS notifiers Lorenzo Bianconi <lorenzo(a)kernel.org> igb: fix a use-after-free issue in igb_clean_tx_ring Masami Hiramatsu (Google) <mhiramat(a)kernel.org> rethook: Reject getting a rethook if RCU is not watching Christoph Hellwig <hch(a)lst.de> block: disable the elevator int del_gendisk Hoang Le <hoang.h.le(a)dektech.com.au> tipc: fix use-after-free Read in tipc_named_reinit Jay Vosburgh <jay.vosburgh(a)canonical.com> veth: Add updating of trans_start Eric Dumazet <edumazet(a)google.com> net: fix data-race in dev_isalive() Quentin Perret <qperret(a)google.com> KVM: arm64: Prevent kmemleak from accessing pKVM memory Claudiu Manoil <claudiu.manoil(a)nxp.com> phy: aquantia: Fix AN when higher speeds than 1G are not advertised Saurabh Sengar <ssengar(a)linux.microsoft.com> scsi: storvsc: Correct reporting of Hyper-V I/O size limits Yu Liao <liaoyu15(a)huawei.com> selftests dma: fix compile error for dma_map_benchmark Jakub Sitnicki <jakub(a)cloudflare.com> bpf, x86: Fix tail call count offset calculation on bpf2bpf call Samuel Holland <samuel(a)sholland.org> drm/sun4i: Fix crash during suspend after component bind failure Jon Maxwell <jmaxwell37(a)gmail.com> bpf: Fix request_sock leak in sk lookup helpers Jonathan Marek <jonathan(a)marek.ca> drm/msm: use for_each_sgtable_sg to iterate over scatterlist Ciara Loftus <ciara.loftus(a)intel.com> xsk: Fix generic transmit when completion queue reservation fails Sergey Gorenko <sergeygo(a)nvidia.com> scsi: iscsi: Exclude zero from the endpoint ID range Rob Clark <robdclark(a)chromium.org> drm/msm: Switch ordering of runpm put vs devfreq_idle Damien Le Moal <damien.lemoal(a)opensource.wdc.com> scsi: scsi_debug: Fix zone transition to full condition Florian Westphal <fw(a)strlen.de> netfilter: use get_random_u32 instead of prandom Maximilian Luz <luzmaximilian(a)gmail.com> drm/msm: Fix double pm_runtime_disable() call Rob Clark <robdclark(a)chromium.org> drm/msm: Ensure mmap offset is initialized Macpaul Lin <macpaul.lin(a)mediatek.com> USB: serial: option: add Quectel RM500K module support Yonglin Tan <yonglin.tan(a)outlook.com> USB: serial: option: add Quectel EM05-G modem Carlo Lobrano <c.lobrano(a)gmail.com> USB: serial: option: add Telit LE910Cx 0x1250 composition Johan Hovold <johan(a)kernel.org> USB: serial: pl2303: add support for more HXN (G) types George Shen <george.shen(a)amd.com> drm/amd/display: Fix typo in override_lane_settings Joshua Ashton <joshua(a)froggi.es> amd/display/dc: Fix COLOR_ENCODING and COLOR_RANGE doing nothing for DCN20+ Ville Syrjälä <ville.syrjala(a)linux.intel.com> drm/i915: Implement w/a 22010492432 for adl-s Jann Horn <jannh(a)google.com> mm/slub: add missing TID updates on slab deactivation Matthew Wilcox (Oracle) <willy(a)infradead.org> filemap: Handle sibling entries in filemap_get_read_batch() Masami Hiramatsu (Google) <mhiramat(a)kernel.org> tracing/kprobes: Check whether get_kretprobe() returns NULL in kretprobe_dispatcher() Mikulas Patocka <mpatocka(a)redhat.com> dm mirror log: clear log bits up to BITS_PER_LONG boundary Mike Snitzer <snitzer(a)kernel.org> dm: do not return early from dm_io_complete if BLK_STS_AGAIN without polling Nikos Tsironis <ntsironis(a)arrikto.com> dm era: commit metadata in postsuspend after worker stops Edward Wu <edwardwu(a)realtek.com> ata: libata: add qc->flags in ata_qc_complete_template tracepoint Sascha Hauer <s.hauer(a)pengutronix.de> mtd: rawnand: gpmi: Fix setting busy timeout setting Joerg Roedel <jroedel(a)suse.de> MAINTAINERS: Add new IOMMU development mailing list Demi Marie Obenour <demi(a)invisiblethingslab.com> xen/gntdev: Avoid blocking in unmap_grant_pages() Mengqi Zhang <mengqi.zhang(a)mediatek.com> mmc: mediatek: wait dma stop bit reset to 0 Chevron Li <chevron.li(a)bayhubtech.com> mmc: sdhci-pci-o2micro: Fix card detect by dealing with debouncing Tyrel Datwyler <tyreld(a)linux.ibm.com> scsi: ibmvfc: Allocate/free queue resource only during probe/remove Tyrel Datwyler <tyreld(a)linux.ibm.com> scsi: ibmvfc: Store vhost pointer during subcrq allocation David Sterba <dsterba(a)suse.com> btrfs: add error messages to all unrecognized mount options Qu Wenruo <wqu(a)suse.com> btrfs: prevent remounting to v1 space cache for subpage mount Filipe Manana <fdmanana(a)suse.com> btrfs: fix hang during unmount when block group reclaim task is running Dominique Martinet <asmadeus(a)codewreck.org> 9p: fix EBADF errors in cached mode Dominique Martinet <asmadeus(a)codewreck.org> 9p: fix fid refcount leak in v9fs_vfs_get_link Dominique Martinet <asmadeus(a)codewreck.org> 9p: fix fid refcount leak in v9fs_vfs_atomic_open_dotl Tyler Hicks <tyhicks(a)linux.microsoft.com> 9p: Fix refcounting during full path walks for fid lookups Riccardo Paolo Bestetti <pbl(a)bestov.io> ipv4: ping: fix bind address validity check Rosemarie O'Riorden <roriorden(a)redhat.com> net: openvswitch: fix parsing of nw_proto for IPv6 fragments Tim Crawford <tcrawford(a)system76.com> ALSA: hda/realtek: Add quirk for Clevo NS50PU Tim Crawford <tcrawford(a)system76.com> ALSA: hda/realtek: Add quirk for Clevo PD70PNT Takashi Iwai <tiwai(a)suse.de> ALSA: hda/realtek: Apply fixup for Lenovo Yoga Duet 7 properly Kailang Yang <kailang(a)realtek.com> ALSA: hda/realtek - ALC897 headset MIC no sound Soham Sen <contact(a)sohamsen.me> ALSA: hda/realtek: Add mute LED quirk for HP Omen laptop Takashi Iwai <tiwai(a)suse.de> ALSA: hda/conexant: Fix missing beep setup Takashi Iwai <tiwai(a)suse.de> ALSA: hda: Fix discovery of i915 graphics PCI device Takashi Iwai <tiwai(a)suse.de> ALSA: hda/via: Fix missing beep setup Takashi Iwai <tiwai(a)suse.de> ALSA: memalloc: Drop x86-specific hack for WC allocations Jason A. Donenfeld <Jason(a)zx2c4.com> random: quiet urandom warning ratelimit suppression message Jason A. Donenfeld <Jason(a)zx2c4.com> random: schedule mix_interrupt_randomness() less often ------------- Diffstat: Documentation/ABI/testing/sysfs-bus-iio-vf610 | 2 +- .../devicetree/bindings/usb/generic-ehci.yaml | 3 +- .../devicetree/bindings/usb/generic-ohci.yaml | 3 +- Documentation/vm/hwpoison.rst | 3 +- MAINTAINERS | 11 ++ Makefile | 6 +- arch/arm/boot/dts/bcm2711-rpi-400.dts | 6 +- arch/arm/boot/dts/imx6qdl.dtsi | 2 +- arch/arm/boot/dts/imx7s.dtsi | 2 +- arch/arm/kernel/crash_dump.c | 27 +--- arch/arm/mach-axxia/platsmp.c | 1 + arch/arm/mach-cns3xxx/core.c | 2 + arch/arm/mach-exynos/exynos.c | 1 + arch/arm64/boot/dts/exynos/exynos7885.dtsi | 12 +- arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 2 - arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi | 2 +- arch/arm64/kernel/crash_dump.c | 29 +--- arch/arm64/kvm/arm.c | 6 +- arch/ia64/kernel/crash_dump.c | 32 +---- arch/mips/kernel/crash_dump.c | 27 +--- arch/mips/vr41xx/common/icu.c | 2 - arch/parisc/Kconfig | 1 + arch/parisc/include/asm/fb.h | 2 +- arch/parisc/kernel/cache.c | 5 +- arch/powerpc/kernel/crash_dump.c | 35 +---- arch/powerpc/kernel/process.c | 2 +- arch/powerpc/kernel/rtas.c | 11 +- arch/powerpc/platforms/microwatt/microwatt.h | 7 + arch/powerpc/platforms/microwatt/rng.c | 10 +- arch/powerpc/platforms/microwatt/setup.c | 8 ++ arch/powerpc/platforms/powernv/powernv.h | 2 + arch/powerpc/platforms/powernv/rng.c | 52 ++++--- arch/powerpc/platforms/powernv/setup.c | 2 + arch/powerpc/platforms/pseries/pseries.h | 2 + arch/powerpc/platforms/pseries/rng.c | 11 +- arch/powerpc/platforms/pseries/setup.c | 2 + arch/riscv/kernel/crash_dump.c | 26 +--- arch/s390/kernel/crash_dump.c | 23 ++- arch/s390/kernel/perf_cpum_cf.c | 22 ++- arch/sh/kernel/crash_dump.c | 29 +--- arch/x86/kernel/crash_dump_32.c | 29 +--- arch/x86/kernel/crash_dump_64.c | 41 ++---- arch/x86/kvm/svm/sev.c | 68 ++++++--- arch/x86/kvm/svm/svm.c | 11 +- arch/x86/kvm/svm/svm.h | 2 +- arch/x86/net/bpf_jit_comp.c | 3 +- arch/xtensa/kernel/time.c | 1 + arch/xtensa/platforms/xtfpga/setup.c | 1 + block/blk-core.c | 13 -- block/blk-mq.c | 11 +- block/genhd.c | 39 ++--- drivers/base/memory.c | 2 +- drivers/base/regmap/regmap-irq.c | 8 +- drivers/block/xen-blkfront.c | 19 ++- drivers/char/random.c | 6 +- drivers/dma-buf/udmabuf.c | 5 +- drivers/gpio/gpio-vr41xx.c | 2 - drivers/gpio/gpio-winbond.c | 7 +- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 2 +- .../amd/display/dc/dce110/dce110_hw_sequencer.c | 24 +--- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.c | 3 + drivers/gpu/drm/amd/display/dc/dcn201/dcn201_dpp.c | 3 + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c | 3 + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 4 +- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 3 +- drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 2 + drivers/gpu/drm/msm/dp/dp_ctrl.c | 33 +++-- drivers/gpu/drm/msm/dp/dp_ctrl.h | 2 +- drivers/gpu/drm/msm/dp/dp_display.c | 16 +-- drivers/gpu/drm/msm/msm_drv.c | 2 +- drivers/gpu/drm/msm/msm_drv.h | 1 + drivers/gpu/drm/msm/msm_gem_prime.c | 15 ++ drivers/gpu/drm/msm/msm_gpu.c | 3 +- drivers/gpu/drm/msm/msm_iommu.c | 2 +- drivers/gpu/drm/sun4i/sun4i_drv.c | 4 +- drivers/iio/accel/bma180.c | 3 +- drivers/iio/accel/kxcjk-1013.c | 4 +- drivers/iio/accel/mma8452.c | 22 +-- drivers/iio/accel/mxc4005.c | 4 +- drivers/iio/adc/adi-axi-adc.c | 3 + drivers/iio/adc/aspeed_adc.c | 1 + drivers/iio/adc/axp288_adc.c | 8 ++ drivers/iio/adc/rzg2l_adc.c | 8 +- drivers/iio/adc/stm32-adc-core.c | 9 +- drivers/iio/adc/stm32-adc.c | 37 +++-- drivers/iio/adc/ti-ads131e08.c | 10 +- drivers/iio/adc/xilinx-ams.c | 2 +- drivers/iio/afe/iio-rescale.c | 2 +- drivers/iio/chemical/ccs811.c | 4 +- drivers/iio/gyro/mpu3050-core.c | 1 + drivers/iio/humidity/hts221_buffer.c | 5 +- drivers/iio/imu/inv_icm42600/inv_icm42600.h | 1 + drivers/iio/imu/inv_icm42600/inv_icm42600_core.c | 2 +- drivers/iio/magnetometer/yamaha-yas530.c | 2 +- drivers/iio/proximity/sx9324.c | 3 + drivers/iio/test/Kconfig | 2 +- drivers/iio/test/Makefile | 2 +- drivers/iio/trigger/iio-trig-sysfs.c | 1 + drivers/iommu/ipmmu-vmsa.c | 2 +- drivers/md/dm-era-target.c | 8 +- drivers/md/dm-log.c | 2 +- drivers/md/dm.c | 4 +- drivers/memory/mtk-smi.c | 5 +- drivers/memory/samsung/exynos5422-dmc.c | 29 ++-- drivers/mmc/host/mtk-sd.c | 20 +-- drivers/mmc/host/sdhci-pci-o2micro.c | 2 + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 2 +- drivers/net/bonding/bond_main.c | 4 +- drivers/net/dsa/qca8k.h | 2 +- drivers/net/ethernet/intel/ice/ice_ethtool.c | 49 ++++++- drivers/net/ethernet/intel/ice/ice_lib.c | 42 +++++- drivers/net/ethernet/intel/ice/ice_tc_lib.c | 5 +- drivers/net/ethernet/intel/igb/igb_main.c | 19 +-- drivers/net/phy/aquantia_main.c | 15 +- drivers/net/phy/at803x.c | 6 + drivers/net/veth.c | 4 + drivers/net/virtio_net.c | 25 +--- drivers/nvme/host/core.c | 14 ++ drivers/nvme/host/pci.c | 4 - drivers/scsi/ibmvscsi/ibmvfc.c | 82 ++++++++--- drivers/scsi/ibmvscsi/ibmvfc.h | 2 +- drivers/scsi/scsi_debug.c | 22 ++- drivers/scsi/scsi_transport_iscsi.c | 7 +- drivers/scsi/storvsc_drv.c | 27 +++- drivers/soc/bcm/brcmstb/pm/pm-arm.c | 1 + drivers/usb/chipidea/udc.c | 3 + drivers/usb/gadget/function/uvc_video.c | 3 + drivers/usb/gadget/legacy/raw_gadget.c | 63 ++++++--- drivers/usb/host/xhci-hub.c | 2 +- drivers/usb/host/xhci-pci.c | 6 +- drivers/usb/host/xhci.c | 15 +- drivers/usb/host/xhci.h | 2 + drivers/usb/serial/option.c | 6 + drivers/usb/serial/pl2303.c | 29 ++-- drivers/usb/typec/tcpm/Kconfig | 1 - drivers/video/console/sticore.c | 2 + drivers/xen/features.c | 2 +- drivers/xen/gntdev-common.h | 7 + drivers/xen/gntdev.c | 157 ++++++++++++++------- fs/9p/fid.c | 22 ++- fs/9p/vfs_addr.c | 13 ++ fs/9p/vfs_inode.c | 8 +- fs/9p/vfs_inode_dotl.c | 3 + fs/afs/inode.c | 3 +- fs/btrfs/disk-io.c | 13 +- fs/btrfs/file.c | 67 +++++++-- fs/btrfs/locking.c | 3 - fs/btrfs/reflink.c | 15 +- fs/btrfs/super.c | 47 +++++- fs/cifs/smb2pdu.c | 21 ++- fs/f2fs/iostat.c | 31 ++-- fs/f2fs/namei.c | 17 ++- fs/f2fs/node.c | 4 +- fs/io_uring.c | 20 ++- fs/proc/vmcore.c | 54 ++++--- include/linux/crash_dump.h | 9 +- include/linux/mm.h | 1 + include/linux/ratelimit_types.h | 12 +- include/net/inet_sock.h | 5 + include/trace/events/libata.h | 1 + kernel/dma/direct.c | 5 +- kernel/trace/rethook.c | 9 ++ kernel/trace/trace_kprobe.c | 11 +- mm/filemap.c | 2 + mm/hwpoison-inject.c | 2 +- mm/madvise.c | 2 +- mm/memory-failure.c | 12 ++ mm/readahead.c | 2 + mm/slub.c | 2 + mm/swap.c | 2 +- net/core/dev.c | 25 ++-- net/core/filter.c | 34 ++++- net/core/net-sysfs.c | 1 + net/core/skmsg.c | 5 + net/ethtool/eeprom.c | 2 +- net/ipv4/ip_gre.c | 15 +- net/ipv4/ping.c | 10 +- net/ipv4/tcp_bpf.c | 3 - net/ipv6/ip6_gre.c | 15 +- net/netfilter/nf_dup_netdev.c | 25 +++- net/netfilter/nft_meta.c | 13 +- net/netfilter/nft_numgen.c | 12 +- net/openvswitch/flow.c | 2 +- net/sched/sch_netem.c | 4 +- net/tipc/core.c | 3 +- net/tls/tls_main.c | 2 + net/xdp/xsk.c | 16 ++- scripts/mod/modpost.c | 2 +- sound/core/memalloc.c | 23 +-- sound/hda/hdac_i915.c | 15 +- sound/pci/hda/hda_auto_parser.c | 7 +- sound/pci/hda/hda_local.h | 1 + sound/pci/hda/patch_conexant.c | 4 +- sound/pci/hda/patch_realtek.c | 36 ++++- sound/pci/hda/patch_via.c | 4 +- tools/perf/tests/shell/test_arm_callgraph_fp.sh | 2 +- tools/perf/tests/topology.c | 2 +- tools/perf/util/arm-spe.c | 22 ++- tools/perf/util/build-id.c | 28 ++++ tools/testing/selftests/dma/Makefile | 1 + tools/testing/selftests/dma/dma_map_benchmark.c | 2 +- tools/testing/selftests/net/fcnal-test.sh | 61 +++++++- .../selftests/netfilter/nft_concat_range.sh | 2 +- 203 files changed, 1558 insertions(+), 920 deletions(-)

1 year, 10 months

17
203
0 0

[PATCH net v1] net: dsa: lantiq_gswip: Fix FDB add/remove on the CPU port

by Martin Blumenstingl

There's no bridge available when adding or removing a static FDB entry for (towards) the CPU port. This is intentional because the CPU port is always considered standalone, even if technically for the GSWIP driver it's part of every bridge. Handling FDB add/remove on the CPU port fixes the following message during boot in OpenWrt: port 4 failed to add <LAN MAC address> vid 1 to fdb: -22 as well as the following message during system shutdown: port 4 failed to delete <LAN MAC address> vid 1 from fdb: -22 Use FID 0 (which is also the "default" FID) when adding/removing an FDB entry for the CPU port. Testing with a BT Home Hub 5A shows that this "default" FID works as expected: - traffic from/to LAN (ports in a bridge) is not seen on the WAN port (standalone port) - traffic from/to the WAN port (standalone port) is not seen on the LAN (ports in a bridge) ports - traffic from/to LAN is not seen on another LAN port with a different VLAN - traffic from/to one LAN port to another is still seen Fixes: 58c59ef9e930c4 ("net: dsa: lantiq: Add Forwarding Database access") Cc: stable(a)vger.kernel.org Signed-off-by: Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> --- This patch is "minimalistic" on purpose: the goal is to have it backported to Linux 5.15. Linux 5.15 doesn't have dsa_fdb_present_in_other_db() or struct dsa_db yet. Once this patch has been accepted I will work on implementing FDB isolation for the Lantiq GSWIP driver. Hauke, I hope I considered all test-cases which you find relevant. If not then please let me know. drivers/net/dsa/lantiq_gswip.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/drivers/net/dsa/lantiq_gswip.c b/drivers/net/dsa/lantiq_gswip.c index e531b93f3cb2..9dab28903af0 100644 --- a/drivers/net/dsa/lantiq_gswip.c +++ b/drivers/net/dsa/lantiq_gswip.c @@ -1365,19 +1365,26 @@ static int gswip_port_fdb(struct dsa_switch *ds, int port, int i; int err; - if (!bridge) - return -EINVAL; - - for (i = max_ports; i < ARRAY_SIZE(priv->vlans); i++) { - if (priv->vlans[i].bridge == bridge) { - fid = priv->vlans[i].fid; - break; + if (bridge) { + for (i = max_ports; i < ARRAY_SIZE(priv->vlans); i++) { + if (priv->vlans[i].bridge == bridge) { + fid = priv->vlans[i].fid; + break; + } } - } - if (fid == -1) { - dev_err(priv->dev, "Port not part of a bridge\n"); - return -EINVAL; + if (fid == -1) { + dev_err(priv->dev, "Port not part of a bridge\n"); + return -EINVAL; + } + } else if (dsa_is_cpu_port(ds, port)) { + /* Use FID 0 which is the "default" and used as fallback. This + * is not used by any standalone port or a bridge, so we can + * safely use it for the CPU port. + */ + fid = 0; + } else { + return -EOPNOTSUPP; } mac_bridge.table = GSWIP_TABLE_MAC_BRIDGE; -- 2.37.0

1 year, 10 months

2
5
0 0

[PATCH v4] dmaengine: mxs: fix driver registering

by Dario Binacchi

Driver registration fails on SOC imx8mn as its supplier, the clock control module, is not ready. Since platform_driver_probe(), as reported by its description, is incompatible with deferred probing, we have to use platform_driver_register(). The addition of the `_probe' suffix to the `mxs_dma_driver' variable was suggested by the following modpost warning: WARNING: modpost: vmlinux.o(.data+0xa3900): Section mismatch in reference from the variable mxs_dma_driver to the function .init.text:mxs_dma_probe() The variable mxs_dma_driver references the function __init mxs_dma_probe() If the reference is valid then annotate the variable with __init* or __refdata (see linux/init.h) or name the variable: *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console Fixes: a580b8c5429a ("dmaengine: mxs-dma: add dma support for i.MX23/28") Co-developed-by: Michael Trimarchi <michael(a)amarulasolutions.com> Signed-off-by: Michael Trimarchi <michael(a)amarulasolutions.com> Signed-off-by: Dario Binacchi <dario.binacchi(a)amarulasolutions.com> Cc: stable(a)vger.kernel.org --- Changes in v4: - Restore __init in front of mxs_dma_probe() definition. - Rename the mxs_dma_driver variable to mxs_dma_driver_probe. - Update the commit message. - Use builtin_platform_driver() instead of module_platform_driver(). Changes in v3: - Restore __init in front of mxs_dma_init() definition. Changes in v2: - Add the tag "Cc: stable(a)vger.kernel.org" in the sign-off area. drivers/dma/mxs-dma.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c index 994fc4d2aca4..4c878bf1e092 100644 --- a/drivers/dma/mxs-dma.c +++ b/drivers/dma/mxs-dma.c @@ -834,15 +834,11 @@ static int __init mxs_dma_probe(struct platform_device *pdev) return 0; } -static struct platform_driver mxs_dma_driver = { +static struct platform_driver mxs_dma_driver_probe = { .driver = { .name = "mxs-dma", .of_match_table = mxs_dma_dt_ids, }, + .probe = mxs_dma_probe, }; - -static int __init mxs_dma_module_init(void) -{ - return platform_driver_probe(&mxs_dma_driver, mxs_dma_probe); -} -subsys_initcall(mxs_dma_module_init); +builtin_platform_driver(mxs_dma_driver_probe); -- 2.32.0

1 year, 10 months

2
1
0 0

[PATCH v5] ACPI: skip IRQ1 override on 3 Ryzen 6000 laptops

by Chuanhong Guo

The IRQ1 of these laptops with Ryzen 6000 and Insyde UEFI are active low and defined in legacy format in ACPI DSDT. The kernel override makes the keyboard interrupt polarity inverted, resulting in non-functional keyboard. Skip legacy IRQ override for: Lenovo ThinkBook 14G4+ ARA Redmi Book Pro 15 2022 Ryzen Asus Zenbook S 13 OLED UM5302 Cc: <stable(a)vger.kernel.org> Signed-off-by: Tighe Donnelly <tighe.donnelly(a)protonmail.com> Signed-off-by: Kent Hou Man <knthmn0(a)gmail.com> Signed-off-by: Chuanhong Guo <gch981213(a)gmail.com> --- Changes since v1: Match DMI_PRODUCT_NAME for ThinkBook because the board name is used for other completely different Lenovo laptops. Add a patch for RedmiBook Changes since v2: Fix alphabetical order in skip_override_table Add a patch for Asus Zenbook Changes since v3: Merge patches as requested Fix another alphabetical ordering between two structs Changes since v4: rename the ident in RedmiBook entry. There's also an Intel version of this series, so rename it to make it specific. reword commit title drivers/acpi/resource.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c index c2d494784425..0491da180fc5 100644 --- a/drivers/acpi/resource.c +++ b/drivers/acpi/resource.c @@ -381,6 +381,31 @@ unsigned int acpi_dev_get_irq_type(int triggering, int polarity) } EXPORT_SYMBOL_GPL(acpi_dev_get_irq_type); +static const struct dmi_system_id irq1_edge_low_shared[] = { + { + .ident = "Asus Zenbook S 13 OLED UM5302", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), + DMI_MATCH(DMI_BOARD_NAME, "UM5302TA"), + }, + }, + { + .ident = "Lenovo ThinkBook 14 G4+ ARA", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_NAME, "21D0"), + }, + }, + { + .ident = "Redmi Book Pro 15 2022 Ryzen", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "TIMI"), + DMI_MATCH(DMI_BOARD_NAME, "TM2113"), + }, + }, + { } +}; + static const struct dmi_system_id medion_laptop[] = { { .ident = "MEDION P15651", @@ -408,6 +433,7 @@ struct irq_override_cmp { }; static const struct irq_override_cmp skip_override_table[] = { + { irq1_edge_low_shared, 1, ACPI_EDGE_SENSITIVE, ACPI_ACTIVE_LOW, 1 }, { medion_laptop, 1, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW, 0 }, }; -- 2.36.1

1 year, 10 months

4
5
0 0

[PATCH] iio: adc: ti-adc128s052: Fix number of channels when device tree is used

by Nishanth Menon

When device_match_data is called - with device tree, of_match list is looked up to find the data, which by default is 0. So, no matter which kind of device compatible we use, we match with config 0 which implies we enable 8 channels even on devices that do not have 8 channels. Solve it by providing the match data similar to what we do with the ACPI lookup information. Fixes: 9e611c9e5a20 ("iio: adc128s052: Add OF match table") Cc: <stable(a)vger.kernel.org> # 5.0+ Signed-off-by: Nishanth Menon <nm(a)ti.com> --- Side note: commits 9e611c9e5a20c ("iio: adc128s052: Add OF match table"), 37cd3c8768edc ("iio: adc128s052: Add pin-compatible IDs"), b41fa86b67bd3 ("iio:adc128s052: add support for adc124s021") introduce code that is fixed by this patch, but it makes no real sense to go and split this patch to apply to versions older than 5.0 - which seems to be the earliest the patch would apply. I picked the "Add OF match table" as the patch that set the precedence which follow on patches followed. drivers/iio/adc/ti-adc128s052.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/iio/adc/ti-adc128s052.c b/drivers/iio/adc/ti-adc128s052.c index 622fd384983c..21a7764cbb93 100644 --- a/drivers/iio/adc/ti-adc128s052.c +++ b/drivers/iio/adc/ti-adc128s052.c @@ -181,13 +181,13 @@ static int adc128_probe(struct spi_device *spi) } static const struct of_device_id adc128_of_match[] = { - { .compatible = "ti,adc128s052", }, - { .compatible = "ti,adc122s021", }, - { .compatible = "ti,adc122s051", }, - { .compatible = "ti,adc122s101", }, - { .compatible = "ti,adc124s021", }, - { .compatible = "ti,adc124s051", }, - { .compatible = "ti,adc124s101", }, + { .compatible = "ti,adc128s052", .data = 0}, + { .compatible = "ti,adc122s021", .data = 1}, + { .compatible = "ti,adc122s051", .data = 1}, + { .compatible = "ti,adc122s101", .data = 1}, + { .compatible = "ti,adc124s021", .data = 2}, + { .compatible = "ti,adc124s051", .data = 2}, + { .compatible = "ti,adc124s101", .data = 2}, { /* sentinel */ }, }; MODULE_DEVICE_TABLE(of, adc128_of_match); -- 2.31.1

1 year, 10 months

4
7
0 0

Reg: rseq selftests failed on 5.4.199

by RAJESH DASARI

Hi , We are running rseq selftests on 5.4.199 kernel with glibc 2.34 version and we see that tests are failing to compile with invalid argument errors. When we took all the commits from https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/log/tool… related to rseq locally , test cases have passed. I see that there are some adaptations to the latest glibc version done in those commits, is there any plan to backport them to 5.4.x versions. Could you please provide your inputs. Regards, Rajesh.

1 year, 10 months

4
5
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror June 2022