[coreboot-gerrit] Change in coreboot[master]: northbridge/nehalem: add MCHBAR8/16 AND_OR macros

[Felix Held (Code Review)]

Felix Held has uploaded this change for review. ( https://review.coreboot.org/27732

Change subject: northbridge/nehalem: add MCHBAR8/16 AND_OR macros
......................................................................

northbridge/nehalem: add MCHBAR8/16 AND_OR macros

Change-Id: I62e4a8610689e72944e1a9c020f13a47d402c136
Signed-off-by: Felix Held 
---
M src/northbridge/intel/nehalem/nehalem.h
1 file changed, 4 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/32/27732/1

diff --git a/src/northbridge/intel/nehalem/nehalem.h b/src/northbridge/intel/nehalem/nehalem.h
index bc49e96..5756c90 100644
--- a/src/northbridge/intel/nehalem/nehalem.h
+++ b/src/northbridge/intel/nehalem/nehalem.h
@@ -177,8 +177,12 @@
 #define MCHBAR32(x) (*((volatile u32 *)(DEFAULT_MCHBAR + (x))))
 #define MCHBAR8_AND(x, and) (MCHBAR8(x) = MCHBAR8(x) & (and))
 #define MCHBAR8_OR(x, or) (MCHBAR8(x) = MCHBAR8(x) | (or))
+#define MCHBAR8_AND_OR(x, and, or) \
+	(MCHBAR8(x) = (MCHBAR8(x) & (and)) | (or))
 #define MCHBAR16_AND(x, and) (MCHBAR16(x) = MCHBAR16(x) & (and))
 #define MCHBAR16_OR(x, or) (MCHBAR16(x) = MCHBAR16(x) | (or))
+#define MCHBAR16_AND_OR(x, and, or) \
+	(MCHBAR16(x) = (MCHBAR16(x) & (and)) | (or))
 #define MCHBAR32_AND(x, and) (MCHBAR32(x) = MCHBAR32(x) & (and))
 #define MCHBAR32_OR(x, or) (MCHBAR32(x) = MCHBAR32(x) | (or))
 #define MCHBAR32_AND_OR(x, and, or) \