Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/38213 )
Change subject: nb/intel/i945,x4x,pineview: Remove wrapper spd_read_byte() ......................................................................
nb/intel/i945,x4x,pineview: Remove wrapper spd_read_byte()
Change-Id: Ic9554ad2813ee70d0da16857d534aab5e17d808f Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/northbridge/intel/i945/raminit.c M src/northbridge/intel/pineview/raminit.c M src/northbridge/intel/x4x/raminit.c 3 files changed, 4 insertions(+), 19 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/13/38213/1
diff --git a/src/northbridge/intel/i945/raminit.c b/src/northbridge/intel/i945/raminit.c index 7096774..f0ea142 100644 --- a/src/northbridge/intel/i945/raminit.c +++ b/src/northbridge/intel/i945/raminit.c @@ -62,11 +62,6 @@
}
-static inline int spd_read_byte(unsigned int device, unsigned int address) -{ - return smbus_read_byte(device, address); -} - static __attribute__((noinline)) void do_ram_command(u32 command) { u32 reg32; @@ -365,7 +360,7 @@ if (!sdram_capabilities_dual_channel() && (i >> 1)) continue;
- if (spd_read_byte(device, SPD_MEMORY_TYPE) != + if (smbus_read_byte(device, SPD_MEMORY_TYPE) != SPD_MEMORY_TYPE_SDRAM_DDR2) { printk(BIOS_DEBUG, "DDR II Channel %d Socket %d: N/A\n", (i >> 1), (i & 1)); @@ -386,7 +381,7 @@ printk(BIOS_DEBUG, "i2c block operation failed," " trying smbus byte operation.\n"); for (j = 0; j < 64; j++) - raw_spd[j] = spd_read_byte(device, j); + raw_spd[j] = smbus_read_byte(device, j); if (CONFIG(DEBUG_RAM_SETUP)) hexdump(raw_spd, 64); } diff --git a/src/northbridge/intel/pineview/raminit.c b/src/northbridge/intel/pineview/raminit.c index 720bd64..a9e2c3e 100644 --- a/src/northbridge/intel/pineview/raminit.c +++ b/src/northbridge/intel/pineview/raminit.c @@ -103,11 +103,6 @@ __asm__ __volatile__("": : :"memory"); }
-static inline int spd_read_byte(unsigned int device, unsigned int address) -{ - return smbus_read_byte(device, address); -} - static int decode_spd(struct dimminfo *d, int i) { d->type = 0; diff --git a/src/northbridge/intel/x4x/raminit.c b/src/northbridge/intel/x4x/raminit.c index 8013af9..df2d31e 100644 --- a/src/northbridge/intel/x4x/raminit.c +++ b/src/northbridge/intel/x4x/raminit.c @@ -39,11 +39,6 @@
#define MRC_CACHE_VERSION 0
-static inline int spd_read_byte(unsigned int device, unsigned int address) -{ - return smbus_read_byte(device, address); -} - static u16 ddr2_get_crc(u8 device, u8 len) { u8 raw_spd[128] = {}; @@ -514,7 +509,7 @@ s->dimms[i].card_type = RAW_CARD_UNPOPULATED; continue; } - switch (spd_read_byte(s->spd_map[i], SPD_MEMORY_TYPE)) { + switch (smbus_read_byte(s->spd_map[i], SPD_MEMORY_TYPE)) { case DDR2SPD: dram_type_mask &= 1 << DDR2; s->spd_type = DDR2; @@ -535,7 +530,7 @@ printk(BIOS_DEBUG, "i2c block operation failed," " trying smbus byte operation.\n"); for (j = 0; j < 128; j++) - raw_spd[j] = spd_read_byte(device, j); + raw_spd[j] = smbus_read_byte(device, j); }
if (s->spd_type == DDR2){
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38213 )
Change subject: nb/intel/i945,x4x,pineview: Remove wrapper spd_read_byte() ......................................................................
Patch Set 1: Code-Review+2
(1 comment)
https://review.coreboot.org/c/coreboot/+/38213/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/38213/1//COMMIT_MSG@7 PS1, Line 7: nb/intel/i945,x4x,pineview: Remove wrapper spd_read_byte() I'd put the northbridge names between curly brackets, as it helps others' internal parsers:
nb/intel/{i945,x4x,pineview}: Remove wrapper spd_read_byte()
Hello Patrick Rudolph, Angel Pons, build bot (Jenkins), Damien Zammit,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/38213
to look at the new patch set (#2).
Change subject: nb/intel/{i945,x4x,pineview}: Remove wrapper spd_read_byte() ......................................................................
nb/intel/{i945,x4x,pineview}: Remove wrapper spd_read_byte()
Change-Id: Ic9554ad2813ee70d0da16857d534aab5e17d808f Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/northbridge/intel/i945/raminit.c M src/northbridge/intel/pineview/raminit.c M src/northbridge/intel/x4x/raminit.c 3 files changed, 4 insertions(+), 19 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/13/38213/2
Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38213 )
Change subject: nb/intel/{i945,x4x,pineview}: Remove wrapper spd_read_byte() ......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/c/coreboot/+/38213/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/38213/1//COMMIT_MSG@7 PS1, Line 7: nb/intel/i945,x4x,pineview: Remove wrapper spd_read_byte()
I'd put the northbridge names between curly brackets, as it helps others' internal parsers: […]
Done
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38213 )
Change subject: nb/intel/{i945,x4x,pineview}: Remove wrapper spd_read_byte() ......................................................................
Patch Set 2: Code-Review+2
Kyösti Mälkki has submitted this change. ( https://review.coreboot.org/c/coreboot/+/38213 )
Change subject: nb/intel/{i945,x4x,pineview}: Remove wrapper spd_read_byte() ......................................................................
nb/intel/{i945,x4x,pineview}: Remove wrapper spd_read_byte()
Change-Id: Ic9554ad2813ee70d0da16857d534aab5e17d808f Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/38213 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Angel Pons th3fanbus@gmail.com --- M src/northbridge/intel/i945/raminit.c M src/northbridge/intel/pineview/raminit.c M src/northbridge/intel/x4x/raminit.c 3 files changed, 4 insertions(+), 19 deletions(-)
Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved
diff --git a/src/northbridge/intel/i945/raminit.c b/src/northbridge/intel/i945/raminit.c index 7096774..f0ea142 100644 --- a/src/northbridge/intel/i945/raminit.c +++ b/src/northbridge/intel/i945/raminit.c @@ -62,11 +62,6 @@
}
-static inline int spd_read_byte(unsigned int device, unsigned int address) -{ - return smbus_read_byte(device, address); -} - static __attribute__((noinline)) void do_ram_command(u32 command) { u32 reg32; @@ -365,7 +360,7 @@ if (!sdram_capabilities_dual_channel() && (i >> 1)) continue;
- if (spd_read_byte(device, SPD_MEMORY_TYPE) != + if (smbus_read_byte(device, SPD_MEMORY_TYPE) != SPD_MEMORY_TYPE_SDRAM_DDR2) { printk(BIOS_DEBUG, "DDR II Channel %d Socket %d: N/A\n", (i >> 1), (i & 1)); @@ -386,7 +381,7 @@ printk(BIOS_DEBUG, "i2c block operation failed," " trying smbus byte operation.\n"); for (j = 0; j < 64; j++) - raw_spd[j] = spd_read_byte(device, j); + raw_spd[j] = smbus_read_byte(device, j); if (CONFIG(DEBUG_RAM_SETUP)) hexdump(raw_spd, 64); } diff --git a/src/northbridge/intel/pineview/raminit.c b/src/northbridge/intel/pineview/raminit.c index 720bd64..a9e2c3e 100644 --- a/src/northbridge/intel/pineview/raminit.c +++ b/src/northbridge/intel/pineview/raminit.c @@ -103,11 +103,6 @@ __asm__ __volatile__("": : :"memory"); }
-static inline int spd_read_byte(unsigned int device, unsigned int address) -{ - return smbus_read_byte(device, address); -} - static int decode_spd(struct dimminfo *d, int i) { d->type = 0; diff --git a/src/northbridge/intel/x4x/raminit.c b/src/northbridge/intel/x4x/raminit.c index 8013af9..df2d31e 100644 --- a/src/northbridge/intel/x4x/raminit.c +++ b/src/northbridge/intel/x4x/raminit.c @@ -39,11 +39,6 @@
#define MRC_CACHE_VERSION 0
-static inline int spd_read_byte(unsigned int device, unsigned int address) -{ - return smbus_read_byte(device, address); -} - static u16 ddr2_get_crc(u8 device, u8 len) { u8 raw_spd[128] = {}; @@ -514,7 +509,7 @@ s->dimms[i].card_type = RAW_CARD_UNPOPULATED; continue; } - switch (spd_read_byte(s->spd_map[i], SPD_MEMORY_TYPE)) { + switch (smbus_read_byte(s->spd_map[i], SPD_MEMORY_TYPE)) { case DDR2SPD: dram_type_mask &= 1 << DDR2; s->spd_type = DDR2; @@ -535,7 +530,7 @@ printk(BIOS_DEBUG, "i2c block operation failed," " trying smbus byte operation.\n"); for (j = 0; j < 128; j++) - raw_spd[j] = spd_read_byte(device, j); + raw_spd[j] = smbus_read_byte(device, j); }
if (s->spd_type == DDR2){
-
Angel Pons (Code Review) -
Kyösti Mälkki (Code Review)