April 2021 - Linux-stable-mirror

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.4.265 release. There are 28 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Wed, 07 Apr 2021 08:50:09 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.4.265-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.4.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.4.265-rc1 Atul Gopinathan <atulgopinathan(a)gmail.com> staging: rtl8192e: Change state information from u16 to u8 Atul Gopinathan <atulgopinathan(a)gmail.com> staging: rtl8192e: Fix incorrect source in memcpy() Johan Hovold <johan(a)kernel.org> USB: cdc-acm: fix use-after-free after probe failure Oliver Neukum <oneukum(a)suse.com> USB: cdc-acm: downgrade message to debug Oliver Neukum <oneukum(a)suse.com> cdc-acm: fix BREAK rx code path adding necessary calls Vincent Palatin <vpalatin(a)chromium.org> USB: quirks: ignore remote wake-up on Fibocom L850-GL LTE modem Zheyu Ma <zheyuma97(a)gmail.com> firewire: nosy: Fix a use-after-free bug in nosy_ioctl() Dinghao Liu <dinghao.liu(a)zju.edu.cn> extcon: Fix error handling in extcon_dev_register Wang Panzhenzhuan <randy.wang(a)rock-chips.com> pinctrl: rockchip: fix restore error in resume Tetsuo Handa <penguin-kernel(a)i-love.sakura.ne.jp> reiserfs: update reiserfs_xattrs_initialized() condition Ilya Lipnitskiy <ilya.lipnitskiy(a)gmail.com> mm: fix race by making init_zero_pfn() early_initcall Steven Rostedt (VMware) <rostedt(a)goodmis.org> tracing: Fix stack trace event size Hui Wang <hui.wang(a)canonical.com> ALSA: hda/realtek: call alc_update_headset_mode() in hp_automute_hook Ikjoon Jang <ikjn(a)chromium.org> ALSA: usb-audio: Apply sample rate quirk to Logitech Connect Tong Zhang <ztong0001(a)gmail.com> net: wan/lmc: unregister device when no matching device is found Doug Brown <doug(a)schmorgal.com> appletalk: Fix skb allocation size in loopback case zhangyi (F) <yi.zhang(a)huawei.com> ext4: do not iput inode under running transaction in ext4_rename() Tong Zhang <ztong0001(a)gmail.com> staging: comedi: cb_pcidas64: fix request_irq() warn Tong Zhang <ztong0001(a)gmail.com> staging: comedi: cb_pcidas: fix request_irq() warn Alexey Dobriyan <adobriyan(a)gmail.com> scsi: qla2xxx: Fix broken #endif placement Lv Yunlong <lyl2019(a)mail.ustc.edu.cn> scsi: st: Fix a use after free in st_open() Benjamin Rood <benjaminjrood(a)gmail.com> ASoC: sgtl5000: set DAP_AVC_CTRL register to correct default value on probe Hans de Goede <hdegoede(a)redhat.com> ASoC: rt5651: Fix dac- and adc- vol-tlv values being off by a factor of 10 Hans de Goede <hdegoede(a)redhat.com> ASoC: rt5640: Fix dac- and adc- vol-tlv values being off by a factor of 10 J. Bruce Fields <bfields(a)redhat.com> rpc: fix NULL dereference on kmalloc failure Zhaolong Zhang <zhangzl2013(a)126.com> ext4: fix bh ref count on error paths Jakub Kicinski <kuba(a)kernel.org> ipv6: weaken the v4mapped source check David Brazdil <dbrazdil(a)google.com> selinux: vsock: Set SID for socket returned by accept() ------------- Diffstat: Makefile | 4 ++-- drivers/extcon/extcon.c | 1 + drivers/firewire/nosy.c | 9 ++++++-- drivers/net/wan/lmc/lmc_main.c | 2 ++ drivers/pinctrl/pinctrl-rockchip.c | 13 ++++++----- drivers/scsi/qla2xxx/qla_target.h | 2 +- drivers/scsi/st.c | 2 +- drivers/staging/comedi/drivers/cb_pcidas.c | 2 +- drivers/staging/comedi/drivers/cb_pcidas64.c | 2 +- drivers/staging/rtl8192e/rtllib.h | 2 +- drivers/staging/rtl8192e/rtllib_rx.c | 2 +- drivers/usb/class/cdc-acm.c | 12 ++++++++-- drivers/usb/core/quirks.c | 4 ++++ fs/ext4/inode.c | 6 ++--- fs/ext4/namei.c | 18 +++++++-------- fs/reiserfs/xattr.h | 2 +- kernel/trace/trace.c | 3 ++- mm/memory.c | 2 +- net/appletalk/ddp.c | 33 ++++++++++++++++++---------- net/dccp/ipv6.c | 5 +++++ net/ipv6/ip6_input.c | 10 --------- net/ipv6/tcp_ipv6.c | 5 +++++ net/sunrpc/auth_gss/svcauth_gss.c | 11 ++++++---- net/vmw_vsock/af_vsock.c | 1 + sound/pci/hda/patch_realtek.c | 1 + sound/soc/codecs/rt5640.c | 4 ++-- sound/soc/codecs/rt5651.c | 4 ++-- sound/soc/codecs/sgtl5000.c | 2 +- sound/usb/quirks.c | 1 + 29 files changed, 102 insertions(+), 63 deletions(-)

3 years, 8 months

6
35
0 0

patch "fbdev: zero-fill colormap in fbcmap.c" added to char-misc-testing

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled fbdev: zero-fill colormap in fbcmap.c to my char-misc git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git in the char-misc-testing branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will be merged to the char-misc-next branch sometime soon, after it passes testing, and the merge window is open. If you have any questions about this process, please let me know. >From 19ab233989d0f7ab1de19a036e247afa4a0a1e9c Mon Sep 17 00:00:00 2001 From: Phillip Potter <phil(a)philpotter.co.uk> Date: Wed, 31 Mar 2021 23:07:19 +0100 Subject: fbdev: zero-fill colormap in fbcmap.c Use kzalloc() rather than kmalloc() for the dynamically allocated parts of the colormap in fb_alloc_cmap_gfp, to prevent a leak of random kernel data to userspace under certain circumstances. Fixes a KMSAN-found infoleak bug reported by syzbot at: https://syzkaller.appspot.com/bug?id=741578659feabd108ad9e06696f0c1f2e69c4b… Reported-by: syzbot+47fa9c9c648b765305b9(a)syzkaller.appspotmail.com Cc: stable <stable(a)vger.kernel.org> Reviewed-by: Geert Uytterhoeven <geert+renesas(a)glider.be> Signed-off-by: Phillip Potter <phil(a)philpotter.co.uk> Link: https://lore.kernel.org/r/20210331220719.1499743-1-phil@philpotter.co.uk Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/video/fbdev/core/fbcmap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/video/fbdev/core/fbcmap.c b/drivers/video/fbdev/core/fbcmap.c index 757d5c3f620b..ff09e57f3c38 100644 --- a/drivers/video/fbdev/core/fbcmap.c +++ b/drivers/video/fbdev/core/fbcmap.c @@ -101,17 +101,17 @@ int fb_alloc_cmap_gfp(struct fb_cmap *cmap, int len, int transp, gfp_t flags) if (!len) return 0; - cmap->red = kmalloc(size, flags); + cmap->red = kzalloc(size, flags); if (!cmap->red) goto fail; - cmap->green = kmalloc(size, flags); + cmap->green = kzalloc(size, flags); if (!cmap->green) goto fail; - cmap->blue = kmalloc(size, flags); + cmap->blue = kzalloc(size, flags); if (!cmap->blue) goto fail; if (transp) { - cmap->transp = kmalloc(size, flags); + cmap->transp = kzalloc(size, flags); if (!cmap->transp) goto fail; } else { -- 2.31.1

3 years, 8 months

1
0
0 0

[PATCH 5.4 00/23] 5.4.111-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.4.111 release. There are 23 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Sun, 11 Apr 2021 09:52:52 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.111-rc… 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.111-rc1 Masahiro Yamada <masahiroy(a)kernel.org> init/Kconfig: make COMPILE_TEST depend on HAS_IOMEM Heiko Carstens <hca(a)linux.ibm.com> init/Kconfig: make COMPILE_TEST depend on !S390 Sagi Grimberg <sagi(a)grimberg.me> nvme-mpath: replace direct_make_request with generic_make_request Piotr Krysiuk <piotras(a)gmail.com> bpf, x86: Validate computation of branch displacements for x86-32 Piotr Krysiuk <piotras(a)gmail.com> bpf, x86: Validate computation of branch displacements for x86-64 Vincent Whitchurch <vincent.whitchurch(a)axis.com> cifs: Silently ignore unknown oplock break handle Ronnie Sahlberg <lsahlber(a)redhat.com> cifs: revalidate mapping when we open files for SMB1 POSIX Sergei Trofimovich <slyfox(a)gentoo.org> ia64: fix format strings for err_inject Sergei Trofimovich <slyfox(a)gentoo.org> ia64: mca: allocate early mca with GFP_ATOMIC Martin Wilck <mwilck(a)suse.com> scsi: target: pscsi: Clean up after failure in pscsi_map_sg() Arnd Bergmann <arnd(a)arndb.de> x86/build: Turn off -fcf-protection for realmode targets Esteve Varela Colominas <esteve.varela(a)gmail.com> platform/x86: thinkpad_acpi: Allow the FnLock LED to change state Ludovic Senecaux <linuxludo(a)free.fr> netfilter: conntrack: Fix gre tunneling over ipv6 Rob Clark <robdclark(a)chromium.org> drm/msm: Ratelimit invalid-fence message Konrad Dybcio <konrad.dybcio(a)somainline.org> drm/msm/adreno: a5xx_power: Don't apply A540 lm_setup to other GPUs Karthikeyan Kathirvel <kathirve(a)codeaurora.org> mac80211: choose first enabled channel for monitor Tong Zhang <ztong0001(a)gmail.com> mISDN: fix crash in fritzpci Pavel Andrianov <andrianov(a)ispras.ru> net: pxa168_eth: Fix a potential data race in pxa168_eth_remove Tariq Toukan <tariqt(a)nvidia.com> net/mlx5e: Enforce minimum value check for ICOSQ size Yonghong Song <yhs(a)fb.com> bpf, x86: Use kvmalloc_array instead kmalloc_array in bpf_jit_comp Alban Bedel <albeu(a)free.fr> platform/x86: intel-hid: Support Lenovo ThinkPad X1 Tablet Gen 2 Tony Lindgren <tony(a)atomide.com> bus: ti-sysc: Fix warning on unbind if reset is not deasserted Mans Rullgard <mans(a)mansr.com> ARM: dts: am33xx: add aliases for mmc interfaces ------------- Diffstat: Makefile | 4 ++-- arch/arm/boot/dts/am33xx.dtsi | 3 +++ arch/ia64/kernel/err_inject.c | 22 +++++++++++----------- arch/ia64/kernel/mca.c | 2 +- arch/x86/Makefile | 2 +- arch/x86/net/bpf_jit_comp.c | 15 ++++++++++++--- arch/x86/net/bpf_jit_comp32.c | 11 ++++++++++- drivers/bus/ti-sysc.c | 4 +++- drivers/gpu/drm/msm/adreno/a5xx_power.c | 2 +- drivers/gpu/drm/msm/msm_fence.c | 2 +- drivers/isdn/hardware/mISDN/mISDNipac.c | 2 +- drivers/net/ethernet/marvell/pxa168_eth.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 5 +++-- drivers/nvme/host/multipath.c | 2 +- drivers/platform/x86/intel-hid.c | 7 +++++++ drivers/platform/x86/thinkpad_acpi.c | 8 +++++++- drivers/target/target_core_pscsi.c | 8 ++++++++ fs/cifs/file.c | 1 + fs/cifs/smb2misc.c | 4 ++-- init/Kconfig | 3 +-- net/mac80211/main.c | 13 ++++++++++++- net/netfilter/nf_conntrack_proto_gre.c | 3 --- 22 files changed, 89 insertions(+), 36 deletions(-)

3 years, 8 months

7
29
0 0

