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

Commit e17ced2c authored by Thor Thayer's avatar Thor Thayer Committed by Borislav Petkov
Browse files

EDAC, altera: Extract error inject operations to a struct fops 



In preparation for the Arria10 peripheral ECCs, extract the inject file
operations because the Arria10 IRQ trigger mechanism is different than
Cyclone5/Arria5 and Arria10 L2 cache.

Signed-off-by: default avatarThor Thayer <tthayer@opensource.altera.com>
Cc: devicetree@vger.kernel.org
Cc: dinguyen@opensource.altera.com
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux@arm.linux.org.uk
Cc: linux-edac <linux-edac@vger.kernel.org>
Link: http://lkml.kernel.org/r/1459450087-24792-2-git-send-email-tthayer@opensource.altera.com


Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
parent ff6fd147

drivers/edac/altera_edac.c

+4 −1
Original line number Diff line number Diff line
@@ -668,7 +668,7 @@ static void altr_create_edacdev_dbgfs(struct edac_device_ctl_info *edac_dci, 


	if (!edac_debugfs_create_file(priv->dbgfs_name, S_IWUSR,

				      drvdata->debugfs_dir, edac_dci,

				      &altr_edac_device_inject_fops))

				      priv->inject_fops))

		debugfs_remove_recursive(drvdata->debugfs_dir);

}
@@ -886,6 +886,7 @@ const struct edac_device_prv_data ocramecc_data = { 
	.ue_set_mask = (ALTR_OCR_ECC_EN | ALTR_OCR_ECC_INJD),

	.set_err_ofst = ALTR_OCR_ECC_REG_OFFSET,

	.trig_alloc_sz = ALTR_TRIG_OCRAM_BYTE_SIZE,

	.inject_fops = &altr_edac_device_inject_fops,

};



#endif	/* CONFIG_EDAC_ALTERA_OCRAM */
@@ -975,6 +976,7 @@ const struct edac_device_prv_data l2ecc_data = { 
	.ue_set_mask = (ALTR_L2_ECC_EN | ALTR_L2_ECC_INJD),

	.set_err_ofst = ALTR_L2_ECC_REG_OFFSET,

	.trig_alloc_sz = ALTR_TRIG_L2C_BYTE_SIZE,

	.inject_fops = &altr_edac_device_inject_fops,

};



const struct edac_device_prv_data a10_l2ecc_data = {
@@ -991,6 +993,7 @@ const struct edac_device_prv_data a10_l2ecc_data = { 
	.set_err_ofst = ALTR_A10_L2_ECC_INJ_OFST,

	.ecc_irq_handler = altr_edac_a10_l2_irq,

	.trig_alloc_sz = ALTR_TRIG_L2C_BYTE_SIZE,

	.inject_fops = &altr_edac_device_inject_fops,

};



#endif	/* CONFIG_EDAC_ALTERA_L2C */

drivers/edac/altera_edac.h

+1 −0
Original line number Diff line number Diff line
@@ -262,6 +262,7 @@ struct edac_device_prv_data { 
	irqreturn_t (*ecc_irq_handler)(struct altr_edac_device_dev *dci,

				       bool sb);

	int trig_alloc_sz;

	const struct file_operations *inject_fops;

};



struct altr_edac_device_dev {