From: Juergen Gross <jgross@suse.com>
To: linux-kernel@vger.kernel.org, xen-devel@lists.xenproject.org,
x86@kernel.org
Cc: boris.ostrovsky@oracle.com, hpa@zytor.com, tglx@linutronix.de,
mingo@redhat.com, corbet@lwn.net, rjw@rjwysocki.net,
lenb@kernel.org, linux-acpi@vger.kernel.org,
Juergen Gross <jgross@suse.com>,
stable@vger.kernel.org
Subject: [PATCH v3 3/4] x86/xen: fix boot loader version reported for pvh guests
Date: Fri, 8 Dec 2017 16:11:38 +0100 [thread overview]
Message-ID: <20171208151139.30213-4-jgross@suse.com> (raw)
In-Reply-To: <20171208151139.30213-1-jgross@suse.com>
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.
Cc: <stable@vger.kernel.org> # 4.12
Signed-off-by: Juergen Gross <jgross@suse.com>
---
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 436c4f003e17..6e6430cb5e3f 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 */
}
--
2.12.3
next prev parent reply other threads:[~2017-12-08 15:12 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-08 15:11 [PATCH v3 0/4] x86: make rsdp address accessible via boot params Juergen Gross
2017-12-08 15:11 ` [PATCH v3 1/4] x86/boot: add acpi rsdp address to setup_header Juergen Gross
2017-12-12 10:53 ` [tip:x86/boot] x86/boot: Add the ACPI RSDP address to struct setup_header::acpi_rdsp_addr tip-bot for Juergen Gross
2017-12-08 15:11 ` [PATCH v3 2/4] x86/acpi: take rsdp address for boot params if available Juergen Gross
2017-12-12 10:54 ` [tip:x86/boot] x86/acpi: Take the RSDP address for boot parameters " tip-bot for Juergen Gross
2017-12-08 15:11 ` Juergen Gross [this message]
2017-12-12 10:54 ` [tip:x86/boot] x86/xen: Fix the boot loader version reported for PVH guests tip-bot for Juergen Gross
2017-12-08 15:11 ` [PATCH v3 4/4] x86/xen: supply rsdp address in boot params for pvh guests Juergen Gross
2017-12-11 10:09 ` [Xen-devel] " Jan Beulich
[not found] ` <5A2E674C0200007800196522@suse.com>
2017-12-11 10:51 ` Juergen Gross
2017-12-11 14:14 ` Ingo Molnar
2017-12-12 10:55 ` [tip:x86/boot] x86/xen: Supply RSDP address in boot params for PVH guests tip-bot for Juergen Gross
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171208151139.30213-4-jgross@suse.com \
--to=jgross@suse.com \
--cc=boris.ostrovsky@oracle.com \
--cc=corbet@lwn.net \
--cc=hpa@zytor.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=rjw@rjwysocki.net \
--cc=stable@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®