summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/northbridge/intel/i945/raminit.c2
-rw-r--r--src/northbridge/intel/pineview/raminit.c2
-rw-r--r--src/northbridge/intel/x4x/raminit.c8
-rw-r--r--src/southbridge/intel/common/smbus.c13
-rw-r--r--src/southbridge/intel/common/smbus.h2
-rw-r--r--src/southbridge/intel/i82801gx/early_smbus.c4
-rw-r--r--src/southbridge/intel/i82801gx/i82801gx.h2
-rw-r--r--src/southbridge/intel/i82801jx/early_smbus.c4
-rw-r--r--src/southbridge/intel/i82801jx/i82801jx.h2
9 files changed, 25 insertions, 14 deletions
diff --git a/src/northbridge/intel/i945/raminit.c b/src/northbridge/intel/i945/raminit.c
index f3c3df68ac..dece9bffae 100644
--- a/src/northbridge/intel/i945/raminit.c
+++ b/src/northbridge/intel/i945/raminit.c
@@ -381,7 +381,7 @@ static void gather_common_timing(struct sys_info *sysinfo,
* only the first 64 bytes contain data needed for raminit.
*/
- bytes_read = i2c_block_read(device, 0, 64, raw_spd);
+ bytes_read = i2c_eeprom_read(device, 0, 64, raw_spd);
printk(BIOS_DEBUG, "Reading SPD using i2c block operation.\n");
if (IS_ENABLED(CONFIG_DEBUG_RAM_SETUP) && bytes_read > 0)
hexdump(raw_spd, bytes_read);
diff --git a/src/northbridge/intel/pineview/raminit.c b/src/northbridge/intel/pineview/raminit.c
index ee19b61841..ed633fd745 100644
--- a/src/northbridge/intel/pineview/raminit.c
+++ b/src/northbridge/intel/pineview/raminit.c
@@ -273,7 +273,7 @@ static void sdram_read_spds(struct sysinfo *s)
u8 i, chan;
s->dt0mode = 0;
FOR_EACH_DIMM(i) {
- if (i2c_block_read(s->spd_map[i], 0, 64, s->dimms[i].spd_data) != 64)
+ if (i2c_eeprom_read(s->spd_map[i], 0, 64, s->dimms[i].spd_data) != 64)
s->dimms[i].card_type = 0;
s->dimms[i].card_type = s->dimms[i].spd_data[62] & 0x1f;
diff --git a/src/northbridge/intel/x4x/raminit.c b/src/northbridge/intel/x4x/raminit.c
index d9fa49d9da..1fd600484f 100644
--- a/src/northbridge/intel/x4x/raminit.c
+++ b/src/northbridge/intel/x4x/raminit.c
@@ -47,15 +47,15 @@ static inline int spd_read_byte(unsigned int device, unsigned int address)
static u16 ddr2_get_crc(u8 device, u8 len)
{
u8 raw_spd[128] = {};
- i2c_block_read(device, 64, 9, &raw_spd[64]);
- i2c_block_read(device, 93, 6, &raw_spd[93]);
+ i2c_eeprom_read(device, 64, 9, &raw_spd[64]);
+ i2c_eeprom_read(device, 93, 6, &raw_spd[93]);
return spd_ddr2_calc_unique_crc(raw_spd, len);
}
static u16 ddr3_get_crc(u8 device, u8 len)
{
u8 raw_spd[256] = {};
- i2c_block_read(device, 117, 11, &raw_spd[117]);
+ i2c_eeprom_read(device, 117, 11, &raw_spd[117]);
return spd_ddr3_calc_unique_crc(raw_spd, len);
}
@@ -531,7 +531,7 @@ static void decode_spd_select_timings(struct sysinfo *s)
die("Mixing up dimm types is not supported!\n");
printk(BIOS_DEBUG, "Decoding dimm %d\n", i);
- if (i2c_block_read(device, 0, 128, raw_spd) != 128) {
+ if (i2c_eeprom_read(device, 0, 128, raw_spd) != 128) {
printk(BIOS_DEBUG, "i2c block operation failed,"
" trying smbus byte operation.\n");
for (j = 0; j < 128; j++)
diff --git a/src/southbridge/intel/common/smbus.c b/src/southbridge/intel/common/smbus.c
index fd8b6aa8dd..a842a61222 100644
--- a/src/southbridge/intel/common/smbus.c
+++ b/src/southbridge/intel/common/smbus.c
@@ -363,11 +363,22 @@ int do_smbus_block_write(unsigned int smbus_base, u8 device, u8 cmd,
}
/* Only since ICH5 */
-int do_i2c_block_read(unsigned int smbus_base, u8 device,
+static int has_i2c_read_command(void)
+{
+ if (IS_ENABLED(CONFIG_SOUTHBRIDGE_INTEL_I82371EB) ||
+ IS_ENABLED(CONFIG_SOUTHBRIDGE_INTEL_I82801DX))
+ return 0;
+ return 1;
+}
+
+int do_i2c_eeprom_read(unsigned int smbus_base, u8 device,
unsigned int offset, const unsigned int bytes, u8 *buf)
{
int ret;
+ if (!has_i2c_read_command())
+ return SMBUS_ERROR;
+
/* Set up for a i2c block data read.
*
* FIXME: Address parameter changes to XMIT_READ(device) with
diff --git a/src/southbridge/intel/common/smbus.h b/src/southbridge/intel/common/smbus.h
index be1aa76c21..ded31d0ae2 100644
--- a/src/southbridge/intel/common/smbus.h
+++ b/src/southbridge/intel/common/smbus.h
@@ -41,6 +41,6 @@ int do_smbus_block_read(unsigned int smbus_base, u8 device,
int do_smbus_block_write(unsigned int smbus_base, u8 device,
u8 cmd, unsigned int bytes, const u8 *buf);
/* Only since ICH5 */
-int do_i2c_block_read(unsigned int smbus_base, u8 device,
+int do_i2c_eeprom_read(unsigned int smbus_base, u8 device,
unsigned int offset, unsigned int bytes, u8 *buf);
#endif
diff --git a/src/southbridge/intel/i82801gx/early_smbus.c b/src/southbridge/intel/i82801gx/early_smbus.c
index 698458b86a..9dddcec362 100644
--- a/src/southbridge/intel/i82801gx/early_smbus.c
+++ b/src/southbridge/intel/i82801gx/early_smbus.c
@@ -54,9 +54,9 @@ int smbus_read_byte(unsigned int device, unsigned int address)
return do_smbus_read_byte(SMBUS_IO_BASE, device, address);
}
-int i2c_block_read(unsigned int device, unsigned int offset, u32 bytes, u8 *buf)
+int i2c_eeprom_read(unsigned int device, unsigned int offset, u32 bytes, u8 *buf)
{
- return do_i2c_block_read(SMBUS_IO_BASE, device, offset, bytes, buf);
+ return do_i2c_eeprom_read(SMBUS_IO_BASE, device, offset, bytes, buf);
}
int smbus_block_read(unsigned int device, unsigned int cmd, u8 bytes, u8 *buf)
diff --git a/src/southbridge/intel/i82801gx/i82801gx.h b/src/southbridge/intel/i82801gx/i82801gx.h
index 66d47ae157..12935c24f2 100644
--- a/src/southbridge/intel/i82801gx/i82801gx.h
+++ b/src/southbridge/intel/i82801gx/i82801gx.h
@@ -45,7 +45,7 @@ void i82801gx_enable(struct device *dev);
#else
void enable_smbus(void);
int smbus_read_byte(unsigned int device, unsigned int address);
-int i2c_block_read(unsigned int device, unsigned int cmd, unsigned int bytes,
+int i2c_eeprom_read(unsigned int device, unsigned int cmd, unsigned int bytes,
u8 *buf);
int smbus_block_read(unsigned int device, unsigned int cmd, u8 bytes, u8 *buf);
int smbus_block_write(unsigned int device, unsigned int cmd, u8 bytes,
diff --git a/src/southbridge/intel/i82801jx/early_smbus.c b/src/southbridge/intel/i82801jx/early_smbus.c
index bd689556e9..8c870454fe 100644
--- a/src/southbridge/intel/i82801jx/early_smbus.c
+++ b/src/southbridge/intel/i82801jx/early_smbus.c
@@ -51,9 +51,9 @@ int smbus_read_byte(unsigned device, unsigned address)
return do_smbus_read_byte(SMBUS_IO_BASE, device, address);
}
-int i2c_block_read(unsigned int device, unsigned int offset, u32 bytes, u8 *buf)
+int i2c_eeprom_read(unsigned int device, unsigned int offset, u32 bytes, u8 *buf)
{
- return do_i2c_block_read(SMBUS_IO_BASE, device, offset, bytes, buf);
+ return do_i2c_eeprom_read(SMBUS_IO_BASE, device, offset, bytes, buf);
}
int smbus_block_read(unsigned int device, unsigned int cmd, u8 bytes, u8 *buf)
diff --git a/src/southbridge/intel/i82801jx/i82801jx.h b/src/southbridge/intel/i82801jx/i82801jx.h
index ad3b38177a..00148480a1 100644
--- a/src/southbridge/intel/i82801jx/i82801jx.h
+++ b/src/southbridge/intel/i82801jx/i82801jx.h
@@ -233,7 +233,7 @@ static inline int lpc_is_mobile(const u16 devid)
#if defined(__PRE_RAM__)
void enable_smbus(void);
int smbus_read_byte(unsigned device, unsigned address);
-int i2c_block_read(unsigned int device, unsigned int cmd, unsigned int bytes,
+int i2c_eeprom_read(unsigned int device, unsigned int cmd, unsigned int bytes,
u8 *buf);
int smbus_block_read(unsigned int device, unsigned int cmd, u8 bytes, u8 *buf);
int smbus_block_write(unsigned int device, unsigned int cmd, u8 bytes,