Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751551AbdDCS6G (ORCPT ); Mon, 3 Apr 2017 14:58:06 -0400 Received: from mga04.intel.com ([192.55.52.120]:28488 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750855AbdDCS6E (ORCPT ); Mon, 3 Apr 2017 14:58:04 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,271,1486454400"; d="scan'208";a="841348667" From: thor.thayer@linux.intel.com To: bp@alien8.de, mchehab@kernel.org Cc: linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org, thor.thayer@linux.intel.com.com, Thor Thayer Subject: [PATCH] EDAC, altera: Fix peripheral warnings for Cyclone5 Date: Mon, 3 Apr 2017 14:01:06 -0500 Message-Id: <1491246066-22334-1-git-send-email-thor.thayer@linux.intel.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2117 Lines: 65 From: Thor Thayer 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 --- drivers/edac/altera_edac.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/drivers/edac/altera_edac.c b/drivers/edac/altera_edac.c index 6421cc3..98e83f5 100644 --- a/drivers/edac/altera_edac.c +++ b/drivers/edac/altera_edac.c @@ -1024,13 +1024,30 @@ static int __maybe_unused altr_init_memory_port(void __iomem *ioaddr, int port) return ret; } +static int invalid_model(void) +{ + struct device_node *np = of_find_node_by_path("/"); + const char *model = of_get_property(np, "model", NULL); + + of_node_put(np); + if (!model || strncmp(model, "Altera SOCFPGA Arria 10", 23) != 0) + return -ENODEV; + + return 0; +} + 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 (invalid_model()) + 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; @@ -1546,8 +1563,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 (invalid_model()) + 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