[PATCH 5.10 00/41] 5.10.29-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.10.29 release. There are 41 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Sun, 11 Apr 2021 09:52:52 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.29-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.10.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.10.29-rc1 Masahiro Yamada <masahiroy(a)kernel.org> init/Kconfig: make COMPILE_TEST depend on HAS_IOMEM Heiko Carstens <hca(a)linux.ibm.com> init/Kconfig: make COMPILE_TEST depend on !S390 Piotr Krysiuk <piotras(a)gmail.com> bpf, x86: Validate computation of branch displacements for x86-32 Piotr Krysiuk <piotras(a)gmail.com> bpf, x86: Validate computation of branch displacements for x86-64 Stanislav Fomichev <sdf(a)google.com> tools/resolve_btfids: Add /libbpf to .gitignore Jiri Olsa <jolsa(a)kernel.org> kbuild: Do not clean resolve_btfids if the output does not exist Jiri Olsa <jolsa(a)kernel.org> kbuild: Add resolve_btfids clean to root clean target Jiri Olsa <jolsa(a)kernel.org> tools/resolve_btfids: Set srctree variable unconditionally Jiri Olsa <jolsa(a)kernel.org> tools/resolve_btfids: Check objects before removing Jiri Olsa <jolsa(a)kernel.org> tools/resolve_btfids: Build libbpf and libsubcmd in separate directories David S. Miller <davem(a)davemloft.net> math: Export mul_u64_u64_div_u64 Pavel Begunkov <asml.silence(a)gmail.com> io_uring: fix timeout cancel return code Vincent Whitchurch <vincent.whitchurch(a)axis.com> cifs: Silently ignore unknown oplock break handle Ronnie Sahlberg <lsahlber(a)redhat.com> cifs: revalidate mapping when we open files for SMB1 POSIX Sergei Trofimovich <slyfox(a)gentoo.org> ia64: fix format strings for err_inject Sergei Trofimovich <slyfox(a)gentoo.org> ia64: mca: allocate early mca with GFP_ATOMIC Rong Chen <rong.a.chen(a)intel.com> selftests/vm: fix out-of-tree build Martin Wilck <mwilck(a)suse.com> scsi: target: pscsi: Clean up after failure in pscsi_map_sg() Yangbo Lu <yangbo.lu(a)nxp.com> ptp_qoriq: fix overflow in ptp_qoriq_adjfine() u64 calcalation David E. Box <david.e.box(a)linux.intel.com> platform/x86: intel_pmc_core: Ignore GBE LTR on Tiger Lake platforms Chris Chiu <chris.chiu(a)canonical.com> block: clear GD_NEED_PART_SCAN later in bdev_disk_changed Arnd Bergmann <arnd(a)arndb.de> x86/build: Turn off -fcf-protection for realmode targets Kalyan Thota <kalyant(a)codeaurora.org> drm/msm/disp/dpu1: icc path needs to be set before dpu runtime resume Andre Przywara <andre.przywara(a)arm.com> kselftest/arm64: sve: Do not use non-canonical FFR register value Esteve Varela Colominas <esteve.varela(a)gmail.com> platform/x86: thinkpad_acpi: Allow the FnLock LED to change state Alex Elder <elder(a)linaro.org> net: ipa: fix init header command validation Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nftables: skip hook overlap logic if flowtable is stale Ludovic Senecaux <linuxludo(a)free.fr> netfilter: conntrack: Fix gre tunneling over ipv6 Rob Clark <robdclark(a)chromium.org> drm/msm: Ratelimit invalid-fence message Konrad Dybcio <konrad.dybcio(a)somainline.org> drm/msm/adreno: a5xx_power: Don't apply A540 lm_setup to other GPUs Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org> drm/msm/dsi_pll_7nm: Fix variable usage for pll_lockdet_rate Karthikeyan Kathirvel <kathirve(a)codeaurora.org> mac80211: choose first enabled channel for monitor Daniel Phan <daniel.phan36(a)gmail.com> mac80211: Check crypto_aead_encrypt for errors Tong Zhang <ztong0001(a)gmail.com> mISDN: fix crash in fritzpci David Gow <davidgow(a)google.com> kunit: tool: Fix a python tuple typing error Pavel Andrianov <andrianov(a)ispras.ru> net: pxa168_eth: Fix a potential data race in pxa168_eth_remove Tariq Toukan <tariqt(a)nvidia.com> net/mlx5e: Enforce minimum value check for ICOSQ size Yonghong Song <yhs(a)fb.com> bpf, x86: Use kvmalloc_array instead kmalloc_array in bpf_jit_comp Alban Bedel <albeu(a)free.fr> platform/x86: intel-hid: Support Lenovo ThinkPad X1 Tablet Gen 2 Tony Lindgren <tony(a)atomide.com> bus: ti-sysc: Fix warning on unbind if reset is not deasserted Mans Rullgard <mans(a)mansr.com> ARM: dts: am33xx: add aliases for mmc interfaces ------------- Diffstat: Makefile | 17 ++++++-- arch/arm/boot/dts/am33xx.dtsi | 3 ++ arch/ia64/kernel/err_inject.c | 22 +++++----- arch/ia64/kernel/mca.c | 2 +- arch/x86/Makefile | 2 +- arch/x86/net/bpf_jit_comp.c | 15 +++++-- arch/x86/net/bpf_jit_comp32.c | 11 ++++- drivers/bus/ti-sysc.c | 4 +- drivers/gpu/drm/msm/adreno/a5xx_power.c | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 12 +++--- drivers/gpu/drm/msm/dsi/pll/dsi_pll_7nm.c | 2 +- drivers/gpu/drm/msm/msm_fence.c | 2 +- drivers/isdn/hardware/mISDN/mISDNipac.c | 2 +- drivers/net/ethernet/marvell/pxa168_eth.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 5 ++- drivers/net/ipa/ipa_cmd.c | 50 +++++++++++++++-------- drivers/platform/x86/intel-hid.c | 7 ++++ drivers/platform/x86/intel_pmc_core.c | 50 ++++++++++++++++------- drivers/platform/x86/thinkpad_acpi.c | 8 +++- drivers/ptp/ptp_qoriq.c | 13 +++--- drivers/target/target_core_pscsi.c | 8 ++++ fs/block_dev.c | 4 +- fs/cifs/file.c | 1 + fs/cifs/smb2misc.c | 4 +- fs/io_uring.c | 8 ++-- init/Kconfig | 3 +- lib/math/div64.c | 1 + net/mac80211/aead_api.c | 5 ++- net/mac80211/aes_gmac.c | 5 ++- net/mac80211/main.c | 13 +++++- net/netfilter/nf_conntrack_proto_gre.c | 3 -- net/netfilter/nf_tables_api.c | 3 ++ tools/bpf/resolve_btfids/.gitignore | 3 +- tools/bpf/resolve_btfids/Makefile | 44 ++++++++++---------- tools/testing/kunit/kunit_config.py | 2 +- tools/testing/selftests/arm64/fp/sve-test.S | 22 +++++++--- tools/testing/selftests/vm/Makefile | 4 +- 37 files changed, 242 insertions(+), 122 deletions(-)

3 years, 8 months

10
52
0 0

[PATCH 5.11 00/45] 5.11.13-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.11.13 release. There are 45 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Sun, 11 Apr 2021 09:52:52 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.11.13-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.11.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.11.13-rc1 Masahiro Yamada <masahiroy(a)kernel.org> init/Kconfig: make COMPILE_TEST depend on HAS_IOMEM Piotr Krysiuk <piotras(a)gmail.com> bpf, x86: Validate computation of branch displacements for x86-32 Piotr Krysiuk <piotras(a)gmail.com> bpf, x86: Validate computation of branch displacements for x86-64 Stanislav Fomichev <sdf(a)google.com> tools/resolve_btfids: Add /libbpf to .gitignore Jiri Olsa <jolsa(a)kernel.org> kbuild: Do not clean resolve_btfids if the output does not exist Jiri Olsa <jolsa(a)kernel.org> kbuild: Add resolve_btfids clean to root clean target Jiri Olsa <jolsa(a)kernel.org> tools/resolve_btfids: Set srctree variable unconditionally Jiri Olsa <jolsa(a)kernel.org> tools/resolve_btfids: Check objects before removing Jiri Olsa <jolsa(a)kernel.org> tools/resolve_btfids: Build libbpf and libsubcmd in separate directories David S. Miller <davem(a)davemloft.net> math: Export mul_u64_u64_div_u64 Pavel Begunkov <asml.silence(a)gmail.com> io_uring: fix timeout cancel return code Vincent Whitchurch <vincent.whitchurch(a)axis.com> cifs: Silently ignore unknown oplock break handle Ronnie Sahlberg <lsahlber(a)redhat.com> cifs: revalidate mapping when we open files for SMB1 POSIX Sergei Trofimovich <slyfox(a)gentoo.org> ia64: fix format strings for err_inject Sergei Trofimovich <slyfox(a)gentoo.org> ia64: mca: allocate early mca with GFP_ATOMIC Rong Chen <rong.a.chen(a)intel.com> selftests/vm: fix out-of-tree build Rich Wiley <rwiley(a)nvidia.com> arm64: kernel: disable CNP on Carmel Martin Wilck <mwilck(a)suse.com> scsi: target: pscsi: Clean up after failure in pscsi_map_sg() Yangbo Lu <yangbo.lu(a)nxp.com> ptp_qoriq: fix overflow in ptp_qoriq_adjfine() u64 calcalation David E. Box <david.e.box(a)linux.intel.com> platform/x86: intel_pmc_core: Ignore GBE LTR on Tiger Lake platforms David E. Box <david.e.box(a)linux.intel.com> platform/x86: intel_pmt_class: Initial resource to 0 Chris Chiu <chris.chiu(a)canonical.com> block: clear GD_NEED_PART_SCAN later in bdev_disk_changed Arnd Bergmann <arnd(a)arndb.de> x86/build: Turn off -fcf-protection for realmode targets Kalyan Thota <kalyant(a)codeaurora.org> drm/msm/disp/dpu1: icc path needs to be set before dpu runtime resume Andre Przywara <andre.przywara(a)arm.com> kselftest/arm64: sve: Do not use non-canonical FFR register value Esteve Varela Colominas <esteve.varela(a)gmail.com> platform/x86: thinkpad_acpi: Allow the FnLock LED to change state Alex Elder <elder(a)linaro.org> net: ipa: fix init header command validation Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nftables: skip hook overlap logic if flowtable is stale Ludovic Senecaux <linuxludo(a)free.fr> netfilter: conntrack: Fix gre tunneling over ipv6 Rob Clark <robdclark(a)chromium.org> drm/msm: Ratelimit invalid-fence message Konrad Dybcio <konrad.dybcio(a)somainline.org> drm/msm/adreno: a5xx_power: Don't apply A540 lm_setup to other GPUs Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org> drm/msm/dsi_pll_7nm: Fix variable usage for pll_lockdet_rate Karthikeyan Kathirvel <kathirve(a)codeaurora.org> mac80211: choose first enabled channel for monitor Daniel Phan <daniel.phan36(a)gmail.com> mac80211: Check crypto_aead_encrypt for errors Jimmy Assarsson <extja(a)kvaser.com> can: kvaser_usb: Add support for USBcan Pro 4xHS Tong Zhang <ztong0001(a)gmail.com> net: arcnet: com20020 fix error handling Tong Zhang <ztong0001(a)gmail.com> mISDN: fix crash in fritzpci David Gow <davidgow(a)google.com> kunit: tool: Fix a python tuple typing error Pavel Andrianov <andrianov(a)ispras.ru> net: pxa168_eth: Fix a potential data race in pxa168_eth_remove Tariq Toukan <tariqt(a)nvidia.com> net/mlx5e: Enforce minimum value check for ICOSQ size Yonghong Song <yhs(a)fb.com> bpf, x86: Use kvmalloc_array instead kmalloc_array in bpf_jit_comp Alban Bedel <albeu(a)free.fr> platform/x86: intel-hid: Support Lenovo ThinkPad X1 Tablet Gen 2 Jordan Crouse <jcrouse(a)codeaurora.org> drm/msm: a6xx: Make sure the SQE microcode is safe Tony Lindgren <tony(a)atomide.com> bus: ti-sysc: Fix warning on unbind if reset is not deasserted Mans Rullgard <mans(a)mansr.com> ARM: dts: am33xx: add aliases for mmc interfaces ------------- Diffstat: Documentation/arm64/silicon-errata.rst | 3 + Makefile | 17 ++++- arch/arm/boot/dts/am33xx.dtsi | 3 + arch/arm64/Kconfig | 10 +++ arch/arm64/include/asm/cpucaps.h | 3 +- arch/arm64/kernel/cpu_errata.c | 8 +++ arch/arm64/kernel/cpufeature.c | 5 +- arch/ia64/kernel/err_inject.c | 22 +++---- arch/ia64/kernel/mca.c | 2 +- arch/x86/Makefile | 2 +- arch/x86/net/bpf_jit_comp.c | 15 ++++- arch/x86/net/bpf_jit_comp32.c | 11 +++- drivers/bus/ti-sysc.c | 4 +- drivers/gpu/drm/msm/adreno/a5xx_power.c | 2 +- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 77 +++++++++++++++++++---- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 12 ++-- drivers/gpu/drm/msm/dsi/pll/dsi_pll_7nm.c | 2 +- drivers/gpu/drm/msm/msm_fence.c | 2 +- drivers/isdn/hardware/mISDN/mISDNipac.c | 2 +- drivers/net/arcnet/com20020-pci.c | 34 +++++----- drivers/net/can/usb/Kconfig | 1 + drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 4 +- drivers/net/ethernet/marvell/pxa168_eth.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 5 +- drivers/net/ipa/ipa_cmd.c | 50 ++++++++++----- drivers/platform/x86/intel-hid.c | 7 +++ drivers/platform/x86/intel_pmc_core.c | 50 ++++++++++----- drivers/platform/x86/intel_pmt_class.c | 2 +- drivers/platform/x86/thinkpad_acpi.c | 8 ++- drivers/ptp/ptp_qoriq.c | 13 ++-- drivers/target/target_core_pscsi.c | 8 +++ fs/block_dev.c | 4 +- fs/cifs/file.c | 1 + fs/cifs/smb2misc.c | 4 +- fs/io_uring.c | 8 +-- init/Kconfig | 3 +- lib/math/div64.c | 1 + net/mac80211/aead_api.c | 5 +- net/mac80211/aes_gmac.c | 5 +- net/mac80211/main.c | 13 +++- net/netfilter/nf_conntrack_proto_gre.c | 3 - net/netfilter/nf_tables_api.c | 3 + tools/bpf/resolve_btfids/.gitignore | 3 +- tools/bpf/resolve_btfids/Makefile | 44 ++++++------- tools/testing/kunit/kunit_config.py | 2 +- tools/testing/selftests/arm64/fp/sve-test.S | 22 +++++-- tools/testing/selftests/vm/Makefile | 4 +- 47 files changed, 357 insertions(+), 154 deletions(-)

