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

  * :c:macro:`RISCV_HWPROBE_EXT_ZBS`: The Zbs extension is supported, as defined

       in version 1.0 of the Bit-Manipulation ISA extensions.

  * :c:macro:`RISCV_HWPROBE_EXT_ZICBOZ`: The Zicboz extension is supported, as

       ratified in commit 3dd606f ("Create cmobase-v1.0.pdf") of riscv-CMOs.

* :c:macro:`RISCV_HWPROBE_KEY_CPUPERF_0`: A bitmask that contains performance

  information about the selected set of processors.

  * :c:macro:`RISCV_HWPROBE_MISALIGNED_UNSUPPORTED`: Misaligned accesses are

    not supported at all and will generate a misaligned address fault.

* :c:macro:`RISCV_HWPROBE_KEY_ZICBOZ_BLOCK_SIZE`: An unsigned int which

  represents the size of the Zicboz block in bytes.

	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST

	select ARCH_HAS_UBSAN_SANITIZE_ALL

	select ARCH_HAS_VDSO_DATA

	select ARCH_KEEP_MEMBLOCK if ACPI

	select ARCH_OPTIONAL_KERNEL_RWX if ARCH_HAS_STRICT_KERNEL_RWX

	select ARCH_OPTIONAL_KERNEL_RWX_DEFAULT

	select ARCH_STACKWALK

	select ARCH_SUPPORTS_HUGETLBFS if MMU

	select ARCH_SUPPORTS_PAGE_TABLE_CHECK if MMU

	select ARCH_SUPPORTS_PER_VMA_LOCK if MMU

	select ARCH_SUPPORTS_SHADOW_CALL_STACK if HAVE_SHADOW_CALL_STACK

	select ARCH_USE_MEMTEST

	select ARCH_USE_QUEUED_RWLOCKS

	select ARCH_USES_CFI_TRAPS if CFI_CLANG

	def_bool CC_IS_GCC

	depends on $(cc-option,-fpatchable-function-entry=8)

config HAVE_SHADOW_CALL_STACK

	def_bool $(cc-option,-fsanitize=shadow-call-stack)

	# https://github.com/riscv-non-isa/riscv-elf-psabi-doc/commit/a484e843e6eeb51f0cb7b8819e50da6d2444d769

	depends on $(ld-option,--no-relax-gp)

config ARCH_MMAP_RND_BITS_MIN

	default 18 if 64BIT

	default 8

endif

endif

ifeq ($(CONFIG_SHADOW_CALL_STACK),y)

	KBUILD_LDFLAGS += --no-relax-gp

endif

# ISA string setting

riscv-march-$(CONFIG_ARCH_RV32I)	:= rv32ima

riscv-march-$(CONFIG_ARCH_RV64I)	:= rv64ima

CONFIG_HOTPLUG_CPU=y

CONFIG_PM=y

CONFIG_CPU_IDLE=y

CONFIG_CPU_FREQ=y

CONFIG_CPU_FREQ_STAT=y

CONFIG_CPU_FREQ_GOV_POWERSAVE=m

CONFIG_CPU_FREQ_GOV_USERSPACE=y

CONFIG_CPU_FREQ_GOV_ONDEMAND=y

CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m

CONFIG_CPUFREQ_DT=y

CONFIG_VIRTUALIZATION=y

CONFIG_KVM=m

CONFIG_ACPI=y

CONFIG_CGROUP_NET_PRIO=y

CONFIG_NET_9P=y

CONFIG_NET_9P_VIRTIO=y

CONFIG_CAN=m

CONFIG_PCI=y

CONFIG_PCIEPORTBUS=y

CONFIG_PCI_HOST_GENERIC=y

CONFIG_PCIE_FU740=y

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_MTD=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_ADV_OPTIONS=y

CONFIG_MTD_SPI_NOR=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_VIRTIO_BLK=y

CONFIG_BLK_DEV_NVME=m

CONFIG_MACB=y

CONFIG_E1000E=y

CONFIG_R8169=y

CONFIG_RAVB=y

CONFIG_STMMAC_ETH=m

CONFIG_MICREL_PHY=y

CONFIG_MICROSEMI_PHY=y

CONFIG_CAN_RCAR_CANFD=m

CONFIG_INPUT_MOUSEDEV=y

CONFIG_KEYBOARD_SUN4I_LRADC=m

CONFIG_SERIAL_8250=y

CONFIG_VIRTIO_CONSOLE=y

CONFIG_HW_RANDOM=y

CONFIG_HW_RANDOM_VIRTIO=y

