From b743c5d45983c38f77b5f24905883a016a40ca06 Mon Sep 17 00:00:00 2001
From: Qiao Ma <mqaio@linux.alibaba.com>
Date: Fri, 29 Mar 2024 17:19:43 +0800
Subject: [PATCH] anolis: configs: adjust kconfigs to support some important
 arch

ANBZ: #8598

Adjust kconfigs to support ZHAOXIN, PHYTIUM and KUNPENG.
By the way, some important kconfigs, such as CONFIG_UACCE, was modified,
too.

Here are the kconfig list to be adjusted:

x86:
CONFIG_UACCE=m
CONFIG_SCHED_CLUSTER=y
CONFIG_SATA_ZHAOXIN=m
CONFIG_HW_RANDOM_ZHAOXIN=m
CONFIG_I2C_ZHAOXIN=m
CONFIG_CRYPTO_SM2_ZHAOXIN_GMI=m
CONFIG_I2C_ZHAOXIN_SMBUS=m

arm64:
CONFIG_ARM_SMMU_V3_PMU=m
CONFIG_SPI_HISI_KUNPENG=m
CONFIG_NTB=m
CONFIG_UACCE=m
CONFIG_ARCH_PHYTIUM=y
CONFIG_ARM_GIC_PHYTIUM_2500=y
CONFIG_CRYPTO_DEV_HISI_SEC2=m
CONFIG_CRYPTO_DEV_HISI_ZIP=m
CONFIG_INFINIBAND_HNS_HIP08=y
CONFIG_SPI_HISI_SFC_V3XX=m
CONFIG_ARM_SMMU_V3_SVA=y

Signed-off-by: Qiao Ma <mqaio@linux.alibaba.com>
---
 arch/arm64/configs/anolis-debug_defconfig | 32 ++++++++++++++++-------
 arch/arm64/configs/anolis_defconfig       | 32 ++++++++++++++++-------
 arch/x86/configs/anolis-debug_defconfig   | 19 +++++++++-----
 arch/x86/configs/anolis_defconfig         | 16 +++++++-----
 4 files changed, 67 insertions(+), 32 deletions(-)

diff --git a/arch/arm64/configs/anolis-debug_defconfig b/arch/arm64/configs/anolis-debug_defconfig
index 43c9990b1068..8b932435df46 100644
--- a/arch/arm64/configs/anolis-debug_defconfig
+++ b/arch/arm64/configs/anolis-debug_defconfig
@@ -337,6 +337,7 @@ CONFIG_ARCH_HISI=y
 # CONFIG_ARCH_NXP is not set
 # CONFIG_ARCH_MA35 is not set
 # CONFIG_ARCH_NPCM is not set
+CONFIG_ARCH_PHYTIUM=y
 CONFIG_ARCH_QCOM=y
 # CONFIG_ARCH_REALTEK is not set
 # CONFIG_ARCH_RENESAS is not set
@@ -2328,7 +2329,7 @@ CONFIG_CB710_DEBUG_ASSUMPTIONS=y
 # CONFIG_MISC_ALCOR_PCI is not set
 # CONFIG_MISC_RTSX_PCI is not set
 # CONFIG_MISC_RTSX_USB is not set
-# CONFIG_UACCE is not set
+CONFIG_UACCE=m
 CONFIG_PVPANIC=y
 # CONFIG_PVPANIC_MMIO is not set
 # CONFIG_PVPANIC_PCI is not set
@@ -3486,8 +3487,8 @@ CONFIG_SPI_DESIGNWARE=m
 # CONFIG_SPI_DW_DMA is not set
 # CONFIG_SPI_DW_PCI is not set
 CONFIG_SPI_DW_MMIO=m
-# CONFIG_SPI_HISI_KUNPENG is not set
-# CONFIG_SPI_HISI_SFC_V3XX is not set
+CONFIG_SPI_HISI_KUNPENG=m
+CONFIG_SPI_HISI_SFC_V3XX=m
 # CONFIG_SPI_GPIO is not set
 # CONFIG_SPI_FSL_SPI is not set
 # CONFIG_SPI_MICROCHIP_CORE is not set
@@ -5126,7 +5127,7 @@ CONFIG_INFINIBAND_CXGB4=m
 # CONFIG_INFINIBAND_EFA is not set
 CONFIG_INFINIBAND_ERDMA=m
 CONFIG_INFINIBAND_HNS=m
