diff --git a/0001-riscv-kernel.patch b/0001-riscv-kernel.patch index 6b84da7086dd5555b9ef8fad69c484ff9307522e..b284eb300454f3acf2a2a85b688c04c56123346d 100644 --- a/0001-riscv-kernel.patch +++ b/0001-riscv-kernel.patch @@ -1,6 +1,6 @@ -From 7539e4b83d9faf805d537cebded712eb237e20d4 Mon Sep 17 00:00:00 2001 +From aeaeeb3c790bff7d8d8d9a31d62685fbef521318 Mon Sep 17 00:00:00 2001 From: Mingzheng Xing -Date: Thu, 16 Jan 2025 21:14:16 +0800 +Date: Mon, 17 Mar 2025 12:34:24 +0800 Subject: [PATCH] riscv kernel Signed-off-by: Mingzheng Xing @@ -72,7 +72,7 @@ Signed-off-by: Mingzheng Xing .../boot/dts/thead/th1520-lpi4a-hx8279.dts | 63 + arch/riscv/boot/dts/thead/th1520.dtsi | 2048 +- arch/riscv/configs/defconfig | 22 +- - arch/riscv/configs/openeuler_defconfig | 1891 +- + arch/riscv/configs/openeuler_defconfig | 1913 +- arch/riscv/configs/sg2042_defconfig | 9 + arch/riscv/configs/th1520_defconfig | 470 + arch/riscv/include/asm/barrier.h | 22 + @@ -143,6 +143,7 @@ Signed-off-by: Mingzheng Xing drivers/gpu/drm/Kconfig | 4 + drivers/gpu/drm/Makefile | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 + + drivers/gpu/drm/amd/amdkfd/Kconfig | 2 +- drivers/gpu/drm/amd/display/Kconfig | 5 +- .../gpu/drm/amd/display/amdgpu_dm/dc_fpu.c | 6 +- drivers/gpu/drm/amd/display/dc/dml/Makefile | 6 + @@ -1215,7 +1216,7 @@ Signed-off-by: Mingzheng Xing drivers/tty/serial/8250/8250_dma.c | 134 +- drivers/tty/serial/8250/8250_dw.c | 2 +- drivers/tty/serial/8250/8250_port.c | 12 +- - drivers/ufs/host/ufs-qcom.c | 8 +- + drivers/ufs/host/ufs-qcom.c | 9 +- drivers/usb/dwc3/Kconfig | 20 + drivers/usb/dwc3/Makefile | 2 + drivers/usb/dwc3/core.c | 22 +- @@ -1311,7 +1312,7 @@ Signed-off-by: Mingzheng Xing .../riscv/thead/c900-legacy/microarch.json | 80 + .../arch/riscv/thead/th1520-ddr/metrics.json | 713 + .../thead/th1520-ddr/uncore-ddr-pmu.json | 1550 ++ - 1306 files changed, 559520 insertions(+), 723 deletions(-) + 1307 files changed, 559540 insertions(+), 728 deletions(-) create mode 100644 Documentation/devicetree/bindings/hwlock/xuantie,th1520-hwspinlock.yaml create mode 100644 Documentation/devicetree/bindings/iio/adc/thead,th1520-adc.yaml create mode 100644 Documentation/devicetree/bindings/iio/adc/xuantie,th1520-adc.yaml @@ -4375,10 +4376,10 @@ index 000000000000..2387804b1c63 +The barrier matches a full barrier in the proximity of the membarrier system call +entry, cf. membarrier_{private,global}_expedited(). diff --git a/MAINTAINERS b/MAINTAINERS -index 219b3d11ee43..366530842ec2 100644 +index b22778025fa0..bd37632b3ca5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -13774,7 +13774,9 @@ M: Mathieu Desnoyers +@@ -13781,7 +13781,9 @@ M: Mathieu Desnoyers M: "Paul E. McKenney" L: linux-kernel@vger.kernel.org S: Supported @@ -4388,7 +4389,7 @@ index 219b3d11ee43..366530842ec2 100644 F: include/uapi/linux/membarrier.h F: kernel/sched/membarrier.c -@@ -18516,6 +18518,20 @@ S: Maintained +@@ -18523,6 +18525,20 @@ S: Maintained F: drivers/mtd/nand/raw/r852.c F: drivers/mtd/nand/raw/r852.h @@ -4409,7 +4410,7 @@ index 219b3d11ee43..366530842ec2 100644 RISC-V ARCHITECTURE M: Paul Walmsley M: Palmer Dabbelt -@@ -18587,6 +18603,8 @@ M: Fu Wei +@@ -18594,6 +18610,8 @@ M: Fu Wei L: linux-riscv@lists.infradead.org S: Maintained F: arch/riscv/boot/dts/thead/ @@ -17392,18 +17393,26 @@ index ab86ec3b9eab..ee97fe565df7 100644 +# TH1520 PMIC_WDT +CONFIG_TH1520_PMIC_WATCHDOG=y diff --git a/arch/riscv/configs/openeuler_defconfig b/arch/riscv/configs/openeuler_defconfig -index 295dc52b3994..efe2b72ab53e 100644 +index 61f2b2f12589..c39bbc3701b3 100644 --- a/arch/riscv/configs/openeuler_defconfig +++ b/arch/riscv/configs/openeuler_defconfig @@ -2,6 +2,7 @@ # Automatically generated file; DO NOT EDIT. # Linux/riscv 6.6.0 Kernel Configuration # -+CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y ++CONFIG_GCC_ASM_GOTO_OUTPUT_BROKEN=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y -@@ -90,11 +91,12 @@ CONFIG_BPF_JIT_DEFAULT_ON=y +@@ -44,6 +45,7 @@ CONFIG_IRQ_DOMAIN_HIERARCHY=y + CONFIG_GENERIC_IRQ_IPI=y + CONFIG_GENERIC_IRQ_IPI_MUX=y + CONFIG_GENERIC_MSI_IRQ=y ++CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y + CONFIG_IRQ_FORCED_THREADING=y + CONFIG_SPARSE_IRQ=y + # CONFIG_GENERIC_IRQ_DEBUGFS is not set +@@ -90,11 +92,12 @@ CONFIG_BPF_JIT_DEFAULT_ON=y # CONFIG_BPF_SCHED is not set # end of BPF subsystem @@ -17419,7 +17428,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_PREEMPT_DYNAMIC is not set # -@@ -123,10 +125,11 @@ CONFIG_CPU_ISOLATION=y +@@ -123,10 +126,11 @@ CONFIG_CPU_ISOLATION=y # RCU Subsystem # CONFIG_TREE_RCU=y @@ -17432,7 +17441,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_TASKS_TRACE_RCU=y CONFIG_RCU_STALL_COMMON=y CONFIG_RCU_NEED_SEGCBLIST=y -@@ -148,7 +151,7 @@ CONFIG_GENERIC_SCHED_CLOCK=y +@@ -148,7 +152,7 @@ CONFIG_GENERIC_SCHED_CLOCK=y CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" @@ -17441,7 +17450,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_CC_NO_ARRAY_BOUNDS=y CONFIG_ARCH_SUPPORTS_INT128=y CONFIG_NUMA_BALANCING=y -@@ -169,7 +172,6 @@ CONFIG_FAIR_GROUP_SCHED=y +@@ -169,7 +173,6 @@ CONFIG_FAIR_GROUP_SCHED=y CONFIG_CFS_BANDWIDTH=y CONFIG_RT_GROUP_SCHED=y # CONFIG_QOS_SCHED_DYNAMIC_AFFINITY is not set @@ -17449,7 +17458,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_CGROUP_PIDS=y CONFIG_CGROUP_RDMA=y CONFIG_CGROUP_FREEZER=y -@@ -226,7 +228,7 @@ CONFIG_SYSFS_SYSCALL=y +@@ -226,7 +229,7 @@ CONFIG_SYSFS_SYSCALL=y CONFIG_FHANDLE=y CONFIG_POSIX_TIMERS=y CONFIG_PRINTK=y @@ -17458,7 +17467,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_ELF_CORE=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y -@@ -244,6 +246,8 @@ CONFIG_KALLSYMS=y +@@ -244,6 +247,8 @@ CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_SELFTEST is not set CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS_BASE_RELATIVE=y @@ -17467,7 +17476,16 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_KCMP=y CONFIG_RSEQ=y CONFIG_CACHESTAT_SYSCALL=y -@@ -288,16 +292,16 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=17 +@@ -262,8 +267,6 @@ CONFIG_DEBUG_PERF_USE_VMALLOC=y + CONFIG_SYSTEM_DATA_VERIFICATION=y + CONFIG_PROFILING=y + CONFIG_TRACEPOINTS=y +-CONFIG_KABI_RESERVE=y +-CONFIG_KABI_SIZE_ALIGN_CHECKS=y + + # + # Kexec and crash features +@@ -288,16 +291,16 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=17 CONFIG_RISCV_SBI=y CONFIG_MMU=y CONFIG_PAGE_OFFSET=0xff60000000000000 @@ -17486,7 +17504,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_PGTABLE_LEVELS=5 CONFIG_LOCKDEP_SUPPORT=y CONFIG_RISCV_DMA_NONCOHERENT=y -@@ -306,13 +310,15 @@ CONFIG_RISCV_DMA_NONCOHERENT=y +@@ -306,13 +309,15 @@ CONFIG_RISCV_DMA_NONCOHERENT=y # SoC selection # # CONFIG_SOC_MICROCHIP_POLARFIRE is not set @@ -17504,7 +17522,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_ARCH_VIRT=y CONFIG_SOC_VIRT=y # end of SoC selection -@@ -339,7 +345,7 @@ CONFIG_ARCH_RV64I=y +@@ -339,7 +344,7 @@ CONFIG_ARCH_RV64I=y CONFIG_CMODEL_MEDANY=y CONFIG_MODULE_SECTIONS=y CONFIG_SMP=y @@ -17513,7 +17531,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_NR_CPUS=512 CONFIG_HOTPLUG_CPU=y CONFIG_TUNE_GENERIC=y -@@ -351,9 +357,8 @@ CONFIG_RISCV_ISA_C=y +@@ -351,9 +356,8 @@ CONFIG_RISCV_ISA_C=y CONFIG_RISCV_ISA_SVNAPOT=y CONFIG_RISCV_ISA_SVPBMT=y CONFIG_TOOLCHAIN_HAS_V=y @@ -17525,7 +17543,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_RISCV_ISA_ZICBOZ=y CONFIG_TOOLCHAIN_HAS_ZIHINTPAUSE=y CONFIG_TOOLCHAIN_NEEDS_EXPLICIT_ZICSR_ZIFENCEI=y -@@ -400,27 +405,17 @@ CONFIG_PORTABLE=y +@@ -400,27 +404,17 @@ CONFIG_PORTABLE=y # # Power management options # @@ -17555,6 +17573,14 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_ARCH_SUSPEND_POSSIBLE=y # end of Power management options +@@ -436,6 +430,7 @@ CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y + # CONFIG_CPU_IDLE_GOV_LADDER is not set + CONFIG_CPU_IDLE_GOV_MENU=y + CONFIG_CPU_IDLE_GOV_TEO=y ++# CONFIG_CPU_IDLE_GOV_HALTPOLL is not set + CONFIG_DT_IDLE_STATES=y + CONFIG_DT_IDLE_GENPD=y + @@ -471,6 +466,7 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y # CONFIG_CPUFREQ_DT=y @@ -17618,7 +17644,16 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_UPROBES=y CONFIG_HAVE_64BIT_ALIGNED_ACCESS=y CONFIG_KRETPROBES=y -@@ -565,7 +595,7 @@ CONFIG_VMAP_STACK=y +@@ -524,6 +554,8 @@ CONFIG_HAVE_PERF_REGS=y + CONFIG_HAVE_PERF_USER_STACK_DUMP=y + CONFIG_HAVE_ARCH_JUMP_LABEL=y + CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y ++CONFIG_MMU_GATHER_TABLE_FREE=y ++CONFIG_MMU_GATHER_RCU_TABLE_FREE=y + CONFIG_MMU_LAZY_TLB_REFCOUNT=y + CONFIG_HAVE_ARCH_SECCOMP=y + CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +@@ -565,7 +597,7 @@ CONFIG_VMAP_STACK=y CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y @@ -17627,7 +17662,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y CONFIG_STRICT_MODULE_RWX=y CONFIG_ARCH_USE_MEMREMAP_PROT=y -@@ -576,7 +606,6 @@ CONFIG_HAVE_PREEMPT_DYNAMIC_KEY=y +@@ -576,7 +608,6 @@ CONFIG_HAVE_PREEMPT_DYNAMIC_KEY=y CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_ARCH_SUPPORTS_PAGE_TABLE_CHECK=y @@ -17635,7 +17670,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # # GCOV-based kernel profiling -@@ -585,6 +614,11 @@ CONFIG_DYNAMIC_SIGFRAME=y +@@ -585,6 +616,11 @@ CONFIG_DYNAMIC_SIGFRAME=y CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y # end of GCOV-based kernel profiling @@ -17647,7 +17682,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_HAVE_GCC_PLUGINS=y CONFIG_FUNCTION_ALIGNMENT=0 # end of General architecture-dependent options -@@ -646,6 +680,7 @@ CONFIG_BLK_INLINE_ENCRYPTION=y +@@ -646,6 +682,7 @@ CONFIG_BLK_INLINE_ENCRYPTION=y CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y # CONFIG_BLK_DEV_DETECT_WRITING_PART0 is not set # CONFIG_BLK_DEV_WRITE_MOUNTED_DUMP is not set @@ -17655,7 +17690,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_BLK_IO_HIERARCHY_STATS is not set # -@@ -692,11 +727,7 @@ CONFIG_BFQ_GROUP_IOSCHED=y +@@ -692,11 +729,7 @@ CONFIG_BFQ_GROUP_IOSCHED=y CONFIG_PREEMPT_NOTIFIERS=y CONFIG_PADATA=y CONFIG_ASN1=y @@ -17668,7 +17703,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_RWSEM_SPIN_ON_OWNER=y -@@ -706,6 +737,8 @@ CONFIG_QUEUED_RWLOCKS=y +@@ -706,6 +739,8 @@ CONFIG_QUEUED_RWLOCKS=y CONFIG_ARCH_HAS_MMIOWB=y CONFIG_MMIOWB=y CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE=y @@ -17677,15 +17712,16 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_ARCH_HAS_SYSCALL_WRAPPER=y # CONFIG_PID_MAX_PER_NAMESPACE is not set CONFIG_FREEZER=y -@@ -771,6 +804,7 @@ CONFIG_SPARSEMEM_EXTREME=y +@@ -771,6 +806,8 @@ CONFIG_SPARSEMEM_EXTREME=y CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y CONFIG_SPARSEMEM_VMEMMAP=y CONFIG_ARCH_WANT_OPTIMIZE_HUGETLB_VMEMMAP=y ++CONFIG_HAVE_FAST_GUP=y +CONFIG_ARCH_KEEP_MEMBLOCK=y CONFIG_MEMORY_ISOLATION=y CONFIG_EXCLUSIVE_SYSTEM_RAM=y CONFIG_SPLIT_PTLOCK_CPUS=4 -@@ -795,13 +829,14 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y +@@ -795,13 +832,14 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set CONFIG_THP_SWAP=y # CONFIG_READ_ONLY_THP_FOR_FS is not set @@ -17703,7 +17739,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_GENERIC_EARLY_IOREMAP=y # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set CONFIG_PAGE_IDLE_FLAG=y -@@ -1346,10 +1381,10 @@ CONFIG_L2TP_DEBUGFS=m +@@ -1346,10 +1384,10 @@ CONFIG_L2TP_DEBUGFS=m CONFIG_L2TP_V3=y CONFIG_L2TP_IP=m CONFIG_L2TP_ETH=m @@ -17716,7 +17752,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_BRIDGE_IGMP_SNOOPING=y CONFIG_BRIDGE_VLAN_FILTERING=y # CONFIG_BRIDGE_MRP is not set -@@ -1358,7 +1393,7 @@ CONFIG_BRIDGE_VLAN_FILTERING=y +@@ -1358,7 +1396,7 @@ CONFIG_BRIDGE_VLAN_FILTERING=y CONFIG_VLAN_8021Q=m CONFIG_VLAN_8021Q_GVRP=y CONFIG_VLAN_8021Q_MVRP=y @@ -17725,7 +17761,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_LLC2 is not set # CONFIG_ATALK is not set # CONFIG_X25 is not set -@@ -1513,7 +1548,44 @@ CONFIG_CAN_BCM=m +@@ -1513,7 +1551,44 @@ CONFIG_CAN_BCM=m CONFIG_CAN_GW=m # CONFIG_CAN_J1939 is not set # CONFIG_CAN_ISOTP is not set @@ -17771,7 +17807,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_AF_RXRPC is not set # CONFIG_AF_KCM is not set CONFIG_STREAM_PARSER=y -@@ -1522,7 +1594,7 @@ CONFIG_FIB_RULES=y +@@ -1522,7 +1597,7 @@ CONFIG_FIB_RULES=y CONFIG_WIRELESS=y CONFIG_WEXT_CORE=y CONFIG_WEXT_PROC=y @@ -17780,7 +17816,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_NL80211_TESTMODE is not set # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set # CONFIG_CFG80211_CERTIFICATION_ONUS is not set -@@ -1532,7 +1604,7 @@ CONFIG_CFG80211_DEFAULT_PS=y +@@ -1532,7 +1607,7 @@ CONFIG_CFG80211_DEFAULT_PS=y # CONFIG_CFG80211_DEBUGFS is not set CONFIG_CFG80211_CRDA_SUPPORT=y CONFIG_CFG80211_WEXT=y @@ -17789,7 +17825,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_MAC80211_HAS_RC=y CONFIG_MAC80211_RC_MINSTREL=y CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y -@@ -1543,7 +1615,7 @@ CONFIG_MAC80211_DEBUGFS=y +@@ -1543,7 +1618,7 @@ CONFIG_MAC80211_DEBUGFS=y # CONFIG_MAC80211_MESSAGE_TRACING is not set # CONFIG_MAC80211_DEBUG_MENU is not set CONFIG_MAC80211_STA_HASH_MAX_SIZE=0 @@ -17798,7 +17834,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_RFKILL_LEDS=y CONFIG_RFKILL_INPUT=y CONFIG_RFKILL_GPIO=m -@@ -1573,6 +1645,7 @@ CONFIG_FAILOVER=y +@@ -1573,6 +1648,7 @@ CONFIG_FAILOVER=y CONFIG_ETHTOOL_NETLINK=y CONFIG_NETACC_BPF=y CONFIG_NETACC_TERRACE=y @@ -17806,7 +17842,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # # Device Drivers -@@ -1595,6 +1668,7 @@ CONFIG_PCIEASPM_DEFAULT=y +@@ -1595,6 +1671,7 @@ CONFIG_PCIEASPM_DEFAULT=y CONFIG_PCIE_PME=y CONFIG_PCIE_DPC=y # CONFIG_PCIE_PTM is not set @@ -17814,7 +17850,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_PCI_MSI=y CONFIG_PCI_QUIRKS=y # CONFIG_PCI_DEBUG is not set -@@ -1606,6 +1680,7 @@ CONFIG_PCI_ECAM=y +@@ -1606,6 +1683,7 @@ CONFIG_PCI_ECAM=y CONFIG_PCI_IOV=y CONFIG_PCI_PRI=y CONFIG_PCI_PASID=y @@ -17822,7 +17858,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_PCI_DYNAMIC_OF_NODES is not set # CONFIG_PCIE_BUS_TUNE_OFF is not set CONFIG_PCIE_BUS_DEFAULT=y -@@ -1615,6 +1690,7 @@ CONFIG_PCIE_BUS_DEFAULT=y +@@ -1615,6 +1693,7 @@ CONFIG_PCIE_BUS_DEFAULT=y CONFIG_VGA_ARB=y CONFIG_VGA_ARB_MAX_GPUS=64 CONFIG_HOTPLUG_PCI=y @@ -17830,7 +17866,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_HOTPLUG_PCI_CPCI is not set CONFIG_HOTPLUG_PCI_SHPC=y -@@ -1625,6 +1701,8 @@ CONFIG_HOTPLUG_PCI_SHPC=y +@@ -1625,6 +1704,8 @@ CONFIG_HOTPLUG_PCI_SHPC=y CONFIG_PCI_HOST_COMMON=y CONFIG_PCI_HOST_GENERIC=y CONFIG_PCIE_MICROCHIP_HOST=y @@ -17839,7 +17875,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_PCIE_XILINX=y # -@@ -1636,6 +1714,7 @@ CONFIG_PCIE_CADENCE_EP=y +@@ -1636,6 +1717,7 @@ CONFIG_PCIE_CADENCE_EP=y CONFIG_PCIE_CADENCE_PLAT=y CONFIG_PCIE_CADENCE_PLAT_HOST=y CONFIG_PCIE_CADENCE_PLAT_EP=y @@ -17847,15 +17883,19 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_PCI_J721E=y CONFIG_PCI_J721E_HOST=y # CONFIG_PCI_J721E_EP is not set -@@ -1698,7 +1777,6 @@ CONFIG_FW_LOADER_DEBUG=y +@@ -1697,8 +1779,9 @@ CONFIG_FW_LOADER=y + CONFIG_FW_LOADER_DEBUG=y CONFIG_EXTRA_FIRMWARE="" # CONFIG_FW_LOADER_USER_HELPER is not set - # CONFIG_FW_LOADER_COMPRESS is not set +-# CONFIG_FW_LOADER_COMPRESS is not set -CONFIG_FW_CACHE=y ++CONFIG_FW_LOADER_COMPRESS=y ++# CONFIG_FW_LOADER_COMPRESS_XZ is not set ++CONFIG_FW_LOADER_COMPRESS_ZSTD=y # CONFIG_FW_UPLOAD is not set # end of Firmware loader -@@ -1709,9 +1787,10 @@ CONFIG_WANT_DEV_COREDUMP=y +@@ -1709,9 +1792,10 @@ CONFIG_WANT_DEV_COREDUMP=y # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set CONFIG_GENERIC_CPU_DEVICES=y @@ -17868,7 +17908,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_REGMAP_MMIO=y CONFIG_DMA_SHARED_BUFFER=y # CONFIG_DMA_FENCE_TRACE is not set -@@ -1724,6 +1803,8 @@ CONFIG_GENERIC_ARCH_NUMA=y +@@ -1724,6 +1808,8 @@ CONFIG_GENERIC_ARCH_NUMA=y # Bus devices # # CONFIG_MOXTET is not set @@ -17877,7 +17917,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_MHI_BUS is not set # CONFIG_MHI_BUS_EP is not set # end of Bus devices -@@ -1747,6 +1828,7 @@ CONFIG_PROC_EVENTS=y +@@ -1747,6 +1833,7 @@ CONFIG_PROC_EVENTS=y # end of ARM System Control and Management Interface Protocol # CONFIG_FIRMWARE_MEMMAP is not set @@ -17885,7 +17925,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_SYSFB=y CONFIG_SYSFB_SIMPLEFB=y # CONFIG_GOOGLE_FIRMWARE is not set -@@ -1767,6 +1849,7 @@ CONFIG_EFI_GENERIC_STUB=y +@@ -1767,6 +1854,7 @@ CONFIG_EFI_GENERIC_STUB=y # CONFIG_RESET_ATTACK_MITIGATION is not set # CONFIG_EFI_DISABLE_PCI_DMA is not set CONFIG_EFI_EARLYCON=y @@ -17893,7 +17933,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_EFI_DISABLE_RUNTIME is not set # CONFIG_EFI_COCO_SECRET is not set # end of EFI (Extensible Firmware Interface) Support -@@ -1775,11 +1858,14 @@ CONFIG_EFI_EARLYCON=y +@@ -1775,11 +1863,14 @@ CONFIG_EFI_EARLYCON=y # Tegra firmware driver # # end of Tegra firmware driver @@ -17910,7 +17950,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # # Partition parsers -@@ -1793,9 +1879,8 @@ CONFIG_MTD_OF_PARTS=m +@@ -1793,9 +1884,8 @@ CONFIG_MTD_OF_PARTS=m # # User Modules And Translation Layers # @@ -17922,7 +17962,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # # Note that in some cases UBI block is preferred. See MTD_UBI_BLOCK. -@@ -1862,8 +1947,8 @@ CONFIG_MTD_PHYSMAP_OF=y +@@ -1862,8 +1952,8 @@ CONFIG_MTD_PHYSMAP_OF=y # CONFIG_MTD_MCHP23K256 is not set # CONFIG_MTD_MCHP48L640 is not set # CONFIG_MTD_SST25L is not set @@ -17933,7 +17973,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_MTD_MTDRAM is not set CONFIG_MTD_BLOCK2MTD=m -@@ -1876,13 +1961,15 @@ CONFIG_MTD_BLOCK2MTD=m +@@ -1876,13 +1966,15 @@ CONFIG_MTD_BLOCK2MTD=m # # NAND # @@ -17950,7 +17990,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_MTD_NAND_ECC_SW_HAMMING is not set # CONFIG_MTD_NAND_ECC_SW_BCH is not set # CONFIG_MTD_NAND_ECC_MXIC is not set -@@ -1895,12 +1982,13 @@ CONFIG_MTD_BLOCK2MTD=m +@@ -1895,12 +1987,13 @@ CONFIG_MTD_BLOCK2MTD=m # CONFIG_MTD_LPDDR is not set # end of LPDDR & LPDDR2 PCM memory drivers @@ -17966,7 +18006,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_MTD_UBI_WL_THRESHOLD=4096 CONFIG_MTD_UBI_BEB_LIMIT=20 # CONFIG_MTD_UBI_FASTMAP is not set -@@ -1921,6 +2009,13 @@ CONFIG_OF_RESOLVE=y +@@ -1921,6 +2014,13 @@ CONFIG_OF_RESOLVE=y CONFIG_OF_OVERLAY=y CONFIG_OF_NUMA=y # CONFIG_PARPORT is not set @@ -17980,7 +18020,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_BLK_DEV=y CONFIG_BLK_DEV_NULL_BLK=m CONFIG_CDROM=y -@@ -1939,7 +2034,7 @@ CONFIG_BLK_DEV_LOOP=y +@@ -1939,7 +2039,7 @@ CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP_MIN_COUNT=0 CONFIG_BLK_DEV_DRBD=m # CONFIG_DRBD_FAULT_INJECTION is not set @@ -17989,7 +18029,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=16384 -@@ -2008,7 +2103,7 @@ CONFIG_MISC_RTSX=m +@@ -2008,7 +2108,7 @@ CONFIG_MISC_RTSX=m # # EEPROM support # @@ -17998,7 +18038,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_EEPROM_AT25 is not set CONFIG_EEPROM_LEGACY=m CONFIG_EEPROM_MAX6875=m -@@ -2028,7 +2123,6 @@ CONFIG_CB710_DEBUG_ASSUMPTIONS=y +@@ -2028,7 +2128,6 @@ CONFIG_CB710_DEBUG_ASSUMPTIONS=y # CONFIG_TI_ST is not set # end of Texas Instruments shared transport line discipline @@ -18006,7 +18046,15 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_SENSORS_LIS3_I2C=m CONFIG_ALTERA_STAPL=m # CONFIG_GENWQE is not set -@@ -2156,8 +2250,11 @@ CONFIG_SCSI_DH_ALUA=y +@@ -2110,6 +2209,7 @@ CONFIG_SCSI_MPT2SAS_MAX_SGE=128 + CONFIG_SCSI_MPT3SAS_MAX_SGE=128 + CONFIG_SCSI_MPT2SAS=m + # CONFIG_SCSI_MPI3MR is not set ++# CONFIG_SCSI_LEAPIORAID is not set + CONFIG_SCSI_SMARTPQI=m + # CONFIG_SCSI_HPTIOP is not set + # CONFIG_SCSI_BUSLOGIC is not set +@@ -2156,8 +2256,11 @@ CONFIG_SCSI_DH_ALUA=y CONFIG_ATA=y CONFIG_SATA_HOST=y @@ -18018,7 +18066,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_SATA_PMP=y # -@@ -2168,6 +2265,7 @@ CONFIG_SATA_MOBILE_LPM_POLICY=0 +@@ -2168,6 +2271,7 @@ CONFIG_SATA_MOBILE_LPM_POLICY=0 CONFIG_SATA_AHCI_PLATFORM=y # CONFIG_AHCI_DWC is not set # CONFIG_AHCI_CEVA is not set @@ -18026,7 +18074,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_SATA_INIC162X is not set # CONFIG_SATA_ACARD_AHCI is not set # CONFIG_SATA_SIL24 is not set -@@ -2189,6 +2287,7 @@ CONFIG_ATA_PIIX=m +@@ -2189,6 +2293,7 @@ CONFIG_ATA_PIIX=m # CONFIG_SATA_MV is not set # CONFIG_SATA_NV is not set # CONFIG_SATA_PROMISE is not set @@ -18034,7 +18082,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_SATA_SIL is not set # CONFIG_SATA_SIS is not set # CONFIG_SATA_SVW is not set -@@ -2247,6 +2346,7 @@ CONFIG_ATA_PIIX=m +@@ -2247,6 +2352,7 @@ CONFIG_ATA_PIIX=m # # Generic fallback / legacy drivers # @@ -18042,7 +18090,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_ATA_GENERIC=m # CONFIG_PATA_LEGACY is not set CONFIG_MD=y -@@ -2265,14 +2365,14 @@ CONFIG_BCACHE=m +@@ -2265,14 +2371,14 @@ CONFIG_BCACHE=m # CONFIG_BCACHE_CLOSURES_DEBUG is not set # CONFIG_BCACHE_ASYNC_REGISTRATION is not set CONFIG_BLK_DEV_DM_BUILTIN=y @@ -18059,7 +18107,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_DM_SNAPSHOT=m CONFIG_DM_THIN_PROVISIONING=m CONFIG_DM_CACHE=m -@@ -2292,6 +2392,7 @@ CONFIG_DM_MULTIPATH_ST=m +@@ -2292,6 +2398,7 @@ CONFIG_DM_MULTIPATH_ST=m # CONFIG_DM_MULTIPATH_IOA is not set CONFIG_DM_DELAY=m # CONFIG_DM_DUST is not set @@ -18067,7 +18115,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_DM_UEVENT=y CONFIG_DM_FLAKEY=m CONFIG_DM_VERITY=m -@@ -2322,7 +2423,7 @@ CONFIG_ISCSI_TARGET_CXGB4=m +@@ -2322,7 +2429,7 @@ CONFIG_ISCSI_TARGET_CXGB4=m # end of IEEE 1394 (FireWire) support CONFIG_NETDEVICES=y @@ -18076,7 +18124,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_NET_CORE=y CONFIG_BONDING=m CONFIG_DUMMY=m -@@ -2366,10 +2467,13 @@ CONFIG_VSOCKMON=m +@@ -2366,10 +2473,13 @@ CONFIG_VSOCKMON=m CONFIG_ETHERNET=y CONFIG_MDIO=m # CONFIG_NET_VENDOR_3COM is not set @@ -18090,7 +18138,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_NET_VENDOR_ALTEON is not set # CONFIG_ALTERA_TSE is not set CONFIG_NET_VENDOR_AMAZON=y -@@ -2406,14 +2510,13 @@ CONFIG_BNXT_DCB=y +@@ -2406,14 +2516,13 @@ CONFIG_BNXT_DCB=y # CONFIG_BNXT_HWMON is not set CONFIG_NET_VENDOR_CADENCE=y CONFIG_MACB=y @@ -18106,7 +18154,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_LIQUIDIO_CORE=m CONFIG_LIQUIDIO=m CONFIG_LIQUIDIO_VF=m -@@ -2441,7 +2544,10 @@ CONFIG_NET_VENDOR_ENGLEDER=y +@@ -2441,7 +2550,10 @@ CONFIG_NET_VENDOR_ENGLEDER=y CONFIG_NET_VENDOR_FUNGIBLE=y # CONFIG_FUN_ETH is not set CONFIG_NET_VENDOR_GOOGLE=y @@ -18117,7 +18165,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_NET_VENDOR_I825XX is not set CONFIG_NET_VENDOR_INTEL=y # CONFIG_E100 is not set -@@ -2466,6 +2572,10 @@ CONFIG_FM10K=m +@@ -2466,6 +2578,10 @@ CONFIG_FM10K=m # CONFIG_IGC is not set CONFIG_NET_VENDOR_MUCSE=y # CONFIG_MXGBE is not set @@ -18128,7 +18176,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_JME is not set CONFIG_NET_VENDOR_ADI=y # CONFIG_ADIN1110 is not set -@@ -2564,13 +2674,24 @@ CONFIG_SFC_MCDI_MON=y +@@ -2564,13 +2680,24 @@ CONFIG_SFC_MCDI_MON=y CONFIG_SFC_SRIOV=y CONFIG_SFC_MCDI_LOGGING=y # CONFIG_SFC_FALCON is not set @@ -18155,7 +18203,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_NET_VENDOR_SUN is not set # CONFIG_NET_VENDOR_SYNOPSYS is not set # CONFIG_NET_VENDOR_TEHUTI is not set -@@ -2584,8 +2705,12 @@ CONFIG_NGBE=m +@@ -2584,8 +2711,12 @@ CONFIG_NGBE=m CONFIG_TXGBE=m # CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_XILINX is not set @@ -18168,7 +18216,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_PHYLINK=y CONFIG_PHYLIB=y CONFIG_SWPHY=y -@@ -2661,6 +2786,7 @@ CONFIG_CAN_CALC_BITTIMING=y +@@ -2661,6 +2792,7 @@ CONFIG_CAN_CALC_BITTIMING=y # CONFIG_CAN_GRCAN is not set # CONFIG_CAN_KVASER_PCIEFD is not set CONFIG_CAN_SLCAN=m @@ -18176,7 +18224,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_CAN_C_CAN=m CONFIG_CAN_C_CAN_PLATFORM=m CONFIG_CAN_C_CAN_PCI=m -@@ -2672,6 +2798,8 @@ CONFIG_CAN_CC770_PLATFORM=m +@@ -2672,6 +2804,8 @@ CONFIG_CAN_CC770_PLATFORM=m # CONFIG_CAN_IFI_CANFD is not set # CONFIG_CAN_M_CAN is not set # CONFIG_CAN_PEAK_PCIEFD is not set @@ -18185,7 +18233,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_CAN_SJA1000=m CONFIG_CAN_EMS_PCI=m # CONFIG_CAN_F81601 is not set -@@ -2711,7 +2839,9 @@ CONFIG_MDIO_DEVICE=y +@@ -2711,7 +2845,9 @@ CONFIG_MDIO_DEVICE=y CONFIG_MDIO_BUS=y CONFIG_FWNODE_MDIO=y CONFIG_OF_MDIO=y @@ -18195,7 +18243,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_MDIO_BITBANG=m CONFIG_MDIO_BCM_UNIMAC=m CONFIG_MDIO_CAVIUM=m -@@ -2728,6 +2858,7 @@ CONFIG_MDIO_THUNDER=m +@@ -2728,6 +2864,7 @@ CONFIG_MDIO_THUNDER=m # # MDIO Multiplexers # @@ -18203,7 +18251,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_MDIO_BUS_MUX_GPIO is not set # CONFIG_MDIO_BUS_MUX_MULTIPLEXER is not set # CONFIG_MDIO_BUS_MUX_MMIOREG is not set -@@ -2735,7 +2866,7 @@ CONFIG_MDIO_THUNDER=m +@@ -2735,7 +2872,7 @@ CONFIG_MDIO_THUNDER=m # # PCS device drivers # @@ -18212,7 +18260,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # end of PCS device drivers CONFIG_PPP=m -@@ -2768,8 +2899,8 @@ CONFIG_USB_RTL8150=m +@@ -2768,8 +2905,8 @@ CONFIG_USB_RTL8150=m CONFIG_USB_RTL8152=m CONFIG_USB_LAN78XX=m CONFIG_USB_USBNET=m @@ -18223,7 +18271,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_USB_NET_CDCETHER=m CONFIG_USB_NET_CDC_EEM=m CONFIG_USB_NET_CDC_NCM=m -@@ -2781,7 +2912,7 @@ CONFIG_USB_NET_SR9700=m +@@ -2781,7 +2918,7 @@ CONFIG_USB_NET_SR9700=m CONFIG_USB_NET_SMSC75XX=m CONFIG_USB_NET_SMSC95XX=m CONFIG_USB_NET_GL620A=m @@ -18232,7 +18280,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_USB_NET_PLUSB=m CONFIG_USB_NET_MCS7830=m CONFIG_USB_NET_RNDIS_HOST=m -@@ -2865,7 +2996,39 @@ CONFIG_RT2X00_LIB_CRYPTO=y +@@ -2865,7 +3002,39 @@ CONFIG_RT2X00_LIB_CRYPTO=y CONFIG_RT2X00_LIB_LEDS=y # CONFIG_RT2X00_LIB_DEBUGFS is not set # CONFIG_RT2X00_DEBUG is not set @@ -18273,7 +18321,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_WLAN_VENDOR_RSI is not set CONFIG_WLAN_VENDOR_SILABS=y # CONFIG_WFX is not set -@@ -2876,6 +3039,10 @@ CONFIG_WLAN_VENDOR_SILABS=y +@@ -2876,6 +3045,10 @@ CONFIG_WLAN_VENDOR_SILABS=y # CONFIG_USB_NET_RNDIS_WLAN is not set # CONFIG_MAC80211_HWSIM is not set # CONFIG_VIRT_WIFI is not set @@ -18284,7 +18332,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_WAN=y CONFIG_HDLC=m CONFIG_HDLC_RAW=m -@@ -2900,6 +3067,7 @@ CONFIG_HDLC_PPP=m +@@ -2900,6 +3073,7 @@ CONFIG_HDLC_PPP=m # end of Wireless WAN # CONFIG_VMXNET3 is not set @@ -18292,7 +18340,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_USB4_NET=m # CONFIG_NETDEVSIM is not set CONFIG_NET_FAILOVER=y -@@ -2930,6 +3098,7 @@ CONFIG_INPUT_EVDEV=y +@@ -2930,6 +3104,7 @@ CONFIG_INPUT_EVDEV=y # Input Device Drivers # CONFIG_INPUT_KEYBOARD=y @@ -18300,7 +18348,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_KEYBOARD_ADP5588 is not set # CONFIG_KEYBOARD_ADP5589 is not set CONFIG_KEYBOARD_ATKBD=y -@@ -2955,6 +3124,7 @@ CONFIG_KEYBOARD_GPIO=y +@@ -2955,6 +3130,7 @@ CONFIG_KEYBOARD_GPIO=y # CONFIG_KEYBOARD_GOLDFISH_EVENTS is not set # CONFIG_KEYBOARD_STOWAWAY is not set # CONFIG_KEYBOARD_SUNKBD is not set @@ -18308,7 +18356,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_KEYBOARD_OMAP4 is not set # CONFIG_KEYBOARD_TM2_TOUCHKEY is not set # CONFIG_KEYBOARD_XTKBD is not set -@@ -2987,7 +3157,83 @@ CONFIG_MOUSE_SYNAPTICS_I2C=m +@@ -2987,7 +3163,83 @@ CONFIG_MOUSE_SYNAPTICS_I2C=m CONFIG_MOUSE_SYNAPTICS_USB=m # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TABLET is not set @@ -18393,7 +18441,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_INPUT_MISC=y # CONFIG_INPUT_AD714X is not set # CONFIG_INPUT_ATMEL_CAPTOUCH is not set -@@ -3004,7 +3250,7 @@ CONFIG_INPUT_MISC=y +@@ -3004,7 +3256,7 @@ CONFIG_INPUT_MISC=y # CONFIG_INPUT_YEALINK is not set # CONFIG_INPUT_CM109 is not set # CONFIG_INPUT_REGULATOR_HAPTIC is not set @@ -18402,7 +18450,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_INPUT_PCF8574 is not set # CONFIG_INPUT_PWM_BEEPER is not set # CONFIG_INPUT_PWM_VIBRA is not set -@@ -3017,6 +3263,7 @@ CONFIG_INPUT_UINPUT=m +@@ -3017,6 +3269,7 @@ CONFIG_INPUT_UINPUT=m # CONFIG_INPUT_IQS626A is not set # CONFIG_INPUT_IQS7222 is not set # CONFIG_INPUT_CMA3000 is not set @@ -18410,7 +18458,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_INPUT_DRV260X_HAPTICS is not set # CONFIG_INPUT_DRV2665_HAPTICS is not set # CONFIG_INPUT_DRV2667_HAPTICS is not set -@@ -3048,6 +3295,7 @@ CONFIG_SERIO_ALTERA_PS2=m +@@ -3048,6 +3301,7 @@ CONFIG_SERIO_ALTERA_PS2=m # CONFIG_SERIO_PS2MULT is not set CONFIG_SERIO_ARC_PS2=m # CONFIG_SERIO_APBPS2 is not set @@ -18418,7 +18466,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_SERIO_GPIO_PS2 is not set # CONFIG_USERIO is not set # CONFIG_GAMEPORT is not set -@@ -3061,7 +3309,6 @@ CONFIG_TTY=y +@@ -3061,7 +3315,6 @@ CONFIG_TTY=y CONFIG_VT=y CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y @@ -18426,7 +18474,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_UNIX98_PTYS=y -@@ -3075,6 +3322,7 @@ CONFIG_LDISC_AUTOLOAD=y +@@ -3075,6 +3328,7 @@ CONFIG_LDISC_AUTOLOAD=y CONFIG_SERIAL_EARLYCON=y CONFIG_SERIAL_8250=y # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set @@ -18434,7 +18482,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_SERIAL_8250_16550A_VARIANTS=y # CONFIG_SERIAL_8250_FINTEK is not set CONFIG_SERIAL_8250_CONSOLE=y -@@ -3082,8 +3330,8 @@ CONFIG_SERIAL_8250_DMA=y +@@ -3082,8 +3336,8 @@ CONFIG_SERIAL_8250_DMA=y CONFIG_SERIAL_8250_PCILIB=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_EXAR=y @@ -18445,7 +18493,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_MANY_PORTS=y # CONFIG_SERIAL_8250_PCI1XXXX is not set -@@ -3092,6 +3340,7 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y +@@ -3092,6 +3346,7 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y CONFIG_SERIAL_8250_RSA=y CONFIG_SERIAL_8250_DWLIB=y CONFIG_SERIAL_8250_DW=y @@ -18453,7 +18501,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_SERIAL_8250_RT288X=y CONFIG_SERIAL_8250_PERICOM=y CONFIG_SERIAL_OF_PLATFORM=y -@@ -3106,6 +3355,11 @@ CONFIG_SERIAL_OF_PLATFORM=y +@@ -3106,6 +3361,11 @@ CONFIG_SERIAL_OF_PLATFORM=y # CONFIG_SERIAL_MAX3100 is not set # CONFIG_SERIAL_MAX310X is not set # CONFIG_SERIAL_UARTLITE is not set @@ -18465,7 +18513,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_CONSOLE_POLL=y -@@ -3154,6 +3408,7 @@ CONFIG_HW_RANDOM=y +@@ -3154,6 +3414,7 @@ CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_TIMERIOMEM=m # CONFIG_HW_RANDOM_BA431 is not set CONFIG_HW_RANDOM_VIRTIO=y @@ -18473,7 +18521,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_HW_RANDOM_CCTRNG is not set # CONFIG_HW_RANDOM_XIPHERA is not set # CONFIG_HW_RANDOM_JH7110 is not set -@@ -3172,7 +3427,10 @@ CONFIG_TCG_TIS_I2C_ATMEL=m +@@ -3172,7 +3433,10 @@ CONFIG_TCG_TIS_I2C_ATMEL=m CONFIG_TCG_TIS_I2C_INFINEON=m CONFIG_TCG_TIS_I2C_NUVOTON=m CONFIG_TCG_ATMEL=m @@ -18484,7 +18532,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_TCG_TIS_ST33ZP24=m CONFIG_TCG_TIS_ST33ZP24_I2C=m CONFIG_TCG_TIS_ST33ZP24_SPI=m -@@ -3184,6 +3442,7 @@ CONFIG_TCG_TIS_ST33ZP24_SPI=m +@@ -3184,6 +3448,7 @@ CONFIG_TCG_TIS_ST33ZP24_SPI=m # I2C support # CONFIG_I2C=y @@ -18492,7 +18540,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_I2C_BOARDINFO=y CONFIG_I2C_COMPAT=y CONFIG_I2C_CHARDEV=y -@@ -3221,6 +3480,7 @@ CONFIG_I2C_CCGX_UCSI=m +@@ -3221,6 +3486,7 @@ CONFIG_I2C_CCGX_UCSI=m # CONFIG_I2C_ALI15X3 is not set # CONFIG_I2C_AMD756 is not set # CONFIG_I2C_AMD8111 is not set @@ -18500,7 +18548,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_I2C_I801 is not set # CONFIG_I2C_ISCH is not set # CONFIG_I2C_PIIX4 is not set -@@ -3232,6 +3492,11 @@ CONFIG_I2C_NFORCE2=m +@@ -3232,6 +3498,11 @@ CONFIG_I2C_NFORCE2=m # CONFIG_I2C_VIA is not set # CONFIG_I2C_VIAPRO is not set @@ -18512,7 +18560,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # # I2C system bus drivers (mostly embedded / system-on-chip) # -@@ -3243,12 +3508,17 @@ CONFIG_I2C_DESIGNWARE_PCI=m +@@ -3243,12 +3514,17 @@ CONFIG_I2C_DESIGNWARE_PCI=m # CONFIG_I2C_EMEV2 is not set CONFIG_I2C_GPIO=m # CONFIG_I2C_GPIO_FAULT_INJECTOR is not set @@ -18530,7 +18578,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # # External I2C/SMBus adapter drivers -@@ -3290,6 +3560,7 @@ CONFIG_SPI_MEM=y +@@ -3290,6 +3566,7 @@ CONFIG_SPI_MEM=y CONFIG_SPI_CADENCE=m # CONFIG_SPI_CADENCE_QUADSPI is not set # CONFIG_SPI_CADENCE_XSPI is not set @@ -18538,7 +18586,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_SPI_DESIGNWARE=y # CONFIG_SPI_DW_DMA is not set CONFIG_SPI_DW_PCI=m -@@ -3302,9 +3573,15 @@ CONFIG_SPI_DW_MMIO=y +@@ -3302,9 +3579,15 @@ CONFIG_SPI_DW_MMIO=y # CONFIG_SPI_PCI1XXXX is not set # CONFIG_SPI_PL022 is not set # CONFIG_SPI_PXA2XX is not set @@ -18554,7 +18602,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_SPI_MXIC is not set # CONFIG_SPI_XCOMM is not set # CONFIG_SPI_XILINX is not set -@@ -3319,7 +3596,7 @@ CONFIG_SPI_SIFIVE=y +@@ -3319,7 +3602,7 @@ CONFIG_SPI_SIFIVE=y # # SPI Protocol Masters # @@ -18563,7 +18611,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_SPI_LOOPBACK_TEST is not set # CONFIG_SPI_TLE62X0 is not set # CONFIG_SPI_SLAVE is not set -@@ -3343,14 +3620,8 @@ CONFIG_PPS_CLIENT_GPIO=m +@@ -3343,14 +3626,8 @@ CONFIG_PPS_CLIENT_GPIO=m # # PTP clock support # @@ -18579,7 +18627,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # end of PTP clock support CONFIG_PINCTRL=y -@@ -3360,6 +3631,7 @@ CONFIG_GENERIC_PINMUX_FUNCTIONS=y +@@ -3360,6 +3637,7 @@ CONFIG_GENERIC_PINMUX_FUNCTIONS=y CONFIG_PINCONF=y CONFIG_GENERIC_PINCONF=y # CONFIG_DEBUG_PINCTRL is not set @@ -18587,7 +18635,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_PINCTRL_CY8C95X0 is not set # CONFIG_PINCTRL_MCP23S08 is not set # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set -@@ -3367,19 +3639,47 @@ CONFIG_GENERIC_PINCONF=y +@@ -3367,19 +3645,47 @@ CONFIG_GENERIC_PINCONF=y # CONFIG_PINCTRL_SINGLE is not set # CONFIG_PINCTRL_STMFX is not set # CONFIG_PINCTRL_SX150X is not set @@ -18635,7 +18683,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_GPIOLIB_IRQCHIP=y # CONFIG_DEBUG_GPIO is not set CONFIG_GPIO_SYSFS=y -@@ -3392,6 +3692,7 @@ CONFIG_GPIO_GENERIC=y +@@ -3392,6 +3698,7 @@ CONFIG_GPIO_GENERIC=y # # CONFIG_GPIO_74XX_MMIO is not set # CONFIG_GPIO_ALTERA is not set @@ -18643,7 +18691,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_GPIO_CADENCE=m CONFIG_GPIO_DWAPB=y # CONFIG_GPIO_EXAR is not set -@@ -3402,6 +3703,7 @@ CONFIG_GPIO_GENERIC_PLATFORM=m +@@ -3402,6 +3709,7 @@ CONFIG_GPIO_GENERIC_PLATFORM=m # CONFIG_GPIO_LOGICVC is not set # CONFIG_GPIO_MB86S7X is not set # CONFIG_GPIO_PL061 is not set @@ -18651,7 +18699,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_GPIO_SIFIVE=y # CONFIG_GPIO_SYSCON is not set # CONFIG_GPIO_XILINX is not set -@@ -3417,7 +3719,8 @@ CONFIG_GPIO_SIFIVE=y +@@ -3417,7 +3725,8 @@ CONFIG_GPIO_SIFIVE=y # CONFIG_GPIO_GW_PLD is not set # CONFIG_GPIO_MAX7300 is not set # CONFIG_GPIO_MAX732X is not set @@ -18661,7 +18709,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_GPIO_PCA9570 is not set # CONFIG_GPIO_PCF857X is not set # CONFIG_GPIO_TPIC2810 is not set -@@ -3477,6 +3780,7 @@ CONFIG_POWER_RESET_SYSCON_POWEROFF=y +@@ -3477,6 +3786,7 @@ CONFIG_POWER_RESET_SYSCON_POWEROFF=y CONFIG_POWER_SUPPLY=y # CONFIG_POWER_SUPPLY_DEBUG is not set CONFIG_POWER_SUPPLY_HWMON=y @@ -18669,7 +18717,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_IP5XXX_POWER is not set # CONFIG_TEST_POWER is not set # CONFIG_CHARGER_ADP5061 is not set -@@ -3565,6 +3869,7 @@ CONFIG_SENSORS_G762=m +@@ -3565,6 +3875,7 @@ CONFIG_SENSORS_G762=m # CONFIG_SENSORS_HS3001 is not set CONFIG_SENSORS_IBMAEM=m CONFIG_SENSORS_IBMPEX=m @@ -18677,7 +18725,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_SENSORS_IT87=m CONFIG_SENSORS_JC42=m CONFIG_SENSORS_POWR1220=m -@@ -3600,7 +3905,7 @@ CONFIG_SENSORS_MAX31790=m +@@ -3600,7 +3911,7 @@ CONFIG_SENSORS_MAX31790=m CONFIG_SENSORS_MCP3021=m # CONFIG_SENSORS_TC654 is not set # CONFIG_SENSORS_TPS23861 is not set @@ -18686,7 +18734,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_SENSORS_ADCXX=m CONFIG_SENSORS_LM63=m CONFIG_SENSORS_LM70=m -@@ -3620,6 +3925,7 @@ CONFIG_SENSORS_LM95241=m +@@ -3620,6 +3931,7 @@ CONFIG_SENSORS_LM95241=m CONFIG_SENSORS_LM95245=m CONFIG_SENSORS_PC87360=m CONFIG_SENSORS_PC87427=m @@ -18694,7 +18742,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_SENSORS_NCT6683=m # CONFIG_SENSORS_NCT6775 is not set # CONFIG_SENSORS_NCT6775_I2C is not set -@@ -3680,7 +3986,7 @@ CONFIG_SENSORS_UCD9200=m +@@ -3680,7 +3992,7 @@ CONFIG_SENSORS_UCD9200=m # CONFIG_SENSORS_XDPE152 is not set # CONFIG_SENSORS_XDPE122 is not set CONFIG_SENSORS_ZL6100=m @@ -18703,7 +18751,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_SENSORS_SBTSI is not set # CONFIG_SENSORS_SBRMI is not set CONFIG_SENSORS_SHT15=m -@@ -3733,9 +4039,14 @@ CONFIG_SENSORS_W83L785TS=m +@@ -3733,9 +4045,14 @@ CONFIG_SENSORS_W83L785TS=m CONFIG_SENSORS_W83L786NG=m CONFIG_SENSORS_W83627HF=m CONFIG_SENSORS_W83627EHF=m @@ -18719,7 +18767,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_OF=y -@@ -3743,41 +4054,62 @@ CONFIG_THERMAL_OF=y +@@ -3743,41 +4060,62 @@ CONFIG_THERMAL_OF=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set @@ -18785,7 +18833,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # # PCI-based Watchdog Cards -@@ -3806,6 +4138,7 @@ CONFIG_BCMA_DRIVER_GPIO=y +@@ -3806,6 +4144,7 @@ CONFIG_BCMA_DRIVER_GPIO=y # CONFIG_MFD_CORE=m # CONFIG_MFD_ACT8945A is not set @@ -18793,7 +18841,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_MFD_AS3711 is not set # CONFIG_MFD_SMPRO is not set # CONFIG_MFD_AS3722 is not set -@@ -3877,8 +4210,8 @@ CONFIG_MFD_CORE=m +@@ -3877,8 +4216,8 @@ CONFIG_MFD_CORE=m # CONFIG_MFD_SM501 is not set # CONFIG_MFD_SKY81452 is not set # CONFIG_MFD_STMPE is not set @@ -18803,7 +18851,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_MFD_LP3943 is not set # CONFIG_MFD_LP8788 is not set # CONFIG_MFD_TI_LMU is not set -@@ -3999,6 +4332,7 @@ CONFIG_REGULATOR_PWM=y +@@ -3999,6 +4338,7 @@ CONFIG_REGULATOR_PWM=y # CONFIG_REGULATOR_TPS65132 is not set # CONFIG_REGULATOR_TPS6524X is not set # CONFIG_REGULATOR_VCTRL is not set @@ -18811,7 +18859,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_RC_CORE is not set # -@@ -4007,7 +4341,7 @@ CONFIG_REGULATOR_PWM=y +@@ -4007,7 +4347,7 @@ CONFIG_REGULATOR_PWM=y # CONFIG_MEDIA_CEC_SUPPORT is not set # end of CEC support @@ -18820,7 +18868,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_MEDIA_SUPPORT_FILTER is not set # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set -@@ -4131,10 +4465,12 @@ CONFIG_RADIO_ADAPTERS=m +@@ -4131,10 +4471,12 @@ CONFIG_RADIO_ADAPTERS=m # CONFIG_USB_RAREMONO is not set # CONFIG_RADIO_SI470X is not set CONFIG_MEDIA_PLATFORM_DRIVERS=y @@ -18835,7 +18883,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # # Allegro DVT media platform drivers -@@ -4173,6 +4509,7 @@ CONFIG_MEDIA_PLATFORM_DRIVERS=y +@@ -4173,6 +4515,7 @@ CONFIG_MEDIA_PLATFORM_DRIVERS=y # # Marvell media platform drivers # @@ -18843,7 +18891,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # # Mediatek media platform drivers -@@ -4197,6 +4534,15 @@ CONFIG_MEDIA_PLATFORM_DRIVERS=y +@@ -4197,6 +4540,15 @@ CONFIG_MEDIA_PLATFORM_DRIVERS=y # # Renesas media platform drivers # @@ -18859,7 +18907,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # # Rockchip media platform drivers -@@ -4213,6 +4559,11 @@ CONFIG_MEDIA_PLATFORM_DRIVERS=y +@@ -4213,6 +4565,11 @@ CONFIG_MEDIA_PLATFORM_DRIVERS=y # # Sunxi media platform drivers # @@ -18871,7 +18919,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # # Texas Instruments drivers -@@ -4221,6 +4572,7 @@ CONFIG_MEDIA_PLATFORM_DRIVERS=y +@@ -4221,6 +4578,7 @@ CONFIG_MEDIA_PLATFORM_DRIVERS=y # # Verisilicon media platform drivers # @@ -18879,7 +18927,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # # VIA media platform drivers -@@ -4229,6 +4581,7 @@ CONFIG_MEDIA_PLATFORM_DRIVERS=y +@@ -4229,6 +4587,7 @@ CONFIG_MEDIA_PLATFORM_DRIVERS=y # # Xilinx media platform drivers # @@ -18887,7 +18935,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # # MMC/SDIO DVB adapters -@@ -4283,6 +4636,7 @@ CONFIG_VIDEO_CAMERA_SENSOR=y +@@ -4283,6 +4642,7 @@ CONFIG_VIDEO_CAMERA_SENSOR=y # CONFIG_VIDEO_OV2659 is not set # CONFIG_VIDEO_OV2680 is not set # CONFIG_VIDEO_OV2685 is not set @@ -18895,7 +18943,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_VIDEO_OV4689 is not set # CONFIG_VIDEO_OV5640 is not set # CONFIG_VIDEO_OV5645 is not set -@@ -4304,6 +4658,7 @@ CONFIG_VIDEO_CAMERA_SENSOR=y +@@ -4304,6 +4664,7 @@ CONFIG_VIDEO_CAMERA_SENSOR=y # CONFIG_VIDEO_OV9282 is not set # CONFIG_VIDEO_OV9640 is not set # CONFIG_VIDEO_OV9650 is not set @@ -18903,7 +18951,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_VIDEO_RDACM20 is not set # CONFIG_VIDEO_RDACM21 is not set # CONFIG_VIDEO_RJ54N1 is not set -@@ -4341,6 +4696,7 @@ CONFIG_VIDEO_CAMERA_SENSOR=y +@@ -4341,6 +4702,7 @@ CONFIG_VIDEO_CAMERA_SENSOR=y # CONFIG_VIDEO_CS53L32A is not set # CONFIG_VIDEO_MSP3400 is not set # CONFIG_VIDEO_SONY_BTF_MPX is not set @@ -18911,7 +18959,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_VIDEO_TDA7432 is not set # CONFIG_VIDEO_TDA9840 is not set # CONFIG_VIDEO_TEA6415C is not set -@@ -4451,7 +4807,7 @@ CONFIG_CXD2880_SPI_DRV=m +@@ -4451,7 +4813,7 @@ CONFIG_CXD2880_SPI_DRV=m # CONFIG_VIDEO_GS1662 is not set # end of Media SPI Adapters @@ -18920,7 +18968,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # # Customize TV tuners -@@ -4668,6 +5024,7 @@ CONFIG_DVB_SP2=m +@@ -4668,6 +5030,7 @@ CONFIG_DVB_SP2=m # Graphics support # CONFIG_APERTURE_HELPERS=y @@ -18928,7 +18976,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_VIDEO_CMDLINE=y CONFIG_VIDEO_NOMODESET=y CONFIG_AUXDISPLAY=y -@@ -4679,6 +5036,7 @@ CONFIG_AUXDISPLAY=y +@@ -4679,6 +5042,7 @@ CONFIG_AUXDISPLAY=y # CONFIG_CHARLCD_BL_ON is not set CONFIG_CHARLCD_BL_FLASH=y CONFIG_DRM=y @@ -18936,7 +18984,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_DRM_DEBUG_MM is not set CONFIG_DRM_KMS_HELPER=y # CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set -@@ -4687,7 +5045,7 @@ CONFIG_DRM_FBDEV_EMULATION=y +@@ -4687,7 +5051,7 @@ CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 # CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set CONFIG_DRM_LOAD_EDID_FIRMWARE=y @@ -18945,7 +18993,30 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_DRM_DISPLAY_DP_HELPER=y CONFIG_DRM_DISPLAY_HDCP_HELPER=y CONFIG_DRM_DISPLAY_HDMI_HELPER=y -@@ -4749,6 +5107,9 @@ CONFIG_DRM_NOUVEAU_BACKLIGHT=y +@@ -4720,7 +5084,7 @@ CONFIG_DRM_I2C_NXP_TDA998X=m + CONFIG_DRM_RADEON=m + CONFIG_DRM_RADEON_USERPTR=y + CONFIG_DRM_AMDGPU=m +-# CONFIG_DRM_AMDGPU_SI is not set ++CONFIG_DRM_AMDGPU_SI=y + CONFIG_DRM_AMDGPU_CIK=y + CONFIG_DRM_AMDGPU_USERPTR=y + # CONFIG_DRM_AMDGPU_WERROR is not set +@@ -4735,9 +5099,13 @@ CONFIG_DRM_AMDGPU_USERPTR=y + # Display Engine Configuration + # + CONFIG_DRM_AMD_DC=y ++CONFIG_DRM_AMD_DC_FP=y ++# CONFIG_DRM_AMD_DC_SI is not set + # CONFIG_DEBUG_KERNEL_DC is not set ++# CONFIG_DRM_AMD_SECURE_DISPLAY is not set + # end of Display Engine Configuration + ++CONFIG_HSA_AMD=y + CONFIG_DRM_NOUVEAU=m + CONFIG_NOUVEAU_DEBUG=5 + CONFIG_NOUVEAU_DEBUG_DEFAULT=3 +@@ -4749,6 +5117,9 @@ CONFIG_DRM_NOUVEAU_BACKLIGHT=y CONFIG_DRM_UDL=m CONFIG_DRM_AST=m CONFIG_DRM_MGAG200=m @@ -18955,7 +19026,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_DRM_QXL=m CONFIG_DRM_VIRTIO_GPU=m CONFIG_DRM_VIRTIO_GPU_KMS=y -@@ -4759,36 +5120,89 @@ CONFIG_DRM_PANEL=y +@@ -4759,36 +5130,89 @@ CONFIG_DRM_PANEL=y # # CONFIG_DRM_PANEL_ABT_Y030XX067A is not set # CONFIG_DRM_PANEL_ARM_VERSATILE is not set @@ -19046,7 +19117,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # end of Display Panels CONFIG_DRM_BRIDGE=y -@@ -4834,10 +5248,16 @@ CONFIG_DRM_PANEL_BRIDGE=y +@@ -4834,10 +5258,16 @@ CONFIG_DRM_PANEL_BRIDGE=y # CONFIG_DRM_I2C_ADV7511 is not set # CONFIG_DRM_CDNS_DSI is not set # CONFIG_DRM_CDNS_MHDP8546 is not set @@ -19064,7 +19135,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_DRM_LOGICVC is not set # CONFIG_DRM_ARCPGU is not set CONFIG_DRM_BOCHS=m -@@ -4856,6 +5276,14 @@ CONFIG_DRM_CIRRUS_QEMU=m +@@ -4856,6 +5286,14 @@ CONFIG_DRM_CIRRUS_QEMU=m # CONFIG_TINYDRM_ST7735R is not set # CONFIG_DRM_GUD is not set # CONFIG_DRM_SSD130X is not set @@ -19079,7 +19150,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_DRM_LEGACY is not set CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y -@@ -4894,6 +5322,7 @@ CONFIG_FB_RADEON_BACKLIGHT=y +@@ -4894,6 +5332,7 @@ CONFIG_FB_RADEON_BACKLIGHT=y # CONFIG_FB_ARK is not set # CONFIG_FB_PM3 is not set # CONFIG_FB_CARMINE is not set @@ -19087,7 +19158,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_FB_SMSCUFX is not set # CONFIG_FB_UDL is not set # CONFIG_FB_IBM_GXT4500 is not set -@@ -4919,6 +5348,7 @@ CONFIG_FB_SYS_IMAGEBLIT=y +@@ -4919,6 +5358,7 @@ CONFIG_FB_SYS_IMAGEBLIT=y # CONFIG_FB_FOREIGN_ENDIAN is not set CONFIG_FB_SYS_FOPS=y CONFIG_FB_DEFERRED_IO=y @@ -19095,7 +19166,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_FB_IOMEM_HELPERS=y CONFIG_FB_SYSMEM_HELPERS=y CONFIG_FB_SYSMEM_HELPERS_DEFERRED=y -@@ -4946,7 +5376,7 @@ CONFIG_LCD_PLATFORM=m +@@ -4946,7 +5386,7 @@ CONFIG_LCD_PLATFORM=m CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_KTD253 is not set # CONFIG_BACKLIGHT_KTZ8866 is not set @@ -19104,7 +19175,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_BACKLIGHT_QCOM_WLED is not set # CONFIG_BACKLIGHT_ADP8860 is not set # CONFIG_BACKLIGHT_ADP8870 is not set -@@ -4960,6 +5390,7 @@ CONFIG_BACKLIGHT_GPIO=m +@@ -4960,6 +5400,7 @@ CONFIG_BACKLIGHT_GPIO=m # CONFIG_BACKLIGHT_LED is not set # end of Backlight & LCD device support @@ -19112,7 +19183,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_HDMI=y # -@@ -4983,10 +5414,13 @@ CONFIG_LOGO_LINUX_CLUT224=y +@@ -4983,10 +5424,13 @@ CONFIG_LOGO_LINUX_CLUT224=y # end of Graphics support # CONFIG_DRM_ACCEL is not set @@ -19130,7 +19201,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_SND_HWDEP=m CONFIG_SND_RAWMIDI=m CONFIG_SND_JACK=y -@@ -5074,6 +5508,11 @@ CONFIG_SND_HDA_INTEL=m +@@ -5074,6 +5518,11 @@ CONFIG_SND_HDA_INTEL=m # CONFIG_SND_HDA_RECONFIG is not set # CONFIG_SND_HDA_INPUT_BEEP is not set # CONFIG_SND_HDA_PATCH_LOADER is not set @@ -19142,7 +19213,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_SND_HDA_CODEC_REALTEK is not set # CONFIG_SND_HDA_CODEC_ANALOG is not set # CONFIG_SND_HDA_CODEC_SIGMATEL is not set -@@ -5095,7 +5534,9 @@ CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 +@@ -5095,7 +5544,9 @@ CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 CONFIG_SND_HDA_CORE=m CONFIG_SND_HDA_COMPONENT=y CONFIG_SND_HDA_PREALLOC_SIZE=64 @@ -19152,7 +19223,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_SND_SPI=y CONFIG_SND_USB=y CONFIG_SND_USB_AUDIO=m -@@ -5110,7 +5551,273 @@ CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y +@@ -5110,7 +5561,273 @@ CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y # CONFIG_SND_USB_PODHD is not set # CONFIG_SND_USB_TONEPORT is not set # CONFIG_SND_USB_VARIAX is not set @@ -19427,7 +19498,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_SND_VIRTIO is not set CONFIG_HID_SUPPORT=y CONFIG_HID=y -@@ -5195,6 +5902,7 @@ CONFIG_HID_MULTITOUCH=m +@@ -5195,6 +5912,7 @@ CONFIG_HID_MULTITOUCH=m # CONFIG_HID_NINTENDO is not set # CONFIG_HID_NTI is not set CONFIG_HID_NTRIG=y @@ -19435,7 +19506,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_HID_ORTEK=m CONFIG_HID_PANTHERLORD=m # CONFIG_PANTHERLORD_FF is not set -@@ -5260,6 +5968,7 @@ CONFIG_USB_HIDDEV=y +@@ -5261,6 +5979,7 @@ CONFIG_USB_HIDDEV=y # end of USB HID support CONFIG_I2C_HID=y @@ -19443,7 +19514,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_I2C_HID_OF is not set # CONFIG_I2C_HID_OF_ELAN is not set # CONFIG_I2C_HID_OF_GOODIX is not set -@@ -5296,6 +6005,7 @@ CONFIG_USB_XHCI_HCD=y +@@ -5297,6 +6016,7 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_PCI=y # CONFIG_USB_XHCI_PCI_RENESAS is not set CONFIG_USB_XHCI_PLATFORM=y @@ -19451,7 +19522,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TT_NEWSCHED=y -@@ -5313,6 +6023,7 @@ CONFIG_USB_UHCI_HCD=y +@@ -5314,6 +6034,7 @@ CONFIG_USB_UHCI_HCD=y # CONFIG_USB_R8A66597_HCD is not set # CONFIG_USB_HCD_BCMA is not set # CONFIG_USB_HCD_TEST_MODE is not set @@ -19459,7 +19530,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # # USB Device Class drivers -@@ -5337,8 +6048,8 @@ CONFIG_USB_STORAGE_DATAFAB=m +@@ -5338,8 +6059,8 @@ CONFIG_USB_STORAGE_DATAFAB=m CONFIG_USB_STORAGE_FREECOM=m CONFIG_USB_STORAGE_ISD200=m CONFIG_USB_STORAGE_USBAT=m @@ -19470,7 +19541,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_USB_STORAGE_JUMPSHOT=m CONFIG_USB_STORAGE_ALAUDA=m CONFIG_USB_STORAGE_ONETOUCH=m -@@ -5359,7 +6070,19 @@ CONFIG_USB_MICROTEK=m +@@ -5360,7 +6081,19 @@ CONFIG_USB_MICROTEK=m # # CONFIG_USB_CDNS_SUPPORT is not set # CONFIG_USB_MUSB_HDRC is not set @@ -19491,7 +19562,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_USB_DWC2 is not set # CONFIG_USB_CHIPIDEA is not set # CONFIG_USB_ISP1760 is not set -@@ -5451,7 +6174,7 @@ CONFIG_USB_HSIC_USB3503=m +@@ -5452,7 +6185,7 @@ CONFIG_USB_HSIC_USB3503=m # CONFIG_USB_HSIC_USB4604 is not set # CONFIG_USB_LINK_LAYER_TEST is not set CONFIG_USB_CHAOSKEY=m @@ -19500,7 +19571,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_USB_ATM=m # CONFIG_USB_SPEEDTOUCH is not set CONFIG_USB_CXACRU=m -@@ -5466,7 +6189,101 @@ CONFIG_USB_XUSBATM=m +@@ -5467,7 +6200,101 @@ CONFIG_USB_XUSBATM=m # CONFIG_USB_ISP1301 is not set # end of USB Physical Layer drivers @@ -19603,7 +19674,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_TYPEC=m CONFIG_TYPEC_TCPM=m CONFIG_TYPEC_TCPCI=m -@@ -5475,6 +6292,7 @@ CONFIG_TYPEC_TCPCI=m +@@ -5476,6 +6303,7 @@ CONFIG_TYPEC_TCPCI=m # CONFIG_TYPEC_FUSB302 is not set CONFIG_TYPEC_UCSI=m # CONFIG_UCSI_CCG is not set @@ -19611,7 +19682,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_UCSI_STM32G0 is not set # CONFIG_TYPEC_TPS6598X is not set # CONFIG_TYPEC_ANX7411 is not set -@@ -5499,7 +6317,7 @@ CONFIG_TYPEC_DP_ALTMODE=m +@@ -5500,7 +6328,7 @@ CONFIG_TYPEC_DP_ALTMODE=m # CONFIG_TYPEC_NVIDIA_ALTMODE is not set # end of USB Type-C Alternate Mode drivers @@ -19620,7 +19691,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_MMC=y CONFIG_PWRSEQ_EMMC=m CONFIG_PWRSEQ_SIMPLE=m -@@ -5518,15 +6336,18 @@ CONFIG_MMC_SDHCI=y +@@ -5519,15 +6347,18 @@ CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_IO_ACCESSORS=y CONFIG_MMC_SDHCI_PCI=m CONFIG_MMC_RICOH_MMC=y @@ -19640,7 +19711,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_MMC_CB710=m CONFIG_MMC_VIA_SDMMC=m CONFIG_MMC_DW=m -@@ -5537,18 +6358,18 @@ CONFIG_MMC_DW_BLUEFIELD=m +@@ -5538,18 +6369,18 @@ CONFIG_MMC_DW_BLUEFIELD=m # CONFIG_MMC_DW_K3 is not set CONFIG_MMC_DW_PCI=m # CONFIG_MMC_DW_STARFIVE is not set @@ -19661,7 +19732,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_SCSI_UFSHCD is not set CONFIG_MEMSTICK=m # CONFIG_MEMSTICK_DEBUG is not set -@@ -5589,7 +6410,7 @@ CONFIG_LEDS_LM3530=m +@@ -5590,7 +6421,7 @@ CONFIG_LEDS_LM3530=m # CONFIG_LEDS_LM3642 is not set # CONFIG_LEDS_LM3692X is not set # CONFIG_LEDS_PCA9532 is not set @@ -19670,7 +19741,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_LEDS_LP3944=m # CONFIG_LEDS_LP3952 is not set # CONFIG_LEDS_LP50XX is not set -@@ -5671,6 +6492,7 @@ CONFIG_INFINIBAND_USER_MEM=y +@@ -5672,6 +6503,7 @@ CONFIG_INFINIBAND_USER_MEM=y CONFIG_INFINIBAND_ON_DEMAND_PAGING=y CONFIG_INFINIBAND_ADDR_TRANS=y CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y @@ -19678,7 +19749,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_INFINIBAND_VIRT_DMA=y CONFIG_INFINIBAND_BNXT_RE=m CONFIG_INFINIBAND_CXGB4=m -@@ -5803,21 +6625,28 @@ CONFIG_RTC_DRV_M48T35=m +@@ -5804,21 +6636,28 @@ CONFIG_RTC_DRV_M48T35=m CONFIG_RTC_DRV_M48T59=m CONFIG_RTC_DRV_MSM6242=m CONFIG_RTC_DRV_RP5C01=m @@ -19707,7 +19778,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_DMADEVICES=y # CONFIG_DMADEVICES_DEBUG is not set -@@ -5825,10 +6654,13 @@ CONFIG_DMADEVICES=y +@@ -5826,10 +6665,13 @@ CONFIG_DMADEVICES=y # DMA Devices # CONFIG_DMA_ENGINE=y @@ -19722,7 +19793,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_FSL_EDMA is not set # CONFIG_INTEL_IDMA64 is not set # CONFIG_PL330_DMA is not set -@@ -5843,22 +6675,25 @@ CONFIG_DW_DMAC=m +@@ -5844,22 +6686,25 @@ CONFIG_DW_DMAC=m CONFIG_DW_DMAC_PCI=m # CONFIG_DW_EDMA is not set # CONFIG_SF_PDMA is not set @@ -19752,7 +19823,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_DMABUF_HEAPS is not set # CONFIG_DMABUF_SYSFS_STATS is not set # end of DMABUF options -@@ -5947,6 +6782,8 @@ CONFIG_COMMON_CLK=y +@@ -5948,6 +6793,8 @@ CONFIG_COMMON_CLK=y # CONFIG_COMMON_CLK_VC7 is not set # CONFIG_COMMON_CLK_FIXED_MMIO is not set CONFIG_CLK_ANALOGBITS_WRPLL_CLN28HPC=y @@ -19761,7 +19832,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_CLK_SIFIVE=y CONFIG_CLK_SIFIVE_PRCI=y CONFIG_CLK_STARFIVE_JH71X0=y -@@ -5958,15 +6795,27 @@ CONFIG_CLK_STARFIVE_JH7110_AON=m +@@ -5959,15 +6806,27 @@ CONFIG_CLK_STARFIVE_JH7110_AON=m CONFIG_CLK_STARFIVE_JH7110_STG=m CONFIG_CLK_STARFIVE_JH7110_ISP=m CONFIG_CLK_STARFIVE_JH7110_VOUT=m @@ -19789,7 +19860,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_RISCV_TIMER=y # end of Clock Source drivers -@@ -5975,8 +6824,11 @@ CONFIG_MAILBOX=y +@@ -5976,8 +6835,11 @@ CONFIG_MAILBOX=y # CONFIG_ARM_MHU_V2 is not set # CONFIG_PLATFORM_MHU is not set # CONFIG_PL320_MBOX is not set @@ -19801,7 +19872,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_IOMMU_API=y CONFIG_IOMMU_SUPPORT=y -@@ -5991,6 +6843,7 @@ CONFIG_IOMMU_DEFAULT_DMA_LAZY=y +@@ -5992,6 +6854,7 @@ CONFIG_IOMMU_DEFAULT_DMA_LAZY=y # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set CONFIG_OF_IOMMU=y # CONFIG_IOMMUFD is not set @@ -19809,7 +19880,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # # Remoteproc drivers -@@ -6006,6 +6859,7 @@ CONFIG_RPMSG_CHAR=y +@@ -6007,6 +6870,7 @@ CONFIG_RPMSG_CHAR=y CONFIG_RPMSG_CTRL=y CONFIG_RPMSG_NS=y # CONFIG_RPMSG_QCOM_GLINK_RPM is not set @@ -19817,7 +19888,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_RPMSG_VIRTIO=y # end of Rpmsg drivers -@@ -6054,22 +6908,65 @@ CONFIG_RPMSG_VIRTIO=y +@@ -6055,22 +6919,65 @@ CONFIG_RPMSG_VIRTIO=y # CONFIG_QCOM_PMIC_GLINK is not set # end of Qualcomm SoC drivers @@ -19884,7 +19955,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_EXTCON_FSA9480 is not set CONFIG_EXTCON_GPIO=m # CONFIG_EXTCON_MAX3355 is not set -@@ -6079,7 +6976,536 @@ CONFIG_EXTCON_GPIO=m +@@ -6080,7 +6987,536 @@ CONFIG_EXTCON_GPIO=m # CONFIG_EXTCON_USB_GPIO is not set # CONFIG_EXTCON_USBC_TUSB320 is not set # CONFIG_MEMORY is not set @@ -20422,7 +20493,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_NTB is not set CONFIG_PWM=y CONFIG_PWM_SYSFS=y -@@ -6089,7 +7515,11 @@ CONFIG_PWM_SYSFS=y +@@ -6090,7 +7526,11 @@ CONFIG_PWM_SYSFS=y # CONFIG_PWM_DWC is not set # CONFIG_PWM_FSL_FTM is not set # CONFIG_PWM_PCA9685 is not set @@ -20434,7 +20505,17 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_PWM_XILINX is not set # -@@ -6105,6 +7535,8 @@ CONFIG_SIFIVE_PLIC=y +@@ -6100,12 +7540,18 @@ CONFIG_IRQCHIP=y + # CONFIG_AL_FIC is not set + # CONFIG_XILINX_INTC is not set + CONFIG_RISCV_INTC=y ++CONFIG_RISCV_APLIC=y ++CONFIG_RISCV_APLIC_MSI=y ++CONFIG_RISCV_IMSIC=y ++CONFIG_RISCV_IMSIC_PCI=y + CONFIG_SIFIVE_PLIC=y + # end of IRQ chip support + # CONFIG_IPACK_BUS is not set CONFIG_RESET_CONTROLLER=y CONFIG_RESET_SIMPLE=y @@ -20443,7 +20524,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_RESET_TI_SYSCON is not set # CONFIG_RESET_TI_TPS380X is not set CONFIG_RESET_STARFIVE_JH71X0=y -@@ -6115,7 +7547,12 @@ CONFIG_RESET_STARFIVE_JH7110=y +@@ -6116,7 +7562,12 @@ CONFIG_RESET_STARFIVE_JH7110=y # PHY Subsystem # CONFIG_GENERIC_PHY=y @@ -20456,7 +20537,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # # PHY drivers for Broadcom platforms -@@ -6131,14 +7568,21 @@ CONFIG_GENERIC_PHY=y +@@ -6132,14 +7583,21 @@ CONFIG_GENERIC_PHY=y # CONFIG_PHY_PXA_28NM_HSIC is not set # CONFIG_PHY_PXA_28NM_USB2 is not set # CONFIG_PHY_LAN966X_SERDES is not set @@ -20478,7 +20559,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # end of PHY Subsystem # CONFIG_POWERCAP is not set -@@ -6190,7 +7634,9 @@ CONFIG_NVMEM_SYSFS=y +@@ -6191,7 +7649,9 @@ CONFIG_NVMEM_SYSFS=y # end of Layout Types # CONFIG_NVMEM_RMEM is not set @@ -20488,7 +20569,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # # HW tracing support -@@ -6201,6 +7647,8 @@ CONFIG_NVMEM_SYSFS=y +@@ -6202,6 +7662,8 @@ CONFIG_NVMEM_SYSFS=y # CONFIG_FPGA is not set # CONFIG_FSI is not set @@ -20497,7 +20578,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_PM_OPP=y # CONFIG_SIOX is not set # CONFIG_SLIMBUS is not set -@@ -6234,6 +7682,7 @@ CONFIG_EXT4_FS_POSIX_ACL=y +@@ -6235,6 +7697,7 @@ CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y # CONFIG_EXT4_DEBUG is not set # CONFIG_EXT4_ERROR_REPORT is not set @@ -20505,7 +20586,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_JBD2=y # CONFIG_JBD2_DEBUG is not set CONFIG_FS_MBCACHE=y -@@ -6288,10 +7737,10 @@ CONFIG_QUOTA_TREE=y +@@ -6289,10 +7752,10 @@ CONFIG_QUOTA_TREE=y CONFIG_QFMT_V2=y CONFIG_QUOTACTL=y CONFIG_AUTOFS_FS=y @@ -20518,7 +20599,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y # CONFIG_OVERLAY_FS_INDEX is not set -@@ -6381,8 +7830,24 @@ CONFIG_MISC_FILESYSTEMS=y +@@ -6382,8 +7845,24 @@ CONFIG_MISC_FILESYSTEMS=y # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set @@ -20545,7 +20626,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_CRAMFS=m CONFIG_CRAMFS_BLOCKDEV=y # CONFIG_CRAMFS_MTD is not set -@@ -6415,7 +7880,6 @@ CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240 +@@ -6416,7 +7895,6 @@ CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240 CONFIG_PSTORE_COMPRESS=y # CONFIG_PSTORE_CONSOLE is not set # CONFIG_PSTORE_PMSG is not set @@ -20553,7 +20634,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_PSTORE_RAM=m # CONFIG_PSTORE_BLK is not set # CONFIG_SYSV_FS is not set -@@ -6431,7 +7895,7 @@ CONFIG_NFS_V4=y +@@ -6432,7 +7910,7 @@ CONFIG_NFS_V4=y CONFIG_NFS_V4_1=y CONFIG_NFS_V4_2=y CONFIG_PNFS_FILE_LAYOUT=y @@ -20562,7 +20643,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_PNFS_FLEXFILE_LAYOUT=m CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" # CONFIG_NFS_V4_1_MIGRATION is not set -@@ -6517,7 +7981,7 @@ CONFIG_NLS_ISO8859_8=m +@@ -6518,7 +7996,7 @@ CONFIG_NLS_ISO8859_8=m CONFIG_NLS_CODEPAGE_1250=m CONFIG_NLS_CODEPAGE_1251=m CONFIG_NLS_ASCII=y @@ -20571,7 +20652,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_NLS_ISO8859_2=m CONFIG_NLS_ISO8859_3=m CONFIG_NLS_ISO8859_4=m -@@ -6556,6 +8020,7 @@ CONFIG_KEYS=y +@@ -6557,6 +8035,7 @@ CONFIG_KEYS=y CONFIG_PERSISTENT_KEYRINGS=y CONFIG_TRUSTED_KEYS=y CONFIG_TRUSTED_KEYS_TPM=y @@ -20579,7 +20660,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_ENCRYPTED_KEYS=y # CONFIG_USER_DECRYPTED_DATA is not set # CONFIG_KEY_DH_OPERATIONS is not set -@@ -6631,6 +8096,7 @@ CONFIG_IMA_MEASURE_ASYMMETRIC_KEYS=y +@@ -6635,6 +8114,7 @@ CONFIG_IMA_MEASURE_ASYMMETRIC_KEYS=y CONFIG_IMA_QUEUE_EARLY_BOOT_KEYS=y # CONFIG_IMA_DISABLE_HTABLE is not set # CONFIG_IMA_DIGEST_LIST is not set @@ -20587,7 +20668,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_EVM=y # CONFIG_EVM_DEFAULT_HASH_SHA1 is not set CONFIG_EVM_DEFAULT_HASH_SHA256=y -@@ -6653,6 +8119,8 @@ CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,appar +@@ -6657,6 +8137,8 @@ CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,appar # Memory initialization # CONFIG_INIT_STACK_NONE=y @@ -20596,7 +20677,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set # CONFIG_ZERO_CALL_USED_REGS is not set -@@ -6667,8 +8135,6 @@ CONFIG_LIST_HARDENED=y +@@ -6671,8 +8153,6 @@ CONFIG_LIST_HARDENED=y CONFIG_RANDSTRUCT_NONE=y # end of Kernel hardening options @@ -20605,7 +20686,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # end of Security options CONFIG_XOR_BLOCKS=m -@@ -6689,6 +8155,7 @@ CONFIG_CRYPTO_ALGAPI=y +@@ -6693,6 +8173,7 @@ CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_ALGAPI2=y CONFIG_CRYPTO_AEAD=y CONFIG_CRYPTO_AEAD2=y @@ -20613,7 +20694,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_CRYPTO_SIG2=y CONFIG_CRYPTO_SKCIPHER=y CONFIG_CRYPTO_SKCIPHER2=y -@@ -6700,18 +8167,18 @@ CONFIG_CRYPTO_RNG_DEFAULT=y +@@ -6704,18 +8185,18 @@ CONFIG_CRYPTO_RNG_DEFAULT=y CONFIG_CRYPTO_AKCIPHER2=y CONFIG_CRYPTO_AKCIPHER=y CONFIG_CRYPTO_KPP2=y @@ -20635,7 +20716,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_ENGINE=y # end of Crypto core or helper -@@ -6720,14 +8187,14 @@ CONFIG_CRYPTO_ENGINE=y +@@ -6724,14 +8205,14 @@ CONFIG_CRYPTO_ENGINE=y # Public-key cryptography # CONFIG_CRYPTO_RSA=y @@ -20654,7 +20735,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # end of Public-key cryptography # -@@ -6743,7 +8210,7 @@ CONFIG_CRYPTO_CAMELLIA=m +@@ -6747,7 +8228,7 @@ CONFIG_CRYPTO_CAMELLIA=m CONFIG_CRYPTO_CAST_COMMON=m CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST6=m @@ -20663,7 +20744,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_KHAZAD=m CONFIG_CRYPTO_SEED=m -@@ -6760,7 +8227,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m +@@ -6764,7 +8245,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m # # CONFIG_CRYPTO_ADIANTUM is not set CONFIG_CRYPTO_ARC4=m @@ -20672,7 +20753,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_CRYPTO_CBC=y # CONFIG_CRYPTO_CFB is not set CONFIG_CRYPTO_CTR=y -@@ -6769,35 +8236,35 @@ CONFIG_CRYPTO_ECB=y +@@ -6773,35 +8254,35 @@ CONFIG_CRYPTO_ECB=y # CONFIG_CRYPTO_HCTR2 is not set # CONFIG_CRYPTO_KEYWRAP is not set CONFIG_CRYPTO_LRW=m @@ -20715,7 +20796,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_SHA1=y CONFIG_CRYPTO_SHA256=y -@@ -6860,6 +8327,10 @@ CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y +@@ -6864,6 +8345,10 @@ CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y CONFIG_CRYPTO_HASH_INFO=y CONFIG_CRYPTO_HW=y @@ -20726,7 +20807,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_CRYPTO_DEV_ATMEL_ECC is not set # CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set # CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set -@@ -6867,6 +8338,7 @@ CONFIG_CRYPTO_HW=y +@@ -6871,6 +8356,7 @@ CONFIG_CRYPTO_HW=y # CONFIG_CRYPTO_DEV_QAT_C3XXX is not set # CONFIG_CRYPTO_DEV_QAT_C62X is not set # CONFIG_CRYPTO_DEV_QAT_4XXX is not set @@ -20734,7 +20815,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_CRYPTO_DEV_QAT_DH895xCCVF is not set # CONFIG_CRYPTO_DEV_QAT_C3XXXVF is not set # CONFIG_CRYPTO_DEV_QAT_C62XVF is not set -@@ -6929,16 +8401,16 @@ CONFIG_GENERIC_PCI_IOMAP=y +@@ -6933,16 +8419,16 @@ CONFIG_GENERIC_PCI_IOMAP=y # CONFIG_CRYPTO_LIB_UTILS=y CONFIG_CRYPTO_LIB_AES=y @@ -20756,7 +20837,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_CRYPTO_LIB_POLY1305 is not set # CONFIG_CRYPTO_LIB_CHACHA20POLY1305 is not set CONFIG_CRYPTO_LIB_SHA1=y -@@ -7009,6 +8481,7 @@ CONFIG_HAS_IOPORT_MAP=y +@@ -7013,6 +8499,7 @@ CONFIG_HAS_IOPORT_MAP=y CONFIG_HAS_DMA=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_ARCH_DMA_ADDR_T_64BIT=y @@ -20764,7 +20845,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_DMA_DECLARE_COHERENT=y CONFIG_ARCH_HAS_SETUP_DMA_OPS=y CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y -@@ -7028,7 +8501,7 @@ CONFIG_DMA_CMA=y +@@ -7032,7 +8519,7 @@ CONFIG_DMA_CMA=y # # Default contiguous memory area size: # @@ -20773,7 +20854,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_CMA_SIZE_SEL_MBYTES=y # CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set # CONFIG_CMA_SIZE_SEL_MIN is not set -@@ -7039,7 +8512,6 @@ CONFIG_DMA_MAP_BENCHMARK=y +@@ -7043,7 +8530,6 @@ CONFIG_DMA_MAP_BENCHMARK=y CONFIG_SGL_ALLOC=y CONFIG_CHECK_SIGNATURE=y # CONFIG_CPUMASK_OFFSTACK is not set @@ -20781,7 +20862,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_CPU_RMAP=y CONFIG_DQL=y CONFIG_GLOB=y -@@ -7092,7 +8564,6 @@ CONFIG_BOOT_PRINTK_DELAY=y +@@ -7096,7 +8582,6 @@ CONFIG_BOOT_PRINTK_DELAY=y CONFIG_DYNAMIC_DEBUG=y CONFIG_DYNAMIC_DEBUG_CORE=y CONFIG_SYMBOLIC_ERRNAME=y @@ -20789,7 +20870,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # end of printk and dmesg options CONFIG_DEBUG_KERNEL=y -@@ -7109,6 +8580,7 @@ CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y +@@ -7113,6 +8598,7 @@ CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y # CONFIG_DEBUG_INFO_REDUCED is not set CONFIG_DEBUG_INFO_COMPRESSED_NONE=y # CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set @@ -20797,7 +20878,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_DEBUG_INFO_BTF=y CONFIG_PAHOLE_HAS_SPLIT_BTF=y CONFIG_PAHOLE_HAS_LANG_EXCLUDE=y -@@ -7175,7 +8647,6 @@ CONFIG_SLUB_DEBUG=y +@@ -7179,7 +8665,6 @@ CONFIG_SLUB_DEBUG=y # CONFIG_PAGE_TABLE_CHECK is not set # CONFIG_PAGE_POISONING is not set # CONFIG_DEBUG_PAGE_REF is not set @@ -20805,7 +20886,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_ARCH_HAS_DEBUG_WX=y # CONFIG_DEBUG_WX is not set CONFIG_GENERIC_PTDUMP=y -@@ -7238,6 +8709,7 @@ CONFIG_SCHEDSTATS=y +@@ -7242,6 +8727,7 @@ CONFIG_SCHEDSTATS=y # end of Scheduler Debugging # CONFIG_DEBUG_TIMEKEEPING is not set @@ -20813,7 +20894,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # # Lock Debugging (spinlocks, mutexes, etc...) -@@ -7253,7 +8725,7 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y +@@ -7257,7 +8743,7 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y # CONFIG_DEBUG_LOCK_ALLOC is not set CONFIG_DEBUG_ATOMIC_SLEEP=y # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set @@ -20822,7 +20903,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_WW_MUTEX_SELFTEST is not set # CONFIG_SCF_TORTURE_TEST is not set # CONFIG_CSD_LOCK_WAIT_DEBUG is not set -@@ -7277,8 +8749,9 @@ CONFIG_DEBUG_LIST=y +@@ -7281,8 +8767,9 @@ CONFIG_DEBUG_LIST=y # # RCU Debugging # @@ -20833,7 +20914,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_RCU_REF_SCALE_TEST is not set CONFIG_RCU_CPU_STALL_TIMEOUT=60 CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0 -@@ -7294,7 +8767,6 @@ CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0 +@@ -7298,7 +8785,6 @@ CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0 CONFIG_NOP_TRACER=y CONFIG_HAVE_RETHOOK=y CONFIG_RETHOOK=y @@ -20841,7 +20922,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_RETVAL=y CONFIG_HAVE_DYNAMIC_FTRACE=y -@@ -7311,15 +8783,8 @@ CONFIG_GENERIC_TRACER=y +@@ -7315,15 +8801,8 @@ CONFIG_GENERIC_TRACER=y CONFIG_TRACING_SUPPORT=y CONFIG_FTRACE=y CONFIG_BOOTTIME_TRACING=y @@ -20858,7 +20939,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_SCHED_TRACER=y CONFIG_HWLAT_TRACER=y CONFIG_OSNOISE_TRACER=y -@@ -7332,21 +8797,17 @@ CONFIG_BRANCH_PROFILE_NONE=y +@@ -7336,21 +8815,17 @@ CONFIG_BRANCH_PROFILE_NONE=y CONFIG_BLK_DEV_IO_TRACE=y CONFIG_PROBE_EVENTS_BTF_ARGS=y CONFIG_KPROBE_EVENTS=y @@ -20880,7 +20961,7 @@ index 295dc52b3994..efe2b72ab53e 100644 # CONFIG_FTRACE_STARTUP_TEST is not set # CONFIG_RING_BUFFER_STARTUP_TEST is not set # CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set -@@ -7354,7 +8815,37 @@ CONFIG_RING_BUFFER_BENCHMARK=m +@@ -7358,7 +8833,37 @@ CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_SYNTH_EVENT_GEN_TEST is not set # CONFIG_KPROBE_EVENT_GEN_TEST is not set # CONFIG_RV is not set @@ -20919,7 +21000,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_STRICT_DEVMEM=y CONFIG_IO_STRICT_DEVMEM=y -@@ -7372,7 +8863,47 @@ CONFIG_FUNCTION_ERROR_INJECTION=y +@@ -7376,7 +8881,47 @@ CONFIG_FUNCTION_ERROR_INJECTION=y # CONFIG_FAULT_INJECTION is not set CONFIG_ARCH_HAS_KCOV=y # CONFIG_KCOV is not set @@ -20968,7 +21049,7 @@ index 295dc52b3994..efe2b72ab53e 100644 CONFIG_ARCH_USE_MEMTEST=y # CONFIG_MEMTEST is not set # end of Kernel Testing and Coverage -@@ -7384,9 +8915,3 @@ CONFIG_ARCH_USE_MEMTEST=y +@@ -7388,9 +8933,3 @@ CONFIG_ARCH_USE_MEMTEST=y # end of Kernel hacking # CONFIG_KWORKER_NUMA_AFFINITY is not set @@ -21732,7 +21813,7 @@ index 3272ca7a5270..b99bd66107a6 100644 static inline u64 riscv_page_mtmask(void) diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h -index 63d8a84826e9..63f5eeff43d0 100644 +index e58315cedfd3..d094015802ef 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -205,7 +205,8 @@ extern struct pt_alloc_ops pt_ops __initdata; @@ -29826,7 +29907,7 @@ index 7ba2ec90c3f7..183e306f0c6e 100644 obj-$(CONFIG_HYDCU_FIXUP_HEADER) += hygon/hydcu-fixup-header/ +obj-$(CONFIG_DRM_VERISILICON) += verisilicon/ diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c -index c3d9ca137bea..465409a6114e 100644 +index 2f64c6871935..2d2f0714ea73 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -1109,6 +1109,8 @@ int amdgpu_device_resize_fb_bar(struct amdgpu_device *adev) @@ -29838,6 +29919,19 @@ index c3d9ca137bea..465409a6114e 100644 if (!IS_ENABLED(CONFIG_PHYS_ADDR_T_64BIT)) return 0; +diff --git a/drivers/gpu/drm/amd/amdkfd/Kconfig b/drivers/gpu/drm/amd/amdkfd/Kconfig +index d3c3d3ab7225..9d4a5f8ef43f 100644 +--- a/drivers/gpu/drm/amd/amdkfd/Kconfig ++++ b/drivers/gpu/drm/amd/amdkfd/Kconfig +@@ -5,7 +5,7 @@ + + config HSA_AMD + bool "HSA kernel driver for AMD GPU devices" +- depends on DRM_AMDGPU && (X86_64 || ARM64 || PPC64) ++ depends on DRM_AMDGPU && (X86_64 || ARM64 || PPC64 || RISCV) + select HMM_MIRROR + select MMU_NOTIFIER + select DRM_AMDGPU_USERPTR diff --git a/drivers/gpu/drm/amd/display/Kconfig b/drivers/gpu/drm/amd/display/Kconfig index 901d1961b739..49b33b2f6701 100644 --- a/drivers/gpu/drm/amd/display/Kconfig @@ -30348,7 +30442,7 @@ index 001faea80fef..3555e714f014 100644 #define chipModel_GC800 0x00000800 #define chipModel_GC860 0x00000860 diff --git a/drivers/gpu/drm/etnaviv/etnaviv_buffer.c b/drivers/gpu/drm/etnaviv/etnaviv_buffer.c -index 384df1659be6..74033e7870ac 100644 +index b13a17276d07..8c347ab34f28 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_buffer.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_buffer.c @@ -417,8 +417,11 @@ void etnaviv_buffer_queue(struct etnaviv_gpu *gpu, u32 exec_state, @@ -30366,7 +30460,7 @@ index 384df1659be6..74033e7870ac 100644 VIVS_MMUv2_PTA_CONFIG, VIVS_MMUv2_PTA_CONFIG_INDEX(id)); diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c -index 371e1f2733f6..8158d22a3d1e 100644 +index ad543a7cbf07..8cdc7cf65825 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c @@ -522,7 +522,11 @@ static int etnaviv_hw_reset(struct etnaviv_gpu *gpu) @@ -337441,7 +337535,7 @@ index 000000000000..3cdb50e1a22b +MODULE_DESCRIPTION("Jadard JD9365DA-H3 WXGA DSI panel"); +MODULE_LICENSE("GPL"); diff --git a/drivers/gpu/drm/radeon/radeon_irq_kms.c b/drivers/gpu/drm/radeon/radeon_irq_kms.c -index c4dda908666c..33b56ca7af6f 100644 +index 9961251b44ba..4fb67e6c583b 100644 --- a/drivers/gpu/drm/radeon/radeon_irq_kms.c +++ b/drivers/gpu/drm/radeon/radeon_irq_kms.c @@ -250,10 +250,12 @@ static bool radeon_msi_ok(struct radeon_device *rdev) @@ -443289,7 +443383,7 @@ index 9bac5fb2f13d..edac7c5e94a3 100644 +obj-$(CONFIG_PCIE_CADENCE_SOPHGO) += pcie-cadence-sophgo.o diff --git a/drivers/pci/controller/cadence/pcie-cadence-sophgo.c b/drivers/pci/controller/cadence/pcie-cadence-sophgo.c new file mode 100644 -index 000000000000..9db142c5465a +index 000000000000..6f0a92c632b3 --- /dev/null +++ b/drivers/pci/controller/cadence/pcie-cadence-sophgo.c @@ -0,0 +1,973 @@ @@ -443695,7 +443789,7 @@ index 000000000000..9db142c5465a + return 0; +} + -+static int cdns_pcie_host_init(struct device *dev, struct cdns_mango_pcie_rc *rc) ++static int cdns_pcie_host_sophgo_init(struct device *dev, struct cdns_mango_pcie_rc *rc) +{ + int err; + @@ -444177,7 +444271,7 @@ index 000000000000..9db142c5465a + goto err_get_sync; + } + -+ ret = cdns_pcie_host_init(dev, rc); ++ ret = cdns_pcie_host_sophgo_init(dev, rc); + if (ret) + goto err_init; + @@ -444432,10 +444526,10 @@ index 46fad0d813b2..560b3a236d84 100644 /* * If the user specified "pcie_ports=native", use the PCIe services regardless diff --git a/drivers/perf/arm_smmuv3_pmu.c b/drivers/perf/arm_smmuv3_pmu.c -index 6303b82566f9..9e5d7fa647b6 100644 +index 31e491e7f206..2946422539fb 100644 --- a/drivers/perf/arm_smmuv3_pmu.c +++ b/drivers/perf/arm_smmuv3_pmu.c -@@ -716,7 +716,7 @@ static void smmu_pmu_free_msis(void *data) +@@ -719,7 +719,7 @@ static void smmu_pmu_free_msis(void *data) { struct device *dev = data; @@ -444444,7 +444538,7 @@ index 6303b82566f9..9e5d7fa647b6 100644 } static void smmu_pmu_write_msi_msg(struct msi_desc *desc, struct msi_msg *msg) -@@ -746,7 +746,7 @@ static void smmu_pmu_setup_msi(struct smmu_pmu *pmu) +@@ -749,7 +749,7 @@ static void smmu_pmu_setup_msi(struct smmu_pmu *pmu) if (!(readl(pmu->reg_base + SMMU_PMCG_CFGR) & SMMU_PMCG_CFGR_MSI)) return; @@ -559522,7 +559616,7 @@ index 7fa66501792d..57900b189e99 100644 } EXPORT_SYMBOL_GPL(serial8250_release_dma); diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c -index a1f2259cc9a9..971ba27dd6b1 100644 +index 72f9aab75ab1..65a9865eb6cb 100644 --- a/drivers/tty/serial/8250/8250_dw.c +++ b/drivers/tty/serial/8250/8250_dw.c @@ -262,7 +262,7 @@ static int dw8250_handle_irq(struct uart_port *p) @@ -559572,10 +559666,10 @@ index a17803da83f8..dde4293f3109 100644 /* diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c -index 60079771df25..9ed4236f7b4f 100644 +index 3ec391d06020..8a684e489ca9 100644 --- a/drivers/ufs/host/ufs-qcom.c +++ b/drivers/ufs/host/ufs-qcom.c -@@ -1816,8 +1816,8 @@ static int ufs_qcom_config_esi(struct ufs_hba *hba) +@@ -1814,8 +1814,8 @@ static int ufs_qcom_config_esi(struct ufs_hba *hba) * 2. Poll queues do not need ESI. */ nr_irqs = hba->nr_hw_queues - hba->nr_queues[HCTX_TYPE_POLL]; @@ -559586,7 +559680,7 @@ index 60079771df25..9ed4236f7b4f 100644 if (ret) { dev_err(hba->dev, "Failed to request Platform MSI %d\n", ret); goto out; -@@ -1846,7 +1846,7 @@ static int ufs_qcom_config_esi(struct ufs_hba *hba) +@@ -1844,7 +1844,7 @@ static int ufs_qcom_config_esi(struct ufs_hba *hba) devm_free_irq(hba->dev, desc->irq, hba); } msi_unlock_descs(hba->dev); @@ -559595,15 +559689,16 @@ index 60079771df25..9ed4236f7b4f 100644 } else { if (host->hw_ver.major == 6 && host->hw_ver.minor == 0 && host->hw_ver.step == 0) { -@@ -1928,7 +1928,7 @@ static int ufs_qcom_remove(struct platform_device *pdev) - pm_runtime_get_sync(&(pdev)->dev); - ufshcd_remove(hba); +@@ -1924,7 +1924,8 @@ static void ufs_qcom_remove(struct platform_device *pdev) + + ufshcd_pltfrm_remove(pdev); if (host->esi_enabled) - platform_msi_domain_free_irqs(hba->dev); + platform_device_msi_free_irqs_all(hba->dev); - return 0; ++ return 0; } + static const struct of_device_id ufs_qcom_of_match[] __maybe_unused = { diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig index 98efcbb76c88..54e2a412d643 100644 --- a/drivers/usb/dwc3/Kconfig @@ -562322,10 +562417,10 @@ index 27f42f713c89..7617930d3157 100644 #define MLX4_IS_LEGACY_EQ_MODE(dev_cap) ((dev_cap).num_comp_vectors < \ (dev_cap).num_ports * MIN_MSIX_P_PORT) diff --git a/include/linux/mm.h b/include/linux/mm.h -index 2e6ef9532fc3..4454fcf3a953 100644 +index c127b74f2c90..53c09345618a 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h -@@ -3181,6 +3181,22 @@ static inline spinlock_t *pud_lock(struct mm_struct *mm, pud_t *pud) +@@ -3182,6 +3182,22 @@ static inline spinlock_t *pud_lock(struct mm_struct *mm, pud_t *pud) return ptl; } @@ -562871,10 +562966,10 @@ index 000000000000..cfb1f017480c + +#endif /* __VS_DRM_H__ */ diff --git a/init/Kconfig b/init/Kconfig -index 5af21834fbff..6a7263bee7de 100644 +index 4c566c4bbfa4..0e63ee288041 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -2149,6 +2149,9 @@ source "kernel/Kconfig.locks" +@@ -2158,6 +2158,9 @@ source "kernel/Kconfig.locks" config ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE bool @@ -563032,7 +563127,7 @@ index 75d0ae490e29..8f222d1cccec 100644 } diff --git a/kernel/irq/msi.c b/kernel/irq/msi.c -index 79b4a58ba9c3..f90952ebc494 100644 +index 5a4717a82024..915a4c2b1f65 100644 --- a/kernel/irq/msi.c +++ b/kernel/irq/msi.c @@ -726,11 +726,26 @@ static void msi_domain_free(struct irq_domain *domain, unsigned int virq, @@ -563335,10 +563430,10 @@ index ef9f9a4e928d..824220b20ad7 100644 /* * This thread may hit another WARN() in the panic path. diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index 462571b26f88..c456af8136c4 100644 +index 6a01cd02b579..615126e2eac2 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c -@@ -6662,7 +6662,9 @@ static void __sched notrace __schedule(unsigned int sched_mode) +@@ -6663,7 +6663,9 @@ static void __sched notrace __schedule(unsigned int sched_mode) * if (signal_pending_state()) if (p->state & @state) * * Also, the membarrier system call requires a full memory barrier @@ -563349,7 +563444,7 @@ index 462571b26f88..c456af8136c4 100644 */ rq_lock(rq, &rf); smp_mb__after_spinlock(); -@@ -6740,6 +6742,13 @@ static void __sched notrace __schedule(unsigned int sched_mode) +@@ -6741,6 +6743,13 @@ static void __sched notrace __schedule(unsigned int sched_mode) * architectures where spin_unlock is a full barrier, * - switch_to() for arm64 (weakly-ordered, spin_unlock * is a RELEASE barrier), @@ -563364,10 +563459,10 @@ index 462571b26f88..c456af8136c4 100644 ++*switch_count; diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index be1d35549144..64aea75c0de3 100644 +index c9a4ea466689..5755f9978166 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c -@@ -10590,6 +10590,9 @@ int can_migrate_task(struct task_struct *p, struct lb_env *env) +@@ -10614,6 +10614,9 @@ int can_migrate_task(struct task_struct *p, struct lb_env *env) if (kthread_is_per_cpu(p)) return 0; @@ -563467,10 +563562,10 @@ index 32f99e9a670e..dacadd904250 100644 /* * Find the first cleared bit in a memory region. diff --git a/mm/memblock.c b/mm/memblock.c -index b46bcb931a2e..7ebe8620bb6f 100644 +index f84852a16ce4..4c9ff29245f4 100644 --- a/mm/memblock.c +++ b/mm/memblock.c -@@ -1780,6 +1780,7 @@ phys_addr_t __init_memblock memblock_end_of_DRAM(void) +@@ -1818,6 +1818,7 @@ phys_addr_t __init_memblock memblock_end_of_DRAM(void) static phys_addr_t __init_memblock __find_max_addr(phys_addr_t limit) { @@ -563478,7 +563573,7 @@ index b46bcb931a2e..7ebe8620bb6f 100644 phys_addr_t max_addr = PHYS_ADDR_MAX; struct memblock_region *r; -@@ -1789,11 +1790,10 @@ static phys_addr_t __init_memblock __find_max_addr(phys_addr_t limit) +@@ -1827,11 +1828,10 @@ static phys_addr_t __init_memblock __find_max_addr(phys_addr_t limit) * of those regions, max_addr will keep original value PHYS_ADDR_MAX */ for_each_mem_region(r) { diff --git a/kernel.spec b/kernel.spec index 8c81f1067e5490e8ceb92391efc032852127d2de..c6bc1022da4a01b6e98807768d2b78a780b1629d 100644 --- a/kernel.spec +++ b/kernel.spec @@ -42,7 +42,7 @@ rm -f test_openEuler_sign.ko test_openEuler_sign.ko.sig %global upstream_sublevel 0 %global devel_release 82 %global maintenance_release .0.0 -%global pkg_release .86 +%global pkg_release .87 %global openeuler_lts 1 %global openeuler_major 2403 @@ -1087,6 +1087,12 @@ fi %endif %changelog +* Fri Mar 14 2025 Mingzheng Xing - 6.6.0-82.0.0.87 +- RISC-V kernel upgrade to 6.6.0-82.0.0 +- riscv: Fixed conflict created by commit c7c8e8a76904 +- riscv: Enable zstd-compressed firmware support +- riscv: Enable AMDKFD driver for ROCm + * Wed Mar 12 2025 ZhangPeng - 6.6.0-82.0.0.86 - !15440 [openEuler-24.03-LTS][linux-6.6.y sync] Backport 6.6.70-6.6.72 LTS Patches - drm/mediatek: Only touch DISP_REG_OVL_PITCH_MSB if AFBC is supported