[15/15] riscv: disable the EFI PECOFF header for M-mode

Message ID	20191017173743.5430-16-hch@lst.de (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=yMff=YK=lists.infradead.org=linux-riscv-bounces+patchwork-linux-riscv=patchwork.kernel.org@kernel.org> DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 90A9821D7A From: Christoph Hellwig <hch@lst.de> To: Palmer Dabbelt <palmer@sifive.com>, Paul Walmsley <paul.walmsley@sifive.com> Subject: [PATCH 15/15] riscv: disable the EFI PECOFF header for M-mode Date: Thu, 17 Oct 2019 19:37:43 +0200 Message-Id: <20191017173743.5430-16-hch@lst.de> In-Reply-To: <20191017173743.5430-1-hch@lst.de> References: <20191017173743.5430-1-hch@lst.de> MIME-Version: 1.0 Precedence: list Cc: Damien Le Moal <damien.lemoal@wdc.com>, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" <linux-riscv-bounces@lists.infradead.org> Errors-To: linux-riscv-bounces+patchwork-linux-riscv=patchwork.kernel.org@lists.infradead.org
Series	[01/15] riscv: cleanup <asm/bug.h> \| expand [01/15] riscv: cleanup <asm/bug.h> [02/15] riscv: cleanup do_trap_break [03/15] riscv: abstract out CSR names for supervisor vs machine mode [04/15] riscv: don't allow selecting SBI based drivers for M-mode [05/15] riscv: poison SBI calls for M-mode [06/15] riscv: cleanup the default power off implementation [07/15] riscv: implement remote sfence.i using IPIs [08/15] riscv: add support for MMIO access to the timer registers [09/15] riscv: provide native clint access for M-mode [10/15] riscv: read the hart ID from mhartid on boot [11/15] riscv: use the correct interrupt levels for M-mode [12/15] riscv: clear the instruction cache and all registers when booting [13/15] riscv: add nommu support [14/15] riscv: provide a flat image loader [15/15] riscv: disable the EFI PECOFF header for M-mode

Message ID

20191017173743.5430-16-hch@lst.de (mailing list archive)

State

New, archived

Headers

DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 90A9821D7A
From: Christoph Hellwig <hch@lst.de>
To: Palmer Dabbelt <palmer@sifive.com>,
 Paul Walmsley <paul.walmsley@sifive.com>
Subject: [PATCH 15/15] riscv: disable the EFI PECOFF header for M-mode
Date: Thu, 17 Oct 2019 19:37:43 +0200
Message-Id: <20191017173743.5430-16-hch@lst.de>
In-Reply-To: <20191017173743.5430-1-hch@lst.de>
References: <20191017173743.5430-1-hch@lst.de>
MIME-Version: 1.0
Precedence: list
Cc: Damien Le Moal <damien.lemoal@wdc.com>, linux-riscv@lists.infradead.org,
 linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: "linux-riscv" <linux-riscv-bounces@lists.infradead.org>
Errors-To: 
 linux-riscv-bounces+patchwork-linux-riscv=patchwork.kernel.org@lists.infradead.org

Series

[01/15] riscv: cleanup <asm/bug.h> | expand

No point in bloating the kernel image with a bootloader header if we run bare metal. Signed-off-by: Christoph Hellwig <hch@lst.de> --- arch/riscv/kernel/head.S | 2 ++ 1 file changed, 2 insertions(+)

Comments

Anup Patel Oct. 18, 2019, 3:06 a.m. UTC | #1

On Thu, Oct 17, 2019 at 11:08 PM Christoph Hellwig <hch@lst.de> wrote:
>
> No point in bloating the kernel image with a bootloader header if
> we run bare metal.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
>  arch/riscv/kernel/head.S | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/arch/riscv/kernel/head.S b/arch/riscv/kernel/head.S
> index 71efbba25ed5..dc21e409cc49 100644
> --- a/arch/riscv/kernel/head.S
> +++ b/arch/riscv/kernel/head.S
> @@ -16,6 +16,7 @@
>
>  __INIT
>  ENTRY(_start)
> +#ifndef CONFIG_RISCV_M_MODE
>         /*
>          * Image header expected by Linux boot-loaders. The image header data
>          * structure is described in asm/image.h.
> @@ -47,6 +48,7 @@ ENTRY(_start)
>
>  .global _start_kernel
>  _start_kernel:
> +#endif /* CONFIG_RISCV_M_MODE */
>         /* Mask all interrupts */
>         csrw CSR_XIE, zero
>         csrw CSR_XIP, zero
> --
> 2.20.1
>

LGTM.

Reviewed-by: Anup Patel <anup@brainfault.org>

Regards,
Anup

diff --git a/arch/riscv/kernel/head.S b/arch/riscv/kernel/head.S
index 71efbba25ed5..dc21e409cc49 100644
--- a/arch/riscv/kernel/head.S
+++ b/arch/riscv/kernel/head.S
@@ -16,6 +16,7 @@ 
 
 __INIT
 ENTRY(_start)
+#ifndef CONFIG_RISCV_M_MODE
 	/*
 	 * Image header expected by Linux boot-loaders. The image header data
 	 * structure is described in asm/image.h.
@@ -47,6 +48,7 @@  ENTRY(_start)
 
 .global _start_kernel
 _start_kernel:
+#endif /* CONFIG_RISCV_M_MODE */
 	/* Mask all interrupts */
 	csrw CSR_XIE, zero
 	csrw CSR_XIP, zero

[15/15] riscv: disable the EFI PECOFF header for M-mode

Commit Message

Comments

Patch