UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

amd-xgbe: Support for 64-bit management counter registers 

Add support for reading all management counter registers as 64-bit
values.  The indication of whether to read the high 32-bits to form
a 64-bit value is indicated in the version data.

Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Lendacky, Thomas 2016-11-03 13:19:07 -05:00 committed by David S. Miller
parent b03a4a6fb3
commit e5a20b9072
2 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/net/ethernet/amd/xgbe/xgbe-dev.c
View File

@ -2588,17 +2588,33 @@ static u64 xgbe_mmc_read(struct xgbe_prv_data *pdata, unsigned int reg_lo)
bool read_hi; bool read_hi;
u64 val; u64 val;
switch (reg_lo) { if (pdata->vdata->mmc_64bit) {
/* These registers are always 64 bit */ switch (reg_lo) {
case MMC_TXOCTETCOUNT_GB_LO: /* These registers are always 32 bit */
case MMC_TXOCTETCOUNT_G_LO: case MMC_RXRUNTERROR:
case MMC_RXOCTETCOUNT_GB_LO: case MMC_RXJABBERERROR:
case MMC_RXOCTETCOUNT_G_LO: case MMC_RXUNDERSIZE_G:
read_hi = true; case MMC_RXOVERSIZE_G:
break; case MMC_RXWATCHDOGERROR:
read_hi = false;
break;
default: default:
read_hi = false; read_hi = true;
}
} else {
switch (reg_lo) {
/* These registers are always 64 bit */
case MMC_TXOCTETCOUNT_GB_LO:
case MMC_TXOCTETCOUNT_G_LO:
case MMC_RXOCTETCOUNT_GB_LO:
case MMC_RXOCTETCOUNT_G_LO:
read_hi = true;
break;
default:
read_hi = false;
}
} }
val = XGMAC_IOREAD(pdata, reg_lo); val = XGMAC_IOREAD(pdata, reg_lo);

1
drivers/net/ethernet/amd/xgbe/xgbe.h
View File

@ -804,6 +804,7 @@ struct xgbe_hw_features {
struct xgbe_version_data { struct xgbe_version_data {
void (*init_function_ptrs_phy_impl)(struct xgbe_phy_if *); void (*init_function_ptrs_phy_impl)(struct xgbe_phy_if *);
enum xgbe_xpcs_access xpcs_access; enum xgbe_xpcs_access xpcs_access;
unsigned int mmc_64bit;
}; };
struct xgbe_prv_data { struct xgbe_prv_data {