September 2020 - Linux-stable-mirror

FAILED: patch "[PATCH] PCI: qcom: Add missing reset for ipq806x" 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 ee367e2cdd2202b5714982739e684543cd2cee0e Mon Sep 17 00:00:00 2001 From: Ansuel Smith <ansuelsmth(a)gmail.com> Date: Mon, 15 Jun 2020 23:06:00 +0200 Subject: [PATCH] PCI: qcom: Add missing reset for ipq806x Add missing ext reset used by ipq8064 SoC in PCIe qcom driver. Link: https://lore.kernel.org/r/20200615210608.21469-5-ansuelsmth@gmail.com Fixes: 82a823833f4e ("PCI: qcom: Add Qualcomm PCIe controller driver") Signed-off-by: Sham Muthayyan <smuthayy(a)codeaurora.org> Signed-off-by: Ansuel Smith <ansuelsmth(a)gmail.com> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi(a)arm.com> Reviewed-by: Rob Herring <robh(a)kernel.org> Reviewed-by: Philipp Zabel <p.zabel(a)pengutronix.de> Acked-by: Stanimir Varbanov <svarbanov(a)mm-sol.com> Cc: stable(a)vger.kernel.org # v4.5+ diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c index bae5158a9854..fcd265067f34 100644 --- a/drivers/pci/controller/dwc/pcie-qcom.c +++ b/drivers/pci/controller/dwc/pcie-qcom.c @@ -95,6 +95,7 @@ struct qcom_pcie_resources_2_1_0 { struct reset_control *ahb_reset; struct reset_control *por_reset; struct reset_control *phy_reset; + struct reset_control *ext_reset; struct regulator_bulk_data supplies[QCOM_PCIE_2_1_0_MAX_SUPPLY]; }; @@ -272,6 +273,10 @@ static int qcom_pcie_get_resources_2_1_0(struct qcom_pcie *pcie) if (IS_ERR(res->por_reset)) return PTR_ERR(res->por_reset); + res->ext_reset = devm_reset_control_get_optional_exclusive(dev, "ext"); + if (IS_ERR(res->ext_reset)) + return PTR_ERR(res->ext_reset); + res->phy_reset = devm_reset_control_get_exclusive(dev, "phy"); return PTR_ERR_OR_ZERO(res->phy_reset); } @@ -285,6 +290,7 @@ static void qcom_pcie_deinit_2_1_0(struct qcom_pcie *pcie) reset_control_assert(res->axi_reset); reset_control_assert(res->ahb_reset); reset_control_assert(res->por_reset); + reset_control_assert(res->ext_reset); reset_control_assert(res->phy_reset); clk_disable_unprepare(res->iface_clk); clk_disable_unprepare(res->core_clk); @@ -343,6 +349,12 @@ static int qcom_pcie_init_2_1_0(struct qcom_pcie *pcie) goto err_deassert_ahb; } + ret = reset_control_deassert(res->ext_reset); + if (ret) { + dev_err(dev, "cannot deassert ext reset\n"); + goto err_deassert_ahb; + } + /* enable PCIe clocks and resets */ val = readl(pcie->parf + PCIE20_PARF_PHY_CTRL); val &= ~BIT(0);

3 years, 4 months

3
2
0 0

FAILED: patch "[PATCH] PCI: qcom: Add missing reset for ipq806x" failed to apply to 4.14-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.14-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 ee367e2cdd2202b5714982739e684543cd2cee0e Mon Sep 17 00:00:00 2001 From: Ansuel Smith <ansuelsmth(a)gmail.com> Date: Mon, 15 Jun 2020 23:06:00 +0200 Subject: [PATCH] PCI: qcom: Add missing reset for ipq806x Add missing ext reset used by ipq8064 SoC in PCIe qcom driver. Link: https://lore.kernel.org/r/20200615210608.21469-5-ansuelsmth@gmail.com Fixes: 82a823833f4e ("PCI: qcom: Add Qualcomm PCIe controller driver") Signed-off-by: Sham Muthayyan <smuthayy(a)codeaurora.org> Signed-off-by: Ansuel Smith <ansuelsmth(a)gmail.com> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi(a)arm.com> Reviewed-by: Rob Herring <robh(a)kernel.org> Reviewed-by: Philipp Zabel <p.zabel(a)pengutronix.de> Acked-by: Stanimir Varbanov <svarbanov(a)mm-sol.com> Cc: stable(a)vger.kernel.org # v4.5+ diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c index bae5158a9854..fcd265067f34 100644 --- a/drivers/pci/controller/dwc/pcie-qcom.c +++ b/drivers/pci/controller/dwc/pcie-qcom.c @@ -95,6 +95,7 @@ struct qcom_pcie_resources_2_1_0 { struct reset_control *ahb_reset; struct reset_control *por_reset; struct reset_control *phy_reset; + struct reset_control *ext_reset; struct regulator_bulk_data supplies[QCOM_PCIE_2_1_0_MAX_SUPPLY]; }; @@ -272,6 +273,10 @@ static int qcom_pcie_get_resources_2_1_0(struct qcom_pcie *pcie) if (IS_ERR(res->por_reset)) return PTR_ERR(res->por_reset); + res->ext_reset = devm_reset_control_get_optional_exclusive(dev, "ext"); + if (IS_ERR(res->ext_reset)) + return PTR_ERR(res->ext_reset); + res->phy_reset = devm_reset_control_get_exclusive(dev, "phy"); return PTR_ERR_OR_ZERO(res->phy_reset); } @@ -285,6 +290,7 @@ static void qcom_pcie_deinit_2_1_0(struct qcom_pcie *pcie) reset_control_assert(res->axi_reset); reset_control_assert(res->ahb_reset); reset_control_assert(res->por_reset); + reset_control_assert(res->ext_reset); reset_control_assert(res->phy_reset); clk_disable_unprepare(res->iface_clk); clk_disable_unprepare(res->core_clk); @@ -343,6 +349,12 @@ static int qcom_pcie_init_2_1_0(struct qcom_pcie *pcie) goto err_deassert_ahb; } + ret = reset_control_deassert(res->ext_reset); + if (ret) { + dev_err(dev, "cannot deassert ext reset\n"); + goto err_deassert_ahb; + } + /* enable PCIe clocks and resets */ val = readl(pcie->parf + PCIE20_PARF_PHY_CTRL); val &= ~BIT(0);

3 years, 4 months

2
1
0 0

