From patchwork Thu Apr 19 14:08:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasilis Liaskovitis X-Patchwork-Id: 153783 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id DBF58B6FAA for ; Fri, 20 Apr 2012 00:29:19 +1000 (EST) Received: from localhost ([::1]:36874 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKs4s-0001zw-QJ for incoming@patchwork.ozlabs.org; Thu, 19 Apr 2012 10:11:18 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37567) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKs3o-0008Jd-8x for qemu-devel@nongnu.org; Thu, 19 Apr 2012 10:10:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SKs3j-0006FJ-VA for qemu-devel@nongnu.org; Thu, 19 Apr 2012 10:10:11 -0400 Received: from mail-bk0-f45.google.com ([209.85.214.45]:55442) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKs3j-0005mG-P0 for qemu-devel@nongnu.org; Thu, 19 Apr 2012 10:10:07 -0400 Received: by mail-bk0-f45.google.com with SMTP id ji1so416382bkc.4 for ; Thu, 19 Apr 2012 07:10:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=oHlCgSFDeTXS6cmp+930/M7HqNLNHmEc+XcJBYN3aGQ=; b=EcdpYvEiHhoj0/qvJ68MLMabAabyA6ziAiq6AI5oAVlSOM4SEjhxy5Xl/ccTf22NqB BMkN7LbQAZ6DiY6X3UbdRZDcN42M/nCAax1bsNeDB2equ/8q5PiLNDX0gB7hhk/R1WWk WK//+RzBr7+FJhJqp6ABBFrPtxvmecAOfRhaR2wigBYPyxu/kxVnecVKIc++cym4VhB5 F2RQpnmUOgXls5AnxLrGXzqHLPJQCKVdFF6pI2svFPLiLDVprp1Hpyb6jS1+o+lfWhYa rkYmZ87uo84yC8AVyT1kG6jSLgSbl82aNRDHDTXN5humMN71PwSLpSGpi+/FSceSqRY/ i4xw== Received: by 10.204.128.75 with SMTP id j11mr653577bks.2.1334844606816; Thu, 19 Apr 2012 07:10:06 -0700 (PDT) Received: from dhcp-192-168-178-175.ri.profitbricks.localdomain ([62.217.45.26]) by mx.google.com with ESMTPS id gu12sm4434954bkc.1.2012.04.19.07.10.06 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 19 Apr 2012 07:10:06 -0700 (PDT) From: Vasilis Liaskovitis To: qemu-devel@nongnu.org, kvm@vger.kernel.org, seabios@seabios.org Date: Thu, 19 Apr 2012 16:08:47 +0200 Message-Id: <1334844527-18869-10-git-send-email-vasilis.liaskovitis@profitbricks.com> X-Mailer: git-send-email 1.7.9 In-Reply-To: <1334844527-18869-1-git-send-email-vasilis.liaskovitis@profitbricks.com> References: <1334844527-18869-1-git-send-email-vasilis.liaskovitis@profitbricks.com> X-Gm-Message-State: ALoCoQl2v9SznohiKR+YRaMzrScIeu25gDlXjAdcgq4hKOFmzW3TbcBqz4dOPdtwCIV4yFbzmiOE X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.214.45 Cc: Vasilis Liaskovitis , avi@redhat.com, gleb@redhat.com Subject: [Qemu-devel] [RFC PATCH 9/9][SeaBIOS] enable memory devices if e820 entry is present X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org On a reboot, seabios regenerates srat/ssdt objects. If a valid e820 entry is found spanning the whole address range of a hotplug memory device, the device will be enabled. This ensures persistency of hotplugged memory slots across VM reboots. Signed-off-by: Vasilis Liaskovitis --- src/acpi.c | 6 +++++- src/memmap.c | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 1 deletions(-) diff --git a/src/acpi.c b/src/acpi.c index 5580099..2ebed2e 100644 --- a/src/acpi.c +++ b/src/acpi.c @@ -601,7 +601,11 @@ build_memssdt(void) for (i = 0; i < nb_memdevs; i++) { mem_base = (((u64)(entry->base_addr_high) << 32 )| entry->base_addr_low); mem_len = (((u64)(entry->length_high) << 32 )| entry->length_low); - *(ssdt_ptr++) = 0x00; + if (find_e820(mem_base, mem_len, E820_RAM)) { + *(ssdt_ptr++) = 0x01; + } + else + *(ssdt_ptr++) = 0x00; entry++; } build_header((void*)ssdt, SSDT_SIGNATURE, ssdt_ptr - ssdt, 1); diff --git a/src/memmap.c b/src/memmap.c index 56865b4..9790da1 100644 --- a/src/memmap.c +++ b/src/memmap.c @@ -131,6 +131,21 @@ add_e820(u64 start, u64 size, u32 type) //dump_map(); } +// Check if an e820 entry exists that covers the memory range +// [start, start+size) with same type as type. +int +find_e820(u64 start, u64 size, u32 type) +{ + int i; + for (i=0; istart <= start) && (e->size >= (size + start - e->start)) && + (e->type == type)) + return 1; + } + return 0; +} + // Report on final memory locations. void memmap_finalize(void)