From: Greg Kroah-Hartman Date: Tue, 26 May 2020 10:02:02 +0000 (+0200) Subject: drop edac-ghes-use-cper-module-handles-to-locate-dimms.patch from everywhere X-Git-Tag: v4.4.225~7 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a14c4579623f7a916da400ecd68f4f8b0f9b7b2f;p=thirdparty%2Fkernel%2Fstable-queue.git drop edac-ghes-use-cper-module-handles-to-locate-dimms.patch from everywhere --- diff --git a/queue-4.14/edac-ghes-use-cper-module-handles-to-locate-dimms.patch b/queue-4.14/edac-ghes-use-cper-module-handles-to-locate-dimms.patch deleted file mode 100644 index d5ec36f0106..00000000000 --- a/queue-4.14/edac-ghes-use-cper-module-handles-to-locate-dimms.patch +++ /dev/null @@ -1,104 +0,0 @@ -From e810a46f1f7a2d9b7a7fc9a09d691716e60e4ab6 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 19 Sep 2018 01:59:00 +0000 -Subject: EDAC, ghes: Use CPER module handles to locate DIMMs - -From: Fan Wu - -[ Upstream commit c798c88f3962ddff89c7aa818986caeecd46ab4c ] - -Use SMBIOS module handle type 17, on platforms which provide valid -ones, to locate the corresponding DIMM and thus have per-DIMM error -counter updates. - -Signed-off-by: Fan Wu -[ Massage commit message. ] -Signed-off-by: Borislav Petkov -Reviewed-by: Tyler Baicar -Reviewed-by: James Morse -Tested-by: Toshi Kani -Cc: Mauro Carvalho Chehab -Cc: baicar.tyler@gmail.com -Cc: john.garry@huawei.com -Cc: linux-arm-kernel@lists.infradead.org -Cc: linux-edac -Cc: shiju.jose@huawei.com -Cc: tanxiaofei@huawei.com -Cc: wanghuiqiang@huawei.com -Link: http://lkml.kernel.org/r/1537322340-1860-1-git-send-email-wufan@codeaurora.org -Signed-off-by: Sasha Levin ---- - drivers/edac/ghes_edac.c | 23 +++++++++++++++++++++++ - include/linux/edac.h | 2 ++ - 2 files changed, 25 insertions(+) - -diff --git a/drivers/edac/ghes_edac.c b/drivers/edac/ghes_edac.c -index acae39278669..440cb01304bc 100644 ---- a/drivers/edac/ghes_edac.c -+++ b/drivers/edac/ghes_edac.c -@@ -72,6 +72,18 @@ static void ghes_edac_count_dimms(const struct dmi_header *dh, void *arg) - (*num_dimm)++; - } - -+static int get_dimm_smbios_index(u16 handle) -+{ -+ struct mem_ctl_info *mci = ghes_pvt->mci; -+ int i; -+ -+ for (i = 0; i < mci->tot_dimms; i++) { -+ if (mci->dimms[i]->smbios_handle == handle) -+ return i; -+ } -+ return -1; -+} -+ - static void ghes_edac_dmidecode(const struct dmi_header *dh, void *arg) - { - struct ghes_edac_dimm_fill *dimm_fill = arg; -@@ -159,6 +171,8 @@ static void ghes_edac_dmidecode(const struct dmi_header *dh, void *arg) - entry->total_width, entry->data_width); - } - -+ dimm->smbios_handle = entry->handle; -+ - dimm_fill->count++; - } - } -@@ -305,12 +319,21 @@ void ghes_edac_report_mem_error(struct ghes *ghes, int sev, - p += sprintf(p, "bit_pos:%d ", mem_err->bit_pos); - if (mem_err->validation_bits & CPER_MEM_VALID_MODULE_HANDLE) { - const char *bank = NULL, *device = NULL; -+ int index = -1; -+ - dmi_memdev_name(mem_err->mem_dev_handle, &bank, &device); - if (bank != NULL && device != NULL) - p += sprintf(p, "DIMM location:%s %s ", bank, device); - else - p += sprintf(p, "DIMM DMI handle: 0x%.4x ", - mem_err->mem_dev_handle); -+ -+ index = get_dimm_smbios_index(mem_err->mem_dev_handle); -+ if (index >= 0) { -+ e->top_layer = index; -+ e->enable_per_layer_report = true; -+ } -+ - } - if (p > e->location) - *(p - 1) = '\0'; -diff --git a/include/linux/edac.h b/include/linux/edac.h -index 90f72336aea6..3a3b1cc34218 100644 ---- a/include/linux/edac.h -+++ b/include/linux/edac.h -@@ -449,6 +449,8 @@ struct dimm_info { - u32 nr_pages; /* number of pages on this dimm */ - - unsigned csrow, cschannel; /* Points to the old API data */ -+ -+ u16 smbios_handle; /* Handle for SMBIOS type 17 */ - }; - - /** --- -2.25.1 - diff --git a/queue-4.14/series b/queue-4.14/series index 10147603198..6751a033206 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -44,7 +44,6 @@ ubsan-build-ubsan.c-more-conservatively.patch libnvdimm-btt-remove-unnecessary-code-in-btt_freelis.patch libnvdimm-btt-fix-lba-masking-during-free-list-popul.patch media-fdp1-fix-r-car-m3-n-naming-in-debug-message.patch -edac-ghes-use-cper-module-handles-to-locate-dimms.patch cxgb4-free-mac_hlist-properly.patch cxgb4-cxgb4vf-fix-mac_hlist-initialization-and-free.patch revert-gfs2-don-t-demote-a-glock-until-its-revokes-a.patch diff --git a/queue-4.19/edac-ghes-use-cper-module-handles-to-locate-dimms.patch b/queue-4.19/edac-ghes-use-cper-module-handles-to-locate-dimms.patch deleted file mode 100644 index dc38a772d9b..00000000000 --- a/queue-4.19/edac-ghes-use-cper-module-handles-to-locate-dimms.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 957d981cb18842bcc33767199e5a83635c0e233d Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 19 Sep 2018 01:59:00 +0000 -Subject: EDAC, ghes: Use CPER module handles to locate DIMMs - -From: Fan Wu - -[ Upstream commit c798c88f3962ddff89c7aa818986caeecd46ab4c ] - -Use SMBIOS module handle type 17, on platforms which provide valid -ones, to locate the corresponding DIMM and thus have per-DIMM error -counter updates. - -Signed-off-by: Fan Wu -[ Massage commit message. ] -Signed-off-by: Borislav Petkov -Reviewed-by: Tyler Baicar -Reviewed-by: James Morse -Tested-by: Toshi Kani -Cc: Mauro Carvalho Chehab -Cc: baicar.tyler@gmail.com -Cc: john.garry@huawei.com -Cc: linux-arm-kernel@lists.infradead.org -Cc: linux-edac -Cc: shiju.jose@huawei.com -Cc: tanxiaofei@huawei.com -Cc: wanghuiqiang@huawei.com -Link: http://lkml.kernel.org/r/1537322340-1860-1-git-send-email-wufan@codeaurora.org -Signed-off-by: Sasha Levin ---- - drivers/edac/ghes_edac.c | 23 +++++++++++++++++++++++ - include/linux/edac.h | 2 ++ - 2 files changed, 25 insertions(+) - -diff --git a/drivers/edac/ghes_edac.c b/drivers/edac/ghes_edac.c -index 78c339da19b5..02a7134ad75b 100644 ---- a/drivers/edac/ghes_edac.c -+++ b/drivers/edac/ghes_edac.c -@@ -81,6 +81,18 @@ static void ghes_edac_count_dimms(const struct dmi_header *dh, void *arg) - (*num_dimm)++; - } - -+static int get_dimm_smbios_index(u16 handle) -+{ -+ struct mem_ctl_info *mci = ghes_pvt->mci; -+ int i; -+ -+ for (i = 0; i < mci->tot_dimms; i++) { -+ if (mci->dimms[i]->smbios_handle == handle) -+ return i; -+ } -+ return -1; -+} -+ - static void ghes_edac_dmidecode(const struct dmi_header *dh, void *arg) - { - struct ghes_edac_dimm_fill *dimm_fill = arg; -@@ -177,6 +189,8 @@ static void ghes_edac_dmidecode(const struct dmi_header *dh, void *arg) - entry->total_width, entry->data_width); - } - -+ dimm->smbios_handle = entry->handle; -+ - dimm_fill->count++; - } - } -@@ -328,12 +342,21 @@ void ghes_edac_report_mem_error(int sev, struct cper_sec_mem_err *mem_err) - p += sprintf(p, "bit_pos:%d ", mem_err->bit_pos); - if (mem_err->validation_bits & CPER_MEM_VALID_MODULE_HANDLE) { - const char *bank = NULL, *device = NULL; -+ int index = -1; -+ - dmi_memdev_name(mem_err->mem_dev_handle, &bank, &device); - if (bank != NULL && device != NULL) - p += sprintf(p, "DIMM location:%s %s ", bank, device); - else - p += sprintf(p, "DIMM DMI handle: 0x%.4x ", - mem_err->mem_dev_handle); -+ -+ index = get_dimm_smbios_index(mem_err->mem_dev_handle); -+ if (index >= 0) { -+ e->top_layer = index; -+ e->enable_per_layer_report = true; -+ } -+ - } - if (p > e->location) - *(p - 1) = '\0'; -diff --git a/include/linux/edac.h b/include/linux/edac.h -index 958d69332c1d..1d0c9ea8825d 100644 ---- a/include/linux/edac.h -+++ b/include/linux/edac.h -@@ -452,6 +452,8 @@ struct dimm_info { - u32 nr_pages; /* number of pages on this dimm */ - - unsigned csrow, cschannel; /* Points to the old API data */ -+ -+ u16 smbios_handle; /* Handle for SMBIOS type 17 */ - }; - - /** --- -2.25.1 - diff --git a/queue-4.19/series b/queue-4.19/series index 7d466c1ec6e..dd925775d97 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -54,7 +54,6 @@ libnvdimm-btt-fix-lba-masking-during-free-list-popul.patch staging-most-core-replace-strcpy-by-strscpy.patch thunderbolt-drop-duplicated-get_switch_at_route.patch media-fdp1-fix-r-car-m3-n-naming-in-debug-message.patch -edac-ghes-use-cper-module-handles-to-locate-dimms.patch edac-ghes-fix-locking-and-memory-barrier-issues.patch revert-net-ibmvnic-fix-eoi-when-running-in-xive-mode.patch net-bcmgenet-code-movement.patch diff --git a/queue-4.4/edac-ghes-use-cper-module-handles-to-locate-dimms.patch b/queue-4.4/edac-ghes-use-cper-module-handles-to-locate-dimms.patch deleted file mode 100644 index dc0f12bb997..00000000000 --- a/queue-4.4/edac-ghes-use-cper-module-handles-to-locate-dimms.patch +++ /dev/null @@ -1,104 +0,0 @@ -From bb30c3d1a3a28bcfe13c404d93dc6a51bc1e04b2 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 19 Sep 2018 01:59:00 +0000 -Subject: EDAC, ghes: Use CPER module handles to locate DIMMs - -From: Fan Wu - -[ Upstream commit c798c88f3962ddff89c7aa818986caeecd46ab4c ] - -Use SMBIOS module handle type 17, on platforms which provide valid -ones, to locate the corresponding DIMM and thus have per-DIMM error -counter updates. - -Signed-off-by: Fan Wu -[ Massage commit message. ] -Signed-off-by: Borislav Petkov -Reviewed-by: Tyler Baicar -Reviewed-by: James Morse -Tested-by: Toshi Kani -Cc: Mauro Carvalho Chehab -Cc: baicar.tyler@gmail.com -Cc: john.garry@huawei.com -Cc: linux-arm-kernel@lists.infradead.org -Cc: linux-edac -Cc: shiju.jose@huawei.com -Cc: tanxiaofei@huawei.com -Cc: wanghuiqiang@huawei.com -Link: http://lkml.kernel.org/r/1537322340-1860-1-git-send-email-wufan@codeaurora.org -Signed-off-by: Sasha Levin ---- - drivers/edac/ghes_edac.c | 23 +++++++++++++++++++++++ - include/linux/edac.h | 2 ++ - 2 files changed, 25 insertions(+) - -diff --git a/drivers/edac/ghes_edac.c b/drivers/edac/ghes_edac.c -index 4ddbf6604e2a..4249b9ada3a6 100644 ---- a/drivers/edac/ghes_edac.c -+++ b/drivers/edac/ghes_edac.c -@@ -74,6 +74,18 @@ static void ghes_edac_count_dimms(const struct dmi_header *dh, void *arg) - (*num_dimm)++; - } - -+static int get_dimm_smbios_index(u16 handle) -+{ -+ struct mem_ctl_info *mci = ghes_pvt->mci; -+ int i; -+ -+ for (i = 0; i < mci->tot_dimms; i++) { -+ if (mci->dimms[i]->smbios_handle == handle) -+ return i; -+ } -+ return -1; -+} -+ - static void ghes_edac_dmidecode(const struct dmi_header *dh, void *arg) - { - struct ghes_edac_dimm_fill *dimm_fill = arg; -@@ -161,6 +173,8 @@ static void ghes_edac_dmidecode(const struct dmi_header *dh, void *arg) - entry->total_width, entry->data_width); - } - -+ dimm->smbios_handle = entry->handle; -+ - dimm_fill->count++; - } - } -@@ -307,12 +321,21 @@ void ghes_edac_report_mem_error(struct ghes *ghes, int sev, - p += sprintf(p, "bit_pos:%d ", mem_err->bit_pos); - if (mem_err->validation_bits & CPER_MEM_VALID_MODULE_HANDLE) { - const char *bank = NULL, *device = NULL; -+ int index = -1; -+ - dmi_memdev_name(mem_err->mem_dev_handle, &bank, &device); - if (bank != NULL && device != NULL) - p += sprintf(p, "DIMM location:%s %s ", bank, device); - else - p += sprintf(p, "DIMM DMI handle: 0x%.4x ", - mem_err->mem_dev_handle); -+ -+ index = get_dimm_smbios_index(mem_err->mem_dev_handle); -+ if (index >= 0) { -+ e->top_layer = index; -+ e->enable_per_layer_report = true; -+ } -+ - } - if (p > e->location) - *(p - 1) = '\0'; -diff --git a/include/linux/edac.h b/include/linux/edac.h -index 9bb4f3311e13..16dd9d351969 100644 ---- a/include/linux/edac.h -+++ b/include/linux/edac.h -@@ -559,6 +559,8 @@ struct dimm_info { - u32 nr_pages; /* number of pages on this dimm */ - - unsigned csrow, cschannel; /* Points to the old API data */ -+ -+ u16 smbios_handle; /* Handle for SMBIOS type 17 */ - }; - - /** --- -2.25.1 - diff --git a/queue-4.4/series b/queue-4.4/series index 6bf06cc5957..8681a7d4206 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -31,7 +31,6 @@ alsa-pcm-fix-incorrect-hw_base-increase.patch ext4-lock-the-xattr-block-before-checksuming-it.patch platform-x86-alienware-wmi-fix-kfree-on-potentially-uninitialized-pointer.patch libnvdimm-btt-remove-unnecessary-code-in-btt_freelis.patch -edac-ghes-use-cper-module-handles-to-locate-dimms.patch revert-gfs2-don-t-demote-a-glock-until-its-revokes-a.patch staging-iio-ad2s1210-fix-spi-reading.patch mei-release-me_cl-object-reference.patch diff --git a/queue-4.9/edac-ghes-use-cper-module-handles-to-locate-dimms.patch b/queue-4.9/edac-ghes-use-cper-module-handles-to-locate-dimms.patch deleted file mode 100644 index 5c67c0b8f21..00000000000 --- a/queue-4.9/edac-ghes-use-cper-module-handles-to-locate-dimms.patch +++ /dev/null @@ -1,104 +0,0 @@ -From d0b41e69bd83b92817db1b31a9563315cbefd45f Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 19 Sep 2018 01:59:00 +0000 -Subject: EDAC, ghes: Use CPER module handles to locate DIMMs - -From: Fan Wu - -[ Upstream commit c798c88f3962ddff89c7aa818986caeecd46ab4c ] - -Use SMBIOS module handle type 17, on platforms which provide valid -ones, to locate the corresponding DIMM and thus have per-DIMM error -counter updates. - -Signed-off-by: Fan Wu -[ Massage commit message. ] -Signed-off-by: Borislav Petkov -Reviewed-by: Tyler Baicar -Reviewed-by: James Morse -Tested-by: Toshi Kani -Cc: Mauro Carvalho Chehab -Cc: baicar.tyler@gmail.com -Cc: john.garry@huawei.com -Cc: linux-arm-kernel@lists.infradead.org -Cc: linux-edac -Cc: shiju.jose@huawei.com -Cc: tanxiaofei@huawei.com -Cc: wanghuiqiang@huawei.com -Link: http://lkml.kernel.org/r/1537322340-1860-1-git-send-email-wufan@codeaurora.org -Signed-off-by: Sasha Levin ---- - drivers/edac/ghes_edac.c | 23 +++++++++++++++++++++++ - include/linux/edac.h | 2 ++ - 2 files changed, 25 insertions(+) - -diff --git a/drivers/edac/ghes_edac.c b/drivers/edac/ghes_edac.c -index 4ddbf6604e2a..4249b9ada3a6 100644 ---- a/drivers/edac/ghes_edac.c -+++ b/drivers/edac/ghes_edac.c -@@ -74,6 +74,18 @@ static void ghes_edac_count_dimms(const struct dmi_header *dh, void *arg) - (*num_dimm)++; - } - -+static int get_dimm_smbios_index(u16 handle) -+{ -+ struct mem_ctl_info *mci = ghes_pvt->mci; -+ int i; -+ -+ for (i = 0; i < mci->tot_dimms; i++) { -+ if (mci->dimms[i]->smbios_handle == handle) -+ return i; -+ } -+ return -1; -+} -+ - static void ghes_edac_dmidecode(const struct dmi_header *dh, void *arg) - { - struct ghes_edac_dimm_fill *dimm_fill = arg; -@@ -161,6 +173,8 @@ static void ghes_edac_dmidecode(const struct dmi_header *dh, void *arg) - entry->total_width, entry->data_width); - } - -+ dimm->smbios_handle = entry->handle; -+ - dimm_fill->count++; - } - } -@@ -307,12 +321,21 @@ void ghes_edac_report_mem_error(struct ghes *ghes, int sev, - p += sprintf(p, "bit_pos:%d ", mem_err->bit_pos); - if (mem_err->validation_bits & CPER_MEM_VALID_MODULE_HANDLE) { - const char *bank = NULL, *device = NULL; -+ int index = -1; -+ - dmi_memdev_name(mem_err->mem_dev_handle, &bank, &device); - if (bank != NULL && device != NULL) - p += sprintf(p, "DIMM location:%s %s ", bank, device); - else - p += sprintf(p, "DIMM DMI handle: 0x%.4x ", - mem_err->mem_dev_handle); -+ -+ index = get_dimm_smbios_index(mem_err->mem_dev_handle); -+ if (index >= 0) { -+ e->top_layer = index; -+ e->enable_per_layer_report = true; -+ } -+ - } - if (p > e->location) - *(p - 1) = '\0'; -diff --git a/include/linux/edac.h b/include/linux/edac.h -index c6233227720c..1f69c994b9cc 100644 ---- a/include/linux/edac.h -+++ b/include/linux/edac.h -@@ -559,6 +559,8 @@ struct dimm_info { - u32 nr_pages; /* number of pages on this dimm */ - - unsigned csrow, cschannel; /* Points to the old API data */ -+ -+ u16 smbios_handle; /* Handle for SMBIOS type 17 */ - }; - - /** --- -2.25.1 - diff --git a/queue-4.9/series b/queue-4.9/series index 213b022fb52..002746d04ef 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -53,7 +53,6 @@ x86-uaccess-ubsan-fix-ubsan-vs.-smap.patch ubsan-build-ubsan.c-more-conservatively.patch platform-x86-alienware-wmi-fix-kfree-on-potentially-uninitialized-pointer.patch libnvdimm-btt-remove-unnecessary-code-in-btt_freelis.patch -edac-ghes-use-cper-module-handles-to-locate-dimms.patch cxgb4-free-mac_hlist-properly.patch cxgb4-cxgb4vf-fix-mac_hlist-initialization-and-free.patch revert-gfs2-don-t-demote-a-glock-until-its-revokes-a.patch