d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow I2C to read address 0x51 as well as address 0x50.

Browse Source 
MFC after:	1 week
Submitted by:	Shahar Klein <shahark@mellanox.com>
Sponsored by:	Mellanox Technologies
This commit is contained in:
Hans Petter Selasky 2015-12-30 14:58:55 +00:00
parent 0f79b5d72b
commit 4fbd91a5af
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/dev/mlx5/mlx5_en/mlx5_en_main.c
View File

@ -2298,6 +2298,7 @@ mlx5e_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
int size_read = 0; int size_read = 0;
int module_num; int module_num;
int max_mtu; int max_mtu;
uint8_t read_addr;
priv = ifp->if_softc; priv = ifp->if_softc;
@ -2484,11 +2485,21 @@ out:
} }
/* /*
* Note that we ignore i2c.addr here. The driver hardcodes * Currently 0XA0 and 0xA2 are the only addresses permitted.
* the address to 0x50, while standard expects it to be 0xA0. * The internal conversion is as follows:
*/ */
if (i2c.dev_addr == 0xA0)
read_addr = MLX5E_I2C_ADDR_LOW;
else if (i2c.dev_addr == 0xA2)
read_addr = MLX5E_I2C_ADDR_HIGH;
else {
if_printf(ifp, "Query eeprom failed, "
"Invalid Address: %X\n", i2c.dev_addr);
error = EINVAL;
goto err_i2c;
}
error = mlx5_query_eeprom(priv->mdev, error = mlx5_query_eeprom(priv->mdev,
MLX5E_I2C_ADDR_LOW, MLX5E_EEPROM_LOW_PAGE, read_addr, MLX5E_EEPROM_LOW_PAGE,
(uint32_t)i2c.offset, (uint32_t)i2c.len, module_num, (uint32_t)i2c.offset, (uint32_t)i2c.len, module_num,
(uint32_t *)i2c.data, &size_read); (uint32_t *)i2c.data, &size_read);
if (error) { if (error) {
@ -2499,7 +2510,7 @@ out:
if (i2c.len > MLX5_EEPROM_MAX_BYTES) { if (i2c.len > MLX5_EEPROM_MAX_BYTES) {
error = mlx5_query_eeprom(priv->mdev, error = mlx5_query_eeprom(priv->mdev,
MLX5E_I2C_ADDR_LOW, MLX5E_EEPROM_LOW_PAGE, read_addr, MLX5E_EEPROM_LOW_PAGE,
(uint32_t)(i2c.offset + size_read), (uint32_t)(i2c.offset + size_read),
(uint32_t)(i2c.len - size_read), module_num, (uint32_t)(i2c.len - size_read), module_num,
(uint32_t *)(i2c.data + size_read), &size_read); (uint32_t *)(i2c.data + size_read), &size_read);