3 years, 8 months

4
48
0 0

patch "usb: roles: Call try_module_get() from" added to usb-next

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled usb: roles: Call try_module_get() from to my usb git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git in the usb-next branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will also be merged in the next major kernel release during the merge window. If you have any questions about this process, please let me know. >From 3a2a91a2d51761557843996a66098eb7182b48b4 Mon Sep 17 00:00:00 2001 From: Hans de Goede <hdegoede(a)redhat.com> Date: Fri, 9 Apr 2021 14:41:36 +0200 Subject: usb: roles: Call try_module_get() from usb_role_switch_find_by_fwnode() usb_role_switch_find_by_fwnode() returns a reference to the role-switch which must be put by calling usb_role_switch_put(). usb_role_switch_put() calls module_put(sw->dev.parent->driver->owner), add a matching try_module_get() to usb_role_switch_find_by_fwnode(), making it behave the same as the other usb_role_switch functions which return a reference. This avoids a WARN_ON being hit at kernel/module.c:1158 due to the module-refcount going below 0. Fixes: c6919d5e0cd1 ("usb: roles: Add usb_role_switch_find_by_fwnode()") Cc: stable <stable(a)vger.kernel.org> Reviewed-by: Guenter Roeck <linux(a)roeck-us.net> Reviewed-by: Heikki Krogerus <heikki.krogerus(a)linux.intel.com> Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> Link: https://lore.kernel.org/r/20210409124136.65591-1-hdegoede@redhat.com Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/usb/roles/class.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/usb/roles/class.c b/drivers/usb/roles/class.c index 97f37077b7f9..33b637d0d8d9 100644 --- a/drivers/usb/roles/class.c +++ b/drivers/usb/roles/class.c @@ -189,6 +189,8 @@ usb_role_switch_find_by_fwnode(const struct fwnode_handle *fwnode) return NULL; dev = class_find_device_by_fwnode(role_class, fwnode); + if (dev) + WARN_ON(!try_module_get(dev->parent->driver->owner)); return dev ? to_role_switch(dev) : NULL; } -- 2.31.1

3 years, 8 months

1
0
0 0

patch "usb: typec: tcpm: update power supply once partner accepts" added to usb-next

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled usb: typec: tcpm: update power supply once partner accepts to my usb git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git in the usb-next branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will also be merged in the next major kernel release during the merge window. If you have any questions about this process, please let me know. >From 4050f2683f2c3151dc3dd1501ac88c57caf810ff Mon Sep 17 00:00:00 2001 From: Badhri Jagan Sridharan <badhri(a)google.com> Date: Wed, 7 Apr 2021 13:07:20 -0700 Subject: usb: typec: tcpm: update power supply once partner accepts power_supply_changed needs to be called to notify clients after the partner accepts the requested values for the pps case. Also, remove the redundant power_supply_changed at the end of the tcpm_reset_port as power_supply_changed is already called right after usb_type is changed. Fixes: f2a8aa053c176 ("typec: tcpm: Represent source supply through power_supply") Signed-off-by: Badhri Jagan Sridharan <badhri(a)google.com> Cc: stable <stable(a)vger.kernel.org> Reviewed-by: Adam Thomson <Adam.Thomson.Opensource(a)diasemi.com> Reviewed-by: Heikki Krogerus <heikki.krogerus(a)linux.intel.com> Link: https://lore.kernel.org/r/20210407200723.1914388-3-badhri@google.com Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/usb/typec/tcpm/tcpm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c index b4a40099d7e9..d1d03ee90d8f 100644 --- a/drivers/usb/typec/tcpm/tcpm.c +++ b/drivers/usb/typec/tcpm/tcpm.c @@ -2568,6 +2568,7 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, port->pps_data.max_curr = port->pps_data.req_max_curr; port->req_supply_voltage = port->pps_data.req_out_volt; port->req_current_limit = port->pps_data.req_op_curr; + power_supply_changed(port->psy); tcpm_set_state(port, SNK_TRANSITION_SINK, 0); break; case SOFT_RESET_SEND: @@ -3136,7 +3137,6 @@ static unsigned int tcpm_pd_select_pps_apdo(struct tcpm_port *port) port->pps_data.req_out_volt)); port->pps_data.req_op_curr = min(port->pps_data.max_curr, port->pps_data.req_op_curr); - power_supply_changed(port->psy); } return src_pdo; @@ -3561,8 +3561,6 @@ static void tcpm_reset_port(struct tcpm_port *port) port->sink_cap_done = false; if (port->tcpc->enable_frs) port->tcpc->enable_frs(port->tcpc, false); - - power_supply_changed(port->psy); } static void tcpm_detach(struct tcpm_port *port) -- 2.31.1

3 years, 8 months

1
0
0 0

patch "usb: typec: tcpm: Address incorrect values of tcpm psy for fixed" added to usb-next

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled usb: typec: tcpm: Address incorrect values of tcpm psy for fixed to my usb git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git in the usb-next branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will also be merged in the next major kernel release during the merge window. If you have any questions about this process, please let me know. >From f3dedafb8263ca4791a92a23f5230068f5bde008 Mon Sep 17 00:00:00 2001 From: Badhri Jagan Sridharan <badhri(a)google.com> Date: Wed, 7 Apr 2021 13:07:18 -0700 Subject: usb: typec: tcpm: Address incorrect values of tcpm psy for fixed supply tcpm_pd_build_request overwrites current_limit and supply_voltage even before port partner accepts the requests. This leaves stale values in current_limit and supply_voltage that get exported by "tcpm-source-psy-". Solving this problem by caching the request values of current limit/supply voltage in req_current_limit and req_supply_voltage. current_limit/supply_voltage gets updated once the port partner accepts the request. Fixes: f2a8aa053c176 ("typec: tcpm: Represent source supply through power_supply") Signed-off-by: Badhri Jagan Sridharan <badhri(a)google.com> Cc: stable <stable(a)vger.kernel.org> Reviewed-by: Guenter Roeck <linux(a)roeck-us.net> Reviewed-by: Adam Thomson <Adam.Thomson.Opensource(a)diasemi.com> Reviewed-by: Heikki Krogerus <heikki.krogerus(a)linux.intel.com> Link: https://lore.kernel.org/r/20210407200723.1914388-1-badhri@google.com Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/usb/typec/tcpm/tcpm.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c index ca1fc77697fc..4ea4b30ae885 100644 --- a/drivers/usb/typec/tcpm/tcpm.c +++ b/drivers/usb/typec/tcpm/tcpm.c @@ -389,7 +389,10 @@ struct tcpm_port { unsigned int operating_snk_mw; bool update_sink_caps; - /* Requested current / voltage */ + /* Requested current / voltage to the port partner */ + u32 req_current_limit; + u32 req_supply_voltage; + /* Actual current / voltage limit of the local port */ u32 current_limit; u32 supply_voltage; @@ -2435,8 +2438,8 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, case SNK_TRANSITION_SINK: if (port->vbus_present) { tcpm_set_current_limit(port, - port->current_limit, - port->supply_voltage); + port->req_current_limit, + port->req_supply_voltage); port->explicit_contract = true; tcpm_set_auto_vbus_discharge_threshold(port, TYPEC_PWR_MODE_PD, @@ -2545,8 +2548,8 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, break; case SNK_NEGOTIATE_PPS_CAPABILITIES: port->pps_data.active = true; - port->supply_voltage = port->pps_data.out_volt; - port->current_limit = port->pps_data.op_curr; + port->req_supply_voltage = port->pps_data.out_volt; + port->req_current_limit = port->pps_data.op_curr; tcpm_set_state(port, SNK_TRANSITION_SINK, 0); break; case SOFT_RESET_SEND: @@ -3195,8 +3198,8 @@ static int tcpm_pd_build_request(struct tcpm_port *port, u32 *rdo) flags & RDO_CAP_MISMATCH ? " [mismatch]" : ""); } - port->current_limit = ma; - port->supply_voltage = mv; + port->req_current_limit = ma; + port->req_supply_voltage = mv; return 0; } -- 2.31.1

3 years, 8 months

1
0
0 0

