From 1c903a93f0e4927f6e89cd69c43029d4403875e0 Mon Sep 17 00:00:00 2001 From: 5kft <5kft@5kft.org> Date: Mon, 20 Jan 2020 06:30:54 -0800 Subject: [PATCH] [sunxi-current] cleaned up kernel uplevel patches * cedrus patch is now included in upstream mainline * topology patch is already included in megous upstream --- ...rect-H264-8x8-scaling-list.patch.disabled} | 0 .../sunxi-current/patch-5.4.12-13.patch | 34 ------------------- 2 files changed, 34 deletions(-) rename patch/kernel/sunxi-current/{0617-media-cedrus-Use-correct-H264-8x8-scaling-list.patch => 0617-media-cedrus-Use-correct-H264-8x8-scaling-list.patch.disabled} (100%) diff --git a/patch/kernel/sunxi-current/0617-media-cedrus-Use-correct-H264-8x8-scaling-list.patch b/patch/kernel/sunxi-current/0617-media-cedrus-Use-correct-H264-8x8-scaling-list.patch.disabled similarity index 100% rename from patch/kernel/sunxi-current/0617-media-cedrus-Use-correct-H264-8x8-scaling-list.patch rename to patch/kernel/sunxi-current/0617-media-cedrus-Use-correct-H264-8x8-scaling-list.patch.disabled diff --git a/patch/kernel/sunxi-current/patch-5.4.12-13.patch b/patch/kernel/sunxi-current/patch-5.4.12-13.patch index ef6f8ae16..b9c725867 100644 --- a/patch/kernel/sunxi-current/patch-5.4.12-13.patch +++ b/patch/kernel/sunxi-current/patch-5.4.12-13.patch @@ -154,40 +154,6 @@ index 4b0bab2607e4..46e1be9e57a8 100644 /* * Take this CPU offline. Once we clear this, we can't return, * and we must not schedule until we're ready to give up the cpu. -diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c -index 5b9faba03afb..8d2e61d9e7a6 100644 ---- a/arch/arm/kernel/topology.c -+++ b/arch/arm/kernel/topology.c -@@ -196,9 +196,8 @@ void store_cpu_topology(unsigned int cpuid) - struct cpu_topology *cpuid_topo = &cpu_topology[cpuid]; - unsigned int mpidr; - -- /* If the cpu topology has been already set, just return */ -- if (cpuid_topo->core_id != -1) -- return; -+ if (cpuid_topo->package_id != -1) -+ goto topology_populated; - - mpidr = read_cpuid_mpidr(); - -@@ -231,14 +230,15 @@ void store_cpu_topology(unsigned int cpuid) - cpuid_topo->package_id = -1; - } - -- update_siblings_masks(cpuid); -- - update_cpu_capacity(cpuid); - - pr_info("CPU%u: thread %d, cpu %d, socket %d, mpidr %x\n", - cpuid, cpu_topology[cpuid].thread_id, - cpu_topology[cpuid].core_id, - cpu_topology[cpuid].package_id, mpidr); -+ -+topology_populated: -+ update_siblings_masks(cpuid); - } - - static inline int cpu_corepower_flags(void) diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi index 04ad2fb22b9a..dba3488492f1 100644 --- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi