From patchwork Fri Dec 7 14:14:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1009487 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="fPHqWiHz"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43BF9R6jbJz9s0t for ; Sat, 8 Dec 2018 01:24:59 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 9591EC22762; Fri, 7 Dec 2018 14:13:27 +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_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 B32A0C22766; Fri, 7 Dec 2018 14:10:36 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 06574C2274A; Fri, 7 Dec 2018 14:10:02 +0000 (UTC) Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by lists.denx.de (Postfix) with ESMTPS id 20A21C2271C for ; Fri, 7 Dec 2018 14:09:56 +0000 (UTC) Received: by mail-pl1-f196.google.com with SMTP id u6so1892893plm.8 for ; Fri, 07 Dec 2018 06:09:56 -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=eKrR3kA+WNA2HGXJcyLHteR7sOVmXSLMUlzCqGYjyfE=; b=fPHqWiHz7+D5R/5WSVEXiYoj/jbIpFrQ6agUvbOiJe57DA1EB1dTIBPMrEccd7d7rK hfqmddbj9Hcth2mIeKQp6syDDJCDCLmAQkTiSSGVkBymjp9L+RjwlsWN1EXkf16tQjCr j+iH4xMLEMQ5L2J8r7RJdbdwyuhA5vyrOPvnYVc2YoWPnLpqBq7aCijT+4/6z3Hw0yLZ sJXTCkkmyj6BIrcovOEQSyRUYoG4jSjStNElFsYfNh2bKEwiM/a/9sukZ8tAXp4go6Nn KhEP7K5fMRCmLShuVKmVv6hjUa8NGv36OAxemsv0b+eXBV/FRqJFs9otF2gSsrzkPHDF eWLQ== 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=eKrR3kA+WNA2HGXJcyLHteR7sOVmXSLMUlzCqGYjyfE=; b=KdJNL/kHXud14q3CL2TJQ4ri0i6icNhSZrhPI1us4tMvkzmQm/sMEctpzQHVnvVRWa zAnspjAwNaEBv/GH0W07MI7Bwf2pS84h/if8Z1kWX7ZG9oIbGmYK+bBCG5qUgtOpBcOh jGm2lY6AiIRY1BopZRwbTjQ3c5KahLh4eiJl+t5bm6ACc9p0JGEw/hd+8rOlnqUfn9uz VJGgVo2I9kHQDyu2ypo1PZmStEliHknCckkZKQmWyoiHIdLiGnWfad0Eyxk7M22vfjew 80zA7Q2uJtM9pmoiMPUSRIrVe1tHSCHNo+LgX83C0ReDxF84n02ktV8NpWIi2bgFoins mt0g== X-Gm-Message-State: AA+aEWaHO4dC1U82sGa6bUE0CqyrXJ5LIteRRnpVwqk+Ibp5xVJwgDlN cf2Zs8dsqqP9yscl9aZG7lI= X-Google-Smtp-Source: AFSGD/XoWJFV6yUcAZj6P7sKsNke3XF5pATVe1S9vekH/EgFhUvThwNsswSX8EjgjL50Nq6fgm6ajg== X-Received: by 2002:a17:902:2006:: with SMTP id n6mr2334423pla.66.1544191794770; Fri, 07 Dec 2018 06:09:54 -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 f6sm5206070pfg.188.2018.12.07.06.09.53 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 07 Dec 2018 06:09:54 -0800 (PST) From: Bin Meng To: Rick Chen , Simon Glass , Lukas Auer , Anup Patel , U-Boot Mailing List Date: Fri, 7 Dec 2018 06:14:32 -0800 Message-Id: <1544192072-28764-21-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1544192072-28764-1-git-send-email-bmeng.cn@gmail.com> References: <1544192072-28764-1-git-send-email-bmeng.cn@gmail.com> Subject: [U-Boot] [PATCH v2 20/20] riscv: Adjust the _exit_trap() position to come before handle_trap() 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" With this change, we can avoid a forward declaration. Signed-off-by: Bin Meng Reviewed-by: Lukas Auer --- Changes in v2: - rebase on u-boot/master - drop the patch "riscv: Pass correct exception code to _exit_trap()" - drop the patch "riscv: Refactor handle_trap() a little for future extension" - drop the patch "riscv: Allow U-Boot to run on hart 0 only", and leave the SMP support to Lukas's future patch series arch/riscv/lib/interrupts.c | 62 ++++++++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 32 deletions(-) diff --git a/arch/riscv/lib/interrupts.c b/arch/riscv/lib/interrupts.c index 3aff006..e185933 100644 --- a/arch/riscv/lib/interrupts.c +++ b/arch/riscv/lib/interrupts.c @@ -12,7 +12,36 @@ #include #include -static void _exit_trap(ulong code, ulong epc, struct pt_regs *regs); +static void _exit_trap(ulong code, ulong epc, struct pt_regs *regs) +{ + static const char * const exception_code[] = { + "Instruction address misaligned", + "Instruction access fault", + "Illegal instruction", + "Breakpoint", + "Load address misaligned", + "Load access fault", + "Store/AMO address misaligned", + "Store/AMO access fault", + "Environment call from U-mode", + "Environment call from S-mode", + "Reserved", + "Environment call from M-mode", + "Instruction page fault", + "Load page fault", + "Reserved", + "Store/AMO page fault", + }; + + if (code < ARRAY_SIZE(exception_code)) { + printf("exception code: %ld , %s , epc %lx , ra %lx\n", + code, exception_code[code], epc, regs->ra); + } else { + printf("Reserved\n"); + } + + hang(); +} int interrupt_init(void) { @@ -72,34 +101,3 @@ __attribute__((weak)) void external_interrupt(struct pt_regs *regs) __attribute__((weak)) void timer_interrupt(struct pt_regs *regs) { } - -static void _exit_trap(ulong code, ulong epc, struct pt_regs *regs) -{ - static const char * const exception_code[] = { - "Instruction address misaligned", - "Instruction access fault", - "Illegal instruction", - "Breakpoint", - "Load address misaligned", - "Load access fault", - "Store/AMO address misaligned", - "Store/AMO access fault", - "Environment call from U-mode", - "Environment call from S-mode", - "Reserved", - "Environment call from M-mode", - "Instruction page fault", - "Load page fault", - "Reserved", - "Store/AMO page fault", - }; - - if (code < ARRAY_SIZE(exception_code)) { - printf("exception code: %ld , %s , epc %lx , ra %lx\n", - code, exception_code[code], epc, regs->ra); - } else { - printf("Reserved\n"); - } - - hang(); -}