diff mbox series

[v2,1/1] phy: add support for stingray PAXB PHY controller

Message ID 20200402084513.22682-1-rayagonda.kokatanur@broadcom.com
State Superseded
Delegated to: Tom Rini
Headers show
Series [v2,1/1] phy: add support for stingray PAXB PHY controller | expand

Commit Message

Rayagonda Kokatanur April 2, 2020, 8:45 a.m. UTC
From: Srinath Mannam <srinath.mannam@broadcom.com>

Add support for stingray PAXB PHY controller driver.
This driver supports maximum 8 PAXB phys using pipemux data.

Signed-off-by: Srinath Mannam <srinath.mannam@broadcom.com>
Signed-off-by: Rayagonda Kokatanur <rayagonda.kokatanur@broadcom.com>
---
Changes from v1:
 -Address review comments from Stefan Roese,
  Use GENMASK() instead of hard code value.
  Remove unwanted struct declaration.
  Get pr_err() into single line.

 drivers/phy/Kconfig           |   7 ++
 drivers/phy/Makefile          |   1 +
 drivers/phy/phy-bcm-sr-pcie.c | 178 ++++++++++++++++++++++++++++++++++
 3 files changed, 186 insertions(+)
 create mode 100644 drivers/phy/phy-bcm-sr-pcie.c

Comments

Stefan Roese April 2, 2020, 9:59 a.m. UTC | #1
On 02.04.20 10:45, Rayagonda Kokatanur wrote:
> From: Srinath Mannam <srinath.mannam@broadcom.com>
> 
> Add support for stingray PAXB PHY controller driver.
> This driver supports maximum 8 PAXB phys using pipemux data.
> 
> Signed-off-by: Srinath Mannam <srinath.mannam@broadcom.com>
> Signed-off-by: Rayagonda Kokatanur <rayagonda.kokatanur@broadcom.com>
> ---
> Changes from v1:
>   -Address review comments from Stefan Roese,
>    Use GENMASK() instead of hard code value.
>    Remove unwanted struct declaration.
>    Get pr_err() into single line.
> 
>   drivers/phy/Kconfig           |   7 ++
>   drivers/phy/Makefile          |   1 +
>   drivers/phy/phy-bcm-sr-pcie.c | 178 ++++++++++++++++++++++++++++++++++
>   3 files changed, 186 insertions(+)
>   create mode 100644 drivers/phy/phy-bcm-sr-pcie.c
> 
> diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
> index a72f34f0d4..f7003807fc 100644
> --- a/drivers/phy/Kconfig
> +++ b/drivers/phy/Kconfig
> @@ -84,6 +84,13 @@ config BCM6368_USBH_PHY
>   	help
>   	  Support for the Broadcom MIPS BCM6368 USBH PHY.
>   
> +config BCM_SR_PCIE_PHY
> +	bool "Broadcom Stingray PCIe PHY driver"
> +	depends on PHY
> +	help
> +	  Enable this to support the Broadcom Stingray PCIe PHY
> +	  If unsure, say N.
> +
>   config PHY_DA8XX_USB
>   	tristate "TI DA8xx USB PHY Driver"
>   	depends on PHY && ARCH_DAVINCI
> diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile
> index 43ce62e08c..3958f7899c 100644
> --- a/drivers/phy/Makefile
> +++ b/drivers/phy/Makefile
> @@ -9,6 +9,7 @@ obj-$(CONFIG_BCM6318_USBH_PHY) += bcm6318-usbh-phy.o
>   obj-$(CONFIG_BCM6348_USBH_PHY) += bcm6348-usbh-phy.o
>   obj-$(CONFIG_BCM6358_USBH_PHY) += bcm6358-usbh-phy.o
>   obj-$(CONFIG_BCM6368_USBH_PHY) += bcm6368-usbh-phy.o
> +obj-$(CONFIG_BCM_SR_PCIE_PHY) += phy-bcm-sr-pcie.o
>   obj-$(CONFIG_PHY_SANDBOX) += sandbox-phy.o
>   obj-$(CONFIG_$(SPL_)PIPE3_PHY) += ti-pipe3-phy.o
>   obj-$(CONFIG_AM654_PHY) += phy-ti-am654.o
> diff --git a/drivers/phy/phy-bcm-sr-pcie.c b/drivers/phy/phy-bcm-sr-pcie.c
> new file mode 100644
> index 0000000000..080cac30b2
> --- /dev/null
> +++ b/drivers/phy/phy-bcm-sr-pcie.c
> @@ -0,0 +1,178 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Copyright (C) 2019 Broadcom
> + */
> +
> +#include <asm/io.h>
> +#include <common.h>
> +#include <dm.h>
> +#include <dm/device.h>
> +#include <linux/bitops.h>
> +#include <generic-phy.h>

Sorry for spotting this so late (and my nitpicking comments), but I
think these include files could be reordered and dm/device.h removed:

#include <common.h>
#include <dm.h>
#include <generic-phy.h>
#include <asm/io.h>
#include <linux/bitops.h>

Other that that, feel free to add my:

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> +
> +/* we have up to 8 PAXB based RC. The 9th one is always PAXC */
> +#define SR_NR_PCIE_PHYS               8
> +
> +#define PCIE_PIPEMUX_CFG_OFFSET       0x10c
> +#define PCIE_PIPEMUX_SELECT_STRAP     GENMASK(3, 0)
> +
> +#define CDRU_STRAP_DATA_LSW_OFFSET    0x5c
> +#define PCIE_PIPEMUX_SHIFT            19
> +#define PCIE_PIPEMUX_MASK             GENMASK(3, 0)
> +
> +/**
> + * struct sr_pcie_phy_core - Stingray PCIe PHY core control
> + *
> + * @dev: pointer to device
> + * @base: base register of PCIe SS
> + * @cdru: CDRU base address
> + * @pipemux: pipemuex strap
> + */
> +struct sr_pcie_phy_core {
> +	struct udevice *dev;
> +	void __iomem *base;
> +	void __iomem *cdru;
> +	u32 pipemux;
> +};
> +
> +/*
> + * PCIe PIPEMUX lookup table
> + *
> + * Each array index represents a PIPEMUX strap setting
> + * The array element represents a bitmap where a set bit means the PCIe
> + * core and associated serdes has been enabled as RC and is available for use
> + */
> +static const u8 pipemux_table[] = {
> +	/* PIPEMUX = 0, EP 1x16 */
> +	0x00,
> +	/* PIPEMUX = 1, EP 1x8 + RC 1x8, core 7 */
> +	0x80,
> +	/* PIPEMUX = 2, EP 4x4 */
> +	0x00,
> +	/* PIPEMUX = 3, RC 2x8, cores 0, 7 */
> +	0x81,
> +	/* PIPEMUX = 4, RC 4x4, cores 0, 1, 6, 7 */
> +	0xc3,
> +	/* PIPEMUX = 5, RC 8x2, all 8 cores */
> +	0xff,
> +	/* PIPEMUX = 6, RC 3x4 + 2x2, cores 0, 2, 3, 6, 7 */
> +	0xcd,
> +	/* PIPEMUX = 7, RC 1x4 + 6x2, cores 0, 2, 3, 4, 5, 6, 7 */
> +	0xfd,
> +	/* PIPEMUX = 8, EP 1x8 + RC 4x2, cores 4, 5, 6, 7 */
> +	0xf0,
> +	/* PIPEMUX = 9, EP 1x8 + RC 2x4, cores 6, 7 */
> +	0xc0,
> +	/* PIPEMUX = 10, EP 2x4 + RC 2x4, cores 1, 6 */
> +	0x42,
> +	/* PIPEMUX = 11, EP 2x4 + RC 4x2, cores 2, 3, 4, 5 */
> +	0x3c,
> +	/* PIPEMUX = 12, EP 1x4 + RC 6x2, cores 2, 3, 4, 5, 6, 7 */
> +	0xfc,
> +	/* PIPEMUX = 13, RC 2x4 + RC 1x4 + 2x2, cores 2, 3, 6 */
> +	0x4c,
> +};
> +
> +/*
> + * Return true if the strap setting is valid
> + */
> +static bool pipemux_strap_is_valid(u32 pipemux)
> +{
> +	return !!(pipemux < ARRAY_SIZE(pipemux_table));
> +}
> +
> +/*
> + * Read the PCIe PIPEMUX from strap
> + */
> +static u32 pipemux_strap_read(struct sr_pcie_phy_core *core)
> +{
> +	u32 pipemux;
> +
> +	/*
> +	 * Read PIPEMUX configuration register to determine the pipemux setting
> +	 *
> +	 * In the case when the value indicates using HW strap, fall back to
> +	 * use HW strap
> +	 */
> +	pipemux = readl(core->base + PCIE_PIPEMUX_CFG_OFFSET);
> +	pipemux &= PCIE_PIPEMUX_MASK;
> +	if (pipemux == PCIE_PIPEMUX_SELECT_STRAP) {
> +		pipemux = readl(core->cdru + CDRU_STRAP_DATA_LSW_OFFSET);
> +		pipemux >>= PCIE_PIPEMUX_SHIFT;
> +		pipemux &= PCIE_PIPEMUX_MASK;
> +	}
> +
> +	return pipemux;
> +}
> +
> +static int sr_pcie_phy_init(struct phy *phy)
> +{
> +	struct sr_pcie_phy_core *core = dev_get_priv(phy->dev);
> +	unsigned int core_idx = phy->id;
> +
> +	debug("%s %lx\n", __func__, phy->id);
> +	/*
> +	 * Check whether this PHY is for root complex or not. If yes, return
> +	 * zero so the host driver can proceed to enumeration. If not, return
> +	 * an error and that will force the host driver to bail out
> +	 */
> +	if (!!((pipemux_table[core->pipemux] >> core_idx) & 0x1))
> +		return 0;
> +
> +	return -ENODEV;
> +}
> +
> +static int sr_pcie_phy_xlate(struct phy *phy, struct ofnode_phandle_args *args)
> +{
> +	debug("%s %d\n", __func__, args->args[0]);
> +	if (args->args_count && args->args[0] < SR_NR_PCIE_PHYS)
> +		phy->id = args->args[0];
> +	else
> +		return -ENODEV;
> +
> +	return 0;
> +}
> +
> +static const struct phy_ops sr_pcie_phy_ops = {
> +	.of_xlate = sr_pcie_phy_xlate,
> +	.init = sr_pcie_phy_init,
> +};
> +
> +static int sr_pcie_phy_probe(struct udevice *dev)
> +{
> +	struct sr_pcie_phy_core *core = dev_get_priv(dev);
> +
> +	core->dev = dev;
> +
> +	core->base = (void __iomem *)devfdt_get_addr_name(dev, "reg_base");
> +	core->cdru = (void __iomem *)devfdt_get_addr_name(dev, "cdru_base");
> +	debug("ip base %p\n", core->base);
> +	debug("cdru base %p\n", core->cdru);
> +
> +	/* read the PCIe PIPEMUX strap setting */
> +	core->pipemux = pipemux_strap_read(core);
> +	if (!pipemux_strap_is_valid(core->pipemux)) {
> +		pr_err("invalid PCIe PIPEMUX strap %u\n", core->pipemux);
> +		return -EIO;
> +	}
> +	debug("%s %#x\n", __func__, core->pipemux);
> +
> +	pr_info("Stingray PCIe PHY driver initialized\n");
> +
> +	return 0;
> +}
> +
> +static const struct udevice_id sr_pcie_phy_match_table[] = {
> +	{ .compatible = "brcm,sr-pcie-phy" },
> +	{ }
> +};
> +
> +U_BOOT_DRIVER(sr_pcie_phy) = {
> +	.name = "sr-pcie-phy",
> +	.id = UCLASS_PHY,
> +	.probe = sr_pcie_phy_probe,
> +	.of_match = sr_pcie_phy_match_table,
> +	.ops = &sr_pcie_phy_ops,
> +	.platdata_auto_alloc_size = sizeof(struct sr_pcie_phy_core),
> +	.priv_auto_alloc_size = sizeof(struct sr_pcie_phy_core),
> +};
> 


