Skip to content

Commit

Permalink
tg3: Correct NVRAM stream endian notations
Browse files Browse the repository at this point in the history 
Any software requesting NVRAM data as it exists on NVRAM is necessarily
requesting that the results be returned as a bytestream.  A bytestream
data read in from the device can also be thought to be in big endian
format.  Therefore, all the LE notations in the driver are mislabeled.
This patch converts all LE notations to BE notations, carefully
evaluating the surrounding code in the process.

Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: Benjamin Li <benli@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Matt Carlson authored and David S. Miller committed Feb 27, 2009
1 parent e4f3411 commit a9dc529
Showing 1 changed file with 29 additions and 26 deletions.
55 changes: 29 additions & 26 deletions drivers/net/tg3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2293,12 +2293,13 @@ static int tg3_nvram_read_swab(struct tg3 *tp, u32 offset, u32 *val)
return err;
}

static int tg3_nvram_read_le(struct tg3 *tp, u32 offset, __le32 *val)
/* Ensures NVRAM data is in bytestream format. */
static int tg3_nvram_read_be32(struct tg3 *tp, u32 offset, __be32 *val)
{
u32 v;
int res = tg3_nvram_read_swab(tp, offset, &v);
int res = tg3_nvram_read(tp, offset, &v);
if (!res)
*val = cpu_to_le32(v);
*val = cpu_to_be32(v);
return res;
}

Expand Down Expand Up @@ -8539,7 +8540,7 @@ static int tg3_get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
int ret;
u8 *pd;
u32 i, offset, len, b_offset, b_count;
__le32 val;
__be32 val;

