Commit f22c5579 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'riscv-for-linus-5.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux 

Pull RISC-V fixes from Palmer Dabbelt:

 - The CLINT driver has been split in two: one to handle the M-mode
   CLINT (memory mapped and used on NOMMU systems) and one to handle the
   S-mode CLINT (via SBI).

 - The addition of SiFive's drivers to rv32_defconfig

* tag 'riscv-for-linus-5.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
  riscv: Add SiFive drivers to rv32_defconfig
  dt-bindings: timer: Add CLINT bindings
  RISC-V: Remove CLINT related code from timer and arch
  clocksource/drivers: Add CLINT timer driver
  RISC-V: Add mechanism to provide custom IPI operations
parents c0a4f5b3 fc26f5bb

Documentation/devicetree/bindings/timer/sifive,clint.yaml

0 → 100644
+60 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/timer/sifive,clint.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: SiFive Core Local Interruptor



maintainers:

  - Palmer Dabbelt <palmer@dabbelt.com>

  - Anup Patel <anup.patel@wdc.com>



description:

  SiFive (and other RISC-V) SOCs include an implementation of the SiFive

  Core Local Interruptor (CLINT) for M-mode timer and M-mode inter-processor

  interrupts. It directly connects to the timer and inter-processor interrupt

  lines of various HARTs (or CPUs) so RISC-V per-HART (or per-CPU) local

  interrupt controller is the parent interrupt controller for CLINT device.

  The clock frequency of CLINT is specified via "timebase-frequency" DT

  property of "/cpus" DT node. The "timebase-frequency" DT property is

  described in Documentation/devicetree/bindings/riscv/cpus.yaml



properties:

  compatible:

    items:

      - const: sifive,fu540-c000-clint

      - const: sifive,clint0



    description:

      Should be "sifive,<chip>-clint" and "sifive,clint<version>".

      Supported compatible strings are -

      "sifive,fu540-c000-clint" for the SiFive CLINT v0 as integrated

      onto the SiFive FU540 chip, and "sifive,clint0" for the SiFive

      CLINT v0 IP block with no chip integration tweaks.

      Please refer to sifive-blocks-ip-versioning.txt for details



  reg:

    maxItems: 1



  interrupts-extended:

    minItems: 1



additionalProperties: false



required:

  - compatible

  - reg

  - interrupts-extended



examples:

  - |

    timer@2000000 {

      compatible = "sifive,fu540-c000-clint", "sifive,clint0";

      interrupts-extended = <&cpu1intc 3 &cpu1intc 7

                             &cpu2intc 3 &cpu2intc 7

                             &cpu3intc 3 &cpu3intc 7

                             &cpu4intc 3 &cpu4intc 7>;

       reg = <0x2000000 0x10000>;

    };

...

arch/riscv/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,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

arch/riscv/Kconfig.socs

+2 −0
Original line number Diff line number Diff line
@@ -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

arch/riscv/configs/nommu_virt_defconfig

+2 −5
Original line number Diff line number Diff line
@@ -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,0x10000000,115200n8 console=ttyS0"
@@ -49,7 +50,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
@@ -57,16 +57,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

arch/riscv/configs/rv32_defconfig

+5 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ CONFIG_CHECKPOINT_RESTORE=y 
CONFIG_BLK_DEV_INITRD=y

CONFIG_EXPERT=y

CONFIG_BPF_SYSCALL=y

CONFIG_SOC_SIFIVE=y

CONFIG_SOC_VIRT=y

CONFIG_ARCH_RV32I=y

CONFIG_SMP=y
@@ -62,6 +63,8 @@ CONFIG_HVC_RISCV_SBI=y 
CONFIG_VIRTIO_CONSOLE=y

CONFIG_HW_RANDOM=y

CONFIG_HW_RANDOM_VIRTIO=y

CONFIG_SPI=y

CONFIG_SPI_SIFIVE=y

# CONFIG_PTP_1588_CLOCK is not set

CONFIG_POWER_RESET=y

CONFIG_DRM=y
@@ -77,6 +80,8 @@ CONFIG_USB_OHCI_HCD=y 
CONFIG_USB_OHCI_HCD_PLATFORM=y

CONFIG_USB_STORAGE=y

CONFIG_USB_UAS=y

CONFIG_MMC=y

CONFIG_MMC_SPI=y

CONFIG_RTC_CLASS=y

CONFIG_VIRTIO_PCI=y

CONFIG_VIRTIO_BALLOON=y