From 02d2a4f174b225b765647ca5d10304c7b9ee89ec Mon Sep 17 00:00:00 2001 From: Linyu Yuan Date: Wed, 18 May 2022 09:37:06 +0800 Subject: [PATCH 1/2] Revert "ucsi: ucsi_glink: add more flags for clients during notification" This reverts commit e100ed74953673a4f226941be494fc51292c04d1. UCSI partner change and connect notifications are not needed for clients like USB redriver anymore. Change-Id: I6350f43ad144eae94ccd8cbecc3dabb810086e8b Signed-off-by: Linyu Yuan --- drivers/usb/typec/ucsi/ucsi_glink.c | 6 ------ include/linux/usb/ucsi_glink.h | 2 -- 2 files changed, 8 deletions(-) diff --git a/drivers/usb/typec/ucsi/ucsi_glink.c b/drivers/usb/typec/ucsi/ucsi_glink.c index 97c81979f49a..4f1ff041e926 100644 --- a/drivers/usb/typec/ucsi/ucsi_glink.c +++ b/drivers/usb/typec/ucsi/ucsi_glink.c @@ -425,12 +425,6 @@ static void ucsi_qti_notify(struct ucsi_dev *udev, unsigned int offset, entry->constat_info.partner_usb = false; entry->constat_info.partner_alternate_mode = false; - entry->constat_info.partner_change = - status->change & UCSI_CONSTAT_PARTNER_CHANGE; - - entry->constat_info.connect = - status->flags & UCSI_CONSTAT_CONNECTED; - conn_partner_type = UCSI_CONSTAT_PARTNER_TYPE(status->flags); switch (conn_partner_type) { diff --git a/include/linux/usb/ucsi_glink.h b/include/linux/usb/ucsi_glink.h index bdd9d1d86412..891ba957bb7b 100644 --- a/include/linux/usb/ucsi_glink.h +++ b/include/linux/usb/ucsi_glink.h @@ -13,8 +13,6 @@ struct ucsi_glink_constat_info { enum typec_accessory acc; bool partner_usb; bool partner_alternate_mode; - bool partner_change; - bool connect; }; struct notifier_block; From 4a9157116177d5d050b603d3f15014ace5b772e6 Mon Sep 17 00:00:00 2001 From: Linyu Yuan Date: Wed, 18 May 2022 09:53:53 +0800 Subject: [PATCH 2/2] Revert "ucsi: ucsi_glink: notify partner information" This reverts commit 3c3f7244f40d7cf47a350ff23761fa0d4d9cd80f. UCSI partner alternate_mode and usb type information is not needed anymore for clients like USB redriver as it will be controlled by role switch in ucsi framework, hence removing it. Change-Id: I9f697224907edbf35b7ce63bcbf68e0acc4356e7 Signed-off-by: Linyu Yuan --- drivers/usb/typec/ucsi/ucsi_glink.c | 18 +----------------- include/linux/usb/ucsi_glink.h | 2 -- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/drivers/usb/typec/ucsi/ucsi_glink.c b/drivers/usb/typec/ucsi/ucsi_glink.c index 4f1ff041e926..07fb7827d770 100644 --- a/drivers/usb/typec/ucsi/ucsi_glink.c +++ b/drivers/usb/typec/ucsi/ucsi_glink.c @@ -405,7 +405,7 @@ static void ucsi_qti_notify_work(struct work_struct *work) static void ucsi_qti_notify(struct ucsi_dev *udev, unsigned int offset, struct ucsi_connector_status *status, size_t len) { - u8 conn_partner_type, conn_partner_flag; + u8 conn_partner_type; bool cmd_requested; struct constat_info_entry *entry; @@ -422,9 +422,6 @@ static void ucsi_qti_notify(struct ucsi_dev *udev, unsigned int offset, return; INIT_LIST_HEAD(&entry->node); - entry->constat_info.partner_usb = false; - entry->constat_info.partner_alternate_mode = false; - conn_partner_type = UCSI_CONSTAT_PARTNER_TYPE(status->flags); switch (conn_partner_type) { @@ -434,24 +431,11 @@ static void ucsi_qti_notify(struct ucsi_dev *udev, unsigned int offset, case UCSI_CONSTAT_PARTNER_TYPE_DEBUG: entry->constat_info.acc = TYPEC_ACCESSORY_DEBUG; break; - case UCSI_CONSTAT_PARTNER_TYPE_UFP: - case UCSI_CONSTAT_PARTNER_TYPE_CABLE: - case UCSI_CONSTAT_PARTNER_TYPE_CABLE_AND_UFP: - case UCSI_CONSTAT_PARTNER_TYPE_DFP: - entry->constat_info.partner_usb = true; - fallthrough; default: entry->constat_info.acc = TYPEC_ACCESSORY_NONE; break; } - conn_partner_flag = UCSI_CONSTAT_PARTNER_FLAGS(status->flags); - if (conn_partner_flag & UCSI_CONSTAT_PARTNER_FLAG_USB) - entry->constat_info.partner_usb = true; - - if (conn_partner_flag & UCSI_CONSTAT_PARTNER_FLAG_ALT_MODE) - entry->constat_info.partner_alternate_mode = true; - mutex_lock(&udev->notify_lock); list_add_tail(&entry->node, &udev->constat_info_list); clear_bit(CONN_STAT_REQD, &udev->cmd_requested_flags); diff --git a/include/linux/usb/ucsi_glink.h b/include/linux/usb/ucsi_glink.h index 891ba957bb7b..67d2c8afd6c2 100644 --- a/include/linux/usb/ucsi_glink.h +++ b/include/linux/usb/ucsi_glink.h @@ -11,8 +11,6 @@ struct ucsi_glink_constat_info { enum typec_accessory acc; - bool partner_usb; - bool partner_alternate_mode; }; struct notifier_block;