* [PATCH v8 2/3] of/pci: Add helper function to parse max-link-speed from dt
2016-10-18 1:45 [PATCH v8 1/3] Documentation/devicetree: Add new property to specify the max link speed Shawn Lin
@ 2016-10-18 1:45 ` Shawn Lin
2016-10-25 0:17 ` Rob Herring
2016-10-18 1:45 ` [PATCH v8 3/3] PCI: rockchip: Specify the link capability Shawn Lin
` (2 subsequent siblings)
3 siblings, 1 reply; 6+ messages in thread
From: Shawn Lin @ 2016-10-18 1:45 UTC (permalink / raw)
To: Bjorn Helgaas, Rob Herring
Cc: linux-pci, linux-rockchip, Wenrui Li, Brian Norris, devicetree,
Shawn Lin
This new helper function could be used by host drivers to
get the limitaion of max link speed provided by dt. If the
property isn't assigned or is invalid, it will return -EINVAL
to the caller.
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
---
Changes in v8: None
Changes in v7:
- rename the function name and using of_property_read_u32
suggested by Rob
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
drivers/of/of_pci.c | 21 +++++++++++++++++++++
include/linux/of_pci.h | 7 +++++++
2 files changed, 28 insertions(+)
diff --git a/drivers/of/of_pci.c b/drivers/of/of_pci.c
index 589b30c..0c566ca 100644
--- a/drivers/of/of_pci.c
+++ b/drivers/of/of_pci.c
@@ -120,6 +120,27 @@ int of_get_pci_domain_nr(struct device_node *node)
EXPORT_SYMBOL_GPL(of_get_pci_domain_nr);
/**
+ * This function will try to find the limitation of link speed by finding
+ * a property called "max-link-speed" of the given device node.
+ *
+ * @node: device tree node with the max link speed information
+ *
+ * Returns the associated max link speed from DT, or a negative value if the
+ * required property is not found or is invalid.
+ */
+int of_pci_get_max_link_speed(struct device_node *node)
+{
+ u32 max_link_speed;
+
+ if (of_property_read_u32(node, "max-link-speed", &max_link_speed) ||
+ max_link_speed > 4)
+ return -EINVAL;
+
+ return max_link_speed;
+}
+EXPORT_SYMBOL_GPL(of_pci_get_max_link_speed);
+
+/**
* of_pci_check_probe_only - Setup probe only mode if linux,pci-probe-only
* is present and valid
*/
diff --git a/include/linux/of_pci.h b/include/linux/of_pci.h
index b969e94..2e668e3 100644
--- a/include/linux/of_pci.h
+++ b/include/linux/of_pci.h
@@ -16,6 +16,7 @@ int of_pci_get_devfn(struct device_node *np);
int of_irq_parse_and_map_pci(const struct pci_dev *dev, u8 slot, u8 pin);
int of_pci_parse_bus_range(struct device_node *node, struct resource *res);
int of_get_pci_domain_nr(struct device_node *node);
+int of_pci_get_max_link_speed(struct device_node *node);
void of_pci_check_probe_only(void);
#else
static inline int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq)
@@ -52,6 +53,12 @@ of_get_pci_domain_nr(struct device_node *node)
return -1;
}
+static inline int
+of_pci_get_max_link_speed(struct device_node *node)
+{
+ return -EINVAL;
+}
+
static inline void of_pci_check_probe_only(void) { }
#endif
--
2.3.7
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v8 2/3] of/pci: Add helper function to parse max-link-speed from dt
2016-10-18 1:45 ` [PATCH v8 2/3] of/pci: Add helper function to parse max-link-speed from dt Shawn Lin
@ 2016-10-25 0:17 ` Rob Herring
0 siblings, 0 replies; 6+ messages in thread
From: Rob Herring @ 2016-10-25 0:17 UTC (permalink / raw)
To: Shawn Lin
Cc: Bjorn Helgaas, linux-pci@vger.kernel.org,
open list:ARM/Rockchip SoC..., Wenrui Li, Brian Norris,
devicetree@vger.kernel.org
On Mon, Oct 17, 2016 at 8:45 PM, Shawn Lin <shawn.lin@rock-chips.com> wrote:
> This new helper function could be used by host drivers to
> get the limitaion of max link speed provided by dt. If the
> property isn't assigned or is invalid, it will return -EINVAL
> to the caller.
>
> Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Acked-by: Rob Herring <robh@kernel.org>
Rob
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v8 3/3] PCI: rockchip: Specify the link capability
2016-10-18 1:45 [PATCH v8 1/3] Documentation/devicetree: Add new property to specify the max link speed Shawn Lin
2016-10-18 1:45 ` [PATCH v8 2/3] of/pci: Add helper function to parse max-link-speed from dt Shawn Lin
@ 2016-10-18 1:45 ` Shawn Lin
2016-10-18 16:41 ` [PATCH v8 1/3] Documentation/devicetree: Add new property to specify the max link speed Rob Herring
2016-11-11 22:24 ` Bjorn Helgaas
3 siblings, 0 replies; 6+ messages in thread
From: Shawn Lin @ 2016-10-18 1:45 UTC (permalink / raw)
To: Bjorn Helgaas, Rob Herring
Cc: linux-pci, linux-rockchip, Wenrui Li, Brian Norris, devicetree,
Shawn Lin
rk3399 supports PCIe 2.x link speeds marginally at best, and on some
boards, the link won't train at 5 GT/s at all. Rather than sacrifice
500ms waiting for training that will never happen, let's use the helper
function, of_pci_get_max_link_speed, to get the max link speed from DT
and specify link capability.
Signed-off-by: Brian Norris <briannorris@chromium.org>
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
---
Changes in v8:
- rebase on next branch
Changes in v7:
- rebase on Bjorn's host-rockcip branch again since it isn't applied
cleanly after the cleanup
- call new function, of_pci_get_max_link_speed.
Changes in v6:
- user helper function of_get_pci_max_link_speed and use gen2 by default
if finding any errors from of_get_pci_max_link_speed. It could be
backward compatibe to the old dtb. (Suggested by Rob)
Changes in v5:
- rebase the code since it isn't cleanly applied after Bjorn's cleanup
Changes in v4:
- define link_gen as u32
- elaborate more for rockchip,max-link-speed on doc
Changes in v3:
- Cast a warning for invalid max link speed and use gen1 for it.
That looks better than v2. (Suggested by Brian)
Changes in v2:
- rename the property to rockchip,max-link-speed according to
Bjorn's recommendation and take some bits from imx6q-pcie to
make this requirement more consisent.
drivers/pci/host/pcie-rockchip.c | 60 +++++++++++++++++++++++++---------------
1 file changed, 37 insertions(+), 23 deletions(-)
diff --git a/drivers/pci/host/pcie-rockchip.c b/drivers/pci/host/pcie-rockchip.c
index e0b22da..1ba676f 100644
--- a/drivers/pci/host/pcie-rockchip.c
+++ b/drivers/pci/host/pcie-rockchip.c
@@ -53,6 +53,7 @@
#define PCIE_CLIENT_ARI_ENABLE HIWORD_UPDATE_BIT(0x0008)
#define PCIE_CLIENT_CONF_LANE_NUM(x) HIWORD_UPDATE(0x0030, ENCODE_LANES(x))
#define PCIE_CLIENT_MODE_RC HIWORD_UPDATE_BIT(0x0040)
+#define PCIE_CLIENT_GEN_SEL_1 HIWORD_UPDATE(0x0080, 0)
#define PCIE_CLIENT_GEN_SEL_2 HIWORD_UPDATE_BIT(0x0080)
#define PCIE_CLIENT_BASIC_STATUS1 (PCIE_CLIENT_BASE + 0x48)
#define PCIE_CLIENT_LINK_STATUS_UP 0x00300000
@@ -200,6 +201,7 @@ struct rockchip_pcie {
struct gpio_desc *ep_gpio;
u32 lanes;
u8 root_bus_nr;
+ int link_gen;
struct device *dev;
struct irq_domain *irq_domain;
};
@@ -438,14 +440,20 @@ static int rockchip_pcie_init_port(struct rockchip_pcie *rockchip)
return err;
}
+ if (rockchip->link_gen == 2)
+ rockchip_pcie_write(rockchip, PCIE_CLIENT_GEN_SEL_2,
+ PCIE_CLIENT_CONFIG);
+ else
+ rockchip_pcie_write(rockchip, PCIE_CLIENT_GEN_SEL_1,
+ PCIE_CLIENT_CONFIG);
+
rockchip_pcie_write(rockchip,
PCIE_CLIENT_CONF_ENABLE |
PCIE_CLIENT_LINK_TRAIN_ENABLE |
PCIE_CLIENT_ARI_ENABLE |
PCIE_CLIENT_CONF_LANE_NUM(rockchip->lanes) |
- PCIE_CLIENT_MODE_RC |
- PCIE_CLIENT_GEN_SEL_2,
- PCIE_CLIENT_CONFIG);
+ PCIE_CLIENT_MODE_RC,
+ PCIE_CLIENT_CONFIG);
err = phy_power_on(rockchip->phy);
if (err) {
@@ -522,29 +530,31 @@ static int rockchip_pcie_init_port(struct rockchip_pcie *rockchip)
msleep(20);
}
- /*
- * Enable retrain for gen2. This should be configured only after
- * gen1 finished.
- */
- status = rockchip_pcie_read(rockchip, PCIE_RC_CONFIG_LCS);
- status |= PCIE_RC_CONFIG_LCS_RETRAIN_LINK;
- rockchip_pcie_write(rockchip, status, PCIE_RC_CONFIG_LCS);
+ if (rockchip->link_gen == 2) {
+ /*
+ * Enable retrain for gen2. This should be configured only after
+ * gen1 finished.
+ */
+ status = rockchip_pcie_read(rockchip, PCIE_RC_CONFIG_LCS);
+ status |= PCIE_RC_CONFIG_LCS_RETRAIN_LINK;
+ rockchip_pcie_write(rockchip, status, PCIE_RC_CONFIG_LCS);
+
+ timeout = jiffies + msecs_to_jiffies(500);
+ for (;;) {
+ status = rockchip_pcie_read(rockchip, PCIE_CORE_CTRL);
+ if ((status & PCIE_CORE_PL_CONF_SPEED_MASK) ==
+ PCIE_CORE_PL_CONF_SPEED_5G) {
+ dev_dbg(dev, "PCIe link training gen2 pass!\n");
+ break;
+ }
- timeout = jiffies + msecs_to_jiffies(500);
- for (;;) {
- status = rockchip_pcie_read(rockchip, PCIE_CORE_CTRL);
- if ((status & PCIE_CORE_PL_CONF_SPEED_MASK) ==
- PCIE_CORE_PL_CONF_SPEED_5G) {
- dev_dbg(dev, "PCIe link training gen2 pass!\n");
- break;
- }
+ if (time_after(jiffies, timeout)) {
+ dev_dbg(dev, "PCIe link training gen2 timeout, fall back to gen1!\n");
+ break;
+ }
- if (time_after(jiffies, timeout)) {
- dev_dbg(dev, "PCIe link training gen2 timeout, fall back to gen1!\n");
- break;
+ msleep(20);
}
-
- msleep(20);
}
/* Check the final link width from negotiated lane counter from MGMT */
@@ -753,6 +763,10 @@ static int rockchip_pcie_parse_dt(struct rockchip_pcie *rockchip)
rockchip->lanes = 1;
}
+ rockchip->link_gen = of_pci_get_max_link_speed(node);
+ if (rockchip->link_gen < 0 || rockchip->link_gen > 2)
+ rockchip->link_gen = 2;
+
rockchip->core_rst = devm_reset_control_get(dev, "core");
if (IS_ERR(rockchip->core_rst)) {
if (PTR_ERR(rockchip->core_rst) != -EPROBE_DEFER)
--
2.3.7
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v8 1/3] Documentation/devicetree: Add new property to specify the max link speed
2016-10-18 1:45 [PATCH v8 1/3] Documentation/devicetree: Add new property to specify the max link speed Shawn Lin
2016-10-18 1:45 ` [PATCH v8 2/3] of/pci: Add helper function to parse max-link-speed from dt Shawn Lin
2016-10-18 1:45 ` [PATCH v8 3/3] PCI: rockchip: Specify the link capability Shawn Lin
@ 2016-10-18 16:41 ` Rob Herring
2016-11-11 22:24 ` Bjorn Helgaas
3 siblings, 0 replies; 6+ messages in thread
From: Rob Herring @ 2016-10-18 16:41 UTC (permalink / raw)
To: Shawn Lin
Cc: Bjorn Helgaas, linux-pci, linux-rockchip, Wenrui Li, Brian Norris,
devicetree
On Tue, Oct 18, 2016 at 09:45:08AM +0800, Shawn Lin wrote:
> Some of the host drivers have the requirement of knowing whether the
> EP would never train at some link speed at all. For instance, on some
> boards, the link won't train at 5 GT/s but the host driver still sacrifice
> some cycle to wait for the resule of training at 5 GT/s as the host could
> actually support 5 GT/s. So we could parse this new property and make the
> host drivers be aware of these cases.
>
> Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
> ---
>
> Changes in v8: None
> Changes in v7: None
> Changes in v6: None
> Changes in v5: None
> Changes in v4: None
> Changes in v3: None
> Changes in v2: None
Humm, either you are respinning versions too quickly or failed to copy
the DT list.
>
> Documentation/devicetree/bindings/pci/pci.txt | 6 ++++++
> 1 file changed, 6 insertions(+)
Acked-by: Rob Herring <robh@kernel.org>
>
> diff --git a/Documentation/devicetree/bindings/pci/pci.txt b/Documentation/devicetree/bindings/pci/pci.txt
> index 08dcfad..e7d97a3 100644
> --- a/Documentation/devicetree/bindings/pci/pci.txt
> +++ b/Documentation/devicetree/bindings/pci/pci.txt
> @@ -18,3 +18,9 @@ driver implementation may support the following properties:
> host bridges in the system, otherwise potentially conflicting domain numbers
> may be assigned to root buses behind different host bridges. The domain
> number for each host bridge in the system must be unique.
> +- max-link-speed:
> + If present this property specifies PCI gen for link capability. The host drivers
> + could add this as a strategy to avoid unnecessary operation for unsupported
> + link speed, for instance, trying to do training for unsupported link speed, etc.
> + Must be '4' for gen4, '3' for gen3, '2' for gen2, and '1' for gen1. Any other
> + values are invalid.
> --
> 2.3.7
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v8 1/3] Documentation/devicetree: Add new property to specify the max link speed
2016-10-18 1:45 [PATCH v8 1/3] Documentation/devicetree: Add new property to specify the max link speed Shawn Lin
` (2 preceding siblings ...)
2016-10-18 16:41 ` [PATCH v8 1/3] Documentation/devicetree: Add new property to specify the max link speed Rob Herring
@ 2016-11-11 22:24 ` Bjorn Helgaas
3 siblings, 0 replies; 6+ messages in thread
From: Bjorn Helgaas @ 2016-11-11 22:24 UTC (permalink / raw)
To: Shawn Lin
Cc: Bjorn Helgaas, Rob Herring, linux-pci, linux-rockchip, Wenrui Li,
Brian Norris, devicetree
On Tue, Oct 18, 2016 at 09:45:08AM +0800, Shawn Lin wrote:
> Some of the host drivers have the requirement of knowing whether the
> EP would never train at some link speed at all. For instance, on some
> boards, the link won't train at 5 GT/s but the host driver still sacrifice
> some cycle to wait for the resule of training at 5 GT/s as the host could
> actually support 5 GT/s. So we could parse this new property and make the
> host drivers be aware of these cases.
>
> Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Applied all three, with Rob's acks on the first two, to pci/host-rockchip
for v4.10, thanks!
> ---
>
> Changes in v8: None
> Changes in v7: None
> Changes in v6: None
> Changes in v5: None
> Changes in v4: None
> Changes in v3: None
> Changes in v2: None
>
> Documentation/devicetree/bindings/pci/pci.txt | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/pci/pci.txt b/Documentation/devicetree/bindings/pci/pci.txt
> index 08dcfad..e7d97a3 100644
> --- a/Documentation/devicetree/bindings/pci/pci.txt
> +++ b/Documentation/devicetree/bindings/pci/pci.txt
> @@ -18,3 +18,9 @@ driver implementation may support the following properties:
> host bridges in the system, otherwise potentially conflicting domain numbers
> may be assigned to root buses behind different host bridges. The domain
> number for each host bridge in the system must be unique.
> +- max-link-speed:
> + If present this property specifies PCI gen for link capability. The host drivers
> + could add this as a strategy to avoid unnecessary operation for unsupported
> + link speed, for instance, trying to do training for unsupported link speed, etc.
> + Must be '4' for gen4, '3' for gen3, '2' for gen2, and '1' for gen1. Any other
> + values are invalid.
> --
> 2.3.7
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 6+ messages in thread