Commit 1003e19c authored by Steve Wise's avatar Steve Wise Committed by David S. Miller

cxgb3: fix up vpd strings for kstrto*()

The vpd strings are left justified, in a fixed length array, with possible
trailing white space and no NUL.  So fix them up before calling kstrto*().

This is a recent regression which causes cxgb3 to fail to load.

Fixes: e72c932d ("cxgb3: Convert simple_strtoul to kstrtox")
Signed-off-by: default avatarSteve Wise <swise@opengridcomputing.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c868ee70
...@@ -681,6 +681,24 @@ int t3_seeprom_wp(struct adapter *adapter, int enable) ...@@ -681,6 +681,24 @@ int t3_seeprom_wp(struct adapter *adapter, int enable)
return t3_seeprom_write(adapter, EEPROM_STAT_ADDR, enable ? 0xc : 0); return t3_seeprom_write(adapter, EEPROM_STAT_ADDR, enable ? 0xc : 0);
} }
static int vpdstrtouint(char *s, int len, unsigned int base, unsigned int *val)
{
char tok[len + 1];
memcpy(tok, s, len);
tok[len] = 0;
return kstrtouint(strim(tok), base, val);
}
static int vpdstrtou16(char *s, int len, unsigned int base, u16 *val)
{
char tok[len + 1];
memcpy(tok, s, len);
tok[len] = 0;
return kstrtou16(strim(tok), base, val);
}
/** /**
* get_vpd_params - read VPD parameters from VPD EEPROM * get_vpd_params - read VPD parameters from VPD EEPROM
* @adapter: adapter to read * @adapter: adapter to read
...@@ -709,19 +727,19 @@ static int get_vpd_params(struct adapter *adapter, struct vpd_params *p) ...@@ -709,19 +727,19 @@ static int get_vpd_params(struct adapter *adapter, struct vpd_params *p)
return ret; return ret;
} }
ret = kstrtouint(vpd.cclk_data, 10, &p->cclk); ret = vpdstrtouint(vpd.cclk_data, vpd.cclk_len, 10, &p->cclk);
if (ret) if (ret)
return ret; return ret;
ret = kstrtouint(vpd.mclk_data, 10, &p->mclk); ret = vpdstrtouint(vpd.mclk_data, vpd.mclk_len, 10, &p->mclk);
if (ret) if (ret)
return ret; return ret;
ret = kstrtouint(vpd.uclk_data, 10, &p->uclk); ret = vpdstrtouint(vpd.uclk_data, vpd.uclk_len, 10, &p->uclk);
if (ret) if (ret)
return ret; return ret;
ret = kstrtouint(vpd.mdc_data, 10, &p->mdc); ret = vpdstrtouint(vpd.mdc_data, vpd.mdc_len, 10, &p->mdc);
if (ret) if (ret)
return ret; return ret;
ret = kstrtouint(vpd.mt_data, 10, &p->mem_timing); ret = vpdstrtouint(vpd.mt_data, vpd.mt_len, 10, &p->mem_timing);
if (ret) if (ret)
return ret; return ret;
memcpy(p->sn, vpd.sn_data, SERNUM_LEN); memcpy(p->sn, vpd.sn_data, SERNUM_LEN);
...@@ -733,10 +751,12 @@ static int get_vpd_params(struct adapter *adapter, struct vpd_params *p) ...@@ -733,10 +751,12 @@ static int get_vpd_params(struct adapter *adapter, struct vpd_params *p)
} else { } else {
p->port_type[0] = hex_to_bin(vpd.port0_data[0]); p->port_type[0] = hex_to_bin(vpd.port0_data[0]);
p->port_type[1] = hex_to_bin(vpd.port1_data[0]); p->port_type[1] = hex_to_bin(vpd.port1_data[0]);
ret = kstrtou16(vpd.xaui0cfg_data, 16, &p->xauicfg[0]); ret = vpdstrtou16(vpd.xaui0cfg_data, vpd.xaui0cfg_len, 16,
&p->xauicfg[0]);
if (ret) if (ret)
return ret; return ret;
ret = kstrtou16(vpd.xaui1cfg_data, 16, &p->xauicfg[1]); ret = vpdstrtou16(vpd.xaui1cfg_data, vpd.xaui1cfg_len, 16,
&p->xauicfg[1]);
if (ret) if (ret)
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment