From patchwork Mon Aug 19 09:03:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Eichenberger X-Patchwork-Id: 13768101 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 8F2D1C3DA4A for ; Mon, 19 Aug 2024 09:07:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=zR4Ofv19bSC63uSv19yH+Zec5wT7Br2CN3wzGxETKgc=; b=clOEtqZIXOdDWTbqGtKxYekzWt pOlJbpjYR+OUiDU/IsQcnEne/k2PTapSSTiNPOJrxj/dMyIHRdQ/cp7CgnIT/k1cJwrr9W1SUUkud x00DgiJQwvZe6SKUO32r4VnJFDAoi/RYmpPyxXJRf5JkMe+9aYEG6WF1G2vyyztZmHBdIbk00NrPI 7sxAKncwPGOQl2uybdsFaMIY62EbES6cv7pWrci8UfTTaVXQlGeAaU2Wz/hc1nkztp2nFeoBShWWA luUQxZ7v/VwS4FnB5Ps9uObIFyFcquRpMqo5zim2LjUu9rEX5n97YjXHT5ko+rcP9cLqRnqk7Ynlk xk5Fx77Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sfyM5-00000000sfs-2ai7; Mon, 19 Aug 2024 09:07:13 +0000 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sfyJa-00000000rrr-0Rar for linux-arm-kernel@lists.infradead.org; Mon, 19 Aug 2024 09:04:40 +0000 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-42808071810so32384865e9.1 for ; Mon, 19 Aug 2024 02:04:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724058276; x=1724663076; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zR4Ofv19bSC63uSv19yH+Zec5wT7Br2CN3wzGxETKgc=; b=I9pslXJrDrl96cOkCIzyc1MKvxU2X2qfDZTENp5Wji1+WhcBmtJSQtQysJ08iKsE6Y /sb89WoCNottf7q1iA2i3pxYDzRnMCDa/6VQG8suFAAJg7oY2K7QMNCjUxo4IcQafkkQ XHp7Yx6sPJ7c2sxCygqdR7u31RjFBj0HHPUtNtj1BxpuVS/gkkCOm0trgKhHGwetVCMA lNk6M18cZUmnzTrVkScXxzp3iZ4Ou5ivGU6FOLWrMsU7BL7+3geMcZOW/GgWNu5lswHf 1m2xBCMpRL/0nPJKOwIyY1uSjwm7CoW+runc1Rd7rGkdQrYi+nRSD4PGSngKJGwkHhA7 fB9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724058276; x=1724663076; h=content-transfer-encoding:mime-version: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=zR4Ofv19bSC63uSv19yH+Zec5wT7Br2CN3wzGxETKgc=; b=SjZlSJnlkpVjtIZvjQS7DE8q6EJa2op9w0W8cMLJz75yZxc2T2A/ULjAtx8MY6g2+k PLUXsfee6FfJdTk44HiqqvqY0f4uOyiglZn0Jj6wDo0fFZk3MPb1ny9oAfl+edttRCBb z2LGzDW3rxlKS3M+eh7nCLuauFxB8x87MasYgcGEtGV7amzcBnZDv1MqfFr79ECM00gI ihtvRqr815an6Q6jRTATuUbg3ule9zLIQ873ih1f3OoYXEsz+PGyQByXpyAGckIuAuQN dNDG/S255nJpCUb1VPyu15AfN/nBc3FjeUzbWxB8t77fxS6GxEeimSRwFcGHNU7+KSB0 JUsw== X-Forwarded-Encrypted: i=1; AJvYcCU1X1j73YA3YR3ruG7K8Ne5BnEkTXT3QdNuXQik3joBUus+0gEjtplsO3r9TKSGEfPTKmtVBEMIUXufUBYK140XivHbGARwSu3u/F4fxVrEJa1Y2lk= X-Gm-Message-State: AOJu0Yy/msNNZYBf0YcoYarudlblE/sd3dzCmiKaypulYS/oiSjzbrli eJZ6ZRSdmRRS+bqDKz5s85KflYT5BikffqsuY3cTgGs2LkRu9fD/ X-Google-Smtp-Source: AGHT+IH7JYzrD4WQ2IczOX6U7P1voHwlgUZmPc1foVjQrG13R7Z0iK1/sLxIgbdwHptG5vYiK5hczA== X-Received: by 2002:a05:600c:4712:b0:426:5fbe:bf75 with SMTP id 5b1f17b1804b1-429ed7d1eccmr71255425e9.23.1724058276061; Mon, 19 Aug 2024 02:04:36 -0700 (PDT) Received: from eichest-laptop.toradex.int ([2a02:168:af72:0:a64c:8731:e4fb:38f1]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-429ded19627sm154672095e9.5.2024.08.19.02.04.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Aug 2024 02:04:35 -0700 (PDT) From: Stefan Eichenberger To: hongxing.zhu@nxp.com, l.stach@pengutronix.de, lpieralisi@kernel.org, kw@linux.com, robh@kernel.org, bhelgaas@google.com, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, francesco.dolcini@toradex.com Cc: linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, imx@lists.linux.dev, linux-kernel@vger.kernel.org, Stefan Eichenberger Subject: [PATCH v1 3/3] PCI: imx6: reset link on resume Date: Mon, 19 Aug 2024 11:03:19 +0200 Message-ID: <20240819090428.17349-4-eichest@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240819090428.17349-1-eichest@gmail.com> References: <20240819090428.17349-1-eichest@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240819_020438_224051_5F87B2EA X-CRM114-Status: GOOD ( 22.27 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Stefan Eichenberger According to the https://www.nxp.com/docs/en/errata/IMX6DQCE.pdf errata, the i.MX6Q PCIe controller does not support suspend/resume. So suspend and resume was omitted. However, this does not seem to work because it looks like the PCIe link is still expecting a reset. If we do not reset the link, we end up with a frozen system after resume. The last message we see is: ath10k_pci 0000:01:00.0: Unable to change power state from D3hot to D0, device inaccessible Besides resetting the link, we also need to enable msi again, otherwise DMA access will not work and we can still end up with a frozen system. With these changes we can suspend and resume the system properly with a PCIe device attached. This was tested with a Compex WLE900VX miniPCIe Wifi module. Signed-off-by: Stefan Eichenberger --- drivers/pci/controller/dwc/pci-imx6.c | 45 ++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index f17561791e35a..751243f4c519e 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -1213,14 +1213,57 @@ static int imx6_pcie_suspend_noirq(struct device *dev) return 0; } +static int imx6_pcie_reset_link(struct imx6_pcie *imx6_pcie) +{ + int ret; + + regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR1, + IMX6Q_GPR1_PCIE_TEST_PD, 1 << 18); + regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR1, + IMX6Q_GPR1_PCIE_REF_CLK_EN, 0 << 16); + + /* Reset the PCIe device */ + gpiod_set_value_cansleep(imx6_pcie->reset_gpiod, 1); + + ret = imx6_pcie_enable_ref_clk(imx6_pcie); + if (ret) { + dev_err(imx6_pcie->pci->dev, "unable to enable pcie ref clock\n"); + return ret; + } + + imx6_pcie_deassert_reset_gpio(imx6_pcie); + + /* + * Setup the root complex again and enable msi. Without this PCIe will + * not work in msi mode and drivers will crash if they try to access + * the device memory area + */ + dw_pcie_setup_rc(&imx6_pcie->pci->pp); + if (pci_msi_enabled()) { + u32 val; + u8 offset = dw_pcie_find_capability(imx6_pcie->pci, PCI_CAP_ID_MSI); + + val = dw_pcie_readw_dbi(imx6_pcie->pci, offset + PCI_MSI_FLAGS); + val |= PCI_MSI_FLAGS_ENABLE; + dw_pcie_writew_dbi(imx6_pcie->pci, offset + PCI_MSI_FLAGS, val); + } + + return 0; +} + static int imx6_pcie_resume_noirq(struct device *dev) { int ret; struct imx6_pcie *imx6_pcie = dev_get_drvdata(dev); struct dw_pcie_rp *pp = &imx6_pcie->pci->pp; + /* + * Even though the i.MX6Q does not support suspend/resume, we need to + * reset the link after resume or the memory mapped PCIe I/O space will + * be inaccessible. This will cause the system to freeze. + */ if (!(imx6_pcie->drvdata->flags & IMX6_PCIE_FLAG_SUPPORTS_SUSPEND)) - return 0; + return imx6_pcie_reset_link(imx6_pcie); ret = imx6_pcie_host_init(pp); if (ret)