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

Patch "Revert "cpufreq: Fix governor module removal race"" has been added to the 4.15-stable tree

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled Revert "cpufreq: Fix governor module removal race" to the 4.15-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… The filename of the patch is: revert-cpufreq-fix-governor-module-removal-race.patch and it can be found in the queue-4.15 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable(a)vger.kernel.org> know about it. >From foo@baz Fri Apr 6 10:01:11 CEST 2018 From: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Date: Fri, 6 Apr 2018 09:06:53 +0200 Subject: Revert "cpufreq: Fix governor module removal race" From: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> This reverts commit a853301f77b5c4feb5e17aebfd92018269525523 which was commit a8b149d32b663c1a4105273295184b78f53d33cf upstream. The backport was not correct, so just drop it entirely. Reported-by: Ben Hutchings <ben.hutchings(a)codethink.co.uk> Cc: Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> Cc: Viresh Kumar <viresh.kumar(a)linaro.org> Cc: Sasha Levin <alexander.levin(a)microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/cpufreq/cpufreq.c | 6 ------ 1 file changed, 6 deletions(-) --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -637,8 +637,6 @@ static int cpufreq_parse_governor(char * *governor = t; err = 0; } - if (t && !try_module_get(t->owner)) - t = NULL; mutex_unlock(&cpufreq_governor_mutex); } @@ -767,10 +765,6 @@ static ssize_t store_scaling_governor(st return -EINVAL; ret = cpufreq_set_policy(policy, &new_policy); - - if (new_policy.governor) - module_put(new_policy.governor->owner); - return ret ? ret : count; } Patches currently in stable-queue which might be from gregkh(a)linuxfoundation.org are queue-4.15/rdma-ucma-check-af-family-prior-resolving-address.patch queue-4.15/netfilter-x_tables-add-and-use-xt_check_proc_name.patch queue-4.15/phy-qcom-ufs-add-module_license-tag.patch queue-4.15/powerpc-64s-fix-lost-pending-interrupt-due-to-race-causing-lost-update-to-irq_happened.patch queue-4.15/usb-serial-ftdi_sio-add-support-for-harman-firmwarehubemulator.patch queue-4.15/crypto-caam-fix-null-dereference-at-error-path.patch queue-4.15/revert-base-arch_topology-fix-section-mismatch-build-warnings.patch queue-4.15/vt-change-sgr-21-to-follow-the-standards.patch queue-4.15/percpu-add-__gfp_noretry-semantics-to-the-percpu-balancing-path.patch queue-4.15/fix-slab-name-biovec-1-21-12.patch queue-4.15/powerpc-mm-add-tracking-of-the-number-of-coprocessors-using-a-context.patch queue-4.15/xfrm_user-uncoditionally-validate-esn-replay-attribute-struct.patch queue-4.15/netfilter-x_tables-make-allocation-less-aggressive.patch queue-4.15/crypto-talitos-fix-ipsec-cipher-in-length.patch queue-4.15/crypto-x86-cast5-avx-fix-ecb-encryption-when-long-sg-follows-short-one.patch queue-4.15/crypto-arm-arm64-fix-random-regeneration-of-s_shipped.patch queue-4.15/dev-mem-avoid-overwriting-err-in-read_mem.patch queue-4.15/bluetooth-fix-missing-encryption-refresh-on-security-request.patch queue-4.15/crypto-ccp-return-an-actual-key-size-from-rsa-max_size-callback.patch queue-4.15/i2c-i2c-stm32f7-fix-no-check-on-returned-setup.patch queue-4.15/revert-arm-dts-omap3-n900-fix-the-audio-codec-s-reset-pin.patch queue-4.15/arm-omap-fix-sram-w-x-mapping.patch queue-4.15/mtd-jedec_probe-fix-crash-in-jedec_read_mfr.patch queue-4.15/input-i8042-add-lenovo-thinkpad-l460-to-i8042-reset-list.patch queue-4.15/perf-hwbp-simplify-the-perf-hwbp-code-fix-documentation.patch queue-4.15/bitmap-fix-memset-optimization-on-big-endian-systems.patch queue-4.15/input-alps-fix-trackstick-detection-on-thinkpad-l570-and-latitude-7370.patch queue-4.15/rdma-ucma-check-that-device-is-connected-prior-to-access-it.patch queue-4.15/media-usbtv-prevent-double-free-in-error-case.patch queue-4.15/crypto-inside-secure-fix-clock-management.patch queue-4.15/arm-dts-dra76-evm-set-powerhold-property-for-tps65917.patch queue-4.15/ipc-shm.c-add-split-function-to-shm_vm_ops.patch queue-4.15/revert-arm-dts-am335x-pepper-fix-the-audio-codec-s-reset-pin.patch queue-4.15/staging-comedi-ni_mio_common-ack-ai-fifo-error-interrupts.patch queue-4.15/alsa-usb-audio-add-native-dsd-support-for-teac-ud-301.patch queue-4.15/alsa-pcm-potential-uninitialized-return-values.patch queue-4.15/rdma-ucma-fix-use-after-free-access-in-ucma_close.patch queue-4.15/revert-cpufreq-fix-governor-module-removal-race.patch queue-4.15/btrfs-fix-unexpected-cow-in-run_delalloc_nocow.patch queue-4.15/arm-8746-1-vfp-go-back-to-clearing-vfp_current_hw_state.patch queue-4.15/xfrm-refuse-to-insert-32-bit-userspace-socket-policies-on-64-bit-systems.patch queue-4.15/rdma-rdma_cm-fix-use-after-free-race-with-process_one_req.patch queue-4.15/x86-platform-uv-bau-add-apic-idt-entry.patch queue-4.15/ceph-only-dirty-iter_iovec-pages-for-direct-read.patch queue-4.15/netfilter-bridge-ebt_among-add-more-missing-match-size-checks.patch queue-4.15/crypto-lrw-free-rctx-ext-with-kzfree.patch queue-4.15/crypto-testmgr-fix-incorrect-values-in-pkcs-1-test-vector.patch queue-4.15/l2tp-fix-races-with-ipv4-mapped-ipv6-addresses.patch queue-4.15/rdma-ucma-ensure-that-cm_id-exists-prior-to-access-it.patch queue-4.15/powerpc-mm-workaround-nest-mmu-bug-with-tlb-invalidations.patch queue-4.15/mtd-nand-atmel-fix-get_sectorsize-function.patch queue-4.15/drm-i915-dp-write-to-set_power-dpcd-to-enable-mst-hub.patch queue-4.15/arm-dts-sun6i-a31s-bpi-m2-improve-pmic-properties.patch queue-4.15/powerpc-64s-fix-i-side-slb-miss-bad-address-handler-saving-nonvolatile-gprs.patch queue-4.15/rdma-ucma-introduce-safer-rdma_addr_size-variants.patch queue-4.15/mei-remove-dev_err-message-on-an-unsupported-ioctl.patch queue-4.15/arm-dts-sun6i-a31s-bpi-m2-add-missing-regulators.patch queue-4.15/net-hns-fix-ethtool-private-flags.patch queue-4.15/rdma-ucma-check-that-device-exists-prior-to-accessing-it.patch queue-4.15/netfilter-drop-template-ct-when-conntrack-is-skipped.patch queue-4.15/net-xfrm-use-preempt-safe-this_cpu_read-in-ipcomp_alloc_tfms.patch queue-4.15/input-i8042-enable-mux-on-sony-vaio-vgn-cs-series-to-fix-touchpad.patch queue-4.15/ipv6-fix-possible-deadlock-in-rt6_age_examine_exception.patch queue-4.15/alsa-pcm-use-dma_bytes-as-size-parameter-in-dma_mmap_coherent.patch queue-4.15/revert-ip6_vti-adjust-vti-mtu-according-to-mtu-of-lower-device.patch queue-4.15/parport_pc-add-support-for-wch-ch382l-pci-e-single-parallel-port-card.patch queue-4.15/crypto-talitos-don-t-persistently-map-req_ctx-hw_context-and-req_ctx-buf.patch queue-4.15/serial-8250-add-nuvoton-npcm-uart.patch queue-4.15/usb-serial-ftdi_sio-add-rt-systems-vx-8-cable.patch queue-4.15/usb-serial-cp210x-add-eldat-easywave-rx09-id.patch queue-4.15/crypto-ahash-fix-early-termination-in-hash-walk.patch queue-4.15/partitions-msdos-unable-to-mount-ufs-44bsd-partitions.patch