patch "usb: typec: tcpm: Address incorrect values of tcpm psy for pps supply" added to usb-next

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled usb: typec: tcpm: Address incorrect values of tcpm psy for pps supply to my usb git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git in the usb-next branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will also be merged in the next major kernel release during the merge window. If you have any questions about this process, please let me know. >From e3a0720224873587954b55d193d5b4abb14f0443 Mon Sep 17 00:00:00 2001 From: Badhri Jagan Sridharan <badhri(a)google.com> Date: Wed, 7 Apr 2021 13:07:19 -0700 Subject: usb: typec: tcpm: Address incorrect values of tcpm psy for pps supply tcpm_pd_select_pps_apdo overwrites port->pps_data.min_volt, port->pps_data.max_volt, port->pps_data.max_curr even before port partner accepts the requests. This leaves incorrect values in current_limit and supply_voltage that get exported by "tcpm-source-psy-". Solving this problem by caching the request values in req_min_volt, req_max_volt, req_max_curr, req_out_volt, req_op_curr. min_volt, max_volt, max_curr gets updated once the partner accepts the request. current_limit, supply_voltage gets updated once local port's tcpm enters SNK_TRANSITION_SINK when the accepted current_limit and supply_voltage is enforced. Fixes: f2a8aa053c176 ("typec: tcpm: Represent source supply through power_supply") Signed-off-by: Badhri Jagan Sridharan <badhri(a)google.com> Cc: stable <stable(a)vger.kernel.org> Reviewed-by: Adam Thomson <Adam.Thomson.Opensource(a)diasemi.com> Reviewed-by: Heikki Krogerus <heikki.krogerus(a)linux.intel.com> Link: https://lore.kernel.org/r/20210407200723.1914388-2-badhri@google.com Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/usb/typec/tcpm/tcpm.c | 88 +++++++++++++++++++++-------------- 1 file changed, 53 insertions(+), 35 deletions(-) diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c index 4ea4b30ae885..b4a40099d7e9 100644 --- a/drivers/usb/typec/tcpm/tcpm.c +++ b/drivers/usb/typec/tcpm/tcpm.c @@ -268,12 +268,27 @@ struct pd_mode_data { struct typec_altmode_desc altmode_desc[ALTMODE_DISCOVERY_MAX]; }; +/* + * @min_volt: Actual min voltage at the local port + * @req_min_volt: Requested min voltage to the port partner + * @max_volt: Actual max voltage at the local port + * @req_max_volt: Requested max voltage to the port partner + * @max_curr: Actual max current at the local port + * @req_max_curr: Requested max current of the port partner + * @req_out_volt: Requested output voltage to the port partner + * @req_op_curr: Requested operating current to the port partner + * @supported: Parter has atleast one APDO hence supports PPS + * @active: PPS mode is active + */ struct pd_pps_data { u32 min_volt; + u32 req_min_volt; u32 max_volt; + u32 req_max_volt; u32 max_curr; - u32 out_volt; - u32 op_curr; + u32 req_max_curr; + u32 req_out_volt; + u32 req_op_curr; bool supported; bool active; }; @@ -2498,8 +2513,8 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, break; case SNK_NEGOTIATE_PPS_CAPABILITIES: /* Revert data back from any requested PPS updates */ - port->pps_data.out_volt = port->supply_voltage; - port->pps_data.op_curr = port->current_limit; + port->pps_data.req_out_volt = port->supply_voltage; + port->pps_data.req_op_curr = port->current_limit; port->pps_status = (type == PD_CTRL_WAIT ? -EAGAIN : -EOPNOTSUPP); @@ -2548,8 +2563,11 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, break; case SNK_NEGOTIATE_PPS_CAPABILITIES: port->pps_data.active = true; - port->req_supply_voltage = port->pps_data.out_volt; - port->req_current_limit = port->pps_data.op_curr; + port->pps_data.min_volt = port->pps_data.req_min_volt; + port->pps_data.max_volt = port->pps_data.req_max_volt; + port->pps_data.max_curr = port->pps_data.req_max_curr; + port->req_supply_voltage = port->pps_data.req_out_volt; + port->req_current_limit = port->pps_data.req_op_curr; tcpm_set_state(port, SNK_TRANSITION_SINK, 0); break; case SOFT_RESET_SEND: @@ -3108,16 +3126,16 @@ static unsigned int tcpm_pd_select_pps_apdo(struct tcpm_port *port) src = port->source_caps[src_pdo]; snk = port->snk_pdo[snk_pdo]; - port->pps_data.min_volt = max(pdo_pps_apdo_min_voltage(src), - pdo_pps_apdo_min_voltage(snk)); - port->pps_data.max_volt = min(pdo_pps_apdo_max_voltage(src), - pdo_pps_apdo_max_voltage(snk)); - port->pps_data.max_curr = min_pps_apdo_current(src, snk); - port->pps_data.out_volt = min(port->pps_data.max_volt, - max(port->pps_data.min_volt, - port->pps_data.out_volt)); - port->pps_data.op_curr = min(port->pps_data.max_curr, - port->pps_data.op_curr); + port->pps_data.req_min_volt = max(pdo_pps_apdo_min_voltage(src), + pdo_pps_apdo_min_voltage(snk)); + port->pps_data.req_max_volt = min(pdo_pps_apdo_max_voltage(src), + pdo_pps_apdo_max_voltage(snk)); + port->pps_data.req_max_curr = min_pps_apdo_current(src, snk); + port->pps_data.req_out_volt = min(port->pps_data.max_volt, + max(port->pps_data.min_volt, + port->pps_data.req_out_volt)); + port->pps_data.req_op_curr = min(port->pps_data.max_curr, + port->pps_data.req_op_curr); power_supply_changed(port->psy); } @@ -3245,10 +3263,10 @@ static int tcpm_pd_build_pps_request(struct tcpm_port *port, u32 *rdo) tcpm_log(port, "Invalid APDO selected!"); return -EINVAL; } - max_mv = port->pps_data.max_volt; - max_ma = port->pps_data.max_curr; - out_mv = port->pps_data.out_volt; - op_ma = port->pps_data.op_curr; + max_mv = port->pps_data.req_max_volt; + max_ma = port->pps_data.req_max_curr; + out_mv = port->pps_data.req_out_volt; + op_ma = port->pps_data.req_op_curr; break; default: tcpm_log(port, "Invalid PDO selected!"); @@ -3295,8 +3313,8 @@ static int tcpm_pd_build_pps_request(struct tcpm_port *port, u32 *rdo) tcpm_log(port, "Requesting APDO %d: %u mV, %u mA", src_pdo_index, out_mv, op_ma); - port->pps_data.op_curr = op_ma; - port->pps_data.out_volt = out_mv; + port->pps_data.req_op_curr = op_ma; + port->pps_data.req_out_volt = out_mv; return 0; } @@ -5429,7 +5447,7 @@ static int tcpm_try_role(struct typec_port *p, int role) return ret; } -static int tcpm_pps_set_op_curr(struct tcpm_port *port, u16 op_curr) +static int tcpm_pps_set_op_curr(struct tcpm_port *port, u16 req_op_curr) { unsigned int target_mw; int ret; @@ -5447,12 +5465,12 @@ static int tcpm_pps_set_op_curr(struct tcpm_port *port, u16 op_curr) goto port_unlock; } - if (op_curr > port->pps_data.max_curr) { + if (req_op_curr > port->pps_data.max_curr) { ret = -EINVAL; goto port_unlock; } - target_mw = (op_curr * port->pps_data.out_volt) / 1000; + target_mw = (req_op_curr * port->supply_voltage) / 1000; if (target_mw < port->operating_snk_mw) { ret = -EINVAL; goto port_unlock; @@ -5466,10 +5484,10 @@ static int tcpm_pps_set_op_curr(struct tcpm_port *port, u16 op_curr) } /* Round down operating current to align with PPS valid steps */ - op_curr = op_curr - (op_curr % RDO_PROG_CURR_MA_STEP); + req_op_curr = req_op_curr - (req_op_curr % RDO_PROG_CURR_MA_STEP); reinit_completion(&port->pps_complete); - port->pps_data.op_curr = op_curr; + port->pps_data.req_op_curr = req_op_curr; port->pps_status = 0; port->pps_pending = true; mutex_unlock(&port->lock); @@ -5490,7 +5508,7 @@ static int tcpm_pps_set_op_curr(struct tcpm_port *port, u16 op_curr) return ret; } -static int tcpm_pps_set_out_volt(struct tcpm_port *port, u16 out_volt) +static int tcpm_pps_set_out_volt(struct tcpm_port *port, u16 req_out_volt) { unsigned int target_mw; int ret; @@ -5508,13 +5526,13 @@ static int tcpm_pps_set_out_volt(struct tcpm_port *port, u16 out_volt) goto port_unlock; } - if (out_volt < port->pps_data.min_volt || - out_volt > port->pps_data.max_volt) { + if (req_out_volt < port->pps_data.min_volt || + req_out_volt > port->pps_data.max_volt) { ret = -EINVAL; goto port_unlock; } - target_mw = (port->pps_data.op_curr * out_volt) / 1000; + target_mw = (port->current_limit * req_out_volt) / 1000; if (target_mw < port->operating_snk_mw) { ret = -EINVAL; goto port_unlock; @@ -5528,10 +5546,10 @@ static int tcpm_pps_set_out_volt(struct tcpm_port *port, u16 out_volt) } /* Round down output voltage to align with PPS valid steps */ - out_volt = out_volt - (out_volt % RDO_PROG_VOLT_MV_STEP); + req_out_volt = req_out_volt - (req_out_volt % RDO_PROG_VOLT_MV_STEP); reinit_completion(&port->pps_complete); - port->pps_data.out_volt = out_volt; + port->pps_data.req_out_volt = req_out_volt; port->pps_status = 0; port->pps_pending = true; mutex_unlock(&port->lock); @@ -5589,8 +5607,8 @@ static int tcpm_pps_activate(struct tcpm_port *port, bool activate) /* Trigger PPS request or move back to standard PDO contract */ if (activate) { - port->pps_data.out_volt = port->supply_voltage; - port->pps_data.op_curr = port->current_limit; + port->pps_data.req_out_volt = port->supply_voltage; + port->pps_data.req_op_curr = port->current_limit; } mutex_unlock(&port->lock); -- 2.31.1

