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

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

EDAC, altera: Add register offset for ECC Enable 



In preparation for the Arria10 peripheral ECCs, add a register offset
from the ECC base to index to the ECC enable register.

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-3-git-send-email-tthayer@opensource.altera.com


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

drivers/edac/altera_edac.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -866,7 +866,7 @@ static int altr_ocram_check_deps(struct altr_edac_device_dev *device) 
	void __iomem  *base = device->base;

	void __iomem  *base = device->base;

	const struct edac_device_prv_data *prv = device->data;

	const struct edac_device_prv_data *prv = device->data;





	if (readl(base) & prv->ecc_enable_mask)

	if (readl(base + prv->ecc_en_ofst) & prv->ecc_enable_mask)

		return 0;

		return 0;





	edac_printk(KERN_ERR, EDAC_DEVICE,

	edac_printk(KERN_ERR, EDAC_DEVICE,
@@ -882,6 +882,7 @@ const struct edac_device_prv_data ocramecc_data = { 
	.alloc_mem = ocram_alloc_mem,

	.alloc_mem = ocram_alloc_mem,

	.free_mem = ocram_free_mem,

	.free_mem = ocram_free_mem,

	.ecc_enable_mask = ALTR_OCR_ECC_EN,

	.ecc_enable_mask = ALTR_OCR_ECC_EN,

	.ecc_en_ofst = ALTR_OCR_ECC_REG_OFFSET,

	.ce_set_mask = (ALTR_OCR_ECC_EN | ALTR_OCR_ECC_INJS),

	.ce_set_mask = (ALTR_OCR_ECC_EN | ALTR_OCR_ECC_INJS),

	.ue_set_mask = (ALTR_OCR_ECC_EN | ALTR_OCR_ECC_INJD),

	.ue_set_mask = (ALTR_OCR_ECC_EN | ALTR_OCR_ECC_INJD),

	.set_err_ofst = ALTR_OCR_ECC_REG_OFFSET,

	.set_err_ofst = ALTR_OCR_ECC_REG_OFFSET,

drivers/edac/altera_edac.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -256,6 +256,7 @@ struct edac_device_prv_data { 
	void * (*alloc_mem)(size_t size, void **other);

	void * (*alloc_mem)(size_t size, void **other);

	void (*free_mem)(void *p, size_t size, void *other);

	void (*free_mem)(void *p, size_t size, void *other);

	int ecc_enable_mask;

	int ecc_enable_mask;

	int ecc_en_ofst;

	int ce_set_mask;

	int ce_set_mask;

	int ue_set_mask;

	int ue_set_mask;

	int set_err_ofst;

	int set_err_ofst;