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

Commit f8dd0ecb authored by Ben Dooks's avatar Ben Dooks Committed by Jeff Garzik
Browse files

DM9000: Allow the use of the NSR register to get link status. 



The DM9000's internal PHY reports a copy of the link status
in the NSR register of the chip. Reading the status when
polling for link status is faster as it eliminates the need
to sleep, but does not print as much information.

Add an platform flag to force this behaviour, and a Kconfig
option to allow it to be forced to the faster method always.

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent aa1eb452

drivers/net/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -938,6 +938,15 @@ config DM9000 
	  To compile this driver as a module, choose M here.  The module

	  will be called dm9000.



config DM9000_FORCE_SIMPLE_PHY_POLL

	bool "Force simple NSR based PHY polling"

	depends on DM9000

	---help---

	  This configuration forces the DM9000 to use the NSR's LinkStatus

	  bit to determine if the link is up or down instead of the more

	  costly MII PHY reads. Note, this will not work if the chip is

	  operating with an external PHY.



config ENC28J60

	tristate "ENC28J60 support"

	depends on EXPERIMENTAL && SPI && NET_ETHERNET

drivers/net/dm9000.c

+39 −2
Original line number Diff line number Diff line
@@ -552,15 +552,48 @@ static const struct ethtool_ops dm9000_ethtool_ops = { 
 	.set_eeprom		= dm9000_set_eeprom,

};



static void dm9000_show_carrier(board_info_t *db,

				unsigned carrier, unsigned nsr)

{

	struct net_device *ndev = db->ndev;

	unsigned ncr = dm9000_read_locked(db, DM9000_NCR);



	if (carrier)

		dev_info(db->dev, "%s: link up, %dMbps, %s-duplex, no LPA\n",

			 ndev->name, (nsr & NSR_SPEED) ? 10 : 100,

			 (ncr & NCR_FDX) ? "full" : "half");

	else

		dev_info(db->dev, "%s: link down\n", ndev->name);

}



static void

dm9000_poll_work(struct work_struct *w)

{

	struct delayed_work *dw = container_of(w, struct delayed_work, work);

	board_info_t *db = container_of(dw, board_info_t, phy_poll);

	struct net_device *ndev = db->ndev;



	if (db->flags & DM9000_PLATF_SIMPLE_PHY &&

	    !(db->flags & DM9000_PLATF_EXT_PHY)) {

		unsigned nsr = dm9000_read_locked(db, DM9000_NSR);

		unsigned old_carrier = netif_carrier_ok(ndev) ? 1 : 0;

		unsigned new_carrier;



		new_carrier = (nsr & NSR_LINKST) ? 1 : 0;



		if (old_carrier != new_carrier) {

			if (netif_msg_link(db))

				dm9000_show_carrier(db, new_carrier, nsr);



			if (!new_carrier)

				netif_carrier_off(ndev);

			else

				netif_carrier_on(ndev);

		}

	} else

		mii_check_media(&db->mii, netif_msg_link(db), 0);

	

	if (netif_running(db->ndev))

	if (netif_running(ndev))

		dm9000_schedule_poll(db);

}
@@ -1267,6 +1300,10 @@ dm9000_probe(struct platform_device *pdev) 
		db->flags = pdata->flags;

	}



#ifdef CONFIG_DM9000_FORCE_SIMPLE_PHY_POLL

	db->flags |= DM9000_PLATF_SIMPLE_PHY;

#endif



	dm9000_reset(db);



	/* try multiple times, DM9000 sometimes gets the read wrong */

include/linux/dm9000.h

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#define DM9000_PLATF_32BITONLY	(0x0004)

#define DM9000_PLATF_EXT_PHY	(0x0008)

#define DM9000_PLATF_NO_EEPROM	(0x0010)

#define DM9000_PLATF_SIMPLE_PHY (0x0020)  /* Use NSR to find LinkStatus */



/* platfrom data for platfrom device structure's platfrom_data field */