From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752310AbdLLK6R (ORCPT ); Tue, 12 Dec 2017 05:58:17 -0500 Received: from terminus.zytor.com ([65.50.211.136]:52317 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751289AbdLLK6O (ORCPT ); Tue, 12 Dec 2017 05:58:14 -0500 Date: Tue, 12 Dec 2017 02:54:39 -0800 From: tip-bot for Juergen Gross Message-ID: Cc: torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, peterz@infradead.org, jgross@suse.com, mingo@kernel.org, hpa@zytor.com Reply-To: hpa@zytor.com, mingo@kernel.org, jgross@suse.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, peterz@infradead.org, torvalds@linux-foundation.org In-Reply-To: <20171208151139.30213-4-jgross@suse.com> References: <20171208151139.30213-4-jgross@suse.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/boot] x86/xen: Fix the boot loader version reported for PVH guests Git-Commit-ID: 88750a6c33f813b815516990f01fb5ee488c477e X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 88750a6c33f813b815516990f01fb5ee488c477e Gitweb: https://git.kernel.org/tip/88750a6c33f813b815516990f01fb5ee488c477e Author: Juergen Gross AuthorDate: Fri, 8 Dec 2017 16:11:38 +0100 Committer: Ingo Molnar CommitDate: Mon, 11 Dec 2017 15:14:20 +0100 x86/xen: Fix the boot loader version reported for PVH guests The boot loader version reported via sysfs is wrong in case of the kernel being booted via the Xen PVH boot entry. it should be 2.12 (0x020c), but it is reported to be 2.18 (0x0212). As the current way to set the version is error prone use the more readable variant (2 << 8) | 12. Signed-off-by: Juergen Gross Cc: # 4.12 Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: boris.ostrovsky@oracle.com Cc: corbet@lwn.net Cc: lenb@kernel.org Cc: linux-acpi@vger.kernel.org Cc: rjw@rjwysocki.net Cc: xen-devel@lists.xenproject.org Link: http://lkml.kernel.org/r/20171208151139.30213-4-jgross@suse.com Signed-off-by: Ingo Molnar --- arch/x86/xen/enlighten_pvh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/xen/enlighten_pvh.c b/arch/x86/xen/enlighten_pvh.c index 436c4f0..6e6430c 100644 --- a/arch/x86/xen/enlighten_pvh.c +++ b/arch/x86/xen/enlighten_pvh.c @@ -69,7 +69,7 @@ static void __init init_pvh_bootparams(void) * Version 2.12 supports Xen entry point but we will use default x86/PC * environment (i.e. hardware_subarch 0). */ - pvh_bootparams.hdr.version = 0x212; + pvh_bootparams.hdr.version = (2 << 8) | 12; pvh_bootparams.hdr.type_of_loader = (9 << 4) | 0; /* Xen loader */ }