Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1db780f8 authored by Anton Vorontsov's avatar Anton Vorontsov Committed by David S. Miller
Browse files

gianfar: Revive fixed link support 



Since commit fe192a49 ("Rework gianfar
driver to use of_mdio infrastructure") the fixed-link support is
broken, the driver oopses at init_phy():

  Unable to handle kernel paging request for data at address 0x000000e4
  Faulting instruction address: 0xc01cf298
  Oops: Kernel access of bad area, sig: 11 [#1]
  [...]
  NIP [c01cf298] init_phy+0x80/0xdc
  LR [c01cf250] init_phy+0x38/0xdc
  Call Trace:
  [cf81fe80] [c01d1cf8] gfar_enet_open+0x6c/0x19c
  [cf81fea0] [c024494c] dev_open+0xfc/0x134
  [cf81fec0] [c0242edc] dev_change_flags+0x84/0x1ac
  [cf81fee0] [c0399ee0] ic_open_devs+0x168/0x2d8
  [cf81ff20] [c039b2e8] ip_auto_config+0x90/0x2a4
  [cf81ff60] [c0003884] do_one_initcall+0x34/0x1a8

This patch fixes the oops, and removes phy_node checks, and adds a call
to of_phy_connect_fixed_link() if a phy isn't attached..

Also, remove an old fixed-link code that we don't use any longer.

Signed-off-by: default avatarAnton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent eedbc705

drivers/net/gianfar.c

+8 −16
Original line number Diff line number Diff line
@@ -264,15 +264,6 @@ static int gfar_of_init(struct net_device *dev) 
		priv->device_flags |= FSL_GIANFAR_DEV_HAS_MAGIC_PACKET;



	priv->phy_node = of_parse_phandle(np, "phy-handle", 0);

	if (!priv->phy_node) {

		u32 *fixed_link;



		fixed_link = (u32 *)of_get_property(np, "fixed-link", NULL);

		if (!fixed_link) {

			err = -ENODEV;

			goto err_out;

		}

	}



	/* Find the TBI PHY.  If it's not there, we don't support SGMII */

	priv->tbi_node = of_parse_phandle(np, "tbi-handle", 0);
@@ -659,14 +650,15 @@ static int init_phy(struct net_device *dev) 


	interface = gfar_get_interface(dev);



	if (priv->phy_node) {

		priv->phydev = of_phy_connect(dev, priv->phy_node, &adjust_link,

					      0, interface);

	priv->phydev = of_phy_connect(dev, priv->phy_node, &adjust_link, 0,

				      interface);

	if (!priv->phydev)

		priv->phydev = of_phy_connect_fixed_link(dev, &adjust_link,

							 interface);

	if (!priv->phydev) {

			dev_err(&dev->dev, "error: Could not attach to PHY\n");

		dev_err(&dev->dev, "could not attach to PHY\n");

		return -ENODEV;

	}

	}



	if (interface == PHY_INTERFACE_MODE_SGMII)

		gfar_configure_serdes(dev);