PCI: amlogic: Make PCIe working reliably on AXG platforms
Subsystems (6)
v3 cover PCI: amlogic: Make PCIe working reliably on AXG platforms
PCIe device probing failures have been seen on AXG platforms and were due to unreliable clock signal output. Setting HHI_MIPI_CNTL0[26] bit in MIPI's PHY registers solved the problem. This bit appears to control band gap reference.
As discussed here [1] one of these shared MIPI/PCIE PHY register bits was mistakenly implemented in the clock driver as CLKID_MIPI_ENABLE. This adds a PHY driver to control this bit through syscon subsystem instead, as well as setting the band gap one in order to get reliable PCIE communication.
While at it adding this PHY make AXG code close to G12A one thus allowing to remove some specific platform handling in pci-meson driver.
Please note that CLKID_MIPI_ENABLE removable will be done in a different serie.
Changes since v2:
- Remove shared MIPI/PCIE device driver and use syscon to access register in PCIE only driver instead
- Include devicetree documentation
Changes sinve v1:
- Move HHI_MIPI_CNTL0 bit control in its own PHY driver
- Add a PHY driver for PCIE_PHY registers
- Modify pci-meson.c to make use of both PHYs and remove specific handling for AXG and G12A
[1] https://lkml.org/lkml/2019/12/16/119
Remi Pommarel (5):
phy: amlogic: Add Amlogic AXG PCIE PHY Driver
PCI: amlogic: Use AXG PCIE PHY
arm64: dts: meson-axg: Add PCIE PHY node
dt-bindings: PCI: meson: Update PCIE bindings documentation
dt-bindings: Add AXG PCIE PHY bindings
.../bindings/pci/amlogic,meson-pcie.txt | 22 +-- .../bindings/phy/amlogic,meson-axg-pcie.yaml | 51 +++++ arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 9 + drivers/pci/controller/dwc/pci-meson.c | 116 ++--------- drivers/phy/amlogic/Kconfig | 11 ++ drivers/phy/amlogic/Makefile | 1 + drivers/phy/amlogic/phy-meson-axg-pcie.c | 185 ++++++++++++++++++ 7 files changed, 287 insertions(+), 108 deletions(-) create mode 100644 Documentation/devicetree/bindings/phy/amlogic,meson-axg-pcie.yaml create mode 100644 drivers/phy/amlogic/phy-meson-axg-pcie.c
Signature · 1 line
2.24.0
PATCH v3 1/5 phy: amlogic: Add Amlogic AXG PCIE PHY Driver
This adds support for the PCI PHY found in the Amlogic AXG SoC Family.
This PHY configures the PCIE_PHY registers as well as the HHI_MIPI_CNTL0 through syscon subsystem. This would allow to remove the mipi_enable clock gating logic which was mistakenly added in the clock subsystem.
It also set a non documented band gap bit in those registers that makes PCIE clock signal generation on AXG platforms reliable.
--- drivers/phy/amlogic/Kconfig | 11 ++ drivers/phy/amlogic/Makefile | 1 + drivers/phy/amlogic/phy-meson-axg-pcie.c | 185 +++++++++++++++++++++++ 3 files changed, 197 insertions(+) create mode 100644 drivers/phy/amlogic/phy-meson-axg-pcie.c
drivers/phy/amlogic/Kconfig +11 -0
@@ -59,3 +59,14 @@ config PHY_MESON_G12A_USB3_PCIE Enable this to support the Meson USB3 + PCIE Combo PHY found in Meson G12A SoCs. If unsure, say N. + +config PHY_MESON_AXG_PCIE + tristate "Meson AXG PCIE PHY driver" + default ARCH_MESON + depends on OF && (ARCH_MESON || COMPILE_TEST) + select GENERIC_PHY + select MFD_SYSCON + select REGMAP_MMIO + help + Enable this to support the Meson PCIE PHY found in AXG SoCs. + If unsure, say N.
drivers/phy/amlogic/Makefile +1 -0
@@ -4,3 +4,4 @@ obj-$(CONFIG_PHY_MESON_GXL_USB2) += phy-meson-gxl-usb2.o obj-$(CONFIG_PHY_MESON_G12A_USB2) += phy-meson-g12a-usb2.o obj-$(CONFIG_PHY_MESON_GXL_USB3) += phy-meson-gxl-usb3.o obj-$(CONFIG_PHY_MESON_G12A_USB3_PCIE) += phy-meson-g12a-usb3-pcie.o +obj-$(CONFIG_PHY_MESON_AXG_PCIE) += phy-meson-axg-pcie.o
drivers/phy/amlogic/phy-meson-axg-pcie.c new file +185 -0
185 lines not on this page · raw message
Signature · 1 line
2.24.0
PATCH v3 2/5 PCI: amlogic: Use AXG PCIE PHY
In reply to Remi PommarelNow that PCIE PHY has been introduced for AXG, the whole has_shared_phy logic can be mutualized between AXG and G12A platforms.
The new PHY also enable bang gap reference bit that allows relibable communication on AXG platforms.
--- drivers/pci/controller/dwc/pci-meson.c | 116 +++++-------------------- 1 file changed, 21 insertions(+), 95 deletions(-)
drivers/pci/controller/dwc/pci-meson.c +21 -95
@@ -66,7 +66,6 @@#define PORT_CLK_RATE 100000000UL#define MAX_PAYLOAD_SIZE 256#define MAX_READ_REQ_SIZE 256 -#define MESON_PCIE_PHY_POWERUP 0x1c#define PCIE_RESET_DELAY 500#define PCIE_SHARED_RESET 1#define PCIE_NORMAL_RESET 0
@@ -81,26 +80,19 @@ enum pcie_data_rate {struct meson_pcie_mem_res {void __iomem *elbi_base;void __iomem *cfg_base; -void __iomem *phy_base; };struct meson_pcie_clk_res {struct clk *clk; -struct clk *mipi_gate;struct clk *port_clk;struct clk *general_clk; };struct meson_pcie_rc_reset { -struct reset_control *phy;struct reset_control *port;struct reset_control *apb; }; -struct meson_pcie_param { -bool has_shared_phy; -}; -struct meson_pcie {struct dw_pcie pci;struct meson_pcie_mem_res mem_res;
@@ -108,7 +100,6 @@ struct meson_pcie {struct meson_pcie_rc_reset mrst;struct gpio_desc *reset_gpio;struct phy *phy; -const struct meson_pcie_param *param; }; static struct reset_control *meson_pcie_get_reset(struct meson_pcie *mp,
@@ -130,13 +121,6 @@ static int meson_pcie_get_resets(struct meson_pcie *mp) {struct meson_pcie_rc_reset *mrst = &mp->mrst; -if (!mp->param->has_shared_phy) { - mrst->phy =meson_pcie_get_reset (mp,"phy" ,PCIE_SHARED_RESET ); -if (IS_ERR (mrst->phy)) -return PTR_ERR (mrst->phy); -reset_control_deassert (mrst->phy); - } - mrst->port =meson_pcie_get_reset (mp,"port" ,PCIE_NORMAL_RESET );if (IS_ERR (mrst->port))return PTR_ERR (mrst->port);
@@ -162,22 +146,6 @@ static void __iomem *meson_pcie_get_mem(struct platform_device *pdev,return devm_ioremap_resource (dev, res); } -static void __iomem *meson_pcie_get_mem_shared (struct platform_device *pdev, -struct meson_pcie *mp, -const char *id) -{ -struct device *dev = mp->pci.dev; -struct resource *res; - - res =platform_get_resource_byname (pdev,IORESOURCE_MEM , id); -if (!res) { -dev_err (dev,"No REG resource %s\n" , id); -return ERR_PTR (-ENXIO ); - } - -return devm_ioremap (dev, res->start,resource_size (res)); -} -static int meson_pcie_get_mems (struct platform_device *pdev,struct meson_pcie *mp) {
@@ -189,14 +157,6 @@ static int meson_pcie_get_mems(struct platform_device *pdev,if (IS_ERR (mp->mem_res.cfg_base))return PTR_ERR (mp->mem_res.cfg_base); -/* Meson AXG SoC has two PCI controllers use same phy register */ -if (!mp->param->has_shared_phy) { - mp->mem_res.phy_base = -meson_pcie_get_mem_shared (pdev, mp,"phy" ); -if (IS_ERR (mp->mem_res.phy_base)) -return PTR_ERR (mp->mem_res.phy_base); - } -return 0 ; }
@@ -204,37 +164,33 @@ static int meson_pcie_power_on(struct meson_pcie *mp) {int ret =0 ; -if (mp->param->has_shared_phy) { - ret =phy_init (mp->phy); -if (ret) -return ret; + ret =phy_init (mp->phy); +if (ret) +return ret; - ret =phy_power_on (mp->phy); -if (ret) { -phy_exit (mp->phy); -return ret; - } - }else -writel (MESON_PCIE_PHY_POWERUP , mp->mem_res.phy_base); + ret =phy_power_on (mp->phy); +if (ret) { +phy_exit (mp->phy); +return ret; + }return 0 ; } +static void meson_pcie_power_off (struct meson_pcie *mp) +{ +phy_power_off (mp->phy); +phy_exit (mp->phy); +} +static int meson_pcie_reset (struct meson_pcie *mp) {struct meson_pcie_rc_reset *mrst = &mp->mrst;int ret =0 ; -if (mp->param->has_shared_phy) { - ret =phy_reset (mp->phy); -if (ret) -return ret; - }else { -reset_control_assert (mrst->phy); -udelay (PCIE_RESET_DELAY ); -reset_control_deassert (mrst->phy); -udelay (PCIE_RESET_DELAY ); - } + ret =phy_reset (mp->phy); +if (ret) +return ret;reset_control_assert (mrst->port);reset_control_assert (mrst->apb);
@@ -286,12 +242,6 @@ static int meson_pcie_probe_clocks(struct meson_pcie *mp)if (IS_ERR (res->port_clk))return PTR_ERR (res->port_clk); -if (!mp->param->has_shared_phy) { - res->mipi_gate =meson_pcie_probe_clock (dev,"mipi" ,0 ); -if (IS_ERR (res->mipi_gate)) -return PTR_ERR (res->mipi_gate); - } - res->general_clk =meson_pcie_probe_clock (dev,"general" ,0 );if (IS_ERR (res->general_clk))return PTR_ERR (res->general_clk);
@@ -562,7 +512,6 @@ static const struct dw_pcie_ops dw_pcie_ops = {static int meson_pcie_probe (struct platform_device *pdev) { -const struct meson_pcie_param *match_data;struct device *dev = &pdev->dev;struct dw_pcie *pci;struct meson_pcie *mp;
@@ -576,18 +525,9 @@ static int meson_pcie_probe(struct platform_device *pdev) pci->dev = dev; pci->ops = &dw_pcie_ops; - match_data =of_device_get_match_data (dev); -if (!match_data) { -dev_err (dev,"failed to get match data\n" ); -return -ENODEV ; - } - mp->param = match_data; - -if (mp->param->has_shared_phy) { - mp->phy =devm_phy_get (dev,"pcie" ); -if (IS_ERR (mp->phy)) -return PTR_ERR (mp->phy); - } + mp->phy =devm_phy_get (dev,"pcie" ); +if (IS_ERR (mp->phy)) +return PTR_ERR (mp->phy); mp->reset_gpio =devm_gpiod_get (dev,"reset" ,GPIOD_OUT_LOW );if (IS_ERR (mp->reset_gpio)) {
@@ -636,30 +576,16 @@ static int meson_pcie_probe(struct platform_device *pdev)return 0 ; err_phy: -if (mp->param->has_shared_phy) { -phy_power_off (mp->phy); -phy_exit (mp->phy); - } - +meson_pcie_power_off (mp);return ret; } -static struct meson_pcie_param meson_pcie_axg_param = { - .has_shared_phy = false, -}; - -static struct meson_pcie_param meson_pcie_g12a_param = { - .has_shared_phy = true, -}; -static const struct of_device_id meson_pcie_of_match[] = { { .compatible ="amlogic,axg-pcie" , - .data = &meson_pcie_axg_param, }, { .compatible ="amlogic,g12a-pcie" , - .data = &meson_pcie_g12a_param, }, {}, };
Signature · 1 line
2.24.0
PATCH v3 3/5 arm64: dts: meson-axg: Add PCIE PHY node
In reply to Remi PommarelEnable PCIE PHY node to make PCIE reliable on AXG SoC.
--- arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 9 +++++++++ 1 file changed, 9 insertions(+)
arch/arm64/boot/dts/amlogic/meson-axg.dtsi +9 -0
@@ -1356,6 +1356,15 @@ tdmout_c: audio-controller@580 { }; }; + pcie_phy: pcie-phy@ff644000 { + compatible = "amlogic,axg-pcie-phy"; + reg = <0x0 0xff644000 0x0 0x2000>; + aml,hhi-gpr = <&sysctrl>; + resets = <&reset RESET_PCIE_PHY>; + reset-names = "phy"; + #phy-cells = <0>; + }; + aobus: bus@ff800000 { compatible = "simple-bus"; reg = <0x0 0xff800000 0x0 0x100000>;
Signature · 1 line
2.24.0
PATCH v3 4/5 dt-bindings: PCI: meson: Update PCIE bindings documentation
In reply to Remi PommarelNow that a new PHYs has been introduced for AXG SoC family, update dt bindings documentation.
--- .../bindings/pci/amlogic,meson-pcie.txt | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-)
Documentation/devicetree/bindings/pci/amlogic,meson-pcie.txt +9 -13
@@ -18,7 +18,6 @@ Required properties: - reg-names: Must be - "elbi" External local bus interface registers - "cfg" Meson specific registers - - "phy" Meson PCIE PHY registers for AXG SoC Family - "config" PCIe configuration space - reset-gpios: The GPIO to generate PCIe PERST# assert and deassert signal. - clocks: Must contain an entry for each entry in clock-names.
@@ -26,13 +25,13 @@ Required properties: - "pclk" PCIe GEN 100M PLL clock - "port" PCIe_x(A or B) RC clock gate - "general" PCIe Phy clock - - "mipi" PCIe_x(A or B) 100M ref clock gate for AXG SoC Family - resets: phandle to the reset lines. -- reset-names: must contain "phy" "port" and "apb" - - "phy" Share PHY reset for AXG SoC Family +- reset-names: must contain "port" and "apb" - "port" Port A or B reset - "apb" Share APB reset -- phys: should contain a phandle to the shared phy for G12A SoC Family +- phys: should contain a phandle to the PCIE phy +- phy-names: must contain "pcie" + - device_type: should be "pci". As specified in designware-pcie.txt
@@ -43,9 +42,8 @@ Example configuration: compatible = "amlogic,axg-pcie", "snps,dw-pcie"; reg = <0x0 0xf9800000 0x0 0x400000 0x0 0xff646000 0x0 0x2000 - 0x0 0xff644000 0x0 0x2000 0x0 0xf9f00000 0x0 0x100000>; - reg-names = "elbi", "cfg", "phy", "config"; + reg-names = "elbi", "cfg", "config"; reset-gpios = <&gpio GPIOX_19 GPIO_ACTIVE_HIGH>; interrupts = <GIC_SPI 177 IRQ_TYPE_EDGE_RISING>; #interrupt-cells = <1>;
@@ -58,17 +56,15 @@ Example configuration: ranges = <0x82000000 0 0 0x0 0xf9c00000 0 0x00300000>; clocks = <&clkc CLKID_USB - &clkc CLKID_MIPI_ENABLE &clkc CLKID_PCIE_A &clkc CLKID_PCIE_CML_EN0>; clock-names = "general", - "mipi", "pclk", "port"; - resets = <&reset RESET_PCIE_PHY>, - <&reset RESET_PCIE_A>, + resets = <&reset RESET_PCIE_A>, <&reset RESET_PCIE_APB>; - reset-names = "phy", - "port", + reset-names = "port", "apb"; + phys = <&pcie_phy>; + phy-names = "pcie"; };
Signature · 1 line
2.24.0
Rob Herring
maintainerRe: [PATCH v3 4/5] dt-bindings: PCI: meson: Update PCIE bindings documentation
Quoted 2 lines · Remi Pommarel
Now that a new PHYs has been introduced for AXG SoC family, update dt bindings documentation.
This breaks compatibility. If that's okay, say so and why it is.
If only someone had said putting the phy here in the first place was wrong:
https://lore.kernel.org/linux-amlogic/20180829004122.GA25928@bogus/
Quoted 72 lines
Signed-off-by Remi Pommarel <[email protected]>--- .../bindings/pci/amlogic,meson-pcie.txt | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-)Documentation/devicetree/bindings/pci/amlogic,meson-pcie.txt +9
-13@@ -18,7 +18,6 @@ Required properties: - reg-names: Must be - "elbi" External local bus interface registers - "cfg" Meson specific registers - - "phy" Meson PCIE PHY registers for AXG SoC Family - "config" PCIe configuration space - reset-gpios: The GPIO to generate PCIe PERST# assert and deassert signal. - clocks: Must contain an entry for each entry in clock-names.@@ -26,13 +25,13 @@ Required properties: - "pclk" PCIe GEN 100M PLL clock - "port" PCIe_x(A or B) RC clock gate - "general" PCIe Phy clock - - "mipi" PCIe_x(A or B) 100M ref clock gate for AXG SoC Family - resets: phandle to the reset lines. -- reset-names: must contain "phy" "port" and "apb" - - "phy" Share PHY reset for AXG SoC Family +- reset-names: must contain "port" and "apb" - "port" Port A or B reset - "apb" Share APB reset -- phys: should contain a phandle to the shared phy for G12A SoC Family +- phys: should contain a phandle to the PCIE phy +- phy-names: must contain "pcie" + - device_type: should be "pci". As specified in designware-pcie.txt@@ -43,9 +42,8 @@ Example configuration: compatible = "amlogic,axg-pcie", "snps,dw-pcie"; reg = <0x0 0xf9800000 0x0 0x400000 0x0 0xff646000 0x0 0x2000 - 0x0 0xff644000 0x0 0x2000 0x0 0xf9f00000 0x0 0x100000>; - reg-names = "elbi", "cfg", "phy", "config"; + reg-names = "elbi", "cfg", "config"; reset-gpios = <&gpio GPIOX_19 GPIO_ACTIVE_HIGH>; interrupts = <GIC_SPI 177 IRQ_TYPE_EDGE_RISING>; #interrupt-cells = <1>;@@ -58,17 +56,15 @@ Example configuration: ranges = <0x82000000 0 0 0x0 0xf9c00000 0 0x00300000>; clocks = <&clkc CLKID_USB - &clkc CLKID_MIPI_ENABLE &clkc CLKID_PCIE_A &clkc CLKID_PCIE_CML_EN0>; clock-names = "general", - "mipi", "pclk", "port"; - resets = <&reset RESET_PCIE_PHY>, - <&reset RESET_PCIE_A>, + resets = <&reset RESET_PCIE_A>, <&reset RESET_PCIE_APB>; - reset-names = "phy", - "port", + reset-names = "port", "apb"; + phys = <&pcie_phy>; + phy-names = "pcie"; };Signature · 1 line
2.24.0
PATCH v3 5/5 dt-bindings: Add AXG PCIE PHY bindings
In reply to Remi PommarelAdd documentation for PCIE PHYs found in AXG SoCs.
--- .../bindings/phy/amlogic,meson-axg-pcie.yaml | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/amlogic,meson-axg-pcie.yaml
Documentation/devicetree/bindings/phy/amlogic,meson-axg-pcie.yaml new file +51 -0
@@ -0,0 +1,51 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +# Copyright 2019 BayLibre, SAS +%YAML 1.2 +--- +$id: "http://devicetree.org/schemas/phy/amlogic,meson-axg-pcie.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: Amlogic AXG PCIE PHY + +maintainers: + - Remi Pommarel <[email protected]> + +properties: + compatible: + enum: + - amlogic,axg-pcie-phy + + reg: + maxItems: 1 + + aml,hhi-gpr: + maxItems: 1 + + resets: + maxItems: 1 + + reset-names: + items: + - const: phy + + "#phy-cells": + const: 0 + +required: + - compatible + - reg + - aml,hhi-gpr + - resets + - reset-names + - "#phy-cells" + +examples: + - | + pcie_phy: pcie-phy@ff644000 { + compatible = "amlogic,axg-pcie-phy"; + reg = <0x0 0xff644000 0x0 0x2000>; + aml,hhi-gpr = <&sysctrl>; + resets = <&reset RESET_PCIE_PHY>; + reset-names = "phy"; + #phy-cells = <0>; + };
Signature · 1 line
2.24.0
Re: [PATCH v3 5/5] dt-bindings: Add AXG PCIE PHY bindings
Quoted 26 lines · Remi Pommarel
Add documentation for PCIE PHYs found in AXG SoCs.
Signed-off-by Remi Pommarel <[email protected]>--- .../bindings/phy/amlogic,meson-axg-pcie.yaml | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/amlogic,meson-axg-pcie.yamlDocumentation/devicetree/bindings/phy/amlogic,meson-axg-pcie.yaml new file +12
-0@@ -0,0 +1,51 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +# Copyright 2019 BayLibre, SAS +%YAML 1.2 +--- +$id: "http://devicetree.org/schemas/phy/amlogic,meson-axg-pcie.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: Amlogic AXG PCIE PHY + +maintainers: + - Remi Pommarel <[email protected]> +
Documentation/devicetree/bindings/phy/amlogic,meson-axg-pcie.yaml line 22
Quoted 10 lines
Documentation/devicetree/bindings/phy/amlogic,meson-axg-pcie.yaml new file +10
-0+properties: + compatible: + enum: + - amlogic,axg-pcie-phy + + reg: + maxItems: 1 + + aml,hhi-gpr: + maxItems: 1
My bad, I didn't know about devicetree schemas and their verification, I will fix the missing $ref: '/schemas/types.yaml#/definitions/phandle' here, add a description and add the missing include for reset in the example below in v4 along with upcoming comments on the other patches.
Sorry about that.
Quoted 32 lines
Documentation/devicetree/bindings/phy/amlogic,meson-axg-pcie.yaml new file +29
-0+ + resets: + maxItems: 1 + + reset-names: + items: + - const: phy + + "#phy-cells": + const: 0 + +required: + - compatible + - reg + - aml,hhi-gpr + - resets + - reset-names + - "#phy-cells" + +examples: + - | + pcie_phy: pcie-phy@ff644000 { + compatible = "amlogic,axg-pcie-phy"; + reg = <0x0 0xff644000 0x0 0x2000>; + aml,hhi-gpr = <&sysctrl>; + resets = <&reset RESET_PCIE_PHY>; + reset-names = "phy"; + #phy-cells = <0>; + };Signature · 1 line
2.24.0
Martin Blumenstingl
reviewerRe: [PATCH v3 5/5] dt-bindings: Add AXG PCIE PHY bindings
In reply to Remi PommarelQuoted 27 lines · Remi Pommarel
Add documentation for PCIE PHYs found in AXG SoCs.
Signed-off-by Remi Pommarel <[email protected]>--- .../bindings/phy/amlogic,meson-axg-pcie.yaml | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/amlogic,meson-axg-pcie.yamlDocumentation/devicetree/bindings/phy/amlogic,meson-axg-pcie.yaml new file +12
-0@@ -0,0 +1,51 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +# Copyright 2019 BayLibre, SAS +%YAML 1.2 +--- +$id: "http://devicetree.org/schemas/phy/amlogic,meson-axg-pcie.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: Amlogic AXG PCIE PHY + +maintainers: + - Remi Pommarel <[email protected]> +
Documentation/devicetree/bindings/phy/amlogic,meson-axg-pcie.yaml line 22
Quoted 10 lines
Documentation/devicetree/bindings/phy/amlogic,meson-axg-pcie.yaml new file +10
-0+properties: + compatible: + enum: + - amlogic,axg-pcie-phy + + reg: + maxItems: 1 + + aml,hhi-gpr: + maxItems: 1
nit-pick (as I didn't have time to review the whole series yet):
we have at least two other IP blocks that need this. they use "amlogic,hhi-sysctrl" for the property name
Martin
Rob Herring
maintainerRe: [PATCH v3 5/5] dt-bindings: Add AXG PCIE PHY bindings
In reply to Remi PommarelQuoted 20 lines · Remi Pommarel
Add documentation for PCIE PHYs found in AXG SoCs.
Signed-off-by Remi Pommarel <[email protected]>--- .../bindings/phy/amlogic,meson-axg-pcie.yaml | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/amlogic,meson-axg-pcie.yamlDocumentation/devicetree/bindings/phy/amlogic,meson-axg-pcie.yaml new file +6
-0@@ -0,0 +1,51 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +# Copyright 2019 BayLibre, SAS +%YAML 1.2 +--- +$id: "http://devicetree.org/schemas/phy/amlogic,meson-axg-pcie.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#"
Documentation/devicetree/bindings/phy/amlogic,meson-axg-pcie.yaml line 16
Quoted 10 lines
Documentation/devicetree/bindings/phy/amlogic,meson-axg-pcie.yaml new file +10
-0+ +title: Amlogic AXG PCIE PHY + +maintainers: + - Remi Pommarel <[email protected]> + +properties: + compatible: + enum: + - amlogic,axg-pcie-phy
Do you expect another compatible? If not, use 'const' instead.
Documentation/devicetree/bindings/phy/amlogic,meson-axg-pcie.yaml line 29
Quoted 13 lines
Documentation/devicetree/bindings/phy/amlogic,meson-axg-pcie.yaml new file +13
-0+ + reg: + maxItems: 1 + + aml,hhi-gpr: + maxItems: 1 + + resets: + maxItems: 1 + + reset-names: + items: + - const: phy
You don't need *-names when there's only one entry.
Quoted 25 lines
Documentation/devicetree/bindings/phy/amlogic,meson-axg-pcie.yaml new file +22
-0+ + "#phy-cells": + const: 0 + +required: + - compatible + - reg + - aml,hhi-gpr + - resets + - reset-names + - "#phy-cells" + +examples: + - | + pcie_phy: pcie-phy@ff644000 { + compatible = "amlogic,axg-pcie-phy"; + reg = <0x0 0xff644000 0x0 0x2000>; + aml,hhi-gpr = <&sysctrl>; + resets = <&reset RESET_PCIE_PHY>; + reset-names = "phy"; + #phy-cells = <0>; + };Signature · 1 line
2.24.0
Jerome Brunet
reviewerQuoted 27 lines · Remi Pommarel
PCIe device probing failures have been seen on AXG platforms and were due to unreliable clock signal output. Setting HHI_MIPI_CNTL0[26] bit in MIPI's PHY registers solved the problem. This bit appears to control band gap reference.
As discussed here [1] one of these shared MIPI/PCIE PHY register bits was mistakenly implemented in the clock driver as
CLKID_MIPI_ENABLE. This adds a PHY driver to control this bit through syscon subsystem instead, as well as setting the band gap one in order to get reliable PCIE communication.While at it adding this PHY make AXG code close to G12A one thus allowing to remove some specific platform handling in pci-meson driver.
Please note that
CLKID_MIPI_ENABLEremovable will be done in a different serie.Changes since v2:
- Remove shared MIPI/PCIE device driver and use syscon to access register in PCIE only driver instead
- Include devicetree documentationChanges sinve v1:
- MoveHHI_MIPI_CNTL0bit control in its own PHY driver
- Add a PHY driver forPCIE_PHYregisters
- Modifypci-meson.cto make use of both PHYs and remove specific handling for AXG and G12A
Quoted 8 lines
[1] https://lkml.org/lkml/2019/12/16/119
Remi Pommarel (5):
phy: amlogic: Add Amlogic AXG PCIE PHY Driver
PCI: amlogic: Use AXG PCIE PHY
arm64: dts: meson-axg: Add PCIE PHY node
dt-bindings: PCI: meson: Update PCIE bindings documentation
dt-bindings: Add AXG PCIE PHY bindings
Hi Remi,
Usually, you should put the dt documentation first in the series. This way the properties are documented before being used
Quoted 11 lines
.../bindings/pci/amlogic,meson-pcie.txt | 22 +-- .../bindings/phy/amlogic,meson-axg-pcie.yaml | 51 +++++ arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 9 + drivers/pci/controller/dwc/pci-meson.c | 116 ++--------- drivers/phy/amlogic/Kconfig | 11 ++ drivers/phy/amlogic/Makefile | 1 + drivers/phy/amlogic/phy-meson-axg-pcie.c | 185 ++++++++++++++++++ 7 files changed, 287 insertions(+), 108 deletions(-) create mode 100644 Documentation/devicetree/bindings/phy/amlogic,meson-axg-pcie.yaml create mode 100644 drivers/phy/amlogic/phy-meson-axg-pcie.c