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

!14144 [6.6] [Feature] : update patches for sw64 architecture

Merge Pull Request from: @guzitao 
 
These patches generally cover the following tasks:

1.improve sw8a support
2.improve sw6b support
3.support pcie hotplug
4.support acpi
5.support hardware mismatch processing
6.support perf pmu
7.support KVM (CPU hotplug, memory hotplug, tlb refresh, msi_domain, clock synchronization during live migration, start non-8M RAM alignment)

Test:
All features pass the test.

Related issues:
https://gitee.com/openeuler/kernel/issues/IB73UR 
 
Link:https://gitee.com/openeuler/kernel/pulls/14144

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents fcc514f4 6525d9e5
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
@@ -5,8 +5,11 @@ config SW64
	select ACPI
	select ACPI_GENERIC_GSI if ACPI
	select ACPI_MCFG if (ACPI && PCI)
	select ACPI_PPTT if ACPI
	select ACPI_REDUCED_HARDWARE_ONLY
	select ACPI_SYSTEM_POWER_STATES_SUPPORT	if ACPI
	select ARCH_ATOMIC
	select ARCH_CLOCKSOURCE_INIT
	select ARCH_HAS_ACPI_TABLE_UPGRADE if ACPI
	select ARCH_HAS_ELF_RANDOMIZE
	select ARCH_HAS_PHYS_TO_DMA
@@ -59,7 +62,10 @@ config SW64
	select AUDIT_ARCH
	select COMMON_CLK
	select DMA_OPS if PCI
	select GENERIC_ARCH_TOPOLOGY
	select GENERIC_CLOCKEVENTS
	select GENERIC_CPU_DEVICES
	select GENERIC_GETTIMEOFDAY if HAVE_GENERIC_VDSO
	select GENERIC_IRQ_LEGACY
	select GENERIC_IRQ_MIGRATION if SMP
	select GENERIC_IRQ_PROBE
@@ -88,6 +94,7 @@ config SW64
	select HAVE_FTRACE_MCOUNT_RECORD
	select HAVE_FUNCTION_GRAPH_TRACER
	select HAVE_FUNCTION_TRACER
	select HAVE_GENERIC_VDSO if MMU && 64BIT
	select HAVE_IDE
	select HAVE_KPROBES
	select HAVE_KPROBES_ON_FTRACE
@@ -458,7 +465,7 @@ config RELOCATION_TABLE_SIZE
	hex "Relocation table size"
	depends on RELOCATABLE
	range 0x0 0x01000000
	default "0x80000"
	default "0x100000"
	help
	  A table of relocation data will be appended to the kernel binary
	  and parsed at boot to fix up the relocated kernel.
+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ config SW64_RRK

config DEBUG_MATCH
	bool "instruction-flow and data-flow match debugfs interface"
	depends on DEBUG_FS
	depends on DEBUG_FS && SUBARCH_C4
	default n
	help
	  Turns on the DebugFS interface for instruction-flow and data-flow match.
+4 −0
Original line number Diff line number Diff line
@@ -49,6 +49,10 @@ export LIBS_Y

boot := arch/sw_64/boot

PHONY += vdso_install
vdso_install:
	$(Q)$(MAKE) $(build)=arch/sw64/kernel/vdso $@

#Default target when executing make with no arguments
all: $(boot)/vmlinux.bin.gz

+12 −13
Original line number Diff line number Diff line
@@ -22,17 +22,16 @@
		clocks {
			i2cclk: i2cclk {
				compatible = "fixed-clock";
			clock-frequency = <12500000>;
				clock-frequency = <12000000>;
				#clock-cells = <0>;
			clock-output-names = "i2cclk_12.5mhz";
				clock-output-names = "i2cclk_12mhz";
			};
			spiclk: spiclk {
				compatible = "fixed-clock";
			clock-frequency = <12500000>;
				clock-frequency = <12000000>;
				#clock-cells = <0>;
			clock-output-names = "spiclk_12.5mhz";
				clock-output-names = "spiclk_12mhz";
			};

		};

		pintc: interrupt-controller {
@@ -235,7 +234,7 @@
			reg = <0x8036 0x0 0x0 0x8000>;
			status = "okay";

			porta: gpio-contraller@0 {
			porta: gpio-controller@0 {
				compatible = "snps,dw-apb-gpio-port";
				gpio-controller;
				#gpio-cells = <2>;
+5 −6
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ CONFIG_SYSVIPC=y
CONFIG_POSIX_MQUEUE=y
# CONFIG_CROSS_MEMORY_ATTACH is not set
CONFIG_USELIB=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
CONFIG_BPF_SYSCALL=y
CONFIG_BPF_JIT=y
@@ -28,7 +29,6 @@ CONFIG_DEBUG_PERF_USE_VMALLOC=y
CONFIG_SUBARCH_C4=y
CONFIG_SMP=y
CONFIG_SCHED_SMT=y
CONFIG_NR_CPUS=512
CONFIG_ARCH_SPARSEMEM_ENABLE=y
CONFIG_NUMA=y
CONFIG_HZ=100
@@ -520,13 +520,12 @@ CONFIG_SERIAL_OF_PLATFORM=y
CONFIG_VIRTIO_CONSOLE=y
# CONFIG_HW_RANDOM is not set
# CONFIG_I2C_COMPAT is not set
CONFIG_I2C=y
CONFIG_I2C_CHARDEV=y
CONFIG_I2C_DESIGNWARE_PLATFORM=y
CONFIG_I2C_MUX=y
CONFIG_I2C_DESIGNWARE_PLATFORM=y
CONFIG_SPI=y
CONFIG_SPI_CHIP=y
CONFIG_SPI_CHIP_MMIO=y
CONFIG_SPI_SUNWAY=y
CONFIG_SPI_SUNWAY_MMIO=y
CONFIG_SPI_SPIDEV=y
CONFIG_SENSORS_PVT=y
CONFIG_SENSORS_LM75=y
@@ -573,7 +572,6 @@ CONFIG_FSCACHE=y
CONFIG_ISO9660_FS=y
CONFIG_JOLIET=y
CONFIG_ZISOFS=y
CONFIG_UDF_FS=y
CONFIG_MSDOS_FS=y
CONFIG_VFAT_FS=y
CONFIG_FAT_DEFAULT_UTF8=y
@@ -664,6 +662,7 @@ CONFIG_CRYPTO_SHA1=y
CONFIG_CRYPTO_DEFLATE=y
CONFIG_CRYPTO_LZO=y
# CONFIG_CRYPTO_HW is not set
CONFIG_CRC_ITU_T=y
CONFIG_CONSOLE_LOGLEVEL_QUIET=7
# CONFIG_ENABLE_MUST_CHECK is not set
CONFIG_SCHEDSTATS=y
Loading