April 2021 - Linux-stable-mirror

by Greg Kroah-Hartman

I'm announcing the release of the 4.19.186 kernel. All users of the 4.19 kernel series must upgrade. The updated 4.19.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.19.y and can be browsed at the normal kernel.org git web browser: https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Makefile | 2 +- arch/arm/boot/dts/am33xx.dtsi | 3 +++ arch/ia64/kernel/err_inject.c | 22 +++++++++++----------- arch/ia64/kernel/mca.c | 2 +- arch/x86/Makefile | 2 +- arch/x86/net/bpf_jit_comp.c | 11 ++++++++++- arch/x86/net/bpf_jit_comp32.c | 11 ++++++++++- drivers/bus/ti-sysc.c | 4 +++- drivers/gpu/drm/msm/msm_fence.c | 2 +- drivers/isdn/hardware/mISDN/mISDNipac.c | 2 +- drivers/net/ethernet/marvell/pxa168_eth.c | 2 +- drivers/platform/x86/intel-hid.c | 7 +++++++ drivers/platform/x86/thinkpad_acpi.c | 8 +++++++- drivers/target/target_core_pscsi.c | 8 ++++++++ fs/cifs/file.c | 1 + fs/cifs/smb2misc.c | 4 ++-- init/Kconfig | 3 +-- net/mac80211/main.c | 13 ++++++++++++- 18 files changed, 81 insertions(+), 26 deletions(-) Alban Bedel (1): platform/x86: intel-hid: Support Lenovo ThinkPad X1 Tablet Gen 2 Arnd Bergmann (1): x86/build: Turn off -fcf-protection for realmode targets Esteve Varela Colominas (1): platform/x86: thinkpad_acpi: Allow the FnLock LED to change state Greg Kroah-Hartman (1): Linux 4.19.186 Heiko Carstens (1): init/Kconfig: make COMPILE_TEST depend on !S390 Karthikeyan Kathirvel (1): mac80211: choose first enabled channel for monitor Mans Rullgard (1): ARM: dts: am33xx: add aliases for mmc interfaces Martin Wilck (1): scsi: target: pscsi: Clean up after failure in pscsi_map_sg() Masahiro Yamada (1): init/Kconfig: make COMPILE_TEST depend on HAS_IOMEM Pavel Andrianov (1): net: pxa168_eth: Fix a potential data race in pxa168_eth_remove Piotr Krysiuk (2): bpf, x86: Validate computation of branch displacements for x86-64 bpf, x86: Validate computation of branch displacements for x86-32 Rob Clark (1): drm/msm: Ratelimit invalid-fence message Ronnie Sahlberg (1): cifs: revalidate mapping when we open files for SMB1 POSIX Sergei Trofimovich (2): ia64: mca: allocate early mca with GFP_ATOMIC ia64: fix format strings for err_inject Tong Zhang (1): mISDN: fix crash in fritzpci Tony Lindgren (1): bus: ti-sysc: Fix warning on unbind if reset is not deasserted Vincent Whitchurch (1): cifs: Silently ignore unknown oplock break handle

3 years, 8 months

1
1
0 0

Linux 4.14.230

by Greg Kroah-Hartman

I'm announcing the release of the 4.14.230 kernel. All users of the 4.14 kernel series must upgrade. The updated 4.14.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.14.y and can be browsed at the normal kernel.org git web browser: https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Makefile | 2 +- arch/arm/boot/dts/am33xx.dtsi | 3 +++ arch/ia64/kernel/mca.c | 2 +- arch/x86/Makefile | 2 +- arch/x86/net/bpf_jit_comp.c | 11 ++++++++++- drivers/gpu/drm/msm/msm_fence.c | 2 +- drivers/isdn/hardware/mISDN/mISDNipac.c | 2 +- drivers/net/can/flexcan.c | 8 +++++++- drivers/net/ethernet/marvell/pxa168_eth.c | 2 +- drivers/platform/x86/thinkpad_acpi.c | 8 +++++++- drivers/target/target_core_pscsi.c | 8 ++++++++ fs/cifs/file.c | 1 + fs/cifs/smb2misc.c | 4 ++-- init/Kconfig | 3 +-- net/mac80211/main.c | 13 ++++++++++++- 15 files changed, 57 insertions(+), 14 deletions(-) Angelo Dureghello (1): can: flexcan: flexcan_chip_freeze(): fix chip freeze for missing bitrate Arnd Bergmann (1): x86/build: Turn off -fcf-protection for realmode targets Esteve Varela Colominas (1): platform/x86: thinkpad_acpi: Allow the FnLock LED to change state Greg Kroah-Hartman (1): Linux 4.14.230 Heiko Carstens (1): init/Kconfig: make COMPILE_TEST depend on !S390 Karthikeyan Kathirvel (1): mac80211: choose first enabled channel for monitor Mans Rullgard (1): ARM: dts: am33xx: add aliases for mmc interfaces Martin Wilck (1): scsi: target: pscsi: Clean up after failure in pscsi_map_sg() Masahiro Yamada (1): init/Kconfig: make COMPILE_TEST depend on HAS_IOMEM Pavel Andrianov (1): net: pxa168_eth: Fix a potential data race in pxa168_eth_remove Piotr Krysiuk (1): bpf, x86: Validate computation of branch displacements for x86-64 Rob Clark (1): drm/msm: Ratelimit invalid-fence message Ronnie Sahlberg (1): cifs: revalidate mapping when we open files for SMB1 POSIX Sergei Trofimovich (1): ia64: mca: allocate early mca with GFP_ATOMIC Tong Zhang (1): mISDN: fix crash in fritzpci Vincent Whitchurch (1): cifs: Silently ignore unknown oplock break handle

3 years, 8 months

1
1
0 0

[PATCH 4.19 00/18] 4.19.186-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.19.186 release. There are 18 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 Sun, 11 Apr 2021 09:52:52 +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.19.186-r… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.19.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.19.186-rc1 Masahiro Yamada <masahiroy(a)kernel.org> init/Kconfig: make COMPILE_TEST depend on HAS_IOMEM Heiko Carstens <hca(a)linux.ibm.com> init/Kconfig: make COMPILE_TEST depend on !S390 Piotr Krysiuk <piotras(a)gmail.com> bpf, x86: Validate computation of branch displacements for x86-32 Piotr Krysiuk <piotras(a)gmail.com> bpf, x86: Validate computation of branch displacements for x86-64 Vincent Whitchurch <vincent.whitchurch(a)axis.com> cifs: Silently ignore unknown oplock break handle Ronnie Sahlberg <lsahlber(a)redhat.com> cifs: revalidate mapping when we open files for SMB1 POSIX Sergei Trofimovich <slyfox(a)gentoo.org> ia64: fix format strings for err_inject Sergei Trofimovich <slyfox(a)gentoo.org> ia64: mca: allocate early mca with GFP_ATOMIC Martin Wilck <mwilck(a)suse.com> scsi: target: pscsi: Clean up after failure in pscsi_map_sg() Arnd Bergmann <arnd(a)arndb.de> x86/build: Turn off -fcf-protection for realmode targets Esteve Varela Colominas <esteve.varela(a)gmail.com> platform/x86: thinkpad_acpi: Allow the FnLock LED to change state Rob Clark <robdclark(a)chromium.org> drm/msm: Ratelimit invalid-fence message Karthikeyan Kathirvel <kathirve(a)codeaurora.org> mac80211: choose first enabled channel for monitor Tong Zhang <ztong0001(a)gmail.com> mISDN: fix crash in fritzpci Pavel Andrianov <andrianov(a)ispras.ru> net: pxa168_eth: Fix a potential data race in pxa168_eth_remove Alban Bedel <albeu(a)free.fr> platform/x86: intel-hid: Support Lenovo ThinkPad X1 Tablet Gen 2 Tony Lindgren <tony(a)atomide.com> bus: ti-sysc: Fix warning on unbind if reset is not deasserted Mans Rullgard <mans(a)mansr.com> ARM: dts: am33xx: add aliases for mmc interfaces ------------- Diffstat: Makefile | 4 ++-- arch/arm/boot/dts/am33xx.dtsi | 3 +++ arch/ia64/kernel/err_inject.c | 22 +++++++++++----------- arch/ia64/kernel/mca.c | 2 +- arch/x86/Makefile | 2 +- arch/x86/net/bpf_jit_comp.c | 11 ++++++++++- arch/x86/net/bpf_jit_comp32.c | 11 ++++++++++- drivers/bus/ti-sysc.c | 4 +++- drivers/gpu/drm/msm/msm_fence.c | 2 +- drivers/isdn/hardware/mISDN/mISDNipac.c | 2 +- drivers/net/ethernet/marvell/pxa168_eth.c | 2 +- drivers/platform/x86/intel-hid.c | 7 +++++++ drivers/platform/x86/thinkpad_acpi.c | 8 +++++++- drivers/target/target_core_pscsi.c | 8 ++++++++ fs/cifs/file.c | 1 + fs/cifs/smb2misc.c | 4 ++-- init/Kconfig | 3 +-- net/mac80211/main.c | 13 ++++++++++++- 18 files changed, 82 insertions(+), 27 deletions(-)

