[PATCH net-next 0/4] SFP updates

[PATCH net-next 0/4] SFP updates

[Russell King - ARM Linux]

Included in this series are a further few updates for SFP support:

- Adding support for Fiberstore's non-standard BiDi modules operating
  at 1310nm/1550nm wavelengths rather than the 1000BASE-BX standard of
  1310nm/1490nm.
- Adding support for negotiating the PHY interface mode with the MAC,
  so that modules supporting faster speeds and Gigabit ethernet work
  with Gigabit-only MACs.
- Adding support for high power (>1W) SFP modules.

 Documentation/devicetree/bindings/net/sff,sfp.txt |   5 +
 drivers/net/phy/phylink.c                         |  33 +++--
 drivers/net/phy/sfp-bus.c                         | 162 ++++++++++------------
 drivers/net/phy/sfp.c                             | 150 +++++++++++++++++---
 include/linux/sfp.h                               |  18 +--
 5 files changed, 243 insertions(+), 125 deletions(-)

-- 
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line in suburbia: sync at 8.8Mbps down 630kbps up
According to speedtest.net: 8.21Mbps down 510kbps up

[PATCH net-next 3/4] dt-bindings: add maximum power level to SFP binding

[Russell King]

Add the new maximum power level property to the SFP binding.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
---
 Documentation/devicetree/bindings/net/sff,sfp.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Documentation/devicetree/bindings/net/sff,sfp.txt b/Documentation/devicetree/bindings/net/sff,sfp.txt
index f1c441bedf68..929591d52ed6 100644
--- a/Documentation/devicetree/bindings/net/sff,sfp.txt
+++ b/Documentation/devicetree/bindings/net/sff,sfp.txt
@@ -33,6 +33,10 @@ Transceiver
   Select (AKA RS1) output gpio signal (SFP+ only), low: low Tx rate, high:
   high Tx rate. Must not be present for SFF modules
 
+- maximum-power-milliwatt : Maximum module power consumption
+  Specifies the maximum power consumption allowable by a module in the
+  slot, in milli-Watts.  Presently, modules can be up to 1W, 1.5W or 2W.
+
 Example #1: Direct serdes to SFP connection
 
 sfp_eth3: sfp-eth3 {
@@ -40,6 +44,7 @@ sfp_eth3: sfp-eth3 {
 	i2c-bus = <&sfp_1g_i2c>;
 	los-gpios = <&cpm_gpio2 22 GPIO_ACTIVE_HIGH>;
 	mod-def0-gpios = <&cpm_gpio2 21 GPIO_ACTIVE_LOW>;
+	maximum-power-milliwatt = <1000>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&cpm_sfp_1g_pins &cps_sfp_1g_pins>;
 	tx-disable-gpios = <&cps_gpio1 24 GPIO_ACTIVE_HIGH>;
-- 
2.7.4

Re: [PATCH net-next 0/4] SFP updates

[David Miller]

From: Russell King - ARM Linux <linux@armlinux.org.uk>
Date: Tue, 27 Feb 2018 15:52:18 +0000

> Included in this series are a further few updates for SFP support:
> 
> - Adding support for Fiberstore's non-standard BiDi modules operating
>   at 1310nm/1550nm wavelengths rather than the 1000BASE-BX standard of
>   1310nm/1490nm.
> - Adding support for negotiating the PHY interface mode with the MAC,
>   so that modules supporting faster speeds and Gigabit ethernet work
>   with Gigabit-only MACs.
> - Adding support for high power (>1W) SFP modules.

Series applied, thanks Russell.

Re: [PATCH net-next 3/4] dt-bindings: add maximum power level to SFP binding

[Russell King - ARM Linux]

Hi Rob,

This patch, and the patches that make use of it have now been merged
into their respective trees, but I note that you haven't reviewed
this patch.  Obviously, providing an ack is now moot, but it would
still be good for a response before 4.16-final is released.

On Tue, Feb 27, 2018 at 03:53:07PM +0000, Russell King wrote:
> Add the new maximum power level property to the SFP binding.
> 
> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
> ---
>  Documentation/devicetree/bindings/net/sff,sfp.txt | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/Documentation/devicetree/bindings/net/sff,sfp.txt b/Documentation/devicetree/bindings/net/sff,sfp.txt
> index f1c441bedf68..929591d52ed6 100644
> --- a/Documentation/devicetree/bindings/net/sff,sfp.txt
> +++ b/Documentation/devicetree/bindings/net/sff,sfp.txt
> @@ -33,6 +33,10 @@ Transceiver
>    Select (AKA RS1) output gpio signal (SFP+ only), low: low Tx rate, high:
>    high Tx rate. Must not be present for SFF modules
>  
> +- maximum-power-milliwatt : Maximum module power consumption
> +  Specifies the maximum power consumption allowable by a module in the
> +  slot, in milli-Watts.  Presently, modules can be up to 1W, 1.5W or 2W.
> +
>  Example #1: Direct serdes to SFP connection
>  
>  sfp_eth3: sfp-eth3 {
> @@ -40,6 +44,7 @@ sfp_eth3: sfp-eth3 {
>  	i2c-bus = <&sfp_1g_i2c>;
>  	los-gpios = <&cpm_gpio2 22 GPIO_ACTIVE_HIGH>;
>  	mod-def0-gpios = <&cpm_gpio2 21 GPIO_ACTIVE_LOW>;
> +	maximum-power-milliwatt = <1000>;
>  	pinctrl-names = "default";
>  	pinctrl-0 = <&cpm_sfp_1g_pins &cps_sfp_1g_pins>;
>  	tx-disable-gpios = <&cps_gpio1 24 GPIO_ACTIVE_HIGH>;
> -- 
> 2.7.4
> 

-- 
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line in suburbia: sync at 8.8Mbps down 630kbps up
According to speedtest.net: 8.21Mbps down 510kbps up