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

Commit 270ba4b6 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: qcom: add physical address error type in Gladiator erp"

parents 5267c5ec 9ed4165c

drivers/soc/qcom/gladiator_erp.c

+12 −2
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ enum type_logger_error { 
	DISCONNECT_ERROR,

	DIRECTORY_ERROR,

	PARITY_ERROR,

	PHYSICAL_ADDRESS_ERROR,

};



static void clear_gladiator_error(void __iomem *gladiator_virt_base,
@@ -200,12 +201,14 @@ static inline void print_gld_transaction(unsigned int opc) 


static inline void print_gld_errtype(unsigned int errtype)

{

	char *errors = "Disconnect, Directory, Parity, Physical address";



	if (errtype == 0)

		pr_alert("Error type: Snoop data transfer\n");

	else if (errtype == 1)

		pr_alert("Error type: DVM error\n");

	else if (errtype == 3)

		pr_alert("Error type: Disconnect, directory, or parity error\n");

		pr_alert("Error type: %s\n", errors);

	else

		pr_alert("Error type: Unknown; value:%u\n", errtype);

}
@@ -288,7 +291,7 @@ static void decode_gld_logged_error(u32 err_reg5, 


	log_err_type = (err_reg5 & mask_shifts->gld_errlog5_error_type_mask)

		>> mask_shifts->gld_errlog5_error_type_shift;

	for (i = 0 ; i <= 6 ; i++) {

	for (i = 0 ; i <= 7 ; i++) {

		value = log_err_type & 0x1;

		switch (i) {

		case DATA_TRANSFER_ERROR:
@@ -337,7 +340,14 @@ static void decode_gld_logged_error(u32 err_reg5, 
					mask_shifts);

			decode_index_parity(err_reg5, mask_shifts);

			break;

		case PHYSICAL_ADDRESS_ERROR:

			if (value == 0)

				continue;

			pr_alert("Error type: Physical address error\n");

			pr_alert("Address is greater than SoC address range\n");

			break;

		}



		log_err_type = log_err_type >> 1;

	}

}