-# CONFIG_INFINIBAND_HNS_HIP08 is not set
+CONFIG_INFINIBAND_HNS_HIP08=y
 # CONFIG_INFINIBAND_IRDMA is not set
 CONFIG_MLX4_INFINIBAND=m
 CONFIG_MLX5_INFINIBAND=m
@@ -5357,6 +5358,7 @@ CONFIG_VFIO_PCI_MMAP=y
 CONFIG_VFIO_PCI_INTX=y
 CONFIG_VFIO_PCI=m
 # CONFIG_MLX5_VFIO_PCI is not set
+# CONFIG_HISI_ACC_VFIO_PCI is not set
 # end of VFIO support for PCI devices
 
 #
@@ -5531,6 +5533,7 @@ CONFIG_IOMMU_DEFAULT_DMA_STRICT=y
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_OF_IOMMU=y
 CONFIG_IOMMU_DMA=y
+CONFIG_IOMMU_SVA=y
 # CONFIG_IOMMUFD is not set
 CONFIG_ARM_SMMU=y
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
@@ -5538,7 +5541,7 @@ CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y
 CONFIG_ARM_SMMU_QCOM=y
 # CONFIG_ARM_SMMU_QCOM_DEBUG is not set
 CONFIG_ARM_SMMU_V3=y
-# CONFIG_ARM_SMMU_V3_SVA is not set
+CONFIG_ARM_SMMU_V3_SVA=y
 # CONFIG_QCOM_IOMMU is not set
 # CONFIG_VIRTIO_IOMMU is not set
 
@@ -5649,7 +5652,15 @@ CONFIG_EXTCON_GPIO=m
 # CONFIG_EXTCON_USBC_TUSB320 is not set
 # CONFIG_MEMORY is not set
 # CONFIG_IIO is not set
-# CONFIG_NTB is not set
+CONFIG_NTB=m
+# CONFIG_NTB_MSI is not set
+# CONFIG_NTB_IDT is not set
+# CONFIG_NTB_EPF is not set
+# CONFIG_NTB_SWITCHTEC is not set
+# CONFIG_NTB_PINGPONG is not set
+# CONFIG_NTB_TOOL is not set
+# CONFIG_NTB_PERF is not set
+# CONFIG_NTB_TRANSPORT is not set
 CONFIG_PWM=y
 CONFIG_PWM_SYSFS=y
 # CONFIG_PWM_DEBUG is not set
@@ -5671,6 +5682,7 @@ CONFIG_ARM_GIC_V2M=y
 CONFIG_ARM_GIC_V3=y
 CONFIG_ARM_GIC_V3_ITS=y
 CONFIG_ARM_GIC_V3_ITS_PCI=y
+CONFIG_ARM_GIC_PHYTIUM_2500=y
 # CONFIG_AL_FIC is not set
 CONFIG_HISILICON_IRQ_MBIGEN=y
 # CONFIG_XILINX_INTC is not set
@@ -5749,7 +5761,7 @@ CONFIG_ARM_CCN=y
 CONFIG_ARM_CMN=y
 CONFIG_ARM_PMU=y
 CONFIG_ARM_PMU_ACPI=y
-CONFIG_ARM_SMMU_V3_PMU=y
+CONFIG_ARM_SMMU_V3_PMU=m
 CONFIG_ARM_PMUV3=y
 CONFIG_ARM_DSU_PMU=y
 CONFIG_QCOM_L2_PMU=y
@@ -5760,11 +5772,11 @@ CONFIG_ARM_SPE_PMU=m
 # CONFIG_ARM_DMC620_PMU is not set
 # CONFIG_MARVELL_CN10K_TAD_PMU is not set
 CONFIG_ALIBABA_UNCORE_DRW_PMU=m
-CONFIG_DWC_PCIE_PMU=m
 CONFIG_HISI_PMU=m
 CONFIG_HISI_PCIE_PMU=m
 # CONFIG_HNS3_PMU is not set
 # CONFIG_MARVELL_CN10K_DDR_PMU is not set
+CONFIG_DWC_PCIE_PMU=m
 # CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU is not set
 # end of Performance monitor support
 
@@ -6527,9 +6539,9 @@ CONFIG_CRYPTO_DEV_CHELSIO=m
 # CONFIG_CRYPTO_DEV_SAFEXCEL is not set
 # CONFIG_CRYPTO_DEV_CCREE is not set
 CONFIG_CRYPTO_DEV_HISI_SEC=m
