From patchwork Wed Dec 12 07:11:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1011627 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="B0UOL0KJ"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43F7Tj1pjxz9s8J for ; Wed, 12 Dec 2018 18:19:05 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id D7117C228A0; Wed, 12 Dec 2018 07:17:10 +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 3A181C228F7; Wed, 12 Dec 2018 07:07:39 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id AB21CC228D8; Wed, 12 Dec 2018 07:06:54 +0000 (UTC) Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by lists.denx.de (Postfix) with ESMTPS id 86561C21DDC for ; Wed, 12 Dec 2018 07:06:48 +0000 (UTC) Received: by mail-pg1-f194.google.com with SMTP id 17so7906605pgg.1 for ; Tue, 11 Dec 2018 23:06:48 -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=gTL9DEQyul6IJZ1D/VaXAzeecmuhCElfDNj/Hl7tOzs=; b=B0UOL0KJTQk0CBrc1G0XEmPrjAfSCOAfpSXmwy23Hguv21nvYLYKcs+BF91KsECB8U 6svsZhNn4DC1bg78VHfPoqks9ENx+Akw+hVyrCayq5Qhmx0u/YhTqMHJA9yxotzbh6Wr DGGgnCSVZpPshpHW5T+INhb7RPpn2y+gzyRP1Z6dxv6eDzqaN6Q8FlszVtyh1Be6Dcpq 7ZLOIUKomS3EzkmXg1bl6mWbhZdqoKF5qmNN4epjf3+CIVilDjAHk2CwvlbzBcnu2mDw 334yews0/cSRdH+XLcbZSX5LezDq8VgAeoSrPad09yDFkVFQOAcVya9FX/1h9heMMjnV nlKg== 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=gTL9DEQyul6IJZ1D/VaXAzeecmuhCElfDNj/Hl7tOzs=; b=AyH5Ew45MvrmQr5746PXvz3lQxXN1XkUCdoCYH68JrXIKekiONLEtD/1CB1YsO/hMp 1td3xBNy+LJhuSF/RM0VMLZjVwwdHoyEtjKywMagGV8fnYKdLhchw2dR0/4q8DzZ3p6D h5I2dT8WlUh/E8Ut04QXZD2kI5O9QmfUCtlLVJXvO9CGBva4cmu92eUDObomCFw82WDK mS5whWXL3vtMdfQ9Smi2VhfOapytx0PP3lOUhglEGh3Ydng9shWgXqATjKuIbX9Nfggu xoQeKCN8yd5E5XvPDhis6+KI/Zx/zkKyfXmoI9DTP+pzLYPbNxTOq8Jh/Cytzp2/jBVh ygYQ== X-Gm-Message-State: AA+aEWa/jihBa+2qdzFSnkcKd120jQqgBTdvP3SSPB8KOkEFmCzi5Ud2 //r1ozLFXWAEjG5CdPaANzc= X-Google-Smtp-Source: AFSGD/UUs60Xi5+/I+fS1WCYH2LU+u6XqTjPKftP6vstfgfibFJ9F4CFDKPdjO146cNJKFJSN7G0/A== X-Received: by 2002:a63:7e5b:: with SMTP id o27mr17170893pgn.214.1544598407189; Tue, 11 Dec 2018 23:06:47 -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 z9sm37330096pfd.99.2018.12.11.23.06.46 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 11 Dec 2018 23:06:46 -0800 (PST) From: Bin Meng To: Rick Chen , Simon Glass , Lukas Auer , Anup Patel , U-Boot Mailing List Date: Tue, 11 Dec 2018 23:11:23 -0800 Message-Id: <1544598686-14130-23-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1544598686-14130-1-git-send-email-bmeng.cn@gmail.com> References: <1544598686-14130-1-git-send-email-bmeng.cn@gmail.com> Subject: [U-Boot] [PATCH v4 22/25] 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 v4: None Changes in v3: None 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(); -}