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

Commit 03f7eae8 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

edac: remove arch-specific parameter for the error handler 



Remove the arch-dependent parameter, as it were not used,
as the MCE tracepoint weren't implemented. It probably doesn't
make sense to have an MCE-specific tracepoint, as this will
cost more bytes at the tracepoint, and tracepoint is not free.

The changes at the EDAC drivers were done by this small perl script:

	$file .=$_ while (<>);
	$file =~ s/(edac_mc_handle_error)\s*\(([^\;]+)\,([^\,\)]+)\s*\)/$1($2)/g;
	print $file;

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 075f3090

drivers/edac/amd64_edac.c

+11 −19
Original line number Original line Diff line number Diff line
@@ -1050,8 +1050,7 @@ static void k8_map_sysaddr_to_csrow(struct mem_ctl_info *mci, u64 sys_addr, 
				     page, offset, syndrome,

				     page, offset, syndrome,

				     -1, -1, -1,

				     -1, -1, -1,

				     "failed to map error addr to a node",

				     "failed to map error addr to a node",

				     "",

				     "");

				     NULL);

		return;

		return;

	}

	}
@@ -1062,8 +1061,7 @@ static void k8_map_sysaddr_to_csrow(struct mem_ctl_info *mci, u64 sys_addr, 
				     page, offset, syndrome,

				     page, offset, syndrome,

				     -1, -1, -1,

				     -1, -1, -1,

				     "failed to map error addr to a csrow",

				     "failed to map error addr to a csrow",

				     "",

				     "");

				     NULL);

		return;

		return;

	}

	}
@@ -1083,8 +1081,7 @@ static void k8_map_sysaddr_to_csrow(struct mem_ctl_info *mci, u64 sys_addr, 
					     page, offset, syndrome,

					     page, offset, syndrome,

					     csrow, -1, -1,

					     csrow, -1, -1,

					     "unknown syndrome - possible error reporting race",

					     "unknown syndrome - possible error reporting race",

					     "",

					     "");

					     NULL);

			return;

			return;

		}

		}

	} else {

	} else {
@@ -1102,7 +1099,7 @@ static void k8_map_sysaddr_to_csrow(struct mem_ctl_info *mci, u64 sys_addr, 
	edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, src_mci,

	edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, src_mci,

			     page, offset, syndrome,

			     page, offset, syndrome,

			     csrow, channel, -1,

			     csrow, channel, -1,

			     "", "", NULL);

			     "", "");

}

}





static int ddr2_cs_size(unsigned i, bool dct_width)

static int ddr2_cs_size(unsigned i, bool dct_width)
@@ -1615,8 +1612,7 @@ static void f1x_map_sysaddr_to_csrow(struct mem_ctl_info *mci, u64 sys_addr, 
				     page, offset, syndrome,

				     page, offset, syndrome,

				     -1, -1, -1,

				     -1, -1, -1,

				     "failed to map error addr to a csrow",

				     "failed to map error addr to a csrow",

				     "",

				     "");

				     NULL);

		return;

		return;

	}

	}
@@ -1631,7 +1627,7 @@ static void f1x_map_sysaddr_to_csrow(struct mem_ctl_info *mci, u64 sys_addr, 
	edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci,

	edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci,

			     page, offset, syndrome,

			     page, offset, syndrome,

			     csrow, chan, -1,

			     csrow, chan, -1,

			     "", "", NULL);

			     "", "");

}

}





/*

/*
@@ -1917,8 +1913,7 @@ static void amd64_handle_ce(struct mem_ctl_info *mci, struct mce *m) 
				     0, 0, 0,

				     0, 0, 0,

				     -1, -1, -1,

				     -1, -1, -1,

				     "HW has no ERROR_ADDRESS available",

				     "HW has no ERROR_ADDRESS available",

				     "",

				     "");

				     NULL);

		return;

		return;

	}

	}
@@ -1946,8 +1941,7 @@ static void amd64_handle_ue(struct mem_ctl_info *mci, struct mce *m) 
				     0, 0, 0,

				     0, 0, 0,

				     -1, -1, -1,

				     -1, -1, -1,

				     "HW has no ERROR_ADDRESS available",

				     "HW has no ERROR_ADDRESS available",

				     "",

				     "");

				     NULL);

		return;

		return;

	}

	}
@@ -1966,8 +1960,7 @@ static void amd64_handle_ue(struct mem_ctl_info *mci, struct mce *m) 
				     page, offset, 0,

				     page, offset, 0,

				     -1, -1, -1,

				     -1, -1, -1,

				     "ERROR ADDRESS NOT mapped to a MC",

				     "ERROR ADDRESS NOT mapped to a MC",

				     "",

				     "");

				     NULL);

		return;

		return;

	}

	}
@@ -1981,13 +1974,12 @@ static void amd64_handle_ue(struct mem_ctl_info *mci, struct mce *m) 
				     page, offset, 0,

				     page, offset, 0,

				     -1, -1, -1,

				     -1, -1, -1,

				     "ERROR ADDRESS NOT mapped to CS",

				     "ERROR ADDRESS NOT mapped to CS",

				     "",

				     "");

				     NULL);

	} else {

	} else {

		edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci,

		edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci,

				     page, offset, 0,

				     page, offset, 0,

				     csrow, -1, -1,

				     csrow, -1, -1,

				     "", "", NULL);

				     "", "");

	}

	}

}

}

drivers/edac/amd76x_edac.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -148,7 +148,7 @@ static int amd76x_process_error_info(struct mem_ctl_info *mci, 
			edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci,

			edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci,

					     mci->csrows[row]->first_page, 0, 0,

					     mci->csrows[row]->first_page, 0, 0,

					     row, 0, -1,

					     row, 0, -1,

					     mci->ctl_name, "", NULL);

					     mci->ctl_name, "");

		}

		}

	}

	}
@@ -163,7 +163,7 @@ static int amd76x_process_error_info(struct mem_ctl_info *mci, 
			edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci,

			edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci,

					     mci->csrows[row]->first_page, 0, 0,

					     mci->csrows[row]->first_page, 0, 0,

					     row, 0, -1,

					     row, 0, -1,

					     mci->ctl_name, "", NULL);

					     mci->ctl_name, "");

		}

		}

	}

	}

drivers/edac/cell_edac.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -50,7 +50,7 @@ static void cell_edac_count_ce(struct mem_ctl_info *mci, int chan, u64 ar) 
	/* TODO: Decoding of the error address */

	/* TODO: Decoding of the error address */

	edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci,

	edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci,

			     csrow->first_page + pfn, offset, syndrome,

			     csrow->first_page + pfn, offset, syndrome,

			     0, chan, -1, "", "", NULL);

			     0, chan, -1, "", "");

}

}





static void cell_edac_count_ue(struct mem_ctl_info *mci, int chan, u64 ar)

static void cell_edac_count_ue(struct mem_ctl_info *mci, int chan, u64 ar)
@@ -72,7 +72,7 @@ static void cell_edac_count_ue(struct mem_ctl_info *mci, int chan, u64 ar) 
	/* TODO: Decoding of the error address */

	/* TODO: Decoding of the error address */

	edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci,

	edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci,

			     csrow->first_page + pfn, offset, 0,

			     csrow->first_page + pfn, offset, 0,

			     0, chan, -1, "", "", NULL);

			     0, chan, -1, "", "");

}

}





static void cell_edac_check(struct mem_ctl_info *mci)

static void cell_edac_check(struct mem_ctl_info *mci)

drivers/edac/cpc925_edac.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -557,7 +557,7 @@ static void cpc925_mc_check(struct mem_ctl_info *mci) 
		edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci,

		edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci,

				     pfn, offset, syndrome,

				     pfn, offset, syndrome,

				     csrow, channel, -1,

				     csrow, channel, -1,

				     mci->ctl_name, "", NULL);

				     mci->ctl_name, "");

	}

	}





	if (apiexcp & UECC_EXCP_DETECTED) {

	if (apiexcp & UECC_EXCP_DETECTED) {
@@ -565,7 +565,7 @@ static void cpc925_mc_check(struct mem_ctl_info *mci) 
		edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci,

		edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci,

				     pfn, offset, 0,

				     pfn, offset, 0,

				     csrow, -1, -1,

				     csrow, -1, -1,

				     mci->ctl_name, "", NULL);

				     mci->ctl_name, "");

	}

	}





	cpc925_mc_printk(mci, KERN_INFO, "Dump registers:\n");

	cpc925_mc_printk(mci, KERN_INFO, "Dump registers:\n");

drivers/edac/e752x_edac.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -374,7 +374,7 @@ static void do_process_ce(struct mem_ctl_info *mci, u16 error_one, 
	edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci,

	edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci,

			     page, offset_in_page(sec1_add << 4), sec1_syndrome,

			     page, offset_in_page(sec1_add << 4), sec1_syndrome,

			     row, channel, -1,

			     row, channel, -1,

			     "e752x CE", "", NULL);

			     "e752x CE", "");

}

}





static inline void process_ce(struct mem_ctl_info *mci, u16 error_one,

static inline void process_ce(struct mem_ctl_info *mci, u16 error_one,
@@ -412,7 +412,7 @@ static void do_process_ue(struct mem_ctl_info *mci, u16 error_one, 
					block_page,

					block_page,

					offset_in_page(error_2b << 4), 0,

					offset_in_page(error_2b << 4), 0,

					 row, -1, -1,

					 row, -1, -1,

					"e752x UE from Read", "", NULL);

					"e752x UE from Read", "");





	}

	}

	if (error_one & 0x0404) {

	if (error_one & 0x0404) {
@@ -431,7 +431,7 @@ static void do_process_ue(struct mem_ctl_info *mci, u16 error_one, 
					block_page,

					block_page,

					offset_in_page(error_2b << 4), 0,

					offset_in_page(error_2b << 4), 0,

					row, -1, -1,

					row, -1, -1,

					"e752x UE from Scruber", "", NULL);

					"e752x UE from Scruber", "");

	}

	}

}

}
@@ -456,7 +456,7 @@ static inline void process_ue_no_info_wr(struct mem_ctl_info *mci, 
	edac_dbg(3, "\n");

	edac_dbg(3, "\n");

	edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 0, 0, 0,

	edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 0, 0, 0,

			     -1, -1, -1,

			     -1, -1, -1,

			     "e752x UE log memory write", "", NULL);

			     "e752x UE log memory write", "");

}

}





static void do_process_ded_retry(struct mem_ctl_info *mci, u16 error,

static void do_process_ded_retry(struct mem_ctl_info *mci, u16 error,