-# CONFIG_CRYPTO_DEV_HISI_SEC2 is not set
+CONFIG_CRYPTO_DEV_HISI_SEC2=m
 CONFIG_CRYPTO_DEV_HISI_QM=m
-# CONFIG_CRYPTO_DEV_HISI_ZIP is not set
+CONFIG_CRYPTO_DEV_HISI_ZIP=m
 CONFIG_CRYPTO_DEV_HISI_HPRE=m
 CONFIG_CRYPTO_DEV_HISI_TRNG=m
 # CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set
diff --git a/arch/arm64/configs/anolis_defconfig b/arch/arm64/configs/anolis_defconfig
index 0e3103e1b10c..ba7a0a1e15f4 100644
--- a/arch/arm64/configs/anolis_defconfig
+++ b/arch/arm64/configs/anolis_defconfig
@@ -335,6 +335,7 @@ CONFIG_ARCH_HISI=y
 # CONFIG_ARCH_NXP is not set
 # CONFIG_ARCH_MA35 is not set
 # CONFIG_ARCH_NPCM is not set
+CONFIG_ARCH_PHYTIUM=y
 CONFIG_ARCH_QCOM=y
 # CONFIG_ARCH_REALTEK is not set
 # CONFIG_ARCH_RENESAS is not set
@@ -2325,7 +2326,7 @@ CONFIG_CB710_DEBUG_ASSUMPTIONS=y
 # CONFIG_MISC_ALCOR_PCI is not set
 # CONFIG_MISC_RTSX_PCI is not set
 # CONFIG_MISC_RTSX_USB is not set
-# CONFIG_UACCE is not set
+CONFIG_UACCE=m
 CONFIG_PVPANIC=y
 # CONFIG_PVPANIC_MMIO is not set
 # CONFIG_PVPANIC_PCI is not set
@@ -3483,8 +3484,8 @@ CONFIG_SPI_DESIGNWARE=m
 # CONFIG_SPI_DW_DMA is not set
 # CONFIG_SPI_DW_PCI is not set
 CONFIG_SPI_DW_MMIO=m
-# CONFIG_SPI_HISI_KUNPENG is not set
-# CONFIG_SPI_HISI_SFC_V3XX is not set
+CONFIG_SPI_HISI_KUNPENG=m
+CONFIG_SPI_HISI_SFC_V3XX=m
 # CONFIG_SPI_GPIO is not set
 # CONFIG_SPI_FSL_SPI is not set
 # CONFIG_SPI_MICROCHIP_CORE is not set
@@ -5123,7 +5124,7 @@ CONFIG_INFINIBAND_CXGB4=m
 # CONFIG_INFINIBAND_EFA is not set
 CONFIG_INFINIBAND_ERDMA=m
 CONFIG_INFINIBAND_HNS=m
-# CONFIG_INFINIBAND_HNS_HIP08 is not set
+CONFIG_INFINIBAND_HNS_HIP08=y
 # CONFIG_INFINIBAND_IRDMA is not set
 CONFIG_MLX4_INFINIBAND=m
 CONFIG_MLX5_INFINIBAND=m
@@ -5353,6 +5354,7 @@ CONFIG_VFIO_PCI_MMAP=y
 CONFIG_VFIO_PCI_INTX=y
 CONFIG_VFIO_PCI=m
 # CONFIG_MLX5_VFIO_PCI is not set
+# CONFIG_HISI_ACC_VFIO_PCI is not set
 # end of VFIO support for PCI devices
 
 #
@@ -5527,6 +5529,7 @@ CONFIG_IOMMU_DEFAULT_DMA_STRICT=y
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_OF_IOMMU=y
 CONFIG_IOMMU_DMA=y
+CONFIG_IOMMU_SVA=y
 # CONFIG_IOMMUFD is not set
 CONFIG_ARM_SMMU=y
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
@@ -5534,7 +5537,7 @@ CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y
 CONFIG_ARM_SMMU_QCOM=y
 # CONFIG_ARM_SMMU_QCOM_DEBUG is not set
 CONFIG_ARM_SMMU_V3=y
-# CONFIG_ARM_SMMU_V3_SVA is not set
+CONFIG_ARM_SMMU_V3_SVA=y
 # CONFIG_QCOM_IOMMU is not set
 # CONFIG_VIRTIO_IOMMU is not set
 
