Commit 40239396 authored by Ben Hutchings's avatar Ben Hutchings Committed by David S. Miller
Browse files

s2io: Use generic MDIO definitions 



Compile-tested only.

Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cdbf0eb4

drivers/net/s2io-regs.h

+0 −5
Original line number Diff line number Diff line
@@ -271,11 +271,6 @@ struct XENA_dev_config { 
	u64 mdio_control;

#define MDIO_MMD_INDX_ADDR(val)		vBIT(val, 0, 16)

#define MDIO_MMD_DEV_ADDR(val)		vBIT(val, 19, 5)

#define MDIO_MMD_PMA_DEV_ADDR		0x1

#define MDIO_MMD_PMD_DEV_ADDR		0x1

#define MDIO_MMD_WIS_DEV_ADDR		0x2

#define MDIO_MMD_PCS_DEV_ADDR		0x3

#define MDIO_MMD_PHYXS_DEV_ADDR		0x4

#define MDIO_MMS_PRT_ADDR(val)		vBIT(val, 27, 5)

#define MDIO_CTRL_START_TRANS(val)	vBIT(val, 56, 4)

#define MDIO_OP(val)			vBIT(val, 60, 2)

drivers/net/s2io.c

+11 −10
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ 
#include <linux/kernel.h>

#include <linux/netdevice.h>

#include <linux/etherdevice.h>

#include <linux/mdio.h>

#include <linux/skbuff.h>

#include <linux/init.h>

#include <linux/delay.h>
@@ -3328,9 +3329,9 @@ static void s2io_updt_xpak_counter(struct net_device *dev) 
	struct stat_block *stat_info = sp->mac_control.stats_info;



	/* Check the communication with the MDIO slave */

	addr = 0x0000;

	addr = MDIO_CTRL1;

	val64 = 0x0;

	val64 = s2io_mdio_read(MDIO_MMD_PMA_DEV_ADDR, addr, dev);

	val64 = s2io_mdio_read(MDIO_MMD_PMAPMD, addr, dev);

	if((val64 == 0xFFFF) || (val64 == 0x0000))

	{

		DBG_PRINT(ERR_DBG, "ERR: MDIO slave access failed - "
@@ -3338,24 +3339,24 @@ static void s2io_updt_xpak_counter(struct net_device *dev) 
		return;

	}



	/* Check for the expecte value of 2040 at PMA address 0x0000 */

	if(val64 != 0x2040)

	/* Check for the expected value of control reg 1 */

	if(val64 != MDIO_CTRL1_SPEED10G)

	{

		DBG_PRINT(ERR_DBG, "Incorrect value at PMA address 0x0000 - ");

		DBG_PRINT(ERR_DBG, "Returned: %llx- Expected: 0x2040\n",

			  (unsigned long long)val64);

		DBG_PRINT(ERR_DBG, "Returned: %llx- Expected: 0x%x\n",

			  (unsigned long long)val64, MDIO_CTRL1_SPEED10G);

		return;

	}



	/* Loading the DOM register to MDIO register */

	addr = 0xA100;

	s2io_mdio_write(MDIO_MMD_PMA_DEV_ADDR, addr, val16, dev);

	val64 = s2io_mdio_read(MDIO_MMD_PMA_DEV_ADDR, addr, dev);

	s2io_mdio_write(MDIO_MMD_PMAPMD, addr, val16, dev);

	val64 = s2io_mdio_read(MDIO_MMD_PMAPMD, addr, dev);



	/* Reading the Alarm flags */

	addr = 0xA070;

	val64 = 0x0;

	val64 = s2io_mdio_read(MDIO_MMD_PMA_DEV_ADDR, addr, dev);

	val64 = s2io_mdio_read(MDIO_MMD_PMAPMD, addr, dev);



	flag = CHECKBIT(val64, 0x7);

	type = 1;
@@ -3387,7 +3388,7 @@ static void s2io_updt_xpak_counter(struct net_device *dev) 
	/* Reading the Warning flags */

	addr = 0xA074;

	val64 = 0x0;

	val64 = s2io_mdio_read(MDIO_MMD_PMA_DEV_ADDR, addr, dev);

	val64 = s2io_mdio_read(MDIO_MMD_PMAPMD, addr, dev);



	if(CHECKBIT(val64, 0x7))

		stat_info->xpak_stat.warn_transceiver_temp_high++;