From patchwork Sun Apr 23 17:09:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 9695093 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1749160245 for ; Sun, 23 Apr 2017 17:17:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 03999228C9 for ; Sun, 23 Apr 2017 17:17:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E984C24B44; Sun, 23 Apr 2017 17:17:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 82D20228C9 for ; Sun, 23 Apr 2017 17:17:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=fI/y4ZZgzZ+K+J3xYaD16YbEIeDv0S/iTjBzeLp84II=; b=WzN4j6G2ugQIszOPx59RnTt1Rz utgbXQCBDf66mP43AEFVVXttc5iYL0pDgawzFPoJokiUlIjJatZaJG3iQJzGFgfkBmSvIzjdmYUT/ BtqOicEg7cUysuWEC1UaW1rBDbFMDFY0Wy6A2kKX9p6CxXUYN6vEJ99OPCVUyZFZ0tJqWxG/m60+S d8Z3Z2QSsZOETAhy5zqp2UfhLF+NPwuyMpoQsXGVaGRaerPVyoyRe1acIqeoALpL6Nq5aeecGdnQU Dg2eGmHyTQUWUrdjfOq7ZzXYNpDQ3HxpiN9jiXTQauqp7KkLbWO1Ii1Dl6PT0O1m+2xCTk95WE+iW lmzP1dUQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1d2L8O-00066U-LR; Sun, 23 Apr 2017 17:17:16 +0000 Received: from mail-wm0-x22e.google.com ([2a00:1450:400c:c09::22e]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1d2L24-0006L2-Bt for linux-arm-kernel@lists.infradead.org; Sun, 23 Apr 2017 17:10:53 +0000 Received: by mail-wm0-x22e.google.com with SMTP id r190so50453846wme.1 for ; Sun, 23 Apr 2017 10:10:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=bCsk6k+QsWQWZcEcqneBFP3ueCsuenVSXAaQ5U+JNV0=; b=RfooHY+6b5HBMVndL91HqIqvtZOiggUIOHy5/UzTn8TUX7+CnA/hhqRFbb6MtiwORv W9sJGUk1VJOU7lxUcz8J0qDLMm74sVV6F2nwC9zhCCtWmEo53LAiuFkPDEpeuiQBfMVz v/x+5hWTCrAdbBjRe1dqPfAIhgxyVs+8KnEjk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=bCsk6k+QsWQWZcEcqneBFP3ueCsuenVSXAaQ5U+JNV0=; b=asljHydzSNmPWgEe+3O6/AhSIk4BQiTjKdilV5fSUCbihyW6ejTpEY9pS6I40ehJxX NfO5yJRAsBsaehODMOdp6ho+NU1kLbXNiLvlKNnfSOi9ya9A6O9Z9ECtgZjciNS+tUO+ FvvSNInoFCa4rbPsETad39oC75z04eWL+9xRjRReCTUyQpGR6wQu6RBgX6LDW7kDE91k tjxEeMz/XESSZzH8Pc4DDfum0WQ4tA1v+YWLApQ0uSvldEKJSkYxjeYQxuRqHc2UgIis HVa9IalRZcmFHu9cDdKQRNGA1P3r+CdlMF91ZfftI9ihC9jG9eNbB8Iute7iDuyqooTs cA4w== X-Gm-Message-State: AN3rC/7Q8pXVm/R8cXHf35riqY9f4kARldprnbdo6HUFBM6qX2leZcFn mtb2fNuPlhDMTIfO X-Received: by 10.28.156.140 with SMTP id f134mr6312782wme.40.1492967424434; Sun, 23 Apr 2017 10:10:24 -0700 (PDT) Received: from localhost.localdomain (xd93ddc2d.cust.hiper.dk. [217.61.220.45]) by smtp.gmail.com with ESMTPSA id 58sm2803521edz.2.2017.04.23.10.10.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 23 Apr 2017 10:10:23 -0700 (PDT) From: Christoffer Dall To: Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= Subject: [PULL 50/79] ARM: Update cpu_v7_reset documentation Date: Sun, 23 Apr 2017 19:09:00 +0200 Message-Id: <20170423170929.27334-51-cdall@linaro.org> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170423170929.27334-1-cdall@linaro.org> References: <20170423170929.27334-1-cdall@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170423_101044_644076_0438BB66 X-CRM114-Status: GOOD ( 12.64 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marc Zyngier , Christoffer Dall , kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Marc Zyngier cpu_v7_reset() now takes a second parameter indicating whether we should reboot in HYP or not. Update the documentation to reflect this. Tested-by: Keerthy Acked-by: Russell King Acked-by: Catalin Marinas Signed-off-by: Marc Zyngier Signed-off-by: Christoffer Dall --- arch/arm/mm/proc-v7.S | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S index 1846ca4..01d64c0 100644 --- a/arch/arm/mm/proc-v7.S +++ b/arch/arm/mm/proc-v7.S @@ -39,13 +39,14 @@ ENTRY(cpu_v7_proc_fin) ENDPROC(cpu_v7_proc_fin) /* - * cpu_v7_reset(loc) + * cpu_v7_reset(loc, hyp) * * Perform a soft reset of the system. Put the CPU into the * same state as it would be if it had been reset, and branch * to what would be the reset vector. * * - loc - location to jump to for soft reset + * - hyp - indicate if restart occurs in HYP mode * * This code must be executed using a flat identity mapping with * caches disabled.