@@ -5645,7 +5648,15 @@ CONFIG_EXTCON_GPIO=m
 # CONFIG_EXTCON_USBC_TUSB320 is not set
 # CONFIG_MEMORY is not set
 # CONFIG_IIO is not set
-# CONFIG_NTB is not set
+CONFIG_NTB=m
+# CONFIG_NTB_MSI is not set
+# CONFIG_NTB_IDT is not set
+# CONFIG_NTB_EPF is not set
+# CONFIG_NTB_SWITCHTEC is not set
+# CONFIG_NTB_PINGPONG is not set
+# CONFIG_NTB_TOOL is not set
+# CONFIG_NTB_PERF is not set
+# CONFIG_NTB_TRANSPORT is not set
 CONFIG_PWM=y
 CONFIG_PWM_SYSFS=y
 # CONFIG_PWM_DEBUG is not set
@@ -5667,6 +5678,7 @@ CONFIG_ARM_GIC_V2M=y
 CONFIG_ARM_GIC_V3=y
 CONFIG_ARM_GIC_V3_ITS=y
 CONFIG_ARM_GIC_V3_ITS_PCI=y
+CONFIG_ARM_GIC_PHYTIUM_2500=y
 # CONFIG_AL_FIC is not set
 CONFIG_HISILICON_IRQ_MBIGEN=y
 # CONFIG_XILINX_INTC is not set
@@ -5745,7 +5757,7 @@ CONFIG_ARM_CCN=y
 CONFIG_ARM_CMN=y
 CONFIG_ARM_PMU=y
 CONFIG_ARM_PMU_ACPI=y
-CONFIG_ARM_SMMU_V3_PMU=y
+CONFIG_ARM_SMMU_V3_PMU=m
 CONFIG_ARM_PMUV3=y
 CONFIG_ARM_DSU_PMU=y
 CONFIG_QCOM_L2_PMU=y
@@ -5756,11 +5768,11 @@ CONFIG_ARM_SPE_PMU=m
 # CONFIG_ARM_DMC620_PMU is not set
 # CONFIG_MARVELL_CN10K_TAD_PMU is not set
 CONFIG_ALIBABA_UNCORE_DRW_PMU=m
-CONFIG_DWC_PCIE_PMU=m
 CONFIG_HISI_PMU=m
 CONFIG_HISI_PCIE_PMU=m
 # CONFIG_HNS3_PMU is not set
 # CONFIG_MARVELL_CN10K_DDR_PMU is not set
+CONFIG_DWC_PCIE_PMU=m
 # CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU is not set
 # end of Performance monitor support
 
@@ -6523,9 +6535,9 @@ CONFIG_CRYPTO_DEV_CHELSIO=m
 # CONFIG_CRYPTO_DEV_SAFEXCEL is not set
 # CONFIG_CRYPTO_DEV_CCREE is not set
 CONFIG_CRYPTO_DEV_HISI_SEC=m
-# CONFIG_CRYPTO_DEV_HISI_SEC2 is not set
+CONFIG_CRYPTO_DEV_HISI_SEC2=m
 CONFIG_CRYPTO_DEV_HISI_QM=m
-# CONFIG_CRYPTO_DEV_HISI_ZIP is not set
+CONFIG_CRYPTO_DEV_HISI_ZIP=m
 CONFIG_CRYPTO_DEV_HISI_HPRE=m
 CONFIG_CRYPTO_DEV_HISI_TRNG=m
 # CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set
diff --git a/arch/x86/configs/anolis-debug_defconfig b/arch/x86/configs/anolis-debug_defconfig
index 36a089094635..05b04486b420 100644
--- a/arch/x86/configs/anolis-debug_defconfig
+++ b/arch/x86/configs/anolis-debug_defconfig
@@ -414,7 +414,7 @@ CONFIG_NR_CPUS_RANGE_BEGIN=2
 CONFIG_NR_CPUS_RANGE_END=8192
 CONFIG_NR_CPUS_DEFAULT=64
 CONFIG_NR_CPUS=1024
-# CONFIG_SCHED_CLUSTER is not set
+CONFIG_SCHED_CLUSTER=y
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_MC_PRIO=y
@@ -2430,7 +2430,7 @@ CONFIG_VMWARE_VMCI=m
 # CONFIG_MISC_ALCOR_PCI is not set
 CONFIG_MISC_RTSX_PCI=m
 CONFIG_MISC_RTSX_USB=m
