From patchwork Mon Jan 6 19:19:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1218428 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ide-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="PmWmLgJY"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47s51H5dvcz9sR8 for ; Tue, 7 Jan 2020 06:19:47 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726774AbgAFTTM (ORCPT ); Mon, 6 Jan 2020 14:19:12 -0500 Received: from mail-pj1-f66.google.com ([209.85.216.66]:34827 "EHLO mail-pj1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726751AbgAFTTL (ORCPT ); Mon, 6 Jan 2020 14:19:11 -0500 Received: by mail-pj1-f66.google.com with SMTP id s7so8164619pjc.0; Mon, 06 Jan 2020 11:19:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0pqFH2VG0zjlTk6J0L9VrG9oIlBzQyAPjQqRvKgB/OU=; b=PmWmLgJYXeTiAFx5HcOGxSDU548cT4knHNoDDBX77RQwTQMim1A2rZNP0npr3CqUnc YozX6q7tmqbjC+mRtIri/oE9+8oCL0KnjqhHHDgqzbjtMEopXiSuyCJEoTaiMTly/6+2 tBWHPao1/pAWbi5rEyPO3ARmyDI3aHvHz6zRLcCO1LK7cIGj2KS8ROD9bLV3+7fdqISp o+h2PGDQ95cZCRH1qEzw+xTI8vbAgztuliC8q7RjtfUQFUS10ztibKSvW5zMaHboJXbU pZWxu9OP4C6wQqcv20fO7pv7jRooz/zDl9IcfjaJj49dgz4PejEi69afU4wWOrvRjrKn Eguw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0pqFH2VG0zjlTk6J0L9VrG9oIlBzQyAPjQqRvKgB/OU=; b=c8pxXb9h+Q4WyCe1ZH7d95eGSto5tpCyQha23RjnKSqpJuIvBUc4P44tln/A7YL/il 3atzx0ahG9wYvaL2DDjsFo+lkmv+7uT9WDMgVXjLjyGRlDr+3q4eNy6ZtQ3Td/APIqgm bGA9aev29JxnNV4oH8Lg7Ago/9p0dM70diQ8lHMj9VXFsSEoKpkCbMxjwnb7jnXZpevO JNKrBnz/R/Uf2zwIm77jjHbU/kvZCGoYSaATVlz0e9y9P0t6DtT6Q8U+5jlY5YYNSMso OJjtEk7UUSgqwC+yNapPg24BzRAOMw0IeLGWvEdtfMxa0f/5jC596LvtPllegkTHv0jv GTTA== X-Gm-Message-State: APjAAAVRMq+0p5ysOMZivOjqga12wuDy5KXTwJPQjyvuiqOPzEmEKSaw bLjZJrDpN+BYQQhUP8pwvfCQ5iNh X-Google-Smtp-Source: APXvYqxeHkJ7AJqqUTbyySWm/D6t4iAfm5ngfRjsoqUAk+Khgh78swP9P1Ngoqhsayfd1LWpGw+OqQ== X-Received: by 2002:a17:902:5a83:: with SMTP id r3mr109637942pli.145.1578338350527; Mon, 06 Jan 2020 11:19:10 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id g10sm72795594pgh.35.2020.01.06.11.19.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jan 2020 11:19:10 -0800 (PST) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: bcm-kernel-feedback-list@broadcom.com, Florian Fainelli , Jens Axboe , Rob Herring , Mark Rutland , Hans de Goede , Philipp Zabel , Tejun Heo , Jaedon Shin , linux-ide@vger.kernel.org (open list:LIBATA SUBSYSTEM (Serial and Parallel ATA drivers)), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS) Subject: [PATCH v2 1/2] ata: ahci_brcm: Perform reset after obtaining resources Date: Mon, 6 Jan 2020 11:19:05 -0800 Message-Id: <20200106191906.18266-2-f.fainelli@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200106191906.18266-1-f.fainelli@gmail.com> References: <20200106191906.18266-1-f.fainelli@gmail.com> Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org Resources such as clocks, PHYs, regulators are likely to get a probe deferral return code, which could lead to the AHCI controller being reset a few times until it gets successfully probed. Since this is typically the most time consuming operation, move it after the resources have been acquired. Signed-off-by: Florian Fainelli --- drivers/ata/ahci_brcm.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/ata/ahci_brcm.c b/drivers/ata/ahci_brcm.c index 13ceca687104..70e3e386d52e 100644 --- a/drivers/ata/ahci_brcm.c +++ b/drivers/ata/ahci_brcm.c @@ -453,15 +453,9 @@ static int brcm_ahci_probe(struct platform_device *pdev) else reset_name = "ahci"; - priv->rcdev = devm_reset_control_get(&pdev->dev, reset_name); - if (!IS_ERR_OR_NULL(priv->rcdev)) - reset_control_deassert(priv->rcdev); - hpriv = ahci_platform_get_resources(pdev, 0); - if (IS_ERR(hpriv)) { - ret = PTR_ERR(hpriv); - goto out_reset; - } + if (IS_ERR(hpriv)) + return PTR_ERR(hpriv); hpriv->plat_data = priv; hpriv->flags = AHCI_HFLAG_WAKE_BEFORE_STOP | AHCI_HFLAG_NO_WRITE_TO_RO; @@ -478,6 +472,10 @@ static int brcm_ahci_probe(struct platform_device *pdev) break; } + priv->rcdev = devm_reset_control_get(&pdev->dev, reset_name); + if (!IS_ERR_OR_NULL(priv->rcdev)) + reset_control_deassert(priv->rcdev); + ret = ahci_platform_enable_clks(hpriv); if (ret) goto out_reset; From patchwork Mon Jan 6 19:19:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1218427 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ide-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="BDofDShd"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47s51H1L0cz9sRV for ; Tue, 7 Jan 2020 06:19:47 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726793AbgAFTTN (ORCPT ); Mon, 6 Jan 2020 14:19:13 -0500 Received: from mail-pg1-f196.google.com ([209.85.215.196]:43428 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726773AbgAFTTM (ORCPT ); Mon, 6 Jan 2020 14:19:12 -0500 Received: by mail-pg1-f196.google.com with SMTP id k197so27290527pga.10; Mon, 06 Jan 2020 11:19:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Cc+8NW3oaqL7v7CJZlR+R8urn6RS/4vks+nXeck2ako=; b=BDofDShdgPFjSEz7ovXl1Q/E6JikGI9vQ+kXpBed7w52ce/5mCF/SjDbuRsKI7uAja QAsR2f3Ly4Nmasaq3vlaw25EhlnzyYYAXXx29fCGm0OH7ryj2FdtjE+hbl+CPP+nHMHP tIJS9IBgfUDUC1peoBn5cYHb1mXv10c96rN/hIYCpgjCDKvSqrEE9gyNg/fF43ece8pC ey1mqrbD6YbqyxuCB2Ia4REqmBhXHnUfcvrOtdXTj12Kg/2EifQKhoiHAuEcd22f5exn cDtRRYyFADRovM1nw3rFwPic5yzoOrwKeQndnZmdETNN07o04PVKf2B4jvsUZTrzrX+F cc8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Cc+8NW3oaqL7v7CJZlR+R8urn6RS/4vks+nXeck2ako=; b=qqZ8kGWhS1RyDXaQBDk7mtqvUG3vVKHDzkmCGDHOtvcVG0Kd8PCIC/WbCuRGJPhoNB uJdBk5in09n04BI5WYLxLpoRb3LMYv0jufrtRoyl+zIbzxqFR3z85CZbD3a0VAUrxSkt jKkoRQlx5yQ01eZOtsf+w37/sT5Ch6zYTDmTqBw1K+NnoPlv6WRIgO9ndfJDYf4aycW/ 7BpafrzK9vjIZ8FeE6Zpo82960XzNbQOeJQZwAeaMsOHyjNImnjmn/AWdxnB5WwG1CG8 dXDazyQZNKhKHLJPgvTTtpgPNjpoAHUm96Rhu+5z5khaEl5POvbxR0Sjcf7B8VI60nY6 SEug== X-Gm-Message-State: APjAAAVWt+11UQBldDH0FvJoQo7aj1sjlWfVBfjcjrubb1eH6hipPROj dLZ1Lqn/pkVZnZfHtKgnlJDtydc4 X-Google-Smtp-Source: APXvYqxq/x2IRI/9YHrxAyymDX9EY9Q5xfpzh0M6wGgr+jbFrxm2VaKcmYRNZpvhJVW4ZGpQN+rQkw== X-Received: by 2002:a62:5214:: with SMTP id g20mr107833749pfb.101.1578338351804; Mon, 06 Jan 2020 11:19:11 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id g10sm72795594pgh.35.2020.01.06.11.19.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jan 2020 11:19:11 -0800 (PST) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: bcm-kernel-feedback-list@broadcom.com, Florian Fainelli , Jens Axboe , Rob Herring , Mark Rutland , Hans de Goede , Philipp Zabel , Tejun Heo , Jaedon Shin , linux-ide@vger.kernel.org (open list:LIBATA SUBSYSTEM (Serial and Parallel ATA drivers)), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS) Subject: [PATCH v2 2/2] ata: ahci_brcm: BCM7216 reset is self de-asserting Date: Mon, 6 Jan 2020 11:19:06 -0800 Message-Id: <20200106191906.18266-3-f.fainelli@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200106191906.18266-1-f.fainelli@gmail.com> References: <20200106191906.18266-1-f.fainelli@gmail.com> Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org The BCM7216 reset controller line is self-deasserting, unlike other platforms, so make use of reset_control_reset() instead of reset_control_deassert(). Signed-off-by: Florian Fainelli --- drivers/ata/ahci_brcm.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/ata/ahci_brcm.c b/drivers/ata/ahci_brcm.c index 70e3e386d52e..75931cfb70bc 100644 --- a/drivers/ata/ahci_brcm.c +++ b/drivers/ata/ahci_brcm.c @@ -363,8 +363,12 @@ static int brcm_ahci_resume(struct device *dev) struct brcm_ahci_priv *priv = hpriv->plat_data; int ret = 0; - if (!IS_ERR_OR_NULL(priv->rcdev)) - ret = reset_control_deassert(priv->rcdev); + if (!IS_ERR_OR_NULL(priv->rcdev)) { + if (priv->version == BRCM_SATA_BCM7216) + ret = reset_control_reset(priv->rcdev); + else + ret = reset_control_deassert(priv->rcdev); + } if (ret) return ret; @@ -473,8 +477,12 @@ static int brcm_ahci_probe(struct platform_device *pdev) } priv->rcdev = devm_reset_control_get(&pdev->dev, reset_name); - if (!IS_ERR_OR_NULL(priv->rcdev)) - reset_control_deassert(priv->rcdev); + if (!IS_ERR_OR_NULL(priv->rcdev)) { + if (priv->version == BRCM_SATA_BCM7216) + reset_control_reset(priv->rcdev); + else + reset_control_deassert(priv->rcdev); + } ret = ahci_platform_enable_clks(hpriv); if (ret)