From patchwork Fri Jun 6 12:15:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 31483 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ig0-f200.google.com (mail-ig0-f200.google.com [209.85.213.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 293FB203C3 for ; Fri, 6 Jun 2014 12:17:45 +0000 (UTC) Received: by mail-ig0-f200.google.com with SMTP id l13sf2405407iga.3 for ; Fri, 06 Jun 2014 05:17:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:cc:subject :precedence:list-id:list-unsubscribe:list-post:list-help :list-subscribe:mime-version:sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list:list-archive :content-type:content-transfer-encoding; bh=tp6TMc0GJQT8+/kpZNAktpFFXAvvppbH5GmHesOH7G8=; b=ZMVIcTG/CmLlU8Zhl1VN73IvaxBWQfZcz01FqWVGyVZwhfXSf+EG1B8dcHV05Cl7rD JiEXSV9CCTg8rXn71go2ScyfhexrzE38MjIj0glBtySM+OFCNPM3BRvAHVo86avZTZRY fHL5TuA4+ZGc7O+ubeHlDKK4Cjq0JN3JxCtZJLmuC8vS1HWW21CoMtORdGutHh4E06o6 g+Vk1YC/BPKWM86YWDxuw0sT+qOPZeA3Sl3d0PZ0DhhNiS7DRbJrx8auPDDKe4R6o1at qsc//nC2uqemHyMF5pueway1aSWrisPU+WcjTJxTfOy3zFUj6IFpn33MP7tA9ROq3fLV YyOg== X-Gm-Message-State: ALoCoQlxK2hKMjts2X9DT3mUViWzhxvBfXrJjvCEKg6XtvQgw3P6ggtRpclF5kv9/g6dHyBN9l/i X-Received: by 10.43.173.71 with SMTP id ob7mr2671476icc.19.1402057065504; Fri, 06 Jun 2014 05:17:45 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.90.48 with SMTP id w45ls608554qgd.73.gmail; Fri, 06 Jun 2014 05:17:45 -0700 (PDT) X-Received: by 10.58.74.38 with SMTP id q6mr4535961vev.7.1402057065362; Fri, 06 Jun 2014 05:17:45 -0700 (PDT) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by mx.google.com with ESMTPS id b4si6080649vdf.59.2014.06.06.05.17.45 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 06 Jun 2014 05:17:45 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.173 as permitted sender) client-ip=209.85.220.173; Received: by mail-vc0-f173.google.com with SMTP id ik5so2849274vcb.32 for ; Fri, 06 Jun 2014 05:17:45 -0700 (PDT) X-Received: by 10.52.145.114 with SMTP id st18mr2754777vdb.8.1402057065286; Fri, 06 Jun 2014 05:17:45 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.54.6 with SMTP id vs6csp95067vcb; Fri, 6 Jun 2014 05:17:45 -0700 (PDT) X-Received: by 10.52.139.101 with SMTP id qx5mr3859849vdb.17.1402057064930; Fri, 06 Jun 2014 05:17:44 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id ce2si6077535vdc.67.2014.06.06.05.17.44 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 06 Jun 2014 05:17:44 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Wst3s-0002t1-Fm; Fri, 06 Jun 2014 12:15:56 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Wst3q-0002sp-JL for xen-devel@lists.xen.org; Fri, 06 Jun 2014 12:15:54 +0000 Received: from [193.109.254.147:7920] by server-11.bemta-14.messagelabs.com id 86/F5-09902-9F0B1935; Fri, 06 Jun 2014 12:15:53 +0000 X-Env-Sender: ian.campbell@citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1402056953!9625579!1 X-Originating-IP: [212.110.190.137] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3788 invoked from network); 6 Jun 2014 12:15:53 -0000 Received: from benson.vm.bytemark.co.uk (HELO benson.vm.bytemark.co.uk) (212.110.190.137) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 6 Jun 2014 12:15:53 -0000 Received: from [185.25.64.249] (helo=hastur.hellion.org.uk) by benson.vm.bytemark.co.uk with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1Wst3m-0006Vr-Mv; Fri, 06 Jun 2014 13:15:51 +0100 Received: by hastur.hellion.org.uk (sSMTP sendmail emulation); Fri, 06 Jun 2014 13:15:50 +0100 From: Ian Campbell To: xen-devel@lists.xen.org Date: Fri, 6 Jun 2014 13:15:49 +0100 Message-Id: <1402056950-9732-1-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.9.0 Cc: Ian Campbell , stefano.stabellini@eu.citrix.com, julien.grall@linaro.org, tim@xen.org, linaro-uefi@lists.linaro.org, Fu Wei Subject: [Xen-devel] [PATCH 1/2] xen: arm: implement generic multiboot compatibility strings X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ian.campbell@citrix.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.173 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: This causes Xen to accept the more generic names specified in http://wiki.xen.org/wiki/Xen_ARM_with_Virtualization_Extensions/Multiboot as of 2014-06-06. These names are more generic than those proposed by Andre in http://thread.gmane.org/gmane.linux.linaro.announce.boot/326 and those used in earlier drafts of the /Multiboot wiki page. This will allow bootloaders to not special case Xen (or at least to reduce the amount which is required). Signed-off-by: Ian Campbell Acked-by: Julien Grall --- v2: Use multiboot,{kernel,ramdisk,module} --- xen/common/device_tree.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index f0b17a3..48ae849 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -338,9 +338,11 @@ static void __init process_multiboot_node(const void *fdt, int node, struct dt_mb_module *mod; int len; - if ( fdt_node_check_compatible(fdt, node, "xen,linux-zimage") == 0 ) + if ( fdt_node_check_compatible(fdt, node, "xen,linux-zimage") == 0 || + fdt_node_check_compatible(fdt, node, "multiboot,kernel") == 0 ) nr = MOD_KERNEL; - else if ( fdt_node_check_compatible(fdt, node, "xen,linux-initrd") == 0) + else if ( fdt_node_check_compatible(fdt, node, "xen,linux-initrd") == 0 || + fdt_node_check_compatible(fdt, node, "multiboot,ramdisk") == 0 ) nr = MOD_INITRD; else if ( fdt_node_check_compatible(fdt, node, "xen,xsm-policy") == 0 ) nr = MOD_XSM; @@ -433,7 +435,8 @@ static int __init early_scan_node(const void *fdt, { if ( device_tree_node_matches(fdt, node, "memory") ) process_memory_node(fdt, node, name, address_cells, size_cells); - else if ( device_tree_node_compatible(fdt, node, "xen,multiboot-module" ) ) + else if ( device_tree_node_compatible(fdt, node, "xen,multiboot-module" ) || + device_tree_node_compatible(fdt, node, "multiboot,module" )) process_multiboot_node(fdt, node, name, address_cells, size_cells); else if ( depth == 1 && device_tree_node_matches(fdt, node, "chosen") ) process_chosen_node(fdt, node, name, address_cells, size_cells);