CONFIG_I2C_CHARDEV=m

CONFIG_I2C_MV64XXX=m

CONFIG_I2C_RIIC=y

CONFIG_SPI=y

CONFIG_SPI_RSPI=m

CONFIG_SPI_SIFIVE=y

CONFIG_SPI_SUN6I=y

# CONFIG_PTP_1588_CLOCK is not set

CONFIG_GPIO_SIFIVE=y

CONFIG_CPU_THERMAL=y

CONFIG_DEVFREQ_THERMAL=y

CONFIG_RZG2L_THERMAL=y

CONFIG_WATCHDOG=y

CONFIG_SUNXI_WATCHDOG=y

CONFIG_RENESAS_RZG2LWDT=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_GPIO=y

CONFIG_DRM=m

CONFIG_DRM_RADEON=m

CONFIG_DRM_NOUVEAU=m

CONFIG_DRM_VIRTIO_GPU=m

CONFIG_FB=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_SND_SOC=y

CONFIG_SND_SOC_RZ=m

CONFIG_SND_SOC_WM8978=m

CONFIG_SND_SIMPLE_CARD=m

CONFIG_USB=y

CONFIG_USB_OTG=y

CONFIG_USB_XHCI_HCD=y

CONFIG_USB_XHCI_PLATFORM=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_HCD_PLATFORM=y

CONFIG_USB_OHCI_HCD=y

CONFIG_USB_OHCI_HCD_PLATFORM=y

CONFIG_USB_RENESAS_USBHS=m

CONFIG_USB_STORAGE=y

CONFIG_USB_UAS=y

CONFIG_USB_MUSB_HDRC=m

CONFIG_USB_MUSB_SUNXI=m

CONFIG_NOP_USB_XCEIV=m

CONFIG_USB_GADGET=y

CONFIG_USB_RENESAS_USBHS_UDC=m

CONFIG_USB_CONFIGFS=m

CONFIG_USB_CONFIGFS_SERIAL=y

CONFIG_USB_CONFIGFS_ACM=y

CONFIG_USB_CONFIGFS_OBEX=y

CONFIG_USB_CONFIGFS_NCM=y

CONFIG_USB_CONFIGFS_ECM=y

CONFIG_USB_CONFIGFS_ECM_SUBSET=y

CONFIG_USB_CONFIGFS_RNDIS=y

CONFIG_USB_CONFIGFS_EEM=y

CONFIG_USB_CONFIGFS_MASS_STORAGE=y

CONFIG_USB_CONFIGFS_F_FS=y

CONFIG_MMC=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_CADENCE=y

CONFIG_MMC_SPI=y

CONFIG_MMC_SDHI=y

CONFIG_MMC_SUNXI=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_SUN6I=y

CONFIG_DMADEVICES=y

CONFIG_DMA_SUN6I=m

CONFIG_RZ_DMAC=y

CONFIG_VIRTIO_PCI=y

CONFIG_VIRTIO_BALLOON=y

CONFIG_VIRTIO_INPUT=y

CONFIG_VIRTIO_MMIO=y

CONFIG_RENESAS_OSTM=y

CONFIG_SUN8I_DE2_CCU=m

CONFIG_SUN50I_IOMMU=y

CONFIG_RPMSG_CHAR=y

CONFIG_RPMSG_CTRL=y

CONFIG_RPMSG_VIRTIO=y

CONFIG_ARCH_R9A07G043=y

CONFIG_IIO=y

CONFIG_RZG2L_ADC=m

CONFIG_RESET_RZG2L_USBPHY_CTRL=y

CONFIG_PHY_SUN4I_USB=m

CONFIG_PHY_RCAR_GEN3_USB2=y

CONFIG_LIBNVDIMM=y

CONFIG_NVMEM_SUNXI_SID=y

CONFIG_EXT4_FS=y

		       unsigned int cpu, const char **isa);

static inline int acpi_numa_get_nid(unsigned int cpu) { return NUMA_NO_NODE; }

void acpi_get_cbo_block_size(struct acpi_table_header *table, u32 *cbom_size,

			     u32 *cboz_size, u32 *cbop_size);

#else

static inline void acpi_init_rintc_map(void) { }

static inline struct acpi_madt_rintc *acpi_cpu_get_madt_rintc(int cpu)

	return -EINVAL;

}

static inline void acpi_get_cbo_block_size(struct acpi_table_header *table,

					   u32 *cbom_size, u32 *cboz_size,

					   u32 *cbop_size) { }

#endif /* CONFIG_ACPI */

#endif /*_ASM_ACPI_H*/