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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A6C0AC43219 for ; Tue, 22 Feb 2022 15:51:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233709AbiBVPwM (ORCPT ); Tue, 22 Feb 2022 10:52:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42324 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233699AbiBVPwJ (ORCPT ); Tue, 22 Feb 2022 10:52:09 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B63242A713; Tue, 22 Feb 2022 07:51:41 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 6E63FB81B24; Tue, 22 Feb 2022 15:51:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 18A6BC340E8; Tue, 22 Feb 2022 15:51:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1645545099; bh=kF2VSgfLpoH+QrHmU7/2uhkKeI3FJlUcWLvYj0tc3Mk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eSPVcTrBpdYXaBl+CLugNXcb5mWZjLr5bORfThXweaI+byGk7YJbeVFiSy2haCpX/ SC+Oy/ZbI4bTMugzCywxp5xa+BrL7Kg7cqqH8usKcO0ZopCcwzOJg80+UkxrCruTnm CbZkHcTdv1Gz3VA/u47y2/dTXA/QF8KtqC64hgzvwbvBHTbiV8htuv6m8JGrKYpPf1 uFZneHle+OhodgkVm488B0TXyy5z/vr++hjehAj23cxeewTwCRsIoUVIkza49s3nIY 11idawyhq0hQMcSzd86ps1w42bwlNHJdOooIjXG58Y0cpaGbF/HlhztGBdNF+9isVP 7mT1BZQxU6QyQ== Received: by pali.im (Postfix) id C148CFDB; Tue, 22 Feb 2022 16:51:38 +0100 (CET) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Lorenzo Pieralisi , Bjorn Helgaas , Rob Herring , Thomas Petazzoni , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , =?UTF-8?q?Marek=20Beh=C3=BAn?= , Russell King Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 05/12] PCI: mvebu: Correctly configure x1/x4 mode Date: Tue, 22 Feb 2022 16:50:23 +0100 Message-Id: <20220222155030.988-6-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220222155030.988-1-pali@kernel.org> References: <20220222155030.988-1-pali@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org If x1/x4 mode is not set correctly then link with endpoint card is not established. Use DTS property 'num-lanes' to deteriminate x1/x4 mode. Signed-off-by: Pali Rohár --- drivers/pci/controller/pci-mvebu.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/drivers/pci/controller/pci-mvebu.c b/drivers/pci/controller/pci-mvebu.c index 357f0f41f68e..d0a75c3b78c3 100644 --- a/drivers/pci/controller/pci-mvebu.c +++ b/drivers/pci/controller/pci-mvebu.c @@ -93,6 +93,7 @@ struct mvebu_pcie_port { void __iomem *base; u32 port; u32 lane; + bool is_x4; int devfn; unsigned int mem_target; unsigned int mem_attr; @@ -233,13 +234,25 @@ static void mvebu_pcie_setup_wins(struct mvebu_pcie_port *port) static void mvebu_pcie_setup_hw(struct mvebu_pcie_port *port) { - u32 ctrl, cmd, dev_rev, mask; + u32 ctrl, lnkcap, cmd, dev_rev, mask; /* Setup PCIe controller to Root Complex mode. */ ctrl = mvebu_readl(port, PCIE_CTRL_OFF); ctrl |= PCIE_CTRL_RC_MODE; mvebu_writel(port, ctrl, PCIE_CTRL_OFF); + /* + * Set Maximum Link Width to X1 or X4 in Root Port's PCIe Link + * Capability register. This register is defined by PCIe specification + * as read-only but this mvebu controller has it as read-write and must + * be set to number of SerDes PCIe lanes (1 or 4). If this register is + * not set correctly then link with endpoint card is not established. + */ + lnkcap = mvebu_readl(port, PCIE_CAP_PCIEXP + PCI_EXP_LNKCAP); + lnkcap &= ~PCI_EXP_LNKCAP_MLW; + lnkcap |= (port->is_x4 ? 4 : 1) << 4; + mvebu_writel(port, lnkcap, PCIE_CAP_PCIEXP + PCI_EXP_LNKCAP); + /* Disable Root Bridge I/O space, memory space and bus mastering. */ cmd = mvebu_readl(port, PCIE_CMD_OFF); cmd &= ~(PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER); @@ -982,6 +995,7 @@ static int mvebu_pcie_parse_port(struct mvebu_pcie *pcie, struct device *dev = &pcie->pdev->dev; enum of_gpio_flags flags; int reset_gpio, ret; + u32 num_lanes; port->pcie = pcie; @@ -994,6 +1008,9 @@ static int mvebu_pcie_parse_port(struct mvebu_pcie *pcie, if (of_property_read_u32(child, "marvell,pcie-lane", &port->lane)) port->lane = 0; + if (!of_property_read_u32(child, "num-lanes", &num_lanes) && num_lanes == 4) + port->is_x4 = true; + port->name = devm_kasprintf(dev, GFP_KERNEL, "pcie%d.%d", port->port, port->lane); if (!port->name) { -- 2.20.1 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 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 5D1BBC433EF for ; Tue, 22 Feb 2022 15:55:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=0oljAVIkcsBdbRfv0/pQwVko0gBbjaqNWGh8hHudbSM=; b=m42qtB1dRzDJsU XooJZjj2wti0bentE7Ce45/t+IMZPiKXtCb/zIuP+uwjDcymvmU8xBksvKDkt/YRWb/qC/GLXxtq7 AlP72m9AjlrOFUfeWwFYBExi9V6VGwehzxUTk8EP/e018OfRX5NOw4fES/eBKy3rEgSHOIXJBZpSG JRrEglh4PJuB9clJFuqynpjCoUBbBqWaZj1XDnVWk8gy1np0P+0SFuWKDJA7sGkfN9nKz7fgSM97O n0Bfzl4zxseqru1hj7J1gNAl84lS8AZjOIKFBL0shRNM2mrKDu+jGScZ1go4JQh8YAgu1COm/lzBM AuDC2qQ0qSbAeWgOTcGA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nMXTz-00AQiR-TV; Tue, 22 Feb 2022 15:53:44 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nMXS0-00APeA-AN for linux-arm-kernel@lists.infradead.org; Tue, 22 Feb 2022 15:51:42 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C7202616B8; Tue, 22 Feb 2022 15:51:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 18A6BC340E8; Tue, 22 Feb 2022 15:51:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1645545099; bh=kF2VSgfLpoH+QrHmU7/2uhkKeI3FJlUcWLvYj0tc3Mk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eSPVcTrBpdYXaBl+CLugNXcb5mWZjLr5bORfThXweaI+byGk7YJbeVFiSy2haCpX/ SC+Oy/ZbI4bTMugzCywxp5xa+BrL7Kg7cqqH8usKcO0ZopCcwzOJg80+UkxrCruTnm CbZkHcTdv1Gz3VA/u47y2/dTXA/QF8KtqC64hgzvwbvBHTbiV8htuv6m8JGrKYpPf1 uFZneHle+OhodgkVm488B0TXyy5z/vr++hjehAj23cxeewTwCRsIoUVIkza49s3nIY 11idawyhq0hQMcSzd86ps1w42bwlNHJdOooIjXG58Y0cpaGbF/HlhztGBdNF+9isVP 7mT1BZQxU6QyQ== Received: by pali.im (Postfix) id C148CFDB; Tue, 22 Feb 2022 16:51:38 +0100 (CET) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Lorenzo Pieralisi , Bjorn Helgaas , Rob Herring , Thomas Petazzoni , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , =?UTF-8?q?Marek=20Beh=C3=BAn?= , Russell King Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 05/12] PCI: mvebu: Correctly configure x1/x4 mode Date: Tue, 22 Feb 2022 16:50:23 +0100 Message-Id: <20220222155030.988-6-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220222155030.988-1-pali@kernel.org> References: <20220222155030.988-1-pali@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220222_075140_498750_07BC7292 X-CRM114-Status: GOOD ( 16.28 ) 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org SWYgeDEveDQgbW9kZSBpcyBub3Qgc2V0IGNvcnJlY3RseSB0aGVuIGxpbmsgd2l0aCBlbmRwb2lu dCBjYXJkIGlzIG5vdAplc3RhYmxpc2hlZC4KClVzZSBEVFMgcHJvcGVydHkgJ251bS1sYW5lcycg dG8gZGV0ZXJpbWluYXRlIHgxL3g0IG1vZGUuCgpTaWduZWQtb2ZmLWJ5OiBQYWxpIFJvaMOhciA8 cGFsaUBrZXJuZWwub3JnPgotLS0KIGRyaXZlcnMvcGNpL2NvbnRyb2xsZXIvcGNpLW12ZWJ1LmMg fCAxOSArKysrKysrKysrKysrKysrKystCiAxIGZpbGUgY2hhbmdlZCwgMTggaW5zZXJ0aW9ucygr KSwgMSBkZWxldGlvbigtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvcGNpL2NvbnRyb2xsZXIvcGNp LW12ZWJ1LmMgYi9kcml2ZXJzL3BjaS9jb250cm9sbGVyL3BjaS1tdmVidS5jCmluZGV4IDM1N2Yw ZjQxZjY4ZS4uZDBhNzVjM2I3OGMzIDEwMDY0NAotLS0gYS9kcml2ZXJzL3BjaS9jb250cm9sbGVy L3BjaS1tdmVidS5jCisrKyBiL2RyaXZlcnMvcGNpL2NvbnRyb2xsZXIvcGNpLW12ZWJ1LmMKQEAg LTkzLDYgKzkzLDcgQEAgc3RydWN0IG12ZWJ1X3BjaWVfcG9ydCB7CiAJdm9pZCBfX2lvbWVtICpi YXNlOwogCXUzMiBwb3J0OwogCXUzMiBsYW5lOworCWJvb2wgaXNfeDQ7CiAJaW50IGRldmZuOwog CXVuc2lnbmVkIGludCBtZW1fdGFyZ2V0OwogCXVuc2lnbmVkIGludCBtZW1fYXR0cjsKQEAgLTIz MywxMyArMjM0LDI1IEBAIHN0YXRpYyB2b2lkIG12ZWJ1X3BjaWVfc2V0dXBfd2lucyhzdHJ1Y3Qg bXZlYnVfcGNpZV9wb3J0ICpwb3J0KQogCiBzdGF0aWMgdm9pZCBtdmVidV9wY2llX3NldHVwX2h3 KHN0cnVjdCBtdmVidV9wY2llX3BvcnQgKnBvcnQpCiB7Ci0JdTMyIGN0cmwsIGNtZCwgZGV2X3Jl diwgbWFzazsKKwl1MzIgY3RybCwgbG5rY2FwLCBjbWQsIGRldl9yZXYsIG1hc2s7CiAKIAkvKiBT ZXR1cCBQQ0llIGNvbnRyb2xsZXIgdG8gUm9vdCBDb21wbGV4IG1vZGUuICovCiAJY3RybCA9IG12 ZWJ1X3JlYWRsKHBvcnQsIFBDSUVfQ1RSTF9PRkYpOwogCWN0cmwgfD0gUENJRV9DVFJMX1JDX01P REU7CiAJbXZlYnVfd3JpdGVsKHBvcnQsIGN0cmwsIFBDSUVfQ1RSTF9PRkYpOwogCisJLyoKKwkg KiBTZXQgTWF4aW11bSBMaW5rIFdpZHRoIHRvIFgxIG9yIFg0IGluIFJvb3QgUG9ydCdzIFBDSWUg TGluaworCSAqIENhcGFiaWxpdHkgcmVnaXN0ZXIuIFRoaXMgcmVnaXN0ZXIgaXMgZGVmaW5lZCBi eSBQQ0llIHNwZWNpZmljYXRpb24KKwkgKiBhcyByZWFkLW9ubHkgYnV0IHRoaXMgbXZlYnUgY29u dHJvbGxlciBoYXMgaXQgYXMgcmVhZC13cml0ZSBhbmQgbXVzdAorCSAqIGJlIHNldCB0byBudW1i ZXIgb2YgU2VyRGVzIFBDSWUgbGFuZXMgKDEgb3IgNCkuIElmIHRoaXMgcmVnaXN0ZXIgaXMKKwkg KiBub3Qgc2V0IGNvcnJlY3RseSB0aGVuIGxpbmsgd2l0aCBlbmRwb2ludCBjYXJkIGlzIG5vdCBl c3RhYmxpc2hlZC4KKwkgKi8KKwlsbmtjYXAgPSBtdmVidV9yZWFkbChwb3J0LCBQQ0lFX0NBUF9Q Q0lFWFAgKyBQQ0lfRVhQX0xOS0NBUCk7CisJbG5rY2FwICY9IH5QQ0lfRVhQX0xOS0NBUF9NTFc7 CisJbG5rY2FwIHw9IChwb3J0LT5pc194NCA/IDQgOiAxKSA8PCA0OworCW12ZWJ1X3dyaXRlbChw b3J0LCBsbmtjYXAsIFBDSUVfQ0FQX1BDSUVYUCArIFBDSV9FWFBfTE5LQ0FQKTsKKwogCS8qIERp c2FibGUgUm9vdCBCcmlkZ2UgSS9PIHNwYWNlLCBtZW1vcnkgc3BhY2UgYW5kIGJ1cyBtYXN0ZXJp bmcuICovCiAJY21kID0gbXZlYnVfcmVhZGwocG9ydCwgUENJRV9DTURfT0ZGKTsKIAljbWQgJj0g fihQQ0lfQ09NTUFORF9JTyB8IFBDSV9DT01NQU5EX01FTU9SWSB8IFBDSV9DT01NQU5EX01BU1RF Uik7CkBAIC05ODIsNiArOTk1LDcgQEAgc3RhdGljIGludCBtdmVidV9wY2llX3BhcnNlX3BvcnQo c3RydWN0IG12ZWJ1X3BjaWUgKnBjaWUsCiAJc3RydWN0IGRldmljZSAqZGV2ID0gJnBjaWUtPnBk ZXYtPmRldjsKIAllbnVtIG9mX2dwaW9fZmxhZ3MgZmxhZ3M7CiAJaW50IHJlc2V0X2dwaW8sIHJl dDsKKwl1MzIgbnVtX2xhbmVzOwogCiAJcG9ydC0+cGNpZSA9IHBjaWU7CiAKQEAgLTk5NCw2ICsx MDA4LDkgQEAgc3RhdGljIGludCBtdmVidV9wY2llX3BhcnNlX3BvcnQoc3RydWN0IG12ZWJ1X3Bj aWUgKnBjaWUsCiAJaWYgKG9mX3Byb3BlcnR5X3JlYWRfdTMyKGNoaWxkLCAibWFydmVsbCxwY2ll LWxhbmUiLCAmcG9ydC0+bGFuZSkpCiAJCXBvcnQtPmxhbmUgPSAwOwogCisJaWYgKCFvZl9wcm9w ZXJ0eV9yZWFkX3UzMihjaGlsZCwgIm51bS1sYW5lcyIsICZudW1fbGFuZXMpICYmIG51bV9sYW5l cyA9PSA0KQorCQlwb3J0LT5pc194NCA9IHRydWU7CisKIAlwb3J0LT5uYW1lID0gZGV2bV9rYXNw cmludGYoZGV2LCBHRlBfS0VSTkVMLCAicGNpZSVkLiVkIiwgcG9ydC0+cG9ydCwKIAkJCQkgICAg cG9ydC0+bGFuZSk7CiAJaWYgKCFwb3J0LT5uYW1lKSB7Ci0tIAoyLjIwLjEKCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpsaW51eC1hcm0ta2VybmVsIG1h aWxpbmcgbGlzdApsaW51eC1hcm0ta2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xp c3RzLmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9saW51eC1hcm0ta2VybmVsCg==