From patchwork Wed Nov 5 07:12:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aravinda Prasad X-Patchwork-Id: 406884 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 78F9D140098 for ; Wed, 5 Nov 2014 18:13:48 +1100 (AEDT) Received: from localhost ([::1]:44748 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xlumo-0008Jz-I7 for incoming@patchwork.ozlabs.org; Wed, 05 Nov 2014 02:13:46 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53926) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xlum5-0006zi-FX for qemu-devel@nongnu.org; Wed, 05 Nov 2014 02:13:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xlulu-0001OL-Q4 for qemu-devel@nongnu.org; Wed, 05 Nov 2014 02:13:01 -0500 Received: from e9.ny.us.ibm.com ([32.97.182.139]:58280) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xlulu-0001O2-Ix for qemu-devel@nongnu.org; Wed, 05 Nov 2014 02:12:50 -0500 Received: from /spool/local by e9.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 5 Nov 2014 02:12:49 -0500 Received: from d01dlp03.pok.ibm.com (9.56.250.168) by e9.ny.us.ibm.com (192.168.1.109) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 5 Nov 2014 02:12:46 -0500 Received: from b01cxnp22033.gho.pok.ibm.com (b01cxnp22033.gho.pok.ibm.com [9.57.198.23]) by d01dlp03.pok.ibm.com (Postfix) with ESMTP id 6BEE5C90043; Wed, 5 Nov 2014 02:04:50 -0500 (EST) Received: from d01av03.pok.ibm.com (d01av03.pok.ibm.com [9.56.224.217]) by b01cxnp22033.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id sA57CjT422413390; Wed, 5 Nov 2014 07:12:45 GMT Received: from d01av03.pok.ibm.com (localhost [127.0.0.1]) by d01av03.pok.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id sA57CjOp027149; Wed, 5 Nov 2014 02:12:45 -0500 Received: from [127.0.1.1] (aravindap.in.ibm.com [9.124.35.157]) by d01av03.pok.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id sA57Cbhb026523; Wed, 5 Nov 2014 02:12:43 -0500 To: aik@au1.ibm.com, qemu-ppc@nongnu.org, qemu-devel@nongnu.org From: Aravinda Prasad Date: Wed, 05 Nov 2014 12:42:35 +0530 Message-ID: <20141105071235.26196.28398.stgit@aravindap> In-Reply-To: <20141105071019.26196.93729.stgit@aravindap> References: <20141105071019.26196.93729.stgit@aravindap> User-Agent: StGit/0.15 MIME-Version: 1.0 X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14110507-0033-0000-0000-000000F4A8AB X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 32.97.182.139 Cc: benh@au1.ibm.com, paulus@samba.org Subject: [Qemu-devel] [PATCH v3 1/4] target-ppc: Extend rtas-blob 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 Extend rtas-blob to accommodate error log. Error log structure is saved in rtas space upon a machine check exception. Signed-off-by: Aravinda Prasad --- hw/ppc/spapr.c | 7 +++++++ include/hw/ppc/spapr.h | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 30de25d..38e26af 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1431,6 +1431,13 @@ static void ppc_spapr_init(MachineState *machine) filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, "spapr-rtas.bin"); spapr->rtas_size = get_image_size(filename); + + /* + * Resize blob to accommodate error log. The layout of the rtas + * blob is defined in include/hw/ppc/spapr.h + */ + spapr->rtas_size = TARGET_PAGE_ALIGN(spapr->rtas_size); + spapr->rtas_blob = g_malloc(spapr->rtas_size); if (load_image_size(filename, spapr->rtas_blob, spapr->rtas_size) < 0) { hw_error("qemu: could not load LPAR rtas '%s'\n", filename); diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 749daf4..d08fcc2 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -480,4 +480,9 @@ int spapr_dma_dt(void *fdt, int node_off, const char *propname, int spapr_tcet_dma_dt(void *fdt, int node_off, const char *propname, sPAPRTCETable *tcet); +/* RTAS Blob layout in memory */ +#define RTAS_ENTRY_OFFSET 0 +#define RTAS_TRAMPOLINE_OFFSET 0x200 +#define RTAS_ERRLOG_OFFSET 0x800 + #endif /* !defined (__HW_SPAPR_H__) */