From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 028E0C49ED6 for ; Wed, 11 Sep 2019 12:45:38 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C541D2082C for ; Wed, 11 Sep 2019 12:45:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="p4Ex4ce+"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="YxweOHwI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C541D2082C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date: Message-ID:From:References:To:Subject:Reply-To:Content-ID:Content-Description :Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=hCKo5NDMg548G7qYMJJbvnUU4ExQBejYMmoXBGPXEi0=; b=p4Ex4ce+xBu8TS pDK+t55z74v+Z9SLcN1NjpwCHnT1yGyH3wWxZR/EjhlIrPUNW+fqobEoevP5oFordISp95gMR0C2M MN1IC6ubNmkQ2G3SQ8OQ86WWJ5sRSDmOwXj7AmmguD0gFPNrMtunS8uLyqW+wBg19v2XLt4BJeaVS C4/uvU9d1tgtEkq5lRrFBxcEm/OJUkyaRtCz9noHrcTD0l/i8irabbCRYD/tM/ySVbV6pCn0Lo+wt 9Qes86sgEeGSRPV8iVAtNUPAlHalS9a17xokdveNlNnJikT2gKnTAgAHJCGbwP9T7LqtBX79/M0bb YQApGUUR2MGe19QPeTLA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux)) id 1i8203-0000yp-Jx; Wed, 11 Sep 2019 12:45:31 +0000 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]) by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux)) id 1i8200-0000xy-DH for linux-amlogic@lists.infradead.org; Wed, 11 Sep 2019 12:45:30 +0000 Received: by mail-wm1-x344.google.com with SMTP id t9so3376252wmi.5 for ; Wed, 11 Sep 2019 05:45:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=subject:to:cc:references:from:openpgp:autocrypt:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=sYTCPQr58Ua4ctdJ+VnB47YHWrWIBH3iEJ3RS9pRSbc=; b=YxweOHwIShbCH6hPS6i6HV84ePL/8cEwnniaq115pVZCO5TbxKkSDODe32M1V4EEcp kkvAWuy94ZbnizIyYiG/68Etc5xCsb5L2K0F/wnD8Z0T1/zmZB3W8nlgiBl46+hLGb3l 8cDyaEku+ZkPIVqy4WrasJR182doXyud39F8FnbqWQklXrJtbo9d37Gq53dDsgT38+68 uhcm73eH6zYBPMflwvFivpuyPAl6hX5UqX5TwSE2UKSUBsQYngi1R7Kh4mJc1O1UD23t Hu6ED0MLURUNKVvtT0PlmP5K1sSv+umSwhZOo/WZQYp2pZeIvyRsrI5aJwJ0//huUHte VACA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:openpgp:autocrypt :organization:message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=sYTCPQr58Ua4ctdJ+VnB47YHWrWIBH3iEJ3RS9pRSbc=; b=c4+ee7WnGheheXsi910Il95kSUjF6KiN4moXU5GUrTo7AjixIQ3dJK2JGoTznrccfb zK6Ymuu+M4QEBLPBlWdL1Kn+ttigJW+WJP7fwWza00TJVV+/mts2WFZB001crosTdook XUacXQZxT01kDWiMnCRThAcNDA5KSp6hMm3RGhTs7cg4fIfpXx1SLMALfi78VpbNUemY 6Y4vzgFMjTpP8H0i2Mxa62XUleI0DcL7GP4zRzHFxeevnhmNPsb2zfAf3Si/bdFEV2hd MGZJS7CPzWTmiXkeY1YTpxWk9M5YdwWqxqMMpkVeOKr5APtblvjARrFpgPAZpPNJRR1i nO3A== X-Gm-Message-State: APjAAAWYRnqhxnjHFjAzK8NQQVlXMsLBZbKFtZhUdwH2KGFkILDXz1Iy nN5Lh4NRAjLKogmkbATjgLRkFw== X-Google-Smtp-Source: APXvYqzuBGTWjnqVDdMs2zEFwas3SIFlbtItk3NMd8bprZpJajDKQbiu1luuEHm9SFCTUIv/iE7wrg== X-Received: by 2002:a05:600c:24e:: with SMTP id 14mr3921540wmj.140.1568205924684; Wed, 11 Sep 2019 05:45:24 -0700 (PDT) Received: from [192.168.1.62] (wal59-h01-176-150-251-154.dsl.sta.abo.bbox.fr. [176.150.251.154]) by smtp.gmail.com with ESMTPSA id x5sm29802865wrg.69.2019.09.11.05.45.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Sep 2019 05:45:24 -0700 (PDT) Subject: Re: [PATCH 4/6] phy: meson-g12a-usb3-pcie: Add support for PCIe mode To: Andrew Murray References: <1567950178-4466-1-git-send-email-narmstrong@baylibre.com> <1567950178-4466-5-git-send-email-narmstrong@baylibre.com> <20190911121954.GS9720@e119886-lin.cambridge.arm.com> From: Neil Armstrong Openpgp: preference=signencrypt Autocrypt: addr=narmstrong@baylibre.com; prefer-encrypt=mutual; keydata= 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 ZaTUOEkgIor5losDrePdPgE= Organization: Baylibre Message-ID: Date: Wed, 11 Sep 2019 14:45:23 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <20190911121954.GS9720@e119886-lin.cambridge.arm.com> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190911_054528_606041_89E477AA X-CRM114-Status: GOOD ( 19.97 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lorenzo.pieralisi@arm.com, khilman@baylibre.com, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, kishon@ti.com, repk@triplefau.lt, maz@kernel.org, bhelgaas@google.com, linux-amlogic@lists.infradead.org, yue.wang@Amlogic.com, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org On 11/09/2019 14:19, Andrew Murray wrote: > On Sun, Sep 08, 2019 at 01:42:56PM +0000, Neil Armstrong wrote: >> This adds extended PCIe PHY functions for the Amlogic G12A >> USB3+PCIE Combo PHY to support reset, power_on and power_off for >> PCIe exclusively. >> >> With these callbacks, we can handle all the needed operations of the >> Amlogic PCIe controller driver. >> >> Signed-off-by: Neil Armstrong >> --- >> .../phy/amlogic/phy-meson-g12a-usb3-pcie.c | 70 ++++++++++++++++--- >> 1 file changed, 61 insertions(+), 9 deletions(-) >> >> diff --git a/drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c b/drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c >> index ac322d643c7a..08e322789e59 100644 >> --- a/drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c >> +++ b/drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c >> @@ -50,6 +50,8 @@ >> #define PHY_R5_PHY_CR_ACK BIT(16) >> #define PHY_R5_PHY_BS_OUT BIT(17) >> >> +#define PCIE_RESET_DELAY 500 >> + >> struct phy_g12a_usb3_pcie_priv { >> struct regmap *regmap; >> struct regmap *regmap_cr; >> @@ -196,6 +198,10 @@ static int phy_g12a_usb3_init(struct phy *phy) >> struct phy_g12a_usb3_pcie_priv *priv = phy_get_drvdata(phy); >> int data, ret; >> >> + ret = reset_control_reset(priv->reset); >> + if (ret) >> + return ret; >> + > > Right, so we've moved this to apply to USB only, thus assuming PCI will > call .reset for its reset (why the asymmetry?). Exact, there is no power_on/power_off when USB3 mode is used, and vendor always reset the PHY before switching to USB3, but for PCIe, it seems the reset and the power_on must be done separately with the PCIe controller init and reset in the middle. I would prefer symmetry aswell :-/ Neil > > Thanks, > > Andrew Murray > >> /* Switch PHY to USB3 */ >> /* TODO figure out how to handle when PCIe was set in the bootloader */ >> regmap_update_bits(priv->regmap, PHY_R0, >> @@ -272,24 +278,64 @@ static int phy_g12a_usb3_init(struct phy *phy) >> return 0; >> } >> >> -static int phy_g12a_usb3_pcie_init(struct phy *phy) >> +static int phy_g12a_usb3_pcie_power_on(struct phy *phy) >> +{ >> + struct phy_g12a_usb3_pcie_priv *priv = phy_get_drvdata(phy); >> + >> + if (priv->mode == PHY_TYPE_USB3) >> + return 0; >> + >> + regmap_update_bits(priv->regmap, PHY_R0, >> + PHY_R0_PCIE_POWER_STATE, >> + FIELD_PREP(PHY_R0_PCIE_POWER_STATE, 0x1c)); >> + >> + return 0; >> +} >> + >> +static int phy_g12a_usb3_pcie_power_off(struct phy *phy) >> +{ >> + struct phy_g12a_usb3_pcie_priv *priv = phy_get_drvdata(phy); >> + >> + if (priv->mode == PHY_TYPE_USB3) >> + return 0; >> + >> + regmap_update_bits(priv->regmap, PHY_R0, >> + PHY_R0_PCIE_POWER_STATE, >> + FIELD_PREP(PHY_R0_PCIE_POWER_STATE, 0x1d)); >> + >> + return 0; >> +} >> + >> +static int phy_g12a_usb3_pcie_reset(struct phy *phy) >> { >> struct phy_g12a_usb3_pcie_priv *priv = phy_get_drvdata(phy); >> int ret; >> >> - ret = reset_control_reset(priv->reset); >> + if (priv->mode == PHY_TYPE_USB3) >> + return 0; >> + >> + ret = reset_control_assert(priv->reset); >> if (ret) >> return ret; >> >> + udelay(PCIE_RESET_DELAY); >> + >> + ret = reset_control_deassert(priv->reset); >> + if (ret) >> + return ret; >> + >> + udelay(PCIE_RESET_DELAY); >> + >> + return 0; >> +} >> + >> +static int phy_g12a_usb3_pcie_init(struct phy *phy) >> +{ >> + struct phy_g12a_usb3_pcie_priv *priv = phy_get_drvdata(phy); >> + >> if (priv->mode == PHY_TYPE_USB3) >> return phy_g12a_usb3_init(phy); >> >> - /* Power UP PCIE */ >> - /* TODO figure out when the bootloader has set USB3 mode before */ >> - regmap_update_bits(priv->regmap, PHY_R0, >> - PHY_R0_PCIE_POWER_STATE, >> - FIELD_PREP(PHY_R0_PCIE_POWER_STATE, 0x1c)); >> - >> return 0; >> } >> >> @@ -297,7 +343,10 @@ static int phy_g12a_usb3_pcie_exit(struct phy *phy) >> { >> struct phy_g12a_usb3_pcie_priv *priv = phy_get_drvdata(phy); >> >> - return reset_control_reset(priv->reset); >> + if (priv->mode == PHY_TYPE_USB3) >> + return reset_control_reset(priv->reset); >> + >> + return 0; >> } >> >> static struct phy *phy_g12a_usb3_pcie_xlate(struct device *dev, >> @@ -326,6 +375,9 @@ static struct phy *phy_g12a_usb3_pcie_xlate(struct device *dev, >> static const struct phy_ops phy_g12a_usb3_pcie_ops = { >> .init = phy_g12a_usb3_pcie_init, >> .exit = phy_g12a_usb3_pcie_exit, >> + .power_on = phy_g12a_usb3_pcie_power_on, >> + .power_off = phy_g12a_usb3_pcie_power_off, >> + .reset = phy_g12a_usb3_pcie_reset, >> .owner = THIS_MODULE, >> }; >> >> -- >> 2.17.1 >> _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic