diff options
| -rw-r--r-- | src/include/assert.h | 6 | ||||
| -rw-r--r-- | src/include/cpu/amd/model_fxx_rev.h | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/include/assert.h b/src/include/assert.h index 198538974f..90cc2a8b18 100644 --- a/src/include/assert.h +++ b/src/include/assert.h @@ -24,13 +24,15 @@ if (!(x)) { \ printk(BIOS_EMERG, "ASSERTION ERROR: file '%s'" \ ", line %d\n", __FILE__, __LINE__); \ - if (IS_ENABLED(CONFIG_FATAL_ASSERTS)) hlt(); \ + if (IS_ENABLED(CONFIG_FATAL_ASSERTS)) \ + hlt(); \ } \ } #define BUG() { \ printk(BIOS_EMERG, "ERROR: BUG ENCOUNTERED at file '%s'"\ ", line %d\n", __FILE__, __LINE__); \ - if (IS_ENABLED(CONFIG_FATAL_ASSERTS)) hlt(); \ + if (IS_ENABLED(CONFIG_FATAL_ASSERTS)) \ + hlt(); \ } #define assert(statement) ASSERT(statement) diff --git a/src/include/cpu/amd/model_fxx_rev.h b/src/include/cpu/amd/model_fxx_rev.h index 4a217b2668..6bb8b43c1c 100644 --- a/src/include/cpu/amd/model_fxx_rev.h +++ b/src/include/cpu/amd/model_fxx_rev.h @@ -73,7 +73,8 @@ static inline int is_e0_later_in_bsp(int nodeid) if (IS_ENABLED(CONFIG_K8_REV_F_SUPPORT)) return 1; - if (nodeid == 0) { // we don't need to do that for node 0 in core0/node0 + // we don't need to do that for node 0 in core0/node0 + if (nodeid == 0) { return !is_cpu_pre_e0(); } @@ -87,7 +88,8 @@ static inline int is_e0_later_in_bsp(int nodeid) val = pci_read_config32(dev, 0x80); e0_later = !!(val & (1<<3)); - if (e0_later) { // pre_e0 bit 3 always be 0 and can not be changed + // pre_e0 bit 3 always be 0 and can not be changed + if (e0_later) { pci_write_config32(dev, 0x80, val_old); // restore it } |