mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2025-01-04 21:04:46 +08:00
f1b744f65e
* Support for the DA9063 as used on the HiFive Unmatched.
* Support for relative extables, which puts us in line with other
architectures and save some space in vmlinux.
* A handful of kexec fixes/improvements, including the ability to run
crash kernels from PCI-addressable memory on the HiFive Unmatched.
* Support for the SBI SRST extension, which allows systems that do not
have an explicit driver in Linux to reboot.
* A handful of fixes and cleanups, including to the defconfigs and
device trees.
---
This time I do expect to have a part 2, as there's still some smaller
patches on the list. I was hoping to get through more of that over the
weekend, but I got distracted with the ABI issues. Figured it's better
to send this sooner rather than waiting.
Included are my merge resolutions against a master from this morning, if
that helps any:
diff --cc arch/riscv/include/asm/sbi.h
index 289621da4a2a,9c46dd3ff4a2..000000000000
--- a/arch/riscv/include/asm/sbi.h
+++ b/arch/riscv/include/asm/sbi.h
@@@ -27,7 -27,14 +27,15 @@@ enum sbi_ext_id
SBI_EXT_IPI = 0x735049,
SBI_EXT_RFENCE = 0x52464E43,
SBI_EXT_HSM = 0x48534D,
+ SBI_EXT_SRST = 0x53525354,
+
+ /* Experimentals extensions must lie within this range */
+ SBI_EXT_EXPERIMENTAL_START = 0x08000000,
+ SBI_EXT_EXPERIMENTAL_END = 0x08FFFFFF,
+
+ /* Vendor extensions must lie within this range */
+ SBI_EXT_VENDOR_START = 0x09000000,
+ SBI_EXT_VENDOR_END = 0x09FFFFFF,
};
enum sbi_ext_base_fid {
diff --git a/arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts b/arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts
index e03a4c94cf3f..6bfa1f24d3de 100644
--- a/arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts
+++ b/arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts
@@ -188,14 +188,6 @@ vdd_ldo11: ldo11 {
regulator-always-on;
};
};
-
- rtc {
- compatible = "dlg,da9063-rtc";
- };
-
- wdt {
- compatible = "dlg,da9063-watchdog";
- };
};
};
-----BEGIN PGP SIGNATURE-----
iQJHBAABCAAxFiEEKzw3R0RoQ7JKlDp6LhMZ81+7GIkFAmHnDV4THHBhbG1lckBk
YWJiZWx0LmNvbQAKCRAuExnzX7sYiaGWD/wOMHVLrkLZDxKHY3lFU7S7FanpFgcU
L265fgKtoG/QOI9WPuQlN7pYvrC4ssUvtQ23WwZ+iz4pJlUwoMb2TAqBBeTXxEbW
pVF2QqnlPdv2ZEn95MFxZ0HQB2+xgJKPL5gdD6Iz7oe2378lf7tywSF7MYpxG/AA
CeHUxzhEPhQJntufTievMhvYpM7ZyhCr19ZAHXRaPoGReJK5ZMCeYHGTrHD4EisG
hO/Pg2vx/Ynxi/vb/C69kpTBvu4Qsxnbhgfy1SowrO3FhxcZTbyrZ6l8uRxSAHIg
dA0NLPh/YDQCPXYnphQcLo+Q9Gy4Sz5es7ULnnMyyEOZxoVyy4up3rCAFAL3Ubav
CNQdk/ZWtrZ+s4chilA1kW97apxocvmq5ULg+7Hi58ZUzk+y7MQBVCClohyONVEU
/leJzJ3nq3YHFgfo8Uh7L+iPzlNgycfi4gRnGJIkEVRhXBPTfJ/Pc5wjPoPVsFvt
pjEYT4YaXITZ0QBLdcuPex5h3PXkRsORsZl8eJGnIz8742KA4tfFraZ4BkbrjoqC
tLsi7Si9hN3JKhLsNgclb76tDkoz4CY7yZ7TT7hRbKdZZJkVRu1XqUq75X18CVQv
9p7Q7j1b5H3Z+/5KOxwS0UO73y92yvyVvi0cLqBoD2Tkeq3beumxmy50Qy+O+h1D
Ut7GwcyavzfS8Q==
=uqtf
-----END PGP SIGNATURE-----
Merge tag 'riscv-for-linus-5.17-mw0' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux
Pull RISC-V updates from Palmer Dabbelt:
- Support for the DA9063 as used on the HiFive Unmatched.
- Support for relative extables, which puts us in line with other
architectures and save some space in vmlinux.
- A handful of kexec fixes/improvements, including the ability to run
crash kernels from PCI-addressable memory on the HiFive Unmatched.
- Support for the SBI SRST extension, which allows systems that do not
have an explicit driver in Linux to reboot.
- A handful of fixes and cleanups, including to the defconfigs and
device trees.
* tag 'riscv-for-linus-5.17-mw0' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux: (52 commits)
RISC-V: Use SBI SRST extension when available
riscv: mm: fix wrong phys_ram_base value for RV64
RISC-V: Use common riscv_cpuid_to_hartid_mask() for both SMP=y and SMP=n
riscv: head: remove useless __PAGE_ALIGNED_BSS and .balign
riscv: errata: alternative: mark vendor_patch_func __initdata
riscv: head: make secondary_start_common() static
riscv: remove cpu_stop()
riscv: try to allocate crashkern region from 32bit addressible memory
riscv: use hart id instead of cpu id on machine_kexec
riscv: Don't use va_pa_offset on kdump
riscv: dts: sifive: fu540-c000: Fix PLIC node
riscv: dts: sifive: fu540-c000: Drop bogus soc node compatible values
riscv: dts: sifive: Group tuples in register properties
riscv: dts: sifive: Group tuples in interrupt properties
riscv: dts: microchip: mpfs: Group tuples in interrupt properties
riscv: dts: microchip: mpfs: Fix clock controller node
riscv: dts: microchip: mpfs: Fix reference clock node
riscv: dts: microchip: mpfs: Fix PLIC node
riscv: dts: microchip: mpfs: Drop empty chosen node
riscv: dts: canaan: Group tuples in interrupt properties
...
146 lines
3.0 KiB
Plaintext
146 lines
3.0 KiB
Plaintext
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
|
|
CONFIG_CGROUP_SCHED=y
|
|
CONFIG_CFS_BANDWIDTH=y
|
|
CONFIG_CGROUP_BPF=y
|
|
CONFIG_NAMESPACES=y
|
|
CONFIG_USER_NS=y
|
|
CONFIG_CHECKPOINT_RESTORE=y
|
|
CONFIG_BLK_DEV_INITRD=y
|
|
CONFIG_EXPERT=y
|
|
# CONFIG_SYSFS_SYSCALL is not set
|
|
CONFIG_SOC_MICROCHIP_POLARFIRE=y
|
|
CONFIG_SOC_SIFIVE=y
|
|
CONFIG_SOC_VIRT=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
|
|
CONFIG_NET=y
|
|
CONFIG_PACKET=y
|
|
CONFIG_UNIX=y
|
|
CONFIG_INET=y
|
|
CONFIG_IP_MULTICAST=y
|
|
CONFIG_IP_ADVANCED_ROUTER=y
|
|
CONFIG_IP_PNP=y
|
|
CONFIG_IP_PNP_DHCP=y
|
|
CONFIG_IP_PNP_BOOTP=y
|
|
CONFIG_IP_PNP_RARP=y
|
|
CONFIG_NETLINK_DIAG=y
|
|
CONFIG_NET_9P=y
|
|
CONFIG_NET_9P_VIRTIO=y
|
|
CONFIG_PCI=y
|
|
CONFIG_PCIEPORTBUS=y
|
|
CONFIG_PCI_HOST_GENERIC=y
|
|
CONFIG_PCIE_XILINX=y
|
|
CONFIG_PCIE_FU740=y
|
|
CONFIG_DEVTMPFS=y
|
|
CONFIG_DEVTMPFS_MOUNT=y
|
|
CONFIG_BLK_DEV_LOOP=y
|
|
CONFIG_VIRTIO_BLK=y
|
|
CONFIG_BLK_DEV_NVME=m
|
|
CONFIG_BLK_DEV_SD=y
|
|
CONFIG_BLK_DEV_SR=y
|
|
CONFIG_SCSI_VIRTIO=y
|
|
CONFIG_ATA=y
|
|
CONFIG_SATA_AHCI=y
|
|
CONFIG_SATA_AHCI_PLATFORM=y
|
|
CONFIG_NETDEVICES=y
|
|
CONFIG_VIRTIO_NET=y
|
|
CONFIG_MACB=y
|
|
CONFIG_E1000E=y
|
|
CONFIG_R8169=y
|
|
CONFIG_MICROSEMI_PHY=y
|
|
CONFIG_INPUT_MOUSEDEV=y
|
|
CONFIG_SERIAL_8250=y
|
|
CONFIG_SERIAL_8250_CONSOLE=y
|
|
CONFIG_SERIAL_OF_PLATFORM=y
|
|
CONFIG_SERIAL_EARLYCON_RISCV_SBI=y
|
|
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_GPIOLIB=y
|
|
CONFIG_GPIO_SIFIVE=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_USB=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_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_SPI=y
|
|
CONFIG_RTC_CLASS=y
|
|
CONFIG_VIRTIO_PCI=y
|
|
CONFIG_VIRTIO_BALLOON=y
|
|
CONFIG_VIRTIO_INPUT=y
|
|
CONFIG_VIRTIO_MMIO=y
|
|
CONFIG_RPMSG_CHAR=y
|
|
CONFIG_RPMSG_VIRTIO=y
|
|
CONFIG_EXT4_FS=y
|
|
CONFIG_EXT4_FS_POSIX_ACL=y
|
|
CONFIG_AUTOFS4_FS=y
|
|
CONFIG_MSDOS_FS=y
|
|
CONFIG_VFAT_FS=y
|
|
CONFIG_TMPFS=y
|
|
CONFIG_TMPFS_POSIX_ACL=y
|
|
CONFIG_NFS_FS=y
|
|
CONFIG_NFS_V4=y
|
|
CONFIG_NFS_V4_1=y
|
|
CONFIG_NFS_V4_2=y
|
|
CONFIG_ROOT_NFS=y
|
|
CONFIG_9P_FS=y
|
|
CONFIG_NLS_CODEPAGE_437=y
|
|
CONFIG_NLS_ISO8859_1=m
|
|
CONFIG_CRYPTO_USER_API_HASH=y
|
|
CONFIG_CRYPTO_DEV_VIRTIO=y
|
|
CONFIG_PRINTK_TIME=y
|
|
CONFIG_DEBUG_FS=y
|
|
CONFIG_DEBUG_PAGEALLOC=y
|
|
CONFIG_SCHED_STACK_END_CHECK=y
|
|
CONFIG_DEBUG_VM=y
|
|
CONFIG_DEBUG_VM_PGFLAGS=y
|
|
CONFIG_DEBUG_MEMORY_INIT=y
|
|
CONFIG_DEBUG_PER_CPU_MAPS=y
|
|
CONFIG_SOFTLOCKUP_DETECTOR=y
|
|
CONFIG_WQ_WATCHDOG=y
|
|
CONFIG_DEBUG_TIMEKEEPING=y
|
|
CONFIG_DEBUG_RT_MUTEXES=y
|
|
CONFIG_DEBUG_SPINLOCK=y
|
|
CONFIG_DEBUG_MUTEXES=y
|
|
CONFIG_DEBUG_RWSEMS=y
|
|
CONFIG_DEBUG_ATOMIC_SLEEP=y
|
|
CONFIG_STACKTRACE=y
|
|
CONFIG_DEBUG_LIST=y
|
|
CONFIG_DEBUG_PLIST=y
|
|
CONFIG_DEBUG_SG=y
|
|
# CONFIG_RCU_TRACE is not set
|
|
CONFIG_RCU_EQS_DEBUG=y
|
|
# CONFIG_FTRACE is not set
|
|
# CONFIG_RUNTIME_TESTING_MENU is not set
|
|
CONFIG_MEMTEST=y
|