Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:12.2
xen
23616-x86_64-EFI-MPS.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 23616-x86_64-EFI-MPS.patch of Package xen
References: fate#311376, fate#311529, bnc#578927, bnc#628554 # HG changeset patch # User Jan Beulich <jbeulich@novell.com> # Date 1309249288 -3600 # Node ID dffcd8b4c197b58d2acb914d0e07a100e340f7ae # Parent d19e778442673050bba8ea8cf61585902ff81162 x86-64: EFI MPS support It's not clear this is needed - Linux doesn't use the MPS table even if available, and no system having one was seen so far. Signed-off-by: Jan Beulich <jbeulich@novell.com> # HG changeset patch # User Keir Fraser <keir@xen.org> # Date 1309268736 -3600 # Node ID d22b64ccf088db8bfce1d6c4830f08e3e834ec84 # Parent 6d404796a8e587eb648a66f2859991d385b65eb6 x86_32: Fix build after EFI MPS patch. Signed-off-by: Keir Fraser <keir@xen.org> Index: xen-4.1.2-testing/xen/arch/x86/efi/boot.c =================================================================== --- xen-4.1.2-testing.orig/xen/arch/x86/efi/boot.c +++ xen-4.1.2-testing/xen/arch/x86/efi/boot.c @@ -897,12 +897,15 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SY { static EFI_GUID __initdata acpi2_guid = ACPI_20_TABLE_GUID; static EFI_GUID __initdata acpi_guid = ACPI_TABLE_GUID; + static EFI_GUID __initdata mps_guid = MPS_TABLE_GUID; static EFI_GUID __initdata smbios_guid = SMBIOS_TABLE_GUID; if ( match_guid(&acpi2_guid, &efi_ct[i].VendorGuid) ) efi.acpi20 = (long)efi_ct[i].VendorTable; if ( match_guid(&acpi_guid, &efi_ct[i].VendorGuid) ) efi.acpi = (long)efi_ct[i].VendorTable; + if ( match_guid(&mps_guid, &efi_ct[i].VendorGuid) ) + efi.mps = (long)efi_ct[i].VendorTable; if ( match_guid(&smbios_guid, &efi_ct[i].VendorGuid) ) efi.smbios = (long)efi_ct[i].VendorTable; } Index: xen-4.1.2-testing/xen/arch/x86/efi/runtime.c =================================================================== --- xen-4.1.2-testing.orig/xen/arch/x86/efi/runtime.c +++ xen-4.1.2-testing/xen/arch/x86/efi/runtime.c @@ -29,6 +29,7 @@ void *__read_mostly efi_memmap; struct efi __read_mostly efi = { .acpi = EFI_INVALID_TABLE_ADDR, .acpi20 = EFI_INVALID_TABLE_ADDR, + .mps = EFI_INVALID_TABLE_ADDR, .smbios = EFI_INVALID_TABLE_ADDR, }; Index: xen-4.1.2-testing/xen/arch/x86/mpparse.c =================================================================== --- xen-4.1.2-testing.orig/xen/arch/x86/mpparse.c +++ xen-4.1.2-testing/xen/arch/x86/mpparse.c @@ -19,6 +19,8 @@ #include <xen/init.h> #include <xen/acpi.h> #include <xen/delay.h> +#include <xen/efi.h> +#include <xen/pfn.h> #include <xen/sched.h> #include <asm/mc146818rtc.h> @@ -655,6 +657,14 @@ static inline void __init construct_defa } } +#define FIX_EFI_MPF FIX_KEXEC_BASE_0 + +static __init void efi_unmap_mpf(void) +{ + if (efi_enabled) + __set_fixmap(FIX_EFI_MPF, 0, 0); +} + static struct intel_mp_floating *mpf_found; /* @@ -669,6 +679,7 @@ void __init get_smp_config (void) * processors, where MPS only supports physical. */ if (acpi_lapic && acpi_ioapic) { + efi_unmap_mpf(); printk(KERN_INFO "Using ACPI (MADT) for SMP configuration information\n"); return; } @@ -699,6 +710,7 @@ void __init get_smp_config (void) * override the defaults. */ if (!smp_read_mpc((void *)(unsigned long)mpf->mpf_physptr)) { + efi_unmap_mpf(); smp_found_config = 0; printk(KERN_ERR "BIOS bug, MP table errors detected!...\n"); printk(KERN_ERR "... disabling SMP support. (tell your hw vendor)\n"); @@ -725,6 +737,8 @@ void __init get_smp_config (void) } else BUG(); + efi_unmap_mpf(); + printk(KERN_INFO "Processors: %d\n", num_processors); /* * Only use the first configuration found. @@ -779,10 +793,37 @@ static int __init smp_scan_config (unsig return 0; } +static void __init efi_check_config(void) +{ + struct intel_mp_floating *mpf; + + if (efi.mps == EFI_INVALID_TABLE_ADDR) + return; + + __set_fixmap(FIX_EFI_MPF, PFN_DOWN(efi.mps), __PAGE_HYPERVISOR); + mpf = (void *)fix_to_virt(FIX_EFI_MPF) + ((long)efi.mps & (PAGE_SIZE-1)); + + if (memcmp(mpf->mpf_signature, "_MP_", 4) == 0 && + mpf->mpf_length == 1 && + mpf_checksum((void *)mpf, 16) && + (mpf->mpf_specification == 1 || mpf->mpf_specification == 4)) { + smp_found_config = 1; + printk(KERN_INFO "SMP MP-table at %08lx\n", efi.mps); + mpf_found = mpf; + } + else + efi_unmap_mpf(); +} + void __init find_smp_config (void) { unsigned int address; + if (efi_enabled) { + efi_check_config(); + return; + } + /* * FIXME: Linux assumes you have 640K of base ram.. * this continues the error... Index: xen-4.1.2-testing/xen/include/xen/efi.h =================================================================== --- xen-4.1.2-testing.orig/xen/include/xen/efi.h +++ xen-4.1.2-testing/xen/include/xen/efi.h @@ -17,6 +17,7 @@ extern const bool_t efi_enabled; /* Add fields here only if they need to be referenced from non-EFI code. */ struct efi { + unsigned long mps; /* MPS table */ unsigned long acpi; /* ACPI table (IA64 ext 0.71) */ unsigned long acpi20; /* ACPI table (ACPI 2.0) */ unsigned long smbios; /* SM BIOS table */
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor