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: 9694999 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 F36FD60245 for ; Sun, 23 Apr 2017 17:12:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DD22F20564 for ; Sun, 23 Apr 2017 17:12:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D2023212BE; Sun, 23 Apr 2017 17:12:15 +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=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7DEC120564 for ; Sun, 23 Apr 2017 17:12:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1163297AbdDWRMN (ORCPT ); Sun, 23 Apr 2017 13:12:13 -0400 Received: from mail-wm0-f41.google.com ([74.125.82.41]:36877 "EHLO mail-wm0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1162768AbdDWRK0 (ORCPT ); Sun, 23 Apr 2017 13:10:26 -0400 Received: by mail-wm0-f41.google.com with SMTP id m123so50340826wma.0 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=gQYRyHNf/lWAKihdt2yzKBQLiA382Kpngr13Uxh5pLKa+Hni6nGn7hI+Nhr/y64RyU L1JSNS0zZDPrhk11hRYnvJHwnbfMlmNmqTsH2rjNIiZywc+z32x+1yK0vi9Xjuth/50c WxDhiTyUfdxof8hVYIXd17Oa/Ggl900m49LqXgTYH61DoVohxgyeR03Q1UjBH5YsOyA1 Qu60H1ErqFzteDkWzVB2bx4Gwq9+91fuoXeXlrZVSKUQPPpiwOcSQ0XPp8QLTlSxmiBA kFtIeBHRPGJWe2+8qprtXQJQBCqdpXjcn2pwYRm+6wtgPWyRXrSHxmN7gibaBkhqwaFr /ZVw== X-Gm-Message-State: AN3rC/4oikHHVBrUaHSKUFZPkEs1iUbDr/MfqoSg5rBRpNygvXcs1wrs Igr+coibF7kkoLJN 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?= Cc: Marc Zyngier , kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Christoffer Dall 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> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.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.