Commit 3c5b977f authored by Tyler Baicar's avatar Tyler Baicar Committed by Rafael J. Wysocki
Browse files

ACPI: APEI: handle PCIe AER errors in separate function 



Move PCIe AER error handling code into a separate function.

Signed-off-by: default avatarTyler Baicar <tbaicar@codeaurora.org>
Reviewed-by: default avatarBorislav Petkov <bp@suse.de>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent ae64f9bd

drivers/acpi/apei/ghes.c

+34 −30
Original line number Original line Diff line number Diff line
@@ -414,35 +414,9 @@ static void ghes_handle_memory_failure(struct acpi_hest_generic_data *gdata, int 
#endif

#endif

}

}





static void ghes_do_proc(struct ghes *ghes,

static void ghes_handle_aer(struct acpi_hest_generic_data *gdata, int sev, int sec_sev)

			 const struct acpi_hest_generic_status *estatus)

{

{

	int sev, sec_sev;

	struct acpi_hest_generic_data *gdata;

	guid_t *sec_type;

	guid_t *fru_id = &NULL_UUID_LE;

	char *fru_text = "";



	sev = ghes_severity(estatus->error_severity);

	apei_estatus_for_each_section(estatus, gdata) {

		sec_type = (guid_t *)gdata->section_type;

		sec_sev = ghes_severity(gdata->error_severity);

		if (gdata->validation_bits & CPER_SEC_VALID_FRU_ID)

			fru_id = (guid_t *)gdata->fru_id;



		if (gdata->validation_bits & CPER_SEC_VALID_FRU_TEXT)

			fru_text = gdata->fru_text;



		if (guid_equal(sec_type, &CPER_SEC_PLATFORM_MEM)) {

			struct cper_sec_mem_err *mem_err = acpi_hest_get_payload(gdata);



			ghes_edac_report_mem_error(ghes, sev, mem_err);



			arch_apei_report_mem_error(sev, mem_err);

			ghes_handle_memory_failure(gdata, sev);

		}

#ifdef CONFIG_ACPI_APEI_PCIEAER

#ifdef CONFIG_ACPI_APEI_PCIEAER

		else if (guid_equal(sec_type, &CPER_SEC_PCIE)) {

	struct cper_sec_pcie *pcie_err = acpi_hest_get_payload(gdata);

	struct cper_sec_pcie *pcie_err = acpi_hest_get_payload(gdata);





	if (sev == GHES_SEV_RECOVERABLE &&

	if (sev == GHES_SEV_RECOVERABLE &&
@@ -470,9 +444,39 @@ static void ghes_do_proc(struct ghes *ghes, 
				  (struct aer_capability_regs *)

				  (struct aer_capability_regs *)

				  pcie_err->aer_info);

				  pcie_err->aer_info);

	}

	}

#endif

}





static void ghes_do_proc(struct ghes *ghes,

			 const struct acpi_hest_generic_status *estatus)

{

	int sev, sec_sev;

	struct acpi_hest_generic_data *gdata;

	guid_t *sec_type;

	guid_t *fru_id = &NULL_UUID_LE;

	char *fru_text = "";



	sev = ghes_severity(estatus->error_severity);

	apei_estatus_for_each_section(estatus, gdata) {

		sec_type = (guid_t *)gdata->section_type;

		sec_sev = ghes_severity(gdata->error_severity);

		if (gdata->validation_bits & CPER_SEC_VALID_FRU_ID)

			fru_id = (guid_t *)gdata->fru_id;



		if (gdata->validation_bits & CPER_SEC_VALID_FRU_TEXT)

			fru_text = gdata->fru_text;



		if (guid_equal(sec_type, &CPER_SEC_PLATFORM_MEM)) {

			struct cper_sec_mem_err *mem_err = acpi_hest_get_payload(gdata);



			ghes_edac_report_mem_error(ghes, sev, mem_err);



			arch_apei_report_mem_error(sev, mem_err);

			ghes_handle_memory_failure(gdata, sev);

		}

		else if (guid_equal(sec_type, &CPER_SEC_PCIE)) {

			ghes_handle_aer(gdata, sev, sec_sev);

		}

		}

#endif

		else if (guid_equal(sec_type, &CPER_SEC_PROC_ARM)) {

		else if (guid_equal(sec_type, &CPER_SEC_PROC_ARM)) {

			struct cper_sec_proc_arm *err = acpi_hest_get_payload(gdata);

			struct cper_sec_proc_arm *err = acpi_hest_get_payload(gdata);