From: "Pali Rohár" <pali@kernel.org>
To: "Thomas Petazzoni" <thomas.petazzoni@bootlin.com>,
"Lorenzo Pieralisi" <lorenzo.pieralisi@arm.com>,
"Rob Herring" <robh@kernel.org>,
"Krzysztof Wilczyński" <kw@linux.com>,
"Bjorn Helgaas" <bhelgaas@google.com>,
"Marek Behún" <kabel@kernel.org>
Cc: linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 11/11] PCI: mvebu: Fix reporting Data Link Layer Link Active on emulated bridge
Date: Tue, 4 Jan 2022 16:35:29 +0100 [thread overview]
Message-ID: <20220104153529.31647-12-pali@kernel.org> (raw)
In-Reply-To: <20220104153529.31647-1-pali@kernel.org>
Add support for reporting PCI_EXP_LNKSTA_DLLLA bit in Link Control register
on emulated bridge via PCIE_STAT_OFF reg. Function mvebu_pcie_link_up()
already parses this register and returns if Data Link is Active or not.
Also correctly indicate DLLLA capability via PCI_EXP_LNKCAP_DLLLARC bit in
Link Control Capability register which is required for reporting DLLLA bit.
Signed-off-by: Pali Rohár <pali@kernel.org>
---
drivers/pci/controller/pci-mvebu.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/pci/controller/pci-mvebu.c b/drivers/pci/controller/pci-mvebu.c
index dffa330de174..a075ba26cff1 100644
--- a/drivers/pci/controller/pci-mvebu.c
+++ b/drivers/pci/controller/pci-mvebu.c
@@ -548,13 +548,18 @@ mvebu_pci_bridge_emul_pcie_conf_read(struct pci_bridge_emul *bridge,
/*
* PCIe requires that the Clock Power Management capability bit
* is hard-wired to zero for downstream ports but HW returns 1.
+ * Additionally enable Data Link Layer Link Active Reporting
+ * Capable bit as DL_Active indication is provided too.
*/
- *value = mvebu_readl(port, PCIE_CAP_PCIEXP + PCI_EXP_LNKCAP) &
- ~PCI_EXP_LNKCAP_CLKPM;
+ *value = (mvebu_readl(port, PCIE_CAP_PCIEXP + PCI_EXP_LNKCAP) &
+ ~PCI_EXP_LNKCAP_CLKPM) | PCI_EXP_LNKCAP_DLLLARC;
break;
case PCI_EXP_LNKCTL:
- *value = mvebu_readl(port, PCIE_CAP_PCIEXP + PCI_EXP_LNKCTL);
+ /* DL_Active indication is provided via PCIE_STAT_OFF */
+ *value = mvebu_readl(port, PCIE_CAP_PCIEXP + PCI_EXP_LNKCTL) |
+ (mvebu_pcie_link_up(port) ?
+ (PCI_EXP_LNKSTA_DLLLA << 16) : 0);
break;
case PCI_EXP_SLTCTL:
--
2.20.1
next prev parent reply other threads:[~2022-01-04 15:38 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-21 14:14 [PATCH 00/11] PCI: Small improvements for pci-bridge-emul and mvebu Pali Rohár
2021-12-21 14:14 ` [PATCH 01/11] MAINTAINERS: Add Pali Rohár as pci-mvebu.c maintainer Pali Rohár
2021-12-21 15:39 ` Thomas Petazzoni
2021-12-21 14:14 ` [PATCH 02/11] PCI: pci-bridge-emul: Make struct pci_bridge_emul_ops as const Pali Rohár
2021-12-21 15:39 ` Thomas Petazzoni
2021-12-21 14:14 ` [PATCH 03/11] PCI: pci-bridge-emul: Rename PCI_BRIDGE_EMUL_NO_PREFETCHABLE_BAR to PCI_BRIDGE_EMUL_NO_PREFMEM_FORWARD Pali Rohár
2021-12-21 15:41 ` Thomas Petazzoni
2021-12-21 14:14 ` [PATCH 04/11] PCI: pci-bridge-emul: Add support for new flag PCI_BRIDGE_EMUL_NO_IO_FORWARD Pali Rohár
2021-12-21 15:42 ` Thomas Petazzoni
2021-12-21 14:14 ` [PATCH 05/11] PCI: mvebu: Add help string for CONFIG_PCI_MVEBU option Pali Rohár
2021-12-21 15:43 ` Thomas Petazzoni
2021-12-21 14:14 ` [PATCH 06/11] PCI: mvebu: Remove duplicate nports assignment Pali Rohár
2021-12-21 15:44 ` Thomas Petazzoni
2021-12-21 14:14 ` [PATCH 07/11] PCI: mvebu: Set PCI_BRIDGE_EMUL_NO_IO_FORWARD when IO is unsupported Pali Rohár
2021-12-21 14:14 ` [PATCH 08/11] PCI: mvebu: Properly initialize vendor, device and revision of emulated bridge Pali Rohár
2021-12-21 14:14 ` [PATCH 09/11] PCI: mvebu: Update comment for PCI_EXP_LNKCAP register on " Pali Rohár
2021-12-21 14:14 ` [PATCH 10/11] PCI: mvebu: Update comment for PCI_EXP_LNKCTL " Pali Rohár
2021-12-21 14:14 ` [PATCH 11/11] PCI: mvebu: Fix reporting Data Link Layer Link Active " Pali Rohár
2022-01-04 15:35 ` [PATCH v2 00/11] PCI: Small improvements for pci-bridge-emul and mvebu Pali Rohár
2022-01-04 15:35 ` [PATCH v2 01/11] MAINTAINERS: Add Pali Rohár as pci-mvebu.c maintainer Pali Rohár
2022-01-04 15:35 ` [PATCH v2 02/11] PCI: pci-bridge-emul: Make struct pci_bridge_emul_ops as const Pali Rohár
2022-01-04 15:35 ` [PATCH v2 03/11] PCI: pci-bridge-emul: Rename PCI_BRIDGE_EMUL_NO_PREFETCHABLE_BAR to PCI_BRIDGE_EMUL_NO_PREFMEM_FORWARD Pali Rohár
2022-01-04 15:35 ` [PATCH v2 04/11] PCI: pci-bridge-emul: Add support for new flag PCI_BRIDGE_EMUL_NO_IO_FORWARD Pali Rohár
2022-01-04 15:35 ` [PATCH v2 05/11] PCI: mvebu: Add help string for CONFIG_PCI_MVEBU option Pali Rohár
2022-01-04 15:35 ` [PATCH v2 06/11] PCI: mvebu: Remove duplicate nports assignment Pali Rohár
2022-01-04 15:35 ` [PATCH v2 07/11] PCI: mvebu: Set PCI_BRIDGE_EMUL_NO_IO_FORWARD when IO is unsupported Pali Rohár
2022-01-04 15:35 ` [PATCH v2 08/11] PCI: mvebu: Properly initialize vendor, device and revision of emulated bridge Pali Rohár
2022-01-04 15:35 ` [PATCH v2 09/11] PCI: mvebu: Update comment for PCI_EXP_LNKCAP register on " Pali Rohár
2022-01-04 15:35 ` [PATCH v2 10/11] PCI: mvebu: Update comment for PCI_EXP_LNKCTL " Pali Rohár
2022-01-04 15:35 ` Pali Rohár [this message]
2022-01-20 9:01 ` [PATCH v2 00/11] PCI: Small improvements for pci-bridge-emul and mvebu Pali Rohár
2022-01-20 16:31 ` Rob Herring
2022-02-03 10:56 ` 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=20220104153529.31647-12-pali@kernel.org \
--to=pali@kernel.org \
--cc=bhelgaas@google.com \
--cc=kabel@kernel.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=lorenzo.pieralisi@arm.com \
--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).