linux.git/drivers/net/dsa, branch v3.18-rc2

dsa: Fix conversion from host device to mii bus

2014-10-18T03:52:08+00:00

Commit b4d2394d01bc ("dsa: Replace mii_bus with a generic host device")
replaces mii_bus with a generic host_dev, and introduces
dsa_host_dev_to_mii_bus() to support conversion from host_dev to mii_bus.
However, in some cases it uses to_mii_bus to perform that conversion.
Since host_dev is not the phy bus device but typically a platform device,
this fails and results in a crash with the affected drivers.

BUG: unable to handle kernel NULL pointer dereference at           (null)
IP: [] __mutex_lock_slowpath+0x75/0x100
PGD 406783067 PUD 406784067 PMD 0
Oops: 0002 [#1] SMP
...
Call Trace:
[] ? pick_next_task_fair+0x61b/0x880
[] mutex_lock+0x23/0x37
[] mdiobus_read+0x34/0x60
[] __mv88e6xxx_reg_read+0x8a/0xa0
[] mv88e6xxx_reg_read+0x4c/0xa0

Fixes: b4d2394d01bc ("dsa: Replace mii_bus with a generic host device")
Cc: Alexander Duyck 
Signed-off-by: Guenter Roeck 
Acked-by: Alexander Duyck 
Acked-by: Florian Fainelli 
Signed-off-by: David S. Miller

dsa: mv88e6171: Fix tag_protocol check

2014-10-14T20:23:27+00:00

tag_protocol is now an enum, so drivers have to check against it.

Cc: Andrew Lunn 
Signed-off-by: Guenter Roeck 
Acked-by: Florian Fainelli 
Acked-by: Andrew Lunn 
Signed-off-by: David S. Miller

drivers/net/dsa/Kconfig: Let NET_DSA_BCM_SF2 depend on HAS_IOMEM

2014-10-03T22:52:04+00:00

NET_DSA_BCM_SF2 need HAS_IOMEM, so depend on it, the related error (with
allmodconfig under um):

    CC [M]  drivers/net/dsa/bcm_sf2.o
  drivers/net/dsa/bcm_sf2.c: In function ‘bcm_sf2_sw_setup’:
  drivers/net/dsa/bcm_sf2.c:487:3: error: implicit declaration of function ‘iounmap’ [-Werror=implicit-function-declaration]
     iounmap(*base);
     ^

Signed-off-by: Chen Gang 
Acked-by: Florian Fainelli 
Signed-off-by: David S. Miller

net: dsa: bcm_sf2: add support for controlling EEE

2014-09-28T21:14:09+00:00

When EEE is enabled, negotiate this feature with the PHY and make sure
that the capability checking, local EEE advertisement, link partner EEE
advertisement and auto-negotiation resolution returned by phy_init_eee()
is positive, and enable EEE at the switch level.

While querying the current EEE settings, verify the low-power indication
and indicate its status.

Signed-off-by: Florian Fainelli 
Signed-off-by: David S. Miller

net: dsa: bcm_sf2: add port_enable/disable callbacks

2014-09-28T21:14:09+00:00

The SF2 switch driver is already architected around per-port
enable/disable callbacks, so we just need a slight update to our
existing bcm_sf2_port_setup() resp. bcm_sf2_port_disable() functions to
be suitable as callbacks for port_enable/port_disable.

We need to shuffle a little the code that does the per-port VLAN
configuration/isolation since ports can now be brought up/down
separately, so we need to make sure that IMP (CPU, management) port is
always included in that specific port setup.

Signed-off-by: Florian Fainelli 
Signed-off-by: David S. Miller

net: dsa: bcm_sf2: disable RGMII interface(s) when link is down

2014-09-28T21:14:09+00:00

When the link is down, disable the RGMII interface to conserve as much
power as possible. We re-enable the RGMII interface whenever the link is
detected.

Signed-off-by: Florian Fainelli 
Signed-off-by: David S. Miller

net: dsa: bcm_sf2: add support for Wake-on-LAN

2014-09-22T18:41:23+00:00

In order for Wake-on-LAN to work properly, we query the parent network
device Wake-on-LAN features and advertise those. Similarly, when
configuring Wake-on-LAN on a per-port network interface, we make sure
that we do not accept something the master network devices does not
support.

Finally, we need to maintain a bitmask of the ports enabled for
Wake-on-LAN to prevent the suspend() callback from disabling a port that
is used for waking up the system.

Signed-off-by: Florian Fainelli 
Signed-off-by: David S. Miller

net: dsa: bcm_sf2: add suspend/resume callbacks

2014-09-22T18:41:23+00:00

Implement the suspend/resume callbacks for the Broadcom Starfighter 2
switch driver. Suspending the switch requires masking interrupts and
shutting down ports. Resuming the switch requires a software reset since
we do not know which power-sate we might be coming from, and re-enabling
the physical ports that are used.

Signed-off-by: Florian Fainelli 
Signed-off-by: David S. Miller

net: dsa: bcm_sf2: communicate integrated PHY revision to PHY driver

2014-09-19T20:27:07+00:00

The integrated BCM7xxx PHY contains no useful revision information
in its MII_PHYSID2 bits 3:0, that information is instead contained in
the SWITCH_REG_PHY_REVISION register.

Read this register, store its value, and return it by implementing the
dsa_switch::get_phy_flags() callback accordingly. The register layout is
already matching what the BCM7xxx PHY driver is expecting to find.

Signed-off-by: Florian Fainelli 
Signed-off-by: David S. Miller

dsa: Replace mii_bus with a generic host device

2014-09-15T21:24:20+00:00

This change makes it so that instead of passing and storing a mii_bus we
instead pass and store a host_dev.  From there we can test to determine the
exact type of device, and can verify it is the correct device for our switch.

So for example it would be possible to pass a device pointer from a pci_dev
and instead of checking for a PHY ID we could check for a vendor and/or device
ID.

Signed-off-by: Alexander Duyck 
Signed-off-by: David S. Miller