PCI: amlogic: Make PCIe working reliably on AXG platforms
Subsystems (5)
v2 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 devicetree and its documentation modifications as well as CLKID_MIPI_ENABLE will be sent as different series if this one is considered sane.
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 (3):
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
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 | 176 ++++++++++++++++++ drivers/phy/amlogic/phy-meson-axg-pcie.c | 163 ++++++++++++++++ 5 files changed, 409 insertions(+), 94 deletions(-) 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.0
PATCH v2 1/3 phy: amlogic: Add Amlogic AXG MIPI/PCIE PHY Driver
This 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 | 176 ++++++++++++++++++ 3 files changed, 188 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 MFD_SYSCON + 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 +176 -0
176 lines not on this page · raw message
Signature · 1 line
2.24.0
Re: [PATCH v2 1/3] phy: amlogic: Add Amlogic AXG MIPI/PCIE PHY Driver
Hi,
Quoted 204 lines · Remi Pommarel
This 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_enableclock 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.Signed-off-by Remi Pommarel <[email protected]>--- drivers/phy/amlogic/Kconfig | 11 ++ drivers/phy/amlogic/Makefile | 1 + drivers/phy/amlogic/phy-meson-axg-mipi-pcie.c | 176 ++++++++++++++++++ 3 files changed, 188 insertions(+) create mode 100644 drivers/phy/amlogic/phy-meson-axg-mipi-pcie.cdrivers/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 MFD_SYSCON + 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.odrivers/phy/amlogic/phy-meson-axg-mipi-pcie.c new file +149
-0@@ -0,0 +1,176 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Amlogic AXG MIPI + PCIE PHY driver +* +* Copyright (C) 2019 Remi Pommarel <[email protected]> +*/ +#include <linux/module.h> +#include <linux/phy/phy.h> +#include <linux/regmap.h> +#include <linux/mfd/syscon.h> +#include <linux/platform_device.h> +#include <dt-bindings/phy/phy.h> + +#define HHI_MIPI_CNTL0 0x00 +#define HHI_MIPI_CNTL0_COMMON_BLOCK GENMASK(31, 28) +#define HHI_MIPI_CNTL0_ENABLE BIT(29) +#define HHI_MIPI_CNTL0_BANDGAP BIT(26) +#define HHI_MIPI_CNTL0_DECODE_TO_RTERM GENMASK(15, 12) +#define HHI_MIPI_CNTL0_OUTPUT_EN BIT(3) + +#define HHI_MIPI_CNTL1 0x01 +#define HHI_MIPI_CNTL1_CH0_CML_PDR_EN BIT(12) +#define HHI_MIPI_CNTL1_LP_ABILITY GENMASK(5, 4) +#define HHI_MIPI_CNTL1_LP_RESISTER BIT(3) +#define HHI_MIPI_CNTL1_INPUT_SETTING BIT(2) +#define HHI_MIPI_CNTL1_INPUT_SEL BIT(1) +#define HHI_MIPI_CNTL1_PRBS7_EN BIT(0) + +#define HHI_MIPI_CNTL2 0x02 +#define HHI_MIPI_CNTL2_CH_PU GENMASK(31, 25) +#define HHI_MIPI_CNTL2_CH_CTL GENMASK(24, 19) +#define HHI_MIPI_CNTL2_CH0_DIGDR_EN BIT(18) +#define HHI_MIPI_CNTL2_CH_DIGDR_EN BIT(17) +#define HHI_MIPI_CNTL2_LPULPS_EN BIT(16) +#define HHI_MIPI_CNTL2_CH_EN (n) BIT(15 - (n)) +#define HHI_MIPI_CNTL2_CH0_LP_CTL GENMASK(10, 1) + +struct phy_axg_mipi_pcie_priv { +struct phy *phy; +unsigned int mode; +struct regmap *regmap; +}; + +static const struct regmap_config phy_axg_mipi_pcie_regmap_conf = { + .reg_bits =8 , + .val_bits =32 , + .reg_stride =4 , + .max_register =HHI_MIPI_CNTL2 , +}; + +static int phy_axg_mipi_pcie_power_on (struct phy *phy) +{ +struct phy_axg_mipi_pcie_priv *priv =phy_get_drvdata (phy); + +/* MIPI not supported yet */ +if (priv->mode !=PHY_TYPE_PCIE ) +return 0 ; + +regmap_update_bits (priv->regmap,HHI_MIPI_CNTL0 , +HHI_MIPI_CNTL0_BANDGAP ,HHI_MIPI_CNTL0_BANDGAP ); + +regmap_update_bits (priv->regmap,HHI_MIPI_CNTL0 , +HHI_MIPI_CNTL0_ENABLE ,HHI_MIPI_CNTL0_ENABLE ); +return 0 ; +} + +static int phy_axg_mipi_pcie_power_off (struct phy *phy) +{ +struct phy_axg_mipi_pcie_priv *priv =phy_get_drvdata (phy); + +/* MIPI not supported yet */ +if (priv->mode !=PHY_TYPE_PCIE ) +return 0 ; + +regmap_update_bits (priv->regmap,HHI_MIPI_CNTL0 , +HHI_MIPI_CNTL0_BANDGAP ,0 ); +regmap_update_bits (priv->regmap,HHI_MIPI_CNTL0 , +HHI_MIPI_CNTL0_ENABLE ,0 ); +return 0 ; +} + +static int phy_axg_mipi_pcie_init (struct phy *phy) +{ +return 0 ; +} + +static int phy_axg_mipi_pcie_exit (struct phy *phy) +{ +return 0 ; +} + +static const struct phy_ops phy_axg_mipi_pcie_ops = { + .init = phy_axg_mipi_pcie_init, + .exit = phy_axg_mipi_pcie_exit, + .power_on = phy_axg_mipi_pcie_power_on, + .power_off = phy_axg_mipi_pcie_power_off, + .owner =THIS_MODULE , +}; + +static struct phy *phy_axg_mipi_pcie_xlate (struct device *dev, +struct of_phandle_args *args) +{ +struct phy_axg_mipi_pcie_priv *priv =dev_get_drvdata (dev); +unsigned int mode; + +if (args->args_count !=1 ) { +dev_err (dev,"invalid number of arguments\n" ); +return ERR_PTR (-EINVAL ); + } + + mode = args->args[0 ]; + +/* MIPI mode is not supported yet */ +if (mode !=PHY_TYPE_PCIE ) { +dev_err (dev,"invalid phy mode select argument\n" ); +return ERR_PTR (-EINVAL ); + } + + priv->mode = mode; +return priv->phy; +} + +static int phy_axg_mipi_pcie_probe (struct platform_device *pdev) +{ +struct phy_provider *pphy; +struct device *dev = &pdev->dev; +struct phy_axg_mipi_pcie_priv *priv; +struct device_node *np = dev->of_node; +int ret; + + priv =devm_kmalloc (dev,sizeof (*priv),GFP_KERNEL ); +if (!priv) +return -ENOMEM ; + +/* Get the hhi system controller node */ + priv->regmap =syscon_node_to_regmap (of_get_parent (dev->of_node)); +if (IS_ERR (priv->regmap)) { +dev_err (dev,"failed to get HHI regmap\n" ); +return PTR_ERR (priv->regmap); + } + + priv->phy =devm_phy_create (dev, np, &phy_axg_mipi_pcie_ops); +if (IS_ERR (priv->phy)) { + ret =PTR_ERR (priv->phy); +if (ret != -EPROBE_DEFER ) +dev_err (dev,"failed to create PHY\n" ); +return ret; + } +
drivers/phy/amlogic/phy-meson-axg-mipi-pcie.c line 159
Quoted 10 lines
drivers/phy/amlogic/phy-meson-axg-mipi-pcie.c new file +10
-0+phy_set_drvdata (priv->phy, priv); +dev_set_drvdata (dev, priv); + pphy =devm_of_phy_provider_register (dev, phy_axg_mipi_pcie_xlate); + +return PTR_ERR_OR_ZERO (pphy); +} + +static const struct of_device_id phy_axg_mipi_pcie_of_match[] = { + { + .compatible ="amlogic,axg-mipi-pcie-phy" ,
Is there a dt-binding documentation for this?
Thanks
Kishon
Re: [PATCH v2 1/3] phy: amlogic: Add Amlogic AXG MIPI/PCIE PHY Driver
Quoted 211 lines · Kishon Vijay Abraham I
Hi,
Quoted 208 lines · Remi Pommarel
This 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_enableclock 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.Signed-off-by Remi Pommarel <[email protected]>--- drivers/phy/amlogic/Kconfig | 11 ++ drivers/phy/amlogic/Makefile | 1 + drivers/phy/amlogic/phy-meson-axg-mipi-pcie.c | 176 ++++++++++++++++++ 3 files changed, 188 insertions(+) create mode 100644 drivers/phy/amlogic/phy-meson-axg-mipi-pcie.cdrivers/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 MFD_SYSCON + 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.odrivers/phy/amlogic/phy-meson-axg-mipi-pcie.c new file +153
-0@@ -0,0 +1,176 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Amlogic AXG MIPI + PCIE PHY driver +* +* Copyright (C) 2019 Remi Pommarel <[email protected]> +*/ +#include <linux/module.h> +#include <linux/phy/phy.h> +#include <linux/regmap.h> +#include <linux/mfd/syscon.h> +#include <linux/platform_device.h> +#include <dt-bindings/phy/phy.h> + +#define HHI_MIPI_CNTL0 0x00 +#define HHI_MIPI_CNTL0_COMMON_BLOCK GENMASK(31, 28) +#define HHI_MIPI_CNTL0_ENABLE BIT(29) +#define HHI_MIPI_CNTL0_BANDGAP BIT(26) +#define HHI_MIPI_CNTL0_DECODE_TO_RTERM GENMASK(15, 12) +#define HHI_MIPI_CNTL0_OUTPUT_EN BIT(3) + +#define HHI_MIPI_CNTL1 0x01 +#define HHI_MIPI_CNTL1_CH0_CML_PDR_EN BIT(12) +#define HHI_MIPI_CNTL1_LP_ABILITY GENMASK(5, 4) +#define HHI_MIPI_CNTL1_LP_RESISTER BIT(3) +#define HHI_MIPI_CNTL1_INPUT_SETTING BIT(2) +#define HHI_MIPI_CNTL1_INPUT_SEL BIT(1) +#define HHI_MIPI_CNTL1_PRBS7_EN BIT(0) + +#define HHI_MIPI_CNTL2 0x02 +#define HHI_MIPI_CNTL2_CH_PU GENMASK(31, 25) +#define HHI_MIPI_CNTL2_CH_CTL GENMASK(24, 19) +#define HHI_MIPI_CNTL2_CH0_DIGDR_EN BIT(18) +#define HHI_MIPI_CNTL2_CH_DIGDR_EN BIT(17) +#define HHI_MIPI_CNTL2_LPULPS_EN BIT(16) +#define HHI_MIPI_CNTL2_CH_EN (n) BIT(15 - (n)) +#define HHI_MIPI_CNTL2_CH0_LP_CTL GENMASK(10, 1) + +struct phy_axg_mipi_pcie_priv { +struct phy *phy; +unsigned int mode; +struct regmap *regmap; +}; + +static const struct regmap_config phy_axg_mipi_pcie_regmap_conf = { + .reg_bits =8 , + .val_bits =32 , + .reg_stride =4 , + .max_register =HHI_MIPI_CNTL2 , +}; + +static int phy_axg_mipi_pcie_power_on (struct phy *phy) +{ +struct phy_axg_mipi_pcie_priv *priv =phy_get_drvdata (phy); + +/* MIPI not supported yet */ +if (priv->mode !=PHY_TYPE_PCIE ) +return 0 ; + +regmap_update_bits (priv->regmap,HHI_MIPI_CNTL0 , +HHI_MIPI_CNTL0_BANDGAP ,HHI_MIPI_CNTL0_BANDGAP ); + +regmap_update_bits (priv->regmap,HHI_MIPI_CNTL0 , +HHI_MIPI_CNTL0_ENABLE ,HHI_MIPI_CNTL0_ENABLE ); +return 0 ; +} + +static int phy_axg_mipi_pcie_power_off (struct phy *phy) +{ +struct phy_axg_mipi_pcie_priv *priv =phy_get_drvdata (phy); + +/* MIPI not supported yet */ +if (priv->mode !=PHY_TYPE_PCIE ) +return 0 ; + +regmap_update_bits (priv->regmap,HHI_MIPI_CNTL0 , +HHI_MIPI_CNTL0_BANDGAP ,0 ); +regmap_update_bits (priv->regmap,HHI_MIPI_CNTL0 , +HHI_MIPI_CNTL0_ENABLE ,0 ); +return 0 ; +} + +static int phy_axg_mipi_pcie_init (struct phy *phy) +{ +return 0 ; +} + +static int phy_axg_mipi_pcie_exit (struct phy *phy) +{ +return 0 ; +} + +static const struct phy_ops phy_axg_mipi_pcie_ops = { + .init = phy_axg_mipi_pcie_init, + .exit = phy_axg_mipi_pcie_exit, + .power_on = phy_axg_mipi_pcie_power_on, + .power_off = phy_axg_mipi_pcie_power_off, + .owner =THIS_MODULE , +}; + +static struct phy *phy_axg_mipi_pcie_xlate (struct device *dev, +struct of_phandle_args *args) +{ +struct phy_axg_mipi_pcie_priv *priv =dev_get_drvdata (dev); +unsigned int mode; + +if (args->args_count !=1 ) { +dev_err (dev,"invalid number of arguments\n" ); +return ERR_PTR (-EINVAL ); + } + + mode = args->args[0 ]; + +/* MIPI mode is not supported yet */ +if (mode !=PHY_TYPE_PCIE ) { +dev_err (dev,"invalid phy mode select argument\n" ); +return ERR_PTR (-EINVAL ); + } + + priv->mode = mode; +return priv->phy; +} + +static int phy_axg_mipi_pcie_probe (struct platform_device *pdev) +{ +struct phy_provider *pphy; +struct device *dev = &pdev->dev; +struct phy_axg_mipi_pcie_priv *priv; +struct device_node *np = dev->of_node; +int ret; + + priv =devm_kmalloc (dev,sizeof (*priv),GFP_KERNEL ); +if (!priv) +return -ENOMEM ; + +/* Get the hhi system controller node */ + priv->regmap =syscon_node_to_regmap (of_get_parent (dev->of_node)); +if (IS_ERR (priv->regmap)) { +dev_err (dev,"failed to get HHI regmap\n" ); +return PTR_ERR (priv->regmap); + } + + priv->phy =devm_phy_create (dev, np, &phy_axg_mipi_pcie_ops); +if (IS_ERR (priv->phy)) { + ret =PTR_ERR (priv->phy); +if (ret != -EPROBE_DEFER ) +dev_err (dev,"failed to create PHY\n" ); +return ret; + } + +phy_set_drvdata (priv->phy, priv); +dev_set_drvdata (dev, priv); + pphy =devm_of_phy_provider_register (dev, phy_axg_mipi_pcie_xlate); +
Quoted 8 lines
drivers/phy/amlogic/phy-meson-axg-mipi-pcie.c line 159
Quoted 6 lines
drivers/phy/amlogic/phy-meson-axg-mipi-pcie.c new file +6
-0+return PTR_ERR_OR_ZERO (pphy); +} + +static const struct of_device_id phy_axg_mipi_pcie_of_match[] = { + { + .compatible ="amlogic,axg-mipi-pcie-phy" ,Is there a dt-binding documentation for this?
There is binding documentation updates for this whole serie but I thought they were supposed to be sent in separate serie, which is not the case apparently.
Thanks,
Signature · 1 line
Remi
Jerome Brunet
reviewerRe: [PATCH v2 1/3] phy: amlogic: Add Amlogic AXG MIPI/PCIE PHY Driver
Quoted 221 lines · Remi Pommarel
Quoted 211 lines · Kishon Vijay Abraham I
Hi,
Quoted 208 lines · Remi Pommarel
This 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_enableclock 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.Signed-off-by Remi Pommarel <[email protected]>--- drivers/phy/amlogic/Kconfig | 11 ++ drivers/phy/amlogic/Makefile | 1 + drivers/phy/amlogic/phy-meson-axg-mipi-pcie.c | 176 ++++++++++++++++++ 3 files changed, 188 insertions(+) create mode 100644 drivers/phy/amlogic/phy-meson-axg-mipi-pcie.cdrivers/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 MFD_SYSCON + 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.odrivers/phy/amlogic/phy-meson-axg-mipi-pcie.c new file +153
-0@@ -0,0 +1,176 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Amlogic AXG MIPI + PCIE PHY driver +* +* Copyright (C) 2019 Remi Pommarel <[email protected]> +*/ +#include <linux/module.h> +#include <linux/phy/phy.h> +#include <linux/regmap.h> +#include <linux/mfd/syscon.h> +#include <linux/platform_device.h> +#include <dt-bindings/phy/phy.h> + +#define HHI_MIPI_CNTL0 0x00 +#define HHI_MIPI_CNTL0_COMMON_BLOCK GENMASK(31, 28) +#define HHI_MIPI_CNTL0_ENABLE BIT(29) +#define HHI_MIPI_CNTL0_BANDGAP BIT(26) +#define HHI_MIPI_CNTL0_DECODE_TO_RTERM GENMASK(15, 12) +#define HHI_MIPI_CNTL0_OUTPUT_EN BIT(3) + +#define HHI_MIPI_CNTL1 0x01 +#define HHI_MIPI_CNTL1_CH0_CML_PDR_EN BIT(12) +#define HHI_MIPI_CNTL1_LP_ABILITY GENMASK(5, 4) +#define HHI_MIPI_CNTL1_LP_RESISTER BIT(3) +#define HHI_MIPI_CNTL1_INPUT_SETTING BIT(2) +#define HHI_MIPI_CNTL1_INPUT_SEL BIT(1) +#define HHI_MIPI_CNTL1_PRBS7_EN BIT(0) + +#define HHI_MIPI_CNTL2 0x02 +#define HHI_MIPI_CNTL2_CH_PU GENMASK(31, 25) +#define HHI_MIPI_CNTL2_CH_CTL GENMASK(24, 19) +#define HHI_MIPI_CNTL2_CH0_DIGDR_EN BIT(18) +#define HHI_MIPI_CNTL2_CH_DIGDR_EN BIT(17) +#define HHI_MIPI_CNTL2_LPULPS_EN BIT(16) +#define HHI_MIPI_CNTL2_CH_EN (n) BIT(15 - (n)) +#define HHI_MIPI_CNTL2_CH0_LP_CTL GENMASK(10, 1) + +struct phy_axg_mipi_pcie_priv { +struct phy *phy; +unsigned int mode; +struct regmap *regmap; +}; + +static const struct regmap_config phy_axg_mipi_pcie_regmap_conf = { + .reg_bits =8 , + .val_bits =32 , + .reg_stride =4 , + .max_register =HHI_MIPI_CNTL2 , +}; + +static int phy_axg_mipi_pcie_power_on (struct phy *phy) +{ +struct phy_axg_mipi_pcie_priv *priv =phy_get_drvdata (phy); + +/* MIPI not supported yet */ +if (priv->mode !=PHY_TYPE_PCIE ) +return 0 ; + +regmap_update_bits (priv->regmap,HHI_MIPI_CNTL0 , +HHI_MIPI_CNTL0_BANDGAP ,HHI_MIPI_CNTL0_BANDGAP ); + +regmap_update_bits (priv->regmap,HHI_MIPI_CNTL0 , +HHI_MIPI_CNTL0_ENABLE ,HHI_MIPI_CNTL0_ENABLE ); +return 0 ; +} + +static int phy_axg_mipi_pcie_power_off (struct phy *phy) +{ +struct phy_axg_mipi_pcie_priv *priv =phy_get_drvdata (phy); + +/* MIPI not supported yet */ +if (priv->mode !=PHY_TYPE_PCIE ) +return 0 ; + +regmap_update_bits (priv->regmap,HHI_MIPI_CNTL0 , +HHI_MIPI_CNTL0_BANDGAP ,0 ); +regmap_update_bits (priv->regmap,HHI_MIPI_CNTL0 , +HHI_MIPI_CNTL0_ENABLE ,0 ); +return 0 ; +} + +static int phy_axg_mipi_pcie_init (struct phy *phy) +{ +return 0 ; +} + +static int phy_axg_mipi_pcie_exit (struct phy *phy) +{ +return 0 ; +} + +static const struct phy_ops phy_axg_mipi_pcie_ops = { + .init = phy_axg_mipi_pcie_init, + .exit = phy_axg_mipi_pcie_exit, + .power_on = phy_axg_mipi_pcie_power_on, + .power_off = phy_axg_mipi_pcie_power_off, + .owner =THIS_MODULE , +}; + +static struct phy *phy_axg_mipi_pcie_xlate (struct device *dev, +struct of_phandle_args *args) +{ +struct phy_axg_mipi_pcie_priv *priv =dev_get_drvdata (dev); +unsigned int mode; + +if (args->args_count !=1 ) { +dev_err (dev,"invalid number of arguments\n" ); +return ERR_PTR (-EINVAL ); + } + + mode = args->args[0 ]; + +/* MIPI mode is not supported yet */ +if (mode !=PHY_TYPE_PCIE ) { +dev_err (dev,"invalid phy mode select argument\n" ); +return ERR_PTR (-EINVAL ); + } + + priv->mode = mode; +return priv->phy; +} + +static int phy_axg_mipi_pcie_probe (struct platform_device *pdev) +{ +struct phy_provider *pphy; +struct device *dev = &pdev->dev; +struct phy_axg_mipi_pcie_priv *priv; +struct device_node *np = dev->of_node; +int ret; + + priv =devm_kmalloc (dev,sizeof (*priv),GFP_KERNEL ); +if (!priv) +return -ENOMEM ; + +/* Get the hhi system controller node */ + priv->regmap =syscon_node_to_regmap (of_get_parent (dev->of_node)); +if (IS_ERR (priv->regmap)) { +dev_err (dev,"failed to get HHI regmap\n" ); +return PTR_ERR (priv->regmap); + } + + priv->phy =devm_phy_create (dev, np, &phy_axg_mipi_pcie_ops); +if (IS_ERR (priv->phy)) { + ret =PTR_ERR (priv->phy); +if (ret != -EPROBE_DEFER ) +dev_err (dev,"failed to create PHY\n" ); +return ret; + } + +phy_set_drvdata (priv->phy, priv); +dev_set_drvdata (dev, priv); + pphy =devm_of_phy_provider_register (dev, phy_axg_mipi_pcie_xlate); +Quoted 8 lines
drivers/phy/amlogic/phy-meson-axg-mipi-pcie.c line 159
Quoted 6 lines
drivers/phy/amlogic/phy-meson-axg-mipi-pcie.c new file +6
-0+return PTR_ERR_OR_ZERO (pphy); +} + +static const struct of_device_id phy_axg_mipi_pcie_of_match[] = { + { + .compatible ="amlogic,axg-mipi-pcie-phy" ,Is there a dt-binding documentation for this?
Quoted 3 lines
There is binding documentation updates for this whole serie but I thought they were supposed to be sent in separate serie, which is not the case apparently.
Different patches, but same series is recommended ;)
Quoted 2 lines
Thanks,
Jerome Brunet
reviewerRe: [PATCH v2 1/3] phy: amlogic: Add Amlogic AXG MIPI/PCIE PHY Driver
In reply to Remi PommarelQuoted 185 lines · Remi Pommarel
This 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_enableclock 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.Signed-off-by Remi Pommarel <[email protected]>--- drivers/phy/amlogic/Kconfig | 11 ++ drivers/phy/amlogic/Makefile | 1 + drivers/phy/amlogic/phy-meson-axg-mipi-pcie.c | 176 ++++++++++++++++++ 3 files changed, 188 insertions(+) create mode 100644 drivers/phy/amlogic/phy-meson-axg-mipi-pcie.cdrivers/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 MFD_SYSCON + 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.odrivers/phy/amlogic/phy-meson-axg-mipi-pcie.c new file +130
-0@@ -0,0 +1,176 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Amlogic AXG MIPI + PCIE PHY driver +* +* Copyright (C) 2019 Remi Pommarel <[email protected]> +*/ +#include <linux/module.h> +#include <linux/phy/phy.h> +#include <linux/regmap.h> +#include <linux/mfd/syscon.h> +#include <linux/platform_device.h> +#include <dt-bindings/phy/phy.h> + +#define HHI_MIPI_CNTL0 0x00 +#define HHI_MIPI_CNTL0_COMMON_BLOCK GENMASK(31, 28) +#define HHI_MIPI_CNTL0_ENABLE BIT(29) +#define HHI_MIPI_CNTL0_BANDGAP BIT(26) +#define HHI_MIPI_CNTL0_DECODE_TO_RTERM GENMASK(15, 12) +#define HHI_MIPI_CNTL0_OUTPUT_EN BIT(3) + +#define HHI_MIPI_CNTL1 0x01 +#define HHI_MIPI_CNTL1_CH0_CML_PDR_EN BIT(12) +#define HHI_MIPI_CNTL1_LP_ABILITY GENMASK(5, 4) +#define HHI_MIPI_CNTL1_LP_RESISTER BIT(3) +#define HHI_MIPI_CNTL1_INPUT_SETTING BIT(2) +#define HHI_MIPI_CNTL1_INPUT_SEL BIT(1) +#define HHI_MIPI_CNTL1_PRBS7_EN BIT(0) + +#define HHI_MIPI_CNTL2 0x02 +#define HHI_MIPI_CNTL2_CH_PU GENMASK(31, 25) +#define HHI_MIPI_CNTL2_CH_CTL GENMASK(24, 19) +#define HHI_MIPI_CNTL2_CH0_DIGDR_EN BIT(18) +#define HHI_MIPI_CNTL2_CH_DIGDR_EN BIT(17) +#define HHI_MIPI_CNTL2_LPULPS_EN BIT(16) +#define HHI_MIPI_CNTL2_CH_EN (n) BIT(15 - (n)) +#define HHI_MIPI_CNTL2_CH0_LP_CTL GENMASK(10, 1) + +struct phy_axg_mipi_pcie_priv { +struct phy *phy; +unsigned int mode; +struct regmap *regmap; +}; + +static const struct regmap_config phy_axg_mipi_pcie_regmap_conf = { + .reg_bits =8 , + .val_bits =32 , + .reg_stride =4 , + .max_register =HHI_MIPI_CNTL2 , +}; + +static int phy_axg_mipi_pcie_power_on (struct phy *phy) +{ +struct phy_axg_mipi_pcie_priv *priv =phy_get_drvdata (phy); + +/* MIPI not supported yet */ +if (priv->mode !=PHY_TYPE_PCIE ) +return 0 ; + +regmap_update_bits (priv->regmap,HHI_MIPI_CNTL0 , +HHI_MIPI_CNTL0_BANDGAP ,HHI_MIPI_CNTL0_BANDGAP ); + +regmap_update_bits (priv->regmap,HHI_MIPI_CNTL0 , +HHI_MIPI_CNTL0_ENABLE ,HHI_MIPI_CNTL0_ENABLE ); +return 0 ; +} + +static int phy_axg_mipi_pcie_power_off (struct phy *phy) +{ +struct phy_axg_mipi_pcie_priv *priv =phy_get_drvdata (phy); + +/* MIPI not supported yet */ +if (priv->mode !=PHY_TYPE_PCIE ) +return 0 ; + +regmap_update_bits (priv->regmap,HHI_MIPI_CNTL0 , +HHI_MIPI_CNTL0_BANDGAP ,0 ); +regmap_update_bits (priv->regmap,HHI_MIPI_CNTL0 , +HHI_MIPI_CNTL0_ENABLE ,0 ); +return 0 ; +} + +static int phy_axg_mipi_pcie_init (struct phy *phy) +{ +return 0 ; +} + +static int phy_axg_mipi_pcie_exit (struct phy *phy) +{ +return 0 ; +} + +static const struct phy_ops phy_axg_mipi_pcie_ops = { + .init = phy_axg_mipi_pcie_init, + .exit = phy_axg_mipi_pcie_exit, + .power_on = phy_axg_mipi_pcie_power_on, + .power_off = phy_axg_mipi_pcie_power_off, + .owner =THIS_MODULE , +}; + +static struct phy *phy_axg_mipi_pcie_xlate (struct device *dev, +struct of_phandle_args *args) +{ +struct phy_axg_mipi_pcie_priv *priv =dev_get_drvdata (dev); +unsigned int mode; + +if (args->args_count !=1 ) { +dev_err (dev,"invalid number of arguments\n" ); +return ERR_PTR (-EINVAL ); + } + + mode = args->args[0 ]; + +/* MIPI mode is not supported yet */ +if (mode !=PHY_TYPE_PCIE ) { +dev_err (dev,"invalid phy mode select argument\n" ); +return ERR_PTR (-EINVAL ); + } + + priv->mode = mode; +return priv->phy; +} + +static int phy_axg_mipi_pcie_probe (struct platform_device *pdev) +{ +struct phy_provider *pphy; +struct device *dev = &pdev->dev; +struct phy_axg_mipi_pcie_priv *priv; +struct device_node *np = dev->of_node; +int ret; +
drivers/phy/amlogic/phy-meson-axg-mipi-pcie.c line 140
Quoted 10 lines
drivers/phy/amlogic/phy-meson-axg-mipi-pcie.c new file +10
-0+ priv =devm_kmalloc (dev,sizeof (*priv),GFP_KERNEL ); +if (!priv) +return -ENOMEM ; + +/* Get the hhi system controller node */ + priv->regmap =syscon_node_to_regmap (of_get_parent (dev->of_node)); +if (IS_ERR (priv->regmap)) { +dev_err (dev,"failed to get HHI regmap\n" ); +return PTR_ERR (priv->regmap); + }
Remi,
Unless we are absolutely sure this will be *AXG ONLY*, I would prefer if you get the registers without the syscon.
Having it introduce some kind of dependency between the 2 which is likely to make this driver SoC specific.
It was clearly wrong for the clock controller to map these regiters, and if there is a possibility that this driver is used on other SoCs, I would prefer if we did not carry that mistake over. I would prefer if we fixed the clock controller so you don't need syscon here.
Quoted 36 lines
drivers/phy/amlogic/phy-meson-axg-mipi-pcie.c new file +36
-0+ + priv->phy =devm_phy_create (dev, np, &phy_axg_mipi_pcie_ops); +if (IS_ERR (priv->phy)) { + ret =PTR_ERR (priv->phy); +if (ret != -EPROBE_DEFER ) +dev_err (dev,"failed to create PHY\n" ); +return ret; + } + +phy_set_drvdata (priv->phy, priv); +dev_set_drvdata (dev, priv); + pphy =devm_of_phy_provider_register (dev, phy_axg_mipi_pcie_xlate); + +return PTR_ERR_OR_ZERO (pphy); +} + +static const struct of_device_id phy_axg_mipi_pcie_of_match[] = { + { + .compatible ="amlogic,axg-mipi-pcie-phy" , + }, + { }, +}; +MODULE_DEVICE_TABLE (of, phy_axg_mipi_pcie_of_match); + +static struct platform_driver phy_axg_mipi_pcie_driver = { + .probe = phy_axg_mipi_pcie_probe, + .driver = { + .name ="phy-axg-mipi-pcie" , + .of_match_table = phy_axg_mipi_pcie_of_match, + }, +}; +module_platform_driver (phy_axg_mipi_pcie_driver); + +MODULE_AUTHOR ("Remi Pommarel <[email protected]>" ); +MODULE_DESCRIPTION ("Amlogic AXG MIPI + PCIE PHY driver" ); +MODULE_LICENSE ("GPL v2" );
Re: [PATCH v2 1/3] phy: amlogic: Add Amlogic AXG MIPI/PCIE PHY Driver
Quoted 204 lines · Jerome Brunet
Quoted 185 lines · Remi Pommarel
This 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_enableclock 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.Signed-off-by Remi Pommarel <[email protected]>--- drivers/phy/amlogic/Kconfig | 11 ++ drivers/phy/amlogic/Makefile | 1 + drivers/phy/amlogic/phy-meson-axg-mipi-pcie.c | 176 ++++++++++++++++++ 3 files changed, 188 insertions(+) create mode 100644 drivers/phy/amlogic/phy-meson-axg-mipi-pcie.cdrivers/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 MFD_SYSCON + 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.odrivers/phy/amlogic/phy-meson-axg-mipi-pcie.c new file +130
-0@@ -0,0 +1,176 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Amlogic AXG MIPI + PCIE PHY driver +* +* Copyright (C) 2019 Remi Pommarel <[email protected]> +*/ +#include <linux/module.h> +#include <linux/phy/phy.h> +#include <linux/regmap.h> +#include <linux/mfd/syscon.h> +#include <linux/platform_device.h> +#include <dt-bindings/phy/phy.h> + +#define HHI_MIPI_CNTL0 0x00 +#define HHI_MIPI_CNTL0_COMMON_BLOCK GENMASK(31, 28) +#define HHI_MIPI_CNTL0_ENABLE BIT(29) +#define HHI_MIPI_CNTL0_BANDGAP BIT(26) +#define HHI_MIPI_CNTL0_DECODE_TO_RTERM GENMASK(15, 12) +#define HHI_MIPI_CNTL0_OUTPUT_EN BIT(3) + +#define HHI_MIPI_CNTL1 0x01 +#define HHI_MIPI_CNTL1_CH0_CML_PDR_EN BIT(12) +#define HHI_MIPI_CNTL1_LP_ABILITY GENMASK(5, 4) +#define HHI_MIPI_CNTL1_LP_RESISTER BIT(3) +#define HHI_MIPI_CNTL1_INPUT_SETTING BIT(2) +#define HHI_MIPI_CNTL1_INPUT_SEL BIT(1) +#define HHI_MIPI_CNTL1_PRBS7_EN BIT(0) + +#define HHI_MIPI_CNTL2 0x02 +#define HHI_MIPI_CNTL2_CH_PU GENMASK(31, 25) +#define HHI_MIPI_CNTL2_CH_CTL GENMASK(24, 19) +#define HHI_MIPI_CNTL2_CH0_DIGDR_EN BIT(18) +#define HHI_MIPI_CNTL2_CH_DIGDR_EN BIT(17) +#define HHI_MIPI_CNTL2_LPULPS_EN BIT(16) +#define HHI_MIPI_CNTL2_CH_EN (n) BIT(15 - (n)) +#define HHI_MIPI_CNTL2_CH0_LP_CTL GENMASK(10, 1) + +struct phy_axg_mipi_pcie_priv { +struct phy *phy; +unsigned int mode; +struct regmap *regmap; +}; + +static const struct regmap_config phy_axg_mipi_pcie_regmap_conf = { + .reg_bits =8 , + .val_bits =32 , + .reg_stride =4 , + .max_register =HHI_MIPI_CNTL2 , +}; + +static int phy_axg_mipi_pcie_power_on (struct phy *phy) +{ +struct phy_axg_mipi_pcie_priv *priv =phy_get_drvdata (phy); + +/* MIPI not supported yet */ +if (priv->mode !=PHY_TYPE_PCIE ) +return 0 ; + +regmap_update_bits (priv->regmap,HHI_MIPI_CNTL0 , +HHI_MIPI_CNTL0_BANDGAP ,HHI_MIPI_CNTL0_BANDGAP ); + +regmap_update_bits (priv->regmap,HHI_MIPI_CNTL0 , +HHI_MIPI_CNTL0_ENABLE ,HHI_MIPI_CNTL0_ENABLE ); +return 0 ; +} + +static int phy_axg_mipi_pcie_power_off (struct phy *phy) +{ +struct phy_axg_mipi_pcie_priv *priv =phy_get_drvdata (phy); + +/* MIPI not supported yet */ +if (priv->mode !=PHY_TYPE_PCIE ) +return 0 ; + +regmap_update_bits (priv->regmap,HHI_MIPI_CNTL0 , +HHI_MIPI_CNTL0_BANDGAP ,0 ); +regmap_update_bits (priv->regmap,HHI_MIPI_CNTL0 , +HHI_MIPI_CNTL0_ENABLE ,0 ); +return 0 ; +} + +static int phy_axg_mipi_pcie_init (struct phy *phy) +{ +return 0 ; +} + +static int phy_axg_mipi_pcie_exit (struct phy *phy) +{ +return 0 ; +} + +static const struct phy_ops phy_axg_mipi_pcie_ops = { + .init = phy_axg_mipi_pcie_init, + .exit = phy_axg_mipi_pcie_exit, + .power_on = phy_axg_mipi_pcie_power_on, + .power_off = phy_axg_mipi_pcie_power_off, + .owner =THIS_MODULE , +}; + +static struct phy *phy_axg_mipi_pcie_xlate (struct device *dev, +struct of_phandle_args *args) +{ +struct phy_axg_mipi_pcie_priv *priv =dev_get_drvdata (dev); +unsigned int mode; + +if (args->args_count !=1 ) { +dev_err (dev,"invalid number of arguments\n" ); +return ERR_PTR (-EINVAL ); + } + + mode = args->args[0 ]; + +/* MIPI mode is not supported yet */ +if (mode !=PHY_TYPE_PCIE ) { +dev_err (dev,"invalid phy mode select argument\n" ); +return ERR_PTR (-EINVAL ); + } + + priv->mode = mode; +return priv->phy; +} + +static int phy_axg_mipi_pcie_probe (struct platform_device *pdev) +{ +struct phy_provider *pphy; +struct device *dev = &pdev->dev; +struct phy_axg_mipi_pcie_priv *priv; +struct device_node *np = dev->of_node; +int ret; +drivers/phy/amlogic/phy-meson-axg-mipi-pcie.c line 140
Quoted 10 lines
drivers/phy/amlogic/phy-meson-axg-mipi-pcie.c new file +10
-0+ priv =devm_kmalloc (dev,sizeof (*priv),GFP_KERNEL ); +if (!priv) +return -ENOMEM ; + +/* Get the hhi system controller node */ + priv->regmap =syscon_node_to_regmap (of_get_parent (dev->of_node)); +if (IS_ERR (priv->regmap)) { +dev_err (dev,"failed to get HHI regmap\n" ); +return PTR_ERR (priv->regmap); + }Remi,
Unless we are absolutely sure this will be *AXG ONLY*, I would prefer if you get the registers without the syscon.
Quoted 7 lines
Having it introduce some kind of dependency between the 2 which is likely to make this driver SoC specific.
It was clearly wrong for the clock controller to map these regiters, and if there is a possibility that this driver is used on other SoCs, I would prefer if we did not carry that mistake over. I would prefer if we fixed the clock controller so you don't need syscon here.
Jerome thank you for reviewing this,
Sure I will remove access to the registers through syscon system. Just to be sure we are on the same page here. What you suggest is keeping the two PHYs approach from this patchset (instead of the one PHY in v3), even if there is not exactly two PHYs, right ?
Thanks,
Signature · 1 line
Remi
Quoted 38 lines
Quoted 37 lines
drivers/phy/amlogic/phy-meson-axg-mipi-pcie.c new file +36
-0+ + priv->phy =devm_phy_create (dev, np, &phy_axg_mipi_pcie_ops); +if (IS_ERR (priv->phy)) { + ret =PTR_ERR (priv->phy); +if (ret != -EPROBE_DEFER ) +dev_err (dev,"failed to create PHY\n" ); +return ret; + } + +phy_set_drvdata (priv->phy, priv); +dev_set_drvdata (dev, priv); + pphy =devm_of_phy_provider_register (dev, phy_axg_mipi_pcie_xlate); + +return PTR_ERR_OR_ZERO (pphy); +} + +static const struct of_device_id phy_axg_mipi_pcie_of_match[] = { + { + .compatible ="amlogic,axg-mipi-pcie-phy" , + }, + { }, +}; +MODULE_DEVICE_TABLE (of, phy_axg_mipi_pcie_of_match); + +static struct platform_driver phy_axg_mipi_pcie_driver = { + .probe = phy_axg_mipi_pcie_probe, + .driver = { + .name ="phy-axg-mipi-pcie" , + .of_match_table = phy_axg_mipi_pcie_of_match, + }, +}; +module_platform_driver (phy_axg_mipi_pcie_driver); + +MODULE_AUTHOR ("Remi Pommarel <[email protected]>" ); +MODULE_DESCRIPTION ("Amlogic AXG MIPI + PCIE PHY driver" ); +MODULE_LICENSE ("GPL v2" );
Jerome Brunet
reviewerRe: [PATCH v2 1/3] phy: amlogic: Add Amlogic AXG MIPI/PCIE PHY Driver
Quoted 213 lines · Remi Pommarel
Quoted 204 lines · Jerome Brunet
Quoted 185 lines · Remi Pommarel
This 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_enableclock 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.Signed-off-by Remi Pommarel <[email protected]>--- drivers/phy/amlogic/Kconfig | 11 ++ drivers/phy/amlogic/Makefile | 1 + drivers/phy/amlogic/phy-meson-axg-mipi-pcie.c | 176 ++++++++++++++++++ 3 files changed, 188 insertions(+) create mode 100644 drivers/phy/amlogic/phy-meson-axg-mipi-pcie.cdrivers/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 MFD_SYSCON + 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.odrivers/phy/amlogic/phy-meson-axg-mipi-pcie.c new file +130
-0@@ -0,0 +1,176 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Amlogic AXG MIPI + PCIE PHY driver +* +* Copyright (C) 2019 Remi Pommarel <[email protected]> +*/ +#include <linux/module.h> +#include <linux/phy/phy.h> +#include <linux/regmap.h> +#include <linux/mfd/syscon.h> +#include <linux/platform_device.h> +#include <dt-bindings/phy/phy.h> + +#define HHI_MIPI_CNTL0 0x00 +#define HHI_MIPI_CNTL0_COMMON_BLOCK GENMASK(31, 28) +#define HHI_MIPI_CNTL0_ENABLE BIT(29) +#define HHI_MIPI_CNTL0_BANDGAP BIT(26) +#define HHI_MIPI_CNTL0_DECODE_TO_RTERM GENMASK(15, 12) +#define HHI_MIPI_CNTL0_OUTPUT_EN BIT(3) + +#define HHI_MIPI_CNTL1 0x01 +#define HHI_MIPI_CNTL1_CH0_CML_PDR_EN BIT(12) +#define HHI_MIPI_CNTL1_LP_ABILITY GENMASK(5, 4) +#define HHI_MIPI_CNTL1_LP_RESISTER BIT(3) +#define HHI_MIPI_CNTL1_INPUT_SETTING BIT(2) +#define HHI_MIPI_CNTL1_INPUT_SEL BIT(1) +#define HHI_MIPI_CNTL1_PRBS7_EN BIT(0) + +#define HHI_MIPI_CNTL2 0x02 +#define HHI_MIPI_CNTL2_CH_PU GENMASK(31, 25) +#define HHI_MIPI_CNTL2_CH_CTL GENMASK(24, 19) +#define HHI_MIPI_CNTL2_CH0_DIGDR_EN BIT(18) +#define HHI_MIPI_CNTL2_CH_DIGDR_EN BIT(17) +#define HHI_MIPI_CNTL2_LPULPS_EN BIT(16) +#define HHI_MIPI_CNTL2_CH_EN (n) BIT(15 - (n)) +#define HHI_MIPI_CNTL2_CH0_LP_CTL GENMASK(10, 1) + +struct phy_axg_mipi_pcie_priv { +struct phy *phy; +unsigned int mode; +struct regmap *regmap; +}; + +static const struct regmap_config phy_axg_mipi_pcie_regmap_conf = { + .reg_bits =8 , + .val_bits =32 , + .reg_stride =4 , + .max_register =HHI_MIPI_CNTL2 , +}; + +static int phy_axg_mipi_pcie_power_on (struct phy *phy) +{ +struct phy_axg_mipi_pcie_priv *priv =phy_get_drvdata (phy); + +/* MIPI not supported yet */ +if (priv->mode !=PHY_TYPE_PCIE ) +return 0 ; + +regmap_update_bits (priv->regmap,HHI_MIPI_CNTL0 , +HHI_MIPI_CNTL0_BANDGAP ,HHI_MIPI_CNTL0_BANDGAP ); + +regmap_update_bits (priv->regmap,HHI_MIPI_CNTL0 , +HHI_MIPI_CNTL0_ENABLE ,HHI_MIPI_CNTL0_ENABLE ); +return 0 ; +} + +static int phy_axg_mipi_pcie_power_off (struct phy *phy) +{ +struct phy_axg_mipi_pcie_priv *priv =phy_get_drvdata (phy); + +/* MIPI not supported yet */ +if (priv->mode !=PHY_TYPE_PCIE ) +return 0 ; + +regmap_update_bits (priv->regmap,HHI_MIPI_CNTL0 , +HHI_MIPI_CNTL0_BANDGAP ,0 ); +regmap_update_bits (priv->regmap,HHI_MIPI_CNTL0 , +HHI_MIPI_CNTL0_ENABLE ,0 ); +return 0 ; +} + +static int phy_axg_mipi_pcie_init (struct phy *phy) +{ +return 0 ; +} + +static int phy_axg_mipi_pcie_exit (struct phy *phy) +{ +return 0 ; +} + +static const struct phy_ops phy_axg_mipi_pcie_ops = { + .init = phy_axg_mipi_pcie_init, + .exit = phy_axg_mipi_pcie_exit, + .power_on = phy_axg_mipi_pcie_power_on, + .power_off = phy_axg_mipi_pcie_power_off, + .owner =THIS_MODULE , +}; + +static struct phy *phy_axg_mipi_pcie_xlate (struct device *dev, +struct of_phandle_args *args) +{ +struct phy_axg_mipi_pcie_priv *priv =dev_get_drvdata (dev); +unsigned int mode; + +if (args->args_count !=1 ) { +dev_err (dev,"invalid number of arguments\n" ); +return ERR_PTR (-EINVAL ); + } + + mode = args->args[0 ]; + +/* MIPI mode is not supported yet */ +if (mode !=PHY_TYPE_PCIE ) { +dev_err (dev,"invalid phy mode select argument\n" ); +return ERR_PTR (-EINVAL ); + } + + priv->mode = mode; +return priv->phy; +} + +static int phy_axg_mipi_pcie_probe (struct platform_device *pdev) +{ +struct phy_provider *pphy; +struct device *dev = &pdev->dev; +struct phy_axg_mipi_pcie_priv *priv; +struct device_node *np = dev->of_node; +int ret; +drivers/phy/amlogic/phy-meson-axg-mipi-pcie.c line 140
Quoted 10 lines
drivers/phy/amlogic/phy-meson-axg-mipi-pcie.c new file +10
-0+ priv =devm_kmalloc (dev,sizeof (*priv),GFP_KERNEL ); +if (!priv) +return -ENOMEM ; + +/* Get the hhi system controller node */ + priv->regmap =syscon_node_to_regmap (of_get_parent (dev->of_node)); +if (IS_ERR (priv->regmap)) { +dev_err (dev,"failed to get HHI regmap\n" ); +return PTR_ERR (priv->regmap); + }Remi,
Unless we are absolutely sure this will be *AXG ONLY*, I would prefer if you get the registers without the syscon.
Quoted 7 lines
Having it introduce some kind of dependency between the 2 which is likely to make this driver SoC specific.
It was clearly wrong for the clock controller to map these regiters, and if there is a possibility that this driver is used on other SoCs, I would prefer if we did not carry that mistake over. I would prefer if we fixed the clock controller so you don't need syscon here.
Quoted 6 lines
Jerome thank you for reviewing this,
Sure I will remove access to the registers through syscon system. Just to be sure we are on the same page here. What you suggest is keeping the two PHYs approach from this patchset (instead of the one PHY in v3), even if there is not exactly two PHYs, right ?
Well, according the doc, this "MIPI Phy" seems to be used by the PCIe PHY so I tempted to say yes but I'm not very familiar with the PHY subsystem. I'm sure the PHY maintainers can help us with this
Quoted 2 lines
Thanks,
PATCH v2 2/3 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.0
Re: [PATCH v2 2/3] phy: amlogic: Add Amlogic AXG PCIE PHY Driver
Hi,
Quoted 186 lines · Remi Pommarel
This adds support for the PCI PHY found in the Amlogic AXG SoC Family. This will allow to mutualize code in
pci-meson.cbetween AXG and G12A SoC.Signed-off-by Remi Pommarel <[email protected]>--- 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.cdrivers/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_MESONdrivers/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.odrivers/phy/amlogic/phy-meson-axg-pcie.c new file +136
-0@@ -0,0 +1,163 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Amlogic AXG PCIE PHY driver +* +* Copyright (C) 2019 Remi Pommarel <[email protected]> +*/ +#include <linux/module.h> +#include <linux/phy/phy.h> +#include <linux/regmap.h> +#include <linux/reset.h> +#include <linux/platform_device.h> +#include <linux/bitfield.h> +#include <dt-bindings/phy/phy.h> + +#define MESON_PCIE_REG0 0x00 +#define MESON_PCIE_COMMON_CLK BIT(4) +#define MESON_PCIE_PORT_SEL GENMASK(3, 2) +#define MESON_PCIE_CLK BIT(1) +#define MESON_PCIE_POWERDOWN BIT(0) + +#define MESON_PCIE_TWO_X1 FIELD_PREP(MESON_PCIE_PORT_SEL, 0x3) +#define MESON_PCIE_COMMON_REF_CLK FIELD_PREP(MESON_PCIE_COMMON_CLK, 0x1) +#define MESON_PCIE_PHY_INIT (MESON_PCIE_TWO_X1 | \ + MESON_PCIE_COMMON_REF_CLK) +#define MESON_PCIE_RESET_DELAY 500 + +struct phy_axg_pcie_priv { +struct phy *phy; +struct regmap *regmap; +struct reset_control *reset; +}; + +static const struct regmap_config phy_axg_pcie_regmap_conf = { + .reg_bits =8 , + .val_bits =32 , + .reg_stride =4 , + .max_register =MESON_PCIE_REG0 , +}; + +static int phy_axg_pcie_power_on (struct phy *phy) +{ +struct phy_axg_pcie_priv *priv =phy_get_drvdata (phy); + +regmap_update_bits (priv->regmap,MESON_PCIE_REG0 , +MESON_PCIE_POWERDOWN ,0 ); +return 0 ; +} + +static int phy_axg_pcie_power_off (struct phy *phy) +{ +struct phy_axg_pcie_priv *priv =phy_get_drvdata (phy); + +regmap_update_bits (priv->regmap,MESON_PCIE_REG0 , +MESON_PCIE_POWERDOWN ,1 ); +return 0 ; +} + +static int phy_axg_pcie_init (struct phy *phy) +{ +struct phy_axg_pcie_priv *priv =phy_get_drvdata (phy); + +regmap_write (priv->regmap,MESON_PCIE_REG0 ,MESON_PCIE_PHY_INIT ); +return reset_control_reset (priv->reset); +} + +static int phy_axg_pcie_exit (struct phy *phy) +{ +struct phy_axg_pcie_priv *priv =phy_get_drvdata (phy); + +return reset_control_reset (priv->reset); +} + +static int phy_axg_pcie_reset (struct phy *phy) +{ +struct phy_axg_pcie_priv *priv =phy_get_drvdata (phy); +int ret =0 ; + + ret =reset_control_assert (priv->reset); +if (ret !=0 ) + goto out; +udelay (MESON_PCIE_RESET_DELAY ); + + ret =reset_control_deassert (priv->reset); +if (ret !=0 ) + goto out; +udelay (MESON_PCIE_RESET_DELAY ); + +out: +return ret; +} + +static const struct phy_ops phy_axg_pcie_ops = { + .init = phy_axg_pcie_init, + .exit = phy_axg_pcie_exit, + .power_on = phy_axg_pcie_power_on, + .power_off = phy_axg_pcie_power_off, + .reset = phy_axg_pcie_reset, + .owner =THIS_MODULE , +}; + +static int phy_axg_pcie_probe (struct platform_device *pdev) +{ +struct phy_provider *pphy; +struct device *dev = &pdev->dev; +struct phy_axg_pcie_priv *priv; +struct device_node *np = dev->of_node; +struct resource *res; +void __iomem *base; +int ret; + + priv =devm_kmalloc (dev,sizeof (*priv),GFP_KERNEL ); +if (!priv) +return -ENOMEM ; + + priv->phy =devm_phy_create (dev, np, &phy_axg_pcie_ops); +if (IS_ERR (priv->phy)) { + ret =PTR_ERR (priv->phy); +if (ret != -EPROBE_DEFER ) +dev_err (dev,"failed to create PHY\n" ); +return ret; + } + + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); + base =devm_ioremap_resource (dev, res); +if (IS_ERR (base)) +return PTR_ERR (base); + + priv->regmap =devm_regmap_init_mmio (dev, base, + &phy_axg_pcie_regmap_conf); +if (IS_ERR (priv->regmap)) +return PTR_ERR (priv->regmap); + + priv->reset =devm_reset_control_array_get (dev, false, false); +if (IS_ERR (priv->reset)) +return PTR_ERR (priv->reset); +
drivers/phy/amlogic/phy-meson-axg-pcie.c line 146
Quoted 10 lines
drivers/phy/amlogic/phy-meson-axg-pcie.c new file +10
-0+phy_set_drvdata (priv->phy, priv); +dev_set_drvdata (dev, priv); + pphy =devm_of_phy_provider_register (dev, of_phy_simple_xlate); + +return PTR_ERR_OR_ZERO (pphy); +} + +static const struct of_device_id phy_axg_pcie_of_match[] = { + { + .compatible ="amlogic,axg-pcie-phy" ,
dt binding documentation for this too is missing in this series?
Thanks
Kishon
_______________________________________________
linux-amlogic mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-amlogic
PATCH v2 3/3 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->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 +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.0
Re: [PATCH v2 3/3] PCI: amlogic: Use AXG PCIE and shared MIPI/PCIE PHYs
Hi,
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->phy)) +return PTR_ERR (mp->phy);
This also requires dt-binding updation.Is PCIe connected to two different PHYs here?
Thanks
Kishon
Re: [PATCH v2 3/3] PCI: amlogic: Use AXG PCIE and shared MIPI/PCIE PHYs
Quoted 226 lines · Kishon Vijay Abraham I
Hi,
Quoted 223 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 +42
-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)) +return PTR_ERR (mp->phy);
Quoted 11 lines
drivers/pci/controller/dwc/pci-meson.c static int meson_pcie_probe(struct platform_device *pdev) · line 556
Quoted 8 lines
drivers/pci/controller/dwc/pci-meson.c +3
-5-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->phy)) +return PTR_ERR (mp->phy);This also requires dt-binding updation.Is PCIe connected to two different PHYs here?
Not exactly, it is that the PCIE PHY is using some non documented bits from the range of the MIPI one. But now that I have read about syscon it seems that those registers are defined to be handled by syscon subsystem in the device tree.
Thus I think It would make much more sense to remove the shared MIPI/PCIE PHY driver in patch 1/3 and set the appropriate bits in the PCIE PHY driver itself from patch 2/3 through syscon subsystem.
Sorry for the noise, will send v3 with only 1 PHY driver and appropriate binding documentation.
Thanks,
Signature · 1 line
Remi