riscv: Move timers into drivers/timer
Subsystems (2)
cover riscv: Move timers into drivers/timer
Now that mtime sources are regular timers, they can go in with the rest of the timer drivers. I have assigned maintenance of these drivers to Rick Chen, as they were previous under his purview. This series is based off of -next.
Passing CI located at [1].
[1] https://dev.azure.com/seanga2/9603e4b8-6f49-4106-b8fc-46e66a869d69/_build/results?buildId=45
Sean Anderson (3):
riscv: Move Andes PLMT driver to drivers/timer
timer: Add _TIMER suffix to Andes PLMT Kconfig
riscv: Move timer portions of SiFive CLINT to drivers/timer
MAINTAINERS | 2 + arch/riscv/Kconfig | 7 --- arch/riscv/cpu/ax25/Kconfig | 2 +- arch/riscv/lib/Makefile | 1 - arch/riscv/lib/sifive_clint.c | 43 +--------------- drivers/timer/Kconfig | 7 +++ drivers/timer/Makefile | 2 + .../timer/andes_plmt_timer.c | 0 drivers/timer/sifive_clint_timer.c | 49 +++++++++++++++++++ 9 files changed, 63 insertions(+), 50 deletions(-) rename arch/riscv/lib/andes_plmt.c => drivers/timer/andes_plmt_timer.c (100%) create mode 100644 drivers/timer/sifive_clint_timer.c
Signature · 1 line
2.28.0
PATCH 1/3 riscv: Move Andes PLMT driver to drivers/timer
This is a regular timer driver, and should live with the other timer drivers.
---
MAINTAINERS | 1 + arch/riscv/Kconfig | 7 ------- arch/riscv/lib/Makefile | 1 - drivers/timer/Kconfig | 7 +++++++ drivers/timer/Makefile | 1 + .../lib/andes_plmt.c => drivers/timer/andes_plmt_timer.c | 0 6 files changed, 9 insertions(+), 8 deletions(-) rename arch/riscv/lib/andes_plmt.c => drivers/timer/andes_plmt_timer.c (100%)
MAINTAINERS +1 -0
@@ -927,6 +927,7 @@ S: Maintained T: git https://gitlab.denx.de/u-boot/custodians/u-boot-riscv.git F: arch/riscv/ F: cmd/riscv/ +F: drivers/timer/andes_plmt_timer.c F: tools/prelink-riscv.c RISC-V KENDRYTE
arch/riscv/Kconfig +0 -7
@@ -170,13 +170,6 @@ config ANDES_PLIC The Andes PLIC block holds memory-mapped claim and pending registers associated with software interrupt. -config ANDES_PLMT - bool - depends on RISCV_MMODE || SPL_RISCV_MMODE - help - The Andes PLMT block holds memory-mapped mtime register - associated with timer tick. - config SYS_MALLOC_F_LEN default 0x1000
arch/riscv/lib/Makefile +0 -1
@@ -13,7 +13,6 @@ obj-y += cache.o ifeq ($(CONFIG_$(SPL_)RISCV_MMODE),y) obj-$(CONFIG_SIFIVE_CLINT) += sifive_clint.o obj-$(CONFIG_ANDES_PLIC) += andes_plic.o -obj-$(CONFIG_ANDES_PLMT) += andes_plmt.o else obj-$(CONFIG_SBI) += sbi.o obj-$(CONFIG_SBI_IPI) += sbi_ipi.o
drivers/timer/Kconfig +7 -0
@@ -53,6 +53,13 @@ config ALTERA_TIMER Select this to enable a timer for Altera devices. Please find details on the "Embedded Peripherals IP User Guide" of Altera. +config ANDES_PLMT + bool + depends on RISCV_MMODE || SPL_RISCV_MMODE + help + The Andes PLMT block holds memory-mapped mtime register + associated with timer tick. + config ARC_TIMER bool "ARC timer support" depends on TIMER && ARC && CLK
drivers/timer/Makefile +1 -0
@@ -5,6 +5,7 @@ obj-y += timer-uclass.o obj-$(CONFIG_AG101P_TIMER) += ag101p_timer.o obj-$(CONFIG_ALTERA_TIMER) += altera_timer.o +obj-$(CONFIG_ANDES_PLMT) += andes_plmt_timer.o obj-$(CONFIG_ARC_TIMER) += arc_timer.o obj-$(CONFIG_AST_TIMER) += ast_timer.o obj-$(CONFIG_ATCPIT100_TIMER) += atcpit100_timer.o
drivers/timer/andes_plmt_timer.c renamed from arch/riscv/lib/andes_plmt.c +0 -0
Signature · 1 line
2.28.0
PATCH 1/3 riscv: Move Andes PLMT driver to drivers/timer
Quoted 7 lines · Sean Anderson
This is a regular timer driver, and should live with the other timer drivers.
Signed-off-by Sean Anderson <[email protected]>---
Quoted 8 lines
MAINTAINERS | 1 + arch/riscv/Kconfig | 7 ------- arch/riscv/lib/Makefile | 1 - drivers/timer/Kconfig | 7 +++++++ drivers/timer/Makefile | 1 + .../lib/andes_plmt.c => drivers/timer/andes_plmt_timer.c | 0 6 files changed, 9 insertions(+), 8 deletions(-) rename arch/riscv/lib/andes_plmt.c => drivers/timer/andes_plmt_timer.c (100%)
PATCH 1/3 riscv: Move Andes PLMT driver to drivers/timer
In reply to Sean AndersonQuoted 6 lines
This is a regular timer driver, and should live with the other timer drivers.
Signed-off-by Sean Anderson <[email protected]>---
Quoted 8 lines
MAINTAINERS | 1 + arch/riscv/Kconfig | 7 ------- arch/riscv/lib/Makefile | 1 - drivers/timer/Kconfig | 7 +++++++ drivers/timer/Makefile | 1 + .../lib/andes_plmt.c => drivers/timer/andes_plmt_timer.c | 0 6 files changed, 9 insertions(+), 8 deletions(-) rename arch/riscv/lib/andes_plmt.c => drivers/timer/andes_plmt_timer.c (100%)
PATCH 2/3 timer: Add _TIMER suffix to Andes PLMT Kconfig
In reply to Sean AndersonThis matches the naming scheme of other timer drivers.
---
arch/riscv/cpu/ax25/Kconfig | 2 +- drivers/timer/Kconfig | 2 +- drivers/timer/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/riscv/cpu/ax25/Kconfig +1 -1
@@ -5,7 +5,7 @@ config RISCV_NDS imply CPU_RISCV imply RISCV_TIMER if (RISCV_SMODE || SPL_RISCV_SMODE) imply ANDES_PLIC if (RISCV_MMODE || SPL_RISCV_MMODE) - imply ANDES_PLMT if (RISCV_MMODE || SPL_RISCV_MMODE) + imply ANDES_PLMT_TIMER if (RISCV_MMODE || SPL_RISCV_MMODE) imply SPL_CPU_SUPPORT imply SPL_OPENSBI imply SPL_LOAD_FIT
drivers/timer/Kconfig +1 -1
@@ -53,7 +53,7 @@ config ALTERA_TIMER Select this to enable a timer for Altera devices. Please find details on the "Embedded Peripherals IP User Guide" of Altera. -config ANDES_PLMT +config ANDES_PLMT_TIMER bool depends on RISCV_MMODE || SPL_RISCV_MMODE help
drivers/timer/Makefile +1 -1
@@ -5,7 +5,7 @@ obj-y += timer-uclass.o obj-$(CONFIG_AG101P_TIMER) += ag101p_timer.o obj-$(CONFIG_ALTERA_TIMER) += altera_timer.o -obj-$(CONFIG_ANDES_PLMT) += andes_plmt_timer.o +obj-$(CONFIG_ANDES_PLMT_TIMER) += andes_plmt_timer.o obj-$(CONFIG_ARC_TIMER) += arc_timer.o obj-$(CONFIG_AST_TIMER) += ast_timer.o obj-$(CONFIG_ATCPIT100_TIMER) += atcpit100_timer.o
Signature · 1 line
2.28.0
PATCH 2/3 timer: Add _TIMER suffix to Andes PLMT Kconfig
Quoted 11 lines · Sean Anderson
This matches the naming scheme of other timer drivers.
Signed-off-by Sean Anderson <[email protected]>---
arch/riscv/cpu/ax25/Kconfig | 2 +- drivers/timer/Kconfig | 2 +- drivers/timer/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
PATCH 2/3 timer: Add _TIMER suffix to Andes PLMT Kconfig
In reply to Sean AndersonQuoted 9 lines
This matches the naming scheme of other timer drivers.
Signed-off-by Sean Anderson <[email protected]>---
arch/riscv/cpu/ax25/Kconfig | 2 +- drivers/timer/Kconfig | 2 +- drivers/timer/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
PATCH 3/3 riscv: Move timer portions of SiFive CLINT to drivers/timer
In reply to Sean AndersonHalf of this driver is a DM-based timer driver, and half is RISC-V-specific IPI code. Move the timer portions in with the other timer drivers. The KConfig is not moved, since it also enables IPIs. It could also be split into two configs, but no boards use the timer but not the IPI atm, so I haven't split it.
---
MAINTAINERS | 1 + arch/riscv/lib/sifive_clint.c | 43 ++------------------------ drivers/timer/Makefile | 1 + drivers/timer/sifive_clint_timer.c | 49 ++++++++++++++++++++++++++++++ 4 files changed, 53 insertions(+), 41 deletions(-) create mode 100644 drivers/timer/sifive_clint_timer.c
MAINTAINERS +1 -0
@@ -928,6 +928,7 @@ T: git https://gitlab.denx.de/u-boot/custodians/u-boot-riscv.git F: arch/riscv/ F: cmd/riscv/ F: drivers/timer/andes_plmt_timer.c +F: drivers/timer/sifive_clint_timer.c F: tools/prelink-riscv.c RISC-V KENDRYTE
arch/riscv/lib/sifive_clint.c +2 -41
63 lines not on this page · raw message
drivers/timer/Makefile +1 -0
@@ -19,6 +19,7 @@ obj-$(CONFIG_RENESAS_OSTM_TIMER) += ostm_timer.o obj-$(CONFIG_RISCV_TIMER) += riscv_timer.o obj-$(CONFIG_ROCKCHIP_TIMER) += rockchip_timer.o obj-$(CONFIG_SANDBOX_TIMER) += sandbox_timer.o +obj-$(CONFIG_SIFIVE_CLINT) += sifive_clint_timer.o obj-$(CONFIG_STI_TIMER) += sti-timer.o obj-$(CONFIG_STM32_TIMER) += stm32_timer.o obj-$(CONFIG_X86_TSC_TIMER) += tsc_timer.o
drivers/timer/sifive_clint_timer.c new file +49 -0
49 lines not on this page · raw message
Signature · 1 line
2.28.0
PATCH 3/3 riscv: Move timer portions of SiFive CLINT to drivers/timer
Quoted 8 lines · Sean Anderson
Half of this driver is a DM-based timer driver, and half is RISC-V-specific IPI code. Move the timer portions in with the other timer drivers. The KConfig is not moved, since it also enables IPIs. It could also be split into two configs, but no boards use the timer but not the IPI atm, so I haven't split it.
Signed-off-by Sean Anderson <[email protected]>
Quoted 9 lines
---
MAINTAINERS | 1 + arch/riscv/lib/sifive_clint.c | 43 ++------------------------ drivers/timer/Makefile | 1 + drivers/timer/sifive_clint_timer.c | 49 ++++++++++++++++++++++++++++++ 4 files changed, 53 insertions(+), 41 deletions(-) create mode 100644 drivers/timer/sifive_clint_timer.c
PATCH 3/3 riscv: Move timer portions of SiFive CLINT to drivers/timer
In reply to Sean AndersonQuoted 103 lines
Half of this driver is a DM-based timer driver, and half is RISC-V-specific IPI code. Move the timer portions in with the other timer drivers. The KConfig is not moved, since it also enables IPIs. It could also be split into two configs, but no boards use the timer but not the IPI atm, so I haven't split it.
Signed-off-by Sean Anderson <[email protected]>---
MAINTAINERS | 1 + arch/riscv/lib/sifive_clint.c | 43 ++------------------------ drivers/timer/Makefile | 1 + drivers/timer/sifive_clint_timer.c | 49 ++++++++++++++++++++++++++++++ 4 files changed, 53 insertions(+), 41 deletions(-) create mode 100644 drivers/timer/sifive_clint_timer.cMAINTAINERS +1
-0@@ -928,6 +928,7 @@ T: git https://gitlab.denx.de/u-boot/custodians/u-boot-riscv.git F: arch/riscv/ F: cmd/riscv/ F: drivers/timer/andes_plmt_timer.c +F: drivers/timer/sifive_clint_timer.c F: tools/prelink-riscv.c RISC-V KENDRYTEarch/riscv/lib/sifive_clint.c +2
-41@@ -1,5 +1,6 @@// SPDX-License-Identifier: GPL-2.0+ /* +* Copyright (C) 2020, Sean Anderson <[email protected]> * Copyright (C) 2018, Bin Meng <[email protected]> * * U-Boot syscon driver for SiFive's Core Local Interruptor (CLINT). @@ -8,19 +9,13 @@*/ #include <common.h> -#include <clk.h> #include <dm.h> -#include <timer.h> #include <asm/io.h> -#include <asm/syscon.h> +#include <asm/smp.h> #include <linux/err.h> /* MSIP registers */ #define MSIP_REG (base, hart) ((ulong)(base) + (hart) * 4) -/* mtime compare register */ -#define MTIMECMP_REG (base, hart) ((ulong)(base) + 0x4000 + (hart) * 8) -/* mtime register */ -#define MTIME_REG (base) ((ulong)(base) + 0xbff8)DECLARE_GLOBAL_DATA_PTR ;@@ -61,37 +56,3 @@ int riscv_get_ipi(int hart, int *pending)return 0 ; } - -static int sifive_clint_get_count (struct udevice *dev,u64 *count) -{ - *count =readq ((void __iomem *)MTIME_REG (dev->priv)); - -return 0 ; -} - -static const struct timer_ops sifive_clint_ops = { - .get_count = sifive_clint_get_count, -}; - -static int sifive_clint_probe (struct udevice *dev) -{ - dev->priv =dev_read_addr_ptr (dev); -if (!dev->priv) -return -EINVAL ; - -return timer_timebase_fallback (dev); -} - -static const struct udevice_id sifive_clint_ids[] = { - { .compatible ="riscv,clint0" }, - { } -}; - -U_BOOT_DRIVER (sifive_clint) = { - .name ="sifive_clint" , - .id =UCLASS_TIMER , - .of_match = sifive_clint_ids, - .probe = sifive_clint_probe, - .ops = &sifive_clint_ops, - .flags =DM_FLAG_PRE_RELOC , -};drivers/timer/Makefile +0
-0
drivers/timer/Makefile obj-$(CONFIG_RENESAS_OSTM_TIMER) += ostm_timer.o · line 22
Quoted 4 lines
drivers/timer/Makefile +1
-0@@ -19,6 +19,7 @@ obj-$(CONFIG_RENESAS_OSTM_TIMER) += ostm_timer.o obj-$(CONFIG_RISCV_TIMER) += riscv_timer.o obj-$(CONFIG_ROCKCHIP_TIMER) += rockchip_timer.o obj-$(CONFIG_SANDBOX_TIMER) += sandbox_timer.o +obj-$(CONFIG_SIFIVE_CLINT) += sifive_clint_timer.o
no _TIMER suffix ?
Quoted 59 lines
drivers/timer/Makefile +0
-0obj-$(CONFIG_STI_TIMER) += sti-timer.o obj-$(CONFIG_STM32_TIMER) += stm32_timer.o obj-$(CONFIG_X86_TSC_TIMER) += tsc_timer.odrivers/timer/sifive_clint_timer.c new file +49
-1@@ -0,0 +1,49 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright (C) 2020, Sean Anderson <[email protected]> +* Copyright (C) 2018, Bin Meng <[email protected]> +*/ + +#include <common.h> +#include <clk.h> +#include <dm.h> +#include <timer.h> +#include <asm/io.h> +#include <linux/err.h> + +/* mtime register */ +#define MTIME_REG (base) ((ulong)(base) + 0xbff8) + +static int sifive_clint_get_count (struct udevice *dev,u64 *count) +{ + *count =readq ((void __iomem *)MTIME_REG (dev->priv)); + +return 0 ; +} + +static const struct timer_ops sifive_clint_ops = { + .get_count = sifive_clint_get_count, +}; + +static int sifive_clint_probe (struct udevice *dev) +{ + dev->priv =dev_read_addr_ptr (dev); +if (!dev->priv) +return -EINVAL ; + +return timer_timebase_fallback (dev); +} + +static const struct udevice_id sifive_clint_ids[] = { + { .compatible ="riscv,clint0" }, + { } +}; + +U_BOOT_DRIVER (sifive_clint) = { + .name ="sifive_clint" , + .id =UCLASS_TIMER , + .of_match = sifive_clint_ids, + .probe = sifive_clint_probe, + .ops = &sifive_clint_ops, + .flags =DM_FLAG_PRE_RELOC , +}; --
Quoted 1 line
2.28.0
LGTM.
Other than that,
PATCH 3/3 riscv: Move timer portions of SiFive CLINT to drivers/timer
Quoted 101 lines · Rick Chen
Quoted 101 lines
Half of this driver is a DM-based timer driver, and half is RISC-V-specific IPI code. Move the timer portions in with the other timer drivers. The KConfig is not moved, since it also enables IPIs. It could also be split into two configs, but no boards use the timer but not the IPI atm, so I haven't split it.
Signed-off-by Sean Anderson <[email protected]>---
MAINTAINERS | 1 + arch/riscv/lib/sifive_clint.c | 43 ++------------------------ drivers/timer/Makefile | 1 + drivers/timer/sifive_clint_timer.c | 49 ++++++++++++++++++++++++++++++ 4 files changed, 53 insertions(+), 41 deletions(-) create mode 100644 drivers/timer/sifive_clint_timer.cMAINTAINERS +1
-0@@ -928,6 +928,7 @@ T: git https://gitlab.denx.de/u-boot/custodians/u-boot-riscv.git F: arch/riscv/ F: cmd/riscv/ F: drivers/timer/andes_plmt_timer.c +F: drivers/timer/sifive_clint_timer.c F: tools/prelink-riscv.c RISC-V KENDRYTEarch/riscv/lib/sifive_clint.c +2
-41@@ -1,5 +1,6 @@// SPDX-License-Identifier: GPL-2.0+ /* +* Copyright (C) 2020, Sean Anderson <[email protected]> * Copyright (C) 2018, Bin Meng <[email protected]> * * U-Boot syscon driver for SiFive's Core Local Interruptor (CLINT). @@ -8,19 +9,13 @@*/ #include <common.h> -#include <clk.h> #include <dm.h> -#include <timer.h> #include <asm/io.h> -#include <asm/syscon.h> +#include <asm/smp.h> #include <linux/err.h> /* MSIP registers */ #define MSIP_REG (base, hart) ((ulong)(base) + (hart) * 4) -/* mtime compare register */ -#define MTIMECMP_REG (base, hart) ((ulong)(base) + 0x4000 + (hart) * 8) -/* mtime register */ -#define MTIME_REG (base) ((ulong)(base) + 0xbff8)DECLARE_GLOBAL_DATA_PTR ;@@ -61,37 +56,3 @@ int riscv_get_ipi(int hart, int *pending)return 0 ; } - -static int sifive_clint_get_count (struct udevice *dev,u64 *count) -{ - *count =readq ((void __iomem *)MTIME_REG (dev->priv)); - -return 0 ; -} - -static const struct timer_ops sifive_clint_ops = { - .get_count = sifive_clint_get_count, -}; - -static int sifive_clint_probe (struct udevice *dev) -{ - dev->priv =dev_read_addr_ptr (dev); -if (!dev->priv) -return -EINVAL ; - -return timer_timebase_fallback (dev); -} - -static const struct udevice_id sifive_clint_ids[] = { - { .compatible ="riscv,clint0" }, - { } -}; - -U_BOOT_DRIVER (sifive_clint) = { - .name ="sifive_clint" , - .id =UCLASS_TIMER , - .of_match = sifive_clint_ids, - .probe = sifive_clint_probe, - .ops = &sifive_clint_ops, - .flags =DM_FLAG_PRE_RELOC , -};drivers/timer/Makefile +0
-1--- a/drivers/timer/Makefile
Quoted 8 lines
drivers/timer/Makefile obj-$(CONFIG_RENESAS_OSTM_TIMER) += ostm_timer.o · line 22
Quoted 6 lines
+++ b/drivers/timer/Makefile
drivers/timer/Makefile +1
-0@@ -19,6 +19,7 @@ obj-$(CONFIG_RENESAS_OSTM_TIMER) += ostm_timer.o obj-$(CONFIG_RISCV_TIMER) += riscv_timer.o obj-$(CONFIG_ROCKCHIP_TIMER) += rockchip_timer.o obj-$(CONFIG_SANDBOX_TIMER) += sandbox_timer.o +obj-$(CONFIG_SIFIVE_CLINT) += sifive_clint_timer.ono
_TIMERsuffix ?
I chose to keep the current Kconfig option semantics and naming. This reflects that it enables both an IPI driver and a timer driver.
--Sean
Quoted 66 lines
Quoted 60 lines
drivers/timer/Makefile +0
-0obj-$(CONFIG_STI_TIMER) += sti-timer.o obj-$(CONFIG_STM32_TIMER) += stm32_timer.o obj-$(CONFIG_X86_TSC_TIMER) += tsc_timer.odrivers/timer/sifive_clint_timer.c new file +49
-1@@ -0,0 +1,49 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright (C) 2020, Sean Anderson <[email protected]> +* Copyright (C) 2018, Bin Meng <[email protected]> +*/ + +#include <common.h> +#include <clk.h> +#include <dm.h> +#include <timer.h> +#include <asm/io.h> +#include <linux/err.h> + +/* mtime register */ +#define MTIME_REG (base) ((ulong)(base) + 0xbff8) + +static int sifive_clint_get_count (struct udevice *dev,u64 *count) +{ + *count =readq ((void __iomem *)MTIME_REG (dev->priv)); + +return 0 ; +} + +static const struct timer_ops sifive_clint_ops = { + .get_count = sifive_clint_get_count, +}; + +static int sifive_clint_probe (struct udevice *dev) +{ + dev->priv =dev_read_addr_ptr (dev); +if (!dev->priv) +return -EINVAL ; + +return timer_timebase_fallback (dev); +} + +static const struct udevice_id sifive_clint_ids[] = { + { .compatible ="riscv,clint0" }, + { } +}; + +U_BOOT_DRIVER (sifive_clint) = { + .name ="sifive_clint" , + .id =UCLASS_TIMER , + .of_match = sifive_clint_ids, + .probe = sifive_clint_probe, + .ops = &sifive_clint_ops, + .flags =DM_FLAG_PRE_RELOC , +}; --Quoted 1 line
2.28.0
LGTM.
Other than that,Reviewed-by Rick Chen <[email protected]>
PATCH 3/3 riscv: Move timer portions of SiFive CLINT to drivers/timer
Hi Sean
Quoted 7 lines · Rick Chen
Quoted 6 lines
Quoted 6 lines
Half of this driver is a DM-based timer driver, and half is RISC-V-specific IPI code. Move the timer portions in with the other timer drivers. The KConfig is not moved, since it also enables IPIs. It could also be split into two configs, but no boards use the timer but not the IPI atm, so I haven't split it.
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Signed-off-by Sean Anderson <[email protected]>---
MAINTAINERS | 1 + arch/riscv/lib/sifive_clint.c | 43 ++------------------------ drivers/timer/Makefile | 1 + drivers/timer/sifive_clint_timer.c | 49 ++++++++++++++++++++++++++++++ 4 files changed, 53 insertions(+), 41 deletions(-)
I am trying to sync to master, but it conflicts.
Can you rebase again ?
Applying: riscv: Move Andes PLMT driver to drivers/timer
Applying: timer: Add _TIMER suffix to Andes PLMT Kconfig
Applying: riscv: Move timer portions of SiFive CLINT to drivers/timer
error: patch failed: arch/riscv/lib/sifive_clint.c:61
error: arch/riscv/lib/sifive_clint.c: patch does not apply
Patch failed at 0003 riscv: Move timer portions of SiFive CLINT to drivers/timer
Thanks,
Rick