From patchwork Wed Mar 13 03:54:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 780126 Received: from mail-lj1-f180.google.com (mail-lj1-f180.google.com [209.85.208.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6914B101DE for ; Wed, 13 Mar 2024 03:54:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710302066; cv=none; b=lpjTIWncCwruMp1QBrB7n0kBwg/KN5A2OXLrjaviGqR5LXa2VTYJhPSsyj+m/Rpz/AcKXz2ibwWRl6n70H99QiTH21saKBQvX2NMIlosSCughqYWTHB7a6V8NdC+HsuNx+rrKpSBSN1+781t6BahgwLpfX12EXG82TUSbvzdVmo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710302066; c=relaxed/simple; bh=5qUUCTMFfwh0GWLizFk8xctUPdAHmp89Ki8123ktN38=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=k0vcAiY7dB/sLVJNKGR0lP3+qaW0soMpO+NHN3Y7MLxropIvdLiMTIpDVpbkkr1qhXRHMO4ffKEWdeeyhwJIsvvj6vQrs+oPwaGPH0gm0O9X++H4ZV/pPjlShYcCRN1TgVWaa+C1wFxWB0Uap/njx3yNcQ4T4iE/JTySaKWd4ec= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=Vq4sTN5r; arc=none smtp.client-ip=209.85.208.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Vq4sTN5r" Received: by mail-lj1-f180.google.com with SMTP id 38308e7fff4ca-2d27fef509eso101134421fa.3 for ; Tue, 12 Mar 2024 20:54:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1710302062; x=1710906862; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=RLTPq66GU+FLbpH3nyuA9I8IqdpbGC/dXUxjJTbbTFU=; b=Vq4sTN5resfoKl2ZP0jIXXTxe6kN5nrkl2+af6Nd9sXill94EtJYPjSO7fsRitsmiV f6CvorYT9NujrGwI/6V4vJBc4jRpDHyYWGaw5fUgS9ITYobFPQ8BXMlhLQ6iP09cTUMV NTg88+KUuYj45Qm2ldzBJK9lvWFJ8WLfgOgERsrc3R83nNSygF5h1gXY1pX5KhDx6Auz XUCrzteGKc5oZoH81wGcbXyd3MpC62YrKWWJ6bz3SrNEntu3uKa11D8AepEAXzYYUf5P 1H6a+fVGfQIIV6GbqRtuNMxOwIVUYd3jd9ik0STnHB4jTUtxKxN4vdYk6YrVrsnLCWJ+ iiQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710302062; x=1710906862; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RLTPq66GU+FLbpH3nyuA9I8IqdpbGC/dXUxjJTbbTFU=; b=i4qZQKThIpu/z1Ewq+oz2LPHO4Dp+HZGwWix0qYdi5SGcuJrDJ2KeLiNUazOQnRRhz t5T5jxEGHP5q0RQ6B5WTJTwyNHWlZGZOOePbWHVlE3xfNrPAnF38JOlCo2Gr3a4xvC20 03jamXHKjVzWbikd6tK1Jeapm2hexXufXtGsjFAdh1C5GG5N8ciRWGKV+NxMx/5kjtXy fMqwI+wcj6IaiV8MdHevH8/Dws7bOpA6P+oRnAXLBw3AU0PuFnT9Edz5l+tjmm4fzN3z SjQpJqTvrrx7MZdVk5Bah9Lg8zC8dHsCO97yyk/iqiBBoIu81hW+rXrRJM3HH1U4LS0N Ct7g== X-Forwarded-Encrypted: i=1; AJvYcCXy6m0zqOC2BubJGPEY2NpzrMQ7ZSbBArzWTGoyRPUY8SY2/Xus3n94zpX6ufSH0EMmlI0nlwEX3u7+QP5jRVTKKQia+8kiNxFuK4JDjw== X-Gm-Message-State: AOJu0YwRIJpJ0WjGJUVYcebEZg4K1/a9nHhXCeTMeL69hVoGo7FUhsiC 6toE/V7ieoRG6cbTyeyYcpYtzhy7+lmuUWW2nHGi2W74YS1qFs99PF0wxEs17II= X-Google-Smtp-Source: AGHT+IF2gIO8l89DhMPUZnzCGqhK82MhP/4ZMa2FOkGWNOMjWcfpe6eVq0PlHpm1K5Fom8nIThZywQ== X-Received: by 2002:a2e:7812:0:b0:2d4:142:488a with SMTP id t18-20020a2e7812000000b002d40142488amr7666840ljc.8.1710302062209; Tue, 12 Mar 2024 20:54:22 -0700 (PDT) Received: from umbar.lan ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id f25-20020a05651c02d900b002d0acb57c89sm1854319ljo.64.2024.03.12.20.54.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Mar 2024 20:54:20 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 13 Mar 2024 05:54:11 +0200 Subject: [PATCH 1/7] usb: typec: ucsi: fix race condition in connection change ACK'ing Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240313-qcom-ucsi-fixes-v1-1-74d90cb48a00@linaro.org> References: <20240313-qcom-ucsi-fixes-v1-0-74d90cb48a00@linaro.org> In-Reply-To: <20240313-qcom-ucsi-fixes-v1-0-74d90cb48a00@linaro.org> To: Heikki Krogerus , Greg Kroah-Hartman , Guenter Roeck , Bjorn Andersson , Neil Armstrong , Konrad Dybcio Cc: Johan Hovold , linux-usb@vger.kernel.org, linux-arm-msm@vger.kernel.org, stable@vger.kernel.org X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2257; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=5qUUCTMFfwh0GWLizFk8xctUPdAHmp89Ki8123ktN38=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBl8SNqd16wpFUFHQFpmCrx+aM4x5e+9Cbg/SwXy EdVo+IYGxKJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZfEjagAKCRCLPIo+Aiko 1UjFB/4vxPjvb5YNIJgzQJVuz/WdW4MrD6GzN/1jhebh/IPO9C/nP43s77XTsN73+OTlfVNgKj7 KRzqBz1ESGVxQQxhe/2KfA1S5ijpxK+egNcbul3gw/oqD+nGfIZhPoHp7k6GhiX8akiKxqn27LC iJm920Vq03Of8/X5T8XaKKqmaZ26hpUvv9x0bkBWszW0edyW/Nbyj4Ad4nUiQaFlmVS/e7RpQcK Z7HDoO+hI6Oj3xqrjlFHLVrxkw2ozF+vWnWoYPI9QENjgV58QiyN1B+zRyyTNVaIXyrZkuhqa2l FS4ARb4RRh7dauequb0u/GYKVmA1E3ZUQZmDS9/GMRhM9S1M X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A The code to handle connection change events contains a race: there is an open window for notifications to arrive between clearing EVENT_PENDING bit and sending the ACK_CC_CI command to acknowledge the connection change. This is mostly not an issue, but on Qualcomm platforms when the PPM receives ACK_CC_CI with the ConnectorChange bit set if there is no pending reported Connector Change, it responds with the CommandCompleted + NotSupported notifications, completely breaking UCSI state machine. Fix this by reading out CCI after ACK_CC_CI and scheduling the work if there is a connector change reported. Fixes: bdc62f2bae8f ("usb: typec: ucsi: Simplified registration and I/O API") Cc: stable@vger.kernel.org Signed-off-by: Dmitry Baryshkov --- drivers/usb/typec/ucsi/ucsi.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c index cf52cb34d285..4abb752c6806 100644 --- a/drivers/usb/typec/ucsi/ucsi.c +++ b/drivers/usb/typec/ucsi/ucsi.c @@ -61,12 +61,28 @@ static int ucsi_acknowledge_command(struct ucsi *ucsi) static int ucsi_acknowledge_connector_change(struct ucsi *ucsi) { + unsigned int con_num; u64 ctrl; + u32 cci; + int ret; ctrl = UCSI_ACK_CC_CI; ctrl |= UCSI_ACK_CONNECTOR_CHANGE; - return ucsi->ops->sync_write(ucsi, UCSI_CONTROL, &ctrl, sizeof(ctrl)); + ret = ucsi->ops->sync_write(ucsi, UCSI_CONTROL, &ctrl, sizeof(ctrl)); + if (ret) + return ret; + + clear_bit(EVENT_PENDING, &ucsi->flags); + ret = ucsi->ops->read(ucsi, UCSI_CCI, &cci, sizeof(cci)); + if (ret) + return ret; + + con_num = UCSI_CCI_CONNECTOR(cci); + if (con_num) + ucsi_connector_change(ucsi, con_num); + + return 0; } static int ucsi_exec_command(struct ucsi *ucsi, u64 command); @@ -1215,8 +1231,6 @@ static void ucsi_handle_connector_change(struct work_struct *work) if (con->status.change & UCSI_CONSTAT_CAM_CHANGE) ucsi_partner_task(con, ucsi_check_altmodes, 1, 0); - clear_bit(EVENT_PENDING, &con->ucsi->flags); - mutex_lock(&ucsi->ppm_lock); ret = ucsi_acknowledge_connector_change(ucsi); mutex_unlock(&ucsi->ppm_lock); From patchwork Wed Mar 13 03:54:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 780125 Received: from mail-lj1-f172.google.com (mail-lj1-f172.google.com [209.85.208.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5D17910A28 for ; Wed, 13 Mar 2024 03:54:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710302068; cv=none; b=muUUZv6AkmU6jeGqJIjj6TRx3iG3pC3DHThYoL+P5v2sSZ0lzOy/BtUsnN8rdwf+u4vSB5opCZmXvCc+DeQ2v0lh8+A/K1TtW2Nt5QhTX86fDeDTH2Y9Sd5XdMzTV0PHRxc6qoWJs7x0VRSkUPwpfWcY2WEmugJTwtvrD1ozcOY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710302068; c=relaxed/simple; bh=b4TOdcAfpKP7c8TtSew/74QZD84OuH+/13I9UVvWj6I=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=EEnyhp1rTn9jK8rvbXNkTrYb4chiL9g5JQGlSRxdBe306TLDZ4p/67+wNNSdbzwhJeOZ2Cbnmdri5DG1GmPCtvYg8nbuWEVBCLq3JSLOVu2bW9I+hzZK1KN1yo7GAp7mbRBDC7y+Z1/GjoB864CD1hnWZC9y7neqkrnFhdFxKYM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=N//dqGSF; arc=none smtp.client-ip=209.85.208.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="N//dqGSF" Received: by mail-lj1-f172.google.com with SMTP id 38308e7fff4ca-2d2509c66daso73702811fa.3 for ; Tue, 12 Mar 2024 20:54:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1710302063; x=1710906863; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=gFntvUmfQrQoD9JhHP4a9IiBrKarY81qZUG6+LdJaJU=; b=N//dqGSFTGZvAunpZjEUrPCDR0QAy+0xIvChTBMKfVysAt17fMBVWca1U/DE6hmJFo AZE7RnQOrdAiy1nfH43OuJBJ3loRlKATQS+f3JoY9Ct07oJQ6ACDV54vwx2Ql66uoNHM 27t3+kD7wxgrwF4lL8emztXUM+CY8mnXeHuA3sWunwWVeNp5nR998/WaXMN7IHjPWd/b ACbQOG2tQVVLeBabOfoDjpLyb2du6+7d//2Ltzpw+/5ZPJcQZX3I+DaBfbBZBWm8i9mG iCsGjea1ADQWIO7ehcjkQ06irnS7aw3iQcw1mWKVKbinon62i2gXiyQNrhM7wJVoGfFd Ujrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710302063; x=1710906863; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gFntvUmfQrQoD9JhHP4a9IiBrKarY81qZUG6+LdJaJU=; b=TxeZ5334byTAil0+mSuC5hQNYtMeons1Bfe73QtTMDLPrWYurk+tBMgRsWxmQZjHOd RDlbjNZVYjFScJAghVbmX68zfcYElCSLlne3mfKCa4e2fu/k8gX07Gp8cTl/vuKQziuU YLodc3h90/VEDSYAybPU+Mkbb5GY/C5PuYImzua+Ox7nLtm0mRfJAaNyqOALVPhF4trD OizXZsbVh+4nn7NlpFDzNvMV47uvN2NvTYLXmmGetKLfgcdzwLM5DqIzO4iMXFcVoMPt OAayJZyRJcWSC2X3+IrW96Kv3nSGtiPL2Ic5NxypcIpcxm0I14v+vqLfqQI7bVL3V1xx C8hw== X-Forwarded-Encrypted: i=1; AJvYcCXCWMT2XI63h6YcIArQ0k7oBC8FhBmAiDzbfnM//1Khhb2dZPwmiftFgEAw7ZmRvvX8vr85YEduAXRWvcr2MX3CerpLiQxHHryGwY0k5Q== X-Gm-Message-State: AOJu0YzlmngX8c9eBy4zThZNdalwMM8HDEmEg9QcgAKnt3xKebPlUAHg 1ZxOKYwV7Z+RNvMukpYcZlb53nBrilBVZ4RGxQr8/pPB4JtJRAVD0SptFdj3XTc= X-Google-Smtp-Source: AGHT+IF7ZptzPxSTf58/lAJjw4Oo4QhbXQNkZBdrDCZziYkkXuk84yKwMDenXbJyp736hIssvaOTAQ== X-Received: by 2002:a2e:8e3c:0:b0:2d3:fca:dae8 with SMTP id r28-20020a2e8e3c000000b002d30fcadae8mr1200502ljk.16.1710302063642; Tue, 12 Mar 2024 20:54:23 -0700 (PDT) Received: from umbar.lan ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id f25-20020a05651c02d900b002d0acb57c89sm1854319ljo.64.2024.03.12.20.54.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Mar 2024 20:54:22 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 13 Mar 2024 05:54:12 +0200 Subject: [PATCH 2/7] usb: typec: ucsi: acknowledge the UCSI_CCI_NOT_SUPPORTED Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240313-qcom-ucsi-fixes-v1-2-74d90cb48a00@linaro.org> References: <20240313-qcom-ucsi-fixes-v1-0-74d90cb48a00@linaro.org> In-Reply-To: <20240313-qcom-ucsi-fixes-v1-0-74d90cb48a00@linaro.org> To: Heikki Krogerus , Greg Kroah-Hartman , Guenter Roeck , Bjorn Andersson , Neil Armstrong , Konrad Dybcio Cc: Johan Hovold , linux-usb@vger.kernel.org, linux-arm-msm@vger.kernel.org, stable@vger.kernel.org X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1127; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=b4TOdcAfpKP7c8TtSew/74QZD84OuH+/13I9UVvWj6I=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBl8SNqeJcoJB/Iq7ScN3gQPd6nqFh0TtyF56Qo1 NIzkt2f3CaJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZfEjagAKCRCLPIo+Aiko 1a3NCACwe1UaBtfp8zYIFp97vnTMJ/Rftih1EHQpFoHrXfy+q8GjM7W55FJWQ0tAJYAHneww/11 rW0r6zoOWO0hGH6L9wScIb2k5fsy8RgV7e5FOj/Yu8QMY/f0FYoQl15l8AUfhF8BWYhgWll8tf/ ipldJqj9i7EgaY0Qr2FdwICG5H2Y2LePyZRb5HljYaW4ABjjn6ojloi0+4f9nExQG7K9bdOkYMb q3EwJ6XFQlbJCSnMjN2nAp+f5lYuWmFria6qyf/FXgkYqO0NJSZ+cETuzQ9B4MG7uYbNwehvcII vndULkoE+/G27inrpaRG3Q2Nyyn9uNwE75AcIJ4co7trqJew X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A When the PPM reports UCSI_CCI_NOT_SUPPORTED for the command, the flag remains set and no further commands are allowed to be processed until OPM acknowledges failed command completion using ACK_CC_CI. Add missing call to ucsi_acknowledge_command(). Fixes: bdc62f2bae8f ("usb: typec: ucsi: Simplified registration and I/O API") Cc: stable@vger.kernel.org Signed-off-by: Dmitry Baryshkov Reviewed-by: Heikki Krogerus --- drivers/usb/typec/ucsi/ucsi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c index 4abb752c6806..bde4f03b9aa2 100644 --- a/drivers/usb/typec/ucsi/ucsi.c +++ b/drivers/usb/typec/ucsi/ucsi.c @@ -167,8 +167,10 @@ static int ucsi_exec_command(struct ucsi *ucsi, u64 cmd) if (!(cci & UCSI_CCI_COMMAND_COMPLETE)) return -EIO; - if (cci & UCSI_CCI_NOT_SUPPORTED) - return -EOPNOTSUPP; + if (cci & UCSI_CCI_NOT_SUPPORTED) { + ret = ucsi_acknowledge_command(ucsi); + return ret ? ret : -EOPNOTSUPP; + } if (cci & UCSI_CCI_ERROR) { if (cmd == UCSI_GET_ERROR_STATUS) From patchwork Wed Mar 13 03:54:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 780358 Received: from mail-lj1-f180.google.com (mail-lj1-f180.google.com [209.85.208.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 38C9710A3B for ; Wed, 13 Mar 2024 03:54:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710302068; cv=none; b=iQhDUchOiHf++Ejueist7LwTJYLLMkgGeDDXPviWVTAC4iEHyt5KwARsF+vBw//hbC+NkyCwE05tRFmy4WynckfIj70A1uOMi30TJVCOFYeKwmhd+KhKnBbawCkwGwpJxs+DkMpihRj9NEf59Klj6LymXgtwVISdXuB7RgKKlNY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710302068; c=relaxed/simple; bh=XsTJRGmLqtfeI4uhYqv88MedEB7+Nrzpk4+GYV5RAlA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=k2kfPx0qoqSLXPTNs3qcwPrmyPdbGXniuw/nYBwiOgq6uF+W/dUQWJ6H1IEc/ZfCOWwaTdUqMz1PDCCGPqUie/T9ycBURSQ/nCdycrZNUrcXf4cuRvAnXtfEcaDxD43k0drSiipepDfEBUxM5AIzj190VCpx+j/Jm8eiqMJq4M0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=OP+DHje5; arc=none smtp.client-ip=209.85.208.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="OP+DHje5" Received: by mail-lj1-f180.google.com with SMTP id 38308e7fff4ca-2d46c99eb07so1246491fa.0 for ; Tue, 12 Mar 2024 20:54:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1710302064; x=1710906864; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=bhgYvXY3qfNB9puPl0tbRCud+qYwtmwix0mxjSGycJU=; b=OP+DHje5kxRl9YoabnmKgG0XA6Ndk2Io7E/e1tV3a9VIz1+nK1L5sFn/UnUeq7iwLm mltkMSrDGDBYtqfIlj2Z7UJfhqiQ4HSbYwGPCgutgMSt5qw2p2Sea5lCzN6Dcld9RX8S 61/CoQKA6v9KF89Pbg12yakLp28ZwF+6wJBrkzWOh9+3WdyCJJjxMIc2K3tQVw2TmWnJ xCL44PlQQN0CNr2y0FxRnSYh7sXe3ccj//eIKlIcZjl8U+XBwHZncP7EanREO0MxnoV5 Iz6kt/6aAbP71InEiPByf1D8zGQsO+dGfk3wWFjQgWu/5bQEnKniQSg68epIWeDXQLOT QNGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710302064; x=1710906864; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bhgYvXY3qfNB9puPl0tbRCud+qYwtmwix0mxjSGycJU=; b=HasTVewx+HyROYARu8gP7H9rhtsTSjB19Qkgj+VlpqQFfGMBULgIxKNDLFlPNZ/GKy TQ8RoVxlU6EVNMaOL2jA7lLoMCJggb91Alu3s+EnWsCLbSDb2zIO74A4qgT/BRY7lh81 y5w3Zc8vBR5usz0/1t6Hu1zV7tT3zdLV+bhtrzT10Vbp2OcWP1u59yU9XGEUuxpObnHh g0VbXAUqvcV7W3zpULZir5XSihpZ5dRb8H5sCc4gT/c2Pfza7OXJ8b0xfkNaeIQPkX65 v4ok6m7Qv86qZ3FADTLaPEcj1WFm7hlaPR/coLKAKpqazBYQMRul9Wcn9jAY89MdWyFx Ylzg== X-Forwarded-Encrypted: i=1; AJvYcCXQ3NR2W2QCUO+FRP36n5C3XBrW5xj4KL3UbZogxN3jZlo+PJea0oRGmH7ltlCeGt+IofYyCMZXs0/nm56kdhiqAGDe4bHOYJtX25ER2A== X-Gm-Message-State: AOJu0YxqO+EbLubNypTFs1E4/h9RVC87NyKgjrD+j6MFSf1jc8r1Af7K GZ/kQVqLq5ZiAILCVYkWQV9sbImQCMBKcYavtqsT61t85yD0SUIglcRLnWWpCyk= X-Google-Smtp-Source: AGHT+IGuUJwUxKprfVv1helbjKdC5swNlM5EdpqQUBCZ/j7Fjvo76AQlVaJ8BDDIwbK/p2HrX+FHmw== X-Received: by 2002:a2e:9a8e:0:b0:2d4:6532:f449 with SMTP id p14-20020a2e9a8e000000b002d46532f449mr1716234lji.20.1710302064505; Tue, 12 Mar 2024 20:54:24 -0700 (PDT) Received: from umbar.lan ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id f25-20020a05651c02d900b002d0acb57c89sm1854319ljo.64.2024.03.12.20.54.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Mar 2024 20:54:23 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 13 Mar 2024 05:54:13 +0200 Subject: [PATCH 3/7] usb: typec: ucsi: make ACK_CC_CI rules more obvious Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240313-qcom-ucsi-fixes-v1-3-74d90cb48a00@linaro.org> References: <20240313-qcom-ucsi-fixes-v1-0-74d90cb48a00@linaro.org> In-Reply-To: <20240313-qcom-ucsi-fixes-v1-0-74d90cb48a00@linaro.org> To: Heikki Krogerus , Greg Kroah-Hartman , Guenter Roeck , Bjorn Andersson , Neil Armstrong , Konrad Dybcio Cc: Johan Hovold , linux-usb@vger.kernel.org, linux-arm-msm@vger.kernel.org X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1720; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=XsTJRGmLqtfeI4uhYqv88MedEB7+Nrzpk4+GYV5RAlA=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBl8SNraClA33CPWuYkPDFf2GlffV2yFp/DWqKa7 JQyl/lMd/uJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZfEjawAKCRCLPIo+Aiko 1YfsB/4+Nnmk2AEqncBvGZIyyIxPd3aHD2nZiLyZEb7CBulni/ZUTXCulyCwldLCgywS023JrRG 41Rkn2pHoUQnxjPdpOs2b6fapIoXo32fP4piMRUoCIIFb+sf0+Q2oLd7zKi3Tf35i/v2htftBjJ QwOzuXDH//Ajc+uiqVaB8TNe8ZfprSRp4B/2S7JLikuss7hY2TGbGHwh30liqMDoFrQ6DHyyQtF b7KMWqsOGlwPiHaB1jkX1+ecq0Ecj02YsPEKCPlJHkL9vr3WP1hIOUqiwCFnI2BtOI5GxVmCAKN NJWpkza6/b0rKtM7fQz+TeQlpqIPMDPfoRdcLBaebmpxqK6Y X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A It is pretty easy to miss a call to usb_acknowledge_command() in the error handling inside ucsi_exec_command(). For example UCSI_CCI_ERROR had this call hidden inside ucsi_read_error(). Move this call and add a comment to make the rules regarding usb_acknowledge_command() calls more obvious. Signed-off-by: Dmitry Baryshkov Reviewed-by: Heikki Krogerus --- drivers/usb/typec/ucsi/ucsi.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c index bde4f03b9aa2..05a44e346e85 100644 --- a/drivers/usb/typec/ucsi/ucsi.c +++ b/drivers/usb/typec/ucsi/ucsi.c @@ -92,11 +92,6 @@ static int ucsi_read_error(struct ucsi *ucsi) u16 error; int ret; - /* Acknowledge the command that failed */ - ret = ucsi_acknowledge_command(ucsi); - if (ret) - return ret; - ret = ucsi_exec_command(ucsi, UCSI_GET_ERROR_STATUS); if (ret < 0) return ret; @@ -167,14 +162,27 @@ static int ucsi_exec_command(struct ucsi *ucsi, u64 cmd) if (!(cci & UCSI_CCI_COMMAND_COMPLETE)) return -EIO; + /* + * All error cases below must acknowledge the command completion, + * otherwise PPM will be stuck and won't process commands anymore. + * + * In non-error case the command is acknowledged after reading Data + * from the controller. + */ + if (cci & UCSI_CCI_NOT_SUPPORTED) { ret = ucsi_acknowledge_command(ucsi); return ret ? ret : -EOPNOTSUPP; } if (cci & UCSI_CCI_ERROR) { + ret = ucsi_acknowledge_command(ucsi); + if (ret) + return ret; + if (cmd == UCSI_GET_ERROR_STATUS) return -EIO; + return ucsi_read_error(ucsi); } From patchwork Wed Mar 13 03:54:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 780357 Received: from mail-lj1-f182.google.com (mail-lj1-f182.google.com [209.85.208.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3D8E0101DE for ; Wed, 13 Mar 2024 03:54:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710302068; cv=none; b=fZyji/Yg1CCD47WfDImo+38ggS8lJUFc4S5Fnba3HEN7OkF1CcHjGmhx79G2I5SZPp2ThDorf5SItVllqEioRDGFzqQgDA3gSvYq/5Mn2u3eXj86aUEyKjfeFzQH9x1iN0pfpQ8Q0464+V8ooFeOnu2LrUFI4NMkbshooWyB2ZY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710302068; c=relaxed/simple; bh=6EYmD69sWZmGoX6AKwzh0M4O6uXmEHRrEKh/yt0/KPs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=FtJfa/JwoFmcG+VgHmUXozfl8sKTu0u3TrsPOjZJl6Y5twagCXMV7oIgXkOhUdtjBTxOnR2Jewpy5nuncH3OKe3ebLPB6pN09iMyhTlfHnAGOBeIFHhUSFm5TnbacpySmTP76lD2EZtaGkvKocAlWaouVBmRczOm95a9OspLIIo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=YZpLyrRt; arc=none smtp.client-ip=209.85.208.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="YZpLyrRt" Received: by mail-lj1-f182.google.com with SMTP id 38308e7fff4ca-2d2509c66daso73702981fa.3 for ; Tue, 12 Mar 2024 20:54:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1710302065; x=1710906865; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Fct0VZjsurRkzQqPpB3JaLxWY0P6FclFVQOW6mKz5w0=; b=YZpLyrRtNe2B1Z74VpEfjNExU+KV+xHRq721Jqup9DucYxpJqxzIFvh9avQ/qKPqDO h1Mz4ZvRom+vPWuVqmXnd3iQE0k7EOZXBKWaYyf9Kb1tr62civn1LRhJomfPYmjH3N38 F/WphJ2ow9iYQ0T9FiGJ2CRVGlSSzVMfLUJmSSBSuTdXrsvHLtmuTVq5Oz3gaInMVfW3 UbqY+KkAI7U5Q4cmBu7GpB7PCFmCT++FOT2B7ywqY/1NgHuaCpfCAQaRxEVWqik8H39w v4+kK+RYX6NbZpBoYBqq07Hsxi4za5v2YwP/p0r6i2nhpCZ4E1rMK3C31ap63M3PFwWq Cc5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710302065; x=1710906865; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Fct0VZjsurRkzQqPpB3JaLxWY0P6FclFVQOW6mKz5w0=; b=A9tkM0qgoU3uzexs5yL0NyXDuhXZWfr7Y7ho5mTpwer6RAnCKrepnxdGl09tacHEBS ivr7wx8WY4fiFB4f4+nE9gYMw+Qoh5oGt3kne9JGmxkzdHwWuqVUasSIPA51efrcrftS h+d4+zOfur2lTvv4RK72Z+la9IzXlmRWI8RlUhj1A4P/H958F3rtkuctbuzX3PqoVQYZ iNQY5t6CpeV7aaaWM/Ff34Ub7/n6Bg2IT0pgyYWBgfT/2105Nexq564F4chweid0Gjmt a3hi2c971V2nFdxr9lClSUhAgOzjmdj+ZSG63CTbb4ywg4KH24lluNeF3Nh/MMUHOvIb xnRg== X-Forwarded-Encrypted: i=1; AJvYcCWETy56Yp6V+LIP5MJmN6rxnd/GZDyooI0ND1HXYcptKqKPo3O7YdCwEUo3Y3DfV9yYbT8inpLisoUo9aRxuQU+A2A/fw//hTS7VBWwfw== X-Gm-Message-State: AOJu0YwadcwYCAejeAZKD4HEDWPEuNMn2SqhPeLSFu0qPBEgUpgzuV/D jFTAHkojhRdEcSsuaAkMNl485IJNZMF5kEpACRgPu5zx7Ir/gyhnzAK7pvVQkFO632279A0XbYd P X-Google-Smtp-Source: AGHT+IGU1nKa9yZZSaZBVwxotiWxvgYGip66g5eNu2UPhAK4cjTwOilx3MCH81jbjbDHlShtOoBQOA== X-Received: by 2002:a2e:350d:0:b0:2d4:16a5:b361 with SMTP id z13-20020a2e350d000000b002d416a5b361mr1431441ljz.25.1710302065397; Tue, 12 Mar 2024 20:54:25 -0700 (PDT) Received: from umbar.lan ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id f25-20020a05651c02d900b002d0acb57c89sm1854319ljo.64.2024.03.12.20.54.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Mar 2024 20:54:24 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 13 Mar 2024 05:54:14 +0200 Subject: [PATCH 4/7] usb: typec: ucsi: allow non-partner GET_PDOS for Qualcomm devices Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240313-qcom-ucsi-fixes-v1-4-74d90cb48a00@linaro.org> References: <20240313-qcom-ucsi-fixes-v1-0-74d90cb48a00@linaro.org> In-Reply-To: <20240313-qcom-ucsi-fixes-v1-0-74d90cb48a00@linaro.org> To: Heikki Krogerus , Greg Kroah-Hartman , Guenter Roeck , Bjorn Andersson , Neil Armstrong , Konrad Dybcio Cc: Johan Hovold , linux-usb@vger.kernel.org, linux-arm-msm@vger.kernel.org X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=997; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=6EYmD69sWZmGoX6AKwzh0M4O6uXmEHRrEKh/yt0/KPs=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBl8SNreDUqybYN8KU9iG18YedS4ZfehnlaTrZRv 7/A8LzaOIeJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZfEjawAKCRCLPIo+Aiko 1cz5B/9rl0hub4Z5WK6m/HRp2u0VhWm7/iLCPxfkgXFaarI7zCOiQf41D8H4NbEWJ6jgcecy/OU nl0B5nbBw52Ix4jTdCe5Gh3sTn6yDoTcxcsNln/T3ncQowxE6g7W8qudfBxEv5AJ5XosAtSWEP8 KiSRh/6WUQOGnwYLtuZXPACSjnp5ObKVHCpiP7RjYov0fO8tmYDaTbzfhf1IuKYkYd6jKjMZGPs KfyunsuG/2tZ36zX8L2X7NVbqltjSEu6X8wuBZLXbOHpilZNv4r+wxTi5EYAHCDqFWuxI+smGY7 0YEgHg2AnKgprVC9jqXv9diDMCum1RYwGNSZp+tQCdHSxmM4 X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A The name and description of the USB_NO_PARTNER_PDOS quirk specifies that only retrieving PDOS of the attached device is crashing. Retrieving PDOS of the UCSI device works. Fix the condition to limit the workaround only to is_partner cases. Fixes: 1d103d6af241 ("usb: typec: ucsi: fix UCSI on buggy Qualcomm devices") Signed-off-by: Dmitry Baryshkov --- drivers/usb/typec/ucsi/ucsi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c index 05a44e346e85..011d52bf34f6 100644 --- a/drivers/usb/typec/ucsi/ucsi.c +++ b/drivers/usb/typec/ucsi/ucsi.c @@ -641,7 +641,8 @@ static int ucsi_read_pdos(struct ucsi_connector *con, u64 command; int ret; - if (ucsi->quirks & UCSI_NO_PARTNER_PDOS) + if (is_partner && + ucsi->quirks & UCSI_NO_PARTNER_PDOS) return 0; command = UCSI_COMMAND(UCSI_GET_PDOS) | UCSI_CONNECTOR_NUMBER(con->num); From patchwork Wed Mar 13 03:54:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 780124 Received: from mail-lj1-f174.google.com (mail-lj1-f174.google.com [209.85.208.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 39A8512E54 for ; Wed, 13 Mar 2024 03:54:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710302069; cv=none; b=kke+ihTulbL64VVfCozk/jRi5Lte9RiPrzCiCyR7rm7zEzeR5y4oCg9o7R8n8zNqOTxi/IusUb71Qg4rsuvrQhceIcxGqA3XH9h56GO6qW/8V/5LYGIiHhZTrFE4V6xenL1OsLnSui/Qug+L5bskK9O7zQGZWO9Qi5AqDFTkwY4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710302069; c=relaxed/simple; bh=pwqh+7qUWx0XkGuOfq8GXVfKJVkT8SLDNZBKjtfBxbs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=QYbuwKWWmbp6yQ69OT/MSNHBGcz6LNJGTAEmbZdHaa6afNCtAVc4xXieuGIwIBC19pY1LvitUzrRoqaYTTUIguOupsF5Y9qWUcLHKxiGTUYggUCfBO//fqix69e50DMDkbtz8cWqoCzHxCy5PjsfpGPgvGWlK5bCzW6JaCuSApQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=IUaXGz0r; arc=none smtp.client-ip=209.85.208.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="IUaXGz0r" Received: by mail-lj1-f174.google.com with SMTP id 38308e7fff4ca-2d2991e8c12so4383201fa.0 for ; Tue, 12 Mar 2024 20:54:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1710302066; x=1710906866; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=uhTvdctsG3UAMNuU+ThWL3PpPImv7wP9zybhV8Y4zOc=; b=IUaXGz0rxDtAD6Cld+luz1aqvemAl0UDawDcjU++IpWlYfvGzG72/Kez6VQDQCIByH ZdBRlw9KC0TIw+OaGGv6MNi+tlEk5alA2DMVVPVU0fhl+VQVV0h3HA2gsql2hNIFSvFF oBcLZEvksHh6n572UgLmKAcCTE/jjHf42gutb2anI8imgDytdXBxs83HfeDHuwO4Ypmf fiJjnj6e1xcFJG7rsaSoB1Jyb+hvO2cdnAiLgsQPXwJ0pEaQjR5H0b3cb8wW47Kc62F1 2W2NdIPaA9uLiTWGIGbPN20KcViSMpaskbOaTsFmbOrsPthND/If5ZhET3VeLPAZsSYM 7Ayw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710302066; x=1710906866; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uhTvdctsG3UAMNuU+ThWL3PpPImv7wP9zybhV8Y4zOc=; b=VIe4Usky2etyIuQqD5dNU9HMzpf7m333OUiVl1ccTJiRqPsSOCbY/RegNEPBjjJxlx BeSiMTCPcxMgwJmzqyKvnGM0mlkbWDZIqyECKMGRJTyyE3wvUcwMpzr2T84yH9X7xm8l 7ASyifYP2yF3WPNGdl09HUovnPLRf6INgO3o4Ej5YSye6bGlrcfj1N1c15NZ21LLHVcl ngyFZVrEuFslHTwKGpkjpHsBB89yVGq00EuMQASCQJhPIo1utA1ePoWP0GXW98AZ8ynp 2sPvCdeAEbcavBD7k6qMN4EGzk50vDFB6Wz2lDr6BPlP/jEZQoAyC6/CXMb4Vaah0Ycy BNVA== X-Forwarded-Encrypted: i=1; AJvYcCW7QNRKdNnUqb2LhAo2xND6rJmwK15xT5tHn2Tp4jHKR9+W1dgzF1VpxtHL3xgTgqVL+rer3qWxhxXqzIg4qoOSuSwBaGcIbHtpqTMnqw== X-Gm-Message-State: AOJu0YwN03l4ky98zqirO9Jq4nFX877dCSqKrY/0BGIG9ZkLbfECMPH6 JcZDW4RiIlf7AkryUhnJ14Mtb5/A7Ca5tq+dC/B1vBGJB0STMZ3vtUU26A6Bypg= X-Google-Smtp-Source: AGHT+IGUXuKt1xsCYGLcIpNaTG6doYJa88I3f0jTK6Qe7QNycBlM9CkIMQ3hzYDXjsxiQ5roHW7rYQ== X-Received: by 2002:a2e:984e:0:b0:2d4:6c19:67d5 with SMTP id e14-20020a2e984e000000b002d46c1967d5mr203100ljj.18.1710302066638; Tue, 12 Mar 2024 20:54:26 -0700 (PDT) Received: from umbar.lan ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id f25-20020a05651c02d900b002d0acb57c89sm1854319ljo.64.2024.03.12.20.54.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Mar 2024 20:54:25 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 13 Mar 2024 05:54:15 +0200 Subject: [PATCH 5/7] usb: typec: ucsi: limit the UCSI_NO_PARTNER_PDOS even further Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240313-qcom-ucsi-fixes-v1-5-74d90cb48a00@linaro.org> References: <20240313-qcom-ucsi-fixes-v1-0-74d90cb48a00@linaro.org> In-Reply-To: <20240313-qcom-ucsi-fixes-v1-0-74d90cb48a00@linaro.org> To: Heikki Krogerus , Greg Kroah-Hartman , Guenter Roeck , Bjorn Andersson , Neil Armstrong , Konrad Dybcio Cc: Johan Hovold , linux-usb@vger.kernel.org, linux-arm-msm@vger.kernel.org X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=936; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=pwqh+7qUWx0XkGuOfq8GXVfKJVkT8SLDNZBKjtfBxbs=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBl8SNr5RlhRizT3CYUWt8TNerNgnS1//e4G+r31 b4pQpB5/6GJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZfEjawAKCRCLPIo+Aiko 1SKzB/9zGp/G8bISVxeCGIhS8uvT6pZELUF3hCqGctUuFrbIpV65Gdq/ez91l1PgETjn6GMCGSW sAKmTpVlfnYDypMn8wZuwVz1yetFoXqRg7XEik/i8PmzxnXJVzzaUoakH/cp4hqBA1kTWgozjnz QRLPZRDHLyOZiQyefK2xfU9z7uZtVOEBUt9Io625dadNsoqHfFgZYsWU7Y7fNlDVusSxtlcr7Mu u21RyF7QSCKpFQtY5OUuNK3HYU/CQWi4Xj0sKJcf2KkWRDPOP06dIVlz7HdPmtf8DxqLTK7qE0H q4ab2aeZAZIYxyMuW8ijEU8rFWVNG2MVGglhuwxHo/9usGyR X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A Reading Partner Source PDOs for the consumer Connectors appears to be working. Permit getting PDOs in this case in order to populate capabilities of the connected power supply in the sysfs. Signed-off-by: Dmitry Baryshkov Reviewed-by: Heikki Krogerus --- drivers/usb/typec/ucsi/ucsi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c index 011d52bf34f6..72d368433b1f 100644 --- a/drivers/usb/typec/ucsi/ucsi.c +++ b/drivers/usb/typec/ucsi/ucsi.c @@ -642,7 +642,9 @@ static int ucsi_read_pdos(struct ucsi_connector *con, int ret; if (is_partner && - ucsi->quirks & UCSI_NO_PARTNER_PDOS) + ucsi->quirks & UCSI_NO_PARTNER_PDOS && + ((con->status.flags & UCSI_CONSTAT_PWR_DIR) || + !is_source(role))) return 0; command = UCSI_COMMAND(UCSI_GET_PDOS) | UCSI_CONNECTOR_NUMBER(con->num); From patchwork Wed Mar 13 03:54:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 780356 Received: from mail-lj1-f178.google.com (mail-lj1-f178.google.com [209.85.208.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2C47D13ADD for ; Wed, 13 Mar 2024 03:54:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710302070; cv=none; b=FGyXIJXIQFsVc2tSSniT6ieaEGosiVFzMMNh50FC5+GG+1DvzX+EppZtDMPwvrY9ObQ1IMnDJI+klDkBA8fMbjaemoqtx41ehexxL3LbtmX/GESEXOfcQdVondNzHd3CMAtcYGlEaLdKyJv4hJnhs9QoSmvZ8OjGXdJ5U8M3S20= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710302070; c=relaxed/simple; bh=hjtNY7rwrzLwExmeSB1V0RfbPf0EFqjWrRvXTMW6u3s=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=JrrxquF5O80SLGwa+pplW9gtubSNWHyFxVSK0HUJ6WZwmUrYwu1HpUco+LUDhaAVJqPGMIveJ3k56eufSTw0w0hKOPv32OHLo2dVGz2AOoA/C1yPpehi2Sa2K11TuUq/EsIP/KCV3I/922egMLmOPPV8tzdnJnvJn+cH92LFD0I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=ESI5kDfG; arc=none smtp.client-ip=209.85.208.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="ESI5kDfG" Received: by mail-lj1-f178.google.com with SMTP id 38308e7fff4ca-2d3fb16f1a9so5021101fa.0 for ; Tue, 12 Mar 2024 20:54:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1710302067; x=1710906867; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=7fFzMCtaUwxqWFGfcU6jyBqJsIQ1qd2eqh/5wTdrbDk=; b=ESI5kDfGw+RUT5wFKUYfTqPRiBshcZynfD7gVREyEH0gMMjcUzHYdiINtls+NVC6Dn PRymzqkxFgrRRdG5Ci1BkbekdPn7rd5+nLRKabSr+nKpIgqhDAGr/71hwxrAzV0XdNUV +NJBrvvuKqbXb0qzkbvQjk7DApPlM5M0sxVV2Rns0VDbLelSImMHsM0CRm8qziQaARzm pkbnqNRIDFACwR1MF/CTvnsF2MJHYGABZKKA5P5SxI9c33+Oilrocdnr4dOH4stsyFCm 0SGvzeBumSk/g5U7Qddi9K4t4MFHClA+Oi9Oa8CVvQnc+AJDbiRXqYzdLmij/D7iz3b/ dMPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710302067; x=1710906867; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7fFzMCtaUwxqWFGfcU6jyBqJsIQ1qd2eqh/5wTdrbDk=; b=IN85QcY2vf/cqay/kYnP3Lx8PoSsbD159LL77QlDxrNCPWfqKL0zMub1MhRiKoU9aZ eDpKzXBrto0Q+5Q2FrA05AqU+/6DPF9j2+uEJjyFq5paErx8tMr+zhCYWhADa9XF0Rc7 2imLQm9KEDza8bCrXerHexYD0WJlcB/zc2per+fZQVHiqzP66hx9Md+VIUkMky2Xzsdf JoEajLLzU5nLAt0bngfSdujCtbTpctryw2IvOzUZdeTvexQwlyFYcB2Oo/CwV85yPP7i uVZNqOyPq8eaXPpB2Fimgwjv8rlzk6OHbw7NgpxR91TxCOHrZWWER0gKt8+aJeNf7YFf PRxg== X-Forwarded-Encrypted: i=1; AJvYcCUprQBAx8y2xN/GmBIbX7ml8SZFikV5p6mXXV3IaOiRsiyfBTmYL/iL4P+IpXo4vmvc3bTRM1YHHlwihAhXDUwt0RwNJaa3igxwo7r9wQ== X-Gm-Message-State: AOJu0Yxg5gW9SG543oQyDTKBDzrtaqkc+u8JKp0/1LLR0mj7kxz2Ut7L cOyKMszDNQJelId/Bg7eA4lfwtxnerKzJwopkx37UDD/BFkMoYz2RHlEXtOE0rw= X-Google-Smtp-Source: AGHT+IFIf0aayTcXNyruF81FSZALtLVnPMSslXA4xvKeV9oyGrKzjNCVmlS48OOTDYcZ4iyL5usVdA== X-Received: by 2002:a05:651c:105b:b0:2d4:22d9:b01a with SMTP id x27-20020a05651c105b00b002d422d9b01amr477054ljm.11.1710302067679; Tue, 12 Mar 2024 20:54:27 -0700 (PDT) Received: from umbar.lan ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id f25-20020a05651c02d900b002d0acb57c89sm1854319ljo.64.2024.03.12.20.54.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Mar 2024 20:54:26 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 13 Mar 2024 05:54:16 +0200 Subject: [PATCH 6/7] usb: typec: ucsi: properly register partner's PD device Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240313-qcom-ucsi-fixes-v1-6-74d90cb48a00@linaro.org> References: <20240313-qcom-ucsi-fixes-v1-0-74d90cb48a00@linaro.org> In-Reply-To: <20240313-qcom-ucsi-fixes-v1-0-74d90cb48a00@linaro.org> To: Heikki Krogerus , Greg Kroah-Hartman , Guenter Roeck , Bjorn Andersson , Neil Armstrong , Konrad Dybcio Cc: Johan Hovold , linux-usb@vger.kernel.org, linux-arm-msm@vger.kernel.org X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=874; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=hjtNY7rwrzLwExmeSB1V0RfbPf0EFqjWrRvXTMW6u3s=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBl8SNr/e7wwCwLWXzsNh5AlPrljH8c1bjebYZIn 8rDBmNao7eJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZfEjawAKCRCLPIo+Aiko 1ex4B/42jyzjXY1cC5GZEU8UWURS1Dc2rdh13kO5wmShsvrgMpF/oGhA3FRPKAPUOVyGH6odIub /oif7UVdI8wIEjrlxqwQRgwO+HUXZlK8ZQzoAuHcrS37BJQAWTqMHzNkOyEBlpOxkEyf1aRBiSR huxD4SHC9UFToOPFfHdOzJRBM+Jag9tMFliRUzn3KJ+8XidOkgBVdJGatJGJSua7Pe46uuEohXG e/acWjwZX5FROYGG759vSg/l71rEOsx9NRa+CMq2qJH/+1lCPyavH2uibMQSaYhBIN8YB/3ei+y O790+02cRft7tSNsgHZWGKIZ3+k72uiUCke+q6f4LNtdfTfi X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A Use typec_partner_usb_power_delivery_register() to register PD device for Type-C partner so that the PD device is nested under the partner's device in sysfs. Signed-off-by: Dmitry Baryshkov --- drivers/usb/typec/ucsi/ucsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c index 72d368433b1f..78e04b7701c8 100644 --- a/drivers/usb/typec/ucsi/ucsi.c +++ b/drivers/usb/typec/ucsi/ucsi.c @@ -833,7 +833,7 @@ static int ucsi_register_partner_pdos(struct ucsi_connector *con) if (con->partner_pd) return 0; - con->partner_pd = usb_power_delivery_register(NULL, &desc); + con->partner_pd = typec_partner_usb_power_delivery_register(con->partner, &desc); if (IS_ERR(con->partner_pd)) return PTR_ERR(con->partner_pd); From patchwork Wed Mar 13 03:54:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 780123 Received: from mail-lj1-f169.google.com (mail-lj1-f169.google.com [209.85.208.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 627D214ABA for ; Wed, 13 Mar 2024 03:54:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710302072; cv=none; b=Cw2T6vsF6sXHFurWZEzEDpZKti2mTifMjODn8VfsOqImaL+2Prb1ou658WMlT6epvmZl/1qM7NFVtIZlihwWY7vDY6MQbVdsoBIAMe+A3S+O9L+zBkgCM+V77WSjUkZvrMmLlf5wC9RbU5oYbexMxW8OKCPpYchHlGkbqkDdDew= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710302072; c=relaxed/simple; bh=S06LW4XbXp4mNZRbX50ghuv/ngjWIPDbWauLWS0Z+FU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KKfPibMzfLJaV3fpMkS0FLdYLmaEB0QG2QP6CB4xDaK2KWaqXu8shavdzBsCZrENj9uhN5KaY+jLtKVnxr3Nr2E5b+A5u4sZKoqubtoFakAeQwX6CwRMubYOZqdekQm0/jv8EnAV1TP9CJf/r7RK/iLpMgDuzzAUdXmvO/G9h44= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=Pnov1oIs; arc=none smtp.client-ip=209.85.208.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Pnov1oIs" Received: by mail-lj1-f169.google.com with SMTP id 38308e7fff4ca-2d228a132acso80456701fa.0 for ; Tue, 12 Mar 2024 20:54:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1710302068; x=1710906868; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Z632Vl9mGcaUD+E7Cpwdhyjpjxo2r7hLci9lVvPzHlg=; b=Pnov1oIssLpiTJqrAjLlU8ThYua0NravpFbBeOIHDnL1NiU9ugNF89QXqytmXt5rBu nw065NatFw/6ijseQV7HO0JtB3heAaTFJZZ/X4jNvPDvXNr2JIm3wHM5p8hJikLAuv27 IfyvK91T82fWeJCT/myTLmLuJ1erJdDaXeMqZWeB+h4ShQUPGo7cDSh3M8YUkJfd6XMW 9PTMXHT/oaYjCyFBQkCBXAa8C64xdbWJAyqRT7fnTlP0EQwP7EgXyhdoptJFlDCtdbkx 8nxCzSH7uOwfyzkciHoM2W1AVIyulcb4EXXZV1BvTJpVmV5As6E788j1SQmEGVUpimhx YkQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710302068; x=1710906868; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Z632Vl9mGcaUD+E7Cpwdhyjpjxo2r7hLci9lVvPzHlg=; b=UUhi93pYAbjK14doHWUl1nn0S0cuVQ6y9roEIfIrJQr1seEuuZHVSf3TEMAU5nGo7t TcNny7ehKb75nVw/ovUdAH4t2ltQXvr5z80gjObPkdvUvji0cPF/o/H0ZdKaYfh7sdo+ f0qcTsOe/CPwhwHdTeJYne8AHcKt+Xbk7bmXXawefgRFMa5nfi1+BIaPVCaAQygHIYr2 EG69aF2puWhV37jgWIF5SHVetZRWlCQlmNSlIVUYmk46cnZKIz+cU/DRoCy+n7BQ9tka joFe/axlc5m60ICi8mVVwk69QTauzVYBRzpWQRiIu0/P/cW0XsYi4nhH7T5rx6gyLc2b 93TQ== X-Forwarded-Encrypted: i=1; AJvYcCWWjdXrAsCzccuSXpQhrEBw0NaobQY5hsd+caG6KlXW9cXwqGdORq2auMIFAO73Y+/1JEJ1QVdIeL7HJeRSrV9p/da2FTiJtoKqYZPkhA== X-Gm-Message-State: AOJu0YwzhANRGe+00UE+uQ7Sg92pG/aPAUwtstKyqxsM8TqUb/d8vU71 HQ45J0kzA7mLtVWbyNhBd065x35LoKtHcF/JlHVNAltRD9e/5IpDZIV16kliB8M= X-Google-Smtp-Source: AGHT+IGT21uwfmDhENLTqEjyobLcyK/klC8iwxAr7x91U3iV4MBVqo6A+D5u/a3myRTNeji9AGY8rA== X-Received: by 2002:a2e:b0f1:0:b0:2d4:4a0d:d48 with SMTP id h17-20020a2eb0f1000000b002d44a0d0d48mr3239650ljl.47.1710302068739; Tue, 12 Mar 2024 20:54:28 -0700 (PDT) Received: from umbar.lan ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id f25-20020a05651c02d900b002d0acb57c89sm1854319ljo.64.2024.03.12.20.54.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Mar 2024 20:54:27 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 13 Mar 2024 05:54:17 +0200 Subject: [PATCH 7/7] soc: qcom: pmic_glink: reenable UCSI on sc8280xp Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240313-qcom-ucsi-fixes-v1-7-74d90cb48a00@linaro.org> References: <20240313-qcom-ucsi-fixes-v1-0-74d90cb48a00@linaro.org> In-Reply-To: <20240313-qcom-ucsi-fixes-v1-0-74d90cb48a00@linaro.org> To: Heikki Krogerus , Greg Kroah-Hartman , Guenter Roeck , Bjorn Andersson , Neil Armstrong , Konrad Dybcio Cc: Johan Hovold , linux-usb@vger.kernel.org, linux-arm-msm@vger.kernel.org X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=885; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=S06LW4XbXp4mNZRbX50ghuv/ngjWIPDbWauLWS0Z+FU=; b=owGbwMvMwMXYbdNlx6SpcZXxtFoSQ+pH5exzHOlrKmav+l5ZE3/7pk7Bumje/gT92sakcnOr+ z475i/pZDRmYWDkYpAVU2TxKWiZGrMpOezDjqn1MINYmUCmMHBxCsBEIt6x/9PjOXv3CoPxwnZL /882hZlvIuWPab36PneV8eaX2dtFfV+qacU01FUwytl8t16Z9L3D1vwPa9jl+PWhlYe7+u/Y5hv +Ycz3lnr2I5TNUkfrn9dvwwDe1bJJ+xPebTpwp6k7SS+gM/CiuT73lxj9hCm3JzClFD089Lvg+N 0W68NhrZvCJmf7VAp/8quvXCIqvu2hvEpA49O5wVF57Bbhmre+B4haaAXY2PfoHVomurTcYfVUr zV7PkluCHvymIvZoKJg32P+9bNqjD22OSUWGvd4Gese5Z0jpXjitvapDe8dtu3icbT8s5rzzCen DNvZE77wHinmjjmesnAK7x7RfX9vBd3a8G2KkvccGY31AA== X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A Now as all UCSI issues have been fixed, reenable UCSI subdevice on the Qualcomm SC8280XP platform. Signed-off-by: Dmitry Baryshkov Reviewed-by: Heikki Krogerus --- drivers/soc/qcom/pmic_glink.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/soc/qcom/pmic_glink.c b/drivers/soc/qcom/pmic_glink.c index f913e9bd57ed..e5a591733a0f 100644 --- a/drivers/soc/qcom/pmic_glink.c +++ b/drivers/soc/qcom/pmic_glink.c @@ -343,7 +343,6 @@ static const unsigned long pmic_glink_sm8450_client_mask = BIT(PMIC_GLINK_CLIENT static const struct of_device_id pmic_glink_of_match[] = { { .compatible = "qcom,sc8180x-pmic-glink", .data = &pmic_glink_sc8180x_client_mask }, - { .compatible = "qcom,sc8280xp-pmic-glink", .data = &pmic_glink_sc8180x_client_mask }, { .compatible = "qcom,pmic-glink", .data = &pmic_glink_sm8450_client_mask }, {} };