From 95d9ef1730e8ed28c8e648b64c4cff86bf5d47a4 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 28 Jun 2018 13:37:16 +0900 Subject: [PATCH] drop broken 4.14 patches --- queue-4.14/series | 2 - ...l-parameter-to-set-memory-block-size.patch | 57 ------- ...e-new-set-memory-block-size-function.patch | 139 ------------------ 3 files changed, 198 deletions(-) delete mode 100644 queue-4.14/x86-platform-uv-add-kernel-parameter-to-set-memory-block-size.patch delete mode 100644 queue-4.14/x86-platform-uv-use-new-set-memory-block-size-function.patch diff --git a/queue-4.14/series b/queue-4.14/series index c9693dd02bf..d308ffdd034 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -1,7 +1,5 @@ x86-spectre_v1-disable-compiler-optimizations-over-array_index_mask_nospec.patch x86-xen-add-call-of-speculative_store_bypass_ht_init-to-pv-paths.patch -x86-platform-uv-use-new-set-memory-block-size-function.patch -x86-platform-uv-add-kernel-parameter-to-set-memory-block-size.patch x86-mce-improve-error-message-when-kernel-cannot-recover.patch x86-mce-check-for-alternate-indication-of-machine-check-recovery-on-skylake.patch x86-mce-fix-incorrect-machine-check-from-unknown-source-message.patch diff --git a/queue-4.14/x86-platform-uv-add-kernel-parameter-to-set-memory-block-size.patch b/queue-4.14/x86-platform-uv-add-kernel-parameter-to-set-memory-block-size.patch deleted file mode 100644 index d4368324f63..00000000000 --- a/queue-4.14/x86-platform-uv-add-kernel-parameter-to-set-memory-block-size.patch +++ /dev/null @@ -1,57 +0,0 @@ -From d7609f4210cb716c11abfe2bfb5997191095d00b Mon Sep 17 00:00:00 2001 -From: "mike.travis@hpe.com" -Date: Thu, 24 May 2018 15:17:14 -0500 -Subject: x86/platform/UV: Add kernel parameter to set memory block size - -From: mike.travis@hpe.com - -commit d7609f4210cb716c11abfe2bfb5997191095d00b upstream. - -Add a kernel parameter that allows setting UV memory block size. This -is to provide an adjustment for new forms of PMEM and other DIMM memory -that might require alignment restrictions other than scanning the global -address table for the required minimum alignment. The value set will be -further adjusted by both the GAM range table scan as well as restrictions -imposed by set_memory_block_size_order(). - -Signed-off-by: Mike Travis -Reviewed-by: Andrew Banman -Cc: Andrew Morton -Cc: Dimitri Sivanich -Cc: Linus Torvalds -Cc: Peter Zijlstra -Cc: Russ Anderson -Cc: Thomas Gleixner -Cc: dan.j.williams@intel.com -Cc: jgross@suse.com -Cc: kirill.shutemov@linux.intel.com -Cc: mhocko@suse.com -Cc: stable@vger.kernel.org -Link: https://lkml.kernel.org/lkml/20180524201711.854849120@stormcage.americas.sgi.com -Signed-off-by: Ingo Molnar -Signed-off-by: Greg Kroah-Hartman - ---- - arch/x86/kernel/apic/x2apic_uv_x.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) - ---- a/arch/x86/kernel/apic/x2apic_uv_x.c -+++ b/arch/x86/kernel/apic/x2apic_uv_x.c -@@ -350,6 +350,17 @@ EXPORT_SYMBOL(uv_hub_info_version); - /* Default UV memory block size is 2GB */ - static unsigned long mem_block_size = (2UL << 30); - -+/* Kernel parameter to specify UV mem block size */ -+static int parse_mem_block_size(char *ptr) -+{ -+ unsigned long size = memparse(ptr, NULL); -+ -+ /* Size will be rounded down by set_block_size() below */ -+ mem_block_size = size; -+ return 0; -+} -+early_param("uv_memblksize", parse_mem_block_size); -+ - static __init int adj_blksize(u32 lgre) - { - unsigned long base = (unsigned long)lgre << UV_GAM_RANGE_SHFT; diff --git a/queue-4.14/x86-platform-uv-use-new-set-memory-block-size-function.patch b/queue-4.14/x86-platform-uv-use-new-set-memory-block-size-function.patch deleted file mode 100644 index 51ea29a6d9d..00000000000 --- a/queue-4.14/x86-platform-uv-use-new-set-memory-block-size-function.patch +++ /dev/null @@ -1,139 +0,0 @@ -From bbbd2b51a2aa0d76b3676271e216cf3647773397 Mon Sep 17 00:00:00 2001 -From: "mike.travis@hpe.com" -Date: Thu, 24 May 2018 15:17:13 -0500 -Subject: x86/platform/UV: Use new set memory block size function - -From: mike.travis@hpe.com - -commit bbbd2b51a2aa0d76b3676271e216cf3647773397 upstream. - -Add a call to the new function to "adjust" the current fixed UV memory -block size of 2GB so it can be changed to a different physical boundary. -This accommodates changes in the Intel BIOS, and therefore UV BIOS, -which now can align boundaries different than the previous UV standard -of 2GB. It also flags any UV Global Address boundaries from BIOS that -cause a change in the mem block size (boundary). - -The current boundary of 2GB has been used on UV since the first system -release in 2009 with Linux 2.6 and has worked fine. But the new NVDIMM -persistent memory modules (PMEM), along with the Intel BIOS changes to -support these modules caused the memory block size boundary to be set -to a lower limit. Intel only guarantees that this minimum boundary at -64MB though the current Linux limit is 128MB. - -Note that the default remains 2GB if no changes occur. - -Signed-off-by: Mike Travis -Reviewed-by: Andrew Banman -Cc: Andrew Morton -Cc: Dimitri Sivanich -Cc: Linus Torvalds -Cc: Peter Zijlstra -Cc: Russ Anderson -Cc: Thomas Gleixner -Cc: dan.j.williams@intel.com -Cc: jgross@suse.com -Cc: kirill.shutemov@linux.intel.com -Cc: mhocko@suse.com -Cc: stable@vger.kernel.org -Link: https://lkml.kernel.org/lkml/20180524201711.732785782@stormcage.americas.sgi.com -Signed-off-by: Ingo Molnar -Signed-off-by: Greg Kroah-Hartman - ---- - arch/x86/kernel/apic/x2apic_uv_x.c | 49 ++++++++++++++++++++++++++++++++++--- - 1 file changed, 46 insertions(+), 3 deletions(-) - ---- a/arch/x86/kernel/apic/x2apic_uv_x.c -+++ b/arch/x86/kernel/apic/x2apic_uv_x.c -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -346,6 +347,40 @@ extern int uv_hub_info_version(void) - } - EXPORT_SYMBOL(uv_hub_info_version); - -+/* Default UV memory block size is 2GB */ -+static unsigned long mem_block_size = (2UL << 30); -+ -+static __init int adj_blksize(u32 lgre) -+{ -+ unsigned long base = (unsigned long)lgre << UV_GAM_RANGE_SHFT; -+ unsigned long size; -+ -+ for (size = mem_block_size; size > MIN_MEMORY_BLOCK_SIZE; size >>= 1) -+ if (IS_ALIGNED(base, size)) -+ break; -+ -+ if (size >= mem_block_size) -+ return 0; -+ -+ mem_block_size = size; -+ return 1; -+} -+ -+static __init void set_block_size(void) -+{ -+ unsigned int order = ffs(mem_block_size); -+ -+ if (order) { -+ /* adjust for ffs return of 1..64 */ -+ set_memory_block_size_order(order - 1); -+ pr_info("UV: mem_block_size set to 0x%lx\n", mem_block_size); -+ } else { -+ /* bad or zero value, default to 1UL << 31 (2GB) */ -+ pr_err("UV: mem_block_size error with 0x%lx\n", mem_block_size); -+ set_memory_block_size_order(31); -+ } -+} -+ - /* Build GAM range lookup table: */ - static __init void build_uv_gr_table(void) - { -@@ -1144,23 +1179,30 @@ static void __init decode_gam_rng_tbl(un - << UV_GAM_RANGE_SHFT); - int order = 0; - char suffix[] = " KMGTPE"; -+ int flag = ' '; - - while (size > 9999 && order < sizeof(suffix)) { - size /= 1024; - order++; - } - -+ /* adjust max block size to current range start */ -+ if (gre->type == 1 || gre->type == 2) -+ if (adj_blksize(lgre)) -+ flag = '*'; -+ - if (!index) { - pr_info("UV: GAM Range Table...\n"); -- pr_info("UV: # %20s %14s %5s %4s %5s %3s %2s\n", "Range", "", "Size", "Type", "NASID", "SID", "PN"); -+ pr_info("UV: # %20s %14s %6s %4s %5s %3s %2s\n", "Range", "", "Size", "Type", "NASID", "SID", "PN"); - } -- pr_info("UV: %2d: 0x%014lx-0x%014lx %5lu%c %3d %04x %02x %02x\n", -+ pr_info("UV: %2d: 0x%014lx-0x%014lx%c %5lu%c %3d %04x %02x %02x\n", - index++, - (unsigned long)lgre << UV_GAM_RANGE_SHFT, - (unsigned long)gre->limit << UV_GAM_RANGE_SHFT, -- size, suffix[order], -+ flag, size, suffix[order], - gre->type, gre->nasid, gre->sockid, gre->pnode); - -+ /* update to next range start */ - lgre = gre->limit; - if (sock_min > gre->sockid) - sock_min = gre->sockid; -@@ -1391,6 +1433,7 @@ static void __init uv_system_init_hub(vo - - build_socket_tables(); - build_uv_gr_table(); -+ set_block_size(); - uv_init_hub_info(&hub_info); - uv_possible_blades = num_possible_nodes(); - if (!_node_to_pnode) -- 2.47.3