From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3635110-1516874747-2-894485763833610091 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=1516874746; b=OIbgGPSmcxhyyJECiLOD+XhNIULgL/BMD4N9cEEJgljwr3l niceA7KoiOCY2QzMHJqPMJ0fUt/kh5A/3sTmlKhVhqSEbwO1IJNKGAc1CFBbtmUl q7sHXJ8wSS4p0Il18qYgkQ0uYcpofz+N0Bmxx0mzQ6qOHt1B3IQ3ucMJjjvwLn5W KKP/lXIJlnWSG6KtqOyfVc2ITX6PEKUKl4GZaUloOK7+tv9tZX//dql7Zyd+wtkH mocc0vD1sGsCcKmZ+XeVnJlEQmBCGs94MrvdPKP3C4drUMFSHAfgpFTu4aT9YGOS iW0OrX0Aed1UvzvxqqhTQRLuSm0xw4VccMoTcRA== 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=1516874746; bh=NOf6dGGRrguflXsGOlhTK2oSDdpquZWYRUNEKRjHeyQ=; b=DAS4Rz0ufvxR rFvmR9bCYZC3jK1dsx+dD9F1wseQTodAjGxqkCNZ7LhzTkgcIi5l/uodT2LiLlX4 tWeJc6v30VCkCPwBMxWE7j4HJzeT5NBkam/iKua6jrBWau+i7FMqpCz7F+ziZJXg WmNDaMiyT29HpKYnbNbbmGlqf+9du/UeU1LYMag7LhT7MmNR88/KbiZfM5EsBAid yyfuWnJ7as5AsdMSc4kVufpAtOT4vDvfiEjQFemu/iEGJMP6OCcdPwJiCsnHRN3u /sksNTnUER7pH91F4fXsReuLa8pRMjKLiGQdf5e9idbfe4rAQY5sSdOVUJcMtaiS ULMR2JKF3w== ARC-Authentication-Results: i=1; mx5.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: mx5.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 S1751349AbeAYKFp (ORCPT ); Thu, 25 Jan 2018 05:05:45 -0500 Received: from mx2.suse.de ([195.135.220.15]:56554 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751353AbeAYKFR (ORCPT ); Thu, 25 Jan 2018 05:05:17 -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 2/2] xen: add acpi_arch_get_root_pointer() for pvh guests Date: Thu, 25 Jan 2018 11:04:54 +0100 Message-Id: <20180125100454.23203-3-jgross@suse.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180125100454.23203-1-jgross@suse.com> References: <20180125100454.23203-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 | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/arch/x86/xen/enlighten_pvh.c b/arch/x86/xen/enlighten_pvh.c index 436c4f003e17..9a5c3a7fe673 100644 --- a/arch/x86/xen/enlighten_pvh.c +++ b/arch/x86/xen/enlighten_pvh.c @@ -16,15 +16,24 @@ /* * 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; +} +EXPORT_SYMBOL_GPL(acpi_arch_get_root_pointer); + static void __init init_pvh_bootparams(void) { struct xen_memory_map memmap; -- 2.13.6