[PATCH v3] net: sfp: add quirk for Potron SFP+ XGSPON ONU Stick

[PATCH v3] net: sfp: add quirk for Potron SFP+ XGSPON ONU Stick

[Chris Morgan]

From: Chris Morgan <macromorgan@hotmail.com>

Add quirk for Potron SFP+ XGSPON ONU Stick (YV SFP+ONT-XGSPON).

This device uses pins 2 and 7 for UART communication, so disable
TX_FAULT and LOS. Additionally as it is an embedded system in an
SFP+ form factor provide it enough time to fully boot before we
attempt to use it.

https://www.potrontec.com/index/index/list/cat_id/2.html#11-83
https://pon.wiki/xgs-pon/ont/potron-technology/x-onu-sfpp/

Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
---
Changes since v2:
 - Waited until merge window closed (sorry).
 - Only disable hardware LOS and TX_FAULT, as software appears to
   work.
 - Created sfp_fixup_ignore_hw() helper which is used to disable
   specific hardware signals and use said helper with both the
   SFP+ONT-XGSPON stick as well as the existing sfp_fixup_halny_gsfp()
   which performs similar fixups.
---
 drivers/net/phy/sfp.c | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c
index 347c1e0e94d9..3829ff32e829 100644
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
@@ -361,6 +361,11 @@ static void sfp_fixup_ignore_tx_fault(struct sfp *sfp)
 	sfp->state_ignore_mask |= SFP_F_TX_FAULT;
 }
 
+static void sfp_fixup_ignore_hw(struct sfp *sfp, unsigned int mask)
+{
+	sfp->state_hw_mask &= ~mask;
+}
+
 static void sfp_fixup_nokia(struct sfp *sfp)
 {
 	sfp_fixup_long_startup(sfp);
@@ -409,7 +414,19 @@ static void sfp_fixup_halny_gsfp(struct sfp *sfp)
 	 * these are possibly used for other purposes on this
 	 * module, e.g. a serial port.
 	 */
-	sfp->state_hw_mask &= ~(SFP_F_TX_FAULT | SFP_F_LOS);
+	sfp_fixup_ignore_hw(sfp, (SFP_F_TX_FAULT | SFP_F_LOS));
+}
+
+static void sfp_fixup_potron(struct sfp *sfp)
+{
+	/*
+	 * The TX_FAULT and LOS pins on this device are used for serial
+	 * communication, so ignore them. Additionally, provide extra
+	 * time for this device to fully start up.
+	 */
+
+	sfp_fixup_long_startup(sfp);
+	sfp_fixup_ignore_hw(sfp, (SFP_F_TX_FAULT | SFP_F_LOS));
 }
 
 static void sfp_fixup_rollball_cc(struct sfp *sfp)
@@ -512,6 +529,8 @@ static const struct sfp_quirk sfp_quirks[] = {
 	SFP_QUIRK_F("Walsun", "HXSX-ATRC-1", sfp_fixup_fs_10gt),
 	SFP_QUIRK_F("Walsun", "HXSX-ATRI-1", sfp_fixup_fs_10gt),
 
+	SFP_QUIRK_F("YV", "SFP+ONU-XGSPON", sfp_fixup_potron),
+
 	// OEM SFP-GE-T is a 1000Base-T module with broken TX_FAULT indicator
 	SFP_QUIRK_F("OEM", "SFP-GE-T", sfp_fixup_ignore_tx_fault),
 
-- 
2.43.0

Re: [PATCH v3] net: sfp: add quirk for Potron SFP+ XGSPON ONU Stick

[Russell King (Oracle)]

On Fri, Jun 13, 2025 at 12:10:02PM -0500, Chris Morgan wrote:
> @@ -409,7 +414,19 @@ static void sfp_fixup_halny_gsfp(struct sfp *sfp)
>  	 * these are possibly used for other purposes on this
>  	 * module, e.g. a serial port.
>  	 */
> -	sfp->state_hw_mask &= ~(SFP_F_TX_FAULT | SFP_F_LOS);
> +	sfp_fixup_ignore_hw(sfp, (SFP_F_TX_FAULT | SFP_F_LOS));
> +}
> +
> +static void sfp_fixup_potron(struct sfp *sfp)
> +{
> +	/*
> +	 * The TX_FAULT and LOS pins on this device are used for serial
> +	 * communication, so ignore them. Additionally, provide extra
> +	 * time for this device to fully start up.
> +	 */
> +
> +	sfp_fixup_long_startup(sfp);
> +	sfp_fixup_ignore_hw(sfp, (SFP_F_TX_FAULT | SFP_F_LOS));

There's no need for parens around the second argument to
sfp_fixup_ignore_hw() - the bitwise OR is unambiguous.

Apart from that, the patch looks fine, thanks.

-- 
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!

Re: [PATCH v3] net: sfp: add quirk for Potron SFP+ XGSPON ONU Stick

[Chris Morgan]

On Mon, Jun 16, 2025 at 10:38:29AM +0100, Russell King (Oracle) wrote:
> On Fri, Jun 13, 2025 at 12:10:02PM -0500, Chris Morgan wrote:
> > @@ -409,7 +414,19 @@ static void sfp_fixup_halny_gsfp(struct sfp *sfp)
> >  	 * these are possibly used for other purposes on this
> >  	 * module, e.g. a serial port.
> >  	 */
> > -	sfp->state_hw_mask &= ~(SFP_F_TX_FAULT | SFP_F_LOS);
> > +	sfp_fixup_ignore_hw(sfp, (SFP_F_TX_FAULT | SFP_F_LOS));
> > +}
> > +
> > +static void sfp_fixup_potron(struct sfp *sfp)
> > +{
> > +	/*
> > +	 * The TX_FAULT and LOS pins on this device are used for serial
> > +	 * communication, so ignore them. Additionally, provide extra
> > +	 * time for this device to fully start up.
> > +	 */
> > +
> > +	sfp_fixup_long_startup(sfp);
> > +	sfp_fixup_ignore_hw(sfp, (SFP_F_TX_FAULT | SFP_F_LOS));
> 
> There's no need for parens around the second argument to
> sfp_fixup_ignore_hw() - the bitwise OR is unambiguous.
> 
> Apart from that, the patch looks fine, thanks.

Thank you, I'll resubmit tomorrow with the requested changes.

- Chris

> 
> -- 
> RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
> FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!