-# CONFIG_UACCE is not set
+CONFIG_UACCE=m
 CONFIG_PVPANIC=y
 # CONFIG_PVPANIC_MMIO is not set
 # CONFIG_PVPANIC_PCI is not set
@@ -2597,7 +2597,7 @@ CONFIG_ATA_PIIX=m
 # CONFIG_SATA_ULI is not set
 # CONFIG_SATA_VIA is not set
 # CONFIG_SATA_VITESSE is not set
-# CONFIG_SATA_ZHAOXIN is not set
+CONFIG_SATA_ZHAOXIN=m
 
 #
 # PATA SFF controllers with BMDMA
@@ -3751,7 +3751,7 @@ CONFIG_HW_RANDOM_INTEL=m
 CONFIG_HW_RANDOM_AMD=m
 # CONFIG_HW_RANDOM_BA431 is not set
 CONFIG_HW_RANDOM_VIA=m
-CONFIG_HW_RANDOM_ZHAOXIN=y
+CONFIG_HW_RANDOM_ZHAOXIN=m
 CONFIG_HW_RANDOM_VIRTIO=y
 # CONFIG_HW_RANDOM_XIPHERA is not set
 # CONFIG_APPLICOM is not set
@@ -3839,13 +3839,13 @@ CONFIG_I2C_NFORCE2_S4985=m
 CONFIG_I2C_SIS96X=m
 CONFIG_I2C_VIA=m
 CONFIG_I2C_VIAPRO=m
-# CONFIG_I2C_ZHAOXIN is not set
+CONFIG_I2C_ZHAOXIN=m
 
 #
 # ACPI drivers
 #
 CONFIG_I2C_SCMI=m
-# CONFIG_I2C_ZHAOXIN_SMBUS is not set
+CONFIG_I2C_ZHAOXIN_SMBUS=m
 
 #
 # I2C system bus drivers (mostly embedded / system-on-chip)
@@ -6655,6 +6655,7 @@ CONFIG_IDLE_INJECT=y
 #
 # Performance monitor support
 #
+# CONFIG_DWC_PCIE_PMU is not set
 # end of Performance monitor support
 
 CONFIG_RAS=y
@@ -7387,6 +7388,7 @@ CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
 CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
 CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64=m
 CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64=m
+CONFIG_CRYPTO_SM4_ZHAOXIN_GMI=m
 CONFIG_CRYPTO_TWOFISH_X86_64=m
 CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
 CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
@@ -7404,16 +7406,19 @@ CONFIG_CRYPTO_SHA1_SSSE3=y
 CONFIG_CRYPTO_SHA256_SSSE3=y
 CONFIG_CRYPTO_SHA512_SSSE3=y
 CONFIG_CRYPTO_SM3_AVX_X86_64=m
+CONFIG_CRYPTO_SM3_ZHAOXIN_GMI=m
 CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
 CONFIG_CRYPTO_CRC32C_INTEL=m
 CONFIG_CRYPTO_CRC32_PCLMUL=m
 CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
+CONFIG_CRYPTO_SM2_ZHAOXIN_GMI=m
 # end of Accelerated Cryptographic Algorithms for CPU (x86)
 
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
 CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+# CONFIG_CRYPTO_DEV_ZHAOXIN is not set
 # CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
 # CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
 CONFIG_CRYPTO_DEV_CCP=y
@@ -7421,6 +7426,7 @@ CONFIG_CRYPTO_DEV_CCP_DD=m
 CONFIG_CRYPTO_DEV_SP_CCP=y
 CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
 CONFIG_CRYPTO_DEV_SP_PSP=y
+CONFIG_HYGON_GM=y
 # CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set
 CONFIG_CRYPTO_DEV_NITROX=m
 CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
@@ -7813,6 +7819,7 @@ CONFIG_LOCKUP_DETECTOR=y
 CONFIG_SOFTLOCKUP_DETECTOR=y
 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
 CONFIG_HAVE_HARDLOCKUP_DETECTOR_BUDDY=y
+# CONFIG_SDEI_WATCHDOG is not set
 CONFIG_HARDLOCKUP_DETECTOR=y
 # CONFIG_HARDLOCKUP_DETECTOR_PREFER_BUDDY is not set
 CONFIG_HARDLOCKUP_DETECTOR_PERF=y