3 years, 8 months

1
0
0 0

patch "usb: dwc2: Fix partial power down exiting by system resume" added to usb-next

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled usb: dwc2: Fix partial power down exiting by system resume to my usb git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git in the usb-next branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will also be merged in the next major kernel release during the merge window. If you have any questions about this process, please let me know. >From c74c26f6e398387cc953b3fdb54858f09bfb696b Mon Sep 17 00:00:00 2001 From: Artur Petrosyan <Arthur.Petrosyan(a)synopsys.com> Date: Thu, 8 Apr 2021 13:46:06 +0400 Subject: usb: dwc2: Fix partial power down exiting by system resume Fixes the implementation of exiting from partial power down power saving mode when PC is resumed. Added port connection status checking which prevents exiting from Partial Power Down mode from _dwc2_hcd_resume() if not in Partial Power Down mode. Rearranged the implementation to get rid of many "if" statements. NOTE: Switch case statement is used for hibernation partial power down and clock gating mode determination. In this patch only Partial Power Down is implemented the Hibernation and clock gating implementations are planned to be added. Fixes: 6f6d70597c15 ("usb: dwc2: bus suspend/resume for hosts with DWC2_POWER_DOWN_PARAM_NONE") Cc: <stable(a)vger.kernel.org> Acked-by: Minas Harutyunyan <Minas.Harutyunyan(a)synopsys.com> Signed-off-by: Artur Petrosyan <Arthur.Petrosyan(a)synopsys.com> Link: https://lore.kernel.org/r/20210408094607.1A9BAA0094@mailhost.synopsys.com Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/usb/dwc2/hcd.c | 90 +++++++++++++++++++++--------------------- 1 file changed, 46 insertions(+), 44 deletions(-) diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c index 34030bafdff4..f096006df96f 100644 --- a/drivers/usb/dwc2/hcd.c +++ b/drivers/usb/dwc2/hcd.c @@ -4427,7 +4427,7 @@ static int _dwc2_hcd_resume(struct usb_hcd *hcd) { struct dwc2_hsotg *hsotg = dwc2_hcd_to_hsotg(hcd); unsigned long flags; - u32 pcgctl; + u32 hprt0; int ret = 0; spin_lock_irqsave(&hsotg->lock, flags); @@ -4438,11 +4438,40 @@ static int _dwc2_hcd_resume(struct usb_hcd *hcd) if (hsotg->lx_state != DWC2_L2) goto unlock; - if (hsotg->params.power_down > DWC2_POWER_DOWN_PARAM_PARTIAL) { + hprt0 = dwc2_read_hprt0(hsotg); + + /* + * Added port connection status checking which prevents exiting from + * Partial Power Down mode from _dwc2_hcd_resume() if not in Partial + * Power Down mode. + */ + if (hprt0 & HPRT0_CONNSTS) { + hsotg->lx_state = DWC2_L0; + goto unlock; + } + + switch (hsotg->params.power_down) { + case DWC2_POWER_DOWN_PARAM_PARTIAL: + ret = dwc2_exit_partial_power_down(hsotg, 0, true); + if (ret) + dev_err(hsotg->dev, + "exit partial_power_down failed\n"); + /* + * Set HW accessible bit before powering on the controller + * since an interrupt may rise. + */ + set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags); + break; + case DWC2_POWER_DOWN_PARAM_HIBERNATION: + case DWC2_POWER_DOWN_PARAM_NONE: + default: hsotg->lx_state = DWC2_L0; goto unlock; } + /* Change Root port status, as port status change occurred after resume.*/ + hsotg->flags.b.port_suspend_change = 1; + /* * Enable power if not already done. * This must not be spinlocked since duration @@ -4454,52 +4483,25 @@ static int _dwc2_hcd_resume(struct usb_hcd *hcd) spin_lock_irqsave(&hsotg->lock, flags); } - if (hsotg->params.power_down == DWC2_POWER_DOWN_PARAM_PARTIAL) { - /* - * Set HW accessible bit before powering on the controller - * since an interrupt may rise. - */ - set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags); - - - /* Exit partial_power_down */ - ret = dwc2_exit_partial_power_down(hsotg, 0, true); - if (ret && (ret != -ENOTSUPP)) - dev_err(hsotg->dev, "exit partial_power_down failed\n"); - } else { - pcgctl = readl(hsotg->regs + PCGCTL); - pcgctl &= ~PCGCTL_STOPPCLK; - writel(pcgctl, hsotg->regs + PCGCTL); - } - - hsotg->lx_state = DWC2_L0; - + /* Enable external vbus supply after resuming the port. */ spin_unlock_irqrestore(&hsotg->lock, flags); + dwc2_vbus_supply_init(hsotg); - if (hsotg->bus_suspended) { - spin_lock_irqsave(&hsotg->lock, flags); - hsotg->flags.b.port_suspend_change = 1; - spin_unlock_irqrestore(&hsotg->lock, flags); - dwc2_port_resume(hsotg); - } else { - if (hsotg->params.power_down == DWC2_POWER_DOWN_PARAM_PARTIAL) { - dwc2_vbus_supply_init(hsotg); - - /* Wait for controller to correctly update D+/D- level */ - usleep_range(3000, 5000); - } + /* Wait for controller to correctly update D+/D- level */ + usleep_range(3000, 5000); + spin_lock_irqsave(&hsotg->lock, flags); - /* - * Clear Port Enable and Port Status changes. - * Enable Port Power. - */ - dwc2_writel(hsotg, HPRT0_PWR | HPRT0_CONNDET | - HPRT0_ENACHG, HPRT0); - /* Wait for controller to detect Port Connect */ - usleep_range(5000, 7000); - } + /* + * Clear Port Enable and Port Status changes. + * Enable Port Power. + */ + dwc2_writel(hsotg, HPRT0_PWR | HPRT0_CONNDET | + HPRT0_ENACHG, HPRT0); - return ret; + /* Wait for controller to detect Port Connect */ + spin_unlock_irqrestore(&hsotg->lock, flags); + usleep_range(5000, 7000); + spin_lock_irqsave(&hsotg->lock, flags); unlock: spin_unlock_irqrestore(&hsotg->lock, flags); -- 2.31.1

3 years, 8 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror April 2021