From patchwork Mon Apr 25 16:38:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 8930641 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C9337BF29F for ; Mon, 25 Apr 2016 16:40:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 01381201BB for ; Mon, 25 Apr 2016 16:40:58 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1B17020138 for ; Mon, 25 Apr 2016 16:40:57 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1aujXN-00085y-Uj; Mon, 25 Apr 2016 16:39:05 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1aujXN-00085r-E7 for xen-devel@lists.xensource.com; Mon, 25 Apr 2016 16:39:05 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 16/CA-03753-8284E175; Mon, 25 Apr 2016 16:39:04 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupnkeJIrShJLcpLzFFi42JxWrrBXlfDQy7 c4M0UJot7U96zOzB6bO/bxR7AGMWamZeUX5HAmtF5oJW94JZwxfP5yQ2M6wW6GDk5JAT8Jfr/ TWMGsdkEdCWatvxlA7FFBJQljjd9Ye1i5OJgFtjDKLH0/T4mkIQwUMPiravBGlgEVCVOtuwEs 3kFPCWe7pvCCjFUUaL72QSwQZwCjhLv29+AxYUEHCQ+HHzG2MXIAWSrScxdHw/RKihxcuYTFh CbWUBC4uCLF8wgJRIC3BJ/u+0nMPLNQlI1C0nVAkamVYwaxalFZalFuobGeklFmekZJbmJmTm 6hoYmermpxcWJ6ak5iUnFesn5uZsYgQFVz8DAuINx13bPQ4ySHExKorySCnLhQnxJ+SmVGYnF GfFFpTmpxYcYZTg4lCR4m9yAcoJFqempFWmZOcDQhklLcPAoifBeAEnzFhck5hZnpkOkTjEqS onz1oEkBEASGaV5cG2weLrEKCslzMvIwMAgxFOQWpSbWYIq/4pRnINRSRhiO09mXgnc9FdAi5 mAFl8+JAuyuCQRISXVwLigaZ72Ro6nd5fPldNd9vzpnQa152kFTT/mZ3hrr3gmLhieVfuEl/n on7qHCo8W7l5ZmuX9IWUxe7BF6drI2OvuHqn6ZaunfBPLnBF1c9k7Hf8bvjn/Z5fc8WRYNOOo nLh73+U23nVXzN0/s54sZDv2z6N332XzNSyCD8Xyk882pu+d/PKsqpcSS3FGoqEWc1FxIgBwz bi8ogIAAA== X-Env-Sender: prvs=916cd6ff0=Ian.Jackson@citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1461602342!37673605!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.34; banners=-,-,- X-VirusChecked: Checked Received: (qmail 59970 invoked from network); 25 Apr 2016 16:39:03 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-15.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 25 Apr 2016 16:39:03 -0000 X-IronPort-AV: E=Sophos;i="5.24,533,1454976000"; d="scan'208";a="356269815" From: Ian Jackson To: Date: Mon, 25 Apr 2016 17:38:57 +0100 Message-ID: <1461602337-29568-1-git-send-email-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <22302.18281.770565.399474@mariner.uk.xensource.com> References: <22302.18281.770565.399474@mariner.uk.xensource.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Ian Jackson , Julien Grall , Stefano Stabellini , Wei Liu , Fu Wei Subject: [Xen-devel] [PATCH v2] docs/arm64: clarify the documention for loading XSM support X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Fu Wei Improve the clarity of the wording introduced in 67831c4c "docs/arm64: update the documentation for loading XSM support" Signed-off-by: Ian Jackson CC: Fu Wei CC: Julien Grall CC: Stefano Stabellini Reviewed-by: Julien Grall --- v2: Tabify (to conform to the rest of the file) --- docs/misc/arm/device-tree/booting.txt | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index cae46eda..ce2d0dc 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -26,19 +26,24 @@ Each node contains the following properties: Xen will assume that the first module which lacks a more specific compatible string is a "multiboot,kernel". - Xen will check all the modules for the XSM Magic from the second - module that lacks a specific compatible string. According to the - result of the detection: - - if it's an XSM, Xen will assume its compatible string is + Xen will examine each module, starting from the second + module that lacks a specific compatible string. Xen will + check each such module for the XSM Magic number: + + - For a module which has the XSM Magic number: it will be + treated by Xen as if its compatible string was "xen,xsm-policy"; - - if it's not an XSM, for the second module that lacks a specific - compatible string, Xen will assume its compatible string is - "multiboot,ramdisk"; the third and subsequent modules that - lack a specific compatible string will not receive any special - treatment. - This means that if the ramdisk module is present and does not have - the compatible string "multiboot,ramdisk", then it must always be - the second module. + + - For a module which does not have the XSM Magic: the second + module lacking a compatible string will be treated by Xen as + if its compatible string was "multiboot,ramdisk"; for the + third and subsequent modules which lack a specific + compatible string, Xen will not apply any special treatment. + + This means if the ramdisk module is present and does not have the + compatible string "multiboot,ramdisk", then it must always be the + second module. + Note: This XSM Magic detection behavior was introduced by Xen 4.7. Xen 4.6 (and downwards) still requires the XSM module to have the compatible string "xen,xsm-policy".