Hi,
please consider commit aa9f7d5172fa ("mm: mempolicy: require at least one nodeid
for MPOL_PREFERRED") for stable releases. It does fix a real problem, even though
the CVE assigned to it (CVE-2020-11565) may be a bit bogus.
I verified that the patch applies cleanly all the way to v4.4.y.
Thanks,
Guenter
This is the start of the stable review cycle for the 5.6.3 release.
There are 29 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 Thu, 09 Apr 2020 10:13:38 +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.6.3-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.6.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.6.3-rc1
Bibby Hsieh <bibby.hsieh(a)mediatek.com>
soc: mediatek: knows_txdone needs to be set in Mediatek CMDQ helper
Geoffrey Allott <geoffrey(a)allott.email>
ALSA: hda/ca0132 - Add Recon3Di quirk to handle integrated sound on EVGA X99 Classified motherboard
Mike Snitzer <snitzer(a)redhat.com>
Revert "dm: always call blk_queue_split() in dm_process_bio()"
Takashi Iwai <tiwai(a)suse.de>
Revert "ALSA: uapi: Drop asound.h inclusion from asoc.h"
Hans de Goede <hdegoede(a)redhat.com>
power: supply: axp288_charger: Add special handling for HP Pavilion x2 10
Hans de Goede <hdegoede(a)redhat.com>
extcon: axp288: Add wakeup support
Freeman Liu <freeman.liu(a)unisoc.com>
nvmem: sprd: Fix the block lock operation
Nicholas Johnson <nicholas.johnson-opensource(a)outlook.com.au>
nvmem: check for NULL reg_read and reg_write before dereferencing
Khouloud Touil <ktouil(a)baylibre.com>
nvmem: release the write-protect pin
Alexander Usyskin <alexander.usyskin(a)intel.com>
mei: me: add cedar fork device ids
Eugene Syromiatnikov <esyr(a)redhat.com>
coresight: do not use the BIT() macro in the UAPI header
Kelsey Skunberg <kelsey.skunberg(a)gmail.com>
PCI: sysfs: Revert "rescan" file renames
Kishon Vijay Abraham I <kishon(a)ti.com>
misc: pci_endpoint_test: Avoid using module parameter to determine irqtype
Kishon Vijay Abraham I <kishon(a)ti.com>
misc: pci_endpoint_test: Fix to support > 10 pci-endpoint-test devices
YueHaibing <yuehaibing(a)huawei.com>
misc: rtsx: set correct pcr_ops for rts522A
Uma Shankar <uma.shankar(a)intel.com>
drm/i915/display: Fix mode private_flags comparison at atomic_check
Torsten Duwe <duwe(a)lst.de>
drm/bridge: analogix-anx6345: Avoid duplicate -supply suffix
Matthew Wilcox (Oracle) <willy(a)infradead.org>
XArray: Fix xa_find_next for large multi-index entries
Jann Horn <jannh(a)google.com>
bpf: Fix tnum constraints for 32-bit comparisons
Guenter Roeck <linux(a)roeck-us.net>
brcmfmac: abort and release host after error
Daniel Jordan <daniel.m.jordan(a)oracle.com>
padata: fix uninitialized return value in padata_replace()
Xin Long <lucien.xin(a)gmail.com>
udp: initialize is_flist with 0 in udp_gro_receive
Florian Westphal <fw(a)strlen.de>
net: fix fraglist segmentation reference count leak
Codrin Ciubotariu <codrin.ciubotariu(a)microchip.com>
net: macb: Fix handling of fixed-link node
Qiujun Huang <hqjagain(a)gmail.com>
sctp: fix refcount bug in sctp_wfree
Marcelo Ricardo Leitner <marcelo.leitner(a)gmail.com>
sctp: fix possibly using a bad saddr with a given dst
William Dauchy <w.dauchy(a)criteo.com>
net, ip_tunnel: fix interface lookup with no key
Codrin Ciubotariu <codrin.ciubotariu(a)microchip.com>
net: dsa: ksz: Select KSZ protocol tag
Qian Cai <cai(a)lca.pw>
ipv4: fix a RCU-list lock in fib_triestat_seq_show
-------------
Diffstat:
Makefile | 4 +-
drivers/extcon/extcon-axp288.c | 32 ++++++
drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 4 +-
drivers/gpu/drm/i915/display/intel_display.c | 4 +-
drivers/md/dm.c | 5 +-
drivers/misc/cardreader/rts5227.c | 1 +
drivers/misc/mei/hw-me-regs.h | 2 +
drivers/misc/mei/pci-me.c | 2 +
drivers/misc/pci_endpoint_test.c | 14 ++-
drivers/net/dsa/microchip/Kconfig | 1 +
drivers/net/ethernet/cadence/macb_main.c | 3 +
.../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 2 +
drivers/nvmem/core.c | 1 +
drivers/nvmem/nvmem-sysfs.c | 6 ++
drivers/nvmem/sprd-efuse.c | 2 +-
drivers/pci/pci-sysfs.c | 6 +-
drivers/power/supply/axp288_charger.c | 57 ++++++++++-
drivers/soc/mediatek/mtk-cmdq-helper.c | 1 +
include/uapi/linux/coresight-stm.h | 6 +-
include/uapi/sound/asoc.h | 1 +
kernel/bpf/verifier.c | 108 ++++++++++++++-------
kernel/padata.c | 2 +-
lib/test_xarray.c | 18 ++++
lib/xarray.c | 3 +-
net/core/skbuff.c | 1 +
net/ipv4/fib_trie.c | 3 +
net/ipv4/ip_tunnel.c | 6 +-
net/ipv4/udp_offload.c | 1 +
net/sctp/ipv6.c | 20 ++--
net/sctp/protocol.c | 28 ++++--
net/sctp/socket.c | 31 ++++--
sound/pci/hda/patch_ca0132.c | 1 +
32 files changed, 292 insertions(+), 84 deletions(-)
This is the start of the stable review cycle for the 5.5.16 release.
There are 46 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 Thu, 09 Apr 2020 10:13:38 +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.5.16-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.5.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.5.16-rc1
Daniel Jordan <daniel.m.jordan(a)oracle.com>
padata: always acquire cpu_hotplug_lock before pinst->lock
Ursula Braun <ubraun(a)linux.ibm.com>
net/smc: fix cleanup for linkgroup setup failures
Amritha Nambiar <amritha.nambiar(a)intel.com>
net: Fix Tx hash bound checking
Paolo Abeni <pabeni(a)redhat.com>
net: genetlink: return the error code when attribute parsing fails.
Mika Westerberg <mika.westerberg(a)linux.intel.com>
i2c: i801: Do not add ICH_RES_IO_SMI for the iTCO_wdt device
Neal Cardwell <ncardwell(a)google.com>
tcp: fix TFO SYNACK undo to avoid double-timestamp-undo
Jiri Pirko <jiri(a)mellanox.com>
sched: act: count in the size of action flags bitfield
Mike Marciniszyn <mike.marciniszyn(a)intel.com>
IB/hfi1: Ensure pq is not left on waitlist
David Howells <dhowells(a)redhat.com>
rxrpc: Fix sendmsg(MSG_WAITALL) handling
Luca Coelho <luciano.coelho(a)intel.com>
iwlwifi: dbg: don't abort if sending DBGC_SUSPEND_RESUME fails
Mordechay Goodstein <mordechay.goodstein(a)intel.com>
iwlwifi: yoyo: don't add TLV offset when reading FIFOs
Mordechay Goodstein <mordechay.goodstein(a)intel.com>
iwlwifi: consider HE capability when setting LDPC
Tariq Toukan <tariqt(a)mellanox.com>
net/mlx5e: kTLS, Fix wrong value in record tracker enum
Bibby Hsieh <bibby.hsieh(a)mediatek.com>
soc: mediatek: knows_txdone needs to be set in Mediatek CMDQ helper
Geoffrey Allott <geoffrey(a)allott.email>
ALSA: hda/ca0132 - Add Recon3Di quirk to handle integrated sound on EVGA X99 Classified motherboard
Mike Snitzer <snitzer(a)redhat.com>
Revert "dm: always call blk_queue_split() in dm_process_bio()"
Hans de Goede <hdegoede(a)redhat.com>
power: supply: axp288_charger: Add special handling for HP Pavilion x2 10
Hans de Goede <hdegoede(a)redhat.com>
extcon: axp288: Add wakeup support
Freeman Liu <freeman.liu(a)unisoc.com>
nvmem: sprd: Fix the block lock operation
Nicholas Johnson <nicholas.johnson-opensource(a)outlook.com.au>
nvmem: check for NULL reg_read and reg_write before dereferencing
Alexander Usyskin <alexander.usyskin(a)intel.com>
mei: me: add cedar fork device ids
Eugene Syromiatnikov <esyr(a)redhat.com>
coresight: do not use the BIT() macro in the UAPI header
Kelsey Skunberg <kelsey.skunberg(a)gmail.com>
PCI: sysfs: Revert "rescan" file renames
Kishon Vijay Abraham I <kishon(a)ti.com>
misc: pci_endpoint_test: Avoid using module parameter to determine irqtype
Kishon Vijay Abraham I <kishon(a)ti.com>
misc: pci_endpoint_test: Fix to support > 10 pci-endpoint-test devices
YueHaibing <yuehaibing(a)huawei.com>
misc: rtsx: set correct pcr_ops for rts522A
Matthew Wilcox (Oracle) <willy(a)infradead.org>
XArray: Fix xa_find_next for large multi-index entries
Jann Horn <jannh(a)google.com>
bpf: Fix tnum constraints for 32-bit comparisons
Guenter Roeck <linux(a)roeck-us.net>
brcmfmac: abort and release host after error
Daniel Jordan <daniel.m.jordan(a)oracle.com>
padata: fix uninitialized return value in padata_replace()
Len Brown <len.brown(a)intel.com>
tools/power turbostat: Fix 32-bit capabilities warning
Len Brown <len.brown(a)intel.com>
tools/power turbostat: Fix missing SYS_LPI counter on some Chromebooks
Len Brown <len.brown(a)intel.com>
tools/power turbostat: Fix gcc build warnings
James Zhu <James.Zhu(a)amd.com>
drm/amdgpu: fix typo for vcn1 idle check
Eugeniy Paltsev <Eugeniy.Paltsev(a)synopsys.com>
initramfs: restore default compression behavior
Gerd Hoffmann <kraxel(a)redhat.com>
drm/bochs: downgrade pci_request_region failure from error to warning
Mario Kleiner <mario.kleiner.de(a)gmail.com>
drm/amd/display: Add link_rate quirk for Apple 15" MBP 2017
Evan Quan <evan.quan(a)amd.com>
drm/amdgpu: add fbdev suspend/resume on gpu reset
Jérôme Pouiller <jerome.pouiller(a)silabs.com>
staging: wfx: fix warning about freeing in-use mutex during device unregister
Prabhath Sajeepa <psajeepa(a)purestorage.com>
nvme-rdma: Avoid double freeing of async event data
Codrin Ciubotariu <codrin.ciubotariu(a)microchip.com>
net: macb: Fix handling of fixed-link node
Qiujun Huang <hqjagain(a)gmail.com>
sctp: fix refcount bug in sctp_wfree
Marcelo Ricardo Leitner <marcelo.leitner(a)gmail.com>
sctp: fix possibly using a bad saddr with a given dst
William Dauchy <w.dauchy(a)criteo.com>
net, ip_tunnel: fix interface lookup with no key
Codrin Ciubotariu <codrin.ciubotariu(a)microchip.com>
net: dsa: ksz: Select KSZ protocol tag
Qian Cai <cai(a)lca.pw>
ipv4: fix a RCU-list lock in fib_triestat_seq_show
-------------
Diffstat:
Makefile | 4 +-
drivers/extcon/extcon-axp288.c | 32 ++++++
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 2 +-
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 11 +++
drivers/gpu/drm/bochs/bochs_hw.c | 6 +-
drivers/i2c/busses/i2c-i801.c | 45 +++------
drivers/infiniband/hw/hfi1/user_sdma.c | 25 ++++-
drivers/md/dm.c | 5 +-
drivers/misc/cardreader/rts5227.c | 1 +
drivers/misc/mei/hw-me-regs.h | 2 +
drivers/misc/mei/pci-me.c | 2 +
drivers/misc/pci_endpoint_test.c | 14 ++-
drivers/net/dsa/microchip/Kconfig | 1 +
drivers/net/ethernet/cadence/macb_main.c | 3 +
.../ethernet/mellanox/mlx5/core/en_accel/ktls.h | 4 +-
.../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 2 +
drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 25 ++---
drivers/net/wireless/intel/iwlwifi/fw/dbg.h | 6 +-
drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 6 +-
drivers/nvme/host/rdma.c | 8 +-
drivers/nvmem/nvmem-sysfs.c | 6 ++
drivers/nvmem/sprd-efuse.c | 2 +-
drivers/pci/pci-sysfs.c | 6 +-
drivers/power/supply/axp288_charger.c | 57 ++++++++++-
drivers/soc/mediatek/mtk-cmdq-helper.c | 1 +
drivers/staging/wfx/hif_tx.c | 1 +
include/uapi/linux/coresight-stm.h | 6 +-
kernel/bpf/verifier.c | 108 ++++++++++++++-------
kernel/padata.c | 6 +-
lib/test_xarray.c | 18 ++++
lib/xarray.c | 3 +-
net/core/dev.c | 2 +
net/ipv4/fib_trie.c | 3 +
net/ipv4/ip_tunnel.c | 6 +-
net/ipv4/tcp_input.c | 6 +-
net/netlink/genetlink.c | 5 +-
net/rxrpc/sendmsg.c | 4 +-
net/sched/act_api.c | 1 +
net/sctp/ipv6.c | 20 ++--
net/sctp/protocol.c | 28 ++++--
net/sctp/socket.c | 31 ++++--
net/smc/af_smc.c | 25 +++--
net/smc/smc_core.c | 12 +++
net/smc/smc_core.h | 2 +-
sound/pci/hda/patch_ca0132.c | 1 +
tools/power/x86/turbostat/Makefile | 2 +-
tools/power/x86/turbostat/turbostat.c | 73 ++++++++------
usr/Kconfig | 22 ++---
49 files changed, 461 insertions(+), 204 deletions(-)
This is the start of the stable review cycle for the 5.4.31 release.
There are 36 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 Thu, 09 Apr 2020 10:13:38 +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.31-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.31-rc1
Daniel Jordan <daniel.m.jordan(a)oracle.com>
padata: always acquire cpu_hotplug_lock before pinst->lock
Amritha Nambiar <amritha.nambiar(a)intel.com>
net: Fix Tx hash bound checking
Mika Westerberg <mika.westerberg(a)linux.intel.com>
i2c: i801: Do not add ICH_RES_IO_SMI for the iTCO_wdt device
Neal Cardwell <ncardwell(a)google.com>
tcp: fix TFO SYNACK undo to avoid double-timestamp-undo
Mike Marciniszyn <mike.marciniszyn(a)intel.com>
IB/hfi1: Ensure pq is not left on waitlist
David Howells <dhowells(a)redhat.com>
rxrpc: Fix sendmsg(MSG_WAITALL) handling
Luca Coelho <luciano.coelho(a)intel.com>
iwlwifi: dbg: don't abort if sending DBGC_SUSPEND_RESUME fails
Mordechay Goodstein <mordechay.goodstein(a)intel.com>
iwlwifi: yoyo: don't add TLV offset when reading FIFOs
Mordechay Goodstein <mordechay.goodstein(a)intel.com>
iwlwifi: consider HE capability when setting LDPC
Tariq Toukan <tariqt(a)mellanox.com>
net/mlx5e: kTLS, Fix wrong value in record tracker enum
Bibby Hsieh <bibby.hsieh(a)mediatek.com>
soc: mediatek: knows_txdone needs to be set in Mediatek CMDQ helper
Geoffrey Allott <geoffrey(a)allott.email>
ALSA: hda/ca0132 - Add Recon3Di quirk to handle integrated sound on EVGA X99 Classified motherboard
Mike Snitzer <snitzer(a)redhat.com>
Revert "dm: always call blk_queue_split() in dm_process_bio()"
Hans de Goede <hdegoede(a)redhat.com>
power: supply: axp288_charger: Add special handling for HP Pavilion x2 10
Hans de Goede <hdegoede(a)redhat.com>
extcon: axp288: Add wakeup support
Nicholas Johnson <nicholas.johnson-opensource(a)outlook.com.au>
nvmem: check for NULL reg_read and reg_write before dereferencing
Alexander Usyskin <alexander.usyskin(a)intel.com>
mei: me: add cedar fork device ids
Eugene Syromiatnikov <esyr(a)redhat.com>
coresight: do not use the BIT() macro in the UAPI header
Kelsey Skunberg <kelsey.skunberg(a)gmail.com>
PCI: sysfs: Revert "rescan" file renames
Kishon Vijay Abraham I <kishon(a)ti.com>
misc: pci_endpoint_test: Avoid using module parameter to determine irqtype
Kishon Vijay Abraham I <kishon(a)ti.com>
misc: pci_endpoint_test: Fix to support > 10 pci-endpoint-test devices
YueHaibing <yuehaibing(a)huawei.com>
misc: rtsx: set correct pcr_ops for rts522A
Guenter Roeck <linux(a)roeck-us.net>
brcmfmac: abort and release host after error
Daniel Jordan <daniel.m.jordan(a)oracle.com>
padata: fix uninitialized return value in padata_replace()
Matthew Wilcox (Oracle) <willy(a)infradead.org>
XArray: Fix xa_find_next for large multi-index entries
Tariq Toukan <tariqt(a)mellanox.com>
net/mlx5e: kTLS, Fix TCP seq off-by-1 issue in TX resync flow
Jann Horn <jannh(a)google.com>
bpf: Fix tnum constraints for 32-bit comparisons
Len Brown <len.brown(a)intel.com>
tools/power turbostat: Fix 32-bit capabilities warning
Len Brown <len.brown(a)intel.com>
tools/power turbostat: Fix missing SYS_LPI counter on some Chromebooks
Len Brown <len.brown(a)intel.com>
tools/power turbostat: Fix gcc build warnings
James Zhu <James.Zhu(a)amd.com>
drm/amdgpu: fix typo for vcn1 idle check
Eugeniy Paltsev <Eugeniy.Paltsev(a)synopsys.com>
initramfs: restore default compression behavior
Gerd Hoffmann <kraxel(a)redhat.com>
drm/bochs: downgrade pci_request_region failure from error to warning
Mario Kleiner <mario.kleiner.de(a)gmail.com>
drm/amd/display: Add link_rate quirk for Apple 15" MBP 2017
Masahiro Yamada <masahiroy(a)kernel.org>
kconfig: introduce m32-flag and m64-flag
Prabhath Sajeepa <psajeepa(a)purestorage.com>
nvme-rdma: Avoid double freeing of async event data
-------------
Diffstat:
Makefile | 4 +-
drivers/extcon/extcon-axp288.c | 32 ++++++
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 2 +-
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 11 +++
drivers/gpu/drm/bochs/bochs_hw.c | 6 +-
drivers/i2c/busses/i2c-i801.c | 45 +++------
drivers/infiniband/hw/hfi1/user_sdma.c | 25 ++++-
drivers/md/dm.c | 5 +-
drivers/misc/cardreader/rts5227.c | 1 +
drivers/misc/mei/hw-me-regs.h | 2 +
drivers/misc/mei/pci-me.c | 2 +
drivers/misc/pci_endpoint_test.c | 14 ++-
.../ethernet/mellanox/mlx5/core/en_accel/ktls.h | 4 +-
.../ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c | 2 +-
.../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 2 +
drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 25 ++---
drivers/net/wireless/intel/iwlwifi/fw/dbg.h | 6 +-
drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 6 +-
drivers/nvme/host/rdma.c | 8 +-
drivers/nvmem/nvmem-sysfs.c | 6 ++
drivers/pci/pci-sysfs.c | 6 +-
drivers/power/supply/axp288_charger.c | 57 ++++++++++-
drivers/soc/mediatek/mtk-cmdq-helper.c | 1 +
include/uapi/linux/coresight-stm.h | 6 +-
kernel/bpf/verifier.c | 108 ++++++++++++++-------
kernel/padata.c | 6 +-
lib/test_xarray.c | 18 ++++
lib/xarray.c | 3 +-
net/core/dev.c | 2 +
net/ipv4/tcp_input.c | 6 +-
net/rxrpc/sendmsg.c | 4 +-
scripts/Kconfig.include | 7 ++
sound/pci/hda/patch_ca0132.c | 1 +
tools/power/x86/turbostat/Makefile | 2 +-
tools/power/x86/turbostat/turbostat.c | 73 ++++++++------
usr/Kconfig | 22 ++---
36 files changed, 367 insertions(+), 163 deletions(-)
The patch
ASoC: cs4270: pull reset GPIO low then high
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From ccfc531695f3a4aada042f6bdb33ac6be24e1aec Mon Sep 17 00:00:00 2001
From: Mike Willard <mwillard(a)izotope.com>
Date: Wed, 1 Apr 2020 20:54:54 +0000
Subject: [PATCH] ASoC: cs4270: pull reset GPIO low then high
Pull the RST line low then high when initializing the driver,
in order to force a reset of the chip.
Previously, the line was not pulled low, which could result in
the chip registers not resetting to their default values on boot.
Signed-off-by: Mike Willard <mwillard(a)izotope.com>
Cc: stable(a)vger.kernel.org
Link: https://lore.kernel.org/r/20200401205454.79792-1-mwillard@izotope.com
Signed-off-by: Mark Brown <broonie(a)kernel.org>
---
sound/soc/codecs/cs4270.c | 40 ++++++++++++++++++++++++++++++++++-----
1 file changed, 35 insertions(+), 5 deletions(-)
diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c
index 5f25b9f872bd..8a02791e44ad 100644
--- a/sound/soc/codecs/cs4270.c
+++ b/sound/soc/codecs/cs4270.c
@@ -137,6 +137,9 @@ struct cs4270_private {
/* power domain regulators */
struct regulator_bulk_data supplies[ARRAY_SIZE(supply_names)];
+
+ /* reset gpio */
+ struct gpio_desc *reset_gpio;
};
static const struct snd_soc_dapm_widget cs4270_dapm_widgets[] = {
@@ -648,6 +651,22 @@ static const struct regmap_config cs4270_regmap = {
.volatile_reg = cs4270_reg_is_volatile,
};
+/**
+ * cs4270_i2c_remove - deinitialize the I2C interface of the CS4270
+ * @i2c_client: the I2C client object
+ *
+ * This function puts the chip into low power mode when the i2c device
+ * is removed.
+ */
+static int cs4270_i2c_remove(struct i2c_client *i2c_client)
+{
+ struct cs4270_private *cs4270 = i2c_get_clientdata(i2c_client);
+
+ gpiod_set_value_cansleep(cs4270->reset_gpio, 0);
+
+ return 0;
+}
+
/**
* cs4270_i2c_probe - initialize the I2C interface of the CS4270
* @i2c_client: the I2C client object
@@ -660,7 +679,6 @@ static int cs4270_i2c_probe(struct i2c_client *i2c_client,
const struct i2c_device_id *id)
{
struct cs4270_private *cs4270;
- struct gpio_desc *reset_gpiod;
unsigned int val;
int ret, i;
@@ -679,10 +697,21 @@ static int cs4270_i2c_probe(struct i2c_client *i2c_client,
if (ret < 0)
return ret;
- reset_gpiod = devm_gpiod_get_optional(&i2c_client->dev, "reset",
- GPIOD_OUT_HIGH);
- if (PTR_ERR(reset_gpiod) == -EPROBE_DEFER)
- return -EPROBE_DEFER;
+ /* reset the device */
+ cs4270->reset_gpio = devm_gpiod_get_optional(&i2c_client->dev, "reset",
+ GPIOD_OUT_LOW);
+ if (IS_ERR(cs4270->reset_gpio)) {
+ dev_dbg(&i2c_client->dev, "Error getting CS4270 reset GPIO\n");
+ return PTR_ERR(cs4270->reset_gpio);
+ }
+
+ if (cs4270->reset_gpio) {
+ dev_dbg(&i2c_client->dev, "Found reset GPIO\n");
+ gpiod_set_value_cansleep(cs4270->reset_gpio, 1);
+ }
+
+ /* Sleep 500ns before i2c communications */
+ ndelay(500);
cs4270->regmap = devm_regmap_init_i2c(i2c_client, &cs4270_regmap);
if (IS_ERR(cs4270->regmap))
@@ -735,6 +764,7 @@ static struct i2c_driver cs4270_i2c_driver = {
},
.id_table = cs4270_id,
.probe = cs4270_i2c_probe,
+ .remove = cs4270_i2c_remove,
};
module_i2c_driver(cs4270_i2c_driver);
--
2.20.1
Hi Greg,
as announced i have backported the identified patches for CVE-2020-1749 from kernel 5.x into v4.14.
Applies to stable linux-v4.14.y (with y=175).
For 4.19, a different patch set is required, i will send this patchset in a few seconds.
Please find the patches for 4.14 appended.
Best regards
Carsten
-----------------
Mentor Graphics (Deutschland) GmbH, Arnulfstraße 201, 80634 München / Germany
Registergericht München HRB 106955, Geschäftsführer: Thomas Heurung, Alexander Walter