Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c76bb5f authored by Chen, Gong's avatar Chen, Gong Committed by Tony Luck
Browse files

RAS, extlog: Adjust init flow 



Unless the platform has eMCA related capability, don't
need to check if there is conflict with EDAC driver.

Signed-off-by: default avatarChen, Gong <gong.chen@linux.intel.com>
Acked-by: default avatarBorislav Petkov <bp@suse.de>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent d6cae935

drivers/acpi/acpi_extlog.c

+5 −8
Original line number Diff line number Diff line
@@ -223,19 +223,16 @@ static int __init extlog_init(void) 
	u64 cap;

	int rc;



	rdmsrl(MSR_IA32_MCG_CAP, cap);



	if (!(cap & MCG_ELOG_P) || !extlog_get_l1addr())

		return -ENODEV;



	if (get_edac_report_status() == EDAC_REPORTING_FORCE) {

		pr_warn("Not loading eMCA, error reporting force-enabled through EDAC.\n");

		return -EPERM;

	}



	rc = -ENODEV;

	rdmsrl(MSR_IA32_MCG_CAP, cap);

	if (!(cap & MCG_ELOG_P))

		return rc;



	if (!extlog_get_l1addr())

		return rc;



	rc = -EINVAL;

	/* get L1 header to fetch necessary information */

	l1_hdr_size = sizeof(struct extlog_l1_head);