[v2 1/2] Docs/devicetree: add serdes-output-amplitude-mv to marvell.txt

[v2 1/2] Docs/devicetree: add serdes-output-amplitude-mv to marvell.txt

[Holger Brunck]

This can be configured from the device tree. Add this property to the
documentation accordingly. This is a property of the port node, which
needs to be specified in millivolts

CC: Andrew Lunn <andrew@lunn.ch>
CC: Jakub Kicinski <kuba@kernel.org>
CC: Marek Behún <kabel@kernel.org>
Signed-off-by: Holger Brunck <holger.brunck@hitachienergy.com>
---
 Documentation/devicetree/bindings/net/dsa/marvell.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Documentation/devicetree/bindings/net/dsa/marvell.txt b/Documentation/devicetree/bindings/net/dsa/marvell.txt
index 2363b412410c..9292b6f960df 100644
--- a/Documentation/devicetree/bindings/net/dsa/marvell.txt
+++ b/Documentation/devicetree/bindings/net/dsa/marvell.txt
@@ -46,6 +46,11 @@ Optional properties:
 - mdio?		: Container of PHYs and devices on the external MDIO
 			  bus. The node must contains a compatible string of
 			  "marvell,mv88e6xxx-mdio-external"
+- serdes-output-amplitude-mv: Configure the output amplitude of the serdes
+			      interface in millivolts. This option can be
+                              set in the ports node as it is a property of
+                              the port.
+    serdes-output-amplitude-mv = <210>;
 
 Example:
 
-- 
2.34.0

[v2 2/2] dsa: mv88e6xxx: make serdes SGMII/Fiber output amplitude configurable

[Holger Brunck]

The mv88e6352, mv88e6240 and mv88e6176  have a serdes interface. This patch
allows to configure the output swing to a desired value in the
devicetree node of the port. As the chips only supports eight dedicated
values we return EINVAL if the value in the DTS does not match.

CC: Andrew Lunn <andrew@lunn.ch>
CC: Jakub Kicinski <kuba@kernel.org>
CC: Marek Behún <kabel@kernel.org>
Signed-off-by: Holger Brunck <holger.brunck@hitachienergy.com>
---
 drivers/net/dsa/mv88e6xxx/chip.c   | 17 +++++++++++
 drivers/net/dsa/mv88e6xxx/chip.h   |  4 +++
 drivers/net/dsa/mv88e6xxx/serdes.c | 48 ++++++++++++++++++++++++++++++
 drivers/net/dsa/mv88e6xxx/serdes.h |  5 ++++
 4 files changed, 74 insertions(+)

diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index f00cbf5753b9..b61db6d2c18d 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -2861,6 +2861,8 @@ static int mv88e6xxx_setup_upstream_port(struct mv88e6xxx_chip *chip, int port)
 static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port)
 {
 	struct dsa_switch *ds = chip->ds;
+	struct dsa_port *dp;
+	int out_amp;
 	int err;
 	u16 reg;
 
@@ -3014,6 +3016,18 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port)
 			return err;
 	}
 
+	if (chip->info->ops->serdes_set_out_amplitude) {
+		dp = dsa_to_port(ds, port);
+		if (dp &&
+		    !of_property_read_u32(dp->dn, "serdes-output-amplitude-mv",
+					  &out_amp)) {
+			err = mv88e6352_serdes_set_out_amplitude(chip, port,
+								 out_amp);
+			if (err)
+				return err;
+		}
+	}
+
 	/* Port based VLAN map: give each port the same default address
 	 * database, and allow bidirectional communication between the
 	 * CPU and DSA port(s), and the other ports.
@@ -4076,6 +4090,7 @@ static const struct mv88e6xxx_ops mv88e6176_ops = {
 	.serdes_irq_status = mv88e6352_serdes_irq_status,
 	.serdes_get_regs_len = mv88e6352_serdes_get_regs_len,
 	.serdes_get_regs = mv88e6352_serdes_get_regs,
+	.serdes_set_out_amplitude = mv88e6352_serdes_set_out_amplitude,
 	.gpio_ops = &mv88e6352_gpio_ops,
 	.phylink_validate = mv88e6352_phylink_validate,
 };
@@ -4356,6 +4371,7 @@ static const struct mv88e6xxx_ops mv88e6240_ops = {
 	.serdes_irq_status = mv88e6352_serdes_irq_status,
 	.serdes_get_regs_len = mv88e6352_serdes_get_regs_len,
 	.serdes_get_regs = mv88e6352_serdes_get_regs,
+	.serdes_set_out_amplitude = mv88e6352_serdes_set_out_amplitude,
 	.gpio_ops = &mv88e6352_gpio_ops,
 	.avb_ops = &mv88e6352_avb_ops,
 	.ptp_ops = &mv88e6352_ptp_ops,
@@ -4762,6 +4778,7 @@ static const struct mv88e6xxx_ops mv88e6352_ops = {
 	.serdes_get_stats = mv88e6352_serdes_get_stats,
 	.serdes_get_regs_len = mv88e6352_serdes_get_regs_len,
 	.serdes_get_regs = mv88e6352_serdes_get_regs,
+	.serdes_set_out_amplitude = mv88e6352_serdes_set_out_amplitude,
 	.phylink_validate = mv88e6352_phylink_validate,
 };
 
diff --git a/drivers/net/dsa/mv88e6xxx/chip.h b/drivers/net/dsa/mv88e6xxx/chip.h
index 8271b8aa7b71..745f6c32dd15 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.h
+++ b/drivers/net/dsa/mv88e6xxx/chip.h
@@ -586,6 +586,10 @@ struct mv88e6xxx_ops {
 	void (*serdes_get_regs)(struct mv88e6xxx_chip *chip, int port,
 				void *_p);
 
+	/* SERDES SGMII/Fiber Output Amplitude */
+	int (*serdes_set_out_amplitude)(struct mv88e6xxx_chip *chip, int port,
+					int val);
+
 	/* Address Translation Unit operations */
 	int (*atu_get_hash)(struct mv88e6xxx_chip *chip, u8 *hash);
 	int (*atu_set_hash)(struct mv88e6xxx_chip *chip, u8 hash);
diff --git a/drivers/net/dsa/mv88e6xxx/serdes.c b/drivers/net/dsa/mv88e6xxx/serdes.c
index 6ea003678798..9abe6fa07b3b 100644
--- a/drivers/net/dsa/mv88e6xxx/serdes.c
+++ b/drivers/net/dsa/mv88e6xxx/serdes.c
@@ -1271,6 +1271,54 @@ void mv88e6390_serdes_get_regs(struct mv88e6xxx_chip *chip, int port, void *_p)
 	}
 }
 
+struct mv88e6352_serdes_amp_to_val {
+	int mv;
+	u16 regval;
+};
+
+static struct mv88e6352_serdes_amp_to_val mv88e6352_serdes_amp_to_val[] = {
+	/* Mapping of configurable millivolt values to the register value */
+	{ 14, 0},
+	{ 112, 1},
+	{ 210, 2},
+	{ 308, 3},
+	{ 406, 4},
+	{ 504, 5},
+	{ 602, 6},
+	{ 700, 7},
+};
+
+int mv88e6352_serdes_set_out_amplitude(struct mv88e6xxx_chip *chip, int port,
+				       int val)
+{
+	bool found = false;
+	u16 reg;
+	int err;
+	int i;
+
+	if (!mv88e6352_port_has_serdes(chip, port))
+		return -EOPNOTSUPP;
+
+	for (i = 0; i < ARRAY_SIZE(mv88e6352_serdes_amp_to_val); ++i) {
+		if (mv88e6352_serdes_amp_to_val[i].mv == val) {
+			reg = mv88e6352_serdes_amp_to_val[i].regval;
+			found = true;
+			break;
+		}
+	}
+
+	if (!found)
+		return -EINVAL;
+
+	err = mv88e6352_serdes_read(chip, MV88E6352_SERDES_SPEC_CTRL2, &reg);
+	if (err)
+		return err;
+
+	reg = (reg & MV88E6352_SERDES_OUT_AMP_MASK) | val;
+
+	return mv88e6352_serdes_write(chip, MV88E6352_SERDES_SPEC_CTRL2, reg);
+}
+
 static int mv88e6393x_serdes_port_errata(struct mv88e6xxx_chip *chip, int lane)
 {
 	u16 reg, pcs;
diff --git a/drivers/net/dsa/mv88e6xxx/serdes.h b/drivers/net/dsa/mv88e6xxx/serdes.h
index cbb3ba30caea..4bc39d06060b 100644
--- a/drivers/net/dsa/mv88e6xxx/serdes.h
+++ b/drivers/net/dsa/mv88e6xxx/serdes.h
@@ -27,6 +27,8 @@
 #define MV88E6352_SERDES_INT_FIBRE_ENERGY	BIT(4)
 #define MV88E6352_SERDES_INT_STATUS	0x13
 
+#define MV88E6352_SERDES_SPEC_CTRL2	0x1a
+#define MV88E6352_SERDES_OUT_AMP_MASK		0xfffc
 
 #define MV88E6341_PORT5_LANE		0x15
 
@@ -172,6 +174,9 @@ void mv88e6352_serdes_get_regs(struct mv88e6xxx_chip *chip, int port, void *_p);
 int mv88e6390_serdes_get_regs_len(struct mv88e6xxx_chip *chip, int port);
 void mv88e6390_serdes_get_regs(struct mv88e6xxx_chip *chip, int port, void *_p);
 
+int mv88e6352_serdes_set_out_amplitude(struct mv88e6xxx_chip *chip, int port,
+				       int val);
+
 /* Return the (first) SERDES lane address a port is using, -errno otherwise. */
 static inline int mv88e6xxx_serdes_get_lane(struct mv88e6xxx_chip *chip,
 					    int port)
-- 
2.34.0

Re: [v2 1/2] Docs/devicetree: add serdes-output-amplitude-mv to marvell.txt

[Marek Behún]

On Thu,  2 Dec 2021 09:05:26 +0100
Holger Brunck <holger.brunck@hitachienergy.com> wrote:

> This can be configured from the device tree. Add this property to the
> documentation accordingly. This is a property of the port node, which
> needs to be specified in millivolts
> 
> CC: Andrew Lunn <andrew@lunn.ch>
> CC: Jakub Kicinski <kuba@kernel.org>
> CC: Marek Behún <kabel@kernel.org>
> Signed-off-by: Holger Brunck <holger.brunck@hitachienergy.com>
> ---
>  Documentation/devicetree/bindings/net/dsa/marvell.txt | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/Documentation/devicetree/bindings/net/dsa/marvell.txt b/Documentation/devicetree/bindings/net/dsa/marvell.txt
> index 2363b412410c..9292b6f960df 100644
> --- a/Documentation/devicetree/bindings/net/dsa/marvell.txt
> +++ b/Documentation/devicetree/bindings/net/dsa/marvell.txt
> @@ -46,6 +46,11 @@ Optional properties:
>  - mdio?		: Container of PHYs and devices on the external MDIO
>  			  bus. The node must contains a compatible string of
>  			  "marvell,mv88e6xxx-mdio-external"
> +- serdes-output-amplitude-mv: Configure the output amplitude of the serdes
> +			      interface in millivolts. This option can be
> +                              set in the ports node as it is a property of
> +                              the port.
> +    serdes-output-amplitude-mv = <210>;

The suffix should be millivolt, as can be seen in other bindings.

Also I think maybe use "tx" instead of "output"? It is more common to
refere to serdes pairs as rx/tx instead of input/output:

  serdes-tx-amplitude-millivolt

I will probably want to add this property also either to mvneta, or to
A3720 common PHY binding. Andrew, do you think it should be put
somewhere more generic?

Marek

RE: [v2 1/2] Docs/devicetree: add serdes-output-amplitude-mv to marvell.txt

[Holger Brunck]

> On Thu,  2 Dec 2021 09:05:26 +0100
> Holger Brunck <holger.brunck@hitachienergy.com> wrote:
> 
> > This can be configured from the device tree. Add this property to the
> > documentation accordingly. This is a property of the port node, which
> > needs to be specified in millivolts
> >
> > CC: Andrew Lunn <andrew@lunn.ch>
> > CC: Jakub Kicinski <kuba@kernel.org>
> > CC: Marek Behún <kabel@kernel.org>
> > Signed-off-by: Holger Brunck <holger.brunck@hitachienergy.com>
> > ---
> >  Documentation/devicetree/bindings/net/dsa/marvell.txt | 5 +++++
> >  1 file changed, 5 insertions(+)
> >
> > diff --git a/Documentation/devicetree/bindings/net/dsa/marvell.txt
> > b/Documentation/devicetree/bindings/net/dsa/marvell.txt
> > index 2363b412410c..9292b6f960df 100644
> > --- a/Documentation/devicetree/bindings/net/dsa/marvell.txt
> > +++ b/Documentation/devicetree/bindings/net/dsa/marvell.txt
> > @@ -46,6 +46,11 @@ Optional properties:
> >  - mdio?              : Container of PHYs and devices on the external MDIO
> >                         bus. The node must contains a compatible string of
> >                         "marvell,mv88e6xxx-mdio-external"
> > +- serdes-output-amplitude-mv: Configure the output amplitude of the serdes
> > +                           interface in millivolts. This option can be
> > +                              set in the ports node as it is a property of
> > +                              the port.
> > +    serdes-output-amplitude-mv = <210>;
> 
> The suffix should be millivolt, as can be seen in other bindings.
> 
> Also I think maybe use "tx" instead of "output"? It is more common to refere to
> serdes pairs as rx/tx instead of input/output:
> 
>   serdes-tx-amplitude-millivolt
> 

I can change that. The naming output-amplitude was chosen because the
register in the datasheet is named  "SGMII/FiberOutput Amplitude".
If I change it,  it would make sense that I also rename the
function and variable names to make it consistent IMHO.

Best regards
Holger

Re: [v2 1/2] Docs/devicetree: add serdes-output-amplitude-mv to marvell.txt

[Andrew Lunn]

> > diff --git a/Documentation/devicetree/bindings/net/dsa/marvell.txt b/Documentation/devicetree/bindings/net/dsa/marvell.txt
> > index 2363b412410c..9292b6f960df 100644
> > --- a/Documentation/devicetree/bindings/net/dsa/marvell.txt
> > +++ b/Documentation/devicetree/bindings/net/dsa/marvell.txt
> > @@ -46,6 +46,11 @@ Optional properties:
> >  - mdio?		: Container of PHYs and devices on the external MDIO
> >  			  bus. The node must contains a compatible string of
> >  			  "marvell,mv88e6xxx-mdio-external"
> > +- serdes-output-amplitude-mv: Configure the output amplitude of the serdes
> > +			      interface in millivolts. This option can be
> > +                              set in the ports node as it is a property of
> > +                              the port.
> > +    serdes-output-amplitude-mv = <210>;
> 
> The suffix should be millivolt, as can be seen in other bindings.

My bad. I recommended that. It does seem like both are used, but
millivolt is more popular.

> Also I think maybe use "tx" instead of "output"? It is more common to
> refere to serdes pairs as rx/tx instead of input/output:
> 
>   serdes-tx-amplitude-millivolt
> 
> I will probably want to add this property also either to mvneta, or to
> A3720 common PHY binding. Andrew, do you think it should be put
> somewhere more generic?

Not sure what the common location would be. I assume for mvneta and
A3720 it is part of the generic phy comphy driver? Does generic phy
have any properties like this already?

Here we are using it in DSA. And it could also be used in a Marvell
phy driver node.

So maybe something like serdes.yaml?
bindings/phy/microchip,sparx5-serdes.yaml actually mentions

  * Tx output amplitude control

but does not define a property for it, but that looks like another use
case for it.

     Andrew

RE: [v2 1/2] Docs/devicetree: add serdes-output-amplitude-mv to marvell.txt

[Holger Brunck]

> > > diff --git a/Documentation/devicetree/bindings/net/dsa/marvell.txt
> > > b/Documentation/devicetree/bindings/net/dsa/marvell.txt
> > > index 2363b412410c..9292b6f960df 100644
> > > --- a/Documentation/devicetree/bindings/net/dsa/marvell.txt
> > > +++ b/Documentation/devicetree/bindings/net/dsa/marvell.txt
> > > @@ -46,6 +46,11 @@ Optional properties:
> > >  - mdio?            : Container of PHYs and devices on the external MDIO
> > >                       bus. The node must contains a compatible string of
> > >                       "marvell,mv88e6xxx-mdio-external"
> > > +- serdes-output-amplitude-mv: Configure the output amplitude of the
> serdes
> > > +                         interface in millivolts. This option can be
> > > +                              set in the ports node as it is a property of
> > > +                              the port.
> > > +    serdes-output-amplitude-mv = <210>;
> >
> > The suffix should be millivolt, as can be seen in other bindings.
> 
> My bad. I recommended that. It does seem like both are used, but millivolt is
> more popular.
> 
> > Also I think maybe use "tx" instead of "output"? It is more common to
> > refere to serdes pairs as rx/tx instead of input/output:
> >
> >   serdes-tx-amplitude-millivolt
> >
> > I will probably want to add this property also either to mvneta, or to
> > A3720 common PHY binding. Andrew, do you think it should be put
> > somewhere more generic?
> 
> Not sure what the common location would be. I assume for mvneta and
> A3720 it is part of the generic phy comphy driver? Does generic phy have any
> properties like this already?
> 
> Here we are using it in DSA. And it could also be used in a Marvell phy driver
> node.
> 
> So maybe something like serdes.yaml?
> bindings/phy/microchip,sparx5-serdes.yaml actually mentions
> 
>   * Tx output amplitude control
> 
> but does not define a property for it, but that looks like another use case for it.
> 

so what is the conclusion here? Should I add it to marvell.txt for now or is there
a better place?

Best regards
Holger

Re: [v2 1/2] Docs/devicetree: add serdes-output-amplitude-mv to marvell.txt

[Andrew Lunn]

> so what is the conclusion here? Should I add it to marvell.txt for now or is there
> a better place?

I think a serdes.yaml would be a good idea.

  Andrew