关闭bpf , 缩短处理路径

Signed-off-by: a@b.com <a@b.com>

arch/arm64/Kconfig

@@ -1403,7 +1403,8 @@ config ARM64_PAN
 	 instruction if the cpu does not implement the feature.
 
 config AS_HAS_LSE_ATOMICS
-	def_bool $(as-instr,.arch_extension lse)
+	bool
+	default n
 
 config ARM64_LSE_ATOMICS
 	bool
@@ -1550,18 +1551,20 @@ config ARM64_PTR_AUTH
 	  DYNAMIC_FTRACE_WITH_REGS is enabled.
 
 config CC_HAS_BRANCH_PROT_PAC_RET
-	# GCC 9 or later, clang 8 or later
-	def_bool $(cc-option,-mbranch-protection=pac-ret+leaf)
+	bool
+	default n
 
 config CC_HAS_SIGN_RETURN_ADDRESS
-	# GCC 7, 8
-	def_bool $(cc-option,-msign-return-address=all)
+	bool
+	default n
 
 config AS_HAS_PAC
-	def_bool $(cc-option,-Wa$(comma)-march=armv8.3-a)
+	bool
+	default n
 
 config AS_HAS_CFI_NEGATE_RA_STATE
-	def_bool $(as-instr,.cfi_startproc\n.cfi_negate_ra_state\n.cfi_endproc\n)
+	bool
+	default n
 
 endmenu
 
@@ -1647,8 +1650,8 @@ config ARM64_BTI_KERNEL
 	  modular code must have BTI enabled.
 
 config CC_HAS_BRANCH_PROT_PAC_RET_BTI
-	# GCC 9 or later, clang 8 or later
-	def_bool $(cc-option,-mbranch-protection=pac-ret+leaf+bti)
+	bool
+	default n
 
 config ARM64_E0PD
 	bool "Enable support for E0PD"
@@ -1676,7 +1679,8 @@ config ARM64_AS_HAS_MTE
 	# as a late addition to the final architecture spec (LDGM/STGM)
 	# is only supported in the newer 2.32.x and 2.33 binutils
 	# versions, hence the extra "stgm" instruction check below.
-	def_bool $(as-instr,.arch armv8.5-a+memtag\nstgm xzr$(comma)[x0])
+	bool
+	default n
 
 config ARM64_MTE
 	bool "Memory Tagging Extension support"

arch/arm64/kernel/cpuinfo.c

@@ -205,6 +205,9 @@ static int c_show(struct seq_file *m, void *v)
 			}
 		}
 #endif
+		else {
+				seq_printf(m, "model name\t: %s\n", midr_to_desc(midr));
+		}
 		seq_printf(m, "BogoMIPS\t: %lu.%02lu\n",
 			   loops_per_jiffy / (500000UL/HZ),
 			   loops_per_jiffy / (5000UL/HZ) % 100);

arch/arm64/kernel/topology.c

@@ -17,10 +17,12 @@
 #include <linux/cpufreq.h>
 #include <linux/init.h>
 #include <linux/percpu.h>
+#include <linux/cputypes.h>
 
 #include <asm/cpu.h>
 #include <asm/cputype.h>
 #include <asm/topology.h>
+#include <linux/classtypes.h>
 
 void store_cpu_topology(unsigned int cpuid)
 {
@@ -51,15 +53,26 @@ void store_cpu_topology(unsigned int cpuid)
 	 * need to entirely ignore MPIDR for any topology deduction.
 	 */
 	cpuid_topo->thread_id  = -1;
-	cpuid_topo->core_id    = cpuid;
-	cpuid_topo->package_id = cpu_to_node(cpuid);
-
+	pr_info("Q cpu_name %s\n", get_cpu_name());
+        if(cpu_is_ft2004()) {
+		cpuid_topo->core_id    = cpuid%2;
+		cpuid_topo->package_id = cpuid/2;
+        } else {
+		cpuid_topo->core_id    = cpuid;
+		cpuid_topo->package_id = cpu_to_node(cpuid);
+	}
 	pr_debug("CPU%u: cluster %d core %d thread %d mpidr %#016llx\n",
 		 cpuid, cpuid_topo->package_id, cpuid_topo->core_id,
 		 cpuid_topo->thread_id, mpidr);
 
 topology_populated:
+	pr_info("x CPU%u: cluster %d core %d thread %d mpidr %#016llx\n",
+		 cpuid, cpuid_topo->package_id, cpuid_topo->core_id,
+		 cpuid_topo->thread_id, mpidr);
 	update_siblings_masks(cpuid);
+	pr_info("y CPU%u: cluster %d core %d thread %d mpidr %#016llx\n",
+		 cpuid, cpuid_topo->package_id, cpuid_topo->core_id,
+		 cpuid_topo->thread_id, mpidr);
 }
 
 #ifdef CONFIG_ACPI

drivers/FtDriver/lpc/lpc.c

@@ -217,7 +217,7 @@ static void __exit lpc_exit(void)
 {
 	if (!cpu_is_phytium())
 	{
-		return 0;
+		return ;
 	}
 
     platform_driver_unregister(&lpc_driver);

drivers/base/topology.c

@@ -46,9 +46,10 @@ define_id_show_func(physical_package_id);
 #else
 static ssize_t physical_package_id_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
-	if(cpu_is_ft_d2000() || cpu_is_ft2004()){
+/*	if(cpu_is_ft_d2000() || cpu_is_ft2004()){
 		return sprintf(buf, "0\n");
 	}
+*/
 	return sprintf(buf, "%d\n", topology_physical_package_id(dev->id));
 }
 #endif
@@ -73,23 +74,27 @@ define_siblings_show_func(core_siblings, core_cpumask);
 #else
 static ssize_t core_siblings_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
+/*
 	if(cpu_is_ft_d2000()){
 		return sprintf(buf, "ff\n");
 	}
 	else if(cpu_is_ft2004()){
 		return sprintf(buf, "f\n");
 	}
+*/
 	return cpumap_print_to_pagebuf(false, buf, topology_core_cpumask(dev->id));
 }
 
 static ssize_t core_siblings_list_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
+/*
 	if(cpu_is_ft_d2000()){
 		return sprintf(buf, "0-7\n");
 	}
 	else if(cpu_is_ft2004()){
 		return sprintf(buf, "0-3\n");
 	}
+*/
 	return cpumap_print_to_pagebuf(true, buf, topology_core_cpumask(dev->id));
 }
 #endif

drivers/cpufreq/Kconfig.arm

@@ -340,3 +340,9 @@ config ARM_PXA2xx_CPUFREQ
 	  This add the CPUFreq driver support for Intel PXA2xx SOCs.
 
 	  If in doubt, say N.
+config ARM64_PHYTIUM_CPUFREQ
+	bool "Phytium CPUFreq support"
+        depends on CPUFREQ_DT && CPUFREQ_DT_PLATDEV
+	default y
+	help
+          This add the CPUFreq driver support for Ft2004

drivers/cpufreq/Makefile

@@ -86,6 +86,7 @@ obj-$(CONFIG_ARM_TEGRA186_CPUFREQ)	+= tegra186-cpufreq.o
 obj-$(CONFIG_ARM_TEGRA194_CPUFREQ)	+= tegra194-cpufreq.o
 obj-$(CONFIG_ARM_TI_CPUFREQ)		+= ti-cpufreq.o
 obj-$(CONFIG_ARM_VEXPRESS_SPC_CPUFREQ)	+= vexpress-spc-cpufreq.o
+obj-$(CONFIG_ARM64_PHYTIUM_CPUFREQ)	+= ft2004-cpufreq.o
 
 
 ##################################################################################

drivers/cpufreq/ft2004-cpufreq.c

@@ -153,6 +153,7 @@ static struct cpufreq_driver ft2004_freq_driver = {
 	.attr	= cpufreq_generic_attr,
 };
 
+extern bool cpu_is_phytium(void);
 static int __init ft2004_freq_init(void)
 {
     int ret;
@@ -177,13 +178,12 @@ static int __init ft2004_freq_init(void)
 
     return ret;
 }
-
 static void __exit ft2004_freq_exit(void)
 {
     int i;
 
     if (!cpu_is_phytium()) {
-        return -EPERM;
+        return ;
     }
 
     cpufreq_unregister_driver(&ft2004_freq_driver);

drivers/input/serio/i8042.c

@@ -1411,7 +1411,7 @@ static int i8042_pm_suspend(struct device *dev)
 	int i;
 
 #ifdef CONFIG_ARCH_PHYTIUM_LPC
-	if (cpu_is_phytium)
+	if (cpu_is_phytium())
 		phytium_laptop_toggle_aux(true);
 #endif
 	if (pm_suspend_via_firmware())

drivers/net/phy/mars.c

@@ -402,7 +402,7 @@ static void mars_get_wol(struct phy_device *phydev, struct ethtool_wolinfo *wol)
 
 	val = mars_ext_read(phydev, CTC_MARS_WOL_CFG_REG);
 	if (val < 0)
-		return val;
+		return;
 
 	if (val & CTC_MARS_WOL_EN)
 		wol->wolopts |= WAKE_MAGIC;

init/Kconfig

@@ -916,7 +916,7 @@ config MEMCG_SWAP
 config MEMCG_KMEM
 	bool
 	depends on MEMCG && !SLOB
-	default y
+	default n
 
 config BLK_CGROUP
 	bool "IO controller"

kernel/sched/autogroup.c

@@ -5,7 +5,7 @@
 #include <linux/nospec.h>
 #include "sched.h"
 
-unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
+unsigned int __read_mostly sysctl_sched_autogroup_enabled = 0;
 static struct autogroup autogroup_default;
 static atomic_t autogroup_seq_nr;
 

kernel/sysctl.c

@@ -2694,7 +2694,7 @@ static struct ctl_table kern_table[] = {
 	},
 #endif
 	{
-		.procname   = "uosversion",
+		.procname   = "acoversion",
 		.data       = &UOS_VERSION,
 		.maxlen     = UOS_VERSION_LEN,
 		.mode       = 0644,

kernel/uosversion.h

@@ -1,4 +1,4 @@
 
 #define UOS_VERSION_LEN 0x20
 
-char UOS_VERSION[UOS_VERSION_LEN] = "1051";
+char UOS_VERSION[UOS_VERSION_LEN] = "v2";

lib/classtypes.c

@@ -47,8 +47,13 @@ char *get_cpu_name(void)
 		dmi_walk(get_cpuname_by_dmi, cpu_name);
 
 	if(cpu_name == NULL) {
+#ifdef CONFIG_ARCH_PHYTIUM
+		pr_info("Q cpu_name null, change\n");
+		return "FT-2000/4";
+#else
 		/* Some BIOS don't support getting CPU name from DMI  */
 		return "UNKNOWN-CPU";
+#endif
 	}
 
 	return cpu_name;
@@ -148,4 +153,4 @@ bool os_run_evn_is_virt(void)
 
 	return false;
 }
-EXPORT_SYMBOL(os_run_evn_is_virt);
+EXPORT_SYMBOL(os_run_evn_is_virt);

scripts/package/mkdebian

@@ -91,8 +91,8 @@ if [ -n "$KDEB_PKGVERSION" ]; then
 	revision=${packageversion##*-}
 else
 	revision=$(cat .version 2>/dev/null||echo 1)
-#	packageversion=$KERNELVERSION-$revision
-	packageversion=$revision    #for v23 kernel name rule
+	packageversion=$KERNELVERSION-$revision
+#	packageversion=$revision    #for v23 kernel name rule
 fi
 sourcename=$KDEB_SOURCENAME
 
@@ -134,7 +134,7 @@ else
 fi
 
 mkdir -p debian/source/
-echo "1.0" > debian/source/format
+echo "3.0 (quilt)" > debian/source/format
 
 echo $debarch > debian/arch
 extra_build_depends=", $(if_enabled_echo CONFIG_UNWINDER_ORC libelf-dev:native)"

security/hookmanager/Kconfig

@@ -5,6 +5,6 @@ config SECURITY_HOOKMANAGER
        select SECURITYFS
        select SECURITY_PATH
        select SECURITY_NETWORK
-       default y
+       default n
        help
         This selects an hook manager for LSM hooks.