Unverified Commit b8dc4165 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!853 [sync] PR-809: LoongArch: defconfig: enable memory and pci hotplug... 

!853 [sync] PR-809: LoongArch: defconfig: enable memory and pci hotplug related configs for LoongArch

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/809 
 
enable memory and pci hotplug related configs for LoongArch,
   used by LoongArch virtual machine now. 
 
Link:https://gitee.com/openeuler/kernel/pulls/853

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 2a8dce0b 15bfcada

arch/loongarch/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -594,5 +594,11 @@ source "drivers/cpufreq/Kconfig" 


endmenu



config ARCH_ENABLE_MEMORY_HOTPLUG

	def_bool y



config ARCH_ENABLE_MEMORY_HOTREMOVE

	def_bool y



source "drivers/firmware/Kconfig"

source "arch/loongarch/kvm/Kconfig"

arch/loongarch/configs/loongson3_defconfig

+5 −1
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ CONFIG_ACPI_SPCR_TABLE=y 
CONFIG_ACPI_DOCK=y

CONFIG_ACPI_IPMI=m

CONFIG_ACPI_PCI_SLOT=y

CONFIG_ACPI_HOTPLUG_MEMORY=y

CONFIG_CPU_FREQ=y

CONFIG_CPU_FREQ_STAT=y

CONFIG_CPU_FREQ_GOV_POWERSAVE=y
@@ -66,6 +67,9 @@ CONFIG_PARTITION_ADVANCED=y 
CONFIG_IOSCHED_BFQ=y

CONFIG_BFQ_GROUP_IOSCHED=y

CONFIG_BINFMT_MISC=m

CONFIG_MEMORY_HOTPLUG=y

CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y

CONFIG_MEMORY_HOTREMOVE=y

CONFIG_KSM=y

CONFIG_TRANSPARENT_HUGEPAGE=y

CONFIG_ZPOOL=y
@@ -570,9 +574,9 @@ CONFIG_NET_9P_VIRTIO=y 
CONFIG_PCIEPORTBUS=y

CONFIG_HOTPLUG_PCI_PCIE=y

CONFIG_PCIEAER=y

# CONFIG_PCIEASPM is not set

CONFIG_PCI_IOV=y

CONFIG_HOTPLUG_PCI=y

CONFIG_HOTPLUG_PCI_ACPI=y

CONFIG_HOTPLUG_PCI_SHPC=y

CONFIG_PCCARD=m

CONFIG_YENTA=m

arch/loongarch/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid); 
#endif



#ifdef CONFIG_MEMORY_HOTREMOVE

void arch_remove_memory(u64 start, u64 size, struct vmem_altmap *altmap)

void arch_remove_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap)

{

	unsigned long start_pfn = start >> PAGE_SHIFT;

	unsigned long nr_pages = size >> PAGE_SHIFT;