linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Elad Nachman <enachman@marvell.com>
To: <thomas.petazzoni@bootlin.com>, <bhelgaas@google.com>,
	<lpieralisi@kernel.org>, <robh@kernel.org>, <kw@linux.com>,
	<krzysztof.kozlowski+dt@linaro.org>, <linux-pci@vger.kernel.org>,
	<linux-arm-kernel@lists.infradead.org>,
	<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Cc: Elad Nachman <enachman@marvell.com>
Subject: [PATCH v4 8/8] PCI: dwc: Introduce region limit from DT
Date: Mon, 13 Mar 2023 14:40:16 +0200	[thread overview]
Message-ID: <20230313124016.17102-9-enachman@marvell.com> (raw)
In-Reply-To: <20230313124016.17102-1-enachman@marvell.com>

From: Elad Nachman <enachman@marvell.com>

Allow dts override of region limit for SOCs with older Synopsis
Designware PCIe IP but with greater than 32-bit address range support,
such as the Armada 7020/7040/8040 family of SOCs by Marvell,
when the DT file places the PCIe window above the 4GB region.
The Synopsis Designware PCIe IP in these SOCs is too old to specify the
highest memory location supported by the PCIe, but practically supports
such locations. Allow these locations to be specified in the DT file.
DT property is called num-regionmask , and can range between 33 and 64.

Signed-off-by: Elad Nachman <enachman@marvell.com>
---
v4:
   1) Fix blank lines removal / addition

   2) Remove usage of variable with same name as dt binding property

 drivers/pci/controller/dwc/pcie-designware.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/pci/controller/dwc/pcie-designware.c b/drivers/pci/controller/dwc/pcie-designware.c
index 53a16b8b6ac2..9773c110c733 100644
--- a/drivers/pci/controller/dwc/pcie-designware.c
+++ b/drivers/pci/controller/dwc/pcie-designware.c
@@ -735,8 +735,10 @@ static void dw_pcie_link_set_max_speed(struct dw_pcie *pci, u32 link_gen)
 void dw_pcie_iatu_detect(struct dw_pcie *pci)
 {
 	int max_region, ob, ib;
-	u32 val, min, dir;
+	u32 val, min, dir, ret;
 	u64 max;
+	struct device *dev = pci->dev;
+	struct device_node *np = dev->of_node;
 
 	val = dw_pcie_readl_dbi(pci, PCIE_ATU_VIEWPORT);
 	if (val == 0xFFFFFFFF) {
@@ -781,7 +783,13 @@ void dw_pcie_iatu_detect(struct dw_pcie *pci)
 		dw_pcie_writel_atu(pci, dir, 0, PCIE_ATU_UPPER_LIMIT, 0xFFFFFFFF);
 		max = dw_pcie_readl_atu(pci, dir, 0, PCIE_ATU_UPPER_LIMIT);
 	} else {
-		max = 0;
+		/* Allow dts override of region limit for older IP with above 32-bit support: */
+		ret = of_property_read_u32(np, "num-regionmask", &val);
+		if (!ret && val > 32) {
+			max = GENMASK(val - 33, 0);
+			dev_info(pci->dev, "Overriding region limit to %u bits\n", val);
+		} else
+			max = 0;
 	}
 
 	pci->num_ob_windows = ob;
-- 
2.17.1


  parent reply	other threads:[~2023-03-13 12:43 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-13 12:40 [PATCH v4 0/8] PCI: dwc: Add support for Marvell AC5 SoC Elad Nachman
2023-03-13 12:40 ` [PATCH v4 1/8] dt-bindings: PCI: armada8k: Add compatible string for " Elad Nachman
2023-03-13 12:40 ` [PATCH v4 2/8] PCI: armada8k: Add AC5 SoC support Elad Nachman
2023-03-13 19:43   ` Bjorn Helgaas
2023-03-22 23:19   ` Serge Semin
2023-03-13 12:40 ` [PATCH v4 3/8] PCI: armada8k: Add AC5 MSI support Elad Nachman
2023-03-22 23:23   ` Serge Semin
2023-03-13 12:40 ` [PATCH v4 4/8] dt-bindings: PCI: dwc: Add dma-ranges, region mask Elad Nachman
2023-03-17 18:30   ` Rob Herring
2023-03-13 12:40 ` [PATCH v4 5/8] PCI: armada8k: support AC5 INTx PCIe interrupts Elad Nachman
2023-03-13 12:40 ` [PATCH v4 6/8] PCI: armada8k: support reg regions according to DT Elad Nachman
2023-03-13 12:40 ` [PATCH v4 7/8] PCI: dwc: Introduce configurable DMA mask Elad Nachman
2023-03-17 18:23   ` Rob Herring
2023-03-27 17:01     ` Robin Murphy
2023-03-13 12:40 ` Elad Nachman [this message]
2023-03-13 19:48   ` [PATCH v4 8/8] PCI: dwc: Introduce region limit from DT Bjorn Helgaas
2023-03-14 20:48     ` Serge Semin
2023-03-23  0:11   ` Serge Semin
2023-03-13 19:22 ` [PATCH v4 0/8] PCI: dwc: Add support for Marvell AC5 SoC Bjorn Helgaas

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230313124016.17102-9-enachman@marvell.com \
    --to=enachman@marvell.com \
    --cc=bhelgaas@google.com \
    --cc=devicetree@vger.kernel.org \
    --cc=krzysztof.kozlowski+dt@linaro.org \
    --cc=kw@linux.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=lpieralisi@kernel.org \
    --cc=robh@kernel.org \
    --cc=thomas.petazzoni@bootlin.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).