HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/45613 )
Change subject: nb/i945: Move DEFAULT_MCHBAR to Kconfig ......................................................................
nb/i945: Move DEFAULT_MCHBAR to Kconfig
Change-Id: If7aab904a92ddf741e7032fd111c945633d7c1d6 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M src/northbridge/intel/i945/Kconfig M src/northbridge/intel/i945/acpi/i945.asl M src/northbridge/intel/i945/early_init.c M src/northbridge/intel/i945/i945.h 4 files changed, 9 insertions(+), 7 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/13/45613/1
diff --git a/src/northbridge/intel/i945/Kconfig b/src/northbridge/intel/i945/Kconfig index d6498f1..0499a7c 100644 --- a/src/northbridge/intel/i945/Kconfig +++ b/src/northbridge/intel/i945/Kconfig @@ -15,6 +15,10 @@ select HAVE_VGA_TEXT_FRAMEBUFFER if MAINBOARD_DO_NATIVE_VGA_INIT select PARALLEL_MP
+config DEFAULT_MCHBAR + hex + default 0xfed14000 + config VBOOT select VBOOT_STARTS_IN_BOOTBLOCK select VBOOT_SEPARATE_VERSTAGE diff --git a/src/northbridge/intel/i945/acpi/i945.asl b/src/northbridge/intel/i945/acpi/i945.asl index 789225c..76a50f0 100644 --- a/src/northbridge/intel/i945/acpi/i945.asl +++ b/src/northbridge/intel/i945/acpi/i945.asl @@ -39,7 +39,7 @@
Name (PDRS, ResourceTemplate() { Memory32Fixed(ReadWrite, DEFAULT_RCBA, 0x00004000) - Memory32Fixed(ReadWrite, DEFAULT_MCHBAR, 0x00004000) + Memory32Fixed(ReadWrite, CONFIG_DEFAULT_MCHBAR, 0x00004000) Memory32Fixed(ReadWrite, DEFAULT_DMIBAR, 0x00001000) Memory32Fixed(ReadWrite, DEFAULT_EPBAR, 0x00001000) Memory32Fixed(ReadWrite, CONFIG_MMCONF_BASE_ADDRESS, 0x04000000) diff --git a/src/northbridge/intel/i945/early_init.c b/src/northbridge/intel/i945/early_init.c index b04a2f594..0bdcd17 100644 --- a/src/northbridge/intel/i945/early_init.c +++ b/src/northbridge/intel/i945/early_init.c @@ -145,7 +145,7 @@ printk(BIOS_DEBUG, "Setting up static northbridge registers..."); /* Set up all hardcoded northbridge BARs */ pci_write_config32(HOST_BRIDGE, EPBAR, DEFAULT_EPBAR | 1); - pci_write_config32(HOST_BRIDGE, MCHBAR, (uintptr_t)DEFAULT_MCHBAR | 1); + pci_write_config32(HOST_BRIDGE, MCHBAR, (uintptr_t)CONFIG_DEFAULT_MCHBAR | 1); pci_write_config32(HOST_BRIDGE, DMIBAR, (uintptr_t)DEFAULT_DMIBAR | 1); pci_write_config32(HOST_BRIDGE, X60BAR, DEFAULT_X60BAR | 1);
diff --git a/src/northbridge/intel/i945/i945.h b/src/northbridge/intel/i945/i945.h index 4b79b2b..96623be 100644 --- a/src/northbridge/intel/i945/i945.h +++ b/src/northbridge/intel/i945/i945.h @@ -6,10 +6,8 @@ /* Northbridge BARs */ #define DEFAULT_X60BAR 0xfed13000 #ifndef __ACPI__ -#define DEFAULT_MCHBAR ((u8 *)0xfed14000) /* 16 KB */ #define DEFAULT_DMIBAR ((u8 *)0xfed18000) /* 4 KB */ #else -#define DEFAULT_MCHBAR 0xfed14000 /* 16 KB */ #define DEFAULT_DMIBAR 0xfed18000 /* 4 KB */ #endif #define DEFAULT_EPBAR 0xfed19000 /* 4 KB */ @@ -99,9 +97,9 @@ * MCHBAR */
-#define MCHBAR8(x) (*((volatile u8 *)(DEFAULT_MCHBAR + (x)))) -#define MCHBAR16(x) (*((volatile u16 *)(DEFAULT_MCHBAR + (x)))) -#define MCHBAR32(x) (*((volatile u32 *)(DEFAULT_MCHBAR + (x)))) +#define MCHBAR8(x) (*((volatile u8 *)(CONFIG_DEFAULT_MCHBAR + (x)))) +#define MCHBAR16(x) (*((volatile u16 *)(CONFIG_DEFAULT_MCHBAR + (x)))) +#define MCHBAR32(x) (*((volatile u32 *)(CONFIG_DEFAULT_MCHBAR + (x))))
/* Chipset Control Registers */ #define FSBPMC3 0x40 /* 32bit */
Hello build bot (Jenkins), Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/45613
to look at the new patch set (#2).
Change subject: nb/intel/i945: Move DEFAULT_MCHBAR to Kconfig ......................................................................
nb/intel/i945: Move DEFAULT_MCHBAR to Kconfig
Change-Id: If7aab904a92ddf741e7032fd111c945633d7c1d6 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M src/northbridge/intel/i945/Kconfig M src/northbridge/intel/i945/acpi/i945.asl M src/northbridge/intel/i945/early_init.c M src/northbridge/intel/i945/i945.h 4 files changed, 9 insertions(+), 7 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/13/45613/2
Hello build bot (Jenkins), Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/45613
to look at the new patch set (#3).
Change subject: nb/intel/i945: Move DEFAULT_MCHBAR to Kconfig ......................................................................
nb/intel/i945: Move DEFAULT_MCHBAR to Kconfig
Change-Id: If7aab904a92ddf741e7032fd111c945633d7c1d6 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M src/northbridge/intel/i945/Kconfig M src/northbridge/intel/i945/acpi/i945.asl M src/northbridge/intel/i945/early_init.c M src/northbridge/intel/i945/i945.h 4 files changed, 9 insertions(+), 7 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/13/45613/3
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45613 )
Change subject: nb/intel/i945: Move DEFAULT_MCHBAR to Kconfig ......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/c/coreboot/+/45613/1/src/northbridge/intel/i945/... File src/northbridge/intel/i945/i945.h:
https://review.coreboot.org/c/coreboot/+/45613/1/src/northbridge/intel/i945/... PS1, Line 9: #define DEFAULT_MCHBAR ((u8 *)0xfed14000) /* 16 KB */ We could just patch these lines to use the Kconfig value. I would much prefer that to keep the code stable. Also, I don't see any downsides.
Hello build bot (Jenkins), Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/45613
to look at the new patch set (#4).
Change subject: nb/intel/i945: Move DEFAULT_MCHBAR to Kconfig ......................................................................
nb/intel/i945: Move DEFAULT_MCHBAR to Kconfig
Change-Id: If7aab904a92ddf741e7032fd111c945633d7c1d6 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M src/northbridge/intel/i945/Kconfig M src/northbridge/intel/i945/i945.h 2 files changed, 6 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/13/45613/4
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45613 )
Change subject: nb/intel/i945: Move DEFAULT_MCHBAR to Kconfig ......................................................................
Patch Set 4: Code-Review+1
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45613 )
Change subject: nb/intel/i945: Move DEFAULT_MCHBAR to Kconfig ......................................................................
Patch Set 4:
(1 comment)
https://review.coreboot.org/c/coreboot/+/45613/4/src/northbridge/intel/i945/... File src/northbridge/intel/i945/Kconfig:
https://review.coreboot.org/c/coreboot/+/45613/4/src/northbridge/intel/i945/... PS4, Line 19: hex Not needed here?
Hello build bot (Jenkins), Angel Pons, Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/45613
to look at the new patch set (#5).
Change subject: nb/intel/i945: Move DEFAULT_MCHBAR to Kconfig ......................................................................
nb/intel/i945: Move DEFAULT_MCHBAR to Kconfig
Change-Id: If7aab904a92ddf741e7032fd111c945633d7c1d6 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M src/northbridge/intel/i945/Kconfig M src/northbridge/intel/i945/i945.h 2 files changed, 8 insertions(+), 5 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/13/45613/5
Hello build bot (Jenkins), Angel Pons, Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/45613
to look at the new patch set (#6).
Change subject: nb/intel/i945: Move DEFAULT_BARs to Kconfig ......................................................................
nb/intel/i945: Move DEFAULT_BARs to Kconfig
Change-Id: If7aab904a92ddf741e7032fd111c945633d7c1d6 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M src/northbridge/intel/i945/Kconfig M src/northbridge/intel/i945/i945.h 2 files changed, 14 insertions(+), 5 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/13/45613/6
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45613 )
Change subject: nb/intel/i945: Move DEFAULT_BARs to Kconfig ......................................................................
Patch Set 7:
(1 comment)
https://review.coreboot.org/c/coreboot/+/45613/4/src/northbridge/intel/i945/... File src/northbridge/intel/i945/Kconfig:
https://review.coreboot.org/c/coreboot/+/45613/4/src/northbridge/intel/i945/... PS4, Line 19: hex
Not needed here?
:) indeed
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45613 )
Change subject: nb/intel/i945: Move DEFAULT_BARs to Kconfig ......................................................................
Patch Set 7:
(1 comment)
https://review.coreboot.org/c/coreboot/+/45613/1/src/northbridge/intel/i945/... File src/northbridge/intel/i945/i945.h:
https://review.coreboot.org/c/coreboot/+/45613/1/src/northbridge/intel/i945/... PS1, Line 9: #define DEFAULT_MCHBAR ((u8 *)0xfed14000) /* 16 KB */
We could just patch these lines to use the Kconfig value. I would much […]
Done
Hello build bot (Jenkins), Angel Pons, Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/45613
to look at the new patch set (#9).
Change subject: nb/{gm45,haswell,i945,ironlake,pineview,sandybridge,x4x}: Move DEFAULT_BARs to Kconfig ......................................................................
nb/{gm45,haswell,i945,ironlake,pineview,sandybridge,x4x}: Move DEFAULT_BARs to Kconfig
Change-Id: If7aab904a92ddf741e7032fd111c945633d7c1d6 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M src/northbridge/intel/gm45/Kconfig M src/northbridge/intel/gm45/gm45.h M src/northbridge/intel/haswell/Kconfig M src/northbridge/intel/haswell/memmap.h M src/northbridge/intel/i945/Kconfig M src/northbridge/intel/i945/i945.h M src/northbridge/intel/ironlake/Kconfig M src/northbridge/intel/ironlake/ironlake.h M src/northbridge/intel/pineview/Kconfig M src/northbridge/intel/pineview/memmap.h M src/northbridge/intel/sandybridge/Kconfig M src/northbridge/intel/sandybridge/memmap.h M src/northbridge/intel/x4x/Kconfig M src/northbridge/intel/x4x/memmap.h 14 files changed, 89 insertions(+), 25 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/13/45613/9
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45613 )
Change subject: nb/{gm45,haswell,i945,ironlake,pineview,sandybridge,x4x}: Move DEFAULT_BARs to Kconfig ......................................................................
Patch Set 9:
(1 comment)
https://review.coreboot.org/c/coreboot/+/45613/9/src/northbridge/intel/gm45/... File src/northbridge/intel/gm45/gm45.h:
https://review.coreboot.org/c/coreboot/+/45613/9/src/northbridge/intel/gm45/... PS9, Line 176: #define DEFAULT_HECIBAR 0xfed1a000 guerrrrrrrrrrrrrrrrrrr
Hello build bot (Jenkins), Damien Zammit, Angel Pons, Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/45613
to look at the new patch set (#10).
Change subject: nb/{gm45,haswell,i945,ironlake,pineview,sandybridge,x4x}: Move DEFAULT_BARs to Kconfig ......................................................................
nb/{gm45,haswell,i945,ironlake,pineview,sandybridge,x4x}: Move DEFAULT_BARs to Kconfig
Change-Id: If7aab904a92ddf741e7032fd111c945633d7c1d6 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M src/northbridge/intel/gm45/Kconfig M src/northbridge/intel/gm45/gm45.h M src/northbridge/intel/haswell/Kconfig M src/northbridge/intel/haswell/memmap.h M src/northbridge/intel/i945/Kconfig M src/northbridge/intel/i945/i945.h M src/northbridge/intel/ironlake/Kconfig M src/northbridge/intel/ironlake/ironlake.h M src/northbridge/intel/pineview/Kconfig M src/northbridge/intel/pineview/memmap.h M src/northbridge/intel/sandybridge/Kconfig M src/northbridge/intel/sandybridge/memmap.h M src/northbridge/intel/x4x/Kconfig M src/northbridge/intel/x4x/memmap.h 14 files changed, 88 insertions(+), 25 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/13/45613/10
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45613 )
Change subject: nb/{gm45,haswell,i945,ironlake,pineview,sandybridge,x4x}: Move DEFAULT_BARs to Kconfig ......................................................................
Patch Set 10:
(1 comment)
https://review.coreboot.org/c/coreboot/+/45613/9/src/northbridge/intel/gm45/... File src/northbridge/intel/gm45/gm45.h:
https://review.coreboot.org/c/coreboot/+/45613/9/src/northbridge/intel/gm45/... PS9, Line 176: #define DEFAULT_HECIBAR 0xfed1a000
guerrrrrrrrrrrrrrrrrrr
Done
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45613 )
Change subject: nb/{gm45,haswell,i945,ironlake,pineview,sandybridge,x4x}: Move DEFAULT_BARs to Kconfig ......................................................................
Patch Set 10:
(2 comments)
https://review.coreboot.org/c/coreboot/+/45613/10/src/northbridge/intel/hasw... File src/northbridge/intel/haswell/memmap.h:
https://review.coreboot.org/c/coreboot/+/45613/10/src/northbridge/intel/hasw... PS10, Line 10: /* 16 KB */ This is wrong
https://review.coreboot.org/c/coreboot/+/45613/10/src/northbridge/intel/sand... File src/northbridge/intel/sandybridge/memmap.h:
https://review.coreboot.org/c/coreboot/+/45613/10/src/northbridge/intel/sand... PS10, Line 7: /* 16 KB */ This is wrong
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45613 )
Change subject: nb/{gm45,haswell,i945,ironlake,pineview,sandybridge,x4x}: Move DEFAULT_BARs to Kconfig ......................................................................
Patch Set 10:
(2 comments)
Thank you
https://review.coreboot.org/c/coreboot/+/45613/10/src/northbridge/intel/hasw... File src/northbridge/intel/haswell/memmap.h:
https://review.coreboot.org/c/coreboot/+/45613/10/src/northbridge/intel/hasw... PS10, Line 10: /* 16 KB */
This is wrong
out of scope. but I'll remove it
https://review.coreboot.org/c/coreboot/+/45613/10/src/northbridge/intel/sand... File src/northbridge/intel/sandybridge/memmap.h:
https://review.coreboot.org/c/coreboot/+/45613/10/src/northbridge/intel/sand... PS10, Line 7: /* 16 KB */
This is wrong
out of scope. but I'll remove it
Hello build bot (Jenkins), Damien Zammit, Angel Pons, Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/45613
to look at the new patch set (#11).
Change subject: nb/{gm45,haswell,i945,ironlake,pineview,sandybridge,x4x}: Move DEFAULT_BARs to Kconfig ......................................................................
nb/{gm45,haswell,i945,ironlake,pineview,sandybridge,x4x}: Move DEFAULT_BARs to Kconfig
Change-Id: If7aab904a92ddf741e7032fd111c945633d7c1d6 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M src/northbridge/intel/gm45/Kconfig M src/northbridge/intel/gm45/gm45.h M src/northbridge/intel/haswell/Kconfig M src/northbridge/intel/haswell/memmap.h M src/northbridge/intel/i945/Kconfig M src/northbridge/intel/i945/i945.h M src/northbridge/intel/ironlake/Kconfig M src/northbridge/intel/ironlake/ironlake.h M src/northbridge/intel/pineview/Kconfig M src/northbridge/intel/pineview/memmap.h M src/northbridge/intel/sandybridge/Kconfig M src/northbridge/intel/sandybridge/memmap.h M src/northbridge/intel/x4x/Kconfig M src/northbridge/intel/x4x/memmap.h 14 files changed, 88 insertions(+), 25 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/13/45613/11
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45613 )
Change subject: nb/{gm45,haswell,i945,ironlake,pineview,sandybridge,x4x}: Move DEFAULT_BARs to Kconfig ......................................................................
Patch Set 11:
(2 comments)
https://review.coreboot.org/c/coreboot/+/45613/10/src/northbridge/intel/hasw... File src/northbridge/intel/haswell/memmap.h:
https://review.coreboot.org/c/coreboot/+/45613/10/src/northbridge/intel/hasw... PS10, Line 10: /* 16 KB */
out of scope. […]
Done
https://review.coreboot.org/c/coreboot/+/45613/10/src/northbridge/intel/sand... File src/northbridge/intel/sandybridge/memmap.h:
https://review.coreboot.org/c/coreboot/+/45613/10/src/northbridge/intel/sand... PS10, Line 7: /* 16 KB */
out of scope. […]
Done
HAOUAS Elyes has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/45613 )
Change subject: nb/{gm45,haswell,i945,ironlake,pineview,sandybridge,x4x}: Move DEFAULT_BARs to Kconfig ......................................................................
Abandoned
-
Angel Pons (Code Review) -
HAOUAS Elyes (Code Review)
-
Nico Huber (Code Review)