3 years, 8 months

4
22
0 0

Linux 4.9.266

by Greg Kroah-Hartman

I'm announcing the release of the 4.9.266 kernel. All users of the 4.9 kernel series must upgrade. The updated 4.9.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.9.y and can be browsed at the normal kernel.org git web browser: https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Makefile | 2 +- arch/ia64/kernel/mca.c | 2 +- arch/x86/Makefile | 2 +- arch/x86/net/bpf_jit_comp.c | 11 ++++++++++- drivers/gpu/drm/msm/msm_fence.c | 2 +- drivers/isdn/hardware/mISDN/mISDNipac.c | 2 +- drivers/net/can/flexcan.c | 8 +++++++- drivers/net/ethernet/marvell/pxa168_eth.c | 2 +- drivers/target/target_core_pscsi.c | 8 ++++++++ fs/cifs/file.c | 1 + fs/cifs/smb2misc.c | 4 ++-- init/Kconfig | 3 +-- net/mac80211/main.c | 13 ++++++++++++- sound/pci/hda/patch_realtek.c | 1 - 14 files changed, 47 insertions(+), 14 deletions(-) Angelo Dureghello (1): can: flexcan: flexcan_chip_freeze(): fix chip freeze for missing bitrate Arnd Bergmann (1): x86/build: Turn off -fcf-protection for realmode targets Greg Kroah-Hartman (1): Linux 4.9.266 Heiko Carstens (1): init/Kconfig: make COMPILE_TEST depend on !S390 Karthikeyan Kathirvel (1): mac80211: choose first enabled channel for monitor Martin Wilck (1): scsi: target: pscsi: Clean up after failure in pscsi_map_sg() Masahiro Yamada (1): init/Kconfig: make COMPILE_TEST depend on HAS_IOMEM Pavel Andrianov (1): net: pxa168_eth: Fix a potential data race in pxa168_eth_remove Piotr Krysiuk (1): bpf, x86: Validate computation of branch displacements for x86-64 Rob Clark (1): drm/msm: Ratelimit invalid-fence message Ronnie Sahlberg (1): cifs: revalidate mapping when we open files for SMB1 POSIX Sergei Trofimovich (1): ia64: mca: allocate early mca with GFP_ATOMIC Shih-Yuan Lee (FourDollars) (1): ALSA: hda/realtek - Fix pincfg for Dell XPS 13 9370 Tong Zhang (1): mISDN: fix crash in fritzpci Vincent Whitchurch (1): cifs: Silently ignore unknown oplock break handle

3 years, 8 months

1
1
0 0

Linux 4.4.266

by Greg Kroah-Hartman

I'm announcing the release of the 4.4.266 kernel. All users of the 4.4 kernel series must upgrade. The updated 4.4.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.4.y and can be browsed at the normal kernel.org git web browser: https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Makefile | 2 +- arch/ia64/kernel/mca.c | 2 +- arch/x86/Makefile | 2 +- arch/x86/net/bpf_jit_comp.c | 11 ++++++++++- drivers/isdn/hardware/mISDN/mISDNipac.c | 2 +- drivers/mtd/nand/diskonchip.c | 7 ++----- drivers/mtd/nand/orion_nand.c | 2 +- drivers/mtd/nand/pasemi_nand.c | 4 +++- drivers/mtd/nand/plat_nand.c | 2 +- drivers/mtd/nand/sharpsl.c | 2 +- drivers/mtd/nand/socrates_nand.c | 2 +- drivers/mtd/nand/tmio_nand.c | 2 +- drivers/net/can/flexcan.c | 8 +++++++- drivers/net/ethernet/marvell/pxa168_eth.c | 2 +- fs/cifs/file.c | 1 + fs/cifs/smb2misc.c | 4 ++-- init/Kconfig | 2 +- kernel/trace/trace.c | 14 ++++++++++++++ net/mac80211/main.c | 13 ++++++++++++- sound/pci/hda/patch_realtek.c | 1 - 20 files changed, 62 insertions(+), 23 deletions(-) Angelo Dureghello (1): can: flexcan: flexcan_chip_freeze(): fix chip freeze for missing bitrate Arnd Bergmann (1): x86/build: Turn off -fcf-protection for realmode targets Greg Kroah-Hartman (1): Linux 4.4.266 Heiko Carstens (1): init/Kconfig: make COMPILE_TEST depend on !S390 Karthikeyan Kathirvel (1): mac80211: choose first enabled channel for monitor Masahiro Yamada (1): init/Kconfig: make COMPILE_TEST depend on HAS_IOMEM Miquel Raynal (7): mtd: rawnand: tmio: Fix the probe error path mtd: rawnand: socrates: Fix the probe error path mtd: rawnand: sharpsl: Fix the probe error path mtd: rawnand: plat_nand: Fix the probe error path mtd: rawnand: pasemi: Fix the probe error path mtd: rawnand: orion: Fix the probe error path mtd: rawnand: diskonchip: Fix the probe error path Pavel Andrianov (1): net: pxa168_eth: Fix a potential data race in pxa168_eth_remove Piotr Krysiuk (1): bpf, x86: Validate computation of branch displacements for x86-64 Richard Weinberger (1): init/Kconfig: make COMPILE_TEST depend on !UML Ronnie Sahlberg (1): cifs: revalidate mapping when we open files for SMB1 POSIX Sergei Trofimovich (1): ia64: mca: allocate early mca with GFP_ATOMIC Shih-Yuan Lee (FourDollars) (1): ALSA: hda/realtek - Fix pincfg for Dell XPS 13 9370 Steven Rostedt (VMware) (1): tracing: Add a vmalloc_sync_mappings() for safe measure Tong Zhang (1): mISDN: fix crash in fritzpci Vincent Whitchurch (1): cifs: Silently ignore unknown oplock break handle

