Rename Altera EDAC debug triggers
Subsystems (2)
cover Rename Altera EDAC debug triggers
From: Thor Thayer <[email protected]>
Rename the EDAC debug trigger names to "altr_trigger" for consistency.
Thor Thayer (2):
EDAC, altera: Rename device trigger to common name EDAC, altera: Rename MC trigger to common name
drivers/edac/altera_edac.c | 15 ++------------- drivers/edac/altera_edac.h | 1 - 2 files changed, 2 insertions(+), 14 deletions(-)
Signature · 1 line
1.7.9.5
PATCH 1/2 EDAC, altera: Rename device trigger to common name
From: Thor Thayer <[email protected]>
The L2 and OCRAM devices have different ecc trigger names than the other EDAC devices (FIFO peripherals). Make them all the same and remove the character array from the device structure.
--- drivers/edac/altera_edac.c | 13 +------------ drivers/edac/altera_edac.h | 1 - 2 files changed, 1 insertion(+), 13 deletions(-)
drivers/edac/altera_edac.c +1 -12
@@ -680,7 +680,7 @@ static void altr_create_edacdev_dbgfs(struct edac_device_ctl_info *edac_dci,if (!drvdata->debugfs_dir)return ; -if (!edac_debugfs_create_file (priv->dbgfs_name,S_IWUSR , +if (!edac_debugfs_create_file ("altr_trigger" ,S_IWUSR , drvdata->debugfs_dir, edac_dci, priv->inject_fops))debugfs_remove_recursive (drvdata->debugfs_dir);
@@ -1108,7 +1108,6 @@ static const struct edac_device_prv_data ocramecc_data = { .setup = altr_check_ecc_deps, .ce_clear_mask = (ALTR_OCR_ECC_EN | ALTR_OCR_ECC_SERR), .ue_clear_mask = (ALTR_OCR_ECC_EN | ALTR_OCR_ECC_DERR), - .dbgfs_name = "altr_ocram_trigger", .alloc_mem = ocram_alloc_mem, .free_mem = ocram_free_mem, .ecc_enable_mask = ALTR_OCR_ECC_EN,
@@ -1125,7 +1124,6 @@ static const struct edac_device_prv_data a10_ocramecc_data = { .ce_clear_mask = ALTR_A10_ECC_SERRPENA, .ue_clear_mask = ALTR_A10_ECC_DERRPENA, .irq_status_mask = A10_SYSMGR_ECC_INTSTAT_OCRAM, - .dbgfs_name = "altr_ocram_trigger", .ecc_enable_mask = ALTR_A10_OCRAM_ECC_EN_CTL, .ecc_en_ofst = ALTR_A10_ECC_CTRL_OFST, .ce_set_mask = ALTR_A10_ECC_TSERRA,
@@ -1228,7 +1226,6 @@ static const struct edac_device_prv_data l2ecc_data = { .setup = altr_l2_check_deps, .ce_clear_mask = 0, .ue_clear_mask = 0, - .dbgfs_name = "altr_l2_trigger", .alloc_mem = l2_alloc_mem, .free_mem = l2_free_mem, .ecc_enable_mask = ALTR_L2_ECC_EN,
@@ -1244,7 +1241,6 @@ static const struct edac_device_prv_data a10_l2ecc_data = { .ce_clear_mask = ALTR_A10_L2_ECC_SERR_CLR, .ue_clear_mask = ALTR_A10_L2_ECC_MERR_CLR, .irq_status_mask = A10_SYSMGR_ECC_INTSTAT_L2, - .dbgfs_name = "altr_l2_trigger", .alloc_mem = l2_alloc_mem, .free_mem = l2_free_mem, .ecc_enable_mask = ALTR_A10_L2_ECC_EN_CTL,
@@ -1266,7 +1262,6 @@ static const struct edac_device_prv_data a10_enetecc_data = { .setup = altr_check_ecc_deps, .ce_clear_mask = ALTR_A10_ECC_SERRPENA, .ue_clear_mask = ALTR_A10_ECC_DERRPENA, - .dbgfs_name = "altr_trigger", .ecc_enable_mask = ALTR_A10_COMMON_ECC_EN_CTL, .ecc_en_ofst = ALTR_A10_ECC_CTRL_OFST, .ce_set_mask = ALTR_A10_ECC_TSERRA,
@@ -1293,7 +1288,6 @@ static const struct edac_device_prv_data a10_nandecc_data = { .setup = altr_check_ecc_deps, .ce_clear_mask = ALTR_A10_ECC_SERRPENA, .ue_clear_mask = ALTR_A10_ECC_DERRPENA, - .dbgfs_name = "altr_trigger", .ecc_enable_mask = ALTR_A10_COMMON_ECC_EN_CTL, .ecc_en_ofst = ALTR_A10_ECC_CTRL_OFST, .ce_set_mask = ALTR_A10_ECC_TSERRA,
@@ -1320,7 +1314,6 @@ static const struct edac_device_prv_data a10_dmaecc_data = { .setup = altr_check_ecc_deps, .ce_clear_mask = ALTR_A10_ECC_SERRPENA, .ue_clear_mask = ALTR_A10_ECC_DERRPENA, - .dbgfs_name = "altr_trigger", .ecc_enable_mask = ALTR_A10_COMMON_ECC_EN_CTL, .ecc_en_ofst = ALTR_A10_ECC_CTRL_OFST, .ce_set_mask = ALTR_A10_ECC_TSERRA,
@@ -1347,7 +1340,6 @@ static const struct edac_device_prv_data a10_usbecc_data = { .setup = altr_check_ecc_deps, .ce_clear_mask = ALTR_A10_ECC_SERRPENA, .ue_clear_mask = ALTR_A10_ECC_DERRPENA, - .dbgfs_name = "altr_trigger", .ecc_enable_mask = ALTR_A10_COMMON_ECC_EN_CTL, .ecc_en_ofst = ALTR_A10_ECC_CTRL_OFST, .ce_set_mask = ALTR_A10_ECC_TSERRA,
@@ -1374,7 +1366,6 @@ static const struct edac_device_prv_data a10_qspiecc_data = { .setup = altr_check_ecc_deps, .ce_clear_mask = ALTR_A10_ECC_SERRPENA, .ue_clear_mask = ALTR_A10_ECC_DERRPENA, - .dbgfs_name = "altr_trigger", .ecc_enable_mask = ALTR_A10_COMMON_ECC_EN_CTL, .ecc_en_ofst = ALTR_A10_ECC_CTRL_OFST, .ce_set_mask = ALTR_A10_ECC_TSERRA,
@@ -1524,7 +1515,6 @@ static const struct edac_device_prv_data a10_sdmmcecca_data = { .setup = altr_portb_setup, .ce_clear_mask = ALTR_A10_ECC_SERRPENA, .ue_clear_mask = ALTR_A10_ECC_DERRPENA, - .dbgfs_name = "altr_trigger", .ecc_enable_mask = ALTR_A10_COMMON_ECC_EN_CTL, .ecc_en_ofst = ALTR_A10_ECC_CTRL_OFST, .ce_set_mask = ALTR_A10_ECC_SERRPENA,
@@ -1538,7 +1528,6 @@ static const struct edac_device_prv_data a10_sdmmceccb_data = { .setup = altr_portb_setup, .ce_clear_mask = ALTR_A10_ECC_SERRPENB, .ue_clear_mask = ALTR_A10_ECC_DERRPENB, - .dbgfs_name = "altr_trigger", .ecc_enable_mask = ALTR_A10_COMMON_ECC_EN_CTL, .ecc_en_ofst = ALTR_A10_ECC_CTRL_OFST, .ce_set_mask = ALTR_A10_ECC_TSERRB,
drivers/edac/altera_edac.h +0 -1
@@ -303,7 +303,6 @@ struct edac_device_prv_data {int ce_clear_mask;int ue_clear_mask;int irq_status_mask; -char dbgfs_name[20 ];void * (*alloc_mem)(size_t size,void **other);void (*free_mem)(void *p,size_t size,void *other);int ecc_enable_mask;
Signature · 1 line
1.7.9.5
PATCH 2/2 EDAC, altera: Rename MC trigger to common name
In reply to [email protected]From: Thor Thayer <[email protected]>
Rename the Memory Controller debug trigger to the same common name as the EDAC devices.
--- drivers/edac/altera_edac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/edac/altera_edac.c +1 -1
@@ -203,7 +203,7 @@ static void altr_sdr_mc_create_debugfs_nodes(struct mem_ctl_info *mci)if (!mci->debugfs)return ; -edac_debugfs_create_file ("inject_ctrl" ,S_IWUSR , mci->debugfs, mci, +edac_debugfs_create_file ("altr_trigger" ,S_IWUSR , mci->debugfs, mci, &altr_sdr_mc_debug_inject_fops); }
Signature · 1 line
1.7.9.5
Quoted 5 lines · On Fri, Aug 19, 2016 at 11:04:24AM -0500, [email protected] wrote:
From: Thor Thayer <[email protected]>
Rename the EDAC debug trigger names to "
altr_trigger" for consistency.
Quoted 7 lines
Thor Thayer (2):
EDAC, altera: Rename device trigger to common name EDAC, altera: Rename MC trigger to common namedrivers/edac/altera_edac.c | 15 ++------------- drivers/edac/altera_edac.h | 1 - 2 files changed, 2 insertions(+), 14 deletions(-)
Applied, thanks.
Signature · 5 lines
Regards/Gruss,
Boris.
ECO tip #101: Trim your mails when you reply.
--