From: Christoph Hellwig <hch@lst.de> To: Palmer Dabbelt <palmer@sifive.com>, Paul Walmsley <paul.walmsley@sifive.com> Cc: Damien Le Moal <damien.lemoal@wdc.com>, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Anup Patel <anup@brainfault.org>, Atish Patra <atish.patra@wdc.com> Subject: [PATCH 04/12] riscv: cleanup the default power off implementation Date: Mon, 28 Oct 2019 13:10:35 +0100 [thread overview] Message-ID: <20191028121043.22934-5-hch@lst.de> (raw) In-Reply-To: <20191028121043.22934-1-hch@lst.de> Move the sbi poweroff to a separate function and file that is only compiled if CONFIG_SBI is set. Provide a new default fallback power off that just sits in a wfi loop to save some power. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Anup Patel <anup@brainfault.org> Reviewed-by: Atish Patra <atish.patra@wdc.com> --- arch/riscv/kernel/Makefile | 1 + arch/riscv/kernel/reset.c | 5 ++--- arch/riscv/kernel/sbi.c | 17 +++++++++++++++++ 3 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 arch/riscv/kernel/sbi.c diff --git a/arch/riscv/kernel/Makefile b/arch/riscv/kernel/Makefile index 696020ff72db..d8c35fa93cc6 100644 --- a/arch/riscv/kernel/Makefile +++ b/arch/riscv/kernel/Makefile @@ -41,5 +41,6 @@ obj-$(CONFIG_DYNAMIC_FTRACE) += mcount-dyn.o obj-$(CONFIG_PERF_EVENTS) += perf_event.o obj-$(CONFIG_PERF_EVENTS) += perf_callchain.o obj-$(CONFIG_HAVE_PERF_REGS) += perf_regs.o +obj-$(CONFIG_RISCV_SBI) += sbi.o clean: diff --git a/arch/riscv/kernel/reset.c b/arch/riscv/kernel/reset.c index d0fe623bfb8f..5e4e69859af1 100644 --- a/arch/riscv/kernel/reset.c +++ b/arch/riscv/kernel/reset.c @@ -4,12 +4,11 @@ */ #include <linux/reboot.h> -#include <asm/sbi.h> static void default_power_off(void) { - sbi_shutdown(); - while (1); + while (1) + wait_for_interrupt(); } void (*pm_power_off)(void) = default_power_off; diff --git a/arch/riscv/kernel/sbi.c b/arch/riscv/kernel/sbi.c new file mode 100644 index 000000000000..f6c7c3e82d28 --- /dev/null +++ b/arch/riscv/kernel/sbi.c @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: GPL-2.0-only + +#include <linux/init.h> +#include <linux/pm.h> +#include <asm/sbi.h> + +static void sbi_power_off(void) +{ + sbi_shutdown(); +} + +static int __init sbi_init(void) +{ + pm_power_off = sbi_power_off; + return 0; +} +early_initcall(sbi_init); -- 2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: Christoph Hellwig <hch@lst.de> To: Palmer Dabbelt <palmer@sifive.com>, Paul Walmsley <paul.walmsley@sifive.com> Cc: Anup Patel <anup@brainfault.org>, Damien Le Moal <damien.lemoal@wdc.com>, Atish Patra <atish.patra@wdc.com>, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 04/12] riscv: cleanup the default power off implementation Date: Mon, 28 Oct 2019 13:10:35 +0100 [thread overview] Message-ID: <20191028121043.22934-5-hch@lst.de> (raw) In-Reply-To: <20191028121043.22934-1-hch@lst.de> Move the sbi poweroff to a separate function and file that is only compiled if CONFIG_SBI is set. Provide a new default fallback power off that just sits in a wfi loop to save some power. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Anup Patel <anup@brainfault.org> Reviewed-by: Atish Patra <atish.patra@wdc.com> --- arch/riscv/kernel/Makefile | 1 + arch/riscv/kernel/reset.c | 5 ++--- arch/riscv/kernel/sbi.c | 17 +++++++++++++++++ 3 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 arch/riscv/kernel/sbi.c diff --git a/arch/riscv/kernel/Makefile b/arch/riscv/kernel/Makefile index 696020ff72db..d8c35fa93cc6 100644 --- a/arch/riscv/kernel/Makefile +++ b/arch/riscv/kernel/Makefile @@ -41,5 +41,6 @@ obj-$(CONFIG_DYNAMIC_FTRACE) += mcount-dyn.o obj-$(CONFIG_PERF_EVENTS) += perf_event.o obj-$(CONFIG_PERF_EVENTS) += perf_callchain.o obj-$(CONFIG_HAVE_PERF_REGS) += perf_regs.o +obj-$(CONFIG_RISCV_SBI) += sbi.o clean: diff --git a/arch/riscv/kernel/reset.c b/arch/riscv/kernel/reset.c index d0fe623bfb8f..5e4e69859af1 100644 --- a/arch/riscv/kernel/reset.c +++ b/arch/riscv/kernel/reset.c @@ -4,12 +4,11 @@ */ #include <linux/reboot.h> -#include <asm/sbi.h> static void default_power_off(void) { - sbi_shutdown(); - while (1); + while (1) + wait_for_interrupt(); } void (*pm_power_off)(void) = default_power_off; diff --git a/arch/riscv/kernel/sbi.c b/arch/riscv/kernel/sbi.c new file mode 100644 index 000000000000..f6c7c3e82d28 --- /dev/null +++ b/arch/riscv/kernel/sbi.c @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: GPL-2.0-only + +#include <linux/init.h> +#include <linux/pm.h> +#include <asm/sbi.h> + +static void sbi_power_off(void) +{ + sbi_shutdown(); +} + +static int __init sbi_init(void) +{ + pm_power_off = sbi_power_off; + return 0; +} +early_initcall(sbi_init); -- 2.20.1 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv
next prev parent reply other threads:[~2019-10-28 12:11 UTC|newest] Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-10-28 12:10 RISC-V nommu support v6 Christoph Hellwig 2019-10-28 12:10 ` Christoph Hellwig 2019-10-28 12:10 ` [PATCH 01/12] riscv: abstract out CSR names for supervisor vs machine mode Christoph Hellwig 2019-10-28 12:10 ` Christoph Hellwig 2019-11-05 17:56 ` Paul Walmsley 2019-11-05 17:56 ` Paul Walmsley 2019-11-05 17:57 ` Paul Walmsley 2019-11-05 17:57 ` Paul Walmsley 2019-11-05 18:02 ` Marc Zyngier 2019-11-05 18:02 ` Marc Zyngier 2019-11-12 10:38 ` Thomas Gleixner 2019-11-12 10:38 ` Thomas Gleixner 2019-11-14 7:30 ` Paul Walmsley 2019-11-14 7:30 ` Paul Walmsley 2019-10-28 12:10 ` [PATCH 02/12] riscv: don't allow selecting SBI based drivers for M-mode Christoph Hellwig 2019-10-28 12:10 ` Christoph Hellwig 2019-11-14 7:31 ` Paul Walmsley 2019-11-14 7:31 ` Paul Walmsley 2019-10-28 12:10 ` [PATCH 03/12] riscv: poison SBI calls " Christoph Hellwig 2019-10-28 12:10 ` Christoph Hellwig 2019-10-31 23:55 ` Paul Walmsley 2019-10-31 23:55 ` Paul Walmsley 2019-10-28 12:10 ` Christoph Hellwig [this message] 2019-10-28 12:10 ` [PATCH 04/12] riscv: cleanup the default power off implementation Christoph Hellwig 2019-10-31 20:49 ` Paul Walmsley 2019-10-31 20:49 ` Paul Walmsley 2019-10-31 23:56 ` Paul Walmsley 2019-10-31 23:56 ` Paul Walmsley 2019-10-28 12:10 ` [PATCH 05/12] riscv: implement remote sfence.i using IPIs Christoph Hellwig 2019-10-28 12:10 ` Christoph Hellwig 2019-10-31 23:57 ` Paul Walmsley 2019-10-31 23:57 ` Paul Walmsley 2019-10-28 12:10 ` [PATCH 06/12] riscv: add support for MMIO access to the timer registers Christoph Hellwig 2019-10-28 12:10 ` Christoph Hellwig 2019-11-05 18:01 ` Paul Walmsley 2019-11-05 18:01 ` Paul Walmsley 2019-11-12 10:39 ` Thomas Gleixner 2019-11-12 10:39 ` Thomas Gleixner 2019-11-17 23:06 ` Paul Walmsley 2019-11-17 23:06 ` Paul Walmsley 2019-10-28 12:10 ` [PATCH 07/12] riscv: provide native clint access for M-mode Christoph Hellwig 2019-10-28 12:10 ` Christoph Hellwig 2019-10-28 12:10 ` [PATCH 08/12] riscv: read the hart ID from mhartid on boot Christoph Hellwig 2019-10-28 12:10 ` Christoph Hellwig 2019-10-28 12:10 ` [PATCH 09/12] riscv: clear the instruction cache and all registers when booting Christoph Hellwig 2019-10-28 12:10 ` Christoph Hellwig 2019-11-14 7:45 ` Paul Walmsley 2019-11-14 7:45 ` Paul Walmsley 2019-10-28 12:10 ` [PATCH 10/12] riscv: add nommu support Christoph Hellwig 2019-10-28 12:10 ` Christoph Hellwig 2019-11-17 23:13 ` Paul Walmsley 2019-11-17 23:13 ` Paul Walmsley 2019-12-16 22:03 ` David Abdurachmanov 2019-12-16 22:03 ` David Abdurachmanov 2019-12-17 3:18 ` Paul Walmsley 2019-12-17 3:18 ` Paul Walmsley 2019-10-28 12:10 ` [PATCH 11/12] riscv: provide a flat image loader Christoph Hellwig 2019-10-28 12:10 ` Christoph Hellwig 2019-11-17 23:14 ` Paul Walmsley 2019-11-17 23:14 ` Paul Walmsley 2019-10-28 12:10 ` [PATCH 12/12] riscv: disable the EFI PECOFF header for M-mode Christoph Hellwig 2019-10-28 12:10 ` Christoph Hellwig 2019-10-30 20:21 ` RISC-V nommu support v6 Paul Walmsley 2019-10-30 20:21 ` Paul Walmsley 2019-10-31 15:52 ` Christoph Hellwig 2019-10-31 15:52 ` Christoph Hellwig 2019-10-31 20:13 ` Paul Walmsley 2019-10-31 20:13 ` Paul Walmsley 2019-11-23 2:19 ` Paul Walmsley 2019-11-23 2:19 ` Paul Walmsley 2019-12-11 8:42 ` Greentime Hu 2019-12-11 8:42 ` Greentime Hu 2020-02-12 12:19 ` Greentime Hu 2020-02-12 12:19 ` Greentime Hu 2019-11-11 9:47 ` Christoph Hellwig 2019-11-11 9:47 ` Christoph Hellwig 2019-11-11 17:02 ` Paul Walmsley 2019-11-11 17:02 ` Paul Walmsley 2019-11-13 13:18 ` Christoph Hellwig 2019-11-13 13:18 ` Christoph Hellwig
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20191028121043.22934-5-hch@lst.de \ --to=hch@lst.de \ --cc=anup@brainfault.org \ --cc=atish.patra@wdc.com \ --cc=damien.lemoal@wdc.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-riscv@lists.infradead.org \ --cc=palmer@sifive.com \ --cc=paul.walmsley@sifive.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.