lib/spd_bin: Use proper I2C addresses

Use the plain address instead of the weird shifted encoding (e.g. if
we'd use `0xa0` as address, it's actually `0x50` encoded into a write
command).

Change-Id: I6febb2e04e1c6de4294dfa37bde16b147a80b7a8
Signed-off-by: Nico Huber <nico.huber@secunet.com>
Reviewed-on: https://review.coreboot.org/20405
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>

src/include/spd_bin.h

@@ -43,7 +43,7 @@
 #define LPDDR4_SPD_PART_LEN	20
 
 struct spd_block {
-	u8 addr_map[CONFIG_DIMM_MAX];
+	u8 addr_map[CONFIG_DIMM_MAX]; /* 7 bit I2C addresses */
 	u8 *spd_array[CONFIG_DIMM_MAX];
 	/* Length of each dimm */
 	u16 len;

src/lib/spd_bin.c

@@ -128,8 +128,6 @@ int get_spd_cbfs_rdev(struct region_device *spd_rdev, u8 spd_index)
 static void get_spd(u8 *spd, u8 addr)
 {
 	u16 i;
-	/* Assuming addr is 8 bit address, make it 7 bit */
-	addr = addr >> 1;
 	if (smbus_read_byte(0, addr, 0)  == 0xff) {
 		printk(BIOS_INFO, "No memory dimm at address %02X\n",
 			addr << 1);

src/mainboard/google/fizz/romstage.c

@@ -32,7 +32,7 @@ void mainboard_memory_init_params(FSPM_UPD *mupd)
 
 	/* Read spd block to get memory config */
 	struct spd_block blk = {
-		.addr_map = { 0xa0, 0xa4, },
+		.addr_map = { 0x50, 0x52, },
 	};
 	mem_cfg->DqPinsInterleaved = 1;
 	get_spd_smbus(&blk);

src/mainboard/intel/kblrvp/romstage.c

@@ -51,7 +51,7 @@ void mainboard_memory_init_params(FSPM_UPD *mupd)
 		mem_cfg->MemorySpdPtr00 = (uintptr_t)rdev_mmap_full(&spd_rdev);
 	} else {  /* for CONFIG_BOARD_INTEL_KBLRVP7 */
 		struct spd_block blk = {
-			.addr_map = { 0xa0, 0xa2, 0xa4, 0xa6, },
+			.addr_map = { 0x50, 0x51, 0x52, 0x53, },
 		};
 
 		mem_cfg->DqPinsInterleaved = 1;

src/mainboard/purism/librem13v2/romstage.c

@@ -35,7 +35,7 @@ void mainboard_memory_init_params(struct romstage_params *params,
 	MEMORY_INIT_UPD *memory_params)
 {
 	struct spd_block blk = {
-		.addr_map = { 0xa0 },
+		.addr_map = { 0x50 },
 	};
 
 	memory_params->DqPinsInterleaved = 1;