Skip to content

Commit 3919430

Browse files
bp3tk0vbp3tk0v
committed
Merge branches 'edac-ghes' and 'edac-misc' into edac-updates-for-v6.2
Combine all queued EDAC changes for submission into v6.2: * ras/edac-ghes: EDAC/igen6: Return the correct error type when not the MC owner apei/ghes: Use xchg_release() for updating new cache slot instead of cmpxchg() EDAC: Check for GHES preference in the chipset-specific EDAC drivers EDAC/ghes: Make ghes_edac a proper module EDAC/ghes: Prepare to make ghes_edac a proper module EDAC/ghes: Add a notifier for reporting memory errors efi/cper: Export several helpers for ghes_edac to use * ras/edac-misc: EDAC/i10nm: fix refcount leak in pci_get_dev_wrapper() EDAC/i5400: Fix typo in comment: vaious -> various EDAC/mc_sysfs: Increase legacy channel support to 12 MAINTAINERS: Make Mauro EDAC reviewer MAINTAINERS: Make Manivannan Sadhasivam the maintainer of qcom_edac EDAC/i5000: Mark as BROKEN Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
2 parents f5e3234 + 9c89215 commit 3919430

5 files changed

Lines changed: 30 additions & 6 deletions

File tree

‎MAINTAINERS‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7356,9 +7356,9 @@ F: drivers/edac/thunderx_edac*
73567356

73577357
EDAC-CORE
73587358
M: Borislav Petkov <bp@alien8.de>
7359-
M: Mauro Carvalho Chehab <mchehab@kernel.org>
73607359
M: Tony Luck <tony.luck@intel.com>
73617360
R: James Morse <james.morse@arm.com>
7361+
R: Mauro Carvalho Chehab <mchehab@kernel.org>
73627362
R: Robert Richter <rric@kernel.org>
73637363
L: linux-edac@vger.kernel.org
73647364
S: Supported
@@ -7475,8 +7475,7 @@ S: Maintained
74757475
F: drivers/edac/pnd2_edac.[ch]
74767476

74777477
EDAC-QCOM
7478-
M: Channagoud Kadabi <ckadabi@codeaurora.org>
7479-
M: Venkata Narendra Kumar Gutta <vnkgutta@codeaurora.org>
7478+
M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
74807479
L: linux-arm-msm@vger.kernel.org
74817480
L: linux-edac@vger.kernel.org
74827481
S: Maintained

‎drivers/edac/Kconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@ config EDAC_R82600
211211
config EDAC_I5000
212212
tristate "Intel Greencreek/Blackford chipset"
213213
depends on X86 && PCI
214+
depends on BROKEN
214215
help
215216
Support for error detection and correction the Intel
216217
Greekcreek/Blackford chipsets.

‎drivers/edac/edac_mc_sysfs.c‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,14 @@ DEVICE_CHANNEL(ch6_dimm_label, S_IRUGO | S_IWUSR,
298298
channel_dimm_label_show, channel_dimm_label_store, 6);
299299
DEVICE_CHANNEL(ch7_dimm_label, S_IRUGO | S_IWUSR,
300300
channel_dimm_label_show, channel_dimm_label_store, 7);
301+
DEVICE_CHANNEL(ch8_dimm_label, S_IRUGO | S_IWUSR,
302+
channel_dimm_label_show, channel_dimm_label_store, 8);
303+
DEVICE_CHANNEL(ch9_dimm_label, S_IRUGO | S_IWUSR,
304+
channel_dimm_label_show, channel_dimm_label_store, 9);
305+
DEVICE_CHANNEL(ch10_dimm_label, S_IRUGO | S_IWUSR,
306+
channel_dimm_label_show, channel_dimm_label_store, 10);
307+
DEVICE_CHANNEL(ch11_dimm_label, S_IRUGO | S_IWUSR,
308+
channel_dimm_label_show, channel_dimm_label_store, 11);
301309

302310
/* Total possible dynamic DIMM Label attribute file table */
303311
static struct attribute *dynamic_csrow_dimm_attr[] = {
@@ -309,6 +317,10 @@ static struct attribute *dynamic_csrow_dimm_attr[] = {
309317
&dev_attr_legacy_ch5_dimm_label.attr.attr,
310318
&dev_attr_legacy_ch6_dimm_label.attr.attr,
311319
&dev_attr_legacy_ch7_dimm_label.attr.attr,
320+
&dev_attr_legacy_ch8_dimm_label.attr.attr,
321+
&dev_attr_legacy_ch9_dimm_label.attr.attr,
322+
&dev_attr_legacy_ch10_dimm_label.attr.attr,
323+
&dev_attr_legacy_ch11_dimm_label.attr.attr,
312324
NULL
313325
};
314326

@@ -329,6 +341,14 @@ DEVICE_CHANNEL(ch6_ce_count, S_IRUGO,
329341
channel_ce_count_show, NULL, 6);
330342
DEVICE_CHANNEL(ch7_ce_count, S_IRUGO,
331343
channel_ce_count_show, NULL, 7);
344+
DEVICE_CHANNEL(ch8_ce_count, S_IRUGO,
345+
channel_ce_count_show, NULL, 8);
346+
DEVICE_CHANNEL(ch9_ce_count, S_IRUGO,
347+
channel_ce_count_show, NULL, 9);
348+
DEVICE_CHANNEL(ch10_ce_count, S_IRUGO,
349+
channel_ce_count_show, NULL, 10);
350+
DEVICE_CHANNEL(ch11_ce_count, S_IRUGO,
351+
channel_ce_count_show, NULL, 11);
332352

333353
/* Total possible dynamic ce_count attribute file table */
334354
static struct attribute *dynamic_csrow_ce_count_attr[] = {
@@ -340,6 +360,10 @@ static struct attribute *dynamic_csrow_ce_count_attr[] = {
340360
&dev_attr_legacy_ch5_ce_count.attr.attr,
341361
&dev_attr_legacy_ch6_ce_count.attr.attr,
342362
&dev_attr_legacy_ch7_ce_count.attr.attr,
363+
&dev_attr_legacy_ch8_ce_count.attr.attr,
364+
&dev_attr_legacy_ch9_ce_count.attr.attr,
365+
&dev_attr_legacy_ch10_ce_count.attr.attr,
366+
&dev_attr_legacy_ch11_ce_count.attr.attr,
343367
NULL
344368
};
345369

‎drivers/edac/i10nm_base.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,11 +304,10 @@ static struct pci_dev *pci_get_dev_wrapper(int dom, unsigned int bus,
304304
if (unlikely(pci_enable_device(pdev) < 0)) {
305305
edac_dbg(2, "Failed to enable device %02x:%02x.%x\n",
306306
bus, dev, fun);
307+
pci_dev_put(pdev);
307308
return NULL;
308309
}
309310

310-
pci_dev_get(pdev);
311-
312311
return pdev;
313312
}
314313

‎drivers/edac/i5400_edac.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,8 @@ static inline int from_nf_ferr(unsigned int mask)
279279
#define FERR_NF_RECOVERABLE to_nf_mask(ERROR_NF_RECOVERABLE)
280280
#define FERR_NF_UNCORRECTABLE to_nf_mask(ERROR_NF_UNCORRECTABLE)
281281

282-
/* Defines to extract the vaious fields from the
282+
/*
283+
* Defines to extract the various fields from the
283284
* MTRx - Memory Technology Registers
284285
*/
285286
#define MTR_DIMMS_PRESENT(mtr) ((mtr) & (1 << 10))

0 commit comments

Comments
 (0)