From patchwork Tue Dec 11 09:34:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1010933 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="M9njK5MM"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43DZhk01lwz9s8r for ; Tue, 11 Dec 2018 20:41:41 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id AC2E3C22130; Tue, 11 Dec 2018 09:37:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 1FC36C22817; Tue, 11 Dec 2018 09:31:32 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C8D27C2280E; Tue, 11 Dec 2018 09:30:31 +0000 (UTC) Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by lists.denx.de (Postfix) with ESMTPS id 0EF06C221A9 for ; Tue, 11 Dec 2018 09:30:27 +0000 (UTC) Received: by mail-pg1-f182.google.com with SMTP id n2so6375779pgm.3 for ; Tue, 11 Dec 2018 01:30:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=cyM5TPv6l35zbdXNYjjlZaNJCxWCZSNVOLpajzDImOU=; b=M9njK5MMAF5YQKs87k6IVUVR14wZsfjefZrLWJIW8JfMb2CfEYyCM7vjtmf4C/yUsb +bK+BcZltTmHSfpYYYleOeXxnfkBd/dGEuvjHPg9jfNqrkdFtJ3YQeH5eQzew8gayzA5 Zicblxp783MdxviWHu48Ej97Rd49wRGNJ6YCvYr3s3TFDe6xnWZtRQYfXm1A5OWHwDr2 oeb7Vx1OX9vc3bkhiLnGUb1Bt9slPGJqc57B64/N1yMwQKyvaRTH9BqDXhbqCpa7ROq3 kzpFlqtZDJ5yGCwCN5494dPvQbxJko6xyo23R53msc+YsKUonZwH8LMR2PiO1BhBSrel qKAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=cyM5TPv6l35zbdXNYjjlZaNJCxWCZSNVOLpajzDImOU=; b=M2DlU2B8mHt8ehwMhpKmSIhF7AAQnydhBj4Cqnrz5PCo2XXPgAwq/+86wQ4r64e2gQ yl6QAy90CjoBub4dyGGVRQdfvTuPDhRtcBVvy2AwyTcnFmFFV6kcv9w8AKAF4SZDrOnp 9y4u102c1lrvKiXPoGKNqzG2DMFEKshYgV95Db3YSARs7XORipj/H7GaZ6zBe4ViZoPR m0xUu/FIZSEpQY64HTZX57TTraCreg+rwJHnd4o/13/ngObcskWvBTIJyuD/KxnrmnOS O9BSF3DrSKflJpjPT1lZbxkRaLEs4yMZEcJLBsBxt59bmDqFqUr1m0gEsL91Wh397m1C CgUg== X-Gm-Message-State: AA+aEWbS4zWKSNrBY4B27O8RwslQ9la54J/CKdwGxfyjedJSX+gZqyCR zqGuQUrh6wb8cpgJ9bvEWHU= X-Google-Smtp-Source: AFSGD/XGByXm5yRqfB4m2hTuo3nxMorVofhApHfWmjYFMnkQYvMs9lkbdOMx3QK2fS0vYN0i4AOtig== X-Received: by 2002:a63:ed42:: with SMTP id m2mr13927926pgk.147.1544520625738; Tue, 11 Dec 2018 01:30:25 -0800 (PST) Received: from ala-d2121-lx1.wrs.com (unknown-156-139.windriver.com. [147.11.156.139]) by smtp.gmail.com with ESMTPSA id n66sm21916129pfk.19.2018.12.11.01.30.24 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 11 Dec 2018 01:30:25 -0800 (PST) From: Bin Meng To: Rick Chen , Simon Glass , Lukas Auer , Anup Patel , U-Boot Mailing List Date: Tue, 11 Dec 2018 01:34:56 -0800 Message-Id: <1544520901-31558-21-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1544520901-31558-1-git-send-email-bmeng.cn@gmail.com> References: <1544520901-31558-1-git-send-email-bmeng.cn@gmail.com> Subject: [U-Boot] [PATCH v3 20/25] riscv: Fix context restore before returning from trap handler X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" sp cannot be loaded before restoring other registers. Signed-off-by: Bin Meng Reviewed-by: Lukas Auer --- Changes in v3: None Changes in v2: None arch/riscv/cpu/mtrap.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/riscv/cpu/mtrap.S b/arch/riscv/cpu/mtrap.S index a5ad558..da307e4 100644 --- a/arch/riscv/cpu/mtrap.S +++ b/arch/riscv/cpu/mtrap.S @@ -77,7 +77,6 @@ trap_entry: #endif csrs MODE_PREFIX(status), t0 LREG x1, 1 * REGBYTES(sp) - LREG x2, 2 * REGBYTES(sp) LREG x3, 3 * REGBYTES(sp) LREG x4, 4 * REGBYTES(sp) LREG x5, 5 * REGBYTES(sp) @@ -107,5 +106,6 @@ trap_entry: LREG x29, 29 * REGBYTES(sp) LREG x30, 30 * REGBYTES(sp) LREG x31, 31 * REGBYTES(sp) + LREG x2, 2 * REGBYTES(sp) addi sp, sp, 32 * REGBYTES MODE_PREFIX(ret)