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

Commit 08e9acc2 authored by Yuval Mintz's avatar Yuval Mintz Committed by David S. Miller
Browse files

bnx2x: EEE status is read locally 



This patch aligns the EEE status with that of all other link properties,
by changing the way its accessed - instead of a direct read to the shared
memory, each function maintain its own copy locally.

Signed-off-by: default avatarYuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fdd6681d

drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c

+2 −2
Original line number Diff line number Diff line
@@ -1647,7 +1647,7 @@ static int bnx2x_get_eee(struct net_device *dev, struct ethtool_eee *edata) 
		return -EOPNOTSUPP;

	}



	eee_cfg = SHMEM2_RD(bp, eee_status[BP_PORT(bp)]);

	eee_cfg = bp->link_vars.eee_status;



	edata->supported =

		bnx2x_eee_to_adv((eee_cfg & SHMEM_EEE_SUPPORTED_MASK) >>
@@ -1684,7 +1684,7 @@ static int bnx2x_set_eee(struct net_device *dev, struct ethtool_eee *edata) 
		return -EOPNOTSUPP;

	}



	eee_cfg = SHMEM2_RD(bp, eee_status[BP_PORT(bp)]);

	eee_cfg = bp->link_vars.eee_status;



	if (!(eee_cfg & SHMEM_EEE_SUPPORTED_MASK)) {

		DP(BNX2X_MSG_ETHTOOL, "Board does not support EEE!\n");

drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c

+4 −0
Original line number Diff line number Diff line
@@ -4716,6 +4716,10 @@ void bnx2x_link_status_update(struct link_params *params, 
	vars->link_status = REG_RD(bp, params->shmem_base +

				   offsetof(struct shmem_region,

					    port_mb[port].link_status));

	if (bnx2x_eee_has_cap(params))

		vars->eee_status = REG_RD(bp, params->shmem2_base +

					  offsetof(struct shmem2_region,

						   eee_status[params->port]));



	vars->phy_flags = PHY_XGXS_FLAG;

	bnx2x_sync_link(params, vars);

drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c

+30 −5
Original line number Diff line number Diff line
@@ -39,14 +39,39 @@ static inline long bnx2x_hilo(u32 *hiref) 
#endif

}



static u16 bnx2x_get_port_stats_dma_len(struct bnx2x *bp)

static inline u16 bnx2x_get_port_stats_dma_len(struct bnx2x *bp)

{

	u16 res = sizeof(struct host_port_stats) >> 2;

	u16 res = 0;



	/* if PFC stats are not supported by the MFW, don't DMA them */

	if (!(bp->flags &  BC_SUPPORTS_PFC_STATS))

		res -= (sizeof(u32)*4) >> 2;

	/* 'newest' convention - shmem2 cotains the size of the port stats */

	if (SHMEM2_HAS(bp, sizeof_port_stats)) {

		u32 size = SHMEM2_RD(bp, sizeof_port_stats);

		if (size)

			res = size;



		/* prevent newer BC from causing buffer overflow */

		if (res > sizeof(struct host_port_stats))

			res = sizeof(struct host_port_stats);

	}



	/* Older convention - all BCs support the port stats' fields up until

	 * the 'not_used' field

	 */

	if (!res) {

		res = offsetof(struct host_port_stats, not_used) + 4;



		/* if PFC stats are supported by the MFW, DMA them as well */

		if (bp->flags & BC_SUPPORTS_PFC_STATS) {

			res += offsetof(struct host_port_stats,

					pfc_frames_rx_lo) -

			       offsetof(struct host_port_stats,

					pfc_frames_tx_hi) + 4 ;

		}

	}



	res >>= 2;



	WARN_ON(res > 2 * DMAE_LEN32_RD_MAX);

	return res;

}