Skip to content
Snippets Groups Projects
Unverified Commit 130e9cb3 authored by AngeloGioacchino Del Regno's avatar AngeloGioacchino Del Regno
Browse files

PCI: mediatek-gen3: Add support for restricting link width


Add support for restricting the port's link width by specifying
the num-lanes devicetree property in the PCIe node.

The setting is done in the GEN_SETTINGS register (in the driver
named as PCIE_SETTING_REG), where each set bit in [11:8] activates
a set of lanes (from bits 11 to 8 respectively, x16/x8/x4/x2).

Signed-off-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
parent 65529156
No related branches found
No related tags found
No related merge requests found
Pipeline #104362 passed
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#define PCIE_BASE_CFG_SPEED_MASK GENMASK(15, 8) #define PCIE_BASE_CFG_SPEED_MASK GENMASK(15, 8)
#define PCIE_SETTING_REG 0x80 #define PCIE_SETTING_REG 0x80
#define PCIE_SETTING_LINK_WIDTH GENMASK(11, 8)
#define PCIE_SETTING_GEN_SUPPORT_MASK GENMASK(14, 12) #define PCIE_SETTING_GEN_SUPPORT_MASK GENMASK(14, 12)
#define PCIE_PCI_IDS_1 0x9c #define PCIE_PCI_IDS_1 0x9c
#define PCI_CLASS(class) (class << 8) #define PCI_CLASS(class) (class << 8)
...@@ -131,6 +132,7 @@ struct mtk_msi_set { ...@@ -131,6 +132,7 @@ struct mtk_msi_set {
* @clks: PCIe clocks * @clks: PCIe clocks
* @num_clks: PCIe clocks count for this port * @num_clks: PCIe clocks count for this port
* @max_link_speed: Maximum link speed (PCIe Gen) for this port * @max_link_speed: Maximum link speed (PCIe Gen) for this port
* @num_lanes: Number of PCIe lanes for this port
* @irq: PCIe controller interrupt number * @irq: PCIe controller interrupt number
* @saved_irq_state: IRQ enable state saved at suspend time * @saved_irq_state: IRQ enable state saved at suspend time
* @irq_lock: lock protecting IRQ register access * @irq_lock: lock protecting IRQ register access
...@@ -151,6 +153,7 @@ struct mtk_gen3_pcie { ...@@ -151,6 +153,7 @@ struct mtk_gen3_pcie {
struct clk_bulk_data *clks; struct clk_bulk_data *clks;
int num_clks; int num_clks;
u8 max_link_speed; u8 max_link_speed;
u8 num_lanes;
int irq; int irq;
u32 saved_irq_state; u32 saved_irq_state;
...@@ -350,7 +353,7 @@ static int mtk_pcie_startup_port(struct mtk_gen3_pcie *pcie) ...@@ -350,7 +353,7 @@ static int mtk_pcie_startup_port(struct mtk_gen3_pcie *pcie)
int err; int err;
u32 val; u32 val;
/* Set as RC mode and set controller PCIe Gen speed restriction, if any*/ /* Set as RC mode and set controller PCIe Gen speed/lanes restriction, if any */
val = readl_relaxed(pcie->base + PCIE_SETTING_REG); val = readl_relaxed(pcie->base + PCIE_SETTING_REG);
val |= PCIE_RC_MODE; val |= PCIE_RC_MODE;
if (pcie->max_link_speed) { if (pcie->max_link_speed) {
...@@ -361,6 +364,14 @@ static int mtk_pcie_startup_port(struct mtk_gen3_pcie *pcie) ...@@ -361,6 +364,14 @@ static int mtk_pcie_startup_port(struct mtk_gen3_pcie *pcie)
val |= FIELD_PREP(PCIE_SETTING_GEN_SUPPORT_MASK, val |= FIELD_PREP(PCIE_SETTING_GEN_SUPPORT_MASK,
GENMASK(pcie->max_link_speed - 2, 0)); GENMASK(pcie->max_link_speed - 2, 0));
} }
if (pcie->num_lanes) {
val &= ~PCIE_SETTING_LINK_WIDTH;
/* Zero means one lane, each bit activates x2/x4/x8/x16 */
if (pcie->num_lanes > 1)
val |= FIELD_PREP(PCIE_SETTING_LINK_WIDTH,
GENMASK(pcie->num_lanes >> 1, 0));
};
writel_relaxed(val, pcie->base + PCIE_SETTING_REG); writel_relaxed(val, pcie->base + PCIE_SETTING_REG);
/* Set Link Control 2 (LNKCTL2) speed restriction, if any */ /* Set Link Control 2 (LNKCTL2) speed restriction, if any */
...@@ -810,6 +821,7 @@ static int mtk_pcie_parse_port(struct mtk_gen3_pcie *pcie) ...@@ -810,6 +821,7 @@ static int mtk_pcie_parse_port(struct mtk_gen3_pcie *pcie)
struct device *dev = pcie->dev; struct device *dev = pcie->dev;
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
struct resource *regs; struct resource *regs;
u32 num_lanes;
int ret; int ret;
regs = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pcie-mac"); regs = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pcie-mac");
...@@ -856,6 +868,14 @@ static int mtk_pcie_parse_port(struct mtk_gen3_pcie *pcie) ...@@ -856,6 +868,14 @@ static int mtk_pcie_parse_port(struct mtk_gen3_pcie *pcie)
return pcie->num_clks; return pcie->num_clks;
} }
ret = of_property_read_u32(dev->of_node, "num-lanes", &num_lanes);
if (ret == 0) {
if (num_lanes == 0 || num_lanes > 16 || (num_lanes != 1 && num_lanes % 2))
dev_warn(dev, "Invalid num-lanes, using controller defaults\n");
else
pcie->num_lanes = num_lanes;
}
return 0; return 0;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment