linux.git/drivers/net/phy, branch v4.7-rc2

Revert "phy: add support for a reset-gpio specification"

2016-05-20T21:56:59+00:00

Commit da47b4572056 ("phy: add support for a reset-gpio specification")
causes the following xtensa qemu crash according to Guenter Roeck:

[    9.366256] libphy: ethoc-mdio: probed
[    9.367389]  (null): could not attach to PHY
[    9.368555]  (null): failed to probe MDIO bus
[    9.371540] Unable to handle kernel paging request at virtual address 0000001c
[    9.371540]  pc = d0320926, ra = 903209d1
[    9.375358] Oops: sig: 11 [#1]

This reverts commit da47b4572056487fd7941c26f73b3e8815ff712a.

Reported-by: Guenter Roeck 
Signed-off-by: Fabio Estevam 
Acked-by: Florian Fainelli 
Tested-by: Guenter Roeck 
Signed-off-by: David S. Miller

phy: fix crash in fixed_phy_add()

2016-05-20T17:50:16+00:00

Since e7f4dc3536a ("mdio: Move allocation of interrupts into core"),
platforms which call fixed_phy_add() before fixed_mdio_bus_init() is
called (for example, because the platform code and the fixed_phy driver
use the same initcall level) crash in fixed_phy_add() since the
->mii_bus is not allocated.

Also since e7f4dc3536a, these interrupts are initalized to polling by
default.  The few (old) platforms which directly use fixed_phy_add()
from their platform code all pass PHY_POLL for the irq argument, so we
can keep these platforms not crashing by simply not attempting to set
the irq if PHY_POLL is passed.

Also, even if problems have not been reported on more modern platforms
which used fixed_phy_register() from drivers' probe functions, we return
-EPROBE_DEFER if the MDIO bus is not yet registered so that the probe is
retried later.

Fixes: e7f4dc3536a400 ("mdio: Move allocation of interrupts into core")
Signed-off-by: Rabin Vincent 
Reviewed-by: Andrew Lunn 
Signed-off-by: David S. Miller

Revert "phy dp83867: Fix compilation with CONFIG_OF_MDIO=m"

2016-05-17T18:49:55+00:00

This reverts commit 7f32541c2fdaa84af418c3e1431bbd066ab44d09.

This needs reverting too, as per requests.

Signed-off-by: David S. Miller

Revert "phy dp83867: Make rgmii parameters optional"

2016-05-17T18:49:24+00:00

This reverts commit 81003bc924bac0a99bfdc2869f5dff5a87aa4a3d.

Developers have asked me to revert this for now.

Signed-off-by: David S. Miller

phy dp83867: Make rgmii parameters optional

2016-05-17T18:31:09+00:00

If you compile without OF_MDIO support in an RGMII configuration, we fail
to configure the dp83867 phy today by writing garbage into its configuration
registers.

On the other hand if you do compile with OF_MDIO and the phy gets loaded via
device tree, you have to have the properties set in the device tree, otherwise
we fail to load the driver and don't even attach the generic phy driver to
the interface anymore.

To make things slightly more consistent, make the rgmii configuration properties
optional and allow a user to omit them in their device tree.

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

phy dp83867: Fix compilation with CONFIG_OF_MDIO=m

2016-05-17T18:31:08+00:00

When CONFIG_OF_MDIO is configured as module, the #define for it really
is CONFIG_OF_MDIO_MODULE, not CONFIG_OF_MDIO. So if we are compiling it
as module, the dp83867 doesn't see that OF_MDIO was selected and doesn't
read the dt rgmii parameters.

The fix is simple: Use IS_ENABLED(). It checks for both - module as well
as compiled in code.

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

lxt: simplify lxt970_config_init()

2016-05-16T17:53:20+00:00

This function declares the 'err' local variable for no good reason, get rid
of it.

Signed-off-by: Sergei Shtylyov 
Signed-off-by: David S. Miller

lxt: simplify lxt97[01]_config_intr()

2016-05-16T17:53:19+00:00

Both these functions declare the 'err' local variables for no good reason,
get rid of them.

Signed-off-by: Sergei Shtylyov 
Signed-off-by: David S. Miller

phy: add support for a reset-gpio specification

2016-05-16T17:22:53+00:00

The framework only asserts (for now) that the reset gpio is not active.

Signed-off-by: Uwe Kleine-König 
Reviewed-by: Roger Quadros 
Signed-off-by: David S. Miller

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

2016-05-15T17:32:48+00:00

The nf_conntrack_core.c fix in 'net' is not relevant in 'net-next'
because we no longer have a per-netns conntrack hash.

The ip_gre.c conflict as well as the iwlwifi ones were cases of
overlapping changes.

Conflicts:
	drivers/net/wireless/intel/iwlwifi/mvm/tx.c
	net/ipv4/ip_gre.c
	net/netfilter/nf_conntrack_core.c

Signed-off-by: David S. Miller