diff mbox series

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

Message ID 20200402103812.7775-1-rayagonda.kokatanur@broadcom.com
State New
Headers show
Series [v3,1/1] phy: add support for stingray PAXB PHY controller | expand

Commit Message

Rayagonda Kokatanur April 2, 2020, 10:38 a.m. UTC
From: Srinath Mannam <srinath.mannam at 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 at broadcom.com>
Signed-off-by: Rayagonda Kokatanur <rayagonda.kokatanur at broadcom.com>
Reviewed-by: Stefan Roese <sr at denx.de>
---
Changes from v2:
 -Address review comments from Stefan Roese,
  Rearrange the include files.
  Remove dm/device.h as its included part of dm.h.

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 | 177 ++++++++++++++++++++++++++++++++++
 3 files changed, 185 insertions(+)
 create mode 100644 drivers/phy/phy-bcm-sr-pcie.c

Comments

Tom Rini April 9, 2020, 1:41 p.m. UTC | #1
On Thu, Apr 02, 2020 at 04:08:12PM +0530, Rayagonda Kokatanur wrote:

> From: Srinath Mannam <srinath.mannam at 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 at broadcom.com>
> Signed-off-by: Rayagonda Kokatanur <rayagonda.kokatanur at broadcom.com>
> Reviewed-by: Stefan Roese <sr at denx.de>
> ---
> Changes from v2:
>  -Address review comments from Stefan Roese,
>   Rearrange the include files.
>   Remove dm/device.h as its included part of dm.h.
> 
> 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 | 177 ++++++++++++++++++++++++++++++++++

The patch itself is fine but I think shows another problem.  Can you
please add a patch that lists something relevant in the top-level
MAINTAINERS file and list this and all of the other drivers, etc, that
wouldn't just be listed in the board MAINATINERS file?  Thanks!
Rayagonda Kokatanur April 12, 2020, 3:16 p.m. UTC | #2
On Thu, Apr 9, 2020 at 7:11 PM Tom Rini <trini at konsulko.com> wrote:
>
> On Thu, Apr 02, 2020 at 04:08:12PM +0530, Rayagonda Kokatanur wrote:
>
> > From: Srinath Mannam <srinath.mannam at 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 at broadcom.com>
> > Signed-off-by: Rayagonda Kokatanur <rayagonda.kokatanur at broadcom.com>
> > Reviewed-by: Stefan Roese <sr at denx.de>
> > ---
> > Changes from v2:
> >  -Address review comments from Stefan Roese,
> >   Rearrange the include files.
> >   Remove dm/device.h as its included part of dm.h.
> >
> > 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 | 177 ++++++++++++++++++++++++++++++++++
>
> The patch itself is fine but I think shows another problem.  Can you
> please add a patch that lists something relevant in the top-level
> MAINTAINERS file and list this and all of the other drivers, etc, that
> wouldn't just be listed in the board MAINATINERS file?  Thanks!

I will be mainitainer going ahead.
I have a plan to update top level MAINTAINER file once I push platform files.
Hope this is fine.

>
> --
> Tom
Rayagonda Kokatanur June 25, 2020, 5:27 p.m. UTC | #3
Hi Tom,


On Sun, Apr 12, 2020 at 8:46 PM Rayagonda Kokatanur
<rayagonda.kokatanur at broadcom.com> wrote:
>
> On Thu, Apr 9, 2020 at 7:11 PM Tom Rini <trini at konsulko.com> wrote:
> >
> > On Thu, Apr 02, 2020 at 04:08:12PM +0530, Rayagonda Kokatanur wrote:
> >
> > > From: Srinath Mannam <srinath.mannam at 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 at broadcom.com>
> > > Signed-off-by: Rayagonda Kokatanur <rayagonda.kokatanur at broadcom.com>
> > > Reviewed-by: Stefan Roese <sr at denx.de>
> > > ---
> > > Changes from v2:
> > >  -Address review comments from Stefan Roese,
> > >   Rearrange the include files.
> > >   Remove dm/device.h as its included part of dm.h.
> > >
> > > 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 | 177 ++++++++++++++++++++++++++++++++++
> >
> > The patch itself is fine but I think shows another problem.  Can you
> > please add a patch that lists something relevant in the top-level
> > MAINTAINERS file and list this and all of the other drivers, etc, that
> > wouldn't just be listed in the board MAINATINERS file?  Thanks!