diff --git a/arch/x86/configs/anolis_defconfig b/arch/x86/configs/anolis_defconfig
index 23258f261dcb..ca8ff01300ac 100644
--- a/arch/x86/configs/anolis_defconfig
+++ b/arch/x86/configs/anolis_defconfig
@@ -411,7 +411,7 @@ CONFIG_NR_CPUS_RANGE_BEGIN=2
 CONFIG_NR_CPUS_RANGE_END=8192
 CONFIG_NR_CPUS_DEFAULT=64
 CONFIG_NR_CPUS=1024
-# CONFIG_SCHED_CLUSTER is not set
+CONFIG_SCHED_CLUSTER=y
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_MC_PRIO=y
@@ -2425,7 +2425,7 @@ CONFIG_VMWARE_VMCI=m
 # CONFIG_MISC_ALCOR_PCI is not set
 CONFIG_MISC_RTSX_PCI=m
 CONFIG_MISC_RTSX_USB=m
-# CONFIG_UACCE is not set
+CONFIG_UACCE=m
 CONFIG_PVPANIC=y
 # CONFIG_PVPANIC_MMIO is not set
 # CONFIG_PVPANIC_PCI is not set
@@ -2592,7 +2592,7 @@ CONFIG_ATA_PIIX=m
 # CONFIG_SATA_ULI is not set
 # CONFIG_SATA_VIA is not set
 # CONFIG_SATA_VITESSE is not set
-# CONFIG_SATA_ZHAOXIN is not set
+CONFIG_SATA_ZHAOXIN=m
 
 #
 # PATA SFF controllers with BMDMA
@@ -3745,7 +3745,7 @@ CONFIG_HW_RANDOM_INTEL=m
 CONFIG_HW_RANDOM_AMD=m
 # CONFIG_HW_RANDOM_BA431 is not set
 CONFIG_HW_RANDOM_VIA=m
-CONFIG_HW_RANDOM_ZHAOXIN=y
+CONFIG_HW_RANDOM_ZHAOXIN=m
 CONFIG_HW_RANDOM_VIRTIO=y
 # CONFIG_HW_RANDOM_XIPHERA is not set
 # CONFIG_APPLICOM is not set
@@ -3833,13 +3833,13 @@ CONFIG_I2C_NFORCE2_S4985=m
 CONFIG_I2C_SIS96X=m
 CONFIG_I2C_VIA=m
 CONFIG_I2C_VIAPRO=m
-# CONFIG_I2C_ZHAOXIN is not set
+CONFIG_I2C_ZHAOXIN=m
 
 #
 # ACPI drivers
 #
 CONFIG_I2C_SCMI=m
-# CONFIG_I2C_ZHAOXIN_SMBUS is not set
+CONFIG_I2C_ZHAOXIN_SMBUS=m
 
 #
 # I2C system bus drivers (mostly embedded / system-on-chip)
@@ -6644,6 +6644,7 @@ CONFIG_IDLE_INJECT=y
 #
 # Performance monitor support
 #
+# CONFIG_DWC_PCIE_PMU is not set
 # end of Performance monitor support
 
 CONFIG_RAS=y
@@ -7399,6 +7400,7 @@ CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
 CONFIG_CRYPTO_CRC32C_INTEL=m
 CONFIG_CRYPTO_CRC32_PCLMUL=m
 CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
+CONFIG_CRYPTO_SM2_ZHAOXIN_GMI=m
 # end of Accelerated Cryptographic Algorithms for CPU (x86)
 
 CONFIG_CRYPTO_HW=y
@@ -7415,6 +7417,7 @@ CONFIG_CRYPTO_DEV_CCP_DD=m
 CONFIG_CRYPTO_DEV_SP_CCP=y
 CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
 CONFIG_CRYPTO_DEV_SP_PSP=y
+CONFIG_HYGON_GM=y
 # CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set
 CONFIG_CRYPTO_DEV_NITROX=m
 CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
@@ -7771,6 +7774,7 @@ CONFIG_LOCKUP_DETECTOR=y
 CONFIG_SOFTLOCKUP_DETECTOR=y
 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
 CONFIG_HAVE_HARDLOCKUP_DETECTOR_BUDDY=y
+# CONFIG_SDEI_WATCHDOG is not set
 CONFIG_HARDLOCKUP_DETECTOR=y
 # CONFIG_HARDLOCKUP_DETECTOR_PREFER_BUDDY is not set
 CONFIG_HARDLOCKUP_DETECTOR_PERF=y
-- 
Gitee