From: Sasha Levin Date: Sun, 20 Sep 2020 18:53:28 +0000 (-0400) Subject: Drop powerpc-add-power10-raw-mode-cputable-entry.patch X-Git-Tag: v4.4.237~42 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd64c982b5a73b4e7612a521dbf60dc0f6d47950;p=thirdparty%2Fkernel%2Fstable-queue.git Drop powerpc-add-power10-raw-mode-cputable-entry.patch Signed-off-by: Sasha Levin --- diff --git a/queue-5.8/powerpc-add-power10-raw-mode-cputable-entry.patch b/queue-5.8/powerpc-add-power10-raw-mode-cputable-entry.patch deleted file mode 100644 index 7292814f1b3..00000000000 --- a/queue-5.8/powerpc-add-power10-raw-mode-cputable-entry.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 327da008e65a25b8206b36b7fc0c9e4edbb36a58 Mon Sep 17 00:00:00 2001 -From: Madhavan Srinivasan -Date: Mon, 17 Aug 2020 06:26:18 +0530 -Subject: powerpc: Add POWER10 raw mode cputable entry - -From: Madhavan Srinivasan - -commit 327da008e65a25b8206b36b7fc0c9e4edbb36a58 upstream. - -Add a raw mode cputable entry for POWER10. Copies most of the fields -from commit a3ea40d5c736 ("powerpc: Add POWER10 architected mode") -except for oprofile_cpu_type, machine_check_early, pvr_mask and -pvr_mask fields. On bare metal systems we use DT CPU features, which -doesn't need a cputable entry. But in VMs we still rely on the raw -cputable entry to set the correct values for the PMU related fields. - -Fixes: a3ea40d5c736 ("powerpc: Add POWER10 architected mode") -Signed-off-by: Madhavan Srinivasan -[mpe: Reorder vs cleanup patch and add Fixes tag] -Signed-off-by: Michael Ellerman -Link: https://lore.kernel.org/r/20200817005618.3305028-2-maddy@linux.ibm.com -Signed-off-by: Greg Kroah-Hartman - ---- - arch/powerpc/kernel/cputable.c | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) - ---- a/arch/powerpc/kernel/cputable.c -+++ b/arch/powerpc/kernel/cputable.c -@@ -75,6 +75,7 @@ extern void __restore_cpu_power10(void); - extern long __machine_check_early_realmode_p7(struct pt_regs *regs); - extern long __machine_check_early_realmode_p8(struct pt_regs *regs); - extern long __machine_check_early_realmode_p9(struct pt_regs *regs); -+extern long __machine_check_early_realmode_p10(struct pt_regs *regs); - #endif /* CONFIG_PPC64 */ - #if defined(CONFIG_E500) - extern void __setup_cpu_e5500(unsigned long offset, struct cpu_spec* spec); -@@ -541,6 +542,25 @@ static struct cpu_spec __initdata cpu_sp - .machine_check_early = __machine_check_early_realmode_p9, - .platform = "power9", - }, -+ { /* Power10 */ -+ .pvr_mask = 0xffff0000, -+ .pvr_value = 0x00800000, -+ .cpu_name = "POWER10 (raw)", -+ .cpu_features = CPU_FTRS_POWER10, -+ .cpu_user_features = COMMON_USER_POWER10, -+ .cpu_user_features2 = COMMON_USER2_POWER10, -+ .mmu_features = MMU_FTRS_POWER10, -+ .icache_bsize = 128, -+ .dcache_bsize = 128, -+ .num_pmcs = 6, -+ .pmc_type = PPC_PMC_IBM, -+ .oprofile_cpu_type = "ppc64/power10", -+ .oprofile_type = PPC_OPROFILE_INVALID, -+ .cpu_setup = __setup_cpu_power10, -+ .cpu_restore = __restore_cpu_power10, -+ .machine_check_early = __machine_check_early_realmode_p10, -+ .platform = "power10", -+ }, - { /* Cell Broadband Engine */ - .pvr_mask = 0xffff0000, - .pvr_value = 0x00700000, diff --git a/queue-5.8/series b/queue-5.8/series index 82fd8684c74..7e06e5bb07a 100644 --- a/queue-5.8/series +++ b/queue-5.8/series @@ -2,7 +2,6 @@ rdma-bnxt_re-restrict-the-max_gids-to-256.patch dt-bindings-spi-fix-spi-bcm-qspi-compatible-ordering.patch mptcp-sendmsg-reset-iter-on-error.patch net-handle-the-return-value-of-pskb_carve_frag_list-correctly.patch -powerpc-add-power10-raw-mode-cputable-entry.patch dt-bindings-pci-intel-lgm-pcie-fix-matching-on-all-snps-dw-pcie-instances.patch hv_netvsc-remove-unlikely-from-netvsc_select_queue.patch loop-set-correct-device-size-when-using-loop_configure.patch