From: Kishon Vijay Abraham I <kishon@ti.com>
To: Bjorn Helgaas <bhelgaas@google.com>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Murali Karicheri <m-karicheri2@ti.com>,
Jingoo Han <jingoohan1@gmail.com>,
Gustavo Pimentel <gustavo.pimentel@synopsys.com>
Cc: Rob Herring <robh+dt@kernel.org>, <linux-pci@vger.kernel.org>,
<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
Kishon Vijay Abraham I <kishon@ti.com>
Subject: [PATCH v2 14/21] PCI: keystone: Get number of outbound windows from DT
Date: Wed, 17 Oct 2018 13:11:07 +0530 [thread overview]
Message-ID: <20181017074114.28239-15-kishon@ti.com> (raw)
In-Reply-To: <20181017074114.28239-1-kishon@ti.com>
Instead of having a fixed outbound window count, get the number of
outbound windows from device tree.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
drivers/pci/controller/dwc/pci-keystone.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c
index 1f14de0ef27f..608e40c4b991 100644
--- a/drivers/pci/controller/dwc/pci-keystone.c
+++ b/drivers/pci/controller/dwc/pci-keystone.c
@@ -54,7 +54,6 @@
#define OB_SIZE 0x030
#define CFG_PCIM_WIN_SZ_IDX 3
-#define CFG_PCIM_WIN_CNT 32
#define SPACE0_REMOTE_CFG_OFFSET 0x1000
#define OB_OFFSET_INDEX(n) (0x200 + (8 * (n)))
#define OB_OFFSET_HI(n) (0x204 + (8 * (n)))
@@ -111,6 +110,7 @@ struct keystone_pcie {
int num_msi_host_irqs;
int msi_host_irqs[MAX_MSI_HOST_IRQS];
int num_lanes;
+ u32 num_viewport;
struct phy **phy;
struct device_link **link;
struct device_node *msi_intc_np;
@@ -341,6 +341,7 @@ static void ks_pcie_clear_dbi_mode(struct keystone_pcie *ks_pcie)
static void ks_pcie_setup_rc_app_regs(struct keystone_pcie *ks_pcie)
{
+ u32 num_viewport = ks_pcie->num_viewport;
struct dw_pcie *pci = ks_pcie->pci;
struct pcie_port *pp = &pci->pp;
u32 start = pp->mem->start, end = pp->mem->end;
@@ -359,7 +360,7 @@ static void ks_pcie_setup_rc_app_regs(struct keystone_pcie *ks_pcie)
tr_size = (1 << (CFG_PCIM_WIN_SZ_IDX & 0x7)) * SZ_1M;
/* Using Direct 1:1 mapping of RC <-> PCI memory space */
- for (i = 0; (i < CFG_PCIM_WIN_CNT) && (start < end); i++) {
+ for (i = 0; (i < num_viewport) && (start < end); i++) {
ks_pcie_app_writel(ks_pcie, OB_OFFSET_INDEX(i), start | 1);
ks_pcie_app_writel(ks_pcie, OB_OFFSET_HI(i), 0);
start += tr_size;
@@ -898,6 +899,7 @@ static int __init ks_pcie_probe(struct platform_device *pdev)
struct dw_pcie *pci;
struct keystone_pcie *ks_pcie;
struct device_link **link;
+ u32 num_viewport;
struct phy **phy;
u32 num_lanes;
char name[10];
@@ -915,6 +917,12 @@ static int __init ks_pcie_probe(struct platform_device *pdev)
pci->dev = dev;
pci->ops = &ks_pcie_dw_pcie_ops;
+ ret = of_property_read_u32(np, "num-viewport", &num_viewport);
+ if (ret < 0) {
+ dev_err(dev, "unable to read *num-viewport* property\n");
+ return ret;
+ }
+
ret = of_property_read_u32(np, "num-lanes", &num_lanes);
if (ret)
num_lanes = 1;
@@ -949,6 +957,7 @@ static int __init ks_pcie_probe(struct platform_device *pdev)
ks_pcie->pci = pci;
ks_pcie->link = link;
ks_pcie->num_lanes = num_lanes;
+ ks_pcie->num_viewport = num_viewport;
ks_pcie->phy = phy;
ret = ks_pcie_enable_phy(ks_pcie);
--
2.17.1
next prev parent reply other threads:[~2018-10-17 7:42 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-17 7:40 [PATCH v2 00/21] PCI: Cleanup pci-keystone driver Kishon Vijay Abraham I
2018-10-17 7:40 ` [PATCH v2 01/21] PCI: keystone: Use quirk to limit MRRS for K2G Kishon Vijay Abraham I
2018-10-17 7:40 ` [PATCH v2 02/21] PCI: keystone: Use quirk to set MRRS for PCI host bridge Kishon Vijay Abraham I
2018-10-17 7:40 ` [PATCH v2 03/21] PCI: keystone: Move dw_pcie_setup_rc out of ks_pcie_establish_link() Kishon Vijay Abraham I
2018-10-17 7:40 ` [PATCH v2 04/21] PCI: keystone: Do not initiate link training multiple times Kishon Vijay Abraham I
2018-10-17 7:40 ` [PATCH v2 05/21] PCI: keystone: Remove unused argument from ks_dw_pcie_host_init() Kishon Vijay Abraham I
2018-10-17 7:40 ` [PATCH v2 06/21] PCI: keystone: Merge pci-keystone-dw.c and pci-keystone.c Kishon Vijay Abraham I
2018-10-17 7:41 ` [PATCH v2 07/21] PCI: keystone: Remove redundant platform_set_drvdata Kishon Vijay Abraham I
2018-10-17 7:41 ` [PATCH v2 08/21] PCI: keystone: Use uniform function naming convention Kishon Vijay Abraham I
2018-10-17 7:41 ` [PATCH v2 09/21] dt-bindings: PCI: keystone: Add bindings to get device control module Kishon Vijay Abraham I
2018-10-17 7:41 ` [PATCH v2 10/21] PCI: keystone: Use SYSCON APIs to get device ID from " Kishon Vijay Abraham I
2018-10-17 7:41 ` [PATCH v2 11/21] PCI: keystone: Cleanup PHY handling Kishon Vijay Abraham I
2018-10-17 7:41 ` [PATCH v2 12/21] PCI: keystone: Invoke pm_runtime APIs to enable clock Kishon Vijay Abraham I
2018-10-17 7:41 ` [PATCH v2 13/21] PCI: keystone: Cleanup configuration space access Kishon Vijay Abraham I
2018-10-17 7:41 ` Kishon Vijay Abraham I [this message]
2018-10-17 7:41 ` [PATCH v2 15/21] PCI: keystone: Cleanup outbound window configuration Kishon Vijay Abraham I
2018-10-17 7:41 ` [PATCH v2 16/21] PCI: keystone: Cleanup set_dbi_mode and get_dbi_mode Kishon Vijay Abraham I
2018-10-17 7:41 ` [PATCH v2 17/21] PCI: keystone: Cleanup ks_pcie_link_up() Kishon Vijay Abraham I
2018-10-17 7:41 ` [PATCH v2 18/21] PCI: keystone: Use ERR_IRQ_STATUS instead of ERR_IRQ_STATUS_RAW to get interrupt status Kishon Vijay Abraham I
2018-10-17 7:41 ` [PATCH v2 19/21] PCI: keystone: Add debug error message for all errors Kishon Vijay Abraham I
2018-10-17 7:41 ` [PATCH v2 20/21] PCI: keystone: Reorder header file in alphabetical order Kishon Vijay Abraham I
2018-10-17 7:41 ` [PATCH v2 21/21] PCI: keystone: Cleanup macros defined in pci-keystone.c Kishon Vijay Abraham I
2018-10-17 11:12 ` [PATCH v2 00/21] PCI: Cleanup pci-keystone driver Lorenzo Pieralisi
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=20181017074114.28239-15-kishon@ti.com \
--to=kishon@ti.com \
--cc=bhelgaas@google.com \
--cc=devicetree@vger.kernel.org \
--cc=gustavo.pimentel@synopsys.com \
--cc=jingoohan1@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=m-karicheri2@ti.com \
--cc=robh+dt@kernel.org \
/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).