From: Manikanta Maddireddy <mmaddireddy@nvidia.com>
To: <thierry.reding@gmail.com>, <bhelgaas@google.com>,
<robh+dt@kernel.org>, <mark.rutland@arm.com>,
<jonathanh@nvidia.com>, <lorenzo.pieralisi@arm.com>,
<vidyas@nvidia.com>
Cc: <linux-tegra@vger.kernel.org>, <linux-pci@vger.kernel.org>,
<devicetree@vger.kernel.org>,
Manikanta Maddireddy <mmaddireddy@nvidia.com>
Subject: [PATCH V2 21/28] PCI: tegra: Add AFI_PEX2_CTRL reg offset as part of soc struct
Date: Tue, 23 Apr 2019 14:58:18 +0530 [thread overview]
Message-ID: <20190423092825.759-22-mmaddireddy@nvidia.com> (raw)
In-Reply-To: <20190423092825.759-1-mmaddireddy@nvidia.com>
Tegra186 and Tegra30 have three PCIe root ports. AFI_PEX2_CTRL register
is defined for third root port. Offset of this register in Tegra186 is
different from Tegra30, so add offset as part of soc data structure.
Signed-off-by: Manikanta Maddireddy <mmaddireddy@nvidia.com>
Acked-by: Thierry Reding <treding@nvidia.com>
---
V2: No change
drivers/pci/controller/pci-tegra.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/pci/controller/pci-tegra.c b/drivers/pci/controller/pci-tegra.c
index edc6a0f27397..8ba71e314b1b 100644
--- a/drivers/pci/controller/pci-tegra.c
+++ b/drivers/pci/controller/pci-tegra.c
@@ -169,7 +169,6 @@
#define AFI_PEX0_CTRL 0x110
#define AFI_PEX1_CTRL 0x118
-#define AFI_PEX2_CTRL 0x128
#define AFI_PEX_CTRL_RST (1 << 0)
#define AFI_PEX_CTRL_CLKREQ_EN (1 << 1)
#define AFI_PEX_CTRL_REFCLK_EN (1 << 3)
@@ -308,6 +307,7 @@ struct tegra_pcie_soc {
unsigned int num_ports;
const struct tegra_pcie_port_soc *ports;
unsigned int msi_base_shift;
+ unsigned long afi_pex2_ctrl;
u32 pads_pll_ctl;
u32 tx_ref_sel;
u32 pads_refclk_cfg0;
@@ -518,6 +518,7 @@ static struct pci_ops tegra_pcie_ops = {
static unsigned long tegra_pcie_port_get_pex_ctrl(struct tegra_pcie_port *port)
{
+ const struct tegra_pcie_soc *soc = port->pcie->soc;
unsigned long ret = 0;
switch (port->index) {
@@ -530,7 +531,7 @@ static unsigned long tegra_pcie_port_get_pex_ctrl(struct tegra_pcie_port *port)
break;
case 2:
- ret = AFI_PEX2_CTRL;
+ ret = soc->afi_pex2_ctrl;
break;
}
@@ -2432,6 +2433,7 @@ static const struct tegra_pcie_soc tegra20_pcie = {
.num_ports = 2,
.ports = tegra20_pcie_ports,
.msi_base_shift = 0,
+ .afi_pex2_ctrl = 0x128,
.pads_pll_ctl = PADS_PLL_CTL_TEGRA20,
.tx_ref_sel = PADS_PLL_CTL_TXCLKREF_DIV10,
.pads_refclk_cfg0 = 0xfa5cfa5c,
@@ -2545,6 +2547,7 @@ static const struct tegra_pcie_soc tegra186_pcie = {
.num_ports = 3,
.ports = tegra186_pcie_ports,
.msi_base_shift = 8,
+ .afi_pex2_ctrl = 0x19c,
.pads_pll_ctl = PADS_PLL_CTL_TEGRA30,
.tx_ref_sel = PADS_PLL_CTL_TXCLKREF_BUF_EN,
.pads_refclk_cfg0 = 0x80b880b8,
--
2.17.1
next prev parent reply other threads:[~2019-04-23 9:30 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-23 9:27 [PATCH V2 00/28] Enable Tegra PCIe root port features Manikanta Maddireddy
2019-04-23 9:27 ` [PATCH V2 01/28] soc/tegra: pmc: Export tegra_powergate_power_on() Manikanta Maddireddy
2019-05-09 14:02 ` Thierry Reding
2019-04-23 9:27 ` [PATCH V2 02/28] PCI: tegra: Handle failure cases in tegra_pcie_power_on() Manikanta Maddireddy
2019-05-09 14:04 ` Thierry Reding
2019-04-23 9:28 ` [PATCH V2 03/28] PCI: tegra: Rearrange Tegra PCIe driver functions Manikanta Maddireddy
2019-05-09 14:05 ` Thierry Reding
2019-04-23 9:28 ` [PATCH V2 04/28] PCI: tegra: Disable PCIe interrupts in runtime suspend Manikanta Maddireddy
2019-05-09 14:10 ` Thierry Reding
2019-05-09 15:57 ` Manikanta Maddireddy
2019-04-23 9:28 ` [PATCH V2 05/28] PCI: tegra: Fix PCIe host power up sequence Manikanta Maddireddy
2019-05-09 14:14 ` Thierry Reding
2019-04-23 9:28 ` [PATCH V2 06/28] PCI: tegra: Add PCIe Gen2 link speed support Manikanta Maddireddy
2019-05-09 14:17 ` Thierry Reding
2019-04-23 9:28 ` [PATCH V2 07/28] PCI: tegra: Advertise PCIe Advanced Error Reporting (AER) capability Manikanta Maddireddy
2019-05-09 14:17 ` Thierry Reding
2019-04-23 9:28 ` [PATCH V2 08/28] PCI: tegra: Program UPHY electrical settings for Tegra210 Manikanta Maddireddy
2019-05-09 14:18 ` Thierry Reding
2019-04-23 9:28 ` [PATCH V2 09/28] PCI: tegra: Enable opportunistic UpdateFC and ACK Manikanta Maddireddy
2019-04-23 9:28 ` [PATCH V2 10/28] PCI: tegra: Disable AFI dynamic clock gating Manikanta Maddireddy
2019-04-23 9:28 ` [PATCH V2 11/28] PCI: tegra: Process pending DLL transactions before entering L1 or L2 Manikanta Maddireddy
2019-04-23 9:28 ` [PATCH V2 12/28] PCI: tegra: Enable PCIe xclk clock clamping Manikanta Maddireddy
2019-05-09 14:20 ` Thierry Reding
2019-04-23 9:28 ` [PATCH V2 13/28] PCI: tegra: Increase the deskew retry time Manikanta Maddireddy
2019-05-09 14:20 ` Thierry Reding
2019-04-23 9:28 ` [PATCH V2 14/28] PCI: tegra: Add SW fixup for RAW violations Manikanta Maddireddy
2019-05-09 14:21 ` Thierry Reding
2019-04-23 9:28 ` [PATCH V2 15/28] PCI: tegra: Update flow control timer frequency in Tegra210 Manikanta Maddireddy
2019-05-09 14:22 ` Thierry Reding
2019-04-23 9:28 ` [PATCH V2 16/28] PCI: tegra: Set target speed as Gen1 before starting LTSSM Manikanta Maddireddy
2019-05-09 14:23 ` Thierry Reding
2019-04-23 9:28 ` [PATCH V2 17/28] PCI: tegra: Fix PLLE power down issue due to CLKREQ# signal Manikanta Maddireddy
2019-05-09 14:24 ` Thierry Reding
2019-04-23 9:28 ` [PATCH V2 18/28] PCI: tegra: Program AFI_CACHE* registers only for Tegra20 Manikanta Maddireddy
2019-04-26 15:32 ` Thierry Reding
2019-04-29 9:30 ` Manikanta Maddireddy
2019-05-09 14:25 ` Thierry Reding
2019-04-23 9:28 ` [PATCH V2 19/28] PCI: tegra: Change PRSNT_SENSE irq log to debug Manikanta Maddireddy
2019-05-09 14:27 ` Thierry Reding
2019-04-23 9:28 ` [PATCH V2 20/28] PCI: tegra: Use legacy irq for port service drivers Manikanta Maddireddy
2019-05-09 14:29 ` Thierry Reding
2019-04-23 9:28 ` Manikanta Maddireddy [this message]
2019-04-23 9:28 ` [PATCH V2 22/28] PCI: tegra: Access endpoint config only if PCIe link is up Manikanta Maddireddy
2019-04-23 20:24 ` Bjorn Helgaas
2019-04-24 3:51 ` Manikanta Maddireddy
2019-05-09 14:34 ` Thierry Reding
2019-04-23 9:28 ` [PATCH V2 23/28] dt-bindings: pci: tegra: Document PCIe DPD pinctrl optional prop Manikanta Maddireddy
2019-05-01 19:52 ` Rob Herring
2019-05-09 14:34 ` Thierry Reding
2019-04-23 9:28 ` [PATCH V2 24/28] arm64: tegra: Add PEX DPD states as pinctrl properties Manikanta Maddireddy
2019-05-09 14:38 ` Thierry Reding
2019-04-23 9:28 ` [PATCH V2 25/28] PCI: tegra: Put PEX CLK & BIAS pads in DPD mode Manikanta Maddireddy
2019-05-09 14:35 ` Thierry Reding
2019-04-23 9:28 ` [PATCH V2 26/28] dt-bindings: pci: tegra: Document reset-gpio optional prop Manikanta Maddireddy
2019-05-01 19:58 ` Rob Herring
2019-05-09 14:37 ` Thierry Reding
2019-05-09 14:37 ` Thierry Reding
2019-04-23 9:28 ` [PATCH V2 27/28] PCI: tegra: Add support for GPIO based PCIe reset Manikanta Maddireddy
2019-05-09 14:45 ` Thierry Reding
2019-04-23 9:28 ` [PATCH V2 28/28] PCI: tegra: Change link retry log level to info Manikanta Maddireddy
2019-05-09 14:47 ` Thierry Reding
2019-04-26 13:22 ` [PATCH V2 00/28] Enable Tegra PCIe root port features Thierry Reding
2019-05-01 11:13 ` Lorenzo Pieralisi
2019-05-01 11:43 ` Manikanta Maddireddy
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=20190423092825.759-22-mmaddireddy@nvidia.com \
--to=mmaddireddy@nvidia.com \
--cc=bhelgaas@google.com \
--cc=devicetree@vger.kernel.org \
--cc=jonathanh@nvidia.com \
--cc=linux-pci@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--cc=thierry.reding@gmail.com \
--cc=vidyas@nvidia.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).