From patchwork Fri Feb 3 22:28:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 52696 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1090164wrn; Fri, 3 Feb 2023 14:35:24 -0800 (PST) X-Google-Smtp-Source: AK7set8Y53Z4MnBAPcO+T95ClU59lZnLcbjD0LFNpuqb4ISpnDvvqAecsqZ4koNE7gy2jHZbm51U X-Received: by 2002:a05:6a21:100f:b0:bf:f8a:330b with SMTP id nk15-20020a056a21100f00b000bf0f8a330bmr4681635pzb.10.1675463723728; Fri, 03 Feb 2023 14:35:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675463723; cv=none; d=google.com; s=arc-20160816; b=YslKMzdc2rar8pmwtaROOX18lDrEXjnviY87Cl4UgC4jPR+h6KP1ykqNGTOTEbhquD dJRrJWFDOjf9ePR5RfajCnj5DFcOiu3PMXcwHWg7NNwUWGip4HQNBSiayXze9/yuiTm+ MSmdiRZocQ8vT1ZAa2qg+010Mofjot0gDR77ESsxLUozxx9RCpM+/NihdGkekUiX/Exv U25PNhN/fRUXUHdupvnQjI8fX+Z2tZxM0QwxB7AT3nCPCXCPpYwZwZZk7BqVxk63p3Bs uD449/wNcc3UMARCTTV0xdO+YNib82JKhm5BgtexQDHlm4s35c/zzKn4CNGrm45vQujO VQNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=gMyHt710tobXZzqB4RVOXm/lfSphZfIQDyw8A1rvqM8=; b=MqN+1yL2ft/1Wd/vX7mjkedyC50qopoQPmlTK/uLMbHRYN5dm5DYWA/LIPlt1ElrP7 vCGqo2iecWlPwz1KbfrNc0KP3rOccY3OurNiUSsVY3dSvkoqQyZ7iWwdh65Mge5F4o60 7EeO0wPCawwInerg68gvEnP6uIMIfbMkqKJiUMR1vrilAv9x3rMbdp6xtHGIwsNIkQro 0WYu7lk+FdzdVcfPr+7OzdOCrIA+3Hz6OeIrqgWXuGv7Hek2n6TdYLV/Mvpr19uyQiNm rFDDHFADM+lGBIWxvluLRC99J+jrndHMp1i0MN6pEfk0jHo+w6hIQHlziDZdmQ2hjRkW SFIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=KJQTCWhA; 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=chromium.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i63-20020a636d42000000b004e850715f9asi4173674pgc.475.2023.02.03.14.35.11; Fri, 03 Feb 2023 14:35:23 -0800 (PST) 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=@chromium.org header.s=google header.b=KJQTCWhA; 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=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232774AbjBCW3C (ORCPT + 99 others); Fri, 3 Feb 2023 17:29:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50520 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231286AbjBCW3A (ORCPT ); Fri, 3 Feb 2023 17:29:00 -0500 Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A5CF31EBF8 for ; Fri, 3 Feb 2023 14:28:27 -0800 (PST) Received: by mail-pl1-x62c.google.com with SMTP id g13so1925900ple.10 for ; Fri, 03 Feb 2023 14:28:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=gMyHt710tobXZzqB4RVOXm/lfSphZfIQDyw8A1rvqM8=; b=KJQTCWhAd7IPsSxTwSEdEe5ccYd6PTpm9gQe4BkQOs0WlNmdWxAQxrM8F0aHiu25In 0386XN/L0AG/jmBhyONVoBbYBvi5VNUa6YG27G3cZnsLDOCeubj2Fjew82Ab9wI5dFm9 1JfI/nmp3tNTYA0zPEKeDUbvR5uVXlIKAwp+w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=gMyHt710tobXZzqB4RVOXm/lfSphZfIQDyw8A1rvqM8=; b=1LhunAFV5fVeNWznLyQlUVifml4PhYy/ZAlPF6hY0TkOr2by3FugV/AC9jQLYWEc3M q7dWjAgYLfDIoWe5R9rRQQ6Js7D2R9roYpmJ/JVqYUTjUOSUhSY/+zhEDzUyN5ndfEvF SIOculFrXF9DRngo9jUVyGrOTdxZa4tqe37NxaLkXTpdCtxX+v+eGrpv6OBTF+pFS18d pkj6AsCHUdleL5imm48EX94145wF1axqpg7ff3/8fWGwo/5aq68k8R1S7lve7mBB5vM1 VEELNfk9g9zs608ccs8EDIDy1rg3Mop4ettVpOPXATtYMvicea7rkcVdtSFzSD++ZqmY jehQ== X-Gm-Message-State: AO0yUKW4DL2PVS29PhczUoI6TWFkuT3xsVwsH+8cFAzvQITgzflADuGf qEoRK8q+KyqJRq26uRuV08UuvFnCO6OUKAB5 X-Received: by 2002:a17:903:30d2:b0:195:efa7:d54e with SMTP id s18-20020a17090330d200b00195efa7d54emr4510904plc.12.1675463303088; Fri, 03 Feb 2023 14:28:23 -0800 (PST) Received: from smtp.gmail.com ([2620:15c:11a:201:44f:ac27:361d:7805]) by smtp.gmail.com with ESMTPSA id u65-20020a627944000000b0058da56167b7sm2333853pfc.127.2023.02.03.14.28.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Feb 2023 14:28:22 -0800 (PST) From: Stephen Boyd To: stable@vger.kernel.org Cc: Johan Hovold , linux-kernel@vger.kernel.org, patches@lists.linux.dev, Dmitry Baryshkov , Vinod Koul Subject: [PATCH 6.1.y] phy: qcom-qmp-combo: fix runtime suspend Date: Fri, 3 Feb 2023 14:28:20 -0800 Message-Id: <20230203222820.2958983-1-swboyd@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS 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?1756851036335193613?= X-GMAIL-MSGID: =?utf-8?q?1756851049362160084?= From: Johan Hovold commit c7b98de745cffdceefc077ad5cf9cda032ef8959 upstream. Drop the confused runtime-suspend type check which effectively broke runtime PM if the DP child node happens to be parsed before the USB child node during probe (e.g. due to order of child nodes in the devicetree). Instead use the new driver data USB PHY pointer to access the USB configuration and resources. Fixes: 52e013d0bffa ("phy: qcom-qmp: Add support for DP in USB3+DP combo phy") Reviewed-by: Dmitry Baryshkov Signed-off-by: Johan Hovold Link: https://lore.kernel.org/r/20221114081346.5116-6-johan+linaro@kernel.org Signed-off-by: Vinod Koul Signed-off-by: Stephen Boyd --- drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) base-commit: 68a95455c153f8adc513e5b688f4b348daa7c1b1 diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c index adcda7762acf..816829105135 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c @@ -2296,15 +2296,11 @@ static void qmp_combo_disable_autonomous_mode(struct qmp_phy *qphy) static int __maybe_unused qmp_combo_runtime_suspend(struct device *dev) { struct qcom_qmp *qmp = dev_get_drvdata(dev); - struct qmp_phy *qphy = qmp->phys[0]; + struct qmp_phy *qphy = qmp->usb_phy; const struct qmp_phy_cfg *cfg = qphy->cfg; dev_vdbg(dev, "Suspending QMP phy, mode:%d\n", qphy->mode); - /* Supported only for USB3 PHY and luckily USB3 is the first phy */ - if (cfg->type != PHY_TYPE_USB3) - return 0; - if (!qmp->init_count) { dev_vdbg(dev, "PHY not initialized, bailing out\n"); return 0; @@ -2321,16 +2317,12 @@ static int __maybe_unused qmp_combo_runtime_suspend(struct device *dev) static int __maybe_unused qmp_combo_runtime_resume(struct device *dev) { struct qcom_qmp *qmp = dev_get_drvdata(dev); - struct qmp_phy *qphy = qmp->phys[0]; + struct qmp_phy *qphy = qmp->usb_phy; const struct qmp_phy_cfg *cfg = qphy->cfg; int ret = 0; dev_vdbg(dev, "Resuming QMP phy, mode:%d\n", qphy->mode); - /* Supported only for USB3 PHY and luckily USB3 is the first phy */ - if (cfg->type != PHY_TYPE_USB3) - return 0; - if (!qmp->init_count) { dev_vdbg(dev, "PHY not initialized, bailing out\n"); return 0;