3 years, 8 months

1
1
0 0

FAILED: patch "[PATCH] iio: hid-sensor-prox: Fix scale not correct issue" failed to apply to 4.9-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.9-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 d68c592e02f6f49a88e705f13dfc1883432cf300 Mon Sep 17 00:00:00 2001 From: Ye Xiang <xiang.ye(a)intel.com> Date: Sat, 30 Jan 2021 18:25:30 +0800 Subject: [PATCH] iio: hid-sensor-prox: Fix scale not correct issue Currently, the proxy sensor scale is zero because it just return the exponent directly. To fix this issue, this patch use hid_sensor_format_scale to process the scale first then return the output. Fixes: 39a3a0138f61 ("iio: hid-sensors: Added Proximity Sensor Driver") Signed-off-by: Ye Xiang <xiang.ye(a)intel.com> Link: https://lore.kernel.org/r/20210130102530.31064-1-xiang.ye@intel.com Cc: <Stable(a)vger.kernel.org> Signed-off-by: Jonathan Cameron <Jonathan.Cameron(a)huawei.com> diff --git a/drivers/iio/light/hid-sensor-prox.c b/drivers/iio/light/hid-sensor-prox.c index 330cf359e0b8..e9e00ce0c6d4 100644 --- a/drivers/iio/light/hid-sensor-prox.c +++ b/drivers/iio/light/hid-sensor-prox.c @@ -23,6 +23,9 @@ struct prox_state { struct hid_sensor_common common_attributes; struct hid_sensor_hub_attribute_info prox_attr; u32 human_presence; + int scale_pre_decml; + int scale_post_decml; + int scale_precision; }; /* Channel definitions */ @@ -93,8 +96,9 @@ static int prox_read_raw(struct iio_dev *indio_dev, ret_type = IIO_VAL_INT; break; case IIO_CHAN_INFO_SCALE: - *val = prox_state->prox_attr.units; - ret_type = IIO_VAL_INT; + *val = prox_state->scale_pre_decml; + *val2 = prox_state->scale_post_decml; + ret_type = prox_state->scale_precision; break; case IIO_CHAN_INFO_OFFSET: *val = hid_sensor_convert_exponent( @@ -234,6 +238,11 @@ static int prox_parse_report(struct platform_device *pdev, HID_USAGE_SENSOR_HUMAN_PRESENCE, &st->common_attributes.sensitivity); + st->scale_precision = hid_sensor_format_scale( + hsdev->usage, + &st->prox_attr, + &st->scale_pre_decml, &st->scale_post_decml); + return ret; }

3 years, 8 months

3
2
0 0

[PATCH 4.9] ARM: 8723/2: always assume the "unified" syntax for assembly code

by Nathan Chancellor

