From: Bjorn Helgaas <bhelgaas@google.com>
To: Joao Pinto <Joao.Pinto@synopsys.com>
Cc: mark.rutland@arm.com, Alexey.Brodkin@synopsys.com, arnd@arndb.de,
pawel.moll@arm.com, ijc+devicetree@hellion.org.uk,
linux-pci@vger.kernel.org, Vineet.Gupta1@synopsys.com,
Pratyush Anand <pratyush.anand@gmail.com>,
linux-kernel@vger.kernel.org, CARLOS.PALMINHA@synopsys.com,
robh+dt@kernel.org, Murali Karicheri <m-karicheri2@ti.com>,
galak@codeaurora.org, Jingoo Han <jingoohan1@gmail.com>,
linux-snps-arc@lists.infradead.org
Subject: [PATCH v11 3/4] PCI: designware: Add default link up check if sub-driver doesn't override
Date: Fri, 26 Feb 2016 10:30:13 -0600 [thread overview]
Message-ID: <20160226163013.11964.84849.stgit@bhelgaas-glaptop2.roam.corp.google.com> (raw)
In-Reply-To: <20160226162554.11964.96983.stgit@bhelgaas-glaptop2.roam.corp.google.com>
From: Joao Pinto <Joao.Pinto@synopsys.com>
Add a default DesignWare "link_up" test for use when a sub-driver doesn't
supply its own pcie_host_ops.link_up() method.
[bhelgaas: changelog, split into its own patch]
Signed-off-by: Joao Pinto <jpinto@synopsys.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/host/pcie-designware.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c
index 1fd3ad3..fb1c16f7 100644
--- a/drivers/pci/host/pcie-designware.c
+++ b/drivers/pci/host/pcie-designware.c
@@ -70,6 +70,11 @@
#define PCIE_ATU_FUNC(x) (((x) & 0x7) << 16)
#define PCIE_ATU_UPPER_TARGET 0x91C
+/* PCIe Port Logic registers */
+#define PLR_OFFSET 0x700
+#define PCIE_PHY_DEBUG_R1 (PLR_OFFSET + 0x2c)
+#define PCIE_PHY_DEBUG_R1_LINK_UP 0x00000010
+
static struct pci_ops dw_pcie_ops;
int dw_pcie_cfg_read(void __iomem *addr, int size, u32 *val)
@@ -401,10 +406,13 @@ int dw_pcie_wait_for_link(struct pcie_port *pp)
int dw_pcie_link_up(struct pcie_port *pp)
{
+ u32 val;
+
if (pp->ops->link_up)
return pp->ops->link_up(pp);
- return 0;
+ val = readl(pp->dbi_base + PCIE_PHY_DEBUG_R1);
+ return val & PCIE_PHY_DEBUG_R1_LINK_UP;
}
static int dw_pcie_msi_map(struct irq_domain *domain, unsigned int irq,
next prev parent reply other threads:[~2016-02-26 16:30 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-26 16:29 [PATCH v11 0/4] ARC: Add PCI support Bjorn Helgaas
2016-02-26 16:29 ` [PATCH v11 1/4] " Bjorn Helgaas
2016-02-26 16:30 ` [PATCH v11 2/4] PCI: designware: Add generic dw_pcie_wait_for_link() Bjorn Helgaas
2016-02-26 17:24 ` Pratyush Anand
2016-02-26 16:30 ` Bjorn Helgaas [this message]
2016-02-26 17:29 ` [PATCH v11 3/4] PCI: designware: Add default link up check if sub-driver doesn't override Pratyush Anand
2016-02-26 16:30 ` [PATCH v11 4/4] PCI: designware: Add driver for prototyping kits based on ARC SDP Bjorn Helgaas
2016-02-26 17:35 ` Pratyush Anand
2016-02-29 18:30 ` [PATCH v11 0/4] ARC: Add PCI support Joao Pinto
2016-02-29 19:22 ` Bjorn Helgaas
2016-03-01 10:57 ` Joao Pinto
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=20160226163013.11964.84849.stgit@bhelgaas-glaptop2.roam.corp.google.com \
--to=bhelgaas@google.com \
--cc=Alexey.Brodkin@synopsys.com \
--cc=CARLOS.PALMINHA@synopsys.com \
--cc=Joao.Pinto@synopsys.com \
--cc=Vineet.Gupta1@synopsys.com \
--cc=arnd@arndb.de \
--cc=galak@codeaurora.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=jingoohan1@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-snps-arc@lists.infradead.org \
--cc=m-karicheri2@ti.com \
--cc=mark.rutland@arm.com \
--cc=pawel.moll@arm.com \
--cc=pratyush.anand@gmail.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).