7 years, 5 months

1
0
0 0

Patch "Revert "ARM: dts: am335x-pepper: Fix the audio CODEC's reset pin"" has been added to the 4.15-stable tree

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled Revert "ARM: dts: am335x-pepper: Fix the audio CODEC's reset pin" to the 4.15-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… The filename of the patch is: revert-arm-dts-am335x-pepper-fix-the-audio-codec-s-reset-pin.patch and it can be found in the queue-4.15 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable(a)vger.kernel.org> know about it. >From foo@baz Fri Apr 6 10:01:11 CEST 2018 From: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Date: Fri, 6 Apr 2018 08:49:19 +0200 Subject: Revert "ARM: dts: am335x-pepper: Fix the audio CODEC's reset pin" From: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> This reverts commit cc578825b46e984c19b4a4630d3191d60ff83642 which was comit e153db03c6b7a035c797bcdf35262586f003ee93 upstream. It requires a driver that was not merged until 4.16, so remove it from this stable tree as it is pointless. Reported-by: Ben Hutchings <ben.hutchings(a)codethink.co.uk> Cc: Andrew F. Davis <afd(a)ti.com> Cc: Tony Lindgren <tony(a)atomide.com> Cc: Sasha Levin <alexander.levin(a)microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- arch/arm/boot/dts/am335x-pepper.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/arm/boot/dts/am335x-pepper.dts +++ b/arch/arm/boot/dts/am335x-pepper.dts @@ -139,7 +139,7 @@ &audio_codec { status = "okay"; - reset-gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; + gpio-reset = <&gpio1 16 GPIO_ACTIVE_LOW>; AVDD-supply = <&ldo3_reg>; IOVDD-supply = <&ldo3_reg>; DRVDD-supply = <&ldo3_reg>; Patches currently in stable-queue which might be from gregkh(a)linuxfoundation.org are queue-4.15/rdma-ucma-check-af-family-prior-resolving-address.patch queue-4.15/netfilter-x_tables-add-and-use-xt_check_proc_name.patch queue-4.15/phy-qcom-ufs-add-module_license-tag.patch queue-4.15/powerpc-64s-fix-lost-pending-interrupt-due-to-race-causing-lost-update-to-irq_happened.patch queue-4.15/usb-serial-ftdi_sio-add-support-for-harman-firmwarehubemulator.patch queue-4.15/crypto-caam-fix-null-dereference-at-error-path.patch queue-4.15/revert-base-arch_topology-fix-section-mismatch-build-warnings.patch queue-4.15/vt-change-sgr-21-to-follow-the-standards.patch queue-4.15/percpu-add-__gfp_noretry-semantics-to-the-percpu-balancing-path.patch queue-4.15/fix-slab-name-biovec-1-21-12.patch queue-4.15/powerpc-mm-add-tracking-of-the-number-of-coprocessors-using-a-context.patch queue-4.15/xfrm_user-uncoditionally-validate-esn-replay-attribute-struct.patch queue-4.15/netfilter-x_tables-make-allocation-less-aggressive.patch queue-4.15/crypto-talitos-fix-ipsec-cipher-in-length.patch queue-4.15/crypto-x86-cast5-avx-fix-ecb-encryption-when-long-sg-follows-short-one.patch queue-4.15/crypto-arm-arm64-fix-random-regeneration-of-s_shipped.patch queue-4.15/dev-mem-avoid-overwriting-err-in-read_mem.patch queue-4.15/bluetooth-fix-missing-encryption-refresh-on-security-request.patch queue-4.15/crypto-ccp-return-an-actual-key-size-from-rsa-max_size-callback.patch queue-4.15/i2c-i2c-stm32f7-fix-no-check-on-returned-setup.patch queue-4.15/revert-arm-dts-omap3-n900-fix-the-audio-codec-s-reset-pin.patch queue-4.15/arm-omap-fix-sram-w-x-mapping.patch queue-4.15/mtd-jedec_probe-fix-crash-in-jedec_read_mfr.patch queue-4.15/input-i8042-add-lenovo-thinkpad-l460-to-i8042-reset-list.patch queue-4.15/perf-hwbp-simplify-the-perf-hwbp-code-fix-documentation.patch queue-4.15/bitmap-fix-memset-optimization-on-big-endian-systems.patch queue-4.15/input-alps-fix-trackstick-detection-on-thinkpad-l570-and-latitude-7370.patch queue-4.15/rdma-ucma-check-that-device-is-connected-prior-to-access-it.patch queue-4.15/media-usbtv-prevent-double-free-in-error-case.patch queue-4.15/crypto-inside-secure-fix-clock-management.patch queue-4.15/arm-dts-dra76-evm-set-powerhold-property-for-tps65917.patch queue-4.15/ipc-shm.c-add-split-function-to-shm_vm_ops.patch queue-4.15/revert-arm-dts-am335x-pepper-fix-the-audio-codec-s-reset-pin.patch queue-4.15/staging-comedi-ni_mio_common-ack-ai-fifo-error-interrupts.patch queue-4.15/alsa-usb-audio-add-native-dsd-support-for-teac-ud-301.patch queue-4.15/alsa-pcm-potential-uninitialized-return-values.patch queue-4.15/rdma-ucma-fix-use-after-free-access-in-ucma_close.patch queue-4.15/revert-cpufreq-fix-governor-module-removal-race.patch queue-4.15/btrfs-fix-unexpected-cow-in-run_delalloc_nocow.patch queue-4.15/arm-8746-1-vfp-go-back-to-clearing-vfp_current_hw_state.patch queue-4.15/xfrm-refuse-to-insert-32-bit-userspace-socket-policies-on-64-bit-systems.patch queue-4.15/rdma-rdma_cm-fix-use-after-free-race-with-process_one_req.patch queue-4.15/x86-platform-uv-bau-add-apic-idt-entry.patch queue-4.15/ceph-only-dirty-iter_iovec-pages-for-direct-read.patch queue-4.15/netfilter-bridge-ebt_among-add-more-missing-match-size-checks.patch queue-4.15/crypto-lrw-free-rctx-ext-with-kzfree.patch queue-4.15/crypto-testmgr-fix-incorrect-values-in-pkcs-1-test-vector.patch queue-4.15/l2tp-fix-races-with-ipv4-mapped-ipv6-addresses.patch queue-4.15/rdma-ucma-ensure-that-cm_id-exists-prior-to-access-it.patch queue-4.15/powerpc-mm-workaround-nest-mmu-bug-with-tlb-invalidations.patch queue-4.15/mtd-nand-atmel-fix-get_sectorsize-function.patch queue-4.15/drm-i915-dp-write-to-set_power-dpcd-to-enable-mst-hub.patch queue-4.15/arm-dts-sun6i-a31s-bpi-m2-improve-pmic-properties.patch queue-4.15/powerpc-64s-fix-i-side-slb-miss-bad-address-handler-saving-nonvolatile-gprs.patch queue-4.15/rdma-ucma-introduce-safer-rdma_addr_size-variants.patch queue-4.15/mei-remove-dev_err-message-on-an-unsupported-ioctl.patch queue-4.15/arm-dts-sun6i-a31s-bpi-m2-add-missing-regulators.patch queue-4.15/net-hns-fix-ethtool-private-flags.patch queue-4.15/rdma-ucma-check-that-device-exists-prior-to-accessing-it.patch queue-4.15/netfilter-drop-template-ct-when-conntrack-is-skipped.patch queue-4.15/net-xfrm-use-preempt-safe-this_cpu_read-in-ipcomp_alloc_tfms.patch queue-4.15/input-i8042-enable-mux-on-sony-vaio-vgn-cs-series-to-fix-touchpad.patch queue-4.15/ipv6-fix-possible-deadlock-in-rt6_age_examine_exception.patch queue-4.15/alsa-pcm-use-dma_bytes-as-size-parameter-in-dma_mmap_coherent.patch queue-4.15/revert-ip6_vti-adjust-vti-mtu-according-to-mtu-of-lower-device.patch queue-4.15/parport_pc-add-support-for-wch-ch382l-pci-e-single-parallel-port-card.patch queue-4.15/crypto-talitos-don-t-persistently-map-req_ctx-hw_context-and-req_ctx-buf.patch queue-4.15/serial-8250-add-nuvoton-npcm-uart.patch queue-4.15/usb-serial-ftdi_sio-add-rt-systems-vx-8-cable.patch queue-4.15/usb-serial-cp210x-add-eldat-easywave-rx09-id.patch queue-4.15/crypto-ahash-fix-early-termination-in-hash-walk.patch queue-4.15/partitions-msdos-unable-to-mount-ufs-44bsd-partitions.patch

7 years, 5 months

1
0
0 0

Patch "Revert "ARM: dts: omap3-n900: Fix the audio CODEC's reset pin"" has been added to the 4.15-stable tree

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled Revert "ARM: dts: omap3-n900: Fix the audio CODEC's reset pin" to the 4.15-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… The filename of the patch is: revert-arm-dts-omap3-n900-fix-the-audio-codec-s-reset-pin.patch and it can be found in the queue-4.15 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable(a)vger.kernel.org> know about it. >From foo@baz Fri Apr 6 10:01:11 CEST 2018 From: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Date: Fri, 6 Apr 2018 08:54:26 +0200 Subject: Revert "ARM: dts: omap3-n900: Fix the audio CODEC's reset pin" From: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> This reverts commit c91a501768717f449acd1c2cff1a8531e486c441 which was commit 7be4b5dc7ffa9499ac6ef33a5ffa9ff43f9b7057 upstream. It requires a driver that was not merged until 4.16, so remove it from this stable tree as it is pointless. Reported-by: Ben Hutchings <ben.hutchings(a)codethink.co.uk> Cc: Andrew F. Davis <afd(a)ti.com> Cc: Tony Lindgren <tony(a)atomide.com> Cc: Sasha Levin <alexander.levin(a)microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- arch/arm/boot/dts/omap3-n900.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/arch/arm/boot/dts/omap3-n900.dts +++ b/arch/arm/boot/dts/omap3-n900.dts @@ -558,7 +558,7 @@ tlv320aic3x: tlv320aic3x@18 { compatible = "ti,tlv320aic3x"; reg = <0x18>; - reset-gpios = <&gpio2 28 GPIO_ACTIVE_LOW>; /* 60 */ + gpio-reset = <&gpio2 28 GPIO_ACTIVE_HIGH>; /* 60 */ ai3x-gpio-func = < 0 /* AIC3X_GPIO1_FUNC_DISABLED */ 5 /* AIC3X_GPIO2_FUNC_DIGITAL_MIC_INPUT */ @@ -575,7 +575,7 @@ tlv320aic3x_aux: tlv320aic3x@19 { compatible = "ti,tlv320aic3x"; reg = <0x19>; - reset-gpios = <&gpio2 28 GPIO_ACTIVE_LOW>; /* 60 */ + gpio-reset = <&gpio2 28 GPIO_ACTIVE_HIGH>; /* 60 */ AVDD-supply = <&vmmc2>; DRVDD-supply = <&vmmc2>; Patches currently in stable-queue which might be from gregkh(a)linuxfoundation.org are queue-4.15/rdma-ucma-check-af-family-prior-resolving-address.patch queue-4.15/netfilter-x_tables-add-and-use-xt_check_proc_name.patch queue-4.15/phy-qcom-ufs-add-module_license-tag.patch queue-4.15/powerpc-64s-fix-lost-pending-interrupt-due-to-race-causing-lost-update-to-irq_happened.patch queue-4.15/usb-serial-ftdi_sio-add-support-for-harman-firmwarehubemulator.patch queue-4.15/crypto-caam-fix-null-dereference-at-error-path.patch queue-4.15/revert-base-arch_topology-fix-section-mismatch-build-warnings.patch queue-4.15/vt-change-sgr-21-to-follow-the-standards.patch queue-4.15/percpu-add-__gfp_noretry-semantics-to-the-percpu-balancing-path.patch queue-4.15/fix-slab-name-biovec-1-21-12.patch queue-4.15/powerpc-mm-add-tracking-of-the-number-of-coprocessors-using-a-context.patch queue-4.15/xfrm_user-uncoditionally-validate-esn-replay-attribute-struct.patch queue-4.15/netfilter-x_tables-make-allocation-less-aggressive.patch queue-4.15/crypto-talitos-fix-ipsec-cipher-in-length.patch queue-4.15/crypto-x86-cast5-avx-fix-ecb-encryption-when-long-sg-follows-short-one.patch queue-4.15/crypto-arm-arm64-fix-random-regeneration-of-s_shipped.patch queue-4.15/dev-mem-avoid-overwriting-err-in-read_mem.patch queue-4.15/bluetooth-fix-missing-encryption-refresh-on-security-request.patch queue-4.15/crypto-ccp-return-an-actual-key-size-from-rsa-max_size-callback.patch queue-4.15/i2c-i2c-stm32f7-fix-no-check-on-returned-setup.patch queue-4.15/revert-arm-dts-omap3-n900-fix-the-audio-codec-s-reset-pin.patch queue-4.15/arm-omap-fix-sram-w-x-mapping.patch queue-4.15/mtd-jedec_probe-fix-crash-in-jedec_read_mfr.patch queue-4.15/input-i8042-add-lenovo-thinkpad-l460-to-i8042-reset-list.patch queue-4.15/perf-hwbp-simplify-the-perf-hwbp-code-fix-documentation.patch queue-4.15/bitmap-fix-memset-optimization-on-big-endian-systems.patch queue-4.15/input-alps-fix-trackstick-detection-on-thinkpad-l570-and-latitude-7370.patch queue-4.15/rdma-ucma-check-that-device-is-connected-prior-to-access-it.patch queue-4.15/media-usbtv-prevent-double-free-in-error-case.patch queue-4.15/crypto-inside-secure-fix-clock-management.patch queue-4.15/arm-dts-dra76-evm-set-powerhold-property-for-tps65917.patch queue-4.15/ipc-shm.c-add-split-function-to-shm_vm_ops.patch queue-4.15/revert-arm-dts-am335x-pepper-fix-the-audio-codec-s-reset-pin.patch queue-4.15/staging-comedi-ni_mio_common-ack-ai-fifo-error-interrupts.patch queue-4.15/alsa-usb-audio-add-native-dsd-support-for-teac-ud-301.patch queue-4.15/alsa-pcm-potential-uninitialized-return-values.patch queue-4.15/rdma-ucma-fix-use-after-free-access-in-ucma_close.patch queue-4.15/revert-cpufreq-fix-governor-module-removal-race.patch queue-4.15/btrfs-fix-unexpected-cow-in-run_delalloc_nocow.patch queue-4.15/arm-8746-1-vfp-go-back-to-clearing-vfp_current_hw_state.patch queue-4.15/xfrm-refuse-to-insert-32-bit-userspace-socket-policies-on-64-bit-systems.patch queue-4.15/rdma-rdma_cm-fix-use-after-free-race-with-process_one_req.patch queue-4.15/x86-platform-uv-bau-add-apic-idt-entry.patch queue-4.15/ceph-only-dirty-iter_iovec-pages-for-direct-read.patch queue-4.15/netfilter-bridge-ebt_among-add-more-missing-match-size-checks.patch queue-4.15/crypto-lrw-free-rctx-ext-with-kzfree.patch queue-4.15/crypto-testmgr-fix-incorrect-values-in-pkcs-1-test-vector.patch queue-4.15/l2tp-fix-races-with-ipv4-mapped-ipv6-addresses.patch queue-4.15/rdma-ucma-ensure-that-cm_id-exists-prior-to-access-it.patch queue-4.15/powerpc-mm-workaround-nest-mmu-bug-with-tlb-invalidations.patch queue-4.15/mtd-nand-atmel-fix-get_sectorsize-function.patch queue-4.15/drm-i915-dp-write-to-set_power-dpcd-to-enable-mst-hub.patch queue-4.15/arm-dts-sun6i-a31s-bpi-m2-improve-pmic-properties.patch queue-4.15/powerpc-64s-fix-i-side-slb-miss-bad-address-handler-saving-nonvolatile-gprs.patch queue-4.15/rdma-ucma-introduce-safer-rdma_addr_size-variants.patch queue-4.15/mei-remove-dev_err-message-on-an-unsupported-ioctl.patch queue-4.15/arm-dts-sun6i-a31s-bpi-m2-add-missing-regulators.patch queue-4.15/net-hns-fix-ethtool-private-flags.patch queue-4.15/rdma-ucma-check-that-device-exists-prior-to-accessing-it.patch queue-4.15/netfilter-drop-template-ct-when-conntrack-is-skipped.patch queue-4.15/net-xfrm-use-preempt-safe-this_cpu_read-in-ipcomp_alloc_tfms.patch queue-4.15/input-i8042-enable-mux-on-sony-vaio-vgn-cs-series-to-fix-touchpad.patch queue-4.15/ipv6-fix-possible-deadlock-in-rt6_age_examine_exception.patch queue-4.15/alsa-pcm-use-dma_bytes-as-size-parameter-in-dma_mmap_coherent.patch queue-4.15/revert-ip6_vti-adjust-vti-mtu-according-to-mtu-of-lower-device.patch queue-4.15/parport_pc-add-support-for-wch-ch382l-pci-e-single-parallel-port-card.patch queue-4.15/crypto-talitos-don-t-persistently-map-req_ctx-hw_context-and-req_ctx-buf.patch queue-4.15/serial-8250-add-nuvoton-npcm-uart.patch queue-4.15/usb-serial-ftdi_sio-add-rt-systems-vx-8-cable.patch queue-4.15/usb-serial-cp210x-add-eldat-easywave-rx09-id.patch queue-4.15/crypto-ahash-fix-early-termination-in-hash-walk.patch queue-4.15/partitions-msdos-unable-to-mount-ufs-44bsd-partitions.patch

7 years, 5 months

1
0
0 0

Patch "vt: change SGR 21 to follow the standards" has been added to the 4.9-stable tree

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled vt: change SGR 21 to follow the standards to the 4.9-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… The filename of the patch is: vt-change-sgr-21-to-follow-the-standards.patch and it can be found in the queue-4.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable(a)vger.kernel.org> know about it. >From 65d9982d7e523a1a8e7c9af012da0d166f72fc56 Mon Sep 17 00:00:00 2001 From: Mike Frysinger <vapier(a)chromium.org> Date: Mon, 29 Jan 2018 17:08:21 -0500 Subject: vt: change SGR 21 to follow the standards From: Mike Frysinger <vapier(a)chromium.org> commit 65d9982d7e523a1a8e7c9af012da0d166f72fc56 upstream. ECMA-48 [1] (aka ISO 6429) has defined SGR 21 as "doubly underlined" since at least March 1984. The Linux kernel has treated it as SGR 22 "normal intensity" since it was added in Linux-0.96b in June 1992. Before that, it was simply ignored. Other terminal emulators have either ignored it, or treat it as double underline now. xterm for example added support in its 304 release (May 2014) [2] where it was previously ignoring it. Changing this behavior shouldn't be an issue: - It isn't a named capability in ncurses's terminfo database, so no script is using libtinfo/libcurses to look this up, or using tput to query & output the right sequence. - Any script assuming SGR 21 will reset intensity in all terminals already do not work correctly on non-Linux VTs (including running under screen/tmux/etc...). - If someone has written a script that only runs in the Linux VT, and they're using SGR 21 (instead of SGR 22), the output should still be readable. imo it's important to change this as the Linux VT's non-conformance is sometimes used as an argument for other terminal emulators to not implement SGR 21 at all, or do so incorrectly. [1]: https://www.ecma-international.org/publications/standards/Ecma-048.htm [2]: https://github.com/ThomasDickey/xterm-snapshots/commit/2fd29cb98d214cb536bc… Signed-off-by: Mike Frysinger <vapier(a)chromium.org> Cc: stable <stable(a)vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/tty/vt/vt.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) --- a/drivers/tty/vt/vt.c +++ b/drivers/tty/vt/vt.c @@ -1354,6 +1354,11 @@ static void csi_m(struct vc_data *vc) case 3: vc->vc_italic = 1; break; + case 21: + /* + * No console drivers support double underline, so + * convert it to a single underline. + */ case 4: vc->vc_underline = 1; break; @@ -1389,7 +1394,6 @@ static void csi_m(struct vc_data *vc) vc->vc_disp_ctrl = 1; vc->vc_toggle_meta = 1; break; - case 21: case 22: vc->vc_intensity = 1; break; Patches currently in stable-queue which might be from vapier(a)chromium.org are queue-4.9/vt-change-sgr-21-to-follow-the-standards.patch

7 years, 5 months

1
0
0 0

Patch "staging: comedi: ni_mio_common: ack ai fifo error interrupts." has been added to the 4.9-stable tree

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled staging: comedi: ni_mio_common: ack ai fifo error interrupts. to the 4.9-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… The filename of the patch is: staging-comedi-ni_mio_common-ack-ai-fifo-error-interrupts.patch and it can be found in the queue-4.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable(a)vger.kernel.org> know about it. >From e1d9fc04c41840a4688ef6ce90b6dcca157ea4d7 Mon Sep 17 00:00:00 2001 From: Frank Mori Hess <fmh6jj(a)gmail.com> Date: Thu, 15 Mar 2018 10:25:44 +0000 Subject: staging: comedi: ni_mio_common: ack ai fifo error interrupts. From: Frank Mori Hess <fmh6jj(a)gmail.com> commit e1d9fc04c41840a4688ef6ce90b6dcca157ea4d7 upstream. Ack ai fifo error interrupts in interrupt handler to clear interrupt after fifo overflow. It should prevent lock-ups after the ai fifo overflows. Cc: <stable(a)vger.kernel.org> # v4.2+ Signed-off-by: Frank Mori Hess <fmh6jj(a)gmail.com> Signed-off-by: Ian Abbott <abbotti(a)mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/staging/comedi/drivers/ni_mio_common.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/staging/comedi/drivers/ni_mio_common.c +++ b/drivers/staging/comedi/drivers/ni_mio_common.c @@ -1284,6 +1284,8 @@ static void ack_a_interrupt(struct comed ack |= NISTC_INTA_ACK_AI_START; if (a_status & NISTC_AI_STATUS1_STOP) ack |= NISTC_INTA_ACK_AI_STOP; + if (a_status & NISTC_AI_STATUS1_OVER) + ack |= NISTC_INTA_ACK_AI_ERR; if (ack) ni_stc_writew(dev, ack, NISTC_INTA_ACK_REG); } Patches currently in stable-queue which might be from fmh6jj(a)gmail.com are queue-4.9/staging-comedi-ni_mio_common-ack-ai-fifo-error-interrupts.patch

7 years, 5 months

1
0
0 0

Patch "net: hns: Fix ethtool private flags" has been added to the 4.9-stable tree

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled net: hns: Fix ethtool private flags to the 4.9-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… The filename of the patch is: net-hns-fix-ethtool-private-flags.patch and it can be found in the queue-4.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable(a)vger.kernel.org> know about it. >From d61d263c8d82db7c4404a29ebc29674b1c0c05c9 Mon Sep 17 00:00:00 2001 From: Matthias Brugger <matthias.bgg(a)gmail.com> Date: Thu, 15 Mar 2018 17:54:20 +0100 Subject: net: hns: Fix ethtool private flags From: Matthias Brugger <matthias.bgg(a)gmail.com> commit d61d263c8d82db7c4404a29ebc29674b1c0c05c9 upstream. The driver implementation returns support for private flags, while no private flags are present. When asked for the number of private flags it returns the number of statistic flag names. Fix this by returning EOPNOTSUPP for not implemented ethtool flags. Signed-off-by: Matthias Brugger <mbrugger(a)suse.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> Cc: Ben Hutchings <ben.hutchings(a)codethink.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c | 2 +- drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c | 2 +- drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c | 2 +- drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 4 +++- 4 files changed, 6 insertions(+), 4 deletions(-) --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c @@ -671,7 +671,7 @@ static void hns_gmac_get_strings(u32 str static int hns_gmac_get_sset_count(int stringset) { - if (stringset == ETH_SS_STATS || stringset == ETH_SS_PRIV_FLAGS) + if (stringset == ETH_SS_STATS) return ARRAY_SIZE(g_gmac_stats_string); return 0; --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c @@ -422,7 +422,7 @@ void hns_ppe_update_stats(struct hns_ppe int hns_ppe_get_sset_count(int stringset) { - if (stringset == ETH_SS_STATS || stringset == ETH_SS_PRIV_FLAGS) + if (stringset == ETH_SS_STATS) return ETH_PPE_STATIC_NUM; return 0; } --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c @@ -798,7 +798,7 @@ void hns_rcb_get_stats(struct hnae_queue */ int hns_rcb_get_ring_sset_count(int stringset) { - if (stringset == ETH_SS_STATS || stringset == ETH_SS_PRIV_FLAGS) + if (stringset == ETH_SS_STATS) return HNS_RING_STATIC_REG_NUM; return 0; --- a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c @@ -1017,8 +1017,10 @@ int hns_get_sset_count(struct net_device cnt--; return cnt; - } else { + } else if (stringset == ETH_SS_STATS) { return (HNS_NET_STATS_CNT + ops->get_sset_count(h, stringset)); + } else { + return -EOPNOTSUPP; } } Patches currently in stable-queue which might be from matthias.bgg(a)gmail.com are queue-4.9/net-hns-fix-ethtool-private-flags.patch

7 years, 5 months

1
0
0 0

Patch "md/raid10: reset the 'first' at the end of loop" has been added to the 4.9-stable tree

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled md/raid10: reset the 'first' at the end of loop to the 4.9-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… The filename of the patch is: md-raid10-reset-the-first-at-the-end-of-loop.patch and it can be found in the queue-4.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable(a)vger.kernel.org> know about it. >From 6f287ca6046edd34ed83aafb7f9033c9c2e809e2 Mon Sep 17 00:00:00 2001 From: Guoqing Jiang <gqjiang(a)suse.com> Date: Thu, 6 Apr 2017 09:12:18 +0800 Subject: md/raid10: reset the 'first' at the end of loop From: Guoqing Jiang <gqjiang(a)suse.com> commit 6f287ca6046edd34ed83aafb7f9033c9c2e809e2 upstream. We need to set "first = 0' at the end of rdev_for_each loop, so we can get the array's min_offset_diff correctly otherwise min_offset_diff just means the last rdev's offset diff. [only the first chunk, due to b506335e5d2b ("md/raid10: skip spare disk as 'first' disk") being already applied - gregkh] Suggested-by: NeilBrown <neilb(a)suse.com> Signed-off-by: Guoqing Jiang <gqjiang(a)suse.com> Reviewed-by: NeilBrown <neilb(a)suse.com> Signed-off-by: Shaohua Li <shli(a)fb.com> Cc: Ben Hutchings <ben.hutchings(a)codethink.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/md/raid10.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c @@ -3681,6 +3681,7 @@ static int raid10_run(struct mddev *mdde if (blk_queue_discard(bdev_get_queue(rdev->bdev))) discard_supported = true; + first = 0; } if (mddev->queue) { Patches currently in stable-queue which might be from gqjiang(a)suse.com are queue-4.9/md-raid10-reset-the-first-at-the-end-of-loop.patch

7 years, 5 months

1
0
0 0

Patch "Input: i8042 - enable MUX on Sony VAIO VGN-CS series to fix touchpad" has been added to the 4.9-stable tree

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled Input: i8042 - enable MUX on Sony VAIO VGN-CS series to fix touchpad to the 4.9-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… The filename of the patch is: input-i8042-enable-mux-on-sony-vaio-vgn-cs-series-to-fix-touchpad.patch and it can be found in the queue-4.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable(a)vger.kernel.org> know about it. >From 04bb1719c4de94700056241d4c0fe3c1413f5aff Mon Sep 17 00:00:00 2001 From: Ondrej Zary <linux(a)rainbow-software.org> Date: Tue, 3 Apr 2018 10:24:34 -0700 Subject: Input: i8042 - enable MUX on Sony VAIO VGN-CS series to fix touchpad From: Ondrej Zary <linux(a)rainbow-software.org> commit 04bb1719c4de94700056241d4c0fe3c1413f5aff upstream. The touch sensor buttons on Sony VAIO VGN-CS series laptops (e.g. VGN-CS31S) are a separate PS/2 device. As the MUX is disabled for all VAIO machines by the nomux blacklist, the data from touch sensor buttons and touchpad are combined. The protocol used by the buttons is probably similar to the touchpad protocol (both are Synaptics) so both devices get enabled. The controller combines the data, creating a mess which results in random button clicks, touchpad stopping working and lost sync error messages: psmouse serio1: TouchPad at isa0060/serio1/input0 lost sync at byte 4 psmouse serio1: TouchPad at isa0060/serio1/input0 lost sync at byte 1 psmouse serio1: TouchPad at isa0060/serio1/input0 lost sync at byte 1 psmouse serio1: TouchPad at isa0060/serio1/input0 lost sync at byte 1 psmouse serio1: TouchPad at isa0060/serio1/input0 lost sync at byte 1 psmouse serio1: issuing reconnect request Add a new i8042_dmi_forcemux_table whitelist with VGN-CS. With MUX enabled, touch sensor buttons are detected as separate device (and left disabled as there's currently no driver), fixing all touchpad problems. Signed-off-by: Ondrej Zary <linux(a)rainbow-software.org> Cc: stable(a)vger.kernel.org Signed-off-by: Dmitry Torokhov <dmitry.torokhov(a)gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/input/serio/i8042-x86ia64io.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) --- a/drivers/input/serio/i8042-x86ia64io.h +++ b/drivers/input/serio/i8042-x86ia64io.h @@ -530,6 +530,20 @@ static const struct dmi_system_id __init { } }; +static const struct dmi_system_id i8042_dmi_forcemux_table[] __initconst = { + { + /* + * Sony Vaio VGN-CS series require MUX or the touch sensor + * buttons will disturb touchpad operation + */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), + DMI_MATCH(DMI_PRODUCT_NAME, "VGN-CS"), + }, + }, + { } +}; + /* * On some Asus laptops, just running self tests cause problems. */ @@ -1230,6 +1244,9 @@ static int __init i8042_platform_init(vo if (dmi_check_system(i8042_dmi_nomux_table)) i8042_nomux = true; + if (dmi_check_system(i8042_dmi_forcemux_table)) + i8042_nomux = false; + if (dmi_check_system(i8042_dmi_notimeout_table)) i8042_notimeout = true; Patches currently in stable-queue which might be from linux(a)rainbow-software.org are queue-4.9/input-i8042-enable-mux-on-sony-vaio-vgn-cs-series-to-fix-touchpad.patch

7 years, 5 months

1
0
0 0

Patch "Input: i8042 - add Lenovo ThinkPad L460 to i8042 reset list" has been added to the 4.9-stable tree

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled Input: i8042 - add Lenovo ThinkPad L460 to i8042 reset list to the 4.9-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… The filename of the patch is: input-i8042-add-lenovo-thinkpad-l460-to-i8042-reset-list.patch and it can be found in the queue-4.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable(a)vger.kernel.org> know about it. >From b56af54ac78c54a519d82813836f305d7f76ef27 Mon Sep 17 00:00:00 2001 From: Dennis Wassenberg <dennis.wassenberg(a)secunet.com> Date: Thu, 8 Mar 2018 15:32:09 -0800 Subject: Input: i8042 - add Lenovo ThinkPad L460 to i8042 reset list From: Dennis Wassenberg <dennis.wassenberg(a)secunet.com> commit b56af54ac78c54a519d82813836f305d7f76ef27 upstream. Reset i8042 before probing because of insufficient BIOS initialisation of the i8042 serial controller. This makes Synaptics touchpad detection possible. Without resetting the Synaptics touchpad is not detected because there are always NACK messages from AUX port. Signed-off-by: Dennis Wassenberg <dennis.wassenberg(a)secunet.com> Cc: stable(a)vger.kernel.org Signed-off-by: Dmitry Torokhov <dmitry.torokhov(a)gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/input/serio/i8042-x86ia64io.h | 7 +++++++ 1 file changed, 7 insertions(+) --- a/drivers/input/serio/i8042-x86ia64io.h +++ b/drivers/input/serio/i8042-x86ia64io.h @@ -693,6 +693,13 @@ static const struct dmi_system_id __init }, }, { + /* Lenovo ThinkPad L460 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad L460"), + }, + }, + { /* Clevo P650RS, 650RP6, Sager NP8152-S, and others */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Notebook"), Patches currently in stable-queue which might be from dennis.wassenberg(a)secunet.com are queue-4.9/input-i8042-add-lenovo-thinkpad-l460-to-i8042-reset-list.patch

7 years, 5 months

1
0
0 0

Patch "Input: ALPS - fix TrackStick detection on Thinkpad L570 and Latitude 7370" has been added to the 4.9-stable tree

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled Input: ALPS - fix TrackStick detection on Thinkpad L570 and Latitude 7370 to the 4.9-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… The filename of the patch is: input-alps-fix-trackstick-detection-on-thinkpad-l570-and-latitude-7370.patch and it can be found in the queue-4.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable(a)vger.kernel.org> know about it. >From 567b9b549cfa1cbc202762ae97b5385c29ade1e3 Mon Sep 17 00:00:00 2001 From: Masaki Ota <masaki.ota(a)jp.alps.com> Date: Mon, 29 Jan 2018 14:36:54 -0800 Subject: Input: ALPS - fix TrackStick detection on Thinkpad L570 and Latitude 7370 From: Masaki Ota <masaki.ota(a)jp.alps.com> commit 567b9b549cfa1cbc202762ae97b5385c29ade1e3 upstream. The primary interface for the touchpad device in Thinkpad L570 is SMBus, so ALPS overlooked PS2 interface Firmware setting of TrackStick, and shipped with TrackStick otp bit is disabled. The address 0xD7 contains device number information, so we can identify the device by checking this value, but to access it we need to enable Command mode, and then re-enable the device. Devices shipped in Thinkpad L570 report either 0x0C or 0x1D as device numbers, if we see them we assume that the devices are DualPoints. The same issue exists on Dell Latitude 7370. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=196929 Fixes: 646580f793 ("Input: ALPS - fix multi-touch decoding on SS4 plus touchpads") Signed-off-by: Masaki Ota <masaki.ota(a)jp.alps.com> Tested-by: Aaron Ma <aaron.ma(a)canonical.com> Tested-by: Jonathan Liu <net147(a)gmail.com> Tested-by: Jaak Ristioja <jaak(a)ristioja.ee> Cc: stable(a)vger.kernel.org Signed-off-by: Dmitry Torokhov <dmitry.torokhov(a)gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/input/mouse/alps.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) --- a/drivers/input/mouse/alps.c +++ b/drivers/input/mouse/alps.c @@ -2538,13 +2538,31 @@ static int alps_update_btn_info_ss4_v2(u } static int alps_update_dual_info_ss4_v2(unsigned char otp[][4], - struct alps_data *priv) + struct alps_data *priv, + struct psmouse *psmouse) { bool is_dual = false; + int reg_val = 0; + struct ps2dev *ps2dev = &psmouse->ps2dev; - if (IS_SS4PLUS_DEV(priv->dev_id)) + if (IS_SS4PLUS_DEV(priv->dev_id)) { is_dual = (otp[0][0] >> 4) & 0x01; + if (!is_dual) { + /* For support TrackStick of Thinkpad L/E series */ + if (alps_exit_command_mode(psmouse) == 0 && + alps_enter_command_mode(psmouse) == 0) { + reg_val = alps_command_mode_read_reg(psmouse, + 0xD7); + } + alps_exit_command_mode(psmouse); + ps2_command(ps2dev, NULL, PSMOUSE_CMD_ENABLE); + + if (reg_val == 0x0C || reg_val == 0x1D) + is_dual = true; + } + } + if (is_dual) priv->flags |= ALPS_DUALPOINT | ALPS_DUALPOINT_WITH_PRESSURE; @@ -2567,7 +2585,7 @@ static int alps_set_defaults_ss4_v2(stru alps_update_btn_info_ss4_v2(otp, priv); - alps_update_dual_info_ss4_v2(otp, priv); + alps_update_dual_info_ss4_v2(otp, priv, psmouse); return 0; } Patches currently in stable-queue which might be from masaki.ota(a)jp.alps.com are queue-4.9/input-alps-fix-trackstick-detection-on-thinkpad-l570-and-latitude-7370.patch

7 years, 5 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror