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

Commit e10bc84d authored by Yaniv Rosner's avatar Yaniv Rosner Committed by David S. Miller
Browse files

bnx2x: Unify PHY attributes 



Start building the infrastructure for dual media by adding new component
of PHY which will be used all along the function. Modify function to
work with this component instead of the link_params.

Signed-off-by: default avatarYaniv Rosner <yanivr@broadcom.com>
Signed-off-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent db40980f

drivers/net/bnx2x/bnx2x_ethtool.c

+9 −6
Original line number Diff line number Diff line
@@ -811,7 +811,7 @@ static int bnx2x_set_eeprom(struct net_device *dev, 
	struct bnx2x *bp = netdev_priv(dev);

	int port = BP_PORT(bp);

	int rc = 0;



	u32 ext_phy_config;

	if (!netif_running(dev))

		return -EAGAIN;
@@ -827,6 +827,10 @@ static int bnx2x_set_eeprom(struct net_device *dev, 
	    !bp->port.pmf)

		return -EINVAL;



	ext_phy_config =

		SHMEM_RD(bp,

			 dev_info.port_hw_config[port].external_phy_config);



	if (eeprom->magic == 0x50485950) {

		/* 'PHYP' (0x50485950): prepare phy for FW upgrade */

		bnx2x_stats_handle(bp, STATS_EVENT_STOP);
@@ -834,7 +838,7 @@ static int bnx2x_set_eeprom(struct net_device *dev, 
		bnx2x_acquire_phy_lock(bp);

		rc |= bnx2x_link_reset(&bp->link_params,

				       &bp->link_vars, 0);

		if (XGXS_EXT_PHY_TYPE(bp->link_params.ext_phy_config) ==

		if (XGXS_EXT_PHY_TYPE(ext_phy_config) ==

					PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101)

			bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_0,

				       MISC_REGISTERS_GPIO_HIGH, port);
@@ -855,10 +859,8 @@ static int bnx2x_set_eeprom(struct net_device *dev, 
		}

	} else if (eeprom->magic == 0x53985943) {

		/* 'PHYC' (0x53985943): PHY FW upgrade completed */

		if (XGXS_EXT_PHY_TYPE(bp->link_params.ext_phy_config) ==

		if (XGXS_EXT_PHY_TYPE(ext_phy_config) ==

				       PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101) {

			u8 ext_phy_addr =

			     XGXS_EXT_PHY_ADDR(bp->link_params.ext_phy_config);



			/* DSP Remove Download Mode */

			bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_0,
@@ -866,7 +868,8 @@ static int bnx2x_set_eeprom(struct net_device *dev, 


			bnx2x_acquire_phy_lock(bp);



			bnx2x_sfx7101_sp_sw_reset(bp, port, ext_phy_addr);

			bnx2x_sfx7101_sp_sw_reset(bp,

						&bp->link_params.phy[EXT_PHY1]);



			/* wait 0.5 sec to allow it to run */

			msleep(500);

drivers/net/bnx2x/bnx2x_hsi.h

+17 −0
Original line number Diff line number Diff line
@@ -120,6 +120,23 @@ struct shared_hw_cfg { /* NVRAM Offset */ 
#define SHARED_HW_CFG_FAN_FAILURE_DISABLED		      0x00080000

#define SHARED_HW_CFG_FAN_FAILURE_ENABLED		      0x00100000



	/* Set the MDC/MDIO access for the first external phy */

#define SHARED_HW_CFG_MDC_MDIO_ACCESS1_MASK	    0x1C000000

#define SHARED_HW_CFG_MDC_MDIO_ACCESS1_SHIFT	    26

#define SHARED_HW_CFG_MDC_MDIO_ACCESS1_PHY_TYPE     0x00000000

#define SHARED_HW_CFG_MDC_MDIO_ACCESS1_EMAC0	    0x04000000

#define SHARED_HW_CFG_MDC_MDIO_ACCESS1_EMAC1	    0x08000000

#define SHARED_HW_CFG_MDC_MDIO_ACCESS1_BOTH	    0x0c000000

#define SHARED_HW_CFG_MDC_MDIO_ACCESS1_SWAPPED	    0x10000000



	/* Set the MDC/MDIO access for the second external phy */

#define SHARED_HW_CFG_MDC_MDIO_ACCESS2_MASK	    0xE0000000

#define SHARED_HW_CFG_MDC_MDIO_ACCESS2_SHIFT	    29

#define SHARED_HW_CFG_MDC_MDIO_ACCESS2_PHY_TYPE     0x00000000

#define SHARED_HW_CFG_MDC_MDIO_ACCESS2_EMAC0	    0x20000000

#define SHARED_HW_CFG_MDC_MDIO_ACCESS2_EMAC1	    0x40000000

#define SHARED_HW_CFG_MDC_MDIO_ACCESS2_BOTH	    0x60000000

#define SHARED_HW_CFG_MDC_MDIO_ACCESS2_SWAPPED	    0x80000000

	u32 power_dissipated;					/* 0x11c */

#define SHARED_HW_CFG_POWER_DIS_CMN_MASK	    0xff000000

#define SHARED_HW_CFG_POWER_DIS_CMN_SHIFT	    24

drivers/net/bnx2x/bnx2x_link.c

+831 −1349

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/bnx2x/bnx2x_link.h

+49 −10
Original line number Diff line number Diff line 
/* Copyright 2008-2009 Broadcom Corporation

/* Copyright 2008-2010 Broadcom Corporation

 *

 * Unless you and Broadcom execute a separate written software license

 * agreement governing use of this software, this software is licensed to you
@@ -46,9 +46,35 @@ 
#define SFP_EEPROM_PART_NO_ADDR 		0x28

#define SFP_EEPROM_PART_NO_SIZE		16

#define PWR_FLT_ERR_MSG_LEN			250

/* Single Media Direct board is the plain 577xx board with CX4/RJ45 jacks */

#define SINGLE_MEDIA_DIRECT(params)	(params->num_phys == 1)

/* Single Media board contains single external phy */

#define SINGLE_MEDIA(params)		(params->num_phys == 2)

/***********************************************************/

/*                         Structs                         */

/***********************************************************/

#define INT_PHY		0

#define EXT_PHY1	1



#define MAX_PHYS	2



/***********************************************************/

/*                      bnx2x_phy struct                     */

/*  Defines the required arguments and function per phy    */

/***********************************************************/

struct link_vars;

struct link_params;

struct bnx2x_phy;



struct bnx2x_phy {

	u32 type;



	/* Loaded during init */

	u8 addr;



	u32 mdio_ctrl;

};



/* Inputs parameters to the CLC */

struct link_params {
@@ -106,6 +132,11 @@ struct link_params { 
#define FEATURE_CONFIG_OVERRIDE_PREEMPHASIS_ENABLED (1<<0)

#define FEATURE_CONFIG_BC_SUPPORTS_OPT_MDL_VRFY	(1<<2)

#define FEATURE_CONFIG_BCM8727_NOC			(1<<3)

	/* Will be populated during common init */

	struct bnx2x_phy phy[MAX_PHYS];



	/* Will be populated during common init */

	u8 num_phys;



	/* Device pointer passed to all callback functions */

	struct bnx2x *bp;
@@ -155,17 +186,20 @@ u8 bnx2x_link_reset(struct link_params *params, struct link_vars *vars, 
/* bnx2x_link_update should be called upon link interrupt */

u8 bnx2x_link_update(struct link_params *input, struct link_vars *output);



/* use the following cl45 functions to read/write from external_phy

/* use the following phy functions to read/write from external_phy

  In order to use it to read/write internal phy registers, use

  DEFAULT_PHY_DEV_ADDR as devad, and (_bank + (_addr & 0xf)) as

  Use ext_phy_type of 0 in case of cl22 over cl45

  the register */

u8 bnx2x_cl45_read(struct bnx2x *bp, u8 port, u32 ext_phy_type,

		 u8 phy_addr, u8 devad, u16 reg, u16 *ret_val);

u8 bnx2x_phy_read(struct link_params *params, u8 phy_addr,

		  u8 devad, u16 reg, u16 *ret_val);



u8 bnx2x_cl45_write(struct bnx2x *bp, u8 port, u32 ext_phy_type,

		  u8 phy_addr, u8 devad, u16 reg, u16 val);

u8 bnx2x_phy_write(struct link_params *params, u8 phy_addr,

		   u8 devad, u16 reg, u16 val);

u8 bnx2x_cl45_read(struct bnx2x *bp, struct bnx2x_phy *phy,

		   u8 devad, u16 reg, u16 *ret_val);



u8 bnx2x_cl45_write(struct bnx2x *bp, struct bnx2x_phy *phy,

		    u8 devad, u16 reg, u16 val);

/* Reads the link_status from the shmem,

   and update the link vars accordingly */

void bnx2x_link_status_update(struct link_params *input,
@@ -198,9 +232,14 @@ u8 bnx2x_common_init_phy(struct bnx2x *bp, u32 shmem_base); 
/* Reset the external PHY using GPIO */

void bnx2x_ext_phy_hw_reset(struct bnx2x *bp, u8 port);



void bnx2x_sfx7101_sp_sw_reset(struct bnx2x *bp, u8 port, u8 phy_addr);

/* Reset the external of SFX7101 */

void bnx2x_sfx7101_sp_sw_reset(struct bnx2x *bp, struct bnx2x_phy *phy);



u8 bnx2x_read_sfp_module_eeprom(struct link_params *params, u16 addr,

u8 bnx2x_read_sfp_module_eeprom(struct bnx2x_phy *phy,

				struct link_params *params, u16 addr,

			      u8 byte_cnt, u8 *o_buf);



/* Returns the aggregative supported attributes of the phys on board */

u32 bnx2x_supported_attr(struct link_params *params, u8 phy_idx);

/* Probe the phys on board, and populate them in "params" */

u8 bnx2x_phy_probe(struct link_params *params);

#endif /* BNX2X_LINK_H */

drivers/net/bnx2x/bnx2x_main.c

+2 −19
Original line number Diff line number Diff line
@@ -4351,7 +4351,6 @@ static int bnx2x_init_port(struct bnx2x *bp) 
	default:

		break;

	}



	bnx2x__link_reset(bp);



	return 0;
@@ -6984,23 +6983,15 @@ static int bnx2x_mdio_read(struct net_device *netdev, int prtad, 
	struct bnx2x *bp = netdev_priv(netdev);

	u16 value;

	int rc;

	u32 phy_type = XGXS_EXT_PHY_TYPE(bp->link_params.ext_phy_config);



	DP(NETIF_MSG_LINK, "mdio_read: prtad 0x%x, devad 0x%x, addr 0x%x\n",

	   prtad, devad, addr);



	if (prtad != bp->mdio.prtad) {

		DP(NETIF_MSG_LINK, "prtad missmatch (cmd:0x%x != bp:0x%x)\n",

		   prtad, bp->mdio.prtad);

		return -EINVAL;

	}



	/* The HW expects different devad if CL22 is used */

	devad = (devad == MDIO_DEVAD_NONE) ? DEFAULT_PHY_DEV_ADDR : devad;



	bnx2x_acquire_phy_lock(bp);

	rc = bnx2x_cl45_read(bp, BP_PORT(bp), phy_type, prtad,

			     devad, addr, &value);

	rc = bnx2x_phy_read(&bp->link_params, prtad, devad, addr, &value);

	bnx2x_release_phy_lock(bp);

	DP(NETIF_MSG_LINK, "mdio_read_val 0x%x rc = 0x%x\n", value, rc);
@@ -7014,24 +7005,16 @@ static int bnx2x_mdio_write(struct net_device *netdev, int prtad, int devad, 
			    u16 addr, u16 value)

{

	struct bnx2x *bp = netdev_priv(netdev);

	u32 ext_phy_type = XGXS_EXT_PHY_TYPE(bp->link_params.ext_phy_config);

	int rc;



	DP(NETIF_MSG_LINK, "mdio_write: prtad 0x%x, devad 0x%x, addr 0x%x,"

			   " value 0x%x\n", prtad, devad, addr, value);



	if (prtad != bp->mdio.prtad) {

		DP(NETIF_MSG_LINK, "prtad missmatch (cmd:0x%x != bp:0x%x)\n",

		   prtad, bp->mdio.prtad);

		return -EINVAL;

	}



	/* The HW expects different devad if CL22 is used */

	devad = (devad == MDIO_DEVAD_NONE) ? DEFAULT_PHY_DEV_ADDR : devad;



	bnx2x_acquire_phy_lock(bp);

	rc = bnx2x_cl45_write(bp, BP_PORT(bp), ext_phy_type, prtad,

			      devad, addr, value);

	rc = bnx2x_phy_write(&bp->link_params, prtad, devad, addr, value);

	bnx2x_release_phy_lock(bp);

	return rc;

}