linux-kernel - [PATCH v10 3/4] PCI: designware: Add default link up check if sub-driver doesn't override

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20160225173743.2103.52643.stgit@bhelgaas-glaptop2.roam.corp.google.com>
Date:	Thu, 25 Feb 2016 11:37:43 -0600
From:	Bjorn Helgaas <bhelgaas@...gle.com>
To:	Joao Pinto <Joao.Pinto@...opsys.com>
Cc:	mark.rutland@....com, Alexey.Brodkin@...opsys.com, arnd@...db.de,
	pawel.moll@....com, ijc+devicetree@...lion.org.uk,
	linux-pci@...r.kernel.org, Vineet.Gupta1@...opsys.com,
	Pratyush Anand <pratyush.anand@...il.com>,
	linux-kernel@...r.kernel.org, CARLOS.PALMINHA@...opsys.com,
	robh+dt@...nel.org, Murali Karicheri <m-karicheri2@...com>,
	galak@...eaurora.org, Jingoo Han <jingoohan1@...il.com>,
	linux-snps-arc@...ts.infradead.org
Subject: [PATCH v10 3/4] PCI: designware: Add default link up check if
 sub-driver doesn't override

From: Joao Pinto <Joao.Pinto@...opsys.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@...opsys.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@...gle.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 4fff2d2..d6013a2 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,