[PATCH] x86/hvmloader: fix order of PCI vs MTRR initialization

[PATCH] x86/hvmloader: fix order of PCI vs MTRR initialization

[Roger Pau Monne]

After some recent change the order of MTRR vs PCI initialization is
inverted.  MTRR will get initialization ahead of PCI scanning and sizing of
MMIO regions.  As a result when setting up MTRRs the MMIO window below 4GB
will always have the same size, and there will be no window above 4GB.
This results in malformed and incomplete MTRRs being setup.

Fix by making sure PCI is initialized ahead of MTRR, also add a comment to
notice the ordering dependency.

Fixes: 2c3dffbaa324 ('tools/hvmloader: Replace LAPIC_ID() with cpu_to_apicid[]')
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
---
 tools/firmware/hvmloader/hvmloader.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tools/firmware/hvmloader/hvmloader.c b/tools/firmware/hvmloader/hvmloader.c
index 4e330fc1e241..6d23150fc9fd 100644
--- a/tools/firmware/hvmloader/hvmloader.c
+++ b/tools/firmware/hvmloader/hvmloader.c
@@ -341,10 +341,16 @@ int main(void)
 
     printf("CPU speed is %u MHz\n", get_cpu_mhz());
 
+    /*
+     * PCI setup must be done before SMP initialization, as the later also does
+     * the MTRR setup and so the size of the PCI MMIO windows must be known at
+     * that point.
+     */
+    pci_setup();
+
     smp_initialise();
 
     apic_setup();
-    pci_setup();
 
     perform_tests();
 
-- 
2.49.0

Re: [PATCH] x86/hvmloader: fix order of PCI vs MTRR initialization

[Andrew Cooper]

On 27/05/2025 9:55 am, Roger Pau Monne wrote:
> After some recent change the order of MTRR vs PCI initialization is
> inverted.  MTRR will get initialization ahead of PCI scanning and sizing of
> MMIO regions.  As a result when setting up MTRRs the MMIO window below 4GB
> will always have the same size, and there will be no window above 4GB.
> This results in malformed and incomplete MTRRs being setup.
>
> Fix by making sure PCI is initialized ahead of MTRR, also add a comment to
> notice the ordering dependency.
>
> Fixes: 2c3dffbaa324 ('tools/hvmloader: Replace LAPIC_ID() with cpu_to_apicid[]')
> Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>

Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>

Re: [PATCH] x86/hvmloader: fix order of PCI vs MTRR initialization

[Anthoine Bourgeois]

On Tue, May 27, 2025 at 10:55:04AM +0200, Roger Pau Monne wrote:
>After some recent change the order of MTRR vs PCI initialization is
>inverted.  MTRR will get initialization ahead of PCI scanning and sizing of
>MMIO regions.  As a result when setting up MTRRs the MMIO window below 4GB
>will always have the same size, and there will be no window above 4GB.
>This results in malformed and incomplete MTRRs being setup.
>
>Fix by making sure PCI is initialized ahead of MTRR, also add a comment to
>notice the ordering dependency.
>
>Fixes: 2c3dffbaa324 ('tools/hvmloader: Replace LAPIC_ID() with cpu_to_apicid[]')
>Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>

Reviewed-by: Anthoine Bourgeois <anthoine.bourgeois@gmail.com>