Viele Grüße,
Stefan
Rayagonda Kokatanur April 2, 2020, 10:34 a.m. UTC | #2
On Thu, Apr 2, 2020 at 3:29 PM Stefan Roese <sr@denx.de> wrote:
>
> On 02.04.20 10:45, Rayagonda Kokatanur wrote:
> > From: Srinath Mannam <srinath.mannam@broadcom.com>
> >
> > Add support for stingray PAXB PHY controller driver.
> > This driver supports maximum 8 PAXB phys using pipemux data.
> >
> > Signed-off-by: Srinath Mannam <srinath.mannam@broadcom.com>
> > Signed-off-by: Rayagonda Kokatanur <rayagonda.kokatanur@broadcom.com>
> > ---
> > Changes from v1:
> >   -Address review comments from Stefan Roese,
> >    Use GENMASK() instead of hard code value.
> >    Remove unwanted struct declaration.
> >    Get pr_err() into single line.
> >
> >   drivers/phy/Kconfig           |   7 ++
> >   drivers/phy/Makefile          |   1 +
> >   drivers/phy/phy-bcm-sr-pcie.c | 178 ++++++++++++++++++++++++++++++++++
> >   3 files changed, 186 insertions(+)
> >   create mode 100644 drivers/phy/phy-bcm-sr-pcie.c
> >
> > diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
> > index a72f34f0d4..f7003807fc 100644
> > --- a/drivers/phy/Kconfig
> > +++ b/drivers/phy/Kconfig
> > @@ -84,6 +84,13 @@ config BCM6368_USBH_PHY
> >       help
> >         Support for the Broadcom MIPS BCM6368 USBH PHY.
> >
> > +config BCM_SR_PCIE_PHY
> > +     bool "Broadcom Stingray PCIe PHY driver"
> > +     depends on PHY
> > +     help
> > +       Enable this to support the Broadcom Stingray PCIe PHY
> > +       If unsure, say N.
> > +
> >   config PHY_DA8XX_USB
> >       tristate "TI DA8xx USB PHY Driver"
> >       depends on PHY && ARCH_DAVINCI
> > diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile
> > index 43ce62e08c..3958f7899c 100644
> > --- a/drivers/phy/Makefile
> > +++ b/drivers/phy/Makefile
> > @@ -9,6 +9,7 @@ obj-$(CONFIG_BCM6318_USBH_PHY) += bcm6318-usbh-phy.o
> >   obj-$(CONFIG_BCM6348_USBH_PHY) += bcm6348-usbh-phy.o
> >   obj-$(CONFIG_BCM6358_USBH_PHY) += bcm6358-usbh-phy.o
> >   obj-$(CONFIG_BCM6368_USBH_PHY) += bcm6368-usbh-phy.o
> > +obj-$(CONFIG_BCM_SR_PCIE_PHY) += phy-bcm-sr-pcie.o
> >   obj-$(CONFIG_PHY_SANDBOX) += sandbox-phy.o
> >   obj-$(CONFIG_$(SPL_)PIPE3_PHY) += ti-pipe3-phy.o
> >   obj-$(CONFIG_AM654_PHY) += phy-ti-am654.o
> > diff --git a/drivers/phy/phy-bcm-sr-pcie.c b/drivers/phy/phy-bcm-sr-pcie.c
> > new file mode 100644
> > index 0000000000..080cac30b2
> > --- /dev/null
> > +++ b/drivers/phy/phy-bcm-sr-pcie.c
> > @@ -0,0 +1,178 @@
> > +// SPDX-License-Identifier: GPL-2.0
> > +/*
> > + * Copyright (C) 2019 Broadcom
> > + */
> > +
> > +#include <asm/io.h>
> > +#include <common.h>
> > +#include <dm.h>
> > +#include <dm/device.h>
> > +#include <linux/bitops.h>
> > +#include <generic-phy.h>
>
> Sorry for spotting this so late (and my nitpicking comments), but I
> think these include files could be reordered and dm/device.h removed:
>
> #include <common.h>
> #include <dm.h>
> #include <generic-phy.h>
> #include <asm/io.h>
> #include <linux/bitops.h>
>
> Other that that, feel free to add my:
>
> Reviewed-by: Stefan Roese <sr@denx.de>

Not an issue Stefan.
Thank you for your detailed review.
I will do the above changes and push patch v3.

>
> Thanks,
> Stefan
>
> > +
> > +/* we have up to 8 PAXB based RC. The 9th one is always PAXC */
> > +#define SR_NR_PCIE_PHYS               8
> > +
> > +#define PCIE_PIPEMUX_CFG_OFFSET       0x10c
> > +#define PCIE_PIPEMUX_SELECT_STRAP     GENMASK(3, 0)
> > +
> > +#define CDRU_STRAP_DATA_LSW_OFFSET    0x5c
> > +#define PCIE_PIPEMUX_SHIFT            19
> > +#define PCIE_PIPEMUX_MASK             GENMASK(3, 0)
> > +
> > +/**
> > + * struct sr_pcie_phy_core - Stingray PCIe PHY core control
> > + *
> > + * @dev: pointer to device
> > + * @base: base register of PCIe SS
> > + * @cdru: CDRU base address
> > + * @pipemux: pipemuex strap
> > + */
> > +struct sr_pcie_phy_core {
> > +     struct udevice *dev;
> > +     void __iomem *base;
> > +     void __iomem *cdru;
> > +     u32 pipemux;
> > +};
> > +
> > +/*
> > + * PCIe PIPEMUX lookup table
> > + *
> > + * Each array index represents a PIPEMUX strap setting
> > + * The array element represents a bitmap where a set bit means the PCIe
> > + * core and associated serdes has been enabled as RC and is available for use
> > + */
> > +static const u8 pipemux_table[] = {
> > +     /* PIPEMUX = 0, EP 1x16 */
> > +     0x00,
> > +     /* PIPEMUX = 1, EP 1x8 + RC 1x8, core 7 */
> > +     0x80,
> > +     /* PIPEMUX = 2, EP 4x4 */
> > +     0x00,
> > +     /* PIPEMUX = 3, RC 2x8, cores 0, 7 */
> > +     0x81,
> > +     /* PIPEMUX = 4, RC 4x4, cores 0, 1, 6, 7 */
> > +     0xc3,
> > +     /* PIPEMUX = 5, RC 8x2, all 8 cores */
> > +     0xff,
> > +     /* PIPEMUX = 6, RC 3x4 + 2x2, cores 0, 2, 3, 6, 7 */
> > +     0xcd,
> > +     /* PIPEMUX = 7, RC 1x4 + 6x2, cores 0, 2, 3, 4, 5, 6, 7 */
> > +     0xfd,
> > +     /* PIPEMUX = 8, EP 1x8 + RC 4x2, cores 4, 5, 6, 7 */
> > +     0xf0,
> > +     /* PIPEMUX = 9, EP 1x8 + RC 2x4, cores 6, 7 */
> > +     0xc0,
> > +     /* PIPEMUX = 10, EP 2x4 + RC 2x4, cores 1, 6 */
> > +     0x42,
> > +     /* PIPEMUX = 11, EP 2x4 + RC 4x2, cores 2, 3, 4, 5 */
> > +     0x3c,
> > +     /* PIPEMUX = 12, EP 1x4 + RC 6x2, cores 2, 3, 4, 5, 6, 7 */
> > +     0xfc,
> > +     /* PIPEMUX = 13, RC 2x4 + RC 1x4 + 2x2, cores 2, 3, 6 */
> > +     0x4c,
> > +};
> > +
> > +/*
> > + * Return true if the strap setting is valid
> > + */
> > +static bool pipemux_strap_is_valid(u32 pipemux)
> > +{
> > +     return !!(pipemux < ARRAY_SIZE(pipemux_table));
> > +}
> > +
> > +/*
> > + * Read the PCIe PIPEMUX from strap
> > + */
> > +static u32 pipemux_strap_read(struct sr_pcie_phy_core *core)
> > +{
> > +     u32 pipemux;
> > +
> > +     /*
> > +      * Read PIPEMUX configuration register to determine the pipemux setting
> > +      *
> > +      * In the case when the value indicates using HW strap, fall back to
> > +      * use HW strap
> > +      */
> > +     pipemux = readl(core->base + PCIE_PIPEMUX_CFG_OFFSET);
> > +     pipemux &= PCIE_PIPEMUX_MASK;
> > +     if (pipemux == PCIE_PIPEMUX_SELECT_STRAP) {
> > +             pipemux = readl(core->cdru + CDRU_STRAP_DATA_LSW_OFFSET);
> > +             pipemux >>= PCIE_PIPEMUX_SHIFT;
> > +             pipemux &= PCIE_PIPEMUX_MASK;
> > +     }
> > +
> > +     return pipemux;
> > +}
> > +
> > +static int sr_pcie_phy_init(struct phy *phy)
> > +{
> > +     struct sr_pcie_phy_core *core = dev_get_priv(phy->dev);
> > +     unsigned int core_idx = phy->id;
> > +
> > +     debug("%s %lx\n", __func__, phy->id);
> > +     /*
> > +      * Check whether this PHY is for root complex or not. If yes, return
> > +      * zero so the host driver can proceed to enumeration. If not, return
> > +      * an error and that will force the host driver to bail out
> > +      */
> > +     if (!!((pipemux_table[core->pipemux] >> core_idx) & 0x1))
> > +             return 0;
> > +
> > +     return -ENODEV;
> > +}
> > +
> > +static int sr_pcie_phy_xlate(struct phy *phy, struct ofnode_phandle_args *args)
> > +{
> > +     debug("%s %d\n", __func__, args->args[0]);
> > +     if (args->args_count && args->args[0] < SR_NR_PCIE_PHYS)
> > +             phy->id = args->args[0];
> > +     else
> > +             return -ENODEV;
> > +
> > +     return 0;
> > +}
> > +
> > +static const struct phy_ops sr_pcie_phy_ops = {
> > +     .of_xlate = sr_pcie_phy_xlate,
> > +     .init = sr_pcie_phy_init,
> > +};
> > +
> > +static int sr_pcie_phy_probe(struct udevice *dev)
> > +{
> > +     struct sr_pcie_phy_core *core = dev_get_priv(dev);
> > +
> > +     core->dev = dev;
> > +
> > +     core->base = (void __iomem *)devfdt_get_addr_name(dev, "reg_base");
> > +     core->cdru = (void __iomem *)devfdt_get_addr_name(dev, "cdru_base");
> > +     debug("ip base %p\n", core->base);
> > +     debug("cdru base %p\n", core->cdru);
> > +
> > +     /* read the PCIe PIPEMUX strap setting */
> > +     core->pipemux = pipemux_strap_read(core);
> > +     if (!pipemux_strap_is_valid(core->pipemux)) {
> > +             pr_err("invalid PCIe PIPEMUX strap %u\n", core->pipemux);
> > +             return -EIO;
> > +     }
> > +     debug("%s %#x\n", __func__, core->pipemux);
> > +
> > +     pr_info("Stingray PCIe PHY driver initialized\n");
> > +
> > +     return 0;
> > +}
> > +
> > +static const struct udevice_id sr_pcie_phy_match_table[] = {
> > +     { .compatible = "brcm,sr-pcie-phy" },
> > +     { }
> > +};
> > +
> > +U_BOOT_DRIVER(sr_pcie_phy) = {
> > +     .name = "sr-pcie-phy",
> > +     .id = UCLASS_PHY,
> > +     .probe = sr_pcie_phy_probe,
> > +     .of_match = sr_pcie_phy_match_table,
> > +     .ops = &sr_pcie_phy_ops,
> > +     .platdata_auto_alloc_size = sizeof(struct sr_pcie_phy_core),
> > +     .priv_auto_alloc_size = sizeof(struct sr_pcie_phy_core),
> > +};
> >
>
>
> Viele Grüße,
> Stefan
>
> --
> DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
> Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de
diff mbox series

Patch

diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
index a72f34f0d4..f7003807fc 100644
--- a/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@ -84,6 +84,13 @@  config BCM6368_USBH_PHY
 	help
 	  Support for the Broadcom MIPS BCM6368 USBH PHY.
 
+config BCM_SR_PCIE_PHY
+	bool "Broadcom Stingray PCIe PHY driver"
+	depends on PHY
+	help
+	  Enable this to support the Broadcom Stingray PCIe PHY
+	  If unsure, say N.
+
 config PHY_DA8XX_USB
 	tristate "TI DA8xx USB PHY Driver"
 	depends on PHY && ARCH_DAVINCI
diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile
index 43ce62e08c..3958f7899c 100644
--- a/drivers/phy/Makefile
+++ b/drivers/phy/Makefile
@@ -9,6 +9,7 @@  obj-$(CONFIG_BCM6318_USBH_PHY) += bcm6318-usbh-phy.o
 obj-$(CONFIG_BCM6348_USBH_PHY) += bcm6348-usbh-phy.o
 obj-$(CONFIG_BCM6358_USBH_PHY) += bcm6358-usbh-phy.o
 obj-$(CONFIG_BCM6368_USBH_PHY) += bcm6368-usbh-phy.o
+obj-$(CONFIG_BCM_SR_PCIE_PHY) += phy-bcm-sr-pcie.o
 obj-$(CONFIG_PHY_SANDBOX) += sandbox-phy.o
 obj-$(CONFIG_$(SPL_)PIPE3_PHY) += ti-pipe3-phy.o
 obj-$(CONFIG_AM654_PHY) += phy-ti-am654.o
diff --git a/drivers/phy/phy-bcm-sr-pcie.c b/drivers/phy/phy-bcm-sr-pcie.c
new file mode 100644
index 0000000000..080cac30b2
--- /dev/null
+++ b/drivers/phy/phy-bcm-sr-pcie.c
@@ -0,0 +1,178 @@ 
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2019 Broadcom
+ */
+
+#include <asm/io.h>
+#include <common.h>
+#include <dm.h>
+#include <dm/device.h>
+#include <linux/bitops.h>
+#include <generic-phy.h>
+
+/* we have up to 8 PAXB based RC. The 9th one is always PAXC */
+#define SR_NR_PCIE_PHYS               8
+
+#define PCIE_PIPEMUX_CFG_OFFSET       0x10c
+#define PCIE_PIPEMUX_SELECT_STRAP     GENMASK(3, 0)
+
+#define CDRU_STRAP_DATA_LSW_OFFSET    0x5c
+#define PCIE_PIPEMUX_SHIFT            19
+#define PCIE_PIPEMUX_MASK             GENMASK(3, 0)
+
+/**
+ * struct sr_pcie_phy_core - Stingray PCIe PHY core control
+ *
+ * @dev: pointer to device
+ * @base: base register of PCIe SS
+ * @cdru: CDRU base address
+ * @pipemux: pipemuex strap
+ */
+struct sr_pcie_phy_core {
+	struct udevice *dev;
+	void __iomem *base;
+	void __iomem *cdru;
+	u32 pipemux;
+};
+
+/*
+ * PCIe PIPEMUX lookup table
+ *
+ * Each array index represents a PIPEMUX strap setting
+ * The array element represents a bitmap where a set bit means the PCIe
+ * core and associated serdes has been enabled as RC and is available for use
+ */
+static const u8 pipemux_table[] = {
+	/* PIPEMUX = 0, EP 1x16 */
+	0x00,
+	/* PIPEMUX = 1, EP 1x8 + RC 1x8, core 7 */
+	0x80,
+	/* PIPEMUX = 2, EP 4x4 */
+	0x00,
+	/* PIPEMUX = 3, RC 2x8, cores 0, 7 */
+	0x81,
+	/* PIPEMUX = 4, RC 4x4, cores 0, 1, 6, 7 */
+	0xc3,
+	/* PIPEMUX = 5, RC 8x2, all 8 cores */
+	0xff,
+	/* PIPEMUX = 6, RC 3x4 + 2x2, cores 0, 2, 3, 6, 7 */
+	0xcd,
+	/* PIPEMUX = 7, RC 1x4 + 6x2, cores 0, 2, 3, 4, 5, 6, 7 */
+	0xfd,
+	/* PIPEMUX = 8, EP 1x8 + RC 4x2, cores 4, 5, 6, 7 */
+	0xf0,
+	/* PIPEMUX = 9, EP 1x8 + RC 2x4, cores 6, 7 */
+	0xc0,
+	/* PIPEMUX = 10, EP 2x4 + RC 2x4, cores 1, 6 */
+	0x42,
+	/* PIPEMUX = 11, EP 2x4 + RC 4x2, cores 2, 3, 4, 5 */
+	0x3c,
+	/* PIPEMUX = 12, EP 1x4 + RC 6x2, cores 2, 3, 4, 5, 6, 7 */
+	0xfc,
+	/* PIPEMUX = 13, RC 2x4 + RC 1x4 + 2x2, cores 2, 3, 6 */
+	0x4c,
+};
+
+/*
+ * Return true if the strap setting is valid
+ */
+static bool pipemux_strap_is_valid(u32 pipemux)
+{
+	return !!(pipemux < ARRAY_SIZE(pipemux_table));
+}
+
+/*
+ * Read the PCIe PIPEMUX from strap
+ */
+static u32 pipemux_strap_read(struct sr_pcie_phy_core *core)
+{
+	u32 pipemux;
+
+	/*
+	 * Read PIPEMUX configuration register to determine the pipemux setting
+	 *
+	 * In the case when the value indicates using HW strap, fall back to
+	 * use HW strap
+	 */
+	pipemux = readl(core->base + PCIE_PIPEMUX_CFG_OFFSET);
+	pipemux &= PCIE_PIPEMUX_MASK;
+	if (pipemux == PCIE_PIPEMUX_SELECT_STRAP) {
+		pipemux = readl(core->cdru + CDRU_STRAP_DATA_LSW_OFFSET);
+		pipemux >>= PCIE_PIPEMUX_SHIFT;
+		pipemux &= PCIE_PIPEMUX_MASK;
+	}
+
+	return pipemux;
+}
+
+static int sr_pcie_phy_init(struct phy *phy)
+{
+	struct sr_pcie_phy_core *core = dev_get_priv(phy->dev);
+	unsigned int core_idx = phy->id;
+
+	debug("%s %lx\n", __func__, phy->id);
+	/*
+	 * Check whether this PHY is for root complex or not. If yes, return
+	 * zero so the host driver can proceed to enumeration. If not, return
+	 * an error and that will force the host driver to bail out
+	 */
+	if (!!((pipemux_table[core->pipemux] >> core_idx) & 0x1))
+		return 0;
+
+	return -ENODEV;
+}
+
+static int sr_pcie_phy_xlate(struct phy *phy, struct ofnode_phandle_args *args)
+{
+	debug("%s %d\n", __func__, args->args[0]);
+	if (args->args_count && args->args[0] < SR_NR_PCIE_PHYS)
+		phy->id = args->args[0];
+	else
+		return -ENODEV;
+
+	return 0;
+}
+
+static const struct phy_ops sr_pcie_phy_ops = {
+	.of_xlate = sr_pcie_phy_xlate,
+	.init = sr_pcie_phy_init,
+};
+
+static int sr_pcie_phy_probe(struct udevice *dev)
+{
+	struct sr_pcie_phy_core *core = dev_get_priv(dev);
+
+	core->dev = dev;
+
+	core->base = (void __iomem *)devfdt_get_addr_name(dev, "reg_base");
+	core->cdru = (void __iomem *)devfdt_get_addr_name(dev, "cdru_base");
+	debug("ip base %p\n", core->base);
+	debug("cdru base %p\n", core->cdru);
+
+	/* read the PCIe PIPEMUX strap setting */
+	core->pipemux = pipemux_strap_read(core);
+	if (!pipemux_strap_is_valid(core->pipemux)) {
+		pr_err("invalid PCIe PIPEMUX strap %u\n", core->pipemux);
+		return -EIO;
+	}
+	debug("%s %#x\n", __func__, core->pipemux);
+
+	pr_info("Stingray PCIe PHY driver initialized\n");
+
+	return 0;
+}
+
+static const struct udevice_id sr_pcie_phy_match_table[] = {
+	{ .compatible = "brcm,sr-pcie-phy" },
+	{ }
+};
+
+U_BOOT_DRIVER(sr_pcie_phy) = {
+	.name = "sr-pcie-phy",
+	.id = UCLASS_PHY,
+	.probe = sr_pcie_phy_probe,
+	.of_match = sr_pcie_phy_match_table,
+	.ops = &sr_pcie_phy_ops,
+	.platdata_auto_alloc_size = sizeof(struct sr_pcie_phy_core),
+	.priv_auto_alloc_size = sizeof(struct sr_pcie_phy_core),
+};