- Kernel - mailweb.openeuler.org

[PATCH 1/4] can: j1939: fix support for multipacket broadcast message
by Yang Yingliang 25 Aug '20

25 Aug '20

From: Zhang Changzhong <zhangchangzhong(a)huawei.com> mainline inclusion from mainline-v5.9-rc2 commit f4fd77fd87e9b214c26bb2ebd4f90055eaea5ade category: bugfix bugzilla: 39990 CVE: NA --------------------------- Currently j1939_tp_im_involved_anydir() in j1939_tp_recv() check the previously set flags J1939_ECU_LOCAL_DST and J1939_ECU_LOCAL_SRC of incoming skb, thus multipacket broadcast message was aborted by receive side because it may come from remote ECUs and have no exact dst address. Similarly, j1939_tp_cmd_recv() and j1939_xtp_rx_dat() didn't process broadcast message. So fix it by checking and process broadcast message in j1939_tp_recv(), j1939_tp_cmd_recv() and j1939_xtp_rx_dat(). Fixes: 9d71dd0c7009 ("can: add support of SAE J1939 protocol") Signed-off-by: Zhang Changzhong <zhangchangzhong(a)huawei.com> Link: https://lore.kernel.org/r/1596599425-5534-2-git-send-email-zhangchangzhong@… Acked-by: Oleksij Rempel <o.rempel(a)pengutronix.de> Signed-off-by: Marc Kleine-Budde <mkl(a)pengutronix.de> Signed-off-by: Zhang Changzhong <zhangchangzhong(a)huawei.com> Reviewed-by: Yue Haibing <yuehaibing(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- net/can/j1939/transport.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/net/can/j1939/transport.c b/net/can/j1939/transport.c index 9f99af5b0b11e..e5188acbb1db7 100644 --- a/net/can/j1939/transport.c +++ b/net/can/j1939/transport.c @@ -1651,8 +1651,12 @@ static void j1939_xtp_rx_rts(struct j1939_priv *priv, struct sk_buff *skb, return; } session = j1939_xtp_rx_rts_session_new(priv, skb); - if (!session) + if (!session) { + if (cmd == J1939_TP_CMD_BAM && j1939_sk_recv_match(priv, skcb)) + netdev_info(priv->ndev, "%s: failed to create TP BAM session\n", + __func__); return; + } } else { if (j1939_xtp_rx_rts_session_active(session, skb)) { j1939_session_put(session); @@ -1829,6 +1833,13 @@ static void j1939_xtp_rx_dat(struct j1939_priv *priv, struct sk_buff *skb) else j1939_xtp_rx_dat_one(session, skb); } + + if (j1939_cb_is_broadcast(skcb)) { + session = j1939_session_get_by_addr(priv, &skcb->addr, false, + false); + if (session) + j1939_xtp_rx_dat_one(session, skb); + } } /* j1939 main intf */ @@ -1920,7 +1931,7 @@ static void j1939_tp_cmd_recv(struct j1939_priv *priv, struct sk_buff *skb) if (j1939_tp_im_transmitter(skcb)) j1939_xtp_rx_rts(priv, skb, true); - if (j1939_tp_im_receiver(skcb)) + if (j1939_tp_im_receiver(skcb) || j1939_cb_is_broadcast(skcb)) j1939_xtp_rx_rts(priv, skb, false); break; @@ -1984,7 +1995,7 @@ int j1939_tp_recv(struct j1939_priv *priv, struct sk_buff *skb) { struct j1939_sk_buff_cb *skcb = j1939_skb_to_cb(skb); - if (!j1939_tp_im_involved_anydir(skcb)) + if (!j1939_tp_im_involved_anydir(skcb) && !j1939_cb_is_broadcast(skcb)) return 0; switch (skcb->addr.pgn) { -- 2.25.1

1 3

[RESEND,PATCH 0/7] Improvements and fixes
by Roberto Sassu 25 Aug '20

25 Aug '20

Resending due to conflicts with existing code. This patch set provides some improvements and fixes. The first three patches solve a permission problem caused by EVM. EVM denies xattr operations also for files that are not appraised by IMA. If only executables are appraised, xattr operations on the other files should be allowed, even if metadata verification fails (for example due to missing security.evm). At the moment, in openEuler we use EVM_ALLOW_METADATA_WRITES to avoid this problem (EVM does not check metadata integrity), but it would be useful to do the verification for example to prevent accidental changes on immutable metadata. The fourth patch enables the choice of the algorithm for the HMAC and ensures that the parameters passed to the functions which handle the HMAC are consistent with the algorithm chosen. The last three patches are simple bug fixes. Roberto Sassu (7): evm: Move hooks outside LSM infrastructure evm: Extend API of post hooks to pass the result of pre hooks evm: Return -EAGAIN to ignore verification failures evm: Propagate choice of HMAC algorithm in evm_crypto.c ima: Fix datalen check in ima_write_data() evm: Fix validation of fake xattr passed by IMA evm: Initialize saved_evm_status fs/attr.c | 7 ++- fs/xattr.c | 65 +++++++++++++++++--------- include/linux/evm.h | 18 +++++--- security/integrity/evm/Kconfig | 32 +++++++++++++ security/integrity/evm/evm.h | 1 + security/integrity/evm/evm_crypto.c | 15 ++++-- security/integrity/evm/evm_main.c | 71 +++++++++++++++++++++-------- security/integrity/ima/ima_fs.c | 2 +- security/integrity/integrity.h | 2 +- security/security.c | 18 ++------ 10 files changed, 159 insertions(+), 72 deletions(-) -- 2.27.GIT

2 8

[PATCH 00/35] patches for iocost
by Yang Yingliang 25 Aug '20

25 Aug '20

