linux-toradex.git/drivers/net/phy/marvell.c, branch v4.9.15

Marvell phy: add functions to suspend and resume both interfaces: fiber and copper links.

2016-07-19T23:05:56+00:00

These functions used standards registers in a different page
for both interfaces: copper and fiber.

Reviewed-by: Andrew Lunn 
Signed-off-by: Charles-Antoine Couret 
Signed-off-by: David S. Miller

Marvell phy: add configuration of autonegociation for fiber link.

2016-07-19T23:05:56+00:00

To be correctly initilized, the fiber interface needs
to be configured via autonegociation registers which use
some customs options or registers.

Reviewed-by: Andrew Lunn 
Signed-off-by: Charles-Antoine Couret 
Signed-off-by: David S. Miller

Marvell phy: add field to get errors from fiber link.

2016-07-19T23:05:56+00:00

Add support for the fiber receiver error counter in the
statistics. Rename the current counter which is for copper errors to
phy_receive_errors_copper, so it is easy to distinguish copper from
fiber.

Reviewed-by: Andrew Lunn 
Signed-off-by: Charles-Antoine Couret 
Signed-off-by: David S. Miller

Marvell phy: check link status in case of fiber link.

2016-07-19T23:05:56+00:00

For concerned phy, the fiber link is checked before the copper link.
According to datasheet, the link which is up is enabled.

If both links are down, copper link would be used.
To detect fiber link status, we used the real time status
because of troubles with the copper method.

Tested with Marvell 88E1512.

Reviewed-by: Andrew Lunn 
Signed-off-by: Charles-Antoine Couret 
Signed-off-by: David S. Miller

net: marvell: Add separate config ANEG function for Marvell 88E1111

2016-06-29T08:07:36+00:00

Marvell 88E1111 currently uses the generic marvell config ANEG function.
This function has a sequence accessing Page 5 and Register 31,
both of which are not defined or reserved for this PHY.
Hence this patch adds a new config ANEG function for Marvell 88E1111
without these erroneous accesses.

Signed-off-by: Harini Katakam 
Signed-off-by: David S. Miller

phy: marvell: fix LED configuration via marvell,reg-init

2016-06-14T19:23:03+00:00

Configuring the PHY LED registers for the Marvell 88E1510 and others is
not possible, because regardless of the values in marvell,reg-init, it
is later overridden in m88e1121_config_aneg with a non-standard default.

This patch moves that default configuration to .config_init to allow
setting the LED configuration through marvell,reg-init in the device
tree, which should override said default if it exists.

Signed-off-by: Clemens Gruber 
Reviewed-by: Andrew Lunn 
Signed-off-by: David S. Miller

phy: marvell: Fix 88E1510 initialization

2016-02-25T21:08:37+00:00

A bug was introduced in the merge commit b633353115e3 ("Merge
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net")
The generic marvell_config_init (and therefore marvell_of_reg_init) is
not called anymore for the Marvell 88E1510 (in net-next).

This patch calls marvell_config_init and moves the specific init
function for the 88E1510 below the marvell_config_init function to avoid
adding a function predeclaration.

Signed-off-by: Clemens Gruber 
Signed-off-by: David S. Miller

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2016-02-23T05:09:14+00:00

Conflicts:
	drivers/net/phy/bcm7xxx.c
	drivers/net/phy/marvell.c
	drivers/net/vxlan.c

All three conflicts were cases of simple overlapping changes.

Signed-off-by: David S. Miller

phy: marvell/micrel: Fix Unpossible condition

2016-02-20T04:41:37+00:00

commit 2b2427d06426 ("phy: micrel: Add ethtool statistics counters")
from Dec 30, 2015, leads to the following static checker
warning:

        drivers/net/phy/micrel.c:609 kszphy_get_stat()
        warn: unsigned 'val' is never less than zero.

drivers/net/phy/micrel.c
   602  static u64 kszphy_get_stat(struct phy_device *phydev, int i)
   603  {
   604          struct kszphy_hw_stat stat = kszphy_hw_stats[i];
   605          struct kszphy_priv *priv = phydev->priv;
   606          u64 val;
   607
   608          val = phy_read(phydev, stat.reg);
   609          if (val < 0) {
                    ^^^^^^^
Unpossible!

   610                  val = UINT64_MAX;
   611          } else {
   612                  val = val & ((1 << stat.bits) - 1);
   613                  priv->stats[i] += val;
   614                  val = priv->stats[i];
   615          }
   616
   617          return val;
   618  }

The same problem exists in the Marvell driver. Fix both.

Fixes: 2b2427d06426 ("phy: micrel: Add ethtool statistics counters")
Reported-by: Dan Carpenter 
Reported-by: Julia.Lawall 
Signed-off-by: Andrew Lunn 
Signed-off-by: David S. Miller

net: phy: Add SGMII support for Marvell 88E1510/1512/1514/1518

2016-02-18T16:13:12+00:00

Add code to select SGMII-to-copper mode upon SGMII interface selection.

Signed-off-by: Stefan Roese 
Cc: Andrew Lunn 
Cc: Florian Fainelli 
Cc: David S. Miller 
Signed-off-by: David S. Miller