From patchwork Sun Apr 2 13:13:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Wunderlich X-Patchwork-Id: 78242 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1749705vqo; Sun, 2 Apr 2023 06:48:23 -0700 (PDT) X-Google-Smtp-Source: AKy350YbIOe/w9phj9D8Tl5E5kuiOvUYn8gxGEigyi0pd31pgOyuTkRqDIwBAoxKDp5zNnFxC+4d X-Received: by 2002:a17:902:f542:b0:19e:e172:2a40 with SMTP id h2-20020a170902f54200b0019ee1722a40mr41342940plf.65.1680443303127; Sun, 02 Apr 2023 06:48:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680443303; cv=none; d=google.com; s=arc-20160816; b=Eykl5gpiQicbTN6+vQNKdW9OgOPv2yZWZAD8p/cc+jPYCJrUI1RrabawkoGV7y2UWa a914cvDJK6osOS55LppB1r2bQGPttCfpQJaVfLMqzCX1I96GtSWYJphvi7Lq+VCxiLJR j+Vd1Z42Y07W0KOx81mwyE7tXXYQ9BDda/1poJ/el1ZHimLVnmjvwhXVCcH6wfAOP06i /2RDoLKBklQhtKlnf4BF/F56ohIN1benK1GYjTbMYcJSk2yJzQ68K+aEoDhDchLaXrug zWCanAlBig2+yTniegfJAJuaptoQVcJ3G1VkZieQbYO5hUNKPRNrQXOZqP1YG7GEMsIt pR3g== 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; bh=PePDMwKaKXpGWihmfKFx/uB+X5rFJB1pjEC6KIOCAQU=; b=IFYq+ZkAsSs7bOLh4fsYpBmah/Wn4KwH2ret5q62u5DQ3q+aj1bg+Spo0ywZzCXvFk NHr6t2zOQ0stqjWt8IQJJrFdNPodm3rdj5TESz0K1nlQGBvT0cv6CrK5TxJbzXWW+tfO MzxNxLbrJN9q09FZlIKgOQNypLcELUXcmGPvjlbYz5XLhukK5ubx1IcFlP6AFM1A4n5C 5/3zmlr1Q7muUKUBvRraumLp32HiB7CmpKB2jPM2SV9cmfF/esS+cYQS3GnBVlcsmcvI 4+WhLLdbLY0l3Csnvlg4M0wIIC7k+uhx3OQ6IbwClKtZgTikEmc/4NtOZ3jmm6ifk1pK UFug== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o13-20020a170902d4cd00b0019cec510d4csi6897781plg.444.2023.04.02.06.48.10; Sun, 02 Apr 2023 06:48:23 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230383AbjDBNbm (ORCPT + 99 others); Sun, 2 Apr 2023 09:31:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43542 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229448AbjDBNbk (ORCPT ); Sun, 2 Apr 2023 09:31:40 -0400 X-Greylist: delayed 601 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Sun, 02 Apr 2023 06:31:38 PDT Received: from mxout2.routing.net (mxout2.routing.net [IPv6:2a03:2900:1:a::b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 44B301B340; Sun, 2 Apr 2023 06:31:38 -0700 (PDT) Received: from mxbox2.masterlogin.de (unknown [192.168.10.89]) by mxout2.routing.net (Postfix) with ESMTP id CEE775FBFE; Sun, 2 Apr 2023 13:13:55 +0000 (UTC) Received: from frank-G5.. (fttx-pool-217.61.149.201.bambit.de [217.61.149.201]) by mxbox2.masterlogin.de (Postfix) with ESMTPSA id E3A711007F0; Sun, 2 Apr 2023 13:13:54 +0000 (UTC) From: Frank Wunderlich To: linux-mediatek@lists.infradead.org Cc: Frank Wunderlich , Ryder Lee , Jianjun Wang , Lorenzo Pieralisi , Rob Herring , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Bjorn Helgaas , Matthias Brugger , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH] PCI: mediatek-gen3: handle PERST after reset Date: Sun, 2 Apr 2023 15:13:47 +0200 Message-Id: <20230402131347.99268-1-linux@fw-web.de> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Mail-ID: 0729ddf9-6bfe-4c25-9067-7616871ef223 X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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?1762072516986480851?= X-GMAIL-MSGID: =?utf-8?q?1762072516986480851?= From: Frank Wunderlich De-assert PERST in separate step after reset signals to fully comply the PCIe CEM clause 2.2. This fixes some NVME detection issues on mt7986. Fixes: d3bf75b579b9 ("PCI: mediatek-gen3: Add MediaTek Gen3 driver for MT8192") Signed-off-by: Frank Wunderlich --- Patch is taken from user Ruslan aka RRKh61 (permitted me to send it with me as author). https://forum.banana-pi.org/t/bpi-r3-nvme-connection-issue/14563/17 --- drivers/pci/controller/pcie-mediatek-gen3.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/pci/controller/pcie-mediatek-gen3.c b/drivers/pci/controller/pcie-mediatek-gen3.c index b8612ce5f4d0..176b1a04565d 100644 --- a/drivers/pci/controller/pcie-mediatek-gen3.c +++ b/drivers/pci/controller/pcie-mediatek-gen3.c @@ -350,7 +350,13 @@ static int mtk_pcie_startup_port(struct mtk_gen3_pcie *pcie) msleep(100); /* De-assert reset signals */ - val &= ~(PCIE_MAC_RSTB | PCIE_PHY_RSTB | PCIE_BRG_RSTB | PCIE_PE_RSTB); + val &= ~(PCIE_MAC_RSTB | PCIE_PHY_RSTB | PCIE_BRG_RSTB); + writel_relaxed(val, pcie->base + PCIE_RST_CTRL_REG); + + msleep(100); + + /* De-assert PERST# signals */ + val &= ~(PCIE_PE_RSTB); writel_relaxed(val, pcie->base + PCIE_RST_CTRL_REG); /* Check if the link is up or not */