Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 162bc7ab authored by Pan, Jacob jun's avatar Pan, Jacob jun Committed by Thomas Gleixner
Browse files

x86: Add hardware_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.

[ tglx: Cleanup and paravirt fix ]

Signed-off-by: default avatarJacob Pan <jacob.jun.pan@intel.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 47a3d5da

Documentation/x86/boot.txt

+1 −0
Original line number Diff line number Diff line
@@ -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)

arch/x86/include/asm/bootparam.h

+10 −0
Original line number Diff line number Diff line
@@ -109,4 +109,14 @@ struct boot_params { 
	__u8  _pad9[276];				/* 0xeec */

} __attribute__((packed));



enum {

	X86_SUBARCH_PC = 0,

	X86_SUBARCH_LGUEST,

	X86_SUBARCH_XEN,

	X86_SUBARCH_MRST,

	X86_NR_SUBARCHS,

};







#endif /* _ASM_X86_BOOTPARAM_H */

arch/x86/kernel/head_32.S

+1 −0
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ subarch_entries: 
	.long default_entry		/* normal x86/PC */

	.long lguest_entry		/* lguest hypervisor */

	.long xen_entry			/* Xen hypervisor */

	.long default_entry		/* Moorestown MID */

num_subarch_entries = (. - subarch_entries) / 4

.previous

#endif /* CONFIG_PARAVIRT */