From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-4141267-1516891040-2-9610312757953187019 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, ME_NOAUTH 0.01, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org' X-Spam-charsets: X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1516891040; b=KU7yJ2Q8lO74HqGHCD8Anrs6gHaRCkrVeze8MIXaq9E3/bY reC5dD9nmN+cFbo3TfN1Lx39Ih+/9ffdD8DBP/8dvA4PZFPzGD2IicUIx23pafbM iEXCD1nXQgLWS9s1oK+YmwHunc/j83HbYeH3Lxw2uTay9QvictlGv1NCZroqOASY iv++ywKag5eNr/IciGq6f7a/X8nlEcdfOmljIC+3wvljrxPTBXwHB+5bQ4fkgU9b HMp0RFX28CRDz98mWX30iCj/1FyomFN/gmL/CJPKXuVNZOEgrDnmB4kPAQssfFMn PWILRmNwyMW4d1mqxLhGtfx5Sp2Srkh1jFO4R0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:sender:list-id; s=arctest; t=1516891040; bh=z5vKDfD6mPYl9awV2I+6wPD+8PVGbB14wZcPCjhsJbs=; b=hbO7tED72W9x E0DBtVT4lGvbl3rXjt91uM9Z+G4rV4OsDbXhQhqzf4i/rw4xzyaT5qDa0JsZFol3 TvAJeHB707MJu1tN1wlJsxCXOhUSzgVUVVDGOImbtcxcKZr+BsnttSfAf3lnCf/s RVv8OKlPZGqkqJx0BjIYHLOeCAA/i6bmi8lsSoCETotjCQ7edSqPM4p8K6f2cJt1 8nhiMSnmxRKwdiTRfoeF7XVHvJG/iohcIT4IythTz0Gt1tdYGHf48lP8NokNRxEe A4VAgu9jf1mGIW1aUk4th0qcul6J4AloJK+/0EbTxJAj0B8wxFexyFAiKg6Z3xEu jnRkeL9W7w== ARC-Authentication-Results: i=1; mx3.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=suse.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=suse.com header.result=pass header_is_org_domain=yes Authentication-Results: mx3.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=suse.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=suse.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751798AbeAYOgp (ORCPT ); Thu, 25 Jan 2018 09:36:45 -0500 Received: from mx2.suse.de ([195.135.220.15]:50083 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751265AbeAYOgo (ORCPT ); Thu, 25 Jan 2018 09:36:44 -0500 From: Juergen Gross To: linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, xen-devel@lists.xenproject.org Cc: lenb@kernel.org, rafael.j.wysocki@intel.com, mingo@redhat.com, boris.ostrovsky@oracle.com, Juergen Gross , stable@vger.kernel.org Subject: [PATCH v2 2/2] xen: add acpi_arch_get_root_pointer() for pvh guests Date: Thu, 25 Jan 2018 15:36:39 +0100 Message-Id: <20180125143639.9969-3-jgross@suse.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180125143639.9969-1-jgross@suse.com> References: <20180125143639.9969-1-jgross@suse.com> Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: Add acpi_arch_get_root_pointer() for Xen PVH guests to communicate the address of the RSDP table given to the kernel via Xen start info. This makes the kernel boot again in PVH mode after on recent Xen the RSDP was moved to higher addresses. So up to that change it was pure luck that the legacy method to locate the RSDP was working when running as PVH mode. Cc: # 4.11 Signed-off-by: Juergen Gross --- arch/x86/xen/enlighten_pvh.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/arch/x86/xen/enlighten_pvh.c b/arch/x86/xen/enlighten_pvh.c index 436c4f003e17..f08fd43f2aa2 100644 --- a/arch/x86/xen/enlighten_pvh.c +++ b/arch/x86/xen/enlighten_pvh.c @@ -16,15 +16,23 @@ /* * PVH variables. * - * xen_pvh and pvh_bootparams need to live in data segment since they - * are used after startup_{32|64}, which clear .bss, are invoked. + * xen_pvh, pvh_bootparams and pvh_start_info need to live in data segment + * since they are used after startup_{32|64}, which clear .bss, are invoked. */ bool xen_pvh __attribute__((section(".data"))) = 0; struct boot_params pvh_bootparams __attribute__((section(".data"))); +struct hvm_start_info pvh_start_info __attribute__((section(".data"))); -struct hvm_start_info pvh_start_info; unsigned int pvh_start_info_sz = sizeof(pvh_start_info); +acpi_physical_address acpi_arch_get_root_pointer(void) +{ + if (xen_pvh) + return pvh_start_info.rsdp_paddr; + + return 0; +} + static void __init init_pvh_bootparams(void) { struct xen_memory_map memmap; -- 2.13.6