From patchwork Tue Sep 1 12:49:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 250483 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=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 A6E0CC433E2 for ; Tue, 1 Sep 2020 12:50:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8364A207EA for ; Tue, 1 Sep 2020 12:50:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="u25gocfm" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728083AbgIAMuP (ORCPT ); Tue, 1 Sep 2020 08:50:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57632 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727025AbgIAMuD (ORCPT ); Tue, 1 Sep 2020 08:50:03 -0400 Received: from mail-ej1-x643.google.com (mail-ej1-x643.google.com [IPv6:2a00:1450:4864:20::643]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 70DA6C061245; Tue, 1 Sep 2020 05:50:02 -0700 (PDT) Received: by mail-ej1-x643.google.com with SMTP id e23so1469624eja.3; Tue, 01 Sep 2020 05:50:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=TeP2OMTnX08luhi/Cf+M20naxDcFqoHuSCfrsdvdbQs=; b=u25gocfmHvWnUENdqC+EIpRNM7WAVhgZnDdK3HH5Qvx421X8HpAscJvCHSrUvXoFem 2i+K90Pqxe4XtoYu0IwUtCBOXD3e2LwPCRTofmLnNytjINMAUxdoFO/JRauOrDWnwVZy y/gj0c7sGeDgJI1T+ivYt07SorAAWwGokZNSYFm/bFA7Rzh9mGvIV9YD5h+g5XP/ha/r Yw7XoMIr1h0Mss+DEjXaXvYAIrgN5+0neD+CLwe/eVTJMpYXac568ktpjfxUviTyVciX oc4mC0ypWa3ZYWRmghWNVvXaCEFhyRAm1q30sl3bZIrwl5BsPgT7dJwOv5eOQhkFyhXc JC/w== 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:mime-version :content-transfer-encoding; bh=TeP2OMTnX08luhi/Cf+M20naxDcFqoHuSCfrsdvdbQs=; b=ro6Cajyh96x8VoDqBKsu0RXELWFFzLTzGlwVFIgF8KLgqJYMZahEX8cuQdROLdwbQL XUc1uZssn0Cujj/RYV8ecPsGdE5MWm1RoRzW+P/ovJUDUPTih8+tboKmYKY4ZIlNrhCk tcvP0bWiGXLLlqAcIpAp9G+KCjYgBstLZnWuxf+Sn3u+ZqfY2xppIS3h8VFGy1hn6+Jd p9yA02H6+aTk+AA0wp4sZ6ZQ+WyaBtyG5iYNVDx643af9l52fLG4GNt4JdGhASTUvaD3 O+wzMKjJE35dkfoPBasMbREewFjnyN70sxMXuFuCzFHoiZ5S5rRRX/wN4Hw3ts2UFcS0 GSrg== X-Gm-Message-State: AOAM532RgIvBG6emHclXys7xU+rtwu/+NvVZcucMNOec9fexTsD4qjKX wWpLl3LYaZxNkGakazPCiqE= X-Google-Smtp-Source: ABdhPJwd22fDSrMBk6KGt7ZiNC578JKHfx4PFTxHyLD3s9thWNGwOYt2JHqd5L9J5spk0LQZTWNGZA== X-Received: by 2002:a17:906:3755:: with SMTP id e21mr1294445ejc.39.1598964601056; Tue, 01 Sep 2020 05:50:01 -0700 (PDT) Received: from Ansuel-XPS.localdomain (host-95-235-252-96.retail.telecomitalia.it. [95.235.252.96]) by smtp.googlemail.com with ESMTPSA id t12sm1068724edy.61.2020.09.01.05.49.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Sep 2020 05:50:00 -0700 (PDT) From: Ansuel Smith To: Stanimir Varbanov Cc: Ansuel Smith , stable@vger.kernel.org, Andy Gross , Bjorn Andersson , Lorenzo Pieralisi , Rob Herring , Bjorn Helgaas , Philipp Zabel , linux-arm-msm@vger.kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] PCI: qcom: Make sure PCIe is reset before init for rev 2.1.0 Date: Tue, 1 Sep 2020 14:49:54 +0200 Message-Id: <20200901124955.137-1-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Qsdk U-Boot can incorrectly leave the PCIe interface in an undefined state if bootm command is used instead of bootipq. This is caused by the not deinit of PCIe when bootm is called. Reset the PCIe before init anyway to fix this U-Boot bug. Signed-off-by: Ansuel Smith Fixes: 82a823833f4e ("PCI: qcom: Add Qualcomm PCIe controller driver") Cc: stable@vger.kernel.org # v4.19+ Reviewed-by: Bjorn Andersson --- drivers/pci/controller/dwc/pcie-qcom.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c index 3aac77a295ba..82336bbaf8dc 100644 --- a/drivers/pci/controller/dwc/pcie-qcom.c +++ b/drivers/pci/controller/dwc/pcie-qcom.c @@ -302,6 +302,9 @@ static void qcom_pcie_deinit_2_1_0(struct qcom_pcie *pcie) reset_control_assert(res->por_reset); reset_control_assert(res->ext_reset); reset_control_assert(res->phy_reset); + + writel(1, pcie->parf + PCIE20_PARF_PHY_CTRL); + regulator_bulk_disable(ARRAY_SIZE(res->supplies), res->supplies); } @@ -314,6 +317,16 @@ static int qcom_pcie_init_2_1_0(struct qcom_pcie *pcie) u32 val; int ret; + /* reset the PCIe interface as uboot can leave it undefined state */ + reset_control_assert(res->pci_reset); + reset_control_assert(res->axi_reset); + reset_control_assert(res->ahb_reset); + reset_control_assert(res->por_reset); + reset_control_assert(res->ext_reset); + reset_control_assert(res->phy_reset); + + writel(1, pcie->parf + PCIE20_PARF_PHY_CTRL); + ret = regulator_bulk_enable(ARRAY_SIZE(res->supplies), res->supplies); if (ret < 0) { dev_err(dev, "cannot enable regulators\n");