I have a plan to update the top level MAINTAINER file with all new
driver and board files in a separate patch.
Hope this is fine, please let me know.

Thanks,
Rayagonda

>
> I will be mainitainer going ahead.
> I have a plan to update top level MAINTAINER file once I push platform files.
> Hope this is fine.
>
> >
> > --
> > Tom
Tom Rini June 26, 2020, 8:01 p.m. UTC | #4
On Thu, Jun 25, 2020 at 10:57:09PM +0530, Rayagonda Kokatanur wrote:
> Hi Tom,
> 
> 
> On Sun, Apr 12, 2020 at 8:46 PM Rayagonda Kokatanur
> <rayagonda.kokatanur at broadcom.com> wrote:
> >
> > On Thu, Apr 9, 2020 at 7:11 PM Tom Rini <trini at konsulko.com> wrote:
> > >
> > > On Thu, Apr 02, 2020 at 04:08:12PM +0530, Rayagonda Kokatanur wrote:
> > >
> > > > From: Srinath Mannam <srinath.mannam at 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 at broadcom.com>
> > > > Signed-off-by: Rayagonda Kokatanur <rayagonda.kokatanur at broadcom.com>
> > > > Reviewed-by: Stefan Roese <sr at denx.de>
> > > > ---
> > > > Changes from v2:
> > > >  -Address review comments from Stefan Roese,
> > > >   Rearrange the include files.
> > > >   Remove dm/device.h as its included part of dm.h.
> > > >
> > > > 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 | 177 ++++++++++++++++++++++++++++++++++
> > >
> > > The patch itself is fine but I think shows another problem.  Can you
> > > please add a patch that lists something relevant in the top-level
> > > MAINTAINERS file and list this and all of the other drivers, etc, that
> > > wouldn't just be listed in the board MAINATINERS file?  Thanks!
> 
> I have a plan to update the top level MAINTAINER file with all new
> driver and board files in a separate patch.
> Hope this is fine, please let me know.

OK, thanks.  I'll be picking up more patches again soon for -next.
Rayagonda Kokatanur July 30, 2020, 3:58 a.m. UTC | #5
Hi Tom,

On Sat, Jun 27, 2020 at 1:31 AM Tom Rini <trini@konsulko.com> wrote:
>

> On Thu, Jun 25, 2020 at 10:57:09PM +0530, Rayagonda Kokatanur wrote:

> > Hi Tom,

> >

> >

> > On Sun, Apr 12, 2020 at 8:46 PM Rayagonda Kokatanur

> > <rayagonda.kokatanur@broadcom.com> wrote:

> > >

> > > On Thu, Apr 9, 2020 at 7:11 PM Tom Rini <trini@konsulko.com> wrote:

> > > >

> > > > On Thu, Apr 02, 2020 at 04:08:12PM +0530, 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>

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

> > > > > ---

> > > > > Changes from v2:

> > > > >  -Address review comments from Stefan Roese,

> > > > >   Rearrange the include files.

> > > > >   Remove dm/device.h as its included part of dm.h.

> > > > >

> > > > > 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 | 177 ++++++++++++++++++++++++++++++++++

> > > >

> > > > The patch itself is fine but I think shows another problem.  Can you

> > > > please add a patch that lists something relevant in the top-level

> > > > MAINTAINERS file and list this and all of the other drivers, etc, that

> > > > wouldn't just be listed in the board MAINATINERS file?  Thanks!

> >

> > I have a plan to update the top level MAINTAINER file with all new

> > driver and board files in a separate patch.

> > Hope this is fine, please let me know.

>

> OK, thanks.  I'll be picking up more patches again soon for -next.


Could you please pick this patch.
If any further review comments, please let me know.

Best regards,
Rayagonda

>

> --

> Tom
Tom Rini Oct. 1, 2020, 2:09 p.m. UTC | #6
On Thu, Apr 02, 2020 at 04:08:12PM +0530, 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>

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


Applied to u-boot/next, thanks!

-- 
Tom
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..36c77c4b63
--- /dev/null
+++ b/drivers/phy/phy-bcm-sr-pcie.c
@@ -0,0 +1,177 @@ 
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2019 Broadcom
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <generic-phy.h>
+#include <asm/io.h>
+#include <linux/bitops.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),
+};