This is a note to let you know that I've just added the patch titled
usb: typec: altmodes/displayport: Fix pin assignment calculation
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
usb-typec-altmodes-displayport-fix-pin-assignment-calculation.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 9682b41e52cc9f42f5c33caf410464392adaef04 Mon Sep 17 00:00:00 2001
From: Prashant Malani <pmalani@xxxxxxxxxxxx>
Date: Wed, 11 Jan 2023 02:05:42 +0000
Subject: usb: typec: altmodes/displayport: Fix pin assignment calculation
From: Prashant Malani <pmalani@xxxxxxxxxxxx>
commit 9682b41e52cc9f42f5c33caf410464392adaef04 upstream.
Commit c1e5c2f0cb8a ("usb: typec: altmodes/displayport: correct pin
assignment for UFP receptacles") fixed the pin assignment calculation
to take into account whether the peripheral was a plug or a receptacle.
But the "pin_assignments" sysfs logic was not updated. Address this by
using the macros introduced in the aforementioned commit in the sysfs
logic too.
Fixes: c1e5c2f0cb8a ("usb: typec: altmodes/displayport: correct pin assignment for UFP receptacles")
Cc: stable@xxxxxxxxxxxxxxx
Cc: Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx>
Signed-off-by: Prashant Malani <pmalani@xxxxxxxxxxxx>
Reviewed-by: Benson Leung <bleung@xxxxxxxxxxxx>
Reviewed-by: Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20230111020546.3384569-2-pmalani@xxxxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/usb/typec/altmodes/displayport.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/drivers/usb/typec/altmodes/displayport.c
+++ b/drivers/usb/typec/altmodes/displayport.c
@@ -426,9 +426,9 @@ static const char * const pin_assignment
static u8 get_current_pin_assignments(struct dp_altmode *dp)
{
if (DP_CONF_CURRENTLY(dp->data.conf) == DP_CONF_DFP_D)
- return DP_CAP_UFP_D_PIN_ASSIGN(dp->alt->vdo);
+ return DP_CAP_PIN_ASSIGN_DFP_D(dp->alt->vdo);
else
- return DP_CAP_DFP_D_PIN_ASSIGN(dp->alt->vdo);
+ return DP_CAP_PIN_ASSIGN_UFP_D(dp->alt->vdo);
}
static ssize_t
Patches currently in stable-queue which might be from pmalani@xxxxxxxxxxxx are
queue-6.1/usb-typec-altmodes-displayport-fix-pin-assignment-calculation.patch
queue-6.1/usb-typec-altmodes-displayport-add-pin-assignment-helper.patch