[PATCH 4.4 00/70] 4.4.165-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.4.165 release. There are 70 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 Nov 28 10:50:16 UTC 2018. 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.165-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.165-rc1 Eric Biggers <ebiggers(a)google.com> HID: uhid: forbid UHID_CREATE under KERNEL_DS or elevated privileges Al Viro <viro(a)zeniv.linux.org.uk> new helper: uaccess_kernel() Hans de Goede <hdegoede(a)redhat.com> ACPI / platform: Add SMB0001 HID to forbidden_id_list Gustavo A. R. Silva <gustavo(a)embeddedor.com> drivers/misc/sgi-gru: fix Spectre v1 vulnerability Mattias Jacobsson <2pi(a)mok.nu> USB: misc: appledisplay: add 20" Apple Cinema Display Nathan Chancellor <natechancellor(a)gmail.com> misc: atmel-ssc: Fix section annotation on atmel_ssc_get_driver_data Emmanuel Pescosta <emmanuelpescosta099(a)gmail.com> usb: quirks: Add delay-init quirk for Corsair K70 LUX RGB Kai-Heng Feng <kai.heng.feng(a)canonical.com> USB: quirks: Add no-lpm quirk for Raydium touchscreens Maarten Jacobs <maarten256(a)outlook.com> usb: cdc-acm: add entry for Hiro (Conexant) modem Dan Carpenter <dan.carpenter(a)oracle.com> uio: Fix an Oops on load Sakari Ailus <sakari.ailus(a)linux.intel.com> media: v4l: event: Add subscription to list before calling "add" operation Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Revert "Bluetooth: h5: Fix missing dependency on BT_HCIUART_SERDEV" Hans Verkuil <hverkuil(a)xs4all.nl> Revert "media: videobuf2-core: don't call memop 'finish' when queueing" Lu Fengqi <lufq.fnst(a)cn.fujitsu.com> btrfs: fix pinned underflow after transaction aborted Andreas Gruenbacher <agruenba(a)redhat.com> gfs2: Put bitmap buffers in put_super YueHaibing <yuehaibing(a)huawei.com> SUNRPC: drop pointless static qualifier in xdr_get_next_encode_buffer() Minchan Kim <minchan(a)kernel.org> zram: close udev startup race condition as default groups Vignesh R <vigneshr(a)ti.com> i2c: omap: Enable for ARCH_K3 Jeremy Linton <jeremy.linton(a)arm.com> lib/raid6: Fix arm64 test build Geert Uytterhoeven <geert(a)linux-m68k.org> hwmon: (ibmpowernv) Remove bogus __init annotations Taehee Yoo <ap420073(a)gmail.com> netfilter: xt_IDLETIMER: add sysfs filename checking routine Jozsef Kadlecsik <kadlec(a)blackhole.kfki.hu> netfilter: ipset: Correct rcu_dereference() call in ip_set_put_comment() Justin M. Forbes <jforbes(a)fedoraproject.org> s390/mm: Fix ERROR: "__node_distance" undefined! Eric Westbrook <eric(a)westbrook.io> netfilter: ipset: actually allow allowable CIDR 0 in hash:net,port,net Vasily Gorbik <gor(a)linux.ibm.com> s390/vdso: add missing FORCE to build targets Nathan Chancellor <natechancellor(a)gmail.com> arm64: percpu: Initialize ret in the default case Paul Gortmaker <paul.gortmaker(a)windriver.com> platform/x86: acerhdf: Add BIOS entry for Gateway LT31 v1.3307 Marek Szyprowski <m.szyprowski(a)samsung.com> clk: samsung: exynos5420: Enable PERIS clocks for suspend Chengguang Xu <cgxu519(a)gmx.com> fs/exofs: fix potential memory leak in mount option parsing Richard Weinberger <richard(a)nod.at> um: Give start_idle_thread() a return code Ernesto A. Fernández <ernesto.mnd.fernandez(a)gmail.com> hfsplus: prevent btree data loss on root split Ernesto A. Fernández <ernesto.mnd.fernandez(a)gmail.com> hfs: prevent btree data loss on root split Jann Horn <jannh(a)google.com> reiserfs: propagate errors from fill_with_dentries() properly Matthias Kaehlcke <mka(a)chromium.org> x86/build: Use cc-option to validate stack alignment parameter Matthias Kaehlcke <mka(a)chromium.org> x86/build: Fix stack alignment for CLang Michael Davidson <md(a)google.com> x86/boot: #undef memcpy() et al in string.c Matthias Kaehlcke <mka(a)chromium.org> x86/build: Specify stack alignment for clang Matthias Kaehlcke <mka(a)chromium.org> x86/build: Use __cc-option for boot code compiler options Matthias Kaehlcke <mka(a)chromium.org> kbuild: Add __cc-option macro Matthias Kaehlcke <mka(a)chromium.org> x86/mm/kaslr: Use the _ASM_MUL macro for multiplication to work around Clang incompatibility Michael Davidson <md(a)google.com> crypto, x86: aesni - fix token pasting for clang Matthias Kaehlcke <mka(a)chromium.org> x86/kbuild: Use cc-option to enable -falign-{jumps/loops} Matthias Kaehlcke <mka(a)chromium.org> arm64: Disable asm-operand-width warning for clang Stefan Agner <stefan(a)agner.ch> kbuild: allow to use GCC toolchain not in Clang search path Stefan Agner <stefan(a)agner.ch> kbuild: set no-integrated-as before incl. arch Makefile Sodagudi Prasad <psodagud(a)codeaurora.org> kbuild: clang: disable unused variable warnings only when constant Nick Desaulniers <nick.desaulniers(a)gmail.com> kbuild: clang: remove crufty HOSTCFLAGS David Lin <dtwlin(a)google.com> kbuild: clang: fix build failures with sparse check Masahiro Yamada <yamada.masahiro(a)socionext.com> kbuild: move cc-option and cc-disable-warning after incl. arch Makefile Chris Fries <cfries(a)google.com> kbuild: Set KBUILD_CFLAGS before incl. arch Makefile Nick Desaulniers <ndesaulniers(a)google.com> kbuild: fix linker feature test macros when cross compiling with Clang Ard Biesheuvel <ard.biesheuvel(a)linaro.org> efi/libstub/arm64: Set -fpie when building the EFI stub Ard Biesheuvel <ard.biesheuvel(a)linaro.org> efi/libstub/arm64: Force 'hidden' visibility for section markers Ard Biesheuvel <ard.biesheuvel(a)linaro.org> crypto: arm64/sha - avoid non-standard inline asm tricks Matthias Kaehlcke <mka(a)chromium.org> kbuild: clang: Disable 'address-of-packed-member' warning Arnd Bergmann <arnd(a)arndb.de> modules: mark __inittest/__exittest as __maybe_unused Vinícius Tinti <viniciustinti(a)gmail.com> kbuild: Add support to generate LLVM assembly files Behan Webster <behanw(a)converseincode.com> kbuild: use -Oz instead of -Os when using clang Mark Charlebois <charlebm(a)gmail.com> kbuild, LLVMLinux: Add -Werror to cc-option to support clang Masahiro Yamada <yamada.masahiro(a)socionext.com> kbuild: drop -Wno-unknown-warning-option from clang options Jeroen Hofstee <jeroen(a)myspectrum.nl> kbuild: fix asm-offset generation to work with clang Masahiro Yamada <yamada.masahiro(a)socionext.com> kbuild: consolidate redundant sed script ASM offset generation Matthias Kaehlcke <mka(a)chromium.org> kbuild: Consolidate header generation from ASM offset information Michael Davidson <md(a)google.com> kbuild: clang: add -no-integrated-as to KBUILD_[AC]FLAGS Behan Webster <behanw(a)converseincode.com> kbuild: Add better clang cross build support David Ahern <dsahern(a)gmail.com> ipv6: Fix PMTU updates for UDP/raw sockets in presence of VRF Siva Reddy Kallam <siva.kallam(a)broadcom.com> tg3: Add PHY reset for 5717/5719/5720 in change ring and flow control paths Eric Dumazet <edumazet(a)google.com> net-gro: reset skb->pkt_type in napi_reuse_skb() Sabrina Dubroca <sd(a)queasysnail.net> ip_tunnel: don't force DF when MTU is locked 배석진 <soukjin.bae(a)samsung.com> flow_dissector: do not dissect l4 ports for fragments ------------- Diffstat: .gitignore | 1 + Kbuild | 25 --------------- Makefile | 41 ++++++++++++++++-------- arch/arm64/Makefile | 4 +++ arch/arm64/crypto/sha1-ce-core.S | 6 ++-- arch/arm64/crypto/sha1-ce-glue.c | 11 ++----- arch/arm64/crypto/sha2-ce-core.S | 6 ++-- arch/arm64/crypto/sha2-ce-glue.c | 13 +++----- arch/arm64/include/asm/percpu.h | 3 ++ arch/ia64/kernel/Makefile | 26 ++-------------- arch/s390/kernel/vdso32/Makefile | 6 ++-- arch/s390/kernel/vdso64/Makefile | 6 ++-- arch/s390/numa/numa.c | 1 + arch/um/os-Linux/skas/process.c | 5 +++ arch/x86/Makefile | 39 +++++++++++++++++------ arch/x86/boot/compressed/aslr.c | 3 +- arch/x86/boot/string.c | 9 ++++++ arch/x86/crypto/aes_ctrby8_avx-x86_64.S | 7 ++--- arch/x86/include/asm/asm.h | 1 + drivers/acpi/acpi_platform.c | 1 + drivers/block/zram/zram_drv.c | 26 ++++------------ drivers/bluetooth/Kconfig | 1 - drivers/clk/samsung/clk-exynos5420.c | 1 + drivers/firmware/efi/libstub/Makefile | 2 +- drivers/firmware/efi/libstub/arm64-stub.c | 10 +++++- drivers/hid/uhid.c | 13 ++++++++ drivers/hwmon/ibmpowernv.c | 7 ++--- drivers/i2c/busses/Kconfig | 2 +- drivers/media/v4l2-core/v4l2-event.c | 43 ++++++++++++++------------ drivers/media/v4l2-core/videobuf2-core.c | 9 ++---- drivers/misc/atmel-ssc.c | 2 +- drivers/misc/sgi-gru/grukdump.c | 4 +++ drivers/net/ethernet/broadcom/tg3.c | 18 +++++++++-- drivers/platform/x86/acerhdf.c | 1 + drivers/uio/uio.c | 7 +++-- drivers/usb/class/cdc-acm.c | 3 ++ drivers/usb/core/quirks.c | 8 +++++ drivers/usb/misc/appledisplay.c | 1 + fs/btrfs/disk-io.c | 19 +++++++++--- fs/exofs/super.c | 5 ++- fs/gfs2/rgrp.c | 3 +- fs/hfs/brec.c | 4 +++ fs/hfsplus/brec.c | 4 +++ fs/reiserfs/xattr.c | 7 +++++ include/linux/kbuild.h | 6 ++-- include/linux/module.h | 4 +-- include/linux/netfilter/ipset/ip_set_comment.h | 4 +-- include/linux/uaccess.h | 3 ++ lib/raid6/test/Makefile | 4 +-- net/core/dev.c | 4 +++ net/core/flow_dissector.c | 4 +-- net/ipv4/ip_tunnel_core.c | 2 +- net/ipv6/route.c | 8 +++-- net/netfilter/ipset/ip_set_hash_netportnet.c | 8 ++--- net/netfilter/xt_IDLETIMER.c | 20 ++++++++++++ net/sunrpc/xdr.c | 2 +- scripts/Kbuild.include | 18 +++++++---- scripts/Makefile.build | 8 +++++ scripts/Makefile.extrawarn | 1 - scripts/Makefile.lib | 31 +++++++++++++++++++ scripts/mod/Makefile | 28 ++--------------- 61 files changed, 349 insertions(+), 220 deletions(-)

3 years, 4 months

9
88
0 0

[PATCH v2 1/2] powerpc/rtas: Restrict RTAS requests from userspace

by Andrew Donnellan

A number of userspace utilities depend on making calls to RTAS to retrieve information and update various things. The existing API through which we expose RTAS to userspace exposes more RTAS functionality than we actually need, through the sys_rtas syscall, which allows root (or anyone with CAP_SYS_ADMIN) to make any RTAS call they want with arbitrary arguments. Many RTAS calls take the address of a buffer as an argument, and it's up to the caller to specify the physical address of the buffer as an argument. We allocate a buffer (the "RMO buffer") in the Real Memory Area that RTAS can access, and then expose the physical address and size of this buffer in /proc/powerpc/rtas/rmo_buffer. Userspace is expected to read this address, poke at the buffer using /dev/mem, and pass an address in the RMO buffer to the RTAS call. However, there's nothing stopping the caller from specifying whatever address they want in the RTAS call, and it's easy to construct a series of RTAS calls that can overwrite arbitrary bytes (even without /dev/mem access). Additionally, there are some RTAS calls that do potentially dangerous things and for which there are no legitimate userspace use cases. In the past, this would not have been a particularly big deal as it was assumed that root could modify all system state freely, but with Secure Boot and lockdown we need to care about this. We can't fundamentally change the ABI at this point, however we can address this by implementing a filter that checks RTAS calls against a list of permitted calls and forces the caller to use addresses within the RMO buffer. The list is based off the list of calls that are used by the librtas userspace library, and has been tested with a number of existing userspace RTAS utilities. For compatibility with any applications we are not aware of that require other calls, the filter can be turned off at build time. Reported-by: Daniel Axtens <dja(a)axtens.net> Cc: stable(a)vger.kernel.org Signed-off-by: Andrew Donnellan <ajd(a)linux.ibm.com> --- v1->v2: - address comments from mpe - shorten the names of some struct members - make the filter array static/ro_after_init, use const char * - genericise the fixed buffer size cases - simplify/get rid of some of the error printing - get rid of rtas_token_name() --- arch/powerpc/Kconfig | 13 ++++ arch/powerpc/kernel/rtas.c | 153 +++++++++++++++++++++++++++++++++++++ 2 files changed, 166 insertions(+) diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 1f48bbfb3ce9..8dd42b82379b 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -989,6 +989,19 @@ config PPC_SECVAR_SYSFS read/write operations on these variables. Say Y if you have secure boot enabled and want to expose variables to userspace. +config PPC_RTAS_FILTER + bool "Enable filtering of RTAS syscalls" + default y + depends on PPC_RTAS + help + The RTAS syscall API has security issues that could be used to + compromise system integrity. This option enforces restrictions on the + RTAS calls and arguments passed by userspace programs to mitigate + these issues. + + Say Y unless you know what you are doing and the filter is causing + problems for you. + endmenu config ISA_DMA_API diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c index 806d554ce357..954f41676f69 100644 --- a/arch/powerpc/kernel/rtas.c +++ b/arch/powerpc/kernel/rtas.c @@ -992,6 +992,147 @@ struct pseries_errorlog *get_pseries_errorlog(struct rtas_error_log *log, return NULL; } +#ifdef CONFIG_PPC_RTAS_FILTER + +/* + * The sys_rtas syscall, as originally designed, allows root to pass + * arbitrary physical addresses to RTAS calls. A number of RTAS calls + * can be abused to write to arbitrary memory and do other things that + * are potentially harmful to system integrity, and thus should only + * be used inside the kernel and not exposed to userspace. + * + * All known legitimate users of the sys_rtas syscall will only ever + * pass addresses that fall within the RMO buffer, and use a known + * subset of RTAS calls. + * + * Accordingly, we filter RTAS requests to check that the call is + * permitted, and that provided pointers fall within the RMO buffer. + * The rtas_filters list contains an entry for each permitted call, + * with the indexes of the parameters which are expected to contain + * addresses and sizes of buffers allocated inside the RMO buffer. + */ +struct rtas_filter { + const char *name; + int token; + /* Indexes into the args buffer, -1 if not used */ + int buf_idx1; + int size_idx1; + int buf_idx2; + int size_idx2; + + int fixed_size; +}; + +static struct rtas_filter rtas_filters[] __ro_after_init = { + { "ibm,activate-firmware", -1, -1, -1, -1, -1 }, + { "ibm,configure-connector", -1, 0, -1, 1, -1, 4096 }, /* Special cased */ + { "display-character", -1, -1, -1, -1, -1 }, + { "ibm,display-message", -1, 0, -1, -1, -1 }, + { "ibm,errinjct", -1, 2, -1, -1, -1, 1024 }, + { "ibm,close-errinjct", -1, -1, -1, -1, -1 }, + { "ibm,open-errinct", -1, -1, -1, -1, -1 }, + { "ibm,get-config-addr-info2", -1, -1, -1, -1, -1 }, + { "ibm,get-dynamic-sensor-state", -1, 1, -1, -1, -1 }, + { "ibm,get-indices", -1, 2, 3, -1, -1 }, + { "get-power-level", -1, -1, -1, -1, -1 }, + { "get-sensor-state", -1, -1, -1, -1, -1 }, + { "ibm,get-system-parameter", -1, 1, 2, -1, -1 }, + { "get-time-of-day", -1, -1, -1, -1, -1 }, + { "ibm,get-vpd", -1, 0, -1, 1, 2 }, + { "ibm,lpar-perftools", -1, 2, 3, -1, -1 }, + { "ibm,platform-dump", -1, 4, 5, -1, -1 }, + { "ibm,read-slot-reset-state", -1, -1, -1, -1, -1 }, + { "ibm,scan-log-dump", -1, 0, 1, -1, -1 }, + { "ibm,set-dynamic-indicator", -1, 2, -1, -1, -1 }, + { "ibm,set-eeh-option", -1, -1, -1, -1, -1 }, + { "set-indicator", -1, -1, -1, -1, -1 }, + { "set-power-level", -1, -1, -1, -1, -1 }, + { "set-time-for-power-on", -1, -1, -1, -1, -1 }, + { "ibm,set-system-parameter", -1, 1, -1, -1, -1 }, + { "set-time-of-day", -1, -1, -1, -1, -1 }, + { "ibm,suspend-me", -1, -1, -1, -1, -1 }, + { "ibm,update-nodes", -1, 0, -1, -1, -1, 4096 }, + { "ibm,update-properties", -1, 0, -1, -1, -1, 4096 }, + { "ibm,physical-attestation", -1, 0, 1, -1, -1 }, +}; + +static bool in_rmo_buf(u32 base, u32 end) +{ + return base >= rtas_rmo_buf && + base < (rtas_rmo_buf + RTAS_RMOBUF_MAX) && + base <= end && + end >= rtas_rmo_buf && + end < (rtas_rmo_buf + RTAS_RMOBUF_MAX); +} + +static bool block_rtas_call(int token, int nargs, + struct rtas_args *args) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(rtas_filters); i++) { + struct rtas_filter *f = &rtas_filters[i]; + u32 base, size, end; + + if (token != f->token) + continue; + + if (f->buf_idx1 != -1) { + base = be32_to_cpu(args->args[f->buf_idx1]); + if (f->size_idx1 != -1) + size = be32_to_cpu(args->args[f->size_idx1]); + else if (f->fixed_size) + size = f->fixed_size; + else + size = 1; + + end = base + size - 1; + if (!in_rmo_buf(base, end)) + goto err; + } + + if (f->buf_idx2 != -1) { + base = be32_to_cpu(args->args[f->buf_idx2]); + if (f->size_idx2 != -1) + size = be32_to_cpu(args->args[f->size_idx2]); + else if (f->fixed_size) + size = f->fixed_size; + else + size = 1; + end = base + size - 1; + + /* + * Special case for ibm,configure-connector where the + * address can be 0 + */ + if (!strcmp(f->name, "ibm,configure-connector") && + base == 0) + return false; + + if (!in_rmo_buf(base, end)) + goto err; + } + + return false; + } + +err: + pr_err_ratelimited("sys_rtas: RTAS call blocked - exploit attempt?\n"); + pr_err_ratelimited("sys_rtas: token=0x%x, nargs=%d (called by %s)\n", + token, nargs, current->comm); + return true; +} + +#else + +static bool block_rtas_call(int token, int nargs, + struct rtas_args *args) +{ + return false; +} + +#endif /* CONFIG_PPC_RTAS_FILTER */ + /* We assume to be passed big endian arguments */ SYSCALL_DEFINE1(rtas, struct rtas_args __user *, uargs) { @@ -1029,6 +1170,9 @@ SYSCALL_DEFINE1(rtas, struct rtas_args __user *, uargs) args.rets = &args.args[nargs]; memset(args.rets, 0, nret * sizeof(rtas_arg_t)); + if (block_rtas_call(token, nargs, &args)) + return -EINVAL; + /* Need to handle ibm,suspend_me call specially */ if (token == ibm_suspend_me_token) { @@ -1090,6 +1234,9 @@ void __init rtas_initialize(void) unsigned long rtas_region = RTAS_INSTANTIATE_MAX; u32 base, size, entry; int no_base, no_size, no_entry; +#ifdef CONFIG_PPC_RTAS_FILTER + int i; +#endif /* Get RTAS dev node and fill up our "rtas" structure with infos * about it. @@ -1129,6 +1276,12 @@ void __init rtas_initialize(void) #ifdef CONFIG_RTAS_ERROR_LOGGING rtas_last_error_token = rtas_token("rtas-last-error"); #endif + +#ifdef CONFIG_PPC_RTAS_FILTER + for (i = 0; i < ARRAY_SIZE(rtas_filters); i++) { + rtas_filters[i].token = rtas_token(rtas_filters[i].name); + } +#endif } int __init early_init_dt_scan_rtas(unsigned long node, -- 2.20.1

3 years, 4 months

5
7
0 0

FAILED: patch "[PATCH] pinctrl: baytrail: Fix pin being driven low for a while on" 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 156abe2961601d60a8c2a60c6dc8dd6ce7adcdaf Mon Sep 17 00:00:00 2001 From: Hans de Goede <hdegoede(a)redhat.com> Date: Sat, 6 Jun 2020 11:31:50 +0200 Subject: [PATCH] pinctrl: baytrail: Fix pin being driven low for a while on gpiod_get(..., GPIOD_OUT_HIGH) The pins on the Bay Trail SoC have separate input-buffer and output-buffer enable bits and a read of the level bit of the value register will always return the value from the input-buffer. The BIOS of a device may configure a pin in output-only mode, only enabling the output buffer, and write 1 to the level bit to drive the pin high. This 1 written to the level bit will be stored inside the data-latch of the output buffer. But a subsequent read of the value register will return 0 for the level bit because the input-buffer is disabled. This causes a read-modify-write as done by byt_gpio_set_direction() to write 0 to the level bit, driving the pin low! Before this commit byt_gpio_direction_output() relied on pinctrl_gpio_direction_output() to set the direction, followed by a call to byt_gpio_set() to apply the selected value. This causes the pin to go low between the pinctrl_gpio_direction_output() and byt_gpio_set() calls. Change byt_gpio_direction_output() to directly make the register modifications itself instead. Replacing the 2 subsequent writes to the value register with a single write. Note that the pinctrl code does not keep track internally of the direction, so not going through pinctrl_gpio_direction_output() is not an issue. This issue was noticed on a Trekstor SurfTab Twin 10.1. When the panel is already on at boot (no external monitor connected), then the i915 driver does a gpiod_get(..., GPIOD_OUT_HIGH) for the panel-enable GPIO. The temporarily going low of that GPIO was causing the panel to reset itself after which it would not show an image until it was turned off and back on again (until a full modeset was done on it). This commit fixes this. This commit also updates the byt_gpio_direction_input() to use direct register accesses instead of going through pinctrl_gpio_direction_input(), to keep it consistent with byt_gpio_direction_output(). Note for backporting, this commit depends on: commit e2b74419e5cc ("pinctrl: baytrail: Replace WARN with dev_info_once when setting direct-irq pin to output") Cc: stable(a)vger.kernel.org Fixes: 86e3ef812fe3 ("pinctrl: baytrail: Update gpio chip operations") Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> Acked-by: Mika Westerberg <mika.westerberg(a)linux.intel.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> diff --git a/drivers/pinctrl/intel/pinctrl-baytrail.c b/drivers/pinctrl/intel/pinctrl-baytrail.c index e3ceb3dfeabe..a917a2df520e 100644 --- a/drivers/pinctrl/intel/pinctrl-baytrail.c +++ b/drivers/pinctrl/intel/pinctrl-baytrail.c @@ -800,6 +800,21 @@ static void byt_gpio_disable_free(struct pinctrl_dev *pctl_dev, pm_runtime_put(vg->dev); } +static void byt_gpio_direct_irq_check(struct intel_pinctrl *vg, + unsigned int offset) +{ + void __iomem *conf_reg = byt_gpio_reg(vg, offset, BYT_CONF0_REG); + + /* + * Before making any direction modifications, do a check if gpio is set + * for direct IRQ. On Bay Trail, setting GPIO to output does not make + * sense, so let's at least inform the caller before they shoot + * themselves in the foot. + */ + if (readl(conf_reg) & BYT_DIRECT_IRQ_EN) + dev_info_once(vg->dev, "Potential Error: Setting GPIO with direct_irq_en to output"); +} + static int byt_gpio_set_direction(struct pinctrl_dev *pctl_dev, struct pinctrl_gpio_range *range, unsigned int offset, @@ -807,7 +822,6 @@ static int byt_gpio_set_direction(struct pinctrl_dev *pctl_dev, { struct intel_pinctrl *vg = pinctrl_dev_get_drvdata(pctl_dev); void __iomem *val_reg = byt_gpio_reg(vg, offset, BYT_VAL_REG); - void __iomem *conf_reg = byt_gpio_reg(vg, offset, BYT_CONF0_REG); unsigned long flags; u32 value; @@ -817,14 +831,8 @@ static int byt_gpio_set_direction(struct pinctrl_dev *pctl_dev, value &= ~BYT_DIR_MASK; if (input) value |= BYT_OUTPUT_EN; - else if (readl(conf_reg) & BYT_DIRECT_IRQ_EN) - /* - * Before making any direction modifications, do a check if gpio - * is set for direct IRQ. On baytrail, setting GPIO to output - * does not make sense, so let's at least inform the caller before - * they shoot themselves in the foot. - */ - dev_info_once(vg->dev, "Potential Error: Setting GPIO with direct_irq_en to output"); + else + byt_gpio_direct_irq_check(vg, offset); writel(value, val_reg); @@ -1165,19 +1173,50 @@ static int byt_gpio_get_direction(struct gpio_chip *chip, unsigned int offset) static int byt_gpio_direction_input(struct gpio_chip *chip, unsigned int offset) { - return pinctrl_gpio_direction_input(chip->base + offset); + struct intel_pinctrl *vg = gpiochip_get_data(chip); + void __iomem *val_reg = byt_gpio_reg(vg, offset, BYT_VAL_REG); + unsigned long flags; + u32 reg; + + raw_spin_lock_irqsave(&byt_lock, flags); + + reg = readl(val_reg); + reg &= ~BYT_DIR_MASK; + reg |= BYT_OUTPUT_EN; + writel(reg, val_reg); + + raw_spin_unlock_irqrestore(&byt_lock, flags); + return 0; } +/* + * Note despite the temptation this MUST NOT be converted into a call to + * pinctrl_gpio_direction_output() + byt_gpio_set() that does not work this + * MUST be done as a single BYT_VAL_REG register write. + * See the commit message of the commit adding this comment for details. + */ static int byt_gpio_direction_output(struct gpio_chip *chip, unsigned int offset, int value) { - int ret = pinctrl_gpio_direction_output(chip->base + offset); + struct intel_pinctrl *vg = gpiochip_get_data(chip); + void __iomem *val_reg = byt_gpio_reg(vg, offset, BYT_VAL_REG); + unsigned long flags; + u32 reg; - if (ret) - return ret; + raw_spin_lock_irqsave(&byt_lock, flags); + + byt_gpio_direct_irq_check(vg, offset); - byt_gpio_set(chip, offset, value); + reg = readl(val_reg); + reg &= ~BYT_DIR_MASK; + if (value) + reg |= BYT_LEVEL; + else + reg &= ~BYT_LEVEL; + writel(reg, val_reg); + + raw_spin_unlock_irqrestore(&byt_lock, flags); return 0; }

3 years, 4 months

3
2
0 0

FAILED: patch "[PATCH] sched/fair: Fix unthrottle_cfs_rq() for leaf_cfs_rq list" failed to apply to 5.4-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.4-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 39f23ce07b9355d05a64ae303ce20d1c4b92b957 Mon Sep 17 00:00:00 2001 From: Vincent Guittot <vincent.guittot(a)linaro.org> Date: Wed, 13 May 2020 15:55:28 +0200 Subject: [PATCH] sched/fair: Fix unthrottle_cfs_rq() for leaf_cfs_rq list Although not exactly identical, unthrottle_cfs_rq() and enqueue_task_fair() are quite close and follow the same sequence for enqueuing an entity in the cfs hierarchy. Modify unthrottle_cfs_rq() to use the same pattern as enqueue_task_fair(). This fixes a problem already faced with the latter and add an optimization in the last for_each_sched_entity loop. Fixes: fe61468b2cb (sched/fair: Fix enqueue_task_fair warning) Reported-by Tao Zhou <zohooouoto(a)zoho.com.cn> Signed-off-by: Vincent Guittot <vincent.guittot(a)linaro.org> Signed-off-by: Peter Zijlstra (Intel) <peterz(a)infradead.org> Reviewed-by: Phil Auld <pauld(a)redhat.com> Reviewed-by: Ben Segall <bsegall(a)google.com> Link: https://lkml.kernel.org/r/20200513135528.4742-1-vincent.guittot@linaro.org diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index c6d57c334d51..538ba5d94e99 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -4774,7 +4774,6 @@ void unthrottle_cfs_rq(struct cfs_rq *cfs_rq) struct rq *rq = rq_of(cfs_rq); struct cfs_bandwidth *cfs_b = tg_cfs_bandwidth(cfs_rq->tg); struct sched_entity *se; - int enqueue = 1; long task_delta, idle_task_delta; se = cfs_rq->tg->se[cpu_of(rq)]; @@ -4798,26 +4797,44 @@ void unthrottle_cfs_rq(struct cfs_rq *cfs_rq) idle_task_delta = cfs_rq->idle_h_nr_running; for_each_sched_entity(se) { if (se->on_rq) - enqueue = 0; + break; + cfs_rq = cfs_rq_of(se); + enqueue_entity(cfs_rq, se, ENQUEUE_WAKEUP); + cfs_rq->h_nr_running += task_delta; + cfs_rq->idle_h_nr_running += idle_task_delta; + + /* end evaluation on encountering a throttled cfs_rq */ + if (cfs_rq_throttled(cfs_rq)) + goto unthrottle_throttle; + } + + for_each_sched_entity(se) { cfs_rq = cfs_rq_of(se); - if (enqueue) { - enqueue_entity(cfs_rq, se, ENQUEUE_WAKEUP); - } else { - update_load_avg(cfs_rq, se, 0); - se_update_runnable(se); - } + + update_load_avg(cfs_rq, se, UPDATE_TG); + se_update_runnable(se); cfs_rq->h_nr_running += task_delta; cfs_rq->idle_h_nr_running += idle_task_delta; + + /* end evaluation on encountering a throttled cfs_rq */ if (cfs_rq_throttled(cfs_rq)) - break; + goto unthrottle_throttle; + + /* + * One parent has been throttled and cfs_rq removed from the + * list. Add it back to not break the leaf list. + */ + if (throttled_hierarchy(cfs_rq)) + list_add_leaf_cfs_rq(cfs_rq); } - if (!se) - add_nr_running(rq, task_delta); + /* At this point se is NULL and we are at root level*/ + add_nr_running(rq, task_delta); +unthrottle_throttle: /* * The cfs_rq_throttled() breaks in the above iteration can result in * incomplete leaf list maintenance, resulting in triggering the @@ -4826,7 +4843,8 @@ void unthrottle_cfs_rq(struct cfs_rq *cfs_rq) for_each_sched_entity(se) { cfs_rq = cfs_rq_of(se); - list_add_leaf_cfs_rq(cfs_rq); + if (list_add_leaf_cfs_rq(cfs_rq)) + break; } assert_list_leaf_cfs_rq(rq);

3 years, 4 months

4
9
0 0

[PATCH] arm64: don't preempt_disable in do_debug_exception

by Paul Gortmaker

In commit d8bb6718c4db ("arm64: Make debug exception handlers visible from RCU") debug_exception_enter and exit were added to deal with better tracking of RCU state - however, in addition to that, but not mentioned in the commit log, a preempt_disable/enable pair were also added. Based on the comment (being removed here) it would seem that the pair were not added to address a specific problem, but just as a proactive, preventative measure - as in "seemed like a good idea at the time". The problem is that do_debug_exception() eventually calls out to generic kernel code like do_force_sig_info() which takes non-raw locks and on -rt enabled kernels, results in things looking like the following, since on -rt kernels, it is noticed that preemption is still disabled. BUG: sleeping function called from invalid context at kernel/locking/rtmutex.c:975 in_atomic(): 1, irqs_disabled(): 0, pid: 35658, name: gdbtest Preemption disabled at: [<ffff000010081578>] do_debug_exception+0x38/0x1a4 Call trace: dump_backtrace+0x0/0x138 show_stack+0x24/0x30 dump_stack+0x94/0xbc ___might_sleep+0x13c/0x168 rt_spin_lock+0x40/0x80 do_force_sig_info+0x30/0xe0 force_sig_fault+0x64/0x90 arm64_force_sig_fault+0x50/0x80 send_user_sigtrap+0x50/0x80 brk_handler+0x98/0xc8 do_debug_exception+0x70/0x1a4 el0_dbg+0x18/0x20 The reproducer was basically an automated gdb test that set a breakpoint on a simple "hello world" program and then quit gdb once the breakpoint was hit - i.e. "(gdb) A debugging session is active. Quit anyway? " Fixes: d8bb6718c4db ("arm64: Make debug exception handlers visible from RCU") Cc: stable(a)vger.kernel.org Cc: Naresh Kamboju <naresh.kamboju(a)linaro.org> Cc: Paul E. McKenney <paulmck(a)linux.ibm.com> Cc: Masami Hiramatsu <mhiramat(a)kernel.org> Cc: Will Deacon <will(a)kernel.org> Signed-off-by: Paul Gortmaker <paul.gortmaker(a)windriver.com> --- arch/arm64/mm/fault.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index 8afb238ff335..4d83ec991b33 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -788,13 +788,6 @@ void __init hook_debug_fault_code(int nr, debug_fault_info[nr].name = name; } -/* - * In debug exception context, we explicitly disable preemption despite - * having interrupts disabled. - * This serves two purposes: it makes it much less likely that we would - * accidentally schedule in exception context and it will force a warning - * if we somehow manage to schedule by accident. - */ static void debug_exception_enter(struct pt_regs *regs) { /* @@ -816,8 +809,6 @@ static void debug_exception_enter(struct pt_regs *regs) rcu_nmi_enter(); } - preempt_disable(); - /* This code is a bit fragile. Test it. */ RCU_LOCKDEP_WARN(!rcu_is_watching(), "exception_enter didn't work"); } @@ -825,8 +816,6 @@ NOKPROBE_SYMBOL(debug_exception_enter); static void debug_exception_exit(struct pt_regs *regs) { - preempt_enable_no_resched(); - if (!user_mode(regs)) rcu_nmi_exit(); -- 2.7.4

3 years, 4 months

4
6
0 0

FAILED: patch "[PATCH] PCI: Add device even if driver attach failed" failed to apply to 4.14-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.14-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 2194bc7c39610be7cabe7456c5f63a570604f015 Mon Sep 17 00:00:00 2001 From: Rajat Jain <rajatja(a)google.com> Date: Mon, 6 Jul 2020 16:32:40 -0700 Subject: [PATCH] PCI: Add device even if driver attach failed device_attach() returning failure indicates a driver error while trying to probe the device. In such a scenario, the PCI device should still be added in the system and be visible to the user. When device_attach() fails, merely warn about it and keep the PCI device in the system. This partially reverts ab1a187bba5c ("PCI: Check device_attach() return value always"). Link: https://lore.kernel.org/r/20200706233240.3245512-1-rajatja@google.com Signed-off-by: Rajat Jain <rajatja(a)google.com> Signed-off-by: Bjorn Helgaas <bhelgaas(a)google.com> Reviewed-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Cc: stable(a)vger.kernel.org # v4.6+ diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c index 8e40b3e6da77..3cef835b375f 100644 --- a/drivers/pci/bus.c +++ b/drivers/pci/bus.c @@ -322,12 +322,8 @@ void pci_bus_add_device(struct pci_dev *dev) dev->match_driver = true; retval = device_attach(&dev->dev); - if (retval < 0 && retval != -EPROBE_DEFER) { + if (retval < 0 && retval != -EPROBE_DEFER) pci_warn(dev, "device attach failed (%d)\n", retval); - pci_proc_detach_device(dev); - pci_remove_sysfs_dev_files(dev); - return; - } pci_dev_assign_added(dev, true); }

3 years, 4 months

3
2
0 0

[PATCH v2 6/6] thermal: tegra: Avoid setting edp_irq when not relevant

by Nicolas Chauvet

According to the binding, the edp_irq is not available on tegra124/132 This commit moves the initialization of tegra->edp_irq after the introduced has_edp_irq condition. This will have the following effects: - soctherm_interrupts_init will not return prematurely with unfinished thermal_irq initialization on tegra124 and tegra132 - edp_irq initialization will be done only when relevant As a result, this will clear the following error on jetson-tk1 : kernel: tegra_soctherm 700e2000.thermal-sensor: IRQ index 1 not found v2: * Use .has_edp_irq boolean instead of of_compatible * Switch subject prefix to use thermal instead of ARM Fixes: 4a04beb1bf2e (thermal: tegra: add support for EDP IRQ) Cc: stable(a)vger.kernel.org Signed-off-by: Nicolas Chauvet <kwizart(a)gmail.com> --- drivers/thermal/tegra/soctherm.c | 38 +++++++++++++---------- drivers/thermal/tegra/soctherm.h | 1 + drivers/thermal/tegra/tegra124-soctherm.c | 1 + drivers/thermal/tegra/tegra132-soctherm.c | 1 + drivers/thermal/tegra/tegra210-soctherm.c | 1 + 5 files changed, 26 insertions(+), 16 deletions(-) diff --git a/drivers/thermal/tegra/soctherm.c b/drivers/thermal/tegra/soctherm.c index 66e0639da4bf..0c79e033e7ea 100644 --- a/drivers/thermal/tegra/soctherm.c +++ b/drivers/thermal/tegra/soctherm.c @@ -2025,12 +2025,6 @@ static int soctherm_interrupts_init(struct platform_device *pdev, return 0; } - tegra->edp_irq = platform_get_irq(pdev, 1); - if (tegra->edp_irq < 0) { - dev_dbg(&pdev->dev, "get 'edp_irq' failed.\n"); - return 0; - } - ret = devm_request_threaded_irq(&pdev->dev, tegra->thermal_irq, soctherm_thermal_isr, @@ -2043,16 +2037,28 @@ static int soctherm_interrupts_init(struct platform_device *pdev, return ret; } - ret = devm_request_threaded_irq(&pdev->dev, - tegra->edp_irq, - soctherm_edp_isr, - soctherm_edp_isr_thread, - IRQF_ONESHOT, - "soctherm_edp", - tegra); - if (ret < 0) { - dev_err(&pdev->dev, "request_irq 'edp_irq' failed.\n"); - return ret; + /* Initialize edp_irq when available */ + if (tegra->soc->has_edp_irq) { + /* get IRQ */ + + tegra->edp_irq = platform_get_irq(pdev, 1); + if (tegra->edp_irq < 0) { + dev_dbg(&pdev->dev, "get 'edp_irq' failed.\n"); + return 0; + } + + /* request IRQ */ + ret = devm_request_threaded_irq(&pdev->dev, + tegra->edp_irq, + soctherm_edp_isr, + soctherm_edp_isr_thread, + IRQF_ONESHOT, + "soctherm_edp", + tegra); + if (ret < 0) { + dev_err(&pdev->dev, "request_irq 'edp_irq' failed.\n"); + return ret; + } } return 0; diff --git a/drivers/thermal/tegra/soctherm.h b/drivers/thermal/tegra/soctherm.h index 70501e73d586..b93cfdd06e5d 100644 --- a/drivers/thermal/tegra/soctherm.h +++ b/drivers/thermal/tegra/soctherm.h @@ -128,6 +128,7 @@ struct tegra_soctherm_soc { const int thresh_grain; const unsigned int bptt; const bool use_ccroc; + const bool has_edp_irq; struct tsensor_group_thermtrips *thermtrips; }; diff --git a/drivers/thermal/tegra/tegra124-soctherm.c b/drivers/thermal/tegra/tegra124-soctherm.c index 20ad27f4d1a1..c8c8231f6cdd 100644 --- a/drivers/thermal/tegra/tegra124-soctherm.c +++ b/drivers/thermal/tegra/tegra124-soctherm.c @@ -216,4 +216,5 @@ const struct tegra_soctherm_soc tegra124_soctherm = { .thresh_grain = TEGRA124_THRESH_GRAIN, .bptt = TEGRA124_BPTT, .use_ccroc = false, + .has_edp_irq = false, }; diff --git a/drivers/thermal/tegra/tegra132-soctherm.c b/drivers/thermal/tegra/tegra132-soctherm.c index b76308fdad9e..1bc9481de5fc 100644 --- a/drivers/thermal/tegra/tegra132-soctherm.c +++ b/drivers/thermal/tegra/tegra132-soctherm.c @@ -216,4 +216,5 @@ const struct tegra_soctherm_soc tegra132_soctherm = { .thresh_grain = TEGRA132_THRESH_GRAIN, .bptt = TEGRA132_BPTT, .use_ccroc = true, + .has_edp_irq = false, }; diff --git a/drivers/thermal/tegra/tegra210-soctherm.c b/drivers/thermal/tegra/tegra210-soctherm.c index d0ff793f18c5..2b09c8a811d0 100644 --- a/drivers/thermal/tegra/tegra210-soctherm.c +++ b/drivers/thermal/tegra/tegra210-soctherm.c @@ -224,5 +224,6 @@ const struct tegra_soctherm_soc tegra210_soctherm = { .thresh_grain = TEGRA210_THRESH_GRAIN, .bptt = TEGRA210_BPTT, .use_ccroc = false, + .has_edp_irq = true, .thermtrips = tegra210_tsensor_thermtrips, }; -- 2.25.4

3 years, 5 months

2
1
0 0

[PATCH 5.4 000/203] 5.4.13-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.4.13 release. There are 203 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 Sat, 18 Jan 2020 23:16:00 +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.4.13-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.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 5.4.13-rc1 Kai Li <li.kai4(a)h3c.com> ocfs2: call journal flush to mark journal as empty after journal recovery when mount Nick Desaulniers <ndesaulniers(a)google.com> hexagon: work around compiler crash Nick Desaulniers <ndesaulniers(a)google.com> hexagon: parenthesize registers in asm predicates Ard Biesheuvel <ardb(a)kernel.org> kbuild/deb-pkg: annotate libelf-dev dependency as :native Sakari Ailus <sakari.ailus(a)linux.intel.com> media: intel-ipu3: Align struct ipu3_uapi_awb_fr_config_s to 32 bytes changzhu <Changfeng.Zhu(a)amd.com> drm/amdgpu: enable gfxoff for raven1 refresh Alexander.Barabash(a)dell.com <Alexander.Barabash(a)dell.com> ioat: ioat_alloc_ring() failure handling. Julian Wiedmann <jwi(a)linux.ibm.com> s390/qeth: lock the card while changing its hsuid John Stultz <john.stultz(a)linaro.org> dmaengine: k3dma: Avoid null pointer traversal David Howells <dhowells(a)redhat.com> rxrpc: Fix missing security check on incoming calls David Howells <dhowells(a)redhat.com> rxrpc: Don't take call->user_mutex in rxrpc_new_incoming_call() David Howells <dhowells(a)redhat.com> rxrpc: Unlock new call in rxrpc_new_incoming_call() rather than the caller Ben Dooks (Codethink) <ben.dooks(a)codethink.co.uk> drm/arm/mali: make malidp_mw_connector_helper_funcs static Jouni Hogander <jouni.hogander(a)unikie.com> MIPS: Prevent link failure with kcov instrumentation Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> tomoyo: Suppress RCU warning at list_for_each_entry_rcu(). Vincenzo Frascino <vincenzo.frascino(a)arm.com> mips: Fix gettimeofday() in the vdso library Vladimir Kondratiev <vladimir.kondratiev(a)intel.com> mips: cacheinfo: report shared CPU map Olof Johansson <olof(a)lixom.net> riscv: export flush_icache_all to modules Mathieu Desnoyers <mathieu.desnoyers(a)efficios.com> rseq/selftests: Turn off timeout setting Shuah Khan <skhan(a)linuxfoundation.org> selftests: firmware: Fix it to do root uid check and skip Israel Rukshin <israelr(a)mellanox.com> scsi: target/iblock: Fix protection error with blocks greater than 512B Varun Prakash <varun(a)chelsio.com> scsi: libcxgbi: fix NULL pointer dereference in cxgbi_device_destroy() Johnson CH Chen (陳昭勳) <JohnsonCH.Chen(a)moxa.com> gpio: mpc8xxx: Add platform device to gpiochip->parent Matti Vaittinen <matti.vaittinen(a)fi.rohmeurope.com> rtc: bd70528: Add MODULE ALIAS to autoload module Chuhong Yuan <hslester96(a)gmail.com> rtc: brcmstb-waketimer: add missed clk_disable_unprepare Kars de Jong <jongk(a)linux-m68k.org> rtc: msm6242: Fix reading of 10-hour digit Olga Kornievskaia <olga.kornievskaia(a)gmail.com> NFSD fixing possible null pointer derefering in copy offload Chao Yu <chao(a)kernel.org> f2fs: fix potential overflow Victorien Molle <victorien.molle(a)wifirst.fr> sch_cake: Add missing NLA policy entry TCA_CAKE_SPLIT_GSO Luca Coelho <luciano.coelho(a)intel.com> iwlwifi: mvm: fix support for single antenna diversity Nathan Chancellor <natechancellor(a)gmail.com> rtlwifi: Remove unnecessary NULL check in rtl_regd_init Mordechay Goodstein <mordechay.goodstein(a)intel.com> iwlwifi: mvm: consider ieee80211 station max amsdu value Navid Emamdoost <navid.emamdoost(a)gmail.com> spi: lpspi: fix memory leak in fsl_lpspi_probe Geert Uytterhoeven <geert+renesas(a)glider.be> spi: rspi: Use platform_get_irq_byname_optional() for optional irqs Mans Rullgard <mans(a)mansr.com> spi: atmel: fix handling of cs_change set on non-last xfer Daniel Vetter <daniel.vetter(a)ffwll.ch> spi: pxa2xx: Set controller->max_transfer_size in dma mode Sergei Shtylyov <sergei.shtylyov(a)cogentembedded.com> mtd: spi-nor: fix silent truncation in spi_nor_read_raw() Sergei Shtylyov <sergei.shtylyov(a)cogentembedded.com> mtd: spi-nor: fix silent truncation in spi_nor_read() Huanpeng Xin <huanpeng.xin(a)unisoc.com> spi: sprd: Fix the incorrect SPI register Zhihao Cheng <chengzhihao1(a)huawei.com> ubifs: do_kill_orphans: Fix a memory leak bug Ben Dooks (Codethink) <ben.dooks(a)codethink.co.uk> ubifs: Fixed missed le64_to_cpu() in journal Richard Weinberger <richard(a)nod.at> Revert "ubifs: Fix memory leak bug in alloc_ubifs_info() error path" Yong Wu <yong.wu(a)mediatek.com> memory: mtk-smi: Add PM suspend and resume ops Yong Wu <yong.wu(a)mediatek.com> iommu/mediatek: Add a new tlb_lock for tlb_flush Yong Wu <yong.wu(a)mediatek.com> iommu/mediatek: Correct the flush_iotlb_all callback Jonas Karlman <jonas(a)kwiboo.se> media: hantro: Set H264 FIELDPIC_FLAG_E flag correctly Navid Emamdoost <navid.emamdoost(a)gmail.com> media: aspeed-video: Fix memory leaks in aspeed_video_probe Jonas Karlman <jonas(a)kwiboo.se> media: hantro: Do not reorder H264 scaling list Jonas Karlman <jonas(a)kwiboo.se> media: cedrus: Use correct H264 8x8 scaling list Philipp Zabel <p.zabel(a)pengutronix.de> media: coda: fix deadlock between decoder picture run and start command Seung-Woo Kim <sw0312.kim(a)samsung.com> media: exynos4-is: Fix recursive locking in isp_video_release() Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> media: v4l: cadence: Fix how unsued lanes are handled in 'csi2rx_start()' Boris Brezillon <boris.brezillon(a)collabora.com> media: hantro: h264: Fix the frame_num wraparound case Niklas Söderlund <niklas.soderlund+renesas(a)ragnatech.se> media: rcar-vin: Fix incorrect return statement in rvin_try_format() Janusz Krzysztofik <jmkrzyszt(a)gmail.com> media: ov6650: Fix default format not applied on device probe Janusz Krzysztofik <jmkrzyszt(a)gmail.com> media: ov6650: Fix .get_fmt() V4L2_SUBDEV_FORMAT_TRY support Janusz Krzysztofik <jmkrzyszt(a)gmail.com> media: ov6650: Fix some format attributes not under control Janusz Krzysztofik <jmkrzyszt(a)gmail.com> media: ov6650: Fix incorrect use of JPEG colorspace Dietmar Eggemann <dietmar.eggemann(a)arm.com> ARM: 8943/1: Fix topology setup in case of CPU hotplug for CONFIG_SCHED_MC Peng Fan <peng.fan(a)nxp.com> tty: serial: pch_uart: correct usage of dma_unmap_sg Peng Fan <peng.fan(a)nxp.com> tty: serial: imx: use the sg count from dma_map_sg Thomas Bogendoerfer <tbogendoerfer(a)suse.de> MIPS: SGI-IP27: Fix crash, when CPUs are disabled via nr_cpus parameter Tiezhu Yang <yangtiezhu(a)loongson.cn> MIPS: Loongson: Fix return value of loongson_hwmon_init Thomas Bogendoerfer <tbogendoerfer(a)suse.de> MIPS: PCI: remember nasid changed by set interrupt affinity Oliver O'Halloran <oohall(a)gmail.com> powerpc/powernv: Disable native PCIe port management Bjorn Helgaas <bhelgaas(a)google.com> PCI/PTM: Remove spurious "d" from granularity message Hewenliang <hewenliang4(a)huawei.com> tools: PCI: Fix fd leakage Bjorn Helgaas <bhelgaas(a)google.com> PCI/PM: Clear PCIe PME Status even for legacy power management Rob Herring <robh(a)kernel.org> PCI: Fix missing bridge dma_ranges resource list cleanup Niklas Cassel <niklas.cassel(a)linaro.org> PCI: dwc: Fix find_next_bit() usage Remi Pommarel <repk(a)triplefau.lt> PCI: aardvark: Fix PCI_EXP_RTCTL register configuration Remi Pommarel <repk(a)triplefau.lt> PCI: aardvark: Use LTSSM state to build link training flag Arnd Bergmann <arnd(a)arndb.de> compat_ioctl: handle SIOCOUTQNSD Arnd Bergmann <arnd(a)arndb.de> af_unix: add compat_ioctl support Arnd Bergmann <arnd(a)arndb.de> gfs2: add compat_ioctl support Loic Poulain <loic.poulain(a)linaro.org> arm64: dts: apq8096-db820c: Increase load on l21 for SDCARD Arnd Bergmann <arnd(a)arndb.de> scsi: sd: enable compat ioctls for sed-opal Xiaojie Yuan <xiaojie.yuan(a)amd.com> drm/amdgpu/discovery: reserve discovery data at the top of VRAM Christian König <christian.koenig(a)amd.com> drm/amdgpu: cleanup creating BOs at fixed location (v2) Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Revert "drm/virtio: switch virtio_gpu_wait_ioctl() to gem helper." Mika Westerberg <mika.westerberg(a)linux.intel.com> PCI: pciehp: Do not disable interrupt twice on suspend Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> pinctrl: lewisburg: Update pin list according to v1.1v6 Geert Uytterhoeven <geert+renesas(a)glider.be> pinctrl: sh-pfc: Do not use platform_get_irq() to count interrupts Keiya Nobuta <nobuta.keiya(a)fujitsu.com> pinctrl: sh-pfc: Fix PINMUX_IPSR_PHYS() to set GPSR Colin Ian King <colin.king(a)canonical.com> pinctl: ti: iodelay: fix error checking on pinctrl_count_index_with_args call Navid Emamdoost <navid.emamdoost(a)gmail.com> affs: fix a memory leak in affs_remount Denis Efremov <efremov(a)linux.com> rsi: fix potential null dereference in rsi_probe() Leonard Crestez <leonard.crestez(a)nxp.com> clk: imx: pll14xx: Fix quick switch of S/K parameter Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> dmaengine: dw: platform: Mark 'hclk' clock optional Kishon Vijay Abraham I <kishon(a)ti.com> clk: Fix memory leak in clk_unregister() Marian Mihailescu <mihailescu2m(a)gmail.com> clk: samsung: exynos5420: Preserve CPU clocks configuration during suspend/resume Jerome Brunet <jbrunet(a)baylibre.com> clk: meson: axg-audio: fix regmap last register Alexander Usyskin <alexander.usyskin(a)intel.com> mei: fix modalias documentation Alexandru Ardelean <alexandru.ardelean(a)analog.com> iio: imu: adis16480: assign bias value only if operation succeeded Lorenzo Bianconi <lorenzo(a)kernel.org> iio: imu: st_lsm6dsx: fix gyro gain definitions for LSM9DS1 Trond Myklebust <trond.myklebust(a)hammerspace.com> NFSv4.x: Drop the slot if nfs4_delegreturn_prepare waits for layoutreturn Trond Myklebust <trond.myklebust(a)hammerspace.com> NFSv4.x: Handle bad/dead sessions correctly in nfs41_sequence_process() Scott Mayhew <smayhew(a)redhat.com> nfsd: v4 support requires CRYPTO_SHA256 Scott Mayhew <smayhew(a)redhat.com> nfsd: Fix cld_net->cn_tfm initialization Trond Myklebust <trond.myklebust(a)hammerspace.com> NFSv2: Fix a typo in encode_sattr() Eric Biggers <ebiggers(a)google.com> crypto: geode-aes - convert to skcipher API and make thread-safe Herbert Xu <herbert(a)gondor.apana.org.au> crypto: algif_skcipher - Use chunksize instead of blocksize Ard Biesheuvel <ardb(a)kernel.org> crypto: virtio - implement missing support for output IVs Yunfeng Ye <yeyunfeng(a)huawei.com> crypto: arm64/aes-neonbs - add return value of skcipher_walk_done() in __xts_crypt() Zhou Wang <wangzhou1(a)hisilicon.com> crypto: hisilicon - select NEED_SG_DMA_LENGTH in qm Kconfig Phani Kiran Hemadri <phemadri(a)marvell.com> crypto: cavium/nitrox - fix firmware assignment to AE cores Can Guo <cang(a)codeaurora.org> scsi: ufs: Give an unique ID to each ufs-bsg Diego Calleja <diegocg(a)gmail.com> dm: add dm-clone to the documentation index Chuck Lever <chuck.lever(a)oracle.com> xprtrdma: Fix oops in Receive handler after device removal Chuck Lever <chuck.lever(a)oracle.com> xprtrdma: Fix completion wait during device removal Chuck Lever <chuck.lever(a)oracle.com> xprtrdma: Fix create_qp crash on device unload Vadim Pasternak <vadimp(a)mellanox.com> Documentation/ABI: Add missed attribute for mlxreg-io sysfs interfaces Vadim Pasternak <vadimp(a)mellanox.com> Documentation/ABI: Fix documentation inconsistency for mlxreg-io sysfs interfaces Mike Rapoport <rppt(a)linux.ibm.com> asm-generic/nds32: don't redefine cacheflush primitives Hans de Goede <hdegoede(a)redhat.com> platform/x86: GPD pocket fan: Use default values when wrong modparams are given Jian-Hong Pan <jian-hong(a)endlessm.com> platform/x86: asus-wmi: Fix keyboard brightness cannot be set to 0 Liming Sun <lsun(a)mellanox.com> platform/mellanox: fix potential deadlock in the tmfifo driver Xiang Chen <chenxiang66(a)hisilicon.com> scsi: sd: Clear sdkp->protection_type if disk is reformatted without PI James Bottomley <James.Bottomley(a)HansenPartnership.com> scsi: enclosure: Fix stale device oops with hot replug David Howells <dhowells(a)redhat.com> keys: Fix request_key() cache David Howells <dhowells(a)redhat.com> afs: Fix afs_lookup() to not clobber the version on a new dentry David Howells <dhowells(a)redhat.com> afs: Fix use-after-loss-of-ref Andrii Nakryiko <andriin(a)fb.com> libbpf: Fix Makefile' libbpf symbol mismatch diagnostic Stanislav Fomichev <sdf(a)google.com> bpf: Support pre-2.25-binutils objcopy for vmlinux BTF John Fastabend <john.fastabend(a)gmail.com> bpf: skmsg, fix potential psock NULL pointer dereference Daniel Borkmann <daniel(a)iogearbox.net> bpf: Make use of probe_user_write in probe write helper Daniel Borkmann <daniel(a)iogearbox.net> uaccess: Add non-pagefault user-space write function Bart Van Assche <bvanassche(a)acm.org> RDMA/srpt: Report the SCSI residual to the initiator Leon Romanovsky <leon(a)kernel.org> RDMA/mlx5: Return proper error value Jason Gunthorpe <jgg(a)ziepe.ca> rdma: Remove nes ABI header Yangyang Li <liyangyang20(a)huawei.com> RDMA/hns: Bugfix for qpc/cqc timer configuration Lijun Ou <oulijun(a)huawei.com> RDMA/hns: Fix to support 64K page for srq Chuck Lever <chuck.lever(a)oracle.com> xprtrdma: Close window between waking RPC senders and posting Receives Chuck Lever <chuck.lever(a)oracle.com> xprtrdma: Fix MR list handling Chuck Lever <chuck.lever(a)oracle.com> xprtrdma: Connection becomes unstable after a reconnect Chuck Lever <chuck.lever(a)oracle.com> xprtrdma: Add unique trace points for posting Local Invalidate WRs Yangyang Li <liyangyang20(a)huawei.com> RDMA/hns: Release qp resources when failed to destroy qp Arnd Bergmann <arnd(a)arndb.de> RDMA/hns: Fix build error again Bart Van Assche <bvanassche(a)acm.org> RDMA/siw: Fix port number endianness in a debug message Mark Zhang <markz(a)mellanox.com> RDMA/counter: Prevent QP counter manual binding in auto mode Lang Cheng <chenglang(a)huawei.com> RDMA/hns: Modify return value of restrack functions Weihang Li <liweihang(a)hisilicon.com> RDMA/hns: remove a redundant le16_to_cpu Jason Gunthorpe <jgg(a)ziepe.ca> RDMA/hns: Prevent undefined behavior in hns_roce_set_user_sq_size() Nilkanth Ahirrao <anilkanth(a)jp.adit-jv.com> ASoC: rsnd: fix DALIGN register for SSIU Takashi Iwai <tiwai(a)suse.de> ASoC: core: Fix compile warning with CONFIG_DEBUG_FS=n Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> ASoC: SOF: Intel: Broadwell: clarify mutual exclusion with legacy driver Shengjiu Wang <shengjiu.wang(a)nxp.com> ASoC: fsl_esai: Add spin lock to protect reset, stop and start Daniel Baluta <daniel.baluta(a)nxp.com> ASoC: simple_card_utils.h: Add missing include Tzung-Bi Shih <tzungbi(a)google.com> ASoC: dt-bindings: mt8183: add missing update Arnd Bergmann <arnd(a)arndb.de> netfilter: nft_meta: use 64-bit time arithmetic Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables_offload: release flow_rule on error from commit path Goldwyn Rodrigues <rgoldwyn(a)suse.com> btrfs: simplify inode locking for RWF_NOWAIT Taehee Yoo <ap420073(a)gmail.com> hsr: fix slab-out-of-bounds Read in hsr_debugfs_rename() Sami Tolvanen <samitolvanen(a)google.com> syscalls/x86: Fix function types in COND_SYSCALL Sami Tolvanen <samitolvanen(a)google.com> syscalls/x86: Use the correct function type for sys_ni_syscall Sami Tolvanen <samitolvanen(a)google.com> syscalls/x86: Use COMPAT_SYSCALL_DEFINE0 for IA32 (rt_)sigreturn Andy Lutomirski <luto(a)kernel.org> syscalls/x86: Wire up COMPAT_SYSCALL_DEFINE0 Ed Maste <emaste(a)freebsd.org> perf vendor events s390: Remove name from L1D_RO_EXCL_WRITES description David Howells <dhowells(a)redhat.com> afs: Fix missing cell comparison in afs_test_super() Florian Fainelli <f.fainelli(a)gmail.com> reset: brcmstb: Remove resource checks Florian Fainelli <f.fainelli(a)gmail.com> dt-bindings: reset: Fix brcmstb-reset example Marc Kleine-Budde <mkl(a)pengutronix.de> can: j1939: fix address claim code example Christian Lamparter <chunkeey(a)gmail.com> ath9k: use iowrite32 over __raw_writel Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> MAINTAINERS: Append missed file to the database Paul Menzel <pmenzel(a)molgen.mpg.de> scsi: smartpqi: Update attribute name to `driver_version` Nathan Chancellor <natechancellor(a)gmail.com> cifs: Adjust indentation in smb2_open_file Julian Wiedmann <jwi(a)linux.ibm.com> s390/qeth: fix initialization on old HW Alexandra Winter <wintera(a)linux.ibm.com> s390/qeth: vnicc Fix init to default Alexandra Winter <wintera(a)linux.ibm.com> s390/qeth: Fix vnicc_is_in_use if rx_bcast not set Alexandra Winter <wintera(a)linux.ibm.com> s390/qeth: fix false reporting of VNIC CHAR config failure Julian Wiedmann <jwi(a)linux.ibm.com> s390/qeth: fix qdio teardown after early init error Taehee Yoo <ap420073(a)gmail.com> hsr: reset network header when supervision frame is created Taehee Yoo <ap420073(a)gmail.com> hsr: rename debugfs file when interface name is changed Taehee Yoo <ap420073(a)gmail.com> hsr: add hsr root debugfs directory Thierry Reding <treding(a)nvidia.com> drm/tegra: Fix ordering of cleanup code Neil Armstrong <narmstrong(a)baylibre.com> PCI: amlogic: Fix probed clock names Arnd Bergmann <arnd(a)arndb.de> PM / devfreq: tegra: Add COMMON_CLK dependency Geert Uytterhoeven <geert+renesas(a)glider.be> gpio: Fix error message on out-of-range GPIO in lookup table Dan Carpenter <dan.carpenter(a)oracle.com> scsi: mpt3sas: Fix double free in attach error handling Ming Lei <ming.lei(a)redhat.com> fs: move guard_bio_eod() after bio_set_op_attrs Roman Gushchin <guro(a)fb.com> bpf: cgroup: prevent out-of-order release of cgroup bpf Jon Derrick <jonathan.derrick(a)intel.com> iommu: Remove device link to group on failure Jon Derrick <jonathan.derrick(a)intel.com> iommu/vt-d: Unlink device if failed to add to group Hangbin Liu <liuhangbin(a)gmail.com> selftests: loopback.sh: skip this test if the driver does not support Qianggui Song <qianggui.song(a)amlogic.com> pinctrl: meson: Fix wrong shift value when get drive-strength Swapna Manupati <swapna.manupati(a)xilinx.com> gpio: zynq: Fix for bug in zynq_gpio_restore_context API Peter Ujfalusi <peter.ujfalusi(a)ti.com> mtd: onenand: omap2: Pass correct flags for prep_dma_memcpy Daniel Baluta <daniel.baluta(a)nxp.com> ASoC: SOF: imx8: Fix dsp_box offset wenxu <wenxu(a)ucloud.cn> netfilter: nft_flow_offload: fix underflow in flowtable reference counter Arnd Bergmann <arnd(a)arndb.de> pinctrl: lochnagar: select GPIOLIB Olivier Moysan <olivier.moysan(a)st.com> ASoC: stm32: spdifrx: fix input pin state management Olivier Moysan <olivier.moysan(a)st.com> ASoC: stm32: spdifrx: fix race condition in irq handler Olivier Moysan <olivier.moysan(a)st.com> ASoC: stm32: spdifrx: fix inconsistent lock state Daniel Baluta <daniel.baluta(a)nxp.com> ASoC: soc-core: Set dpcm_playback / dpcm_capture Colin Ian King <colin.king(a)canonical.com> ASoC: SOF: imx8: fix memory allocation failure check on priv->pd_dev Stefan Wahren <wahrenst(a)gmx.net> i2c: bcm2835: Store pointer to bus clock Christophe Kerello <christophe.kerello(a)st.com> mtd: rawnand: stm32_fmc2: avoid to lock the CPU bus Kaike Wan <kaike.wan(a)intel.com> IB/hfi1: Don't cancel unused work item Selvin Xavier <selvin.xavier(a)broadcom.com> RDMA/bnxt_re: Fix Send Work Entry state check while polling completions Selvin Xavier <selvin.xavier(a)broadcom.com> RDMA/bnxt_re: Avoid freeing MR resources if dereg fails Tony Lindgren <tony(a)atomide.com> phy: mapphone-mdm6600: Fix uninitialized status value regression Ran Bi <ran.bi(a)mediatek.com> rtc: mt6397: fix alarm register overwrite Jiri Kosina <jkosina(a)suse.cz> HID: hidraw, uhid: Always report EPOLLOUT ------------- Diffstat: Documentation/ABI/stable/sysfs-driver-mlxreg-io | 13 +- Documentation/ABI/testing/sysfs-bus-mei | 2 +- Documentation/admin-guide/device-mapper/index.rst | 1 + .../bindings/reset/brcm,brcmstb-reset.txt | 2 +- .../sound/mt8183-mt6358-ts3a227-max98357.txt | 4 +- Documentation/networking/j1939.rst | 2 +- Documentation/scsi/smartpqi.txt | 2 +- MAINTAINERS | 1 + Makefile | 4 +- arch/arm/kernel/smp.c | 4 + arch/arm/kernel/topology.c | 10 +- arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 2 + arch/arm64/crypto/aes-neonbs-glue.c | 2 +- arch/hexagon/include/asm/atomic.h | 8 +- arch/hexagon/include/asm/bitops.h | 8 +- arch/hexagon/include/asm/cmpxchg.h | 2 +- arch/hexagon/include/asm/futex.h | 6 +- arch/hexagon/include/asm/spinlock.h | 20 +- arch/hexagon/kernel/stacktrace.c | 4 +- arch/hexagon/kernel/vm_entry.S | 2 +- arch/mips/boot/compressed/Makefile | 3 + arch/mips/include/asm/vdso/gettimeofday.h | 13 - arch/mips/kernel/cacheinfo.c | 27 +- arch/mips/pci/pci-xtalk-bridge.c | 5 +- arch/mips/sgi-ip27/ip27-irq.c | 4 + arch/mips/vdso/vgettimeofday.c | 20 + arch/nds32/include/asm/cacheflush.h | 11 +- arch/powerpc/platforms/powernv/pci.c | 17 + arch/riscv/mm/cacheflush.c | 1 + arch/x86/entry/syscall_32.c | 8 +- arch/x86/entry/syscall_64.c | 14 +- arch/x86/entry/syscalls/syscall_32.tbl | 8 +- arch/x86/ia32/ia32_signal.c | 5 +- arch/x86/include/asm/syscall_wrapper.h | 53 ++- block/bio.c | 12 +- crypto/algif_skcipher.c | 2 +- drivers/clk/clk.c | 1 + drivers/clk/imx/clk-pll14xx.c | 40 +- drivers/clk/meson/axg-audio.c | 2 +- drivers/clk/samsung/clk-exynos5420.c | 2 + drivers/crypto/cavium/nitrox/nitrox_main.c | 9 +- drivers/crypto/geode-aes.c | 440 +++++++-------------- drivers/crypto/geode-aes.h | 15 +- drivers/crypto/hisilicon/Kconfig | 1 + drivers/crypto/virtio/virtio_crypto_algs.c | 9 + drivers/devfreq/Kconfig | 1 + drivers/dma/dw/platform.c | 2 +- drivers/dma/ioat/dma.c | 3 +- drivers/dma/k3dma.c | 12 +- drivers/gpio/gpio-mpc8xxx.c | 1 + drivers/gpio/gpio-zynq.c | 8 +- drivers/gpio/gpiolib.c | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 61 +++ drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 3 + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 85 +--- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 99 ++--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 15 +- drivers/gpu/drm/amd/include/discovery.h | 1 - drivers/gpu/drm/arm/malidp_mw.c | 2 +- drivers/gpu/drm/tegra/drm.c | 14 +- drivers/gpu/drm/virtio/virtgpu_ioctl.c | 28 +- drivers/hid/hidraw.c | 7 +- drivers/hid/uhid.c | 5 +- drivers/i2c/busses/i2c-bcm2835.c | 17 +- drivers/iio/imu/adis16480.c | 6 +- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 7 +- drivers/infiniband/core/counters.c | 12 +- drivers/infiniband/hw/bnxt_re/ib_verbs.c | 4 +- drivers/infiniband/hw/bnxt_re/qplib_fp.c | 12 +- drivers/infiniband/hw/hfi1/iowait.c | 4 +- drivers/infiniband/hw/hns/Kconfig | 17 +- drivers/infiniband/hw/hns/Makefile | 8 +- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 18 +- drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 4 +- drivers/infiniband/hw/hns/hns_roce_qp.c | 10 +- drivers/infiniband/hw/hns/hns_roce_restrack.c | 2 +- drivers/infiniband/hw/mlx5/mr.c | 2 +- drivers/infiniband/sw/siw/siw_cm.c | 9 +- drivers/infiniband/ulp/srpt/ib_srpt.c | 24 ++ drivers/iommu/intel-iommu.c | 13 +- drivers/iommu/iommu.c | 1 + drivers/iommu/mtk_iommu.c | 25 +- drivers/iommu/mtk_iommu.h | 1 + drivers/media/i2c/ov6650.c | 79 ++-- drivers/media/platform/aspeed-video.c | 3 +- drivers/media/platform/cadence/cdns-csi2rx.c | 2 +- drivers/media/platform/coda/coda-common.c | 4 +- drivers/media/platform/exynos4-is/fimc-isp-video.c | 2 +- drivers/media/platform/rcar-vin/rcar-v4l2.c | 3 +- drivers/memory/mtk-smi.c | 4 + drivers/misc/enclosure.c | 3 +- drivers/mtd/nand/onenand/omap2.c | 3 +- drivers/mtd/nand/raw/stm32_fmc2_nand.c | 38 +- drivers/mtd/spi-nor/spi-nor.c | 4 +- .../net/wireless/ath/ath9k/ath9k_pci_owl_loader.c | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 20 +- drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 8 +- drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 7 +- drivers/net/wireless/realtek/rtlwifi/regd.c | 2 +- drivers/net/wireless/rsi/rsi_91x_usb.c | 2 +- drivers/pci/controller/dwc/pci-meson.c | 6 +- drivers/pci/controller/dwc/pcie-designware-host.c | 11 +- drivers/pci/controller/pci-aardvark.c | 42 +- drivers/pci/hotplug/pciehp_core.c | 25 +- drivers/pci/pci-driver.c | 3 +- drivers/pci/pcie/ptm.c | 2 +- drivers/pci/probe.c | 1 + drivers/phy/motorola/phy-mapphone-mdm6600.c | 11 +- drivers/pinctrl/cirrus/Kconfig | 1 + drivers/pinctrl/intel/pinctrl-lewisburg.c | 171 ++++---- drivers/pinctrl/meson/pinctrl-meson.c | 1 + drivers/pinctrl/sh-pfc/core.c | 16 +- drivers/pinctrl/sh-pfc/sh_pfc.h | 4 +- drivers/pinctrl/ti/pinctrl-ti-iodelay.c | 2 +- drivers/platform/mellanox/mlxbf-tmfifo.c | 19 +- drivers/platform/mips/cpu_hwmon.c | 2 +- drivers/platform/x86/asus-wmi.c | 8 +- drivers/platform/x86/gpd-pocket-fan.c | 25 +- drivers/reset/reset-brcmstb.c | 6 - drivers/rtc/rtc-bd70528.c | 1 + drivers/rtc/rtc-brcmstb-waketimer.c | 1 + drivers/rtc/rtc-msm6242.c | 3 +- drivers/rtc/rtc-mt6397.c | 47 ++- drivers/s390/net/qeth_core_main.c | 29 +- drivers/s390/net/qeth_l2_main.c | 10 +- drivers/s390/net/qeth_l3_main.c | 2 +- drivers/s390/net/qeth_l3_sys.c | 40 +- drivers/scsi/cxgbi/libcxgbi.c | 3 +- drivers/scsi/mpt3sas/mpt3sas_base.c | 1 - drivers/scsi/sd.c | 18 +- drivers/scsi/ufs/ufs_bsg.c | 2 +- drivers/spi/spi-atmel.c | 10 +- drivers/spi/spi-fsl-lpspi.c | 2 +- drivers/spi/spi-pxa2xx.c | 7 + drivers/spi/spi-rspi.c | 8 +- drivers/spi/spi-sprd.c | 2 +- drivers/staging/media/hantro/hantro_g1_h264_dec.c | 2 +- drivers/staging/media/hantro/hantro_h264.c | 73 ++-- drivers/staging/media/ipu3/include/intel-ipu3.h | 2 +- drivers/staging/media/sunxi/cedrus/cedrus_h264.c | 4 +- drivers/target/target_core_iblock.c | 4 +- drivers/tty/serial/imx.c | 2 +- drivers/tty/serial/pch_uart.c | 5 +- fs/affs/super.c | 6 - fs/afs/dir.c | 18 +- fs/afs/super.c | 1 + fs/btrfs/file.c | 5 +- fs/buffer.c | 8 +- fs/cifs/smb2file.c | 2 +- fs/f2fs/data.c | 2 +- fs/f2fs/file.c | 2 +- fs/gfs2/file.c | 30 ++ fs/internal.h | 2 +- fs/mpage.c | 2 +- fs/nfs/nfs2xdr.c | 2 +- fs/nfs/nfs4proc.c | 38 +- fs/nfsd/Kconfig | 2 +- fs/nfsd/nfs4proc.c | 3 +- fs/nfsd/nfs4recover.c | 12 +- fs/ocfs2/journal.c | 8 + fs/ubifs/journal.c | 2 +- fs/ubifs/orphan.c | 17 +- fs/ubifs/super.c | 4 +- include/asm-generic/cacheflush.h | 33 +- include/crypto/internal/skcipher.h | 30 -- include/crypto/skcipher.h | 30 ++ include/linux/uaccess.h | 12 + include/sound/simple_card_utils.h | 1 + include/trace/events/afs.h | 12 +- include/trace/events/rpcrdma.h | 25 ++ include/uapi/rdma/nes-abi.h | 115 ------ kernel/bpf/cgroup.c | 11 +- kernel/cred.c | 4 +- kernel/trace/bpf_trace.c | 6 +- mm/maccess.c | 45 ++- net/core/skmsg.c | 13 +- net/hsr/hsr_debugfs.c | 36 +- net/hsr/hsr_device.c | 2 + net/hsr/hsr_main.c | 5 + net/hsr/hsr_main.h | 10 + net/hsr/hsr_netlink.c | 1 + net/netfilter/nf_tables_offload.c | 26 +- net/netfilter/nft_flow_offload.c | 3 - net/netfilter/nft_meta.c | 10 +- net/rxrpc/ar-internal.h | 10 +- net/rxrpc/call_accept.c | 60 +-- net/rxrpc/conn_event.c | 16 +- net/rxrpc/conn_service.c | 4 + net/rxrpc/input.c | 18 - net/rxrpc/rxkad.c | 5 +- net/rxrpc/security.c | 70 ++-- net/sched/sch_cake.c | 1 + net/socket.c | 1 + net/sunrpc/xprtrdma/frwr_ops.c | 4 +- net/sunrpc/xprtrdma/rpc_rdma.c | 1 + net/sunrpc/xprtrdma/transport.c | 3 + net/sunrpc/xprtrdma/verbs.c | 103 +++-- net/sunrpc/xprtrdma/xprt_rdma.h | 3 + net/unix/af_unix.c | 19 + scripts/link-vmlinux.sh | 7 +- scripts/package/mkdebian | 2 +- security/tomoyo/common.c | 9 +- security/tomoyo/domain.c | 15 +- security/tomoyo/group.c | 9 +- security/tomoyo/util.c | 6 +- sound/soc/fsl/fsl_esai.c | 12 + sound/soc/intel/Kconfig | 3 + sound/soc/sh/rcar/core.c | 20 +- sound/soc/soc-core.c | 2 + sound/soc/soc-pcm.c | 2 + sound/soc/sof/imx/imx8.c | 5 +- sound/soc/sof/intel/Kconfig | 10 +- sound/soc/stm/stm32_spdifrx.c | 40 +- tools/lib/bpf/Makefile | 2 +- tools/pci/pcitest.c | 1 + .../perf/pmu-events/arch/s390/cf_z14/extended.json | 2 +- tools/testing/selftests/firmware/fw_lib.sh | 6 + tools/testing/selftests/net/forwarding/loopback.sh | 8 + tools/testing/selftests/rseq/settings | 1 + 222 files changed, 1849 insertions(+), 1423 deletions(-)

3 years, 5 months

8
215
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror September 2020