patches 1-31 are from mainline patch 32 add cgroup-V1 support patch 33 and 34 are from ali-cloud-kernel(https://github.com/alibaba/cloud-kernel.git), they fix bug when introduce iocost in lower kernel. patch 35 fix a bug when using iocost in sq Dan Carpenter (1): iocost: don't nest spin_lock_irq in ioc_weight_write() Jiufei Xue (3): iocost: check active_list of all the ancestors in iocg_activate() iocost: fix NULL pointer dereference in ioc_rqos_throttle iocost: fix a deadlock in ioc_rqos_throttle() Stephen Rothwell (1): blkcg: blk-iocost: predeclare used structs Tejun Heo (27): blk-mq: add optional request->alloc_time_ns block/rq_qos: add rq_qos_merge() block/rq_qos: implement rq_qos_ops->queue_depth_changed() blkcg: separate blkcg_conf_get_disk() out of blkg_conf_prep() cgroup: add cgroup_parse_float() cgroup: Move cgroup_parse_float() implementation out of CONFIG_SYSFS blkcg: pass @q and @blkcg into blkcg_pol_alloc_pd_fn() blkcg: make ->cpd_init_fn() optional blkcg: implement blk-iocost blkcg: add tools/cgroup/iocost_monitor.py blkcg: add tools/cgroup/iocost_coef_gen.py blkcg: fix missing free on error path of blk_iocost_init() blkcg: add missing NULL check in ioc_cpd_alloc() blk-iocost: Fix incorrect operation order during iocg free blk-iocost: Account force-charged overage in absolute vtime blk-iocost: Don't let merges push vtime into the future iocost_monitor: Always use strings for json values iocost_monitor: Report more info with higher accuracy iocost_monitor: Report debt iocost: better trace vrate changes iocost: improve nr_lagging handling iocost: bump up default latency targets for hard disks iocost: over-budget forced IOs should schedule async delay iocost: Fix iocost_monitor.py due to helper type mismatch blk-iocost: fix incorrect vtime comparison in iocg_is_idle() blkcg: blkcg_activate_policy() should initialize ancestors first blkcg: Fix multiple bugs in blkcg_activate_policy() Waiman Long (1): blk-iocost: Fix error on iocost_ioc_vrate_adj Yu Kuai (2): iocost: add cgroup V1 suport blk-iocost: fix spin_lock won't release in sq Documentation/admin-guide/cgroup-v2.rst | 103 + block/Kconfig | 13 + block/Makefile | 1 + block/bfq-cgroup.c | 5 +- block/blk-cgroup.c | 136 +- block/blk-core.c | 4 + block/blk-iocost.c | 2547 +++++++++++++++++++++++ block/blk-iolatency.c | 5 +- block/blk-mq.c | 13 +- block/blk-rq-qos.c | 21 + block/blk-rq-qos.h | 5 + block/blk-settings.c | 2 +- block/blk-throttle.c | 6 +- block/blk-wbt.c | 18 +- block/blk-wbt.h | 4 - block/cfq-iosched.c | 5 +- include/linux/blk-cgroup.h | 4 +- include/linux/blk_types.h | 3 + include/linux/blkdev.h | 14 +- include/linux/cgroup.h | 2 + include/trace/events/iocost.h | 178 ++ kernel/cgroup/cgroup.c | 43 + tools/cgroup/iocost_coef_gen.py | 178 ++ tools/cgroup/iocost_monitor.py | 277 +++ 24 files changed, 3522 insertions(+), 65 deletions(-) create mode 100644 block/blk-iocost.c create mode 100644 include/trace/events/iocost.h create mode 100644 tools/cgroup/iocost_coef_gen.py create mode 100644 tools/cgroup/iocost_monitor.py -- 2.25.1

1 35

[PATCH 0/5] Support idle-haltpoll in ARM
by Yang Yingliang 25 Aug '20

25 Aug '20

Idle-haltpoll has been supported in X86. Now, we will provide it in ARM. Xiangyou Xie (5): arm64: Optimize ttwu IPI cpuidle-haltpoll: Use arch_cpu_idle() to replace default_idle() arm64: Add some definitions of kvm_para* ARM: cpuidle: Add support for cpuidle-haltpoll driver for ARM config: set default value of haltpoll arch/arm64/Kconfig | 3 +++ arch/arm64/configs/euleros_defconfig | 2 ++ arch/arm64/configs/hulk_defconfig | 2 ++ arch/arm64/configs/openeuler_defconfig | 4 +++- arch/arm64/include/asm/kvm_para.h | 27 ++++++++++++++++++++++++++ arch/arm64/include/asm/thread_info.h | 3 +++ arch/arm64/kernel/process.c | 4 ++++ arch/x86/kernel/process.c | 1 + drivers/cpuidle/Kconfig | 4 ++-- drivers/cpuidle/cpuidle-haltpoll.c | 6 +++--- drivers/cpuidle/governors/haltpoll.c | 6 +++++- drivers/cpuidle/poll_state.c | 3 +++ 12 files changed, 58 insertions(+), 7 deletions(-) create mode 100644 arch/arm64/include/asm/kvm_para.h -- 2.25.1

1 5

[PATCH 0/4] kvm: arm64: emulate ID registers
by Yang Yingliang 25 Aug '20

25 Aug '20

In AArch64, guest will read the same values of the ID regsiters with host. Both of them read the values from arm64_ftr_regs. This patch series add support to emulate and configure ID registers so that we can control the value of ID registers that guest read. Peng Liang (4): arm64: add a helper function to traverse arm64_ftr_regs kvm: arm64: emulate the ID registers kvm: arm64: make ID registers configurable kvm: arm64: add KVM_CAP_ARM_CPU_FEATURE extension arch/arm64/include/asm/cpufeature.h | 2 + arch/arm64/include/asm/kvm_host.h | 2 + arch/arm64/kernel/cpufeature.c | 13 ++++++ arch/arm64/kvm/sys_regs.c | 71 ++++++++++++++++++++++------- include/uapi/linux/kvm.h | 13 ++++++ virt/kvm/arm/arm.c | 23 ++++++++++ 6 files changed, 107 insertions(+), 17 deletions(-) -- 2.25.1

1 4

[PATCH 01/22] arm64: mm: define NET_IP_ALIGN to 0
by Yang Yingliang 25 Aug '20

25 Aug '20

From: Ard Biesheuvel <ard.biesheuvel(a)linaro.org> mainline inclusion from mainline-v4.20-rc2 commit 26a4676faa1ad5d99317e0cd701e5d6f3e716b77 category: feature bugzilla: NA CVE: NA --------------------------- On arm64, there is no need to add 2 bytes of padding to the start of each network buffer just to make the IP header appear 32-bit aligned. Since this might actually adversely affect DMA performance some platforms, let's override NET_IP_ALIGN to 0 to get rid of this padding. Acked-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Tested-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Acked-by: Mark Rutland <mark.rutland(a)arm.com> Acked-by: Will Deacon <will.deacon(a)arm.com> Signed-off-by: Ard Biesheuvel <ard.biesheuvel(a)linaro.org> Signed-off-by: Catalin Marinas <catalin.marinas(a)arm.com> Signed-off-by: Hanjun Guo <guohanjun(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> Reviewed-by: Xie XiuQi <xiexiuqi(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- arch/arm64/include/asm/processor.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/arm64/include/asm/processor.h b/arch/arm64/include/asm/processor.h index 98529c8b5d313..7695a5117ff20 100644 --- a/arch/arm64/include/asm/processor.h +++ b/arch/arm64/include/asm/processor.h @@ -24,6 +24,14 @@ #define KERNEL_DS UL(-1) #define USER_DS (TASK_SIZE_64 - 1) +/* + * On arm64 systems, unaligned accesses by the CPU are cheap, and so there is + * no point in shifting all network buffers by 2 bytes just to make some IP + * header fields appear aligned in memory, potentially sacrificing some DMA + * performance on some platforms. + */ +#define NET_IP_ALIGN 0 + #ifndef __ASSEMBLY__ /* -- 2.25.1

1 21

[PATCH 00/25] ILP32 for ARM64
by Yang Yingliang 25 Aug '20

25 Aug '20

Andrew Pinski (3): arm64: rename COMPAT to AARCH32_EL0 arm64: uapi: set __BITS_PER_LONG correctly for ILP32 and LP64 arm64:ilp32: add ARM64_ILP32 to Kconfig Dave Martin (1): arm64: signal: Make parse_user_sigframe() independent of rt_sigframe layout James Morse (1): ptrace: Add compat PTRACE_{G, S}ETSIGMASK handlers Philipp Tomsich (1): arm64:ilp32: add vdso-ilp32 and use for signal return Xiongfeng Wang (2): arm64: ilp32: fix compile warning cause by 'VA_BITS' config: add CONFIG_ARM64_ILP32 in defconfigs Yury Norov (17): compat ABI: use non-compat openat and open_by_handle_at variants 32-bit userspace ABI: introduce ARCH_32BIT_OFF_T config option asm-generic: Drop getrlimit and setrlimit syscalls from default list thread: move thread bits accessors to separated file arm64: ilp32: add documentation on the ILP32 ABI for ARM64 arm64: rename functions that reference compat term arm64: introduce is_a32_compat_{task, thread} for AArch32 compat arm64: ilp32: add is_ilp32_compat_{task, thread} and TIF_32BIT_AARCH64 arm64: introduce binfmt_elf32.c arm64: change compat_elf_hwcap and compat_elf_hwcap2 prefix to a32 arm64: ilp32: introduce binfmt_ilp32.c arm64: ilp32: share aarch32 syscall handlers arm64: ilp32: introduce syscall table for ILP32 arm64: signal: share lp64 signal structures and routines to ilp32 arm64: signal32: move ilp32 and aarch32 common code to separated file arm64: ilp32: introduce ilp32-specific sigframe and ucontext arm64: ptrace: handle ptrace_request differently for aarch32 and ilp32 Documentation/arm64/ilp32.txt | 52 +++ arch/Kconfig | 15 + arch/arc/Kconfig | 1 + arch/arc/include/uapi/asm/unistd.h | 1 + arch/arm/Kconfig | 1 + arch/arm64/Kconfig | 17 +- arch/arm64/Makefile | 3 + arch/arm64/configs/euleros_defconfig | 2 + arch/arm64/configs/hulk_defconfig | 2 + arch/arm64/configs/openeuler_defconfig | 2 + arch/arm64/configs/storage_ci_defconfig | 2 + arch/arm64/configs/syzkaller_defconfig | 2 + arch/arm64/include/asm/compat.h | 19 +- arch/arm64/include/asm/elf.h | 36 +- arch/arm64/include/asm/fpsimd.h | 2 +- arch/arm64/include/asm/ftrace.h | 2 +- arch/arm64/include/asm/hwcap.h | 8 +- arch/arm64/include/asm/is_compat.h | 78 ++++ arch/arm64/include/asm/memory.h | 4 + arch/arm64/include/asm/processor.h | 13 +- arch/arm64/include/asm/ptrace.h | 12 +- arch/arm64/include/asm/seccomp.h | 2 +- arch/arm64/include/asm/signal32.h | 19 +- arch/arm64/include/asm/signal32_common.h | 13 + arch/arm64/include/asm/signal_common.h | 303 +++++++++++++++ arch/arm64/include/asm/signal_ilp32.h | 23 ++ arch/arm64/include/asm/syscall.h | 10 +- arch/arm64/include/asm/thread_info.h | 4 +- arch/arm64/include/asm/unistd.h | 6 +- arch/arm64/include/asm/vdso.h | 6 + arch/arm64/include/uapi/asm/bitsperlong.h | 9 +- arch/arm64/include/uapi/asm/unistd.h | 13 + arch/arm64/kernel/Makefile | 8 +- arch/arm64/kernel/armv8_deprecated.c | 6 +- arch/arm64/kernel/asm-offsets.c | 9 +- arch/arm64/kernel/binfmt_elf32.c | 35 ++ arch/arm64/kernel/binfmt_ilp32.c | 87 +++++ arch/arm64/kernel/cpufeature.c | 28 +- arch/arm64/kernel/cpuinfo.c | 18 +- arch/arm64/kernel/debug-monitors.c | 4 +- arch/arm64/kernel/entry.S | 6 +- arch/arm64/kernel/head.S | 2 +- arch/arm64/kernel/hw_breakpoint.c | 8 +- arch/arm64/kernel/perf_callchain.c | 28 +- arch/arm64/kernel/perf_regs.c | 4 +- arch/arm64/kernel/process.c | 13 +- arch/arm64/kernel/ptrace.c | 38 +- arch/arm64/kernel/signal.c | 348 ++++-------------- arch/arm64/kernel/signal32.c | 111 +++--- arch/arm64/kernel/signal32_common.c | 37 ++ arch/arm64/kernel/signal_ilp32.c | 67 ++++ arch/arm64/kernel/sys32.c | 104 +----- arch/arm64/kernel/sys32_common.c | 106 ++++++ arch/arm64/kernel/sys_compat.c | 12 +- arch/arm64/kernel/sys_ilp32.c | 75 ++++ arch/arm64/kernel/syscall.c | 37 +- arch/arm64/kernel/traps.c | 3 +- arch/arm64/kernel/vdso-ilp32/.gitignore | 2 + arch/arm64/kernel/vdso-ilp32/Makefile | 89 +++++ arch/arm64/kernel/vdso-ilp32/vdso-ilp32.S | 22 ++ arch/arm64/kernel/vdso-ilp32/vdso-ilp32.lds.S | 84 +++++ arch/arm64/kernel/vdso.c | 62 +++- arch/arm64/kernel/vdso/gettimeofday.c | 6 + arch/arm64/kernel/vdso/vdso.S | 6 +- arch/arm64/mm/mmap.c | 2 +- arch/c6x/include/uapi/asm/unistd.h | 1 + arch/h8300/Kconfig | 1 + arch/h8300/include/uapi/asm/unistd.h | 1 + arch/hexagon/Kconfig | 1 + arch/hexagon/include/uapi/asm/unistd.h | 1 + arch/m68k/Kconfig | 1 + arch/microblaze/Kconfig | 1 + arch/mips/Kconfig | 1 + arch/nds32/Kconfig | 1 + arch/nds32/include/uapi/asm/unistd.h | 1 + arch/nios2/Kconfig | 1 + arch/nios2/include/uapi/asm/unistd.h | 1 + arch/openrisc/Kconfig | 1 + arch/openrisc/include/uapi/asm/unistd.h | 1 + arch/parisc/Kconfig | 1 + arch/powerpc/Kconfig | 1 + arch/riscv/Kconfig | 1 + arch/riscv/include/asm/unistd.h | 1 + arch/sh/Kconfig | 1 + arch/sparc/Kconfig | 1 + arch/unicore32/Kconfig | 1 + arch/unicore32/include/uapi/asm/unistd.h | 1 + arch/x86/Kconfig | 1 + arch/x86/um/Kconfig | 1 + arch/xtensa/Kconfig | 1 + drivers/clocksource/arm_arch_timer.c | 4 +- include/linux/fcntl.h | 2 +- include/linux/sched.h | 1 + include/linux/thread_bits.h | 87 +++++ include/linux/thread_info.h | 75 +--- include/uapi/asm-generic/unistd.h | 10 +- kernel/ptrace.c | 47 ++- scripts/checksyscalls.sh | 5 + 98 files changed, 1679 insertions(+), 726 deletions(-) create mode 100644 Documentation/arm64/ilp32.txt create mode 100644 arch/arm64/include/asm/is_compat.h create mode 100644 arch/arm64/include/asm/signal32_common.h create mode 100644 arch/arm64/include/asm/signal_common.h create mode 100644 arch/arm64/include/asm/signal_ilp32.h create mode 100644 arch/arm64/kernel/binfmt_elf32.c create mode 100644 arch/arm64/kernel/binfmt_ilp32.c create mode 100644 arch/arm64/kernel/signal32_common.c create mode 100644 arch/arm64/kernel/signal_ilp32.c create mode 100644 arch/arm64/kernel/sys32_common.c create mode 100644 arch/arm64/kernel/sys_ilp32.c create mode 100644 arch/arm64/kernel/vdso-ilp32/.gitignore create mode 100644 arch/arm64/kernel/vdso-ilp32/Makefile create mode 100644 arch/arm64/kernel/vdso-ilp32/vdso-ilp32.S create mode 100644 arch/arm64/kernel/vdso-ilp32/vdso-ilp32.lds.S create mode 100644 include/linux/thread_bits.h -- 2.25.1

1 25

[PATCH 000/169] backport stable-4.19.140
by Yang Yingliang 25 Aug '20

25 Aug '20

Aditya Pakki (2): drm/radeon: Fix reference count leaks caused by pm_runtime_get_sync drm/nouveau: fix multiple instances of reference count leaks Alim Akhtar (1): arm64: dts: exynos: Fix silent hang after boot on Espresso Andrii Nakryiko (1): tools, build: Propagate build failures from tools/build/Makefile.build Aneesh Kumar K.V (1): powerpc/book3s64/pkeys: Use PVR check instead of cpu feature Arnd Bergmann (1): leds: lm355x: avoid enum conversion warning Bartosz Golaszewski (1): irqchip/irq-mtk-sysirq: Replace spinlock with raw_spinlock Bjorn Helgaas (1): PCI: Fix pci_cfg_wait queue locking problem Bolarinwa Olayemi Saheed (1): iwlegacy: Check the return value of pcie_capability_read_*() Brant Merryman (2): USB: serial: cp210x: re-enable auto-RTS on open USB: serial: cp210x: enable usb generic throttle/unthrottle Chris Packham (1): net: dsa: mv88e6xxx: MV88E6097 does not support jumbo configuration Christian Eggers (1): spi: spidev: Align buffers for DMA Christian König (1): drm/radeon: disable AGP by default Christophe JAILLET (5): video: pxafb: Fix the function used to balance a 'dma_alloc_coherent()' call scsi: cumana_2: Fix different dev_id between request_irq() and free_irq() scsi: powertec: Fix different dev_id between request_irq() and free_irq() scsi: eesox: Fix different dev_id between request_irq() and free_irq() net: spider_net: Fix the size used in a 'dma_free_coherent()' call Chuck Lever (1): svcrdma: Fix page leak in svc_rdma_recv_read_chunk() Chuhong Yuan (2): media: omap3isp: Add missed v4l2_ctrl_handler_free() for preview_init_entities() media: exynos4-is: Add missed check for pinctrl_lookup_state() Chunfeng Yun (1): usb: mtu3: clear dual mode of u3port when disable device Colin Ian King (3): drm/arm: fix unintentional integer overflow on left shift drm/radeon: fix array out-of-bounds read and write issues staging: rtl8192u: fix a dubious looking mask before a shift Coly Li (1): bcache: fix super block seq numbers comparision in register_cache_set() Cristian Marussi (1): firmware: arm_scmi: Fix SCMI genpd domain probing Dan Carpenter (5): media: firewire: Using uninitialized values in node_probe() mwifiex: Prevent memory corruption handling keys thermal: ti-soc-thermal: Fix reversed condition in ti_thermal_expose_sensor() Smack: fix another vsscanf out of bounds Smack: prevent underflow in smk_set_cipso() Danesh Petigara (1): usb: bdc: Halt controller on suspend Darrick J. Wong (2): xfs: don't eat an EIO/ENOSPC writeback error when scrubbing data fork xfs: fix reflink quota reservation accounting error Dave Airlie (1): drm/ttm/nouveau: don't call tt destroy callback on alloc failure. Dejin Zheng (2): video: fbdev: sm712fb: fix an issue about iounmap for a wrong address console: newport_con: fix an issue about leak related system resources Dilip Kota (1): spi: lantiq: fix: Rx overflow error in full duplex mode Dmitry Osipenko (1): gpu: host1x: debug: Fix multiple channels emitting messages simultaneously Drew Fustini (1): pinctrl-single: fix pcs_parse_pinconf() return value Emil Velikov (1): drm/mipi: use dcs write for mipi_dsi_dcs_set_tear_scanline Eric Biggers (3): fs/minix: check return value of sb_getblk() fs/minix: don't allow getting deleted inodes fs/minix: reject too-large maximum file size Eric Dumazet (1): x86/fsgsbase/64: Fix NULL deref in 86_fsgsbase_read_task Erik Kaneda (1): ACPICA: Do not increment operation_region reference counts for field units Evan Green (1): ath10k: Acquire tx_lock in tx error paths Evgeny Novikov (2): video: fbdev: neofb: fix memory leak in neo_scan_monitor() usb: gadget: net2280: fix memory leak on probe error handling paths Finn Thain (3): m68k: mac: Don't send IOP message until channel is idle m68k: mac: Fix IOP status/control register writes scsi: mesh: Fix panic after host or bus reset Florinel Iordache (5): fsl/fman: use 32-bit unsigned integer fsl/fman: fix dereference null return value fsl/fman: fix unreachable code fsl/fman: check dereferencing null pointer fsl/fman: fix eth hash table allocation Gilad Ben-Yossef (1): crypto: ccree - fix resource leak on error path Grant Likely (1): HID: input: Fix devices that return multiple bytes in battery report Greg Kroah-Hartman (1): Linux 4.19.140 Hanjun Guo (1): PCI: Release IVRS table in AMD ACS quirk Harish (1): selftests/powerpc: Fix CPU affinity for child process Hector Martin (3): ALSA: usb-audio: fix overeager device match for MacroSilicon MS2109 ALSA: usb-audio: work around streaming quirk for MacroSilicon MS2109 ALSA: usb-audio: add quirk for Pioneer DDJ-RB Heiko Stuebner (3): arm64: dts: rockchip: fix rk3368-lion gmac reset gpio arm64: dts: rockchip: fix rk3399-puma vcc5v0-host gpio arm64: dts: rockchip: fix rk3399-puma gmac reset gpio Hui Wang (1): ALSA: hda - fix the micmute led status for Lenovo ThinkCentre AIO Ira Weiny (1): net/tls: Fix kmap usage Ivan Kokshaysky (1): cpufreq: dt: fix oops on armada37xx Jack Xiao (1): drm/amdgpu: avoid dereferencing a NULL pointer Jakub Kicinski (1): bitfield.h: don't compile-time validate _val in FIELD_FIT Jerome Brunet (1): ASoC: meson: axg-tdm-interface: fix link fmt setup Jian Cai (1): crypto: aesni - add compatibility with IAS Jim Cromie (1): dyndbg: fix a BUG_ON in ddebug_describe_flags Johan Hovold (1): USB: serial: iuu_phoenix: fix led-activity helpers John Allen (1): crypto: ccp - Fix use of merged scatterlists John David Anglin (1): parisc: Implement __smp_store_release and __smp_load_acquire barriers John Garry (1): scsi: scsi_debug: Add check for sdebug_max_queue during module init John Ogness (1): af_packet: TPACKET_V3: fix fill status rwlock imbalance Jon Derrick (1): irqdomain/treewide: Free firmware node after domain removal Julian Anastasov (1): ipvs: allow connection reuse for unconfirmed conntrack Julian Wiedmann (1): s390/qeth: don't process empty bridge port events Kai-Heng Feng (1): leds: core: Flush scheduled work for system suspend Kars Mulder (1): usb: core: fix quirks_param_set() writing to a const pointer Kishon Vijay Abraham I (1): PCI: cadence: Fix updating Vendor ID and Subsystem Vendor ID register Laurent Pinchart (1): drm: panel: simple: Fix bpc for LG LB070WV8 panel Li Heng (1): RDMA/core: Fix return error value in _ib_modify_qp() to negative Lihong Kou (1): Bluetooth: add a mutex lock to avoid UAF in do_enale_set Linus Walleij (2): net: dsa: rtl8366: Fix VLAN semantics net: dsa: rtl8366: Fix VLAN set-up Lu Wei (2): platform/x86: intel-hid: Fix return value check in check_acpi_dev() platform/x86: intel-vbtn: Fix return value check in check_acpi_dev() Lubomir Rintel (1): drm/etnaviv: Fix error path on failure to enable bus clk Luis Chamberlain (1): loop: be paranoid on exit and prevent new additions / removals Marco Felsch (1): drm/imx: tve: fix regulator_disable error path Marek Szyprowski (2): phy: exynos5-usbdrd: Calibrating makes sense only for USB2.0 PHY usb: dwc2: Fix error path in gadget registration Matteo Croce (1): pstore: Fix linking when crypto API disabled Maulik Shah (1): soc: qcom: rpmh-rsc: Set suppress_bind_attrs flag Miaohe Lin (1): net: Set fput_needed iff FDPUT_FPUT is set Michael Ellerman (1): powerpc/boot: Fix CONFIG_PPC_MPC52XX references Michael Tretter (1): drm/debugfs: fix plain echo to connector "force" attribute Mikhail Malygin (1): RDMA/rxe: Prevent access to wr->next ptr afrer wr is posted to send queue Mikulas Patocka (2): crypto: hisilicon - don't sleep of CRYPTO_TFM_REQ_MAY_SLEEP was not specified crypto: cpt - don't sleep of CRYPTO_TFM_REQ_MAY_SLEEP was not specified Milton Miller (1): powerpc/vdso: Fix vdso cpu truncation Mirko Dietrich (1): ALSA: usb-audio: Creative USB X-Fi Pro SB1095 volume knob support Nathan Huckleberry (1): ARM: 8992/1: Fix unwind_frame for clang-built kernels Navid Emamdoost (1): drm/etnaviv: fix ref count leak via pm_runtime_get_sync Nick Desaulniers (1): tracepoint: Mark __tracepoint_string's __used Nicolas Boichat (2): Bluetooth: hci_h5: Set HCI_UART_RESET_ON_INIT to correct flags Bluetooth: hci_serdev: Only unregister device if it was registered Niklas Söderlund (2): ARM: dts: gose: Fix ports node name for adv7180 ARM: dts: gose: Fix ports node name for adv7612 Oleksandr Andrushchenko (1): xen/gntdev: Fix dmabuf import with non-zero sgt offset Paul E. McKenney (2): fs/btrfs: Add cond_resched() for try_release_extent_mapping() stalls mm/mmap.c: Add cond_resched() for exit_mmap() CPU stalls Pavel Machek (1): ocfs2: fix unbalanced locking Peng Liu (1): sched: correct SD_flags returned by tl->sd_flags() Pierre-Louis Bossart (1): ASoC: Intel: bxt_rt298: add missing .owner field Prasanna Kerekoppa (1): brcmfmac: To fix Bss Info flag definition Bug Qingyu Li (1): net/nfc/rawsock.c: add CAP_NET_RAW check. Qiushi Wu (2): EDAC: Fix reference count leaks agp/intel: Fix a memory leak on module initialisation failure Ricardo Cañuelo (1): arm64: dts: hisilicon: hikey: fixes to comply with adi, adv7533 DT binding Rob Clark (1): drm/msm: ratelimit crtc event overflow error Roger Pau Monne (2): xen/balloon: fix accounting in alloc_xenballooned_pages error path xen/balloon: make the balloon wait interruptible Romain Naour (1): include/asm-generic/vmlinux.lds.h: align ro_after_init Sai Prakash Ranjan (1): coresight: tmc: Fix TMC mode read in tmc_read_unprepare_etb() Sandipan Das (1): selftests/powerpc: Fix online CPU selection Sasi Kumar (1): bdc: Fix bug causing crash after multiple disconnects Sedat Dilek (1): crypto: aesni - Fix build with LLVM_IAS=1 Sivaprakash Murugesan (1): mtd: rawnand: qcom: avoid write to unavailable register Stephan Gerhold (1): arm64: dts: qcom: msm8916: Replace invalid bias-pull-none property Sudeep Holla (1): clk: scmi: Fix min and max rate when registering clocks with discrete rates Sven Schnelle (1): parisc: mask out enable and reserved bits from sba imask Tianjia Zhang (2): net: ethernet: aquantia: Fix wrong return value liquidio: Fix wrong return value in cn23xx_get_pf_num() Tim Froidcoeur (2): net: refactor bind_bucket fastreuse into helper net: initialize fastreuse on inet_inherit_port Tom Rix (3): drm/bridge: sil_sii8620: initialize return of sii8620_readb power: supply: check if calc_soc succeeded in pm860x_init_battery crypto: qat - fix double free in qat_uclo_create_batch_init_list Tomasz Duszynski (1): iio: improve IIO_CONCENTRATION channel type description Tomi Valkeinen (1): drm/tilcdc: fix leak & null ref in panel_connector_get_modes Trond Myklebust (2): NFS: Don't move layouts to plh_return_segs list while in use NFS: Don't return layout segments that are in use Vincent Guittot (1): sched/fair: Fix NOHZ next idle balance Wang Hai (3): cxl: Fix kobject memleak wl1251: fix always return 0 error dlm: Fix kobject memleak Wright Feng (2): brcmfmac: keep SDIO watchdog running when console_interval is non-zero brcmfmac: set state of hanger slot to FREE when flushing PSQ Xie He (1): drivers/net/wan/lapbether: Added needed_headroom and a skb->len check Xiongfeng Wang (1): PCI/ASPM: Add missing newline in sysfs 'policy' Yang Yingliang (1): Revert "pci: lock the pci_cfg_wait queue for the consistency of data" Yu Kuai (2): ARM: socfpga: PM: add missing put_device() call in socfpga_setup_ocram_self_refresh() MIPS: OCTEON: add missing put_device() call in dwc3_octeon_device_init() Yuval Basson (1): RDMA/qedr: SRQ's bug fixes Zhao Heming (1): md-cluster: fix wild pointer of unlock_all_bitmaps() Zheng Bin (1): 9p: Fix memory leak in v9fs_mount Zhenzhong Duan (1): x86/mce/inject: Fix a wrong assignment of i_mce.status Zhu Yanjun (1): RDMA/rxe: Skip dgid check in loopback mode yu kuai (1): ARM: at91: pm: add missing put_device() call in at91_pm_sram_init() Documentation/ABI/testing/sysfs-bus-iio | 3 +- Makefile | 2 +- arch/arm/boot/dts/r8a7793-gose.dts | 4 +- arch/arm/kernel/stacktrace.c | 24 +++++ arch/arm/mach-at91/pm.c | 11 ++- arch/arm/mach-socfpga/pm.c | 8 +- .../boot/dts/exynos/exynos7-espresso.dts | 1 + .../boot/dts/hisilicon/hi3660-hikey960.dts | 11 +++ .../arm64/boot/dts/hisilicon/hi6220-hikey.dts | 2 +- arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 10 +- arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 4 +- arch/m68k/mac/iop.c | 21 ++-- arch/mips/cavium-octeon/octeon-usb.c | 5 +- arch/parisc/include/asm/barrier.h | 61 ++++++++++++ arch/powerpc/boot/Makefile | 2 +- arch/powerpc/boot/serial.c | 2 +- arch/powerpc/kernel/vdso.c | 2 +- arch/powerpc/mm/pkeys.c | 16 +-- arch/x86/crypto/aes_ctrby8_avx-x86_64.S | 14 +-- arch/x86/crypto/aesni-intel_asm.S | 6 +- arch/x86/kernel/apic/io_apic.c | 5 + arch/x86/kernel/cpu/mce/inject.c | 2 +- arch/x86/kernel/ptrace.c | 2 +- drivers/acpi/acpica/exprep.c | 4 - drivers/acpi/acpica/utdelete.c | 6 +- drivers/block/loop.c | 4 + drivers/bluetooth/hci_h5.c | 2 +- drivers/bluetooth/hci_serdev.c | 3 +- drivers/char/agp/intel-gtt.c | 4 +- drivers/clk/clk-scmi.c | 22 ++++- drivers/cpufreq/armada-37xx-cpufreq.c | 1 + drivers/crypto/cavium/cpt/cptvf_algs.c | 1 + drivers/crypto/cavium/cpt/cptvf_reqmanager.c | 12 +-- drivers/crypto/cavium/cpt/request_manager.h | 2 + drivers/crypto/ccp/ccp-dev.h | 1 + drivers/crypto/ccp/ccp-ops.c | 37 ++++--- drivers/crypto/ccree/cc_cipher.c | 30 +++--- drivers/crypto/hisilicon/sec/sec_algs.c | 34 ++++--- drivers/crypto/qat/qat_common/qat_uclo.c | 9 +- drivers/edac/edac_device_sysfs.c | 1 + drivers/edac/edac_pci_sysfs.c | 2 +- drivers/firmware/arm_scmi/scmi_pm_domain.c | 12 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 19 ++-- drivers/gpu/drm/arm/malidp_planes.c | 2 +- drivers/gpu/drm/bridge/sil-sii8620.c | 2 +- drivers/gpu/drm/drm_debugfs.c | 8 +- drivers/gpu/drm/drm_mipi_dsi.c | 6 +- drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 19 +++- drivers/gpu/drm/imx/imx-tve.c | 20 ++-- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 2 +- drivers/gpu/drm/nouveau/nouveau_drm.c | 8 +- drivers/gpu/drm/nouveau/nouveau_gem.c | 4 +- drivers/gpu/drm/nouveau/nouveau_sgdma.c | 9 +- drivers/gpu/drm/panel/panel-simple.c | 2 +- drivers/gpu/drm/radeon/ci_dpm.c | 2 +- drivers/gpu/drm/radeon/radeon_display.c | 4 +- drivers/gpu/drm/radeon/radeon_drv.c | 9 +- drivers/gpu/drm/radeon/radeon_kms.c | 4 +- drivers/gpu/drm/tilcdc/tilcdc_panel.c | 6 +- drivers/gpu/drm/ttm/ttm_tt.c | 3 - drivers/gpu/host1x/debug.c | 4 + drivers/hid/hid-input.c | 6 +- .../hwtracing/coresight/coresight-tmc-etf.c | 13 ++- drivers/infiniband/core/verbs.c | 2 +- drivers/infiniband/hw/qedr/qedr.h | 4 +- drivers/infiniband/hw/qedr/verbs.c | 22 ++--- drivers/infiniband/sw/rxe/rxe_recv.c | 6 +- drivers/infiniband/sw/rxe/rxe_verbs.c | 5 +- drivers/iommu/intel_irq_remapping.c | 8 ++ drivers/irqchip/irq-mtk-sysirq.c | 8 +- drivers/leds/led-class.c | 1 + drivers/leds/leds-lm355x.c | 7 +- drivers/md/bcache/super.c | 9 +- drivers/md/md-cluster.c | 1 + drivers/media/firewire/firedtv-fw.c | 2 + drivers/media/platform/exynos4-is/media-dev.c | 3 + drivers/media/platform/omap3isp/isppreview.c | 4 +- drivers/misc/cxl/sysfs.c | 2 +- drivers/mtd/nand/raw/qcom_nandc.c | 7 +- drivers/net/dsa/mv88e6xxx/chip.c | 1 - drivers/net/dsa/rtl8366.c | 35 ++++--- .../aquantia/atlantic/hw_atl/hw_atl_a0.c | 2 +- .../cavium/liquidio/cn23xx_pf_device.c | 2 +- drivers/net/ethernet/freescale/fman/fman.c | 3 +- .../net/ethernet/freescale/fman/fman_dtsec.c | 4 +- .../net/ethernet/freescale/fman/fman_mac.h | 2 +- .../net/ethernet/freescale/fman/fman_memac.c | 3 +- .../net/ethernet/freescale/fman/fman_port.c | 9 +- .../net/ethernet/freescale/fman/fman_tgec.c | 2 +- drivers/net/ethernet/toshiba/spider_net.c | 4 +- drivers/net/wan/lapbether.c | 10 +- drivers/net/wireless/ath/ath10k/htt_tx.c | 4 + .../broadcom/brcm80211/brcmfmac/fwil_types.h | 2 +- .../broadcom/brcm80211/brcmfmac/fwsignal.c | 4 + .../broadcom/brcm80211/brcmfmac/sdio.c | 6 +- drivers/net/wireless/intel/iwlegacy/common.c | 4 +- .../wireless/marvell/mwifiex/sta_cmdresp.c | 22 +++-- drivers/net/wireless/ti/wl1251/event.c | 2 +- drivers/parisc/sba_iommu.c | 2 +- drivers/pci/access.c | 8 +- drivers/pci/controller/pcie-cadence-host.c | 9 +- drivers/pci/controller/vmd.c | 3 + drivers/pci/pcie/aspm.c | 1 + drivers/pci/quirks.c | 2 + drivers/phy/samsung/phy-exynos5-usbdrd.c | 4 +- drivers/pinctrl/pinctrl-single.c | 11 ++- drivers/platform/x86/intel-hid.c | 2 +- drivers/platform/x86/intel-vbtn.c | 2 +- drivers/power/supply/88pm860x_battery.c | 6 +- drivers/s390/net/qeth_l2_main.c | 4 + drivers/scsi/arm/cumana_2.c | 2 +- drivers/scsi/arm/eesox.c | 2 +- drivers/scsi/arm/powertec.c | 2 +- drivers/scsi/mesh.c | 8 +- drivers/scsi/scsi_debug.c | 6 ++ drivers/soc/qcom/rpmh-rsc.c | 1 + drivers/spi/spi-lantiq-ssc.c | 10 ++ drivers/spi/spidev.c | 21 ++-- drivers/staging/rtl8192u/r8192U_core.c | 2 +- .../ti-soc-thermal/ti-thermal-common.c | 2 +- drivers/usb/core/quirks.c | 16 ++- drivers/usb/dwc2/platform.c | 4 +- drivers/usb/gadget/udc/bdc/bdc_core.c | 13 ++- drivers/usb/gadget/udc/bdc/bdc_ep.c | 16 +-- drivers/usb/gadget/udc/net2280.c | 4 +- drivers/usb/mtu3/mtu3_core.c | 6 +- drivers/usb/serial/cp210x.c | 19 ++++ drivers/usb/serial/iuu_phoenix.c | 14 +-- drivers/video/console/newport_con.c | 12 ++- drivers/video/fbdev/neofb.c | 1 + drivers/video/fbdev/pxafb.c | 4 +- drivers/video/fbdev/sm712fb.c | 2 + drivers/xen/balloon.c | 12 ++- drivers/xen/gntdev-dmabuf.c | 8 ++ fs/9p/v9fs.c | 5 +- fs/btrfs/extent_io.c | 2 + fs/dlm/lockspace.c | 6 +- fs/minix/inode.c | 36 ++++++- fs/minix/itree_common.c | 8 +- fs/nfs/pnfs.c | 46 +++------ fs/ocfs2/dlmglue.c | 8 +- fs/pstore/platform.c | 5 +- fs/xfs/scrub/bmap.c | 22 ++++- fs/xfs/xfs_reflink.c | 21 ++-- include/asm-generic/vmlinux.lds.h | 1 + include/linux/bitfield.h | 2 +- include/linux/tracepoint.h | 2 +- include/net/inet_connection_sock.h | 4 + include/net/ip_vs.h | 10 +- kernel/sched/fair.c | 23 +++-- kernel/sched/topology.c | 2 +- lib/dynamic_debug.c | 23 +++-- mm/mmap.c | 1 + net/bluetooth/6lowpan.c | 5 + net/ipv4/inet_connection_sock.c | 97 ++++++++++--------- net/ipv4/inet_hashtables.c | 1 + net/netfilter/ipvs/ip_vs_core.c | 12 ++- net/nfc/rawsock.c | 7 +- net/packet/af_packet.c | 9 +- net/socket.c | 2 +- net/sunrpc/xprtrdma/svc_rdma_rw.c | 28 ++++-- net/tls/tls_device.c | 3 +- security/smack/smackfs.c | 6 +- sound/pci/hda/patch_realtek.c | 1 + sound/soc/intel/boards/bxt_rt298.c | 2 + sound/soc/meson/axg-tdm-interface.c | 26 +++-- sound/usb/card.h | 1 + sound/usb/mixer_quirks.c | 1 + sound/usb/pcm.c | 6 ++ sound/usb/quirks-table.h | 64 +++++++++++- sound/usb/quirks.c | 3 + sound/usb/stream.c | 1 + tools/build/Build.include | 3 +- .../powerpc/benchmarks/context_switch.c | 21 +++- tools/testing/selftests/powerpc/utils.c | 37 ++++--- 176 files changed, 1085 insertions(+), 490 deletions(-) -- 2.25.1

1 169

Re: [Dev] [kernel] kernel arm build failed
by Xie XiuQi 25 Aug '20

25 Aug '20

Hi, On 2020/8/24 21:23, Sugar wrote: > Hi, everyone. > > I have been working on porting openeuler to a cortex-a7 based board. > Some errors hit me when building arm32 openeuler 4.19.90 kernel in *ubuntu-base-16.04-core-armhf.tar.gz* chroot environment emulated by qemu-user-static. > The errors were endless even though I commented on some CONFIG options and fixed some errors. > Here are some of my questions: > - Did openeuler test kernel arm32 build before the LTS-20.03 release, that maybe help me out? No. LTS-20.03 does not have an arm32 release and has not been tested on the arm32 platform. > - Will openeuler provide arm32 support in future version? And a detailed date? We do not have a plan to support ARM32 at this point, and it would be great if you could help to do it. IMHO, the patches merged into the openEuler kernel do not break the support for ARM32. So, select a proper config would be helpful for building on arm32 platform. > > Looking for your rely. > > _______________________________________________ > Dev mailing list -- dev(a)openeuler.org > To unsubscribe send an email to dev-leave(a)openeuler.org >

2 1

[PATCH] ACPI: GED: implement powerkey evged freeze function
by huangjun 24 Aug '20

24 Aug '20

From: Jun Huang <huangjun63(a)huawei.com> The acpi_execute_simple_method function uses a mutex, so it cannot be called in the timer. We replace timer with delayed work. Signed-off-by: Jun Huang <huangjun63(a)huawei.com> --- drivers/acpi/evged.c | 60 ++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 33 deletions(-) diff --git a/drivers/acpi/evged.c b/drivers/acpi/evged.c index 7354d8d..5bf65b1 100644 --- a/drivers/acpi/evged.c +++ b/drivers/acpi/evged.c @@ -34,7 +34,7 @@ * Method (_EVT, 1) { * if (Lequal(123, Arg0)) * { - * } + * }# * } * } * @@ -46,20 +46,23 @@ #include <linux/list.h> #include <linux/platform_device.h> #include <linux/acpi.h> -#include <linux/timer.h> #include <linux/jiffies.h> +#include <linux/workqueue.h> #define MODULE_NAME "acpi-ged" +static void gpp_enable_pwr_btn(struct work_struct *private_); + +static DECLARE_DELAYED_WORK(gpp_work, gpp_enable_pwr_btn); + struct acpi_ged_handle { - struct timer_list timer; /* For 4s anti-shake of power button */ acpi_handle gpp_handle; /* ACPI Handle: enable shutdown */ acpi_handle gpo_handle; /* ACPI Handle: set sleep flag */ }; struct acpi_ged_device { struct device *dev; - struct acpi_ged_handle *wakeup_handle; + struct acpi_ged_handle *ged_handle; struct list_head event_list; }; @@ -71,6 +74,8 @@ struct acpi_ged_event { acpi_handle handle; }; +static struct acpi_ged_handle *wakeup_handle; + static irqreturn_t acpi_ged_irq_handler(int irq, void *data) { struct acpi_ged_event *event = data; @@ -142,7 +147,6 @@ static acpi_status acpi_ged_request_interrupt(struct acpi_resource *ares, #ifdef CONFIG_PM_SLEEP static void init_ged_handle(struct acpi_ged_device *geddev) { - struct acpi_ged_handle *wakeup_handle; acpi_handle gpo_handle = NULL; acpi_handle gpp_handle = NULL; acpi_status acpi_ret; @@ -151,10 +155,7 @@ static void init_ged_handle(struct acpi_ged_device *geddev) { if (!wakeup_handle) return; - geddev->wakeup_handle = wakeup_handle; - - /* Initialize wakeup_handle, prepare for ged suspend and resume */ - timer_setup(&wakeup_handle->timer, NULL, 0); + geddev->ged_handle = wakeup_handle; acpi_ret = acpi_get_handle(ACPI_HANDLE(geddev->dev), "_GPO", &gpo_handle); if (ACPI_FAILURE(acpi_ret)) @@ -204,8 +205,6 @@ static void ged_shutdown(struct platform_device *pdev) dev_dbg(geddev->dev, "GED releasing GSI %u @ IRQ %u\n", event->gsi, event->irq); } - if (geddev->wakeup_handle) - del_timer(&geddev->wakeup_handle->timer); } static int ged_remove(struct platform_device *pdev) @@ -220,23 +219,10 @@ static const struct acpi_device_id ged_acpi_ids[] = { }; #ifdef CONFIG_PM_SLEEP -static void ged_timer_callback(struct timer_list *t) -{ - struct acpi_ged_handle *wakeup_handle = from_timer(wakeup_handle, t, timer); - acpi_status acpi_ret; - - /* _GPP method enable power button */ - if (wakeup_handle && wakeup_handle->gpp_handle) { - acpi_ret = acpi_execute_simple_method(wakeup_handle->gpp_handle, NULL, ACPI_IRQ_MODEL_GIC); - if (ACPI_FAILURE(acpi_ret)) - pr_warn("_GPP method execution failed\n"); - } -} - static int ged_suspend(struct device *dev) { struct acpi_ged_device *geddev = dev_get_drvdata(dev); - struct acpi_ged_handle *wakeup_handle = geddev->wakeup_handle; + //struct acpi_ged_handle *wakeup_handle = geddev->wakeup_handle; struct acpi_ged_event *event, *next; acpi_status acpi_ret; @@ -255,18 +241,26 @@ static int ged_suspend(struct device *dev) return 0; } +static void gpp_enable_pwr_btn(struct work_struct *private_) +{ + acpi_status acpi_ret; + + /* _GPP method enable power button */ + if (wakeup_handle && wakeup_handle->gpp_handle) { + acpi_ret = acpi_execute_simple_method(wakeup_handle->gpp_handle, NULL, ACPI_IRQ_MODEL_GIC); + if (ACPI_FAILURE(acpi_ret)) + pr_warn("_GPP method execution failed\n"); + } + +} + static int ged_resume(struct device *dev) { struct acpi_ged_device *geddev = dev_get_drvdata(dev); - struct acpi_ged_handle *wakeup_handle = geddev->wakeup_handle; struct acpi_ged_event *event, *next; - - /* use timer to complete 4s anti-shake */ - if (wakeup_handle && wakeup_handle->gpp_handle) { - wakeup_handle->timer.expires = jiffies + (4 * HZ); - wakeup_handle->timer.function = ged_timer_callback; - add_timer(&wakeup_handle->timer); - } + + /* use delayed_work to complete 4s anti-shake */ + schedule_delayed_work(&gpp_work, 4 * HZ); list_for_each_entry_safe(event, next, &geddev->event_list, node) disable_irq_wake(event->irq); -- 2.23.0.windows.1

1 0