From: Nicolas Pitre <nicolas.pitre(a)linaro.org> commit 75fea300d73ae5b18957949a53ec770daaeb6fc2 upstream. The GNU assembler has implemented the "unified syntax" parsing since 2005. This "unified" syntax is required when the kernel is built in Thumb2 mode. However the "unified" syntax is a mixed bag of features, including not requiring a `#' prefix with immediate operands. This leads to situations where some code builds just fine in Thumb2 mode and fails to build in ARM mode if that prefix is missing. This behavior discrepancy makes build tests less valuable, forcing both ARM and Thumb2 builds for proper coverage. Let's "fix" this issue by always using the "unified" syntax for both ARM and Thumb2 mode. Given that the documented minimum binutils version that properly builds the kernel is version 2.20 released in 2010, we can assume that any toolchain capable of building the latest kernel is also "unified syntax" capable. Whith this, a bunch of macros used to mask some differences between both syntaxes can be removed, with the side effect of making LTO easier. Suggested-by: Robin Murphy <robin.murphy(a)arm.com> Signed-off-by: Nicolas Pitre <nico(a)linaro.org> Signed-off-by: Russell King <rmk+kernel(a)armlinux.org.uk> [nathan: Resolve small conflict on 4.9 due to a lack of 494609701e06a] Signed-off-by: Nathan Chancellor <nathan(a)kernel.org> --- Hi all, This commit is needed to fix the backport of commit 7f9942c61fa6 ("ARM: s3c: fix fiq for clang IAS"): https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org/message/MJWA3V… It is present in 4.14+ and it has been validate via TuxSuite across a variety of arch/arm configs with no errors so I feel it should be a fairly safe backport. Cheers, Nathan arch/arm/Kconfig | 7 +--- arch/arm/Makefile | 6 ++- arch/arm/include/asm/unified.h | 77 ++-------------------------------- 3 files changed, 8 insertions(+), 82 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index ae55f5db97f8..9dbaa283f01d 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1546,12 +1546,10 @@ config THUMB2_KERNEL depends on (CPU_V7 || CPU_V7M) && !CPU_V6 && !CPU_V6K default y if CPU_THUMBONLY select AEABI - select ARM_ASM_UNIFIED select ARM_UNWIND help By enabling this option, the kernel will be compiled in - Thumb-2 mode. A compiler/assembler that understand the unified - ARM-Thumb syntax is needed. + Thumb-2 mode. If unsure, say N. @@ -1586,9 +1584,6 @@ config THUMB2_AVOID_R_ARM_THM_JUMP11 Unless you are sure your tools don't have this problem, say Y. -config ARM_ASM_UNIFIED - bool - config ARM_PATCH_IDIV bool "Runtime patch udiv/sdiv instructions into __aeabi_{u}idiv()" depends on CPU_32v7 && !XIP_KERNEL diff --git a/arch/arm/Makefile b/arch/arm/Makefile index e14ddca59d02..975b110e7d87 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -113,9 +113,11 @@ ifeq ($(CONFIG_ARM_UNWIND),y) CFLAGS_ABI +=-funwind-tables endif +# Accept old syntax despite ".syntax unified" +AFLAGS_NOWARN :=$(call as-option,-Wa$(comma)-mno-warn-deprecated,-Wa$(comma)-W) + ifeq ($(CONFIG_THUMB2_KERNEL),y) AFLAGS_AUTOIT :=$(call as-option,-Wa$(comma)-mimplicit-it=always,-Wa$(comma)-mauto-it) -AFLAGS_NOWARN :=$(call as-option,-Wa$(comma)-mno-warn-deprecated,-Wa$(comma)-W) CFLAGS_ISA :=-mthumb $(AFLAGS_AUTOIT) $(AFLAGS_NOWARN) AFLAGS_ISA :=$(CFLAGS_ISA) -Wa$(comma)-mthumb # Work around buggy relocation from gas if requested: @@ -123,7 +125,7 @@ ifeq ($(CONFIG_THUMB2_AVOID_R_ARM_THM_JUMP11),y) CFLAGS_MODULE +=-fno-optimize-sibling-calls endif else -CFLAGS_ISA :=$(call cc-option,-marm,) +CFLAGS_ISA :=$(call cc-option,-marm,) $(AFLAGS_NOWARN) AFLAGS_ISA :=$(CFLAGS_ISA) endif diff --git a/arch/arm/include/asm/unified.h b/arch/arm/include/asm/unified.h index a91ae499614c..2c3b952be63e 100644 --- a/arch/arm/include/asm/unified.h +++ b/arch/arm/include/asm/unified.h @@ -20,8 +20,10 @@ #ifndef __ASM_UNIFIED_H #define __ASM_UNIFIED_H -#if defined(__ASSEMBLY__) && defined(CONFIG_ARM_ASM_UNIFIED) +#if defined(__ASSEMBLY__) .syntax unified +#else +__asm__(".syntax unified"); #endif #ifdef CONFIG_CPU_V7M @@ -64,77 +66,4 @@ #endif /* CONFIG_THUMB2_KERNEL */ -#ifndef CONFIG_ARM_ASM_UNIFIED - -/* - * If the unified assembly syntax isn't used (in ARM mode), these - * macros expand to an empty string - */ -#ifdef __ASSEMBLY__ - .macro it, cond - .endm - .macro itt, cond - .endm - .macro ite, cond - .endm - .macro ittt, cond - .endm - .macro itte, cond - .endm - .macro itet, cond - .endm - .macro itee, cond - .endm - .macro itttt, cond - .endm - .macro ittte, cond - .endm - .macro ittet, cond - .endm - .macro ittee, cond - .endm - .macro itett, cond - .endm - .macro itete, cond - .endm - .macro iteet, cond - .endm - .macro iteee, cond - .endm -#else /* !__ASSEMBLY__ */ -__asm__( -" .macro it, cond\n" -" .endm\n" -" .macro itt, cond\n" -" .endm\n" -" .macro ite, cond\n" -" .endm\n" -" .macro ittt, cond\n" -" .endm\n" -" .macro itte, cond\n" -" .endm\n" -" .macro itet, cond\n" -" .endm\n" -" .macro itee, cond\n" -" .endm\n" -" .macro itttt, cond\n" -" .endm\n" -" .macro ittte, cond\n" -" .endm\n" -" .macro ittet, cond\n" -" .endm\n" -" .macro ittee, cond\n" -" .endm\n" -" .macro itett, cond\n" -" .endm\n" -" .macro itete, cond\n" -" .endm\n" -" .macro iteet, cond\n" -" .endm\n" -" .macro iteee, cond\n" -" .endm\n"); -#endif /* __ASSEMBLY__ */ - -#endif /* CONFIG_ARM_ASM_UNIFIED */ - #endif /* !__ASM_UNIFIED_H */ -- 2.31.0

3 years, 8 months

2
1
0 0

[PATCH] powerpc/eeh: Fix EEH handling for hugepages in ioremap space.

by Mahesh Salgaonkar

During the EEH MMIO error checking, the current implementation fails to map the (virtual) MMIO address back to the pci device on radix with hugepage mappings for I/O. This results into failure to dispatch EEH event with no recovery even when EEH capability has been enabled on the device. eeh_check_failure(token) # token = virtual MMIO address addr = eeh_token_to_phys(token); edev = eeh_addr_cache_get_dev(addr); if (!edev) return 0; eeh_dev_check_failure(edev); <= Dispatch the EEH event In case of hugepage mappings, eeh_token_to_phys() has a bug in virt -> phys translation that results in wrong physical address, which is then passed to eeh_addr_cache_get_dev() to match it against cached pci I/O address ranges to get to a PCI device. Hence, it fails to find a match and the EEH event never gets dispatched leaving the device in failed state. The commit 33439620680be ("powerpc/eeh: Handle hugepages in ioremap space") introduced following logic to translate virt to phys for hugepage mappings: eeh_token_to_phys(): + pa = pte_pfn(*ptep); + + /* On radix we can do hugepage mappings for io, so handle that */ + if (hugepage_shift) { + pa <<= hugepage_shift; <= This is wrong + pa |= token & ((1ul << hugepage_shift) - 1); + } This patch fixes the virt -> phys translation in eeh_token_to_phys() function. # cat /sys/kernel/debug/powerpc/eeh_address_cache mem addr range [0x0000040080000000-0x00000400807fffff]: 0030:01:00.1 mem addr range [0x0000040080800000-0x0000040080ffffff]: 0030:01:00.1 mem addr range [0x0000040081000000-0x00000400817fffff]: 0030:01:00.0 mem addr range [0x0000040081800000-0x0000040081ffffff]: 0030:01:00.0 mem addr range [0x0000040082000000-0x000004008207ffff]: 0030:01:00.1 mem addr range [0x0000040082080000-0x00000400820fffff]: 0030:01:00.0 mem addr range [0x0000040082100000-0x000004008210ffff]: 0030:01:00.1 mem addr range [0x0000040082110000-0x000004008211ffff]: 0030:01:00.0 Above is the list of cached io address ranges of pci 0030:01:00.<fn>. Before this patch: Tracing 'arg1' of function eeh_addr_cache_get_dev() during error injection clearly shows that 'addr=' contains wrong physical address: kworker/u16:0-7 [001] .... 108.883775: eeh_addr_cache_get_dev: (eeh_addr_cache_get_dev+0xc/0xf0) addr=0x80103000a510 dmesg shows no EEH recovery messages: [ 108.563768] bnx2x: [bnx2x_timer:5801(eth2)]MFW seems hanged: drv_pulse (0x9ae) != mcp_pulse (0x7fff) [ 108.563788] bnx2x: [bnx2x_hw_stats_update:870(eth2)]NIG timer max (4294967295) [ 108.883788] bnx2x: [bnx2x_acquire_hw_lock:2013(eth1)]lock_status 0xffffffff resource_bit 0x1 [ 108.884407] bnx2x 0030:01:00.0 eth1: MDC/MDIO access timeout [ 108.884976] bnx2x 0030:01:00.0 eth1: MDC/MDIO access timeout <..> After this patch: eeh_addr_cache_get_dev() trace shows correct physical address: <idle>-0 [001] ..s. 1043.123828: eeh_addr_cache_get_dev: (eeh_addr_cache_get_dev+0xc/0xf0) addr=0x40080bc7cd8 dmesg logs shows EEH recovery getting triggerred: [ 964.323980] bnx2x: [bnx2x_timer:5801(eth2)]MFW seems hanged: drv_pulse (0x746f) != mcp_pulse (0x7fff) [ 964.323991] EEH: Recovering PHB#30-PE#10000 [ 964.324002] EEH: PE location: N/A, PHB location: N/A [ 964.324006] EEH: Frozen PHB#30-PE#10000 detected <..> Cc: stable(a)vger.kernel.org Fixes: 33439620680be ("powerpc/eeh: Handle hugepages in ioremap space") Signed-off-by: Mahesh Salgaonkar <mahesh(a)linux.ibm.com> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar(a)linux.ibm.com> Reported-by: Dominic DeMarco <ddemarc(a)us.ibm.com> --- arch/powerpc/kernel/eeh.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c index cd60bc1c87011..c8a8020ef7768 100644 --- a/arch/powerpc/kernel/eeh.c +++ b/arch/powerpc/kernel/eeh.c @@ -362,14 +362,11 @@ static inline unsigned long eeh_token_to_phys(unsigned long token) pa = pte_pfn(*ptep); /* On radix we can do hugepage mappings for io, so handle that */ - if (hugepage_shift) { - pa <<= hugepage_shift; - pa |= token & ((1ul << hugepage_shift) - 1); - } else { - pa <<= PAGE_SHIFT; - pa |= token & (PAGE_SIZE - 1); - } + if (!hugepage_shift) + hugepage_shift = PAGE_SHIFT; + pa <<= PAGE_SHIFT; + pa |= token & ((1ul << hugepage_shift) -1); return pa; }

3 years, 8 months

1
0
0 0

[PATCH 4.9 00/13] 4.9.266-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.9.266 release. There are 13 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 Sun, 11 Apr 2021 09:52:52 +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.266-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.266-rc1 Masahiro Yamada <masahiroy(a)kernel.org> init/Kconfig: make COMPILE_TEST depend on HAS_IOMEM Heiko Carstens <hca(a)linux.ibm.com> init/Kconfig: make COMPILE_TEST depend on !S390 Shih-Yuan Lee (FourDollars) <sylee(a)canonical.com> ALSA: hda/realtek - Fix pincfg for Dell XPS 13 9370 Piotr Krysiuk <piotras(a)gmail.com> bpf, x86: Validate computation of branch displacements for x86-64 Vincent Whitchurch <vincent.whitchurch(a)axis.com> cifs: Silently ignore unknown oplock break handle Ronnie Sahlberg <lsahlber(a)redhat.com> cifs: revalidate mapping when we open files for SMB1 POSIX Sergei Trofimovich <slyfox(a)gentoo.org> ia64: mca: allocate early mca with GFP_ATOMIC Martin Wilck <mwilck(a)suse.com> scsi: target: pscsi: Clean up after failure in pscsi_map_sg() Arnd Bergmann <arnd(a)arndb.de> x86/build: Turn off -fcf-protection for realmode targets Rob Clark <robdclark(a)chromium.org> drm/msm: Ratelimit invalid-fence message Karthikeyan Kathirvel <kathirve(a)codeaurora.org> mac80211: choose first enabled channel for monitor Tong Zhang <ztong0001(a)gmail.com> mISDN: fix crash in fritzpci Pavel Andrianov <andrianov(a)ispras.ru> net: pxa168_eth: Fix a potential data race in pxa168_eth_remove ------------- Diffstat: Makefile | 4 ++-- arch/ia64/kernel/mca.c | 2 +- arch/x86/Makefile | 2 +- arch/x86/net/bpf_jit_comp.c | 11 ++++++++++- drivers/gpu/drm/msm/msm_fence.c | 2 +- drivers/isdn/hardware/mISDN/mISDNipac.c | 2 +- drivers/net/ethernet/marvell/pxa168_eth.c | 2 +- drivers/target/target_core_pscsi.c | 8 ++++++++ fs/cifs/file.c | 1 + fs/cifs/smb2misc.c | 4 ++-- init/Kconfig | 3 +-- net/mac80211/main.c | 13 ++++++++++++- sound/pci/hda/patch_realtek.c | 1 - 13 files changed, 41 insertions(+), 14 deletions(-)

3 years, 8 months

5
17
0 0

[PATCH 4.4 00/20] 4.4.266-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.4.266 release. There are 20 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 Sun, 11 Apr 2021 09:52:52 +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.4.266-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.4.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.4.266-rc1 Masahiro Yamada <masahiroy(a)kernel.org> init/Kconfig: make COMPILE_TEST depend on HAS_IOMEM Heiko Carstens <hca(a)linux.ibm.com> init/Kconfig: make COMPILE_TEST depend on !S390 Richard Weinberger <richard(a)nod.at> init/Kconfig: make COMPILE_TEST depend on !UML Steven Rostedt (VMware) <rostedt(a)goodmis.org> tracing: Add a vmalloc_sync_mappings() for safe measure Miquel Raynal <miquel.raynal(a)bootlin.com> mtd: rawnand: diskonchip: Fix the probe error path Miquel Raynal <miquel.raynal(a)bootlin.com> mtd: rawnand: orion: Fix the probe error path Miquel Raynal <miquel.raynal(a)bootlin.com> mtd: rawnand: pasemi: Fix the probe error path Miquel Raynal <miquel.raynal(a)bootlin.com> mtd: rawnand: plat_nand: Fix the probe error path Miquel Raynal <miquel.raynal(a)bootlin.com> mtd: rawnand: sharpsl: Fix the probe error path Miquel Raynal <miquel.raynal(a)bootlin.com> mtd: rawnand: socrates: Fix the probe error path Miquel Raynal <miquel.raynal(a)bootlin.com> mtd: rawnand: tmio: Fix the probe error path Shih-Yuan Lee (FourDollars) <sylee(a)canonical.com> ALSA: hda/realtek - Fix pincfg for Dell XPS 13 9370 Piotr Krysiuk <piotras(a)gmail.com> bpf, x86: Validate computation of branch displacements for x86-64 Vincent Whitchurch <vincent.whitchurch(a)axis.com> cifs: Silently ignore unknown oplock break handle Ronnie Sahlberg <lsahlber(a)redhat.com> cifs: revalidate mapping when we open files for SMB1 POSIX Sergei Trofimovich <slyfox(a)gentoo.org> ia64: mca: allocate early mca with GFP_ATOMIC Arnd Bergmann <arnd(a)arndb.de> x86/build: Turn off -fcf-protection for realmode targets Karthikeyan Kathirvel <kathirve(a)codeaurora.org> mac80211: choose first enabled channel for monitor Tong Zhang <ztong0001(a)gmail.com> mISDN: fix crash in fritzpci Pavel Andrianov <andrianov(a)ispras.ru> net: pxa168_eth: Fix a potential data race in pxa168_eth_remove ------------- Diffstat: Makefile | 4 ++-- arch/ia64/kernel/mca.c | 2 +- arch/x86/Makefile | 2 +- arch/x86/net/bpf_jit_comp.c | 11 ++++++++++- drivers/isdn/hardware/mISDN/mISDNipac.c | 2 +- drivers/mtd/nand/diskonchip.c | 7 ++----- drivers/mtd/nand/orion_nand.c | 2 +- drivers/mtd/nand/pasemi_nand.c | 4 +++- drivers/mtd/nand/plat_nand.c | 2 +- drivers/mtd/nand/sharpsl.c | 2 +- drivers/mtd/nand/socrates_nand.c | 2 +- drivers/mtd/nand/tmio_nand.c | 2 +- drivers/net/ethernet/marvell/pxa168_eth.c | 2 +- fs/cifs/file.c | 1 + fs/cifs/smb2misc.c | 4 ++-- init/Kconfig | 2 +- kernel/trace/trace.c | 14 ++++++++++++++ net/mac80211/main.c | 13 ++++++++++++- sound/pci/hda/patch_realtek.c | 1 - 19 files changed, 56 insertions(+), 23 deletions(-)

3 years, 8 months

3
22
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror April 2021