From patchwork Wed Aug 28 06:33:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Christian A. Ehrhardt" X-Patchwork-Id: 13780767 Received: from cae.in-ulm.de (cae.in-ulm.de [217.10.14.231]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B82D3374F1; Wed, 28 Aug 2024 06:39:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.10.14.231 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724827165; cv=none; b=jcRtZkLvheTADkh1PHuBhLmUiewHmGF3dLzXDnvIA1hMwM0i878fB7FWIZdUO5pmCYWceK/pkRj/IVTFiZj1kfKadsBuaZVfT/y7Iqaz9FstgAOE4LAZ0KlaZlGc0FC0Jk82Ich2tT2DqNTehEQB6EirIV3f4pLLGhvFKw+fcAM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724827165; c=relaxed/simple; bh=5v+VbaGlCErZl9BBZ85FCldssbuliKuV9zDO0Ube/Mk=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=QbDbW/21jg/OUiKdz1qXW57mm1ImsAiKRvX6sdGht8KYyldNDEACKAU+I1eMW5g5LZUtJUWyV/4vdsfCPj189ydFxIoHUOxX0L0758KRE1Hgimsbv+0bBT8ikdZNSmy19zzGAIhiVs2C7zRwkH9K2/Wp0EJJu2hxXXNuBnfabRE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=c--e.de; spf=pass smtp.mailfrom=c--e.de; arc=none smtp.client-ip=217.10.14.231 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=c--e.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=c--e.de Received: by cae.in-ulm.de (Postfix, from userid 1000) id EA7F71403C1; Wed, 28 Aug 2024 08:33:47 +0200 (CEST) From: "Christian A. Ehrhardt" To: linux-usb@vger.kernel.org (open list:USB TYPEC CLASS), linux-kernel@vger.kernel.org (open list) Cc: "Christian A. Ehrhardt" , Anurag Bijea , Christian Heusel , Heikki Krogerus , Greg Kroah-Hartman , Dmitry Baryshkov , Jameson Thies , Abhishek Pandit-Subedi Subject: [PATCH] usb: typec: ucsi: Fix busy loop on ASUS VivoBooks Date: Wed, 28 Aug 2024 08:33:13 +0200 Message-Id: <20240828063314.552278-1-lk@c--e.de> X-Mailer: git-send-email 2.30.2 Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 If the busy indicator is set, all other fields in CCI should be clear according to the spec. However, some UCSI implementations do not follow this rule and report bogus data in CCI along with the busy indicator. Ignore the contents of CCI if the busy indicator is set. If a command timeout is hit it is possible that the EVENT_PENDING bit is cleared while connector work is still scheduled which can cause the EVENT_PENDING bit to go out of sync with scheduled connector work. Check and set the EVENT_PENDING bit on entry to ucsi_handle_connector_change() to fix this. Finally, the quirk for some ASUS zenbook models is required for ASUS VivoBooks as well. Apply the quirk to these as well. Reported-by: Anurag Bijea Closes: https://bugzilla.kernel.org/show_bug.cgi?id=219108 Bisected-by: Christian Heusel Tested-by: Anurag Bijea Fixes: de52aca4d9d5 ("usb: typec: ucsi: Never send a lone connector change ack") Cc: stable@vger.kernel.org Signed-off-by: Christian A. Ehrhardt --- drivers/usb/typec/ucsi/ucsi.c | 8 ++++++++ drivers/usb/typec/ucsi/ucsi_acpi.c | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c index 4039851551c1..540cb1d2822c 100644 --- a/drivers/usb/typec/ucsi/ucsi.c +++ b/drivers/usb/typec/ucsi/ucsi.c @@ -38,6 +38,10 @@ void ucsi_notify_common(struct ucsi *ucsi, u32 cci) { + /* Ignore bogus data in CCI if busy indicator is set. */ + if (cci & UCSI_CCI_BUSY) + return; + if (UCSI_CCI_CONNECTOR(cci)) ucsi_connector_change(ucsi, UCSI_CCI_CONNECTOR(cci)); @@ -1249,6 +1253,10 @@ static void ucsi_handle_connector_change(struct work_struct *work) mutex_lock(&con->lock); + if (!test_and_set_bit(EVENT_PENDING, &ucsi->flags)) + dev_err_once(ucsi->dev, "%s entered without EVENT_PENDING\n", + __func__); + command = UCSI_GET_CONNECTOR_STATUS | UCSI_CONNECTOR_NUMBER(con->num); ret = ucsi_send_command_common(ucsi, command, &con->status, diff --git a/drivers/usb/typec/ucsi/ucsi_acpi.c b/drivers/usb/typec/ucsi/ucsi_acpi.c index 7a5dff8d9cc6..aa586525ab4c 100644 --- a/drivers/usb/typec/ucsi/ucsi_acpi.c +++ b/drivers/usb/typec/ucsi/ucsi_acpi.c @@ -197,6 +197,13 @@ static const struct dmi_system_id ucsi_acpi_quirks[] = { }, .driver_data = (void *)&ucsi_zenbook_ops, }, + { + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), + DMI_MATCH(DMI_PRODUCT_NAME, "VivoBook_ASUSLaptop"), + }, + .driver_data = (void *)&ucsi_zenbook_ops, + }, { .matches = { DMI_MATCH(DMI_SYS_VENDOR, "LG Electronics"),