From patchwork Mon Jun 26 16:52:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 113053 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp7632515vqr; Mon, 26 Jun 2023 10:15:30 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7zzNs07aqMaxWC3gQ8Xx393BN4UiJDo3+vImNfy0OyeawoRMes0UluWx8k/yCttA3R4ptF X-Received: by 2002:a17:907:8a24:b0:991:f586:7c6a with SMTP id sc36-20020a1709078a2400b00991f5867c6amr1163762ejc.13.1687799730003; Mon, 26 Jun 2023 10:15:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687799729; cv=none; d=google.com; s=arc-20160816; b=TyZowoXJVDUoYSMXLM5TF6ffNNL0FQGIRQ8uQHPO3NPXqVrbCppAH88xNf3plHZUZd KutzxOum6iZjs+ADI0RkeSeTf4pdB0CON3bGPNkScd6oLw0QTPmjhraeJ9lA5FsvmVJX 3MZ57s5xSraXmJa0hPh1TCjuXGRSWb6mXBy9vbE+XJZk+TGJS7Ec4pjD3Jv3xuV46HqT +CqdU6iM4rqaGM5ZpnEoYd8SNr8qd8uCExKpCWlQAsFJeKMhxcO0jpsaeLnrUe6oZEAo 8ANAjkUe7/ZLpffAYUA65tH0TNRs992OBQnm56+aeK6Q4wFFy0tZJHE7YCgKr3+Lu1+v ryIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:message-id:content-transfer-encoding :mime-version:subject:date:from:dkim-signature; bh=RX0ATF4iG7zLA/0c1ahQHVsWmNJPp+QupJeJmJf7dDE=; fh=X+MexZkCJPFr6X0QntKR1SD23FKuT/6EF4wDNeTJc8I=; b=nJw12JX7IrOt5qcz0Bg7kUA83KiW7Ub9hvd9cPr8qyf1P7LRwFDqBTqsIL0HNg/Fgq TE7BKUSOL56JMY+9z2EZlHbgV9uEo54iskPAr5VOTIX2Nr3F8DAR6S5J0NYZog0aY4NR C235sLpsZbd5Bj8DmGhl2a13Vc7qsDSZt4Y6SMOtM8kRWBILF8nLlPTmbyMVsyKqpjij lS04dKGCNxh3miEwO9VkIabLsidnAAQaksdoTFAH/FKAMKmnbIlps2snmtG/w0wEPpgc jh6OecZL/tQGJxIEcsGA271YK5K+q7pTP3nKrz4i0os4T1b+bulw3sWY4sSRtNlnnHqL 1z6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LRivViNY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gx4-20020a170906f1c400b0098f564f6369si1678921ejb.1006.2023.06.26.10.15.05; Mon, 26 Jun 2023 10:15:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LRivViNY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230054AbjFZQwS (ORCPT + 99 others); Mon, 26 Jun 2023 12:52:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42800 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229756AbjFZQwQ (ORCPT ); Mon, 26 Jun 2023 12:52:16 -0400 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EFAAF10FD for ; Mon, 26 Jun 2023 09:52:04 -0700 (PDT) Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-3fb4146e8fcso4158795e9.0 for ; Mon, 26 Jun 2023 09:52:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687798323; x=1690390323; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=RX0ATF4iG7zLA/0c1ahQHVsWmNJPp+QupJeJmJf7dDE=; b=LRivViNYhyXQKvIXtY1RcKyaR98NQE7CCWmyFRcYeNmvYYMD4GYxeeseYaEjTG9CLg uj1XD0+TsYWivhQJT/V72O1E4P7UrFL0nfLlGvlUPjZ0JKMnsJBOsNnfUW0FNIOiUK3k h9qfpSDbaU5GULx1Bcb84gXYAryaMMK1LyZQG4KwTeFtgHPme3aNlvPUUV9EKzDZZz6I 9pLtOTAAbgfDL3DavCaY4OYKBhE9TIkz+pU2ssydLvI343Rd0p+kS/ENNAYNhzvdWJXl smyJ1z7SeC9aokbLFvkl5CEkXedPIkorGZyDQOaicEMvtWQ6Ya8VSnkZ4HOWRI2TUE+L aUVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687798323; x=1690390323; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=RX0ATF4iG7zLA/0c1ahQHVsWmNJPp+QupJeJmJf7dDE=; b=f1nvTfq/+s9J00vyn74vL9BFIyBrje5rnehdVcmnsxDn7MoFH6MIaG08jAeynn5DtG 1z/oSAfVmkphPiTs3cJMyrIL7Zv0BCsb4n1VlJ80sNAT9WMJ5eGzwMTP5B99E/yej4YD bZOs27y8miqazxbZObHlQT9dW4vGt9XFToELxiZvi8YJAJYoaYLb3bhnIrUJElRiQacX jfeXFKnHzMyjHWHl00PISTKXaMoKFI26ibIlNBCBKwthsI1hv7nOY3h+UHnKIF29zTZ0 XXp5LluvYzb8dl4/95VSQEGYwYJ9UdOVrHUZYsYfr3hh8eEuL4w2l7m+E+GKOejx/u4h I35Q== X-Gm-Message-State: AC+VfDyUedPbSp5nqoNCjyRmQYF8qIFrtNH8Mx0meZqV05HHbS3ImSpn HLunJnKga6qyxnxaBGUStLhvZQ== X-Received: by 2002:a1c:4c0f:0:b0:3fa:8c8b:716 with SMTP id z15-20020a1c4c0f000000b003fa8c8b0716mr4135902wmf.1.1687798323252; Mon, 26 Jun 2023 09:52:03 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:8261:5fff:fe11:bdda]) by smtp.gmail.com with ESMTPSA id n23-20020a7bcbd7000000b003f9b19caabesm8205108wmi.37.2023.06.26.09.52.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 09:52:02 -0700 (PDT) From: Neil Armstrong Date: Mon, 26 Jun 2023 18:52:00 +0200 Subject: [PATCH] usb: typec: ucsi: move typec_set_mode(TYPEC_STATE_SAFE) to ucsi_unregister_partner() MIME-Version: 1.0 Message-Id: <20230626-topic-sm8550-usb-c-audio-fixup-v1-1-bc72fddf3f42@linaro.org> X-B4-Tracking: v=1; b=H4sIAC/CmWQC/x2N0QrCMAxFf2Xk2UDt6FB/RXxos8wFZlsaK8LYv xt8PIfLuTsoN2GF27BD44+olGxwPg1Aa8xPRpmNwTs/uslP+C5VCPV1CcFh14SEsc9ScJFvr3h lHilSYOcWsEiKyphazLRaJvdtM1kb2/r/en8cxw/7287hhQAAAA== To: Heikki Krogerus , Greg Kroah-Hartman Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Neil Armstrong X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1493; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=mr86JHI41H3kynpprp69RFpyVVHDbDm53qvzMVnH8b8=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBkmcIxFmDjqabxx+bKet4LRxvH27IFF3TP7o3XEshe 9+o9CSmJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZJnCMQAKCRB33NvayMhJ0WiXD/ 9XzM2XmCirIqZXyAaRhb2OaAhJDfuIZo0Y6Q7vHlbTyXDHOaDfY4KHXjh0Zfc6Q28q4H8LaEhR6rkr NBQ2Vs2KYOx7f8OB5xCVLZ/gos0gBrETZU2U6Jy+gIUExf66QoMiHXC/uPdeeZrgrkJygbS9UaHGwo Te7F7QYMFCH3eKiCUE6kO2tpi1VdXl44dTjfSd7FzkW4yGZ3F3CVJMTY8Cp0kuPpU0+XQ14+RHLO4q KDEBV0q5eI6g+43xpGUoaVa4nrpp0Gmb64Xra/gHF8NNUJX8ONm4wwAxyDfJ1fljhLoGdLrD5UQtUm jDhsQHo+JscADIKRGDTnQu/qi2WSF4yq2KS2F9UlUN77I0QwLbvP1OWdCJ0VsHU0RrdfprHmIjzE91 K3NiEwqtTCvBs9Ze+bwN8DEAfXvYpVwYbjM5Pkdaub3+9irJthJzgaJM/+QVh3bQ+9wVmjGb8vd/bV WIaziuIsXNuVzYh2gNbSSvGYrHA1Dt47cAaLEYV1B5uTuhHQPCfzRapT47MOoM56OzfXKG2lYcjYmv etMLG2uvbSehYfnkXEvLY1LsPDI90CmVLKr5/xNLVbg8feTxnVETJRKbckn39N+G0pg1p4hDvmaLdI wKkatn9Bd2s0+thGC4N85zl48tSEs+VN+9kjWIPwxiVRDXfTK00hTBlD5Teg== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769786289449659496?= X-GMAIL-MSGID: =?utf-8?q?1769786289449659496?= It's better to set TYPEC_STATE_SAFE mode from ucsi_unregister_partner() instead of ucsi_partner_change(), ucsi_unregister_partner() is always when the partner disconnects. Fixes: 25a2bc21c863 ("usb: typec: ucsi: call typec_set_mode on non-altmode partner change") Suggested-by: Heikki Krogerus Signed-off-by: Neil Armstrong Reviewed-by: Heikki Krogerus --- drivers/usb/typec/ucsi/ucsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- base-commit: 60e7c4a25da68cd826719b685babbd23e73b85b0 change-id: 20230626-topic-sm8550-usb-c-audio-fixup-9ee3cac5e00f Best regards, diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c index 9b6d6b14431f..f6901319639d 100644 --- a/drivers/usb/typec/ucsi/ucsi.c +++ b/drivers/usb/typec/ucsi/ucsi.c @@ -785,6 +785,8 @@ static void ucsi_unregister_partner(struct ucsi_connector *con) if (!con->partner) return; + typec_set_mode(con->port, TYPEC_STATE_SAFE); + ucsi_unregister_partner_pdos(con); ucsi_unregister_altmodes(con, UCSI_RECIPIENT_SOP); typec_unregister_partner(con->partner); @@ -825,8 +827,6 @@ static void ucsi_partner_change(struct ucsi_connector *con) UCSI_CONSTAT_PARTNER_FLAG_USB) typec_set_mode(con->port, TYPEC_STATE_USB); } - } else { - typec_set_mode(con->port, TYPEC_STATE_SAFE); } /* Only notify USB controller if partner supports USB data */