summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAngel Pons <th3fanbus@gmail.com>2020-09-14 18:11:40 +0200
committerPatrick Georgi <pgeorgi@google.com>2020-09-21 08:04:00 +0000
commitb8ebeba4a2e42ee04d75712a39b166cb821eeba8 (patch)
treeb8c3d6461ab2d2ca7d180acdb49eb99865b4440f
parent3447db5fe451c84c3c8dbb3e4a88c266e6c1d368 (diff)
downloadcoreboot-b8ebeba4a2e42ee04d75712a39b166cb821eeba8.tar.xz
nb/intel/sandybridge: Put DMIBAR/EPBAR registers into separate files
Tested with BUILD_TIMELESS=1, Lenovo ThinkPad X230 remains identical. Change-Id: I836df4675f4886635973c0c75f5981c9ef17d84b Signed-off-by: Angel Pons <th3fanbus@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/45359 Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/northbridge/intel/sandybridge/registers/dmibar.h53
-rw-r--r--src/northbridge/intel/sandybridge/registers/epbar.h24
-rw-r--r--src/northbridge/intel/sandybridge/sandybridge.h65
3 files changed, 79 insertions, 63 deletions
diff --git a/src/northbridge/intel/sandybridge/registers/dmibar.h b/src/northbridge/intel/sandybridge/registers/dmibar.h
new file mode 100644
index 0000000000..d47588b192
--- /dev/null
+++ b/src/northbridge/intel/sandybridge/registers/dmibar.h
@@ -0,0 +1,53 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef __SANDYBRIDGE_REGISTERS_DMIBAR_H__
+#define __SANDYBRIDGE_REGISTERS_DMIBAR_H__
+
+#define DMIVCECH 0x000 /* 32bit */
+#define DMIPVCCAP1 0x004 /* 32bit */
+#define DMIPVCCAP2 0x008 /* 32bit */
+#define DMIPVCCCTL 0x00c /* 16bit */
+
+#define DMIVC0RCAP 0x010 /* 32bit */
+#define DMIVC0RCTL 0x014 /* 32bit */
+#define DMIVC0RSTS 0x01a /* 16bit */
+#define VC0NP (1 << 1)
+
+#define DMIVC1RCAP 0x01c /* 32bit */
+#define DMIVC1RCTL 0x020 /* 32bit */
+#define DMIVC1RSTS 0x026 /* 16bit */
+#define VC1NP (1 << 1)
+
+#define DMIVCPRCAP 0x028 /* 32bit */
+#define DMIVCPRCTL 0x02c /* 32bit */
+#define DMIVCPRSTS 0x032 /* 16bit */
+#define VCPNP (1 << 1)
+
+#define DMIVCMRCAP 0x034 /* 32bit */
+#define DMIVCMRCTL 0x038 /* 32bit */
+#define DMIVCMRSTS 0x03e /* 16bit */
+#define VCMNP (1 << 1)
+
+#define DMIRCLDECH 0x040 /* 32bit */
+#define DMIESD 0x044 /* 32bit */
+
+#define DMILE1D 0x050 /* 32bit */
+#define DMILE1A 0x058 /* 64bit */
+#define DMILE2D 0x060 /* 32bit */
+#define DMILE2A 0x068 /* 64bit */
+
+#define DMILCAP 0x084 /* 32bit */
+#define DMILCTL 0x088 /* 16bit */
+#define DMILSTS 0x08a /* 16bit */
+#define TXTRN (1 << 11)
+
+#define DMILCTL2 0x098 /* 16bit */
+#define DMILSTS2 0x09a /* 16bit */
+
+#define DMIUESTS 0x1c4 /* 32bit */
+#define DMICESTS 0x1d0 /* 32bit */
+
+#define DMIL0SLAT 0x22c /* 32bit */
+#define DMILLTC 0x238 /* 32bit */
+
+#endif /* __SANDYBRIDGE_REGISTERS_DMIBAR_H__ */
diff --git a/src/northbridge/intel/sandybridge/registers/epbar.h b/src/northbridge/intel/sandybridge/registers/epbar.h
new file mode 100644
index 0000000000..386dbe1262
--- /dev/null
+++ b/src/northbridge/intel/sandybridge/registers/epbar.h
@@ -0,0 +1,24 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef __SANDYBRIDGE_REGISTERS_EPBAR_H__
+#define __SANDYBRIDGE_REGISTERS_EPBAR_H__
+
+#define EPPVCCAP1 0x004 /* 32bit */
+#define EPPVCCAP2 0x008 /* 32bit */
+
+#define EPVC0RCAP 0x010 /* 32bit */
+#define EPVC0RCTL 0x014 /* 32bit */
+#define EPVC0RSTS 0x01a /* 16bit */
+
+#define EPVC1RCAP 0x01c /* 32bit */
+#define EPVC1RCTL 0x020 /* 32bit */
+#define EPVC1RSTS 0x026 /* 16bit */
+
+#define EPESD 0x044 /* 32bit */
+
+#define EPLE1D 0x050 /* 32bit */
+#define EPLE1A 0x058 /* 64bit */
+#define EPLE2D 0x060 /* 32bit */
+#define EPLE2A 0x068 /* 64bit */
+
+#endif /* __SANDYBRIDGE_REGISTERS_EPBAR_H__ */
diff --git a/src/northbridge/intel/sandybridge/sandybridge.h b/src/northbridge/intel/sandybridge/sandybridge.h
index 5c15cb1ad3..24360ac110 100644
--- a/src/northbridge/intel/sandybridge/sandybridge.h
+++ b/src/northbridge/intel/sandybridge/sandybridge.h
@@ -76,23 +76,7 @@ enum platform_type {
#define EPBAR16(x) (*((volatile u16 *)(DEFAULT_EPBAR + (x))))
#define EPBAR32(x) (*((volatile u32 *)(DEFAULT_EPBAR + (x))))
-#define EPPVCCAP1 0x004 /* 32bit */
-#define EPPVCCAP2 0x008 /* 32bit */
-
-#define EPVC0RCAP 0x010 /* 32bit */
-#define EPVC0RCTL 0x014 /* 32bit */
-#define EPVC0RSTS 0x01a /* 16bit */
-
-#define EPVC1RCAP 0x01c /* 32bit */
-#define EPVC1RCTL 0x020 /* 32bit */
-#define EPVC1RSTS 0x026 /* 16bit */
-
-#define EPESD 0x044 /* 32bit */
-
-#define EPLE1D 0x050 /* 32bit */
-#define EPLE1A 0x058 /* 64bit */
-#define EPLE2D 0x060 /* 32bit */
-#define EPLE2A 0x068 /* 64bit */
+#include "registers/epbar.h"
/*
* DMIBAR
@@ -102,52 +86,7 @@ enum platform_type {
#define DMIBAR16(x) (*((volatile u16 *)(DEFAULT_DMIBAR + (x))))
#define DMIBAR32(x) (*((volatile u32 *)(DEFAULT_DMIBAR + (x))))
-#define DMIVCECH 0x000 /* 32bit */
-#define DMIPVCCAP1 0x004 /* 32bit */
-#define DMIPVCCAP2 0x008 /* 32bit */
-#define DMIPVCCCTL 0x00c /* 16bit */
-
-#define DMIVC0RCAP 0x010 /* 32bit */
-#define DMIVC0RCTL 0x014 /* 32bit */
-#define DMIVC0RSTS 0x01a /* 16bit */
-#define VC0NP (1 << 1)
-
-#define DMIVC1RCAP 0x01c /* 32bit */
-#define DMIVC1RCTL 0x020 /* 32bit */
-#define DMIVC1RSTS 0x026 /* 16bit */
-#define VC1NP (1 << 1)
-
-#define DMIVCPRCAP 0x028 /* 32bit */
-#define DMIVCPRCTL 0x02c /* 32bit */
-#define DMIVCPRSTS 0x032 /* 16bit */
-#define VCPNP (1 << 1)
-
-#define DMIVCMRCAP 0x034 /* 32bit */
-#define DMIVCMRCTL 0x038 /* 32bit */
-#define DMIVCMRSTS 0x03e /* 16bit */
-#define VCMNP (1 << 1)
-
-#define DMIRCLDECH 0x040 /* 32bit */
-#define DMIESD 0x044 /* 32bit */
-
-#define DMILE1D 0x050 /* 32bit */
-#define DMILE1A 0x058 /* 64bit */
-#define DMILE2D 0x060 /* 32bit */
-#define DMILE2A 0x068 /* 64bit */
-
-#define DMILCAP 0x084 /* 32bit */
-#define DMILCTL 0x088 /* 16bit */
-#define DMILSTS 0x08a /* 16bit */
-#define TXTRN (1 << 11)
-
-#define DMILCTL2 0x098 /* 16bit */
-#define DMILSTS2 0x09a /* 16bit */
-
-#define DMIUESTS 0x1c4 /* 32bit */
-#define DMICESTS 0x1d0 /* 32bit */
-
-#define DMIL0SLAT 0x22c /* 32bit */
-#define DMILLTC 0x238 /* 32bit */
+#include "registers/dmibar.h"
#ifndef __ASSEMBLER__