On Thu, Oct 28, 2021 at 3:42 AM Palmer Dabbelt <palmerdabbelt@xxxxxxxxxx> wrote: > > On Tue, 26 Oct 2021 10:01:34 PDT (-0700), Anup Patel wrote: > > Let's enable KVM RISC-V in RV64 and RV32 defconfigs as module > > so that it always built along with the default kernel image. > > Turning on KVM in the defconfigs seems like the right way to go, but > this has more diff than just that. Not sure if that's all just > savedefconfig stuff, I usually try and split out the non-functional > changes from anything that makes a change. Other diffs in the defconfigs are generated by "make savedefconfig". I guess this is because most people don't use "make savedefconfig" to generate updated defconfigs. > > If you checked then > > Acked-by: Palmer Dabbelt <palmerdabbelt@xxxxxxxxxx> > > assuming you want to keep these together. LMK if you want me to take > this on its own (I'll split it up if you do). Thanks Palmer. Regards, Anup > > > > > Signed-off-by: Anup Patel <anup.patel@xxxxxxx> > > --- > > arch/riscv/configs/defconfig | 15 +++++++-------- > > arch/riscv/configs/rv32_defconfig | 8 ++++---- > > 2 files changed, 11 insertions(+), 12 deletions(-) > > > > diff --git a/arch/riscv/configs/defconfig b/arch/riscv/configs/defconfig > > index 4ebc80315f01..40506dfab5cf 100644 > > --- a/arch/riscv/configs/defconfig > > +++ b/arch/riscv/configs/defconfig > > @@ -2,6 +2,7 @@ CONFIG_SYSVIPC=y > > CONFIG_POSIX_MQUEUE=y > > CONFIG_NO_HZ_IDLE=y > > CONFIG_HIGH_RES_TIMERS=y > > +CONFIG_BPF_SYSCALL=y > > CONFIG_IKCONFIG=y > > CONFIG_IKCONFIG_PROC=y > > CONFIG_CGROUPS=y > > @@ -13,12 +14,14 @@ CONFIG_USER_NS=y > > CONFIG_CHECKPOINT_RESTORE=y > > CONFIG_BLK_DEV_INITRD=y > > CONFIG_EXPERT=y > > -CONFIG_BPF_SYSCALL=y > > +# CONFIG_SYSFS_SYSCALL is not set > > +CONFIG_SOC_MICROCHIP_POLARFIRE=y > > CONFIG_SOC_SIFIVE=y > > CONFIG_SOC_VIRT=y > > -CONFIG_SOC_MICROCHIP_POLARFIRE=y > > CONFIG_SMP=y > > CONFIG_HOTPLUG_CPU=y > > +CONFIG_VIRTUALIZATION=y > > +CONFIG_KVM=m > > CONFIG_JUMP_LABEL=y > > CONFIG_MODULES=y > > CONFIG_MODULE_UNLOAD=y > > @@ -68,14 +71,12 @@ CONFIG_HW_RANDOM=y > > CONFIG_HW_RANDOM_VIRTIO=y > > CONFIG_SPI=y > > CONFIG_SPI_SIFIVE=y > > +# CONFIG_PTP_1588_CLOCK is not set > > CONFIG_GPIOLIB=y > > CONFIG_GPIO_SIFIVE=y > > -# CONFIG_PTP_1588_CLOCK is not set > > -CONFIG_POWER_RESET=y > > CONFIG_DRM=y > > CONFIG_DRM_RADEON=y > > CONFIG_DRM_VIRTIO_GPU=y > > -CONFIG_FRAMEBUFFER_CONSOLE=y > > CONFIG_USB=y > > CONFIG_USB_XHCI_HCD=y > > CONFIG_USB_XHCI_PLATFORM=y > > @@ -85,10 +86,10 @@ CONFIG_USB_OHCI_HCD=y > > CONFIG_USB_OHCI_HCD_PLATFORM=y > > CONFIG_USB_STORAGE=y > > CONFIG_USB_UAS=y > > +CONFIG_MMC=y > > CONFIG_MMC_SDHCI=y > > CONFIG_MMC_SDHCI_PLTFM=y > > CONFIG_MMC_SDHCI_CADENCE=y > > -CONFIG_MMC=y > > CONFIG_MMC_SPI=y > > CONFIG_RTC_CLASS=y > > CONFIG_VIRTIO_PCI=y > > @@ -139,5 +140,3 @@ CONFIG_RCU_EQS_DEBUG=y > > # CONFIG_FTRACE is not set > > # CONFIG_RUNTIME_TESTING_MENU is not set > > CONFIG_MEMTEST=y > > -# CONFIG_SYSFS_SYSCALL is not set > > -CONFIG_EFI=y > > diff --git a/arch/riscv/configs/rv32_defconfig b/arch/riscv/configs/rv32_defconfig > > index 434ef5b64599..44022e048efd 100644 > > --- a/arch/riscv/configs/rv32_defconfig > > +++ b/arch/riscv/configs/rv32_defconfig > > @@ -2,6 +2,7 @@ CONFIG_SYSVIPC=y > > CONFIG_POSIX_MQUEUE=y > > CONFIG_NO_HZ_IDLE=y > > CONFIG_HIGH_RES_TIMERS=y > > +CONFIG_BPF_SYSCALL=y > > CONFIG_IKCONFIG=y > > CONFIG_IKCONFIG_PROC=y > > CONFIG_CGROUPS=y > > @@ -13,12 +14,14 @@ CONFIG_USER_NS=y > > CONFIG_CHECKPOINT_RESTORE=y > > CONFIG_BLK_DEV_INITRD=y > > CONFIG_EXPERT=y > > -CONFIG_BPF_SYSCALL=y > > +# CONFIG_SYSFS_SYSCALL is not set > > CONFIG_SOC_SIFIVE=y > > CONFIG_SOC_VIRT=y > > CONFIG_ARCH_RV32I=y > > CONFIG_SMP=y > > CONFIG_HOTPLUG_CPU=y > > +CONFIG_VIRTUALIZATION=y > > +CONFIG_KVM=m > > CONFIG_JUMP_LABEL=y > > CONFIG_MODULES=y > > CONFIG_MODULE_UNLOAD=y > > @@ -67,11 +70,9 @@ 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 > > CONFIG_DRM_RADEON=y > > CONFIG_DRM_VIRTIO_GPU=y > > -CONFIG_FRAMEBUFFER_CONSOLE=y > > CONFIG_USB=y > > CONFIG_USB_XHCI_HCD=y > > CONFIG_USB_XHCI_PLATFORM=y > > @@ -130,4 +131,3 @@ CONFIG_RCU_EQS_DEBUG=y > > # CONFIG_FTRACE is not set > > # CONFIG_RUNTIME_TESTING_MENU is not set > > CONFIG_MEMTEST=y > > -# CONFIG_SYSFS_SYSCALL is not set