if (tp->link_config.phy_is_low_power)
return -EAGAIN;
Expand All @@ -8558,7 +8559,7 @@ static int tg3_get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
/* i.e. offset=1 len=2 */
b_count = len;
}
ret = tg3_nvram_read_le(tp, offset-b_offset, &val);
ret = tg3_nvram_read_be32(tp, offset-b_offset, &val);
if (ret)
return ret;
memcpy(data, ((char*)&val) + b_offset, b_count);
Expand All @@ -8570,7 +8571,7 @@ static int tg3_get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
/* read bytes upto the last 4 byte boundary */
pd = &data[eeprom->len];
for (i = 0; i < (len - (len & 3)); i += 4) {
ret = tg3_nvram_read_le(tp, offset + i, &val);
ret = tg3_nvram_read_be32(tp, offset + i, &val);
if (ret) {
eeprom->len += i;
return ret;
Expand All @@ -8584,7 +8585,7 @@ static int tg3_get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
pd = &data[eeprom->len];
b_count = len & 3;
b_offset = offset + len - b_count;
ret = tg3_nvram_read_le(tp, b_offset, &val);
ret = tg3_nvram_read_be32(tp, b_offset, &val);
if (ret)
return ret;
memcpy(pd, &val, b_count);
Expand All @@ -8601,7 +8602,7 @@ static int tg3_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
int ret;
u32 offset, len, b_offset, odd_len;
u8 *buf;
__le32 start, end;
__be32 start, end;

if (tp->link_config.phy_is_low_power)
return -EAGAIN;
Expand All @@ -8614,7 +8615,7 @@ static int tg3_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,

if ((b_offset = (offset & 3))) {
/* adjustments to start on required 4 byte boundary */
ret = tg3_nvram_read_le(tp, offset-b_offset, &start);
ret = tg3_nvram_read_be32(tp, offset-b_offset, &start);
if (ret)
return ret;
len += b_offset;
Expand All @@ -8628,7 +8629,7 @@ static int tg3_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
/* adjustments to end on required 4 byte boundary */
odd_len = 1;
len = (len + 3) & ~3;
ret = tg3_nvram_read_le(tp, offset+len-4, &end);
ret = tg3_nvram_read_be32(tp, offset+len-4, &end);
if (ret)
return ret;
}
Expand Down Expand Up @@ -9200,7 +9201,7 @@ static void tg3_get_ethtool_stats (struct net_device *dev,
static int tg3_test_nvram(struct tg3 *tp)
{
u32 csum, magic;
__le32 *buf;
__be32 *buf;
int i, j, k, err = 0, size;

if (tg3_nvram_read(tp, 0, &magic) != 0)
Expand Down Expand Up @@ -9237,14 +9238,15 @@ static int tg3_test_nvram(struct tg3 *tp)

err = -EIO;
for (i = 0, j = 0; i < size; i += 4, j++) {
if ((err = tg3_nvram_read_le(tp, i, &buf[j])) != 0)
err = tg3_nvram_read_be32(tp, i, &buf[j]);
if (err)
break;
}
if (i < size)
goto out;

/* Selfboot format */
magic = swab32(le32_to_cpu(buf[0]));
magic = be32_to_cpu(buf[0]);
if ((magic & TG3_EEPROM_MAGIC_FW_MSK) ==
TG3_EEPROM_MAGIC_FW) {
u8 *buf8 = (u8 *) buf, csum8 = 0;
Expand Down Expand Up @@ -9273,7 +9275,7 @@ static int tg3_test_nvram(struct tg3 *tp)
if ((magic & TG3_EEPROM_MAGIC_HW_MSK) ==
TG3_EEPROM_MAGIC_HW) {
u8 data[NVRAM_SELFBOOT_DATA_SIZE];
u8 parity[NVRAM_SELFBOOT_DATA_SIZE];
u8 parity[NVRAM_SELFBOOT_DATA_SIZE];
u8 *buf8 = (u8 *) buf;

/* Separate the parity bits and the data bytes. */
Expand Down Expand Up @@ -9316,13 +9318,13 @@ static int tg3_test_nvram(struct tg3 *tp)

/* Bootstrap checksum at offset 0x10 */
csum = calc_crc((unsigned char *) buf, 0x10);
if(csum != le32_to_cpu(buf[0x10/4]))
if (csum != be32_to_cpu(buf[0x10/4]))
goto out;

/* Manufacturing block starts at offset 0x74, checksum at 0xfc */
csum = calc_crc((unsigned char *) &buf[0x74/4], 0x88);
if (csum != le32_to_cpu(buf[0xfc/4]))
goto out;
if (csum != be32_to_cpu(buf[0xfc/4]))
goto out;

err = 0;

Expand Down Expand Up @@ -10654,13 +10656,13 @@ static int tg3_nvram_write_block_using_eeprom(struct tg3 *tp,

for (i = 0; i < len; i += 4) {
u32 addr;
__le32 data;
__be32 data;

addr = offset + i;

memcpy(&data, buf + i, 4);

tw32(GRC_EEPROM_DATA, le32_to_cpu(data));
tw32(GRC_EEPROM_DATA, be32_to_cpu(data));

val = tr32(GRC_EEPROM_ADDR);
tw32(GRC_EEPROM_ADDR, val | EEPROM_ADDR_COMPLETE);
Expand Down Expand Up @@ -10710,8 +10712,9 @@ static int tg3_nvram_write_block_unbuffered(struct tg3 *tp, u32 offset, u32 len,
phy_addr = offset & ~pagemask;

for (j = 0; j < pagesize; j += 4) {
if ((ret = tg3_nvram_read_le(tp, phy_addr + j,
(__le32 *) (tmp + j))))
ret = tg3_nvram_read_be32(tp, phy_addr + j,
(__be32 *) (tmp + j));
if (ret)
break;
}
if (ret)
Expand Down Expand Up @@ -10758,7 +10761,7 @@ static int tg3_nvram_write_block_unbuffered(struct tg3 *tp, u32 offset, u32 len,
__be32 data;

data = *((__be32 *) (tmp + j));
/* swab32(le32_to_cpu(data)), actually */

tw32(NVRAM_WRDATA, be32_to_cpu(data));

tw32(NVRAM_ADDR, phy_addr + j);
Expand Down Expand Up @@ -11529,8 +11532,8 @@ static void __devinit tg3_read_fw_ver(struct tg3 *tp)

offset = offset + ver_offset - start;
for (i = 0; i < 16; i += 4) {
__le32 v;
if (tg3_nvram_read_le(tp, offset + i, &v))
__be32 v;
if (tg3_nvram_read_be32(tp, offset + i, &v))
return;

memcpy(tp->fw_ver + i, &v, 4);
Expand Down Expand Up @@ -11571,8 +11574,8 @@ static void __devinit tg3_read_fw_ver(struct tg3 *tp)
tp->fw_ver[bcnt++] = ' ';

for (i = 0; i < 4; i++) {
__le32 v;
if (tg3_nvram_read_le(tp, offset, &v))
__be32 v;
if (tg3_nvram_read_be32(tp, offset, &v))
return;

offset += sizeof(v);
Expand Down

0 comments on commit a9dc529

Please sign in to comment.