PCI: amlogic: Make PCIe working reliably on AXG platforms
Subsystems (6)
v4 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 controls band gap reference.
As discussed here [1] one of these shared MIPI/PCIE PHY register bits was implemented in the clock driver as CLKID_MIPI_ENABLE. This adds a PHY driver to control this bit instead, as well as setting the band gap one in order to get reliable PCIE communication.
While at it add another PHY driver to control PCIE only PHY registers, making AXG code more similar to G12A platform 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 v3:
- Go back to the shared MIPI/PCIe phy driver solution from v2
- Remove syscon usage
- Add all dt-bindings documentation
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 (7):
dt-bindings: Add AXG PCIE PHY bindings
dt-bindings: Add AXG shared MIPI/PCIE PHY bindings
dt-bindings: PCI: meson: Update PCIE bindings documentation
arm64: dts: meson-axg: Add PCIE PHY nodes
phy: amlogic: Add Amlogic AXG MIPI/PCIE PHY Driver
phy: amlogic: Add Amlogic AXG PCIE PHY Driver
PCI: amlogic: Use AXG PCIE and shared MIPI/PCIE PHYs
.../bindings/pci/amlogic,meson-pcie.txt | 22 +-- .../phy/amlogic,meson-axg-mipi-pcie.yaml | 34 ++++ .../bindings/phy/amlogic,meson-axg-pcie.yaml | 40 ++++ arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 13 ++ drivers/pci/controller/dwc/pci-meson.c | 140 +++++--------- drivers/phy/amlogic/Kconfig | 22 +++ drivers/phy/amlogic/Makefile | 2 + drivers/phy/amlogic/phy-meson-axg-mipi-pcie.c | 179 ++++++++++++++++++ drivers/phy/amlogic/phy-meson-axg-pcie.c | 163 ++++++++++++++++ 9 files changed, 508 insertions(+), 107 deletions(-) create mode 100644 Documentation/devicetree/bindings/phy/amlogic,meson-axg-mipi-pcie.yaml create mode 100644 Documentation/devicetree/bindings/phy/amlogic,meson-axg-pcie.yaml create mode 100644 drivers/phy/amlogic/phy-meson-axg-mipi-pcie.c create mode 100644 drivers/phy/amlogic/phy-meson-axg-pcie.c
Signature · 1 line
2.24.1
PATCH v4 1/7 dt-bindings: Add AXG PCIE PHY bindings
Add documentation for PCIE PHYs found in AXG SoCs.
--- .../bindings/phy/amlogic,meson-axg-pcie.yaml | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/amlogic,meson-axg-pcie.yaml
Documentation/devicetree/bindings/phy/amlogic,meson-axg-pcie.yaml new file +40 -0
@@ -0,0 +1,40 @@ +# 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: + const: amlogic,axg-pcie-phy + + reg: + maxItems: 1 + + resets: + maxItems: 1 + + "#phy-cells": + const: 0 + +required: + - compatible + - reg + - resets + - "#phy-cells" + +examples: + - | + #include <dt-bindings/reset/amlogic,meson-axg-reset.h> + pcie_phy: pcie-phy@ff644000 { + compatible = "amlogic,axg-pcie-phy"; + reg = <0x0 0xff644000 0x0 0x1c>; + resets = <&reset RESET_PCIE_PHY>; + #phy-cells = <0>; + };
Signature · 1 line
2.24.1
PATCH v4 2/7 dt-bindings: Add AXG shared MIPI/PCIE PHY bindings
In reply to Remi PommarelAdd documentation for the shared MIPI/PCIE PHYs found in AXG SoCs.
--- .../phy/amlogic,meson-axg-mipi-pcie.yaml | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/amlogic,meson-axg-mipi-pcie.yaml
Documentation/devicetree/bindings/phy/amlogic,meson-axg-mipi-pcie.yaml new file +34 -0
@@ -0,0 +1,34 @@ +# 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-mipi-pcie.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: Amlogic AXG shared MIPI/PCIE PHY + +maintainers: + - Remi Pommarel <[email protected]> + +properties: + compatible: + const: amlogic,axg-mipi-pcie-phy + + reg: + maxItems: 1 + + "#phy-cells": + const: 1 + +required: + - compatible + - reg + - "#phy-cells" + +examples: + - | + mpphy: phy@0 { + compatible = "amlogic,axg-mipi-pcie-phy"; + reg = <0x0 0x0 0x0 0xc>; + #phy-cells = <1>; + };
Signature · 1 line
2.24.1
Re: [PATCH v4 2/7] dt-bindings: Add AXG shared MIPI/PCIE PHY bindings
Quoted 30 lines · Remi Pommarel
Add documentation for the shared MIPI/PCIE PHYs found in AXG SoCs.
Signed-off-by Remi Pommarel <[email protected]>--- .../phy/amlogic,meson-axg-mipi-pcie.yaml | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/amlogic,meson-axg-mipi-pcie.yamlDocumentation/devicetree/bindings/phy/amlogic,meson-axg-mipi-pcie.yaml new file +16
-0@@ -0,0 +1,34 @@ +# 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-mipi-pcie.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: Amlogic AXG shared MIPI/PCIE PHY + +maintainers: + - Remi Pommarel <[email protected]> + +properties: + compatible: + const: amlogic,axg-mipi-pcie-phy +
Documentation/devicetree/bindings/phy/amlogic,meson-axg-mipi-pcie.yaml line 26
Quoted 10 lines
Documentation/devicetree/bindings/phy/amlogic,meson-axg-mipi-pcie.yaml new file +10
-0+ reg: + maxItems: 1 + + "#phy-cells": + const: 1 + +required: + - compatible + - reg + - "#phy-cells"
Add:
additionalProperties: false
With that,
Quoted 11 lines
Documentation/devicetree/bindings/phy/amlogic,meson-axg-mipi-pcie.yaml new file +8
-0+ +examples: + - | + mpphy: phy@0 { + compatible = "amlogic,axg-mipi-pcie-phy"; + reg = <0x0 0x0 0x0 0xc>; + #phy-cells = <1>; + };Signature · 1 line
2.24.1
Rob Herring
maintainerRe: [PATCH v4 2/7] dt-bindings: Add AXG shared MIPI/PCIE PHY bindings
Quoted 45 lines · Rob Herring
Quoted 30 lines · Remi Pommarel
Add documentation for the shared MIPI/PCIE PHYs found in AXG SoCs.
Signed-off-by Remi Pommarel <[email protected]>--- .../phy/amlogic,meson-axg-mipi-pcie.yaml | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/amlogic,meson-axg-mipi-pcie.yamlDocumentation/devicetree/bindings/phy/amlogic,meson-axg-mipi-pcie.yaml new file +16
-0@@ -0,0 +1,34 @@ +# 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-mipi-pcie.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: Amlogic AXG shared MIPI/PCIE PHY + +maintainers: + - Remi Pommarel <[email protected]> + +properties: + compatible: + const: amlogic,axg-mipi-pcie-phy +Documentation/devicetree/bindings/phy/amlogic,meson-axg-mipi-pcie.yaml line 26
Quoted 10 lines
Documentation/devicetree/bindings/phy/amlogic,meson-axg-mipi-pcie.yaml new file +10
-0+ reg: + maxItems: 1 + + "#phy-cells": + const: 1 + +required: + - compatible + - reg + - "#phy-cells"Add:
Quoted 6 lines
additionalProperties: false
With that,
Reviewed-by Rob Herring <[email protected]>
I missed that I already ack'ed v5, but looks like the same comment applies to both DT patches.
Rob
PATCH v4 3/7 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.
Please note that this breaks backward compatibility but as not a single devicetree uses that yet that seems ok.
--- .../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.1
PATCH v4 4/7 arm64: dts: meson-axg: Add PCIE PHY nodes
In reply to Remi PommarelEnable both PCIE and shared MIPI/PCIE PHY nodes in order to make PCIE reliable on AXG SoC.
--- arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 13 +++++++++++++ 1 file changed, 13 insertions(+)
arch/arm64/boot/dts/amlogic/meson-axg.dtsi +13 -0
@@ -1104,6 +1104,12 @@ hiubus: bus@ff63c000 { #size-cells = <2>; ranges = <0x0 0x0 0x0 0xff63c000 0x0 0x1c00>; + mpphy: phy@0 { + compatible = "amlogic,axg-mipi-pcie-phy"; + reg = <0x0 0x0 0x0 0xc>; + #phy-cells = <1>; + }; + sysctrl: system-controller@0 { compatible = "amlogic,meson-axg-hhi-sysctrl", "simple-mfd", "syscon";
@@ -1356,6 +1362,13 @@ tdmout_c: audio-controller@580 { }; }; + pcie_phy: bus@ff644000 { + compatible = "amlogic,axg-pcie-phy"; + reg = <0x0 0xff644000 0x0 0x1c>; + resets = <&reset RESET_PCIE_PHY>; + #phy-cells = <0>; + }; + aobus: bus@ff800000 { compatible = "simple-bus"; reg = <0x0 0xff800000 0x0 0x100000>;
Signature · 1 line
2.24.1
PATCH v4 5/7 phy: amlogic: Add Amlogic AXG MIPI/PCIE PHY Driver
In reply to Remi PommarelThis adds support for the MIPI PHY also needed for PCIE found in the Amlogic AXG SoC Family.
MIPI or PCIE selection is done by the #phy-cells, making the mode static and exclusive.
For now only PCIE fonctionality is supported.
This PHY will be used to replace the mipi_enable clock gating logic which was mistakenly added in the clock subsystem. This also activate a non documented band gap bit in those registers that allows reliable PCIE clock signal generation on AXG platforms.
--- drivers/phy/amlogic/Kconfig | 11 ++ drivers/phy/amlogic/Makefile | 1 + drivers/phy/amlogic/phy-meson-axg-mipi-pcie.c | 179 ++++++++++++++++++ 3 files changed, 191 insertions(+) create mode 100644 drivers/phy/amlogic/phy-meson-axg-mipi-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_MIPI_PCIE + tristate "Meson AXG MIPI + PCIE PHY driver" + default ARCH_MESON + depends on OF && (ARCH_MESON || COMPILE_TEST) + select GENERIC_PHY + select REGMAP_MMIO + help + Enable this to support the Meson MIPI + PCIE PHY found + in Meson 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_MIPI_PCIE) += phy-meson-axg-mipi-pcie.o
drivers/phy/amlogic/phy-meson-axg-mipi-pcie.c new file +179 -0
179 lines not on this page · raw message
Signature · 1 line
2.24.1
PATCH v4 6/7 phy: amlogic: Add Amlogic AXG PCIE PHY Driver
In reply to Remi PommarelThis adds support for the PCI PHY found in the Amlogic AXG SoC Family. This will allow to mutualize code in pci-meson.c between AXG and G12A SoC.
--- drivers/phy/amlogic/Kconfig | 11 ++ drivers/phy/amlogic/Makefile | 1 + drivers/phy/amlogic/phy-meson-axg-pcie.c | 163 +++++++++++++++++++++++ 3 files changed, 175 insertions(+) create mode 100644 drivers/phy/amlogic/phy-meson-axg-pcie.c
drivers/phy/amlogic/Kconfig +11 -0
@@ -60,6 +60,17 @@ config PHY_MESON_G12A_USB3_PCIE 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 REGMAP_MMIO + help + Enable this to support the Meson MIPI + PCIE PHY found + in Meson AXG SoCs. + If unsure, say N. + config PHY_MESON_AXG_MIPI_PCIE tristate "Meson AXG MIPI + PCIE PHY driver" default ARCH_MESON
drivers/phy/amlogic/Makefile +1 -0
@@ -4,4 +4,5 @@ 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 obj-$(CONFIG_PHY_MESON_AXG_MIPI_PCIE) += phy-meson-axg-mipi-pcie.o
drivers/phy/amlogic/phy-meson-axg-pcie.c new file +163 -0
163 lines not on this page · raw message
Signature · 1 line
2.24.1
PATCH v4 7/7 PCI: amlogic: Use AXG PCIE and shared MIPI/PCIE PHYs
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.
This also makes use of the optional MIPI/PCIE shared fonctionality PHY found on AXG platforms, which need to be used in order to have reliable PCIE communications.
--- drivers/pci/controller/dwc/pci-meson.c | 140 ++++++++----------------- 1 file changed, 46 insertions(+), 94 deletions(-)
drivers/pci/controller/dwc/pci-meson.c +46 -94
@@ -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,7 @@ struct meson_pcie {struct meson_pcie_rc_reset mrst;struct gpio_desc *reset_gpio;struct phy *phy; -const struct meson_pcie_param *param; +struct phy *shared_phy; }; static struct reset_control *meson_pcie_get_reset(struct meson_pcie *mp,
@@ -130,13 +122,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 +147,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 +158,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,20 +165,40 @@ 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) + goto err; - 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_init (mp->shared_phy); +if (ret) + goto exit; + + ret =phy_power_on (mp->phy); +if (ret) + goto shared_exit; + + ret =phy_power_on (mp->shared_phy); +if (ret) + goto power_off;return 0 ; + +power_off: +phy_power_off (mp->phy); +shared_exit: +phy_exit (mp->shared_phy); +exit: +phy_exit (mp->phy); +err: +return ret; +} + +static void meson_pcie_power_off (struct meson_pcie *mp) +{ +phy_power_off (mp->shared_phy); +phy_power_off (mp->phy); +phy_exit (mp->shared_phy); +phy_exit (mp->phy); }static int meson_pcie_reset (struct meson_pcie *mp)
@@ -225,16 +206,13 @@ 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; + + ret =phy_reset (mp->shared_phy); +if (ret) +return ret;reset_control_assert (mrst->port);reset_control_assert (mrst->apb);
@@ -286,12 +264,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 +534,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 +547,13 @@ 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; + mp->phy =devm_phy_get (dev,"pcie" ); +if (IS_ERR (mp->phy)) +return PTR_ERR (mp->phy); -if (mp->param->has_shared_phy) { - mp->phy =devm_phy_get (dev,"pcie" ); -if (IS_ERR (mp->phy)) -return PTR_ERR (mp->phy); - } + mp->shared_phy =devm_phy_optional_get (dev,"shared" ); +if (IS_ERR (mp->shared_phy)) +return PTR_ERR (mp->shared_phy); mp->reset_gpio =devm_gpiod_get (dev,"reset" ,GPIOD_OUT_LOW );if (IS_ERR (mp->reset_gpio)) {
@@ -636,30 +602,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.1
Re: [PATCH v4 7/7] PCI: amlogic: Use AXG PCIE and shared MIPI/PCIE PHYs
Quoted 221 lines · Remi Pommarel
Now that PCIE PHY has been introduced for AXG, the whole
has_shared_phylogic can be mutualized between AXG and G12A platforms.This also makes use of the optional MIPI/PCIE shared fonctionality PHY found on AXG platforms, which need to be used in order to have reliable PCIE communications.
Signed-off-by Remi Pommarel <[email protected]>--- drivers/pci/controller/dwc/pci-meson.c | 140 ++++++++----------------- 1 file changed, 46 insertions(+), 94 deletions(-)drivers/pci/controller/dwc/pci-meson.c +41
-74@@ -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,7 @@ struct meson_pcie {struct meson_pcie_rc_reset mrst;struct gpio_desc *reset_gpio;struct phy *phy; -const struct meson_pcie_param *param; +struct phy *shared_phy; }; static struct reset_control *meson_pcie_get_reset(struct meson_pcie *mp,@@ -130,13 +122,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 +147,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 +158,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,20 +165,40 @@ 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) + goto err; - 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_init (mp->shared_phy); +if (ret) + goto exit; + + ret =phy_power_on (mp->phy); +if (ret) + goto shared_exit; + + ret =phy_power_on (mp->shared_phy); +if (ret) + goto power_off;return 0 ; + +power_off: +phy_power_off (mp->phy); +shared_exit: +phy_exit (mp->shared_phy); +exit: +phy_exit (mp->phy); +err: +return ret; +} + +static void meson_pcie_power_off (struct meson_pcie *mp) +{ +phy_power_off (mp->shared_phy); +phy_power_off (mp->phy); +phy_exit (mp->shared_phy); +phy_exit (mp->phy); }static int meson_pcie_reset (struct meson_pcie *mp)@@ -225,16 +206,13 @@ 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; + + ret =phy_reset (mp->shared_phy); +if (ret) +return ret;reset_control_assert (mrst->port);reset_control_assert (mrst->apb);@@ -286,12 +264,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 +534,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 +547,13 @@ 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; + mp->phy =devm_phy_get (dev,"pcie" ); +if (IS_ERR (mp->phy))
drivers/pci/controller/dwc/pci-meson.c static int meson_pcie_probe(struct platform_device *pdev) · line 556
Quoted 10 lines
drivers/pci/controller/dwc/pci-meson.c +4
-5+return PTR_ERR (mp->phy); -if (mp->param->has_shared_phy) { - mp->phy =devm_phy_get (dev,"pcie" ); -if (IS_ERR (mp->phy)) -return PTR_ERR (mp->phy); - } + mp->shared_phy =devm_phy_optional_get (dev,"shared" ); +if (IS_ERR (mp->shared_phy)) +return PTR_ERR (mp->shared_phy);
This "shared" phy doesn't appear in patch 3 (bindings) !
Not sure it's the best way to do this, maybe you could chain the MIPI phy from the PCIE phy instead, so it's the PCIE phy to enable/power/reset the MIPI PHY instead of the PCIe driver.
But still, here you don't really model the MIPI PHY, it uses way more than a register in HHI... so at least you should add all the resources needed if you wanted to model a true MIPI PHY. i.e. MIPI PHY registers, clocks, resets & co if you want to model the MIPI PHY as is.
Neil
Quoted 36 lines
drivers/pci/controller/dwc/pci-meson.c +1
-15mp->reset_gpio =devm_gpiod_get (dev,"reset" ,GPIOD_OUT_LOW );if (IS_ERR (mp->reset_gpio)) {@@ -636,30 +602,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, }, {}, };
Re: [PATCH v4 7/7] PCI: amlogic: Use AXG PCIE and shared MIPI/PCIE PHYs
Quoted 235 lines · Neil Armstrong
Quoted 221 lines · Remi Pommarel
Now that PCIE PHY has been introduced for AXG, the whole
has_shared_phylogic can be mutualized between AXG and G12A platforms.This also makes use of the optional MIPI/PCIE shared fonctionality PHY found on AXG platforms, which need to be used in order to have reliable PCIE communications.
Signed-off-by Remi Pommarel <[email protected]>--- drivers/pci/controller/dwc/pci-meson.c | 140 ++++++++----------------- 1 file changed, 46 insertions(+), 94 deletions(-)drivers/pci/controller/dwc/pci-meson.c +41
-74@@ -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,7 @@ struct meson_pcie {struct meson_pcie_rc_reset mrst;struct gpio_desc *reset_gpio;struct phy *phy; -const struct meson_pcie_param *param; +struct phy *shared_phy; }; static struct reset_control *meson_pcie_get_reset(struct meson_pcie *mp,@@ -130,13 +122,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 +147,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 +158,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,20 +165,40 @@ 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) + goto err; - 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_init (mp->shared_phy); +if (ret) + goto exit; + + ret =phy_power_on (mp->phy); +if (ret) + goto shared_exit; + + ret =phy_power_on (mp->shared_phy); +if (ret) + goto power_off;return 0 ; + +power_off: +phy_power_off (mp->phy); +shared_exit: +phy_exit (mp->shared_phy); +exit: +phy_exit (mp->phy); +err: +return ret; +} + +static void meson_pcie_power_off (struct meson_pcie *mp) +{ +phy_power_off (mp->shared_phy); +phy_power_off (mp->phy); +phy_exit (mp->shared_phy); +phy_exit (mp->phy); }static int meson_pcie_reset (struct meson_pcie *mp)@@ -225,16 +206,13 @@ 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; + + ret =phy_reset (mp->shared_phy); +if (ret) +return ret;reset_control_assert (mrst->port);reset_control_assert (mrst->apb);@@ -286,12 +264,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 +534,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 +547,13 @@ 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; + mp->phy =devm_phy_get (dev,"pcie" ); +if (IS_ERR (mp->phy))drivers/pci/controller/dwc/pci-meson.c static int meson_pcie_probe(struct platform_device *pdev) · line 556
Quoted 10 lines
drivers/pci/controller/dwc/pci-meson.c +4
-5+return PTR_ERR (mp->phy); -if (mp->param->has_shared_phy) { - mp->phy =devm_phy_get (dev,"pcie" ); -if (IS_ERR (mp->phy)) -return PTR_ERR (mp->phy); - } + mp->shared_phy =devm_phy_optional_get (dev,"shared" ); +if (IS_ERR (mp->shared_phy)) +return PTR_ERR (mp->shared_phy);This "shared" phy doesn't appear in patch 3 (bindings) !
Quoted 3 lines
Not sure it's the best way to do this, maybe you could chain the MIPI phy from the PCIE phy instead, so it's the PCIE phy to enable/power/reset the MIPI PHY instead of the PCIe driver.
Sure will do.
Quoted 5 lines
But still, here you don't really model the MIPI PHY, it uses way more than a register in HHI... so at least you should add all the resources needed if you wanted to model a true MIPI PHY. i.e. MIPI PHY registers, clocks, resets & co if you want to model the MIPI PHY as is.
As discussed on IRC, I will rename this as mipi-analog-phy to match the datasheet and at some point if some platform ever needed MIPI feature, a mipi-digital-phy driver that handles the registers that are not in HHI as well as the clocks, resets, ... could be added.
Thanks,
Signature · 1 line
Remi
Quoted 40 lines
Neil
Quoted 36 lines
drivers/pci/controller/dwc/pci-meson.c +1
-15mp->reset_gpio =devm_gpiod_get (dev,"reset" ,GPIOD_OUT_LOW );if (IS_ERR (mp->reset_gpio)) {@@ -636,30 +602,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, }, {}, };