From patchwork Thu Jun 15 20:06:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Chen X-Patchwork-Id: 108696 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp890873vqr; Thu, 15 Jun 2023 13:13:55 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5FeIVKVWHQy93jvmudSkJ3QltVw0Igdxd8XMO1lu+rnmo6r3KPwlsf6UcXxg1gWTouhY4U X-Received: by 2002:a17:907:36c6:b0:974:1d8b:ca5e with SMTP id bj6-20020a17090736c600b009741d8bca5emr127121ejc.14.1686860035457; Thu, 15 Jun 2023 13:13:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686860035; cv=none; d=google.com; s=arc-20160816; b=xB0xdSiOelNxs6fbloFrT7URUdtsgyX1DdTEZDXCdOyrnJteHyj/NBYyEC1ZaN2XJ+ g8KPKzpSXSADnkHU4Eu5CT59p5WKrz4ERd8klXMhu5kvwl+QeMYjfPhIUn40OUUiC0uc W29s/73zBA+Jbf/dkt/zJ8aLWeQu876LO7Dy4DhwKRugL8ms626b1NAWq/zKWcfMMEDb pLVVS0G5UzK5lVpPWEqkJGexs85sMttVZiNispeZjDMRVJsf2c5gbBVsAEps5b2qPCn/ I8Jo33cdUvFxFcw58gsgHa2FpEIwPjEzEeCx8UHC+LefGj+hyMoGKbWPvNJzs/0Orhj3 sMbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=YBp/Rtkye9A2SX5W55+KGtFjX2gPNbk20w1lf0dP+p4=; b=zG112eyBfbCyPfjNnTQmVAq+BgGmocK3SCLxEcZtrFxnV53HmWYkUGtIjq9NdBIlHw gMzYgssJKBUXtqpdQQaVpHvOx1RKHVw4UkSLLpbv+gB7Tq5o1jh0xmMm6tLrNWEafwho yAG71+GhL+GkDIRwidrbGV+0AU66XqN7Bta8WyX11V51gFMu9QbNkrkb9PKnraRWrV0o 1lW2lmkRSLAupKUMGD57wNJ0uhB4PiuxzGRt02CsgSjGv5uW1dOZmxL2DDes5hGvTqg+ KaHIL0apata9z0FFPYEMQS77M2tsCx3jSRTw9eTjDM3lDWaMlcMLiZEQMBHb9tfllcz/ NPWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@broadcom.com header.s=google header.b=B8t8Z36j; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=broadcom.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z14-20020a1709067e4e00b009787b15a877si9408340ejr.515.2023.06.15.13.13.30; Thu, 15 Jun 2023 13:13:55 -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=@broadcom.com header.s=google header.b=B8t8Z36j; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=broadcom.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229957AbjFOUG2 (ORCPT + 99 others); Thu, 15 Jun 2023 16:06:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229510AbjFOUG0 (ORCPT ); Thu, 15 Jun 2023 16:06:26 -0400 Received: from mail-qk1-x732.google.com (mail-qk1-x732.google.com [IPv6:2607:f8b0:4864:20::732]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6FD33295D for ; Thu, 15 Jun 2023 13:06:25 -0700 (PDT) Received: by mail-qk1-x732.google.com with SMTP id af79cd13be357-75d4f12d4a3so1484185a.0 for ; Thu, 15 Jun 2023 13:06:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1686859584; x=1689451584; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=YBp/Rtkye9A2SX5W55+KGtFjX2gPNbk20w1lf0dP+p4=; b=B8t8Z36jQgm5n3pso0+0nMsgQ1tUcK7aHSbUbYa6CRrOJSvzl27ijBFH4ljAmaN4o4 F+dWdmQDrQOOhwyC3rhGg9VhrZCVTaHXIjV+ciUpnb2PDuSsrV1O8bDI+xxTR/WRVLz6 C15SryyistAXsQy4eLKW9bEDKg+edt5Mfz7/c= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686859584; x=1689451584; h=references:in-reply-to:message-id:date:subject:cc:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=YBp/Rtkye9A2SX5W55+KGtFjX2gPNbk20w1lf0dP+p4=; b=PIsesXOA8ABAKdyoosdN8IAUW7t3Q/1vOLdzV1dV8iwUU+lVUiyifYb5GG40c+Wkqp KfTKNdMAz4NJMRxbeIsi5kGyg8/TCmrPAI4E8CqooONvGejws2i9oMYkYz7RDKaL4kJX lafhLmxfo3mPJnikOwXbfcX0e7vH9CwFiU0EkWJK1uR3nUkZOztmUyss6O71WtnV/b9+ 0+J9G8ZvU1kKNeEPbXGXn2vZDJ/K6bFvd1/rLqPYv3cpyPWYVgv0PIC479fJ/6mwQZWp I61iRf4hZGsp/tDFV8aRYeXm/bSoHWr4foWkHu+vC3rC6i7APpE5Uqagl8LqjM3issWO CMDA== X-Gm-Message-State: AC+VfDxJrKn0Vpfprtp/1IN1xZBtZRertss/pywl6HMQ+2R7gfDExw2o zzySY6pynOuAg3fYa4jVmfdGZg== X-Received: by 2002:a37:688f:0:b0:75d:44af:19f2 with SMTP id d137-20020a37688f000000b0075d44af19f2mr19579005qkc.11.1686859584470; Thu, 15 Jun 2023 13:06:24 -0700 (PDT) Received: from stbirv-lnx-2.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id k4-20020a05620a142400b0075ceca53e84sm5721407qkj.15.2023.06.15.13.06.23 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Jun 2023 13:06:24 -0700 (PDT) From: Justin Chen To: linux-phy@lists.infradead.org Cc: bcm-kernel-feedback-list@broadcom.com, florian.fainelli@broadcom.com, Justin Chen , Justin Chen , Al Cooper , Vinod Koul , Kishon Vijay Abraham I , linux-kernel@vger.kernel.org (open list:BROADCOM BRCMSTB USB2 and USB3 PHY DRIVER) Subject: [PATCH 1/2] phy: usb: Turn off phy when port is in suspend Date: Thu, 15 Jun 2023 13:06:16 -0700 Message-Id: <1686859578-45242-2-git-send-email-justin.chen@broadcom.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1686859578-45242-1-git-send-email-justin.chen@broadcom.com> References: <1686859578-45242-1-git-send-email-justin.chen@broadcom.com> X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, MIME_HEADER_CTYPE_ONLY,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE,T_TVD_MIME_NO_HEADERS 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?1768800948482660954?= X-GMAIL-MSGID: =?utf-8?q?1768800948482660954?= The COMMONONN bit turns off the PHY when the host controller puts it into suspend state. This can happen during the following... - Nothing is connected to the port - The host controller goes into low power mode whatever due to auto suspend or system suspend. With COMMONONN we also must unset U2_FREECLK_EXISTS since the UTMI clock is fed by the PHY. With these changes we see a power savings of ~12mW when port is in suspend. Reviewed-by: Florian Fainelli Signed-off-by: Justin Chen --- drivers/phy/broadcom/phy-brcm-usb-init-synopsys.c | 15 +++++++++++++-- drivers/phy/broadcom/phy-brcm-usb-init.h | 8 ++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/drivers/phy/broadcom/phy-brcm-usb-init-synopsys.c b/drivers/phy/broadcom/phy-brcm-usb-init-synopsys.c index 76cf4280d7ed..4c10cafded4e 100644 --- a/drivers/phy/broadcom/phy-brcm-usb-init-synopsys.c +++ b/drivers/phy/broadcom/phy-brcm-usb-init-synopsys.c @@ -59,6 +59,8 @@ #define USB_CTLR_TP_DIAG1_wake_MASK BIT(1) #define USB_CTRL_CTLR_CSHCR 0x50 #define USB_CTRL_CTLR_CSHCR_ctl_pme_en_MASK BIT(18) +#define USB_CTRL_P0_U2PHY_CFG1 0x68 +#define USB_CTRL_P0_U2PHY_CFG1_COMMONONN_MASK BIT(10) /* Register definitions for the USB_PHY block in 7211b0 */ #define USB_PHY_PLL_CTL 0x00 @@ -90,6 +92,8 @@ #define BDC_EC_AXIRDA_RTS_MASK GENMASK(31, 28) #define BDC_EC_AXIRDA_RTS_SHIFT 28 +#define USB_XHCI_GBL_GUSB2PHYCFG 0x100 +#define USB_XHCI_GBL_GUSB2PHYCFG_U2_FREECLK_EXISTS_MASK BIT(30) static void usb_mdio_write_7211b0(struct brcm_usb_init_params *params, uint8_t addr, uint16_t data) @@ -140,13 +144,17 @@ static void xhci_soft_reset(struct brcm_usb_init_params *params, int on_off) { void __iomem *ctrl = params->regs[BRCM_REGS_CTRL]; + void __iomem *xhci_gbl = params->regs[BRCM_REGS_XHCI_GBL]; /* Assert reset */ - if (on_off) + if (on_off) { USB_CTRL_UNSET(ctrl, USB_PM, XHC_SOFT_RESETB); /* De-assert reset */ - else + } else { USB_CTRL_SET(ctrl, USB_PM, XHC_SOFT_RESETB); + /* Required for COMMONONN to be set */ + USB_XHCI_GBL_UNSET(xhci_gbl, GUSB2PHYCFG, U2_FREECLK_EXISTS); + } } static void usb_init_ipp(struct brcm_usb_init_params *params) @@ -320,6 +328,9 @@ static void usb_init_common_7216(struct brcm_usb_init_params *params) /* 1 millisecond - for USB clocks to settle down */ usleep_range(1000, 2000); + /* Disable PHY when port is suspended */ + USB_CTRL_SET(ctrl, P0_U2PHY_CFG1, COMMONONN); + usb_wake_enable_7216(params, false); usb_init_common(params); } diff --git a/drivers/phy/broadcom/phy-brcm-usb-init.h b/drivers/phy/broadcom/phy-brcm-usb-init.h index f9fbf8fb80e5..c1a88f5cd4cd 100644 --- a/drivers/phy/broadcom/phy-brcm-usb-init.h +++ b/drivers/phy/broadcom/phy-brcm-usb-init.h @@ -34,6 +34,14 @@ enum brcmusb_reg_sel { brcm_usb_ctrl_unset(USB_CTRL_REG(base, reg), \ USB_CTRL_##reg##_##field##_MASK) +#define USB_XHCI_GBL_REG(base, reg) ((void __iomem *)base + USB_XHCI_GBL_##reg) +#define USB_XHCI_GBL_SET(base, reg, field) \ + brcm_usb_ctrl_set(USB_XHCI_GBL_REG(base, reg), \ + USB_XHCI_GBL_##reg##_##field##_MASK) +#define USB_XHCI_GBL_UNSET(base, reg, field) \ + brcm_usb_ctrl_unset(USB_XHCI_GBL_REG(base, reg), \ + USB_XHCI_GBL_##reg##_##field##_MASK) + struct brcm_usb_init_params; struct brcm_usb_init_ops {