2017-04-05 17:57:52

by Thor Thayer

Subject: [PATCHv3] EDAC, altera: Fix peripheral warnings for Cyclone5

From: Thor Thayer <[email protected]>

The peripherals EDACs only exist on the Arria10 SoCFPGA. The Cyclone5
initialization has EDAC warnings when the peripherals aren't found
in the device tree. Fix by checking for Arria10 in the init functions.

Signed-off-by: Thor Thayer <[email protected]>
---
v2 Change valid_model() return value from int to bool
Change valid_model() name to is_a10_model() for clarity.
Simplify expression - remove check for non-zero
v3 Use a simpler of_machine_is_compatible() expression.
Rename is_a10_model() to socfpga_is_a10().
---
drivers/edac/altera_edac.c | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/drivers/edac/altera_edac.c b/drivers/edac/altera_edac.c
index c5a5b91..7717b094 100644
--- a/drivers/edac/altera_edac.c
+++ b/drivers/edac/altera_edac.c
@@ -1023,13 +1023,23 @@ static int __maybe_unused altr_init_memory_port(void __iomem *ioaddr, int port)
return ret;
}

+static int socfpga_is_a10(void)
+{
+ return of_machine_is_compatible("altr,socfpga-arria10");
+}
+
static int validate_parent_available(struct device_node *np);
static const struct of_device_id altr_edac_a10_device_of_match[];
static int __init __maybe_unused altr_init_a10_ecc_device_type(char *compat)
{
int irq;
- struct device_node *child, *np = of_find_compatible_node(NULL, NULL,
- "altr,socfpga-a10-ecc-manager");
+ struct device_node *child, *np;
+
+ if (!socfpga_is_a10())
+ return -ENODEV;
+
+ np = of_find_compatible_node(NULL, NULL,
+ "altr,socfpga-a10-ecc-manager");
if (!np) {
edac_printk(KERN_ERR, EDAC_DEVICE, "ECC Manager not found\n");
return -ENODEV;
@@ -1545,8 +1555,12 @@ static irqreturn_t altr_edac_a10_ecc_irq_portb(int irq, void *dev_id)
static int __init socfpga_init_sdmmc_ecc(void)
{
int rc = -ENODEV;
- struct device_node *child = of_find_compatible_node(NULL, NULL,
- "altr,socfpga-sdmmc-ecc");
+ struct device_node *child;
+
+ if (!socfpga_is_a10())
+ return -ENODEV;
+
+ child = of_find_compatible_node(NULL, NULL, "altr,socfpga-sdmmc-ecc");
if (!child) {
edac_printk(KERN_WARNING, EDAC_DEVICE, "SDMMC node not found\n");
return -ENODEV;
--
1.9.1

2017-04-06 10:05:10

by Borislav Petkov

Subject: Re: [PATCHv3] EDAC, altera: Fix peripheral warnings for Cyclone5

On Wed, Apr 05, 2017 at 01:01:02PM -0500, [email protected] wrote:
> From: Thor Thayer <[email protected]>
>
> The peripherals EDACs only exist on the Arria10 SoCFPGA. The Cyclone5
> initialization has EDAC warnings when the peripherals aren't found
> in the device tree. Fix by checking for Arria10 in the init functions.
>
> Signed-off-by: Thor Thayer <[email protected]>
> ---
> v2 Change valid_model() return value from int to bool
> Change valid_model() name to is_a10_model() for clarity.
> Simplify expression - remove check for non-zero
> v3 Use a simpler of_machine_is_compatible() expression.
> Rename is_a10_model() to socfpga_is_a10().
> ---
> drivers/edac/altera_edac.c | 22 ++++++++++++++++++----
> 1 file changed, 18 insertions(+), 4 deletions(-)

Applied, thanks.

--
Regards/Gruss,
Boris.

Good mailing practices for 400: avoid top-posting and trim the reply.