Re: [PATCH v6 3/4] RISC-V: Remove CLINT related code from timer and arch
On Fri, 24 Jul 2020 00:18:21 PDT (-0700), Anup Patel wrote: Right now the RISC-V timer driver is convoluted to support: 1. Linux RISC-V S-mode (with MMU) where it will use TIME CSR for clocksource and SBI timer calls for clockevent device. 2. Linux RISC-V M-mode (without MMU) where it will use CLINT MMIO counter register for clocksource and CLINT MMIO compare register for clockevent device. We now have a separate CLINT timer driver which also provide CLINT based IPI operations so let's remove CLINT MMIO related code from arch/riscv directory and RISC-V timer driver. Signed-off-by: Anup Patel Tested-by: Emil Renner Berhing Acked-by: Daniel Lezcano --- arch/riscv/Kconfig | 2 +- arch/riscv/Kconfig.socs | 2 + arch/riscv/configs/nommu_virt_defconfig | 7 +-- arch/riscv/include/asm/clint.h | 14 -- arch/riscv/include/asm/timex.h | 28 +++ arch/riscv/kernel/Makefile | 2 +- arch/riscv/kernel/clint.c | 63 - arch/riscv/kernel/setup.c | 2 - arch/riscv/kernel/smp.c | 1 - arch/riscv/kernel/smpboot.c | 1 - drivers/clocksource/Kconfig | 3 +- drivers/clocksource/timer-riscv.c | 17 +-- 12 files changed, 16 insertions(+), 126 deletions(-) delete mode 100644 arch/riscv/include/asm/clint.h delete mode 100644 arch/riscv/kernel/clint.c diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index fedb4a72b29a..57a72ae23d10 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -74,7 +74,7 @@ config RISCV select PCI_DOMAINS_GENERIC if PCI select PCI_MSI if PCI select RISCV_INTC - select RISCV_TIMER + select RISCV_TIMER if RISCV_SBI select SPARSEMEM_STATIC if 32BIT select SPARSE_IRQ select SYSCTL_EXCEPTION_TRACE diff --git a/arch/riscv/Kconfig.socs b/arch/riscv/Kconfig.socs index 6c88148f1b9b..8a55f6156661 100644 --- a/arch/riscv/Kconfig.socs +++ b/arch/riscv/Kconfig.socs @@ -12,6 +12,7 @@ config SOC_SIFIVE config SOC_VIRT bool "QEMU Virt Machine" + select CLINT_TIMER if RISCV_M_MODE select POWER_RESET select POWER_RESET_SYSCON select POWER_RESET_SYSCON_POWEROFF @@ -24,6 +25,7 @@ config SOC_VIRT config SOC_KENDRYTE bool "Kendryte K210 SoC" depends on !MMU + select CLINT_TIMER if RISCV_M_MODE select SERIAL_SIFIVE if TTY select SERIAL_SIFIVE_CONSOLE if TTY select SIFIVE_PLIC diff --git a/arch/riscv/configs/nommu_virt_defconfig b/arch/riscv/configs/nommu_virt_defconfig index cf74e179bf90..cf9388184aa3 100644 --- a/arch/riscv/configs/nommu_virt_defconfig +++ b/arch/riscv/configs/nommu_virt_defconfig @@ -26,6 +26,7 @@ CONFIG_EXPERT=y CONFIG_SLOB=y # CONFIG_SLAB_MERGE_DEFAULT is not set # CONFIG_MMU is not set +CONFIG_SOC_VIRT=y CONFIG_MAXPHYSMEM_2GB=y CONFIG_SMP=y CONFIG_CMDLINE="root=/dev/vda rw earlycon=uart8250,mmio,0x1000,115200n8 console=ttyS0" @@ -48,7 +49,6 @@ CONFIG_VIRTIO_BLK=y # CONFIG_SERIO is not set # CONFIG_LEGACY_PTYS is not set # CONFIG_LDISC_AUTOLOAD is not set -# CONFIG_DEVMEM is not set CONFIG_SERIAL_8250=y # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set CONFIG_SERIAL_8250_CONSOLE=y @@ -56,16 +56,13 @@ CONFIG_SERIAL_8250_NR_UARTS=1 CONFIG_SERIAL_8250_RUNTIME_UARTS=1 CONFIG_SERIAL_OF_PLATFORM=y # CONFIG_HW_RANDOM is not set +# CONFIG_DEVMEM is not set # CONFIG_HWMON is not set -# CONFIG_LCD_CLASS_DEVICE is not set -# CONFIG_BACKLIGHT_CLASS_DEVICE is not set # CONFIG_VGA_CONSOLE is not set # CONFIG_HID is not set # CONFIG_USB_SUPPORT is not set CONFIG_VIRTIO_MMIO=y CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y -CONFIG_SIFIVE_PLIC=y -# CONFIG_VALIDATE_FS_PARSER is not set CONFIG_EXT2_FS=y # CONFIG_DNOTIFY is not set # CONFIG_INOTIFY_USER is not set diff --git a/arch/riscv/include/asm/clint.h b/arch/riscv/include/asm/clint.h deleted file mode 100644 index adaba98a7d6c.. --- a/arch/riscv/include/asm/clint.h +++ /dev/null @@ -1,14 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _ASM_RISCV_CLINT_H -#define _ASM_RISCV_CLINT_H 1 - -#include -#include - -#ifdef CONFIG_RISCV_M_MODE -void clint_init_boot_cpu(void); -#else /* CONFIG_RISCV_M_MODE */ -#define clint_init_boot_cpu() do { } while (0) -#endif /* CONFIG_RISCV_M_MODE */ - -#endif /* _ASM_RISCV_CLINT_H */ diff --git a/arch/riscv/include/asm/timex.h b/arch/riscv/include/asm/timex.h index bad2a7c2cda5..a3fb85d505d4 100644 --- a/arch/riscv/include/asm/timex.h +++ b/arch/riscv/include/asm/timex.h @@ -7,41 +7,27 @@ #define _ASM_RISCV_TIMEX_H #include -#include typedef unsigned long cycles_t; -extern u64 __iomem *riscv_time_val; -extern u64 __iomem *riscv_time_cmp; - -#ifdef CONFIG_64BIT -#define mmio_get_cycles() readq_relaxed(riscv_time_val) -#else -#define mmio_get_cycles() readl_relaxed(riscv_time_val) -#define mmio_get_cycles_hi()
Re: [PATCH v6 3/4] RISC-V: Remove CLINT related code from timer and arch
On Sat, Jul 25, 2020 at 10:46 AM Atish Patra wrote: > > On Fri, Jul 24, 2020 at 12:19 AM Anup Patel wrote: > > > > Right now the RISC-V timer driver is convoluted to support: > > 1. Linux RISC-V S-mode (with MMU) where it will use TIME CSR for > >clocksource and SBI timer calls for clockevent device. > > 2. Linux RISC-V M-mode (without MMU) where it will use CLINT MMIO > >counter register for clocksource and CLINT MMIO compare register > >for clockevent device. > > > > We now have a separate CLINT timer driver which also provide CLINT > > based IPI operations so let's remove CLINT MMIO related code from > > arch/riscv directory and RISC-V timer driver. > > > > Signed-off-by: Anup Patel > > Tested-by: Emil Renner Berhing > > Acked-by: Daniel Lezcano > > --- > > arch/riscv/Kconfig | 2 +- > > arch/riscv/Kconfig.socs | 2 + > > arch/riscv/configs/nommu_virt_defconfig | 7 +-- > > arch/riscv/include/asm/clint.h | 14 -- > > arch/riscv/include/asm/timex.h | 28 +++ > > arch/riscv/kernel/Makefile | 2 +- > > arch/riscv/kernel/clint.c | 63 - > > arch/riscv/kernel/setup.c | 2 - > > arch/riscv/kernel/smp.c | 1 - > > arch/riscv/kernel/smpboot.c | 1 - > > drivers/clocksource/Kconfig | 3 +- > > drivers/clocksource/timer-riscv.c | 17 +-- > > 12 files changed, 16 insertions(+), 126 deletions(-) > > delete mode 100644 arch/riscv/include/asm/clint.h > > delete mode 100644 arch/riscv/kernel/clint.c > > > > diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig > > index fedb4a72b29a..57a72ae23d10 100644 > > --- a/arch/riscv/Kconfig > > +++ b/arch/riscv/Kconfig > > @@ -74,7 +74,7 @@ config RISCV > > select PCI_DOMAINS_GENERIC if PCI > > select PCI_MSI if PCI > > select RISCV_INTC > > - select RISCV_TIMER > > + select RISCV_TIMER if RISCV_SBI > > select SPARSEMEM_STATIC if 32BIT > > select SPARSE_IRQ > > select SYSCTL_EXCEPTION_TRACE > > diff --git a/arch/riscv/Kconfig.socs b/arch/riscv/Kconfig.socs > > index 6c88148f1b9b..8a55f6156661 100644 > > --- a/arch/riscv/Kconfig.socs > > +++ b/arch/riscv/Kconfig.socs > > @@ -12,6 +12,7 @@ config SOC_SIFIVE > > > > config SOC_VIRT > > bool "QEMU Virt Machine" > > + select CLINT_TIMER if RISCV_M_MODE > > select POWER_RESET > > select POWER_RESET_SYSCON > > select POWER_RESET_SYSCON_POWEROFF > > @@ -24,6 +25,7 @@ config SOC_VIRT > > config SOC_KENDRYTE > > bool "Kendryte K210 SoC" > > depends on !MMU > > + select CLINT_TIMER if RISCV_M_MODE > > select SERIAL_SIFIVE if TTY > > select SERIAL_SIFIVE_CONSOLE if TTY > > select SIFIVE_PLIC > > diff --git a/arch/riscv/configs/nommu_virt_defconfig > > b/arch/riscv/configs/nommu_virt_defconfig > > index cf74e179bf90..cf9388184aa3 100644 > > --- a/arch/riscv/configs/nommu_virt_defconfig > > +++ b/arch/riscv/configs/nommu_virt_defconfig > > @@ -26,6 +26,7 @@ CONFIG_EXPERT=y > > CONFIG_SLOB=y > > # CONFIG_SLAB_MERGE_DEFAULT is not set > > # CONFIG_MMU is not set > > +CONFIG_SOC_VIRT=y > > CONFIG_MAXPHYSMEM_2GB=y > > CONFIG_SMP=y > > CONFIG_CMDLINE="root=/dev/vda rw > > earlycon=uart8250,mmio,0x1000,115200n8 console=ttyS0" > > @@ -48,7 +49,6 @@ CONFIG_VIRTIO_BLK=y > > # CONFIG_SERIO is not set > > # CONFIG_LEGACY_PTYS is not set > > # CONFIG_LDISC_AUTOLOAD is not set > > -# CONFIG_DEVMEM is not set > > CONFIG_SERIAL_8250=y > > # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set > > CONFIG_SERIAL_8250_CONSOLE=y > > @@ -56,16 +56,13 @@ CONFIG_SERIAL_8250_NR_UARTS=1 > > CONFIG_SERIAL_8250_RUNTIME_UARTS=1 > > CONFIG_SERIAL_OF_PLATFORM=y > > # CONFIG_HW_RANDOM is not set > > +# CONFIG_DEVMEM is not set > > # CONFIG_HWMON is not set > > -# CONFIG_LCD_CLASS_DEVICE is not set > > -# CONFIG_BACKLIGHT_CLASS_DEVICE is not set > > Why these changes are in the diff ? These are generated by "make savedefconfig". To preserve bisectability, I have enabled CONFIG_SOC_VIRT in nommu_virt_defconfig and I have used "make savedefconfig" to update nommu_virt_defconfig. > > > # CONFIG_VGA_CONSOLE is not set > > # CONFIG_HID is not set > > # CONFIG_USB_SUPPORT is not set > > CONFIG_VIRTIO_MMIO=y > > CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y > > -CONFIG_SIFIVE_PLIC=y > > -# CONFIG_VALIDATE_FS_PARSER is not set > > CONFIG_EXT2_FS=y > > # CONFIG_DNOTIFY is not set > > # CONFIG_INOTIFY_USER is not set > > diff --git a/arch/riscv/include/asm/clint.h b/arch/riscv/include/asm/clint.h > > deleted file mode 100644 > > index adaba98a7d6c.. > > --- a/arch/riscv/include/asm/clint.h > > +++ /dev/null > > @@ -1,14 +0,0 @@ > > -/* SPDX-License-Identifier: GPL-2.0 */ > > -#ifndef _ASM_RISCV_CLINT_H > > -#define _ASM_RISCV_CLINT_H 1 > > - > > -#include > > -#include > > - > > -#ifdef
Re: [PATCH v6 3/4] RISC-V: Remove CLINT related code from timer and arch
On Fri, Jul 24, 2020 at 12:19 AM Anup Patel wrote: > > Right now the RISC-V timer driver is convoluted to support: > 1. Linux RISC-V S-mode (with MMU) where it will use TIME CSR for >clocksource and SBI timer calls for clockevent device. > 2. Linux RISC-V M-mode (without MMU) where it will use CLINT MMIO >counter register for clocksource and CLINT MMIO compare register >for clockevent device. > > We now have a separate CLINT timer driver which also provide CLINT > based IPI operations so let's remove CLINT MMIO related code from > arch/riscv directory and RISC-V timer driver. > > Signed-off-by: Anup Patel > Tested-by: Emil Renner Berhing > Acked-by: Daniel Lezcano > --- > arch/riscv/Kconfig | 2 +- > arch/riscv/Kconfig.socs | 2 + > arch/riscv/configs/nommu_virt_defconfig | 7 +-- > arch/riscv/include/asm/clint.h | 14 -- > arch/riscv/include/asm/timex.h | 28 +++ > arch/riscv/kernel/Makefile | 2 +- > arch/riscv/kernel/clint.c | 63 - > arch/riscv/kernel/setup.c | 2 - > arch/riscv/kernel/smp.c | 1 - > arch/riscv/kernel/smpboot.c | 1 - > drivers/clocksource/Kconfig | 3 +- > drivers/clocksource/timer-riscv.c | 17 +-- > 12 files changed, 16 insertions(+), 126 deletions(-) > delete mode 100644 arch/riscv/include/asm/clint.h > delete mode 100644 arch/riscv/kernel/clint.c > > diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig > index fedb4a72b29a..57a72ae23d10 100644 > --- a/arch/riscv/Kconfig > +++ b/arch/riscv/Kconfig > @@ -74,7 +74,7 @@ config RISCV > select PCI_DOMAINS_GENERIC if PCI > select PCI_MSI if PCI > select RISCV_INTC > - select RISCV_TIMER > + select RISCV_TIMER if RISCV_SBI > select SPARSEMEM_STATIC if 32BIT > select SPARSE_IRQ > select SYSCTL_EXCEPTION_TRACE > diff --git a/arch/riscv/Kconfig.socs b/arch/riscv/Kconfig.socs > index 6c88148f1b9b..8a55f6156661 100644 > --- a/arch/riscv/Kconfig.socs > +++ b/arch/riscv/Kconfig.socs > @@ -12,6 +12,7 @@ config SOC_SIFIVE > > config SOC_VIRT > bool "QEMU Virt Machine" > + select CLINT_TIMER if RISCV_M_MODE > select POWER_RESET > select POWER_RESET_SYSCON > select POWER_RESET_SYSCON_POWEROFF > @@ -24,6 +25,7 @@ config SOC_VIRT > config SOC_KENDRYTE > bool "Kendryte K210 SoC" > depends on !MMU > + select CLINT_TIMER if RISCV_M_MODE > select SERIAL_SIFIVE if TTY > select SERIAL_SIFIVE_CONSOLE if TTY > select SIFIVE_PLIC > diff --git a/arch/riscv/configs/nommu_virt_defconfig > b/arch/riscv/configs/nommu_virt_defconfig > index cf74e179bf90..cf9388184aa3 100644 > --- a/arch/riscv/configs/nommu_virt_defconfig > +++ b/arch/riscv/configs/nommu_virt_defconfig > @@ -26,6 +26,7 @@ CONFIG_EXPERT=y > CONFIG_SLOB=y > # CONFIG_SLAB_MERGE_DEFAULT is not set > # CONFIG_MMU is not set > +CONFIG_SOC_VIRT=y > CONFIG_MAXPHYSMEM_2GB=y > CONFIG_SMP=y > CONFIG_CMDLINE="root=/dev/vda rw earlycon=uart8250,mmio,0x1000,115200n8 > console=ttyS0" > @@ -48,7 +49,6 @@ CONFIG_VIRTIO_BLK=y > # CONFIG_SERIO is not set > # CONFIG_LEGACY_PTYS is not set > # CONFIG_LDISC_AUTOLOAD is not set > -# CONFIG_DEVMEM is not set > CONFIG_SERIAL_8250=y > # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set > CONFIG_SERIAL_8250_CONSOLE=y > @@ -56,16 +56,13 @@ CONFIG_SERIAL_8250_NR_UARTS=1 > CONFIG_SERIAL_8250_RUNTIME_UARTS=1 > CONFIG_SERIAL_OF_PLATFORM=y > # CONFIG_HW_RANDOM is not set > +# CONFIG_DEVMEM is not set > # CONFIG_HWMON is not set > -# CONFIG_LCD_CLASS_DEVICE is not set > -# CONFIG_BACKLIGHT_CLASS_DEVICE is not set Why these changes are in the diff ? > # CONFIG_VGA_CONSOLE is not set > # CONFIG_HID is not set > # CONFIG_USB_SUPPORT is not set > CONFIG_VIRTIO_MMIO=y > CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y > -CONFIG_SIFIVE_PLIC=y > -# CONFIG_VALIDATE_FS_PARSER is not set > CONFIG_EXT2_FS=y > # CONFIG_DNOTIFY is not set > # CONFIG_INOTIFY_USER is not set > diff --git a/arch/riscv/include/asm/clint.h b/arch/riscv/include/asm/clint.h > deleted file mode 100644 > index adaba98a7d6c.. > --- a/arch/riscv/include/asm/clint.h > +++ /dev/null > @@ -1,14 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0 */ > -#ifndef _ASM_RISCV_CLINT_H > -#define _ASM_RISCV_CLINT_H 1 > - > -#include > -#include > - > -#ifdef CONFIG_RISCV_M_MODE > -void clint_init_boot_cpu(void); > -#else /* CONFIG_RISCV_M_MODE */ > -#define clint_init_boot_cpu() do { } while (0) > -#endif /* CONFIG_RISCV_M_MODE */ > - > -#endif /* _ASM_RISCV_CLINT_H */ > diff --git a/arch/riscv/include/asm/timex.h b/arch/riscv/include/asm/timex.h > index bad2a7c2cda5..a3fb85d505d4 100644 > --- a/arch/riscv/include/asm/timex.h > +++ b/arch/riscv/include/asm/timex.h > @@ -7,41 +7,27 @@ > #define _ASM_RISCV_TIMEX_H > > #include > -#include > > typedef
[PATCH v6 3/4] RISC-V: Remove CLINT related code from timer and arch
Right now the RISC-V timer driver is convoluted to support: 1. Linux RISC-V S-mode (with MMU) where it will use TIME CSR for clocksource and SBI timer calls for clockevent device. 2. Linux RISC-V M-mode (without MMU) where it will use CLINT MMIO counter register for clocksource and CLINT MMIO compare register for clockevent device. We now have a separate CLINT timer driver which also provide CLINT based IPI operations so let's remove CLINT MMIO related code from arch/riscv directory and RISC-V timer driver. Signed-off-by: Anup Patel Tested-by: Emil Renner Berhing Acked-by: Daniel Lezcano --- arch/riscv/Kconfig | 2 +- arch/riscv/Kconfig.socs | 2 + arch/riscv/configs/nommu_virt_defconfig | 7 +-- arch/riscv/include/asm/clint.h | 14 -- arch/riscv/include/asm/timex.h | 28 +++ arch/riscv/kernel/Makefile | 2 +- arch/riscv/kernel/clint.c | 63 - arch/riscv/kernel/setup.c | 2 - arch/riscv/kernel/smp.c | 1 - arch/riscv/kernel/smpboot.c | 1 - drivers/clocksource/Kconfig | 3 +- drivers/clocksource/timer-riscv.c | 17 +-- 12 files changed, 16 insertions(+), 126 deletions(-) delete mode 100644 arch/riscv/include/asm/clint.h delete mode 100644 arch/riscv/kernel/clint.c diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index fedb4a72b29a..57a72ae23d10 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -74,7 +74,7 @@ config RISCV select PCI_DOMAINS_GENERIC if PCI select PCI_MSI if PCI select RISCV_INTC - select RISCV_TIMER + select RISCV_TIMER if RISCV_SBI select SPARSEMEM_STATIC if 32BIT select SPARSE_IRQ select SYSCTL_EXCEPTION_TRACE diff --git a/arch/riscv/Kconfig.socs b/arch/riscv/Kconfig.socs index 6c88148f1b9b..8a55f6156661 100644 --- a/arch/riscv/Kconfig.socs +++ b/arch/riscv/Kconfig.socs @@ -12,6 +12,7 @@ config SOC_SIFIVE config SOC_VIRT bool "QEMU Virt Machine" + select CLINT_TIMER if RISCV_M_MODE select POWER_RESET select POWER_RESET_SYSCON select POWER_RESET_SYSCON_POWEROFF @@ -24,6 +25,7 @@ config SOC_VIRT config SOC_KENDRYTE bool "Kendryte K210 SoC" depends on !MMU + select CLINT_TIMER if RISCV_M_MODE select SERIAL_SIFIVE if TTY select SERIAL_SIFIVE_CONSOLE if TTY select SIFIVE_PLIC diff --git a/arch/riscv/configs/nommu_virt_defconfig b/arch/riscv/configs/nommu_virt_defconfig index cf74e179bf90..cf9388184aa3 100644 --- a/arch/riscv/configs/nommu_virt_defconfig +++ b/arch/riscv/configs/nommu_virt_defconfig @@ -26,6 +26,7 @@ CONFIG_EXPERT=y CONFIG_SLOB=y # CONFIG_SLAB_MERGE_DEFAULT is not set # CONFIG_MMU is not set +CONFIG_SOC_VIRT=y CONFIG_MAXPHYSMEM_2GB=y CONFIG_SMP=y CONFIG_CMDLINE="root=/dev/vda rw earlycon=uart8250,mmio,0x1000,115200n8 console=ttyS0" @@ -48,7 +49,6 @@ CONFIG_VIRTIO_BLK=y # CONFIG_SERIO is not set # CONFIG_LEGACY_PTYS is not set # CONFIG_LDISC_AUTOLOAD is not set -# CONFIG_DEVMEM is not set CONFIG_SERIAL_8250=y # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set CONFIG_SERIAL_8250_CONSOLE=y @@ -56,16 +56,13 @@ CONFIG_SERIAL_8250_NR_UARTS=1 CONFIG_SERIAL_8250_RUNTIME_UARTS=1 CONFIG_SERIAL_OF_PLATFORM=y # CONFIG_HW_RANDOM is not set +# CONFIG_DEVMEM is not set # CONFIG_HWMON is not set -# CONFIG_LCD_CLASS_DEVICE is not set -# CONFIG_BACKLIGHT_CLASS_DEVICE is not set # CONFIG_VGA_CONSOLE is not set # CONFIG_HID is not set # CONFIG_USB_SUPPORT is not set CONFIG_VIRTIO_MMIO=y CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y -CONFIG_SIFIVE_PLIC=y -# CONFIG_VALIDATE_FS_PARSER is not set CONFIG_EXT2_FS=y # CONFIG_DNOTIFY is not set # CONFIG_INOTIFY_USER is not set diff --git a/arch/riscv/include/asm/clint.h b/arch/riscv/include/asm/clint.h deleted file mode 100644 index adaba98a7d6c.. --- a/arch/riscv/include/asm/clint.h +++ /dev/null @@ -1,14 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _ASM_RISCV_CLINT_H -#define _ASM_RISCV_CLINT_H 1 - -#include -#include - -#ifdef CONFIG_RISCV_M_MODE -void clint_init_boot_cpu(void); -#else /* CONFIG_RISCV_M_MODE */ -#define clint_init_boot_cpu() do { } while (0) -#endif /* CONFIG_RISCV_M_MODE */ - -#endif /* _ASM_RISCV_CLINT_H */ diff --git a/arch/riscv/include/asm/timex.h b/arch/riscv/include/asm/timex.h index bad2a7c2cda5..a3fb85d505d4 100644 --- a/arch/riscv/include/asm/timex.h +++ b/arch/riscv/include/asm/timex.h @@ -7,41 +7,27 @@ #define _ASM_RISCV_TIMEX_H #include -#include typedef unsigned long cycles_t; -extern u64 __iomem *riscv_time_val; -extern u64 __iomem *riscv_time_cmp; - -#ifdef CONFIG_64BIT -#define mmio_get_cycles() readq_relaxed(riscv_time_val) -#else -#define mmio_get_cycles() readl_relaxed(riscv_time_val) -#define mmio_get_cycles_hi() readl_relaxed(((u32 *)riscv_time_val) + 1) -#endif - static inline