d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/sfc/base: adjust PHY module info interface

Browse Source 
Adjust data types in interface to permit the complete
module information buffer to be obtained in a single
call.

Signed-off-by: Richard Houldsworth <rhouldsworth@solarflare.com>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
This commit is contained in:
Richard Houldsworth 2018-09-24 14:50:22 +01:00 committed by Ferruh Yigit
parent c0516b777e
commit dad744f763
4 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/sfc/base/efx.h
View File

@ -1051,12 +1051,18 @@ efx_phy_media_type_get(
*/
#define EFX_PHY_MEDIA_INFO_DEV_ADDR_QSFP 0xA0
/*
* Maximum accessible data offset for PHY module information.
*/
#define EFX_PHY_MEDIA_INFO_MAX_OFFSET 0x100
extern __checkReturn efx_rc_t
efx_phy_module_get_info(
__in efx_nic_t *enp,
__in uint8_t dev_addr,
__in uint8_t offset,
__in uint8_t len,
__in size_t offset,
__in size_t len,
__out_bcount(len) uint8_t *data);
#if EFSYS_OPT_PHY_STATS

12
drivers/net/sfc/base/efx_mcdi.c
View File

@ -2214,8 +2214,8 @@ fail1:
efx_mcdi_phy_module_get_info(
__in efx_nic_t *enp,
__in uint8_t dev_addr,
__in uint8_t offset,
__in uint8_t len,
__in size_t offset,
__in size_t len,
__out_bcount(len) uint8_t *data)
{
efx_port_t *epp = &(enp->en_port);
@ -2296,12 +2296,14 @@ efx_mcdi_phy_module_get_info(
goto fail1;
}
EFX_STATIC_ASSERT(EFX_PHY_MEDIA_INFO_PAGE_SIZE <= 0xFF);
if (offset < EFX_PHY_MEDIA_INFO_PAGE_SIZE) {
uint8_t read_len =
size_t read_len =
MIN(len, EFX_PHY_MEDIA_INFO_PAGE_SIZE - offset);
rc = efx_mcdi_get_phy_media_info(enp,
mcdi_lower_page, offset, read_len, data);
mcdi_lower_page, (uint8_t)offset, (uint8_t)read_len, data);
if (rc != 0)
goto fail2;
@ -2318,7 +2320,7 @@ efx_mcdi_phy_module_get_info(
EFSYS_ASSERT3U(offset, <, EFX_PHY_MEDIA_INFO_PAGE_SIZE);
rc = efx_mcdi_get_phy_media_info(enp,
mcdi_upper_page, offset, len, data);
mcdi_upper_page, (uint8_t)offset, (uint8_t)len, data);
if (rc != 0)
goto fail3;
}

4
drivers/net/sfc/base/efx_mcdi.h
View File

@ -219,8 +219,8 @@ extern __checkReturn efx_rc_t
efx_mcdi_phy_module_get_info(
__in efx_nic_t *enp,
__in uint8_t dev_addr,
__in uint8_t offset,
__in uint8_t len,
__in size_t offset,
__in size_t len,
__out_bcount(len) uint8_t *data);
#define MCDI_IN(_emr, _type, _ofst) \

7
drivers/net/sfc/base/efx_phy.c
View File

@ -288,8 +288,8 @@ efx_phy_media_type_get(
efx_phy_module_get_info(
__in efx_nic_t *enp,
__in uint8_t dev_addr,
__in uint8_t offset,
__in uint8_t len,
__in size_t offset,
__in size_t len,
__out_bcount(len) uint8_t *data)
{
efx_rc_t rc;
@ -297,7 +297,8 @@ efx_phy_module_get_info(
EFSYS_ASSERT3U(enp->en_magic, ==, EFX_NIC_MAGIC);
EFSYS_ASSERT(data != NULL);
if ((uint32_t)offset + len > 0x100) {
if ((offset > EFX_PHY_MEDIA_INFO_MAX_OFFSET) ||
((offset + len) > EFX_PHY_MEDIA_INFO_MAX_OFFSET)) {
rc = EINVAL;
goto fail1;
}