2009-06-26 00:15:30

by Jacob Pan

Subject: [PATCH 4/9] x86/boot: adding hw subarch ID for Moorestown

>From 522487a05d2beef4f355dc7c47af08108496b244 Mon Sep 17 00:00:00 2001
From: Jacob Pan <[email protected]>
Date: Thu, 11 Jun 2009 20:34:47 -0700
Subject: [PATCH] x86/boot: adding hw subarch ID for Moorestown

x86 bootprotocol 2.07 has introduced hardware_subarch ID in the boot
parameters provided by FW. We use it to identify Moorestown platforms.

The subarchitecture ID will help select a set of platform features and
x86_quirks.

Signed-off-by: Jacob Pan <[email protected]>
---
Documentation/x86/boot.txt | 1 +
arch/x86/include/asm/bootparam.h | 5 +++++
2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/Documentation/x86/boot.txt b/Documentation/x86/boot.txt
index 8da3a79..30b43e1 100644
--- a/Documentation/x86/boot.txt
+++ b/Documentation/x86/boot.txt
@@ -599,6 +599,7 @@ Protocol: 2.07+
0x00000000 The default x86/PC environment
0x00000001 lguest
0x00000002 Xen
+ 0x00000003 Moorestown MID

Field name: hardware_subarch_data
Type: write (subarch-dependent)
diff --git a/arch/x86/include/asm/bootparam.h b/arch/x86/include/asm/bootparam.h
index 1724e8d..117ab6b 100644
--- a/arch/x86/include/asm/bootparam.h
+++ b/arch/x86/include/asm/bootparam.h
@@ -109,4 +109,9 @@ struct boot_params {
__u8 _pad9[276]; /* 0xeec */
} __attribute__((packed));

+#define N_X86_SUBARCHS 4
+#define X86_SUBARCH_PC 0
+#define X86_SUBARCH_LGUEST 1
+#define X86_SUBARCH_XEN 2
+#define X86_SUBARCH_MRST 3
#endif /* _ASM_X86_BOOTPARAM_H */
--
1.5.6.5

2009-06-26 07:18:10

by Ingo Molnar

Subject: Re: [PATCH 4/9] x86/boot: adding hw subarch ID for Moorestown

* Pan, Jacob jun <[email protected]> wrote:

> +++ b/arch/x86/include/asm/bootparam.h
> @@ -109,4 +109,9 @@ struct boot_params {
> __u8 _pad9[276]; /* 0xeec */
> } __attribute__((packed));
>
> +#define N_X86_SUBARCHS 4
> +#define X86_SUBARCH_PC 0
> +#define X86_SUBARCH_LGUEST 1
> +#define X86_SUBARCH_XEN 2
> +#define X86_SUBARCH_MRST 3
> #endif /* _ASM_X86_BOOTPARAM_H */

please use enums.

Ingo