From patchwork Fri Nov 15 15:27:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 21542 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f70.google.com (mail-yh0-f70.google.com [209.85.213.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D7C3123FBA for ; Fri, 15 Nov 2013 15:28:03 +0000 (UTC) Received: by mail-yh0-f70.google.com with SMTP id c41sf6751446yho.1 for ; Fri, 15 Nov 2013 07:28:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=x/hLE4pDuFnvoJypp5ltv8hnFQ4rf9SFZ2HK+npO0nk=; b=dRvveYRbKSfZf8FtD1l8KcPVu69y6UB0VZF7krgtpXXzDIYDesD0pedIo1WYedP6Tk PlUbDDCBu778XImE2nA//Wv/qylsyAcXt9L/jhBeRg/gu18ai1Ax/0QGWqB3OTfB4Aht knaMMJEo958zoLMwkIWAR2uTipdKmwt7xkBIPr+K7P3gk/k3OpePlgHEzSK3m/JjEZV1 aWLyzAM/rL3a4UTnj40dQgesWowt2tWH9iTRtw0pUK5ZIMdHferVSGeUho7ZCr85eHlM pIey4pzYrhlT4zLq8C/E2sr8SCLyv1ggv+TfPj1EA3fQF2Wo/EVJZCqeQrtKhm71cgDF bR6Q== X-Gm-Message-State: ALoCoQmCLLsvDEW2DyTUaCYba3nJuN4TfSfb0uUyInLzG88gGr7sS4glFiUPyWokcY77abvK6zwX X-Received: by 10.58.188.113 with SMTP id fz17mr2980302vec.26.1384529283363; Fri, 15 Nov 2013 07:28:03 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.85.198 with SMTP id j6ls1447100qez.6.gmail; Fri, 15 Nov 2013 07:28:03 -0800 (PST) X-Received: by 10.52.166.200 with SMTP id zi8mr144761vdb.38.1384529283261; Fri, 15 Nov 2013 07:28:03 -0800 (PST) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by mx.google.com with ESMTPS id f14si1741644veh.100.2013.11.15.07.28.03 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 15 Nov 2013 07:28:03 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.169; Received: by mail-vc0-f169.google.com with SMTP id hu8so1901911vcb.28 for ; Fri, 15 Nov 2013 07:28:03 -0800 (PST) X-Received: by 10.58.241.135 with SMTP id wi7mr49216vec.70.1384529282995; Fri, 15 Nov 2013 07:28:02 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp36963vcz; Fri, 15 Nov 2013 07:28:02 -0800 (PST) X-Received: by 10.180.89.98 with SMTP id bn2mr7725952wib.63.1384529281852; Fri, 15 Nov 2013 07:28:01 -0800 (PST) Received: from mail-wg0-f51.google.com (mail-wg0-f51.google.com [74.125.82.51]) by mx.google.com with ESMTPS id gi5si1416305wjd.171.2013.11.15.07.28.01 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 15 Nov 2013 07:28:01 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.51 is neither permitted nor denied by best guess record for domain of julien.grall@linaro.org) client-ip=74.125.82.51; Received: by mail-wg0-f51.google.com with SMTP id m15so3605004wgh.6 for ; Fri, 15 Nov 2013 07:28:01 -0800 (PST) X-Received: by 10.180.189.132 with SMTP id gi4mr7830438wic.19.1384529281420; Fri, 15 Nov 2013 07:28:01 -0800 (PST) Received: from localhost.localdomain ([80.215.132.217]) by mx.google.com with ESMTPSA id uc12sm6079087wib.3.2013.11.15.07.27.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Nov 2013 07:28:00 -0800 (PST) From: Julien Grall To: xen-devel@lists.xenproject.org Cc: ian.campbell@citrix.com, tim@xen.org, patches@linaro.org, stefano.stabellini@eu.citrix.com, Julien Grall Subject: [PATCH] xen/arm: Panic if platform initialization failed Date: Fri, 15 Nov 2013 15:27:36 +0000 Message-Id: <1384529257-7590-2-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1384529257-7590-1-git-send-email-julien.grall@linaro.org> References: <1384529257-7590-1-git-send-email-julien.grall@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: julien.grall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Actually, if an error occurs, Xen will silently ignore it and continue. Convert platform_init to a void function and panic if we fail to correctly initialize the platform. Signed-off-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell --- xen/arch/arm/platform.c | 5 +++-- xen/include/asm-arm/platform.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/platform.c b/xen/arch/arm/platform.c index db135f8..0fbbdc7 100644 --- a/xen/arch/arm/platform.c +++ b/xen/arch/arm/platform.c @@ -54,7 +54,7 @@ static void dump_platform_table(void) printk(" - %s\n", p->name); } -int __init platform_init(void) +void __init platform_init(void) { int res = 0; @@ -82,7 +82,8 @@ int __init platform_init(void) if ( platform && platform->init ) res = platform->init(); - return res; + if ( res ) + panic("Unable to initialize the platform\n"); } int __init platform_init_time(void) diff --git a/xen/include/asm-arm/platform.h b/xen/include/asm-arm/platform.h index 43afebb..c282b30 100644 --- a/xen/include/asm-arm/platform.h +++ b/xen/include/asm-arm/platform.h @@ -45,7 +45,7 @@ struct platform_desc { */ #define PLATFORM_QUIRK_DOM0_MAPPING_11 (1 << 0) -int __init platform_init(void); +void __init platform_init(void); int __init platform_init_time(void); int __init platform_specific_mapping(struct domain *d); #ifdef CONFIG_ARM_32