Change in coreboot[master]: soc/intel/jasperlake: Clean up iomap.h and systemagent.h

[Subrata Banik (Code Review)]

Subrata Banik has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/45321 )

Change subject: soc/intel/jasperlake: Clean up iomap.h and systemagent.h
......................................................................

soc/intel/jasperlake: Clean up iomap.h and systemagent.h

List of changes:
1. Convert inconsistent white space into tab.
2. Group together all MCHBAR offset macros.

Signed-off-by: Subrata Banik 
Change-Id: Ief13406b0116ce0f0b7472e5b133b3fac06f6e27
---
M src/soc/intel/jasperlake/include/soc/iomap.h
M src/soc/intel/jasperlake/include/soc/systemagent.h
2 files changed, 18 insertions(+), 19 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/21/45321/1

diff --git a/src/soc/intel/jasperlake/include/soc/iomap.h b/src/soc/intel/jasperlake/include/soc/iomap.h
index c45430a..79ffe29 100644
--- a/src/soc/intel/jasperlake/include/soc/iomap.h
+++ b/src/soc/intel/jasperlake/include/soc/iomap.h
@@ -47,7 +47,7 @@
 #define GFXVT_BASE_ADDRESS	0xfed90000
 #define GFXVT_BASE_SIZE		0x1000

-#define IPUVT_BASE_ADDRESS      0xfed92000
+#define IPUVT_BASE_ADDRESS	0xfed92000
 #define IPUVT_BASE_SIZE		0x1000

#define VTVC0_BASE_ADDRESS	0xfed91000
diff --git a/src/soc/intel/jasperlake/include/soc/systemagent.h b/src/soc/intel/jasperlake/include/soc/systemagent.h
index e21c9af..a46b8ef 100644
--- a/src/soc/intel/jasperlake/include/soc/systemagent.h
+++ b/src/soc/intel/jasperlake/include/soc/systemagent.h
@@ -9,40 +9,39 @@

#define EPBAR		0x40
 #define DMIBAR		0x68
-#define CAPID0_A        0xe4
-#define  VTD_DISABLE    (1 << 23)
+#define CAPID0_A	0xe4
+#define  VTD_DISABLE	(1 << 23)

-#define BIOS_RESET_CPL		0x5da8
 #define GFXVTBAR		0x5400
 #define EDRAMBAR		0x5408
 #define VTVC0BAR		0x5410
 #define REGBAR			0x5420
+#define MCH_DDR_POWER_LIMIT_LO	0x58e0
+#define MCH_DDR_POWER_LIMIT_HI	0x58e4
+#define MCH_PKG_POWER_LIMIT_LO	0x59a0
+#define MCH_PKG_POWER_LIMIT_HI	0x59a4
+#define BIOS_RESET_CPL		0x5da8
+#define IMRBASE			0x6A40
+#define IMRLIMIT		0x6A48
 #define IPUVTBAR		0x7880
 #define TBT0BAR			0x7888
 #define TBT1BAR			0x7890
 #define TBT2BAR			0x7898
 #define TBT3BAR			0x78A0
+
 #define MAX_TBT_PCIE_PORT	4

#define  VTBAR_ENABLED		0x01
 #define VTBAR_MASK		0x7ffffff000ull

-#define MCH_PKG_POWER_LIMIT_LO	0x59a0
-#define MCH_PKG_POWER_LIMIT_HI	0x59a4
-#define MCH_DDR_POWER_LIMIT_LO	0x58e0
-#define MCH_DDR_POWER_LIMIT_HI	0x58e4
-
-#define IMRBASE			0x6A40
-#define IMRLIMIT		0x6A48
-
 static const struct sa_mmio_descriptor soc_vtd_resources[] = {
-		{ GFXVTBAR, GFXVT_BASE_ADDRESS, GFXVT_BASE_SIZE, "GFXVTBAR" },
-		{ IPUVTBAR, IPUVT_BASE_ADDRESS, IPUVT_BASE_SIZE, "IPUVTBAR" },
-		{ TBT0BAR, TBT0_BASE_ADDRESS, TBT0_BASE_SIZE, "TBT0BAR" },
-		{ TBT1BAR, TBT1_BASE_ADDRESS, TBT1_BASE_SIZE, "TBT1BAR" },
-		{ TBT2BAR, TBT2_BASE_ADDRESS, TBT2_BASE_SIZE, "TBT2BAR" },
-		{ TBT3BAR, TBT3_BASE_ADDRESS, TBT3_BASE_SIZE, "TBT3BAR" },
-		{ VTVC0BAR, VTVC0_BASE_ADDRESS, VTVC0_BASE_SIZE, "VTVC0BAR" },
+	{ GFXVTBAR, GFXVT_BASE_ADDRESS, GFXVT_BASE_SIZE, "GFXVTBAR" },
+	{ IPUVTBAR, IPUVT_BASE_ADDRESS, IPUVT_BASE_SIZE, "IPUVTBAR" },
+	{ TBT0BAR, TBT0_BASE_ADDRESS, TBT0_BASE_SIZE, "TBT0BAR" },
+	{ TBT1BAR, TBT1_BASE_ADDRESS, TBT1_BASE_SIZE, "TBT1BAR" },
+	{ TBT2BAR, TBT2_BASE_ADDRESS, TBT2_BASE_SIZE, "TBT2BAR" },
+	{ TBT3BAR, TBT3_BASE_ADDRESS, TBT3_BASE_SIZE, "TBT3BAR" },
+	{ VTVC0BAR, VTVC0_BASE_ADDRESS, VTVC0_BASE_SIZE, "VTVC0BAR" },
 };

#define V_P2SB_CFG_IBDF_BUS	0

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45321 )

Change subject: soc/intel/jasperlake: Clean up iomap.h and systemagent.h
......................................................................

Patch Set 1: Code-Review+2

[Michael Niewöhner (Code Review)]

Michael Niewöhner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45321 )

Change subject: soc/intel/jasperlake: Clean up iomap.h and systemagent.h
......................................................................

Patch Set 1: Code-Review+2

(1 comment)

https://review.coreboot.org/c/coreboot/+/45321/1/src/soc/intel/jasperlake/in... 
File src/soc/intel/jasperlake/include/soc/systemagent.h:

https://review.coreboot.org/c/coreboot/+/45321/1/src/soc/intel/jasperlake/in... 
PS1, Line 24: 0x6A40
            : #define IMRLIMIT		
nit: hex in lowercase

[Subrata Banik (Code Review)]

Subrata Banik has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45321 )

Change subject: soc/intel/jasperlake: Clean up iomap.h and systemagent.h
......................................................................

Patch Set 1:

(1 comment)

https://review.coreboot.org/c/coreboot/+/45321/1/src/soc/intel/jasperlake/in... 
File src/soc/intel/jasperlake/include/soc/systemagent.h:

https://review.coreboot.org/c/coreboot/+/45321/1/src/soc/intel/jasperlake/in... 
PS1, Line 24: 0x6A40
            : #define IMRLIMIT
> nit: hex in lowercase

Ack

[Subrata Banik (Code Review)]

Hello build bot (Jenkins), Tim Wawrzynczak, Angel Pons, Michael Niewöhner, Patrick Rudolph,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/45321

to look at the new patch set (#2).

Change subject: soc/intel/jasperlake: Clean up iomap.h and systemagent.h
......................................................................

soc/intel/jasperlake: Clean up iomap.h and systemagent.h

List of changes:
1. Convert inconsistent white space into tab.
2. Group together all MCHBAR offset macros.

Signed-off-by: Subrata Banik 
Change-Id: Ief13406b0116ce0f0b7472e5b133b3fac06f6e27
---
M src/soc/intel/jasperlake/include/soc/iomap.h
M src/soc/intel/jasperlake/include/soc/systemagent.h
2 files changed, 19 insertions(+), 20 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/21/45321/2

[HAOUAS Elyes (Code Review)]

HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45321 )

Change subject: soc/intel/jasperlake: Clean up iomap.h and systemagent.h
......................................................................

Patch Set 2: Code-Review+2

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45321 )

Change subject: soc/intel/jasperlake: Clean up iomap.h and systemagent.h
......................................................................

Patch Set 2: Code-Review+2

[Michael Niewöhner (Code Review)]

Michael Niewöhner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45321 )

Change subject: soc/intel/jasperlake: Clean up iomap.h and systemagent.h
......................................................................

Patch Set 2: Code-Review+2

[Michael Niewöhner (Code Review)]

Michael Niewöhner has submitted this change. ( https://review.coreboot.org/c/coreboot/+/45321 )

Change subject: soc/intel/jasperlake: Clean up iomap.h and systemagent.h
......................................................................

soc/intel/jasperlake: Clean up iomap.h and systemagent.h

List of changes:
1. Convert inconsistent white space into tab.
2. Group together all MCHBAR offset macros.

Signed-off-by: Subrata Banik 
Change-Id: Ief13406b0116ce0f0b7472e5b133b3fac06f6e27
Reviewed-on: https://review.coreboot.org/c/coreboot/+/45321
Tested-by: build bot (Jenkins) 
Reviewed-by: HAOUAS Elyes 
Reviewed-by: Angel Pons 
Reviewed-by: Michael Niewöhner 
---
M src/soc/intel/jasperlake/include/soc/iomap.h
M src/soc/intel/jasperlake/include/soc/systemagent.h
2 files changed, 19 insertions(+), 20 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  HAOUAS Elyes: Looks good to me, approved
  Angel Pons: Looks good to me, approved
  Michael Niewöhner: Looks good to me, approved

diff --git a/src/soc/intel/jasperlake/include/soc/iomap.h b/src/soc/intel/jasperlake/include/soc/iomap.h
index c45430a..79ffe29 100644
--- a/src/soc/intel/jasperlake/include/soc/iomap.h
+++ b/src/soc/intel/jasperlake/include/soc/iomap.h
@@ -47,7 +47,7 @@
 #define GFXVT_BASE_ADDRESS	0xfed90000
 #define GFXVT_BASE_SIZE		0x1000

-#define IPUVT_BASE_ADDRESS      0xfed92000
+#define IPUVT_BASE_ADDRESS	0xfed92000
 #define IPUVT_BASE_SIZE		0x1000

#define VTVC0_BASE_ADDRESS	0xfed91000
diff --git a/src/soc/intel/jasperlake/include/soc/systemagent.h b/src/soc/intel/jasperlake/include/soc/systemagent.h
index e21c9af..6acd7f3 100644
--- a/src/soc/intel/jasperlake/include/soc/systemagent.h
+++ b/src/soc/intel/jasperlake/include/soc/systemagent.h
@@ -9,40 +9,39 @@

#define EPBAR		0x40
 #define DMIBAR		0x68
-#define CAPID0_A        0xe4
-#define  VTD_DISABLE    (1 << 23)
+#define CAPID0_A	0xe4
+#define  VTD_DISABLE	(1 << 23)

-#define BIOS_RESET_CPL		0x5da8
 #define GFXVTBAR		0x5400
 #define EDRAMBAR		0x5408
 #define VTVC0BAR		0x5410
 #define REGBAR			0x5420
+#define MCH_DDR_POWER_LIMIT_LO	0x58e0
+#define MCH_DDR_POWER_LIMIT_HI	0x58e4
+#define MCH_PKG_POWER_LIMIT_LO	0x59a0
+#define MCH_PKG_POWER_LIMIT_HI	0x59a4
+#define BIOS_RESET_CPL		0x5da8
+#define IMRBASE			0x6a40
+#define IMRLIMIT		0x6a48
 #define IPUVTBAR		0x7880
 #define TBT0BAR			0x7888
 #define TBT1BAR			0x7890
 #define TBT2BAR			0x7898
-#define TBT3BAR			0x78A0
+#define TBT3BAR			0x78a0
+
 #define MAX_TBT_PCIE_PORT	4

#define  VTBAR_ENABLED		0x01
 #define VTBAR_MASK		0x7ffffff000ull

-#define MCH_PKG_POWER_LIMIT_LO	0x59a0
-#define MCH_PKG_POWER_LIMIT_HI	0x59a4
-#define MCH_DDR_POWER_LIMIT_LO	0x58e0
-#define MCH_DDR_POWER_LIMIT_HI	0x58e4
-
-#define IMRBASE			0x6A40
-#define IMRLIMIT		0x6A48
-
 static const struct sa_mmio_descriptor soc_vtd_resources[] = {
-		{ GFXVTBAR, GFXVT_BASE_ADDRESS, GFXVT_BASE_SIZE, "GFXVTBAR" },
-		{ IPUVTBAR, IPUVT_BASE_ADDRESS, IPUVT_BASE_SIZE, "IPUVTBAR" },
-		{ TBT0BAR, TBT0_BASE_ADDRESS, TBT0_BASE_SIZE, "TBT0BAR" },
-		{ TBT1BAR, TBT1_BASE_ADDRESS, TBT1_BASE_SIZE, "TBT1BAR" },
-		{ TBT2BAR, TBT2_BASE_ADDRESS, TBT2_BASE_SIZE, "TBT2BAR" },
-		{ TBT3BAR, TBT3_BASE_ADDRESS, TBT3_BASE_SIZE, "TBT3BAR" },
-		{ VTVC0BAR, VTVC0_BASE_ADDRESS, VTVC0_BASE_SIZE, "VTVC0BAR" },
+	{ GFXVTBAR, GFXVT_BASE_ADDRESS, GFXVT_BASE_SIZE, "GFXVTBAR" },
+	{ IPUVTBAR, IPUVT_BASE_ADDRESS, IPUVT_BASE_SIZE, "IPUVTBAR" },
+	{ TBT0BAR, TBT0_BASE_ADDRESS, TBT0_BASE_SIZE, "TBT0BAR" },
+	{ TBT1BAR, TBT1_BASE_ADDRESS, TBT1_BASE_SIZE, "TBT1BAR" },
+	{ TBT2BAR, TBT2_BASE_ADDRESS, TBT2_BASE_SIZE, "TBT2BAR" },
+	{ TBT3BAR, TBT3_BASE_ADDRESS, TBT3_BASE_SIZE, "TBT3BAR" },
+	{ VTVC0BAR, VTVC0_BASE_ADDRESS, VTVC0_BASE_SIZE, "VTVC0BAR" },
 };

#define V_P2SB_CFG_IBDF_BUS	0