The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
>From 6d91017a295e9790eec02c4e43f020cdb55f5d98 Mon Sep 17 00:00:00 2001
From: Xu Yang <xu.yang_2(a)nxp.com>
Date: Tue, 28 Sep 2021 19:16:39 +0800
Subject: [PATCH] usb: typec: tcpm: handle SRC_STARTUP state if cc changes
TCPM for DRP should do the same action as SRC_ATTACHED when cc changes in
SRC_STARTUP state. Otherwise, TCPM will transition to SRC_UNATTACHED state
which is not satisfied with the Type-C spec.
Per Type-C spec:
DRP port should move to Unattached.SNK instead of Unattached.SRC if sink
removed.
Fixes: 4b4e02c83167 ("typec: tcpm: Move out of staging")
cc: <stable(a)vger.kernel.org>
Reviewed-by: Guenter Roeck <linux(a)roeck-us.net>
Acked-by: Heikki Krogerus <heikki.krogerus(a)linux.intel.com>
Signed-off-by: Xu Yang <xu.yang_2(a)nxp.com>
Link: https://lore.kernel.org/r/20210928111639.3854174-1-xu.yang_2@nxp.com
Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
index a4d37205df54..7f2f3ff1b391 100644
--- a/drivers/usb/typec/tcpm/tcpm.c
+++ b/drivers/usb/typec/tcpm/tcpm.c
@@ -4876,6 +4876,7 @@ static void _tcpm_cc_change(struct tcpm_port *port, enum typec_cc_status cc1,
tcpm_set_state(port, SRC_ATTACH_WAIT, 0);
break;
case SRC_ATTACHED:
+ case SRC_STARTUP:
case SRC_SEND_CAPABILITIES:
case SRC_READY:
if (tcpm_port_is_disconnected(port) ||
I'm announcing the release of the 5.10.72 kernel.
All users of the 5.10 kernel series must upgrade.
The updated 5.10.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.10.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2
arch/sparc/lib/iomap.c | 2
arch/x86/events/core.c | 1
arch/x86/kvm/svm/svm.c | 2
arch/x86/kvm/x86.c | 7 +
drivers/ata/libata-core.c | 34 ++++-
drivers/irqchip/irq-gic.c | 52 +++++++
drivers/misc/habanalabs/gaudi/gaudi_security.c | 115 +++++++++--------
drivers/net/phy/mdio_device.c | 11 +
drivers/net/xen-netback/netback.c | 2
drivers/nvme/host/fc.c | 18 +-
drivers/platform/x86/touchscreen_dmi.c | 54 +++++++
drivers/scsi/sd.c | 9 -
drivers/scsi/ses.c | 22 ++-
drivers/spi/spi-rockchip.c | 6
drivers/thermal/qcom/tsens.c | 4
drivers/usb/dwc2/hcd.c | 4
fs/btrfs/file-item.c | 13 +
fs/btrfs/volumes.c | 13 +
fs/cifs/smb2pdu.c | 4
fs/ext2/balloc.c | 14 --
fs/nfsd/nfs4state.c | 16 +-
include/linux/libata.h | 1
include/linux/mdio.h | 3
tools/testing/selftests/kvm/steal_time.c | 4
tools/testing/selftests/kvm/x86_64/mmio_warning_test.c | 3
tools/testing/selftests/lib.mk | 1
tools/usb/testusb.c | 14 +-
tools/vm/page-types.c | 2
virt/kvm/kvm_main.c | 6
30 files changed, 339 insertions(+), 100 deletions(-)
Anand K Mistry (1):
perf/x86: Reset destroy callback on event init failure
Ansuel Smith (1):
thermal/drivers/tsens: Fix wrong check for tzd in irq handlers
Changbin Du (1):
tools/vm/page-types: remove dependency on opt_file for idle page tracking
Dai Ngo (1):
nfsd: back channel stuck in SEQ4_STATUS_CB_PATH_DOWN
Dan Carpenter (1):
ext2: fix sleeping in atomic bugs on error
Daniel Wagner (1):
nvme-fc: update hardware queues before using them
Faizel K B (1):
usb: testusb: Fix for showing the connection speed
Fares Mehanna (1):
kvm: x86: Add AMD PMU MSRs to msrs_to_save_all[]
Filipe Manana (1):
btrfs: fix mount failure due to past and transient device flush error
Greg Kroah-Hartman (1):
Linux 5.10.72
Hans de Goede (2):
platform/x86: touchscreen_dmi: Add info for the Chuwi HiBook (CWI514) tablet
platform/x86: touchscreen_dmi: Update info for the Chuwi Hi10 Plus (CWI527) tablet
James Smart (1):
nvme-fc: avoid race between time out and tear down
Jan Beulich (1):
xen-netback: correct success/error reporting for the SKB-with-fraglist case
Kate Hsuan (1):
libata: Add ATA_HORKAGE_NO_NCQ_ON_ATI for Samsung 860 and 870 SSD.
Li Zhijian (1):
selftests: be sure to make khdr before other targets
Linus Torvalds (1):
sparc64: fix pci_iounmap() when CONFIG_PCI is not set
Marc Zyngier (1):
irqchip/gic: Work around broken Renesas integration
Maxim Levitsky (1):
KVM: x86: nSVM: restore int_vector in svm_clear_vintr
Ming Lei (1):
scsi: sd: Free scsi_disk device via put_device()
Oded Gabbay (1):
habanalabs/gaudi: fix LBW RR configuration
Oliver Upton (1):
selftests: KVM: Align SMCCC call with the spec in steal_time
Qu Wenruo (1):
btrfs: replace BUG_ON() in btrfs_csum_one_bio() with proper error handling
Sergey Senozhatsky (1):
KVM: do not shrink halt_poll_ns below grow_start
Shuah Khan (1):
selftests:kvm: fix get_warnings_count() ignoring fscanf() return warn
Steve French (1):
smb3: correct smb3 ACL security descriptor
Tobias Schramm (1):
spi: rockchip: handle zero length transfers without timing out
Vladimir Oltean (1):
net: mdio: introduce a shutdown method to mdio device drivers
Wen Xiong (1):
scsi: ses: Retry failed Send/Receive Diagnostic commands
Yang Yingliang (1):
usb: dwc2: check return value after calling platform_get_resource()
I'm announcing the release of the 5.4.152 kernel.
All users of the 5.4 kernel series must upgrade.
The updated 5.4.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.4.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 -
arch/sparc/lib/iomap.c | 2 +
arch/x86/events/core.c | 1
arch/x86/kvm/x86.c | 7 +++
drivers/ata/libata-core.c | 34 ++++++++++++++++-
drivers/net/phy/mdio_device.c | 11 +++++
drivers/net/xen-netback/netback.c | 2 -
drivers/scsi/sd.c | 9 ++--
drivers/scsi/ses.c | 22 +++++++++--
drivers/usb/dwc2/hcd.c | 4 ++
fs/ext2/balloc.c | 14 +++----
fs/nfsd/nfscache.c | 12 ++----
include/linux/libata.h | 1
include/linux/mdio.h | 3 +
tools/testing/selftests/kvm/x86_64/mmio_warning_test.c | 3 +
tools/testing/selftests/lib.mk | 1
tools/usb/testusb.c | 14 ++++---
tools/vm/page-types.c | 2 -
virt/kvm/kvm_main.c | 6 ++-
19 files changed, 113 insertions(+), 37 deletions(-)
Anand K Mistry (1):
perf/x86: Reset destroy callback on event init failure
Changbin Du (1):
tools/vm/page-types: remove dependency on opt_file for idle page tracking
Dan Carpenter (1):
ext2: fix sleeping in atomic bugs on error
Faizel K B (1):
usb: testusb: Fix for showing the connection speed
Fares Mehanna (1):
kvm: x86: Add AMD PMU MSRs to msrs_to_save_all[]
Greg Kroah-Hartman (1):
Linux 5.4.152
Jan Beulich (1):
xen-netback: correct success/error reporting for the SKB-with-fraglist case
Kate Hsuan (1):
libata: Add ATA_HORKAGE_NO_NCQ_ON_ATI for Samsung 860 and 870 SSD.
Li Zhijian (1):
selftests: be sure to make khdr before other targets
Linus Torvalds (1):
sparc64: fix pci_iounmap() when CONFIG_PCI is not set
Ming Lei (1):
scsi: sd: Free scsi_disk device via put_device()
Rik van Riel (1):
silence nfscache allocation warnings with kvzalloc
Sergey Senozhatsky (1):
KVM: do not shrink halt_poll_ns below grow_start
Shuah Khan (1):
selftests:kvm: fix get_warnings_count() ignoring fscanf() return warn
Vladimir Oltean (1):
net: mdio: introduce a shutdown method to mdio device drivers
Wen Xiong (1):
scsi: ses: Retry failed Send/Receive Diagnostic commands
Yang Yingliang (1):
usb: dwc2: check return value after calling platform_get_resource()
I'm announcing the release of the 4.19.210 kernel.
All users of the 4.19 kernel series must upgrade.
The updated 4.19.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.19.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 +-
arch/sparc/lib/iomap.c | 2 ++
drivers/ata/libata-core.c | 34 ++++++++++++++++++++++++++++++++--
drivers/net/phy/mdio_device.c | 11 +++++++++++
drivers/net/xen-netback/netback.c | 2 +-
drivers/scsi/sd.c | 9 +++++----
drivers/scsi/ses.c | 22 ++++++++++++++++++----
drivers/usb/dwc2/hcd.c | 4 ++++
fs/ext2/balloc.c | 14 ++++++--------
include/linux/libata.h | 1 +
include/linux/mdio.h | 3 +++
include/linux/timerqueue.h | 13 ++++++-------
lib/timerqueue.c | 30 ++++++++++++------------------
tools/testing/selftests/lib.mk | 1 +
tools/usb/testusb.c | 14 ++++++++------
tools/vm/page-types.c | 2 +-
16 files changed, 112 insertions(+), 52 deletions(-)
Changbin Du (1):
tools/vm/page-types: remove dependency on opt_file for idle page tracking
Dan Carpenter (1):
ext2: fix sleeping in atomic bugs on error
Davidlohr Bueso (1):
lib/timerqueue: Rely on rbtree semantics for next timer
Faizel K B (1):
usb: testusb: Fix for showing the connection speed
Greg Kroah-Hartman (1):
Linux 4.19.210
Jan Beulich (1):
xen-netback: correct success/error reporting for the SKB-with-fraglist case
Kate Hsuan (1):
libata: Add ATA_HORKAGE_NO_NCQ_ON_ATI for Samsung 860 and 870 SSD.
Li Zhijian (1):
selftests: be sure to make khdr before other targets
Linus Torvalds (1):
sparc64: fix pci_iounmap() when CONFIG_PCI is not set
Ming Lei (1):
scsi: sd: Free scsi_disk device via put_device()
Vladimir Oltean (1):
net: mdio: introduce a shutdown method to mdio device drivers
Wen Xiong (1):
scsi: ses: Retry failed Send/Receive Diagnostic commands
Yang Yingliang (1):
usb: dwc2: check return value after calling platform_get_resource()