From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B75ECC19425 for ; Mon, 7 Dec 2020 01:11:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8F08722CA0 for ; Mon, 7 Dec 2020 01:11:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728654AbgLGBL4 (ORCPT ); Sun, 6 Dec 2020 20:11:56 -0500 Received: from new1-smtp.messagingengine.com ([66.111.4.221]:50797 "EHLO new1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726046AbgLGBLz (ORCPT ); Sun, 6 Dec 2020 20:11:55 -0500 X-Greylist: delayed 448 seconds by postgrey-1.27 at vger.kernel.org; Sun, 06 Dec 2020 20:11:54 EST Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailnew.nyi.internal (Postfix) with ESMTP id D8A5A5802DF; Sun, 6 Dec 2020 20:03:20 -0500 (EST) Received: from imap2 ([10.202.2.52]) by compute3.internal (MEProxy); Sun, 06 Dec 2020 20:03:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aj.id.au; h= mime-version:message-id:in-reply-to:references:date:from:to:cc :subject:content-type; s=fm1; bh=cB1Dw0K4Q6rFJj1QuyI/XjHiNBx6kkb +GjcfpOtl/kI=; b=jcf93RNPtDBmqCAVJFH4i6r3+KCL9HzRLtj/83g25fy9YHF EGMS7D5V1AKrCms0uRV+a9r3+Grl1m1P/HDPNzeNPIEWt+a9YcM+i4FowIQAhJi3 0fduLdwDspAOqhL/8m6B421xUKkLsQ+rqrWUWJYXveQjzzjEMtaoH96Hx1c2/BG7 +uAoCErJeTTAwEaB94PiBTgk1LJLKytKSTtAqa7+0KPg2kVqPJyBY0y3j3v4RYMu VW2Si0BovZECkWKXClveGRpHUxe8YnWQujcIM/TjefN8q17eIVhyfwae1Z8Yu9/U bjsmlP2x3vv9puZYFbJw0MdzmEyKTqtVk3txPFw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=cB1Dw0 K4Q6rFJj1QuyI/XjHiNBx6kkb+GjcfpOtl/kI=; b=g9bS9X1AI+fTriVltBFOfY Dg1vk0NJn58J+l12bWZmtYTTZSXg8ZQ6Khdd4ITKKrtYSOWmrdW2CcU8o+k8DcIL 16mn1w21JykdKOnLnvu/WYRjSbJ+nHMsNzcN0+b9BjcxRiHk9b8fOjRgj2mPzhJs /d99nvVTwJEBLhpXNV05IuquXLkRxiou3/8tXVUYXrR+xCDMN2DwH+ZSIQGZwdgX dEruhzYU2it4boL/ThdVic4DlaJii7aX5WVgYq+F06uZ5aksMj+02X97vegtwU74 rjA5alr4Vicmszl2p/6WtZDmTXDbZB9GPxjmMj3c1dfVNB6WJPh8wM1zh0QE/TAw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrudejfedgvdehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepofgfggfkjghffffhvffutgesthdtredtreertdenucfhrhhomhepfdetnhgu rhgvficulfgvfhhfvghrhidfuceorghnughrvgifsegrjhdrihgurdgruheqnecuggftrf grthhtvghrnhephefhfeekgfekudevheffheeihedujeefjeevjeefudfgfeeutdeuvdeh hfevueffnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomh eprghnughrvgifsegrjhdrihgurdgruh X-ME-Proxy: Received: by mailuser.nyi.internal (Postfix, from userid 501) id 733F4E00DF; Sun, 6 Dec 2020 20:03:16 -0500 (EST) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.3.0-622-g4a97c0b-fm-20201115.001-g4a97c0b3 Mime-Version: 1.0 Message-Id: <21488758-f839-4762-93d6-0e6c3397394f@www.fastmail.com> In-Reply-To: <20201202101218.18393-3-troy_lee@aspeedtech.com> References: <20201202101218.18393-1-troy_lee@aspeedtech.com> <20201202101218.18393-3-troy_lee@aspeedtech.com> Date: Mon, 07 Dec 2020 11:32:57 +1030 From: "Andrew Jeffery" To: "Troy Lee" , "Stefan M Schaeckeler" , "Rob Herring" , "Joel Stanley" , "Borislav Petkov" , "Mauro Carvalho Chehab" , "Tony Luck" , "James Morse" , "Robert Richter" , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" , "moderated list:ARM/ASPEED MACHINE SUPPORT" , "moderated list:ARM/ASPEED MACHINE SUPPORT" , "open list" , "open list:EDAC-CORE" Cc: leetroy@gmail.com, "Ryan Chen" Subject: Re: [PATCH v3 3/3] edac: Supporting AST2400 and AST2600 edac driver Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 2 Dec 2020, at 20:42, Troy Lee wrote: > Adding AST2400 and AST2600 edac driver support. > > Signed-off-by: Troy Lee > --- > Changes since v2: > - Remove cross dependencies export functions > - Update Kconfig depends on ARCH_ASPEED > - Patch create against latest Linux kernel mainline > > --- > drivers/edac/Kconfig | 6 +++--- > drivers/edac/aspeed_edac.c | 15 +++++---------- > 2 files changed, 8 insertions(+), 13 deletions(-) > > diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig > index 7a47680d6f07..c410331e8ee8 100644 > --- a/drivers/edac/Kconfig > +++ b/drivers/edac/Kconfig > @@ -515,10 +515,10 @@ config EDAC_QCOM > health, you should probably say 'Y' here. > > config EDAC_ASPEED > - tristate "Aspeed AST 2500 SoC" > - depends on MACH_ASPEED_G5 > + tristate "Aspeed AST BMC SoC" > + depends on ARCH_ASPEED > help > - Support for error detection and correction on the Aspeed AST 2500 SoC. > + Support for error detection and correction on the Aspeed AST BMC SoC. > > First, ECC must be configured in the bootloader. Then, this driver > will expose error counters via the EDAC kernel framework. > diff --git a/drivers/edac/aspeed_edac.c b/drivers/edac/aspeed_edac.c > index fde809efc520..c9d1d8a8fcba 100644 > --- a/drivers/edac/aspeed_edac.c > +++ b/drivers/edac/aspeed_edac.c > @@ -239,7 +239,7 @@ static int init_csrows(struct mem_ctl_info *mci) > int rc; > > /* retrieve info about physical memory from device tree */ > - np = of_find_node_by_path("/memory"); > + np = of_find_node_by_name(NULL, "memory"); > if (!np) { > dev_err(mci->pdev, "dt: missing /memory node\n"); > return -ENODEV; > @@ -282,7 +282,6 @@ static int aspeed_probe(struct platform_device *pdev) > struct edac_mc_layer layers[2]; > struct mem_ctl_info *mci; > void __iomem *regs; > - u32 reg04; > int rc; > > regs = devm_platform_ioremap_resource(pdev, 0); > @@ -294,13 +293,6 @@ static int aspeed_probe(struct platform_device *pdev) > if (IS_ERR(aspeed_regmap)) > return PTR_ERR(aspeed_regmap); > > - /* bail out if ECC mode is not configured */ > - regmap_read(aspeed_regmap, ASPEED_MCR_CONF, ®04); > - if (!(reg04 & ASPEED_MCR_CONF_ECC)) { > - dev_err(&pdev->dev, "ECC mode is not configured in u-boot\n"); > - return -EPERM; > - } > - It might pay to separate this out as I think it's unrelated to the supporting the AST2[45]00? Other than that I think the patch is on the right track. Thanks for the quick responses Troy! Andrew > edac_op_state = EDAC_OPSTATE_INT; > > /* allocate & init EDAC MC data structure */ > @@ -375,10 +367,13 @@ static int aspeed_remove(struct platform_device *pdev) > > > static const struct of_device_id aspeed_of_match[] = { > + { .compatible = "aspeed,ast2400-sdram-edac" }, > { .compatible = "aspeed,ast2500-sdram-edac" }, > + { .compatible = "aspeed,ast2600-sdram-edac" }, > {}, > }; > > +MODULE_DEVICE_TABLE(of, aspeed_of_match); > > static struct platform_driver aspeed_driver = { > .driver = { > @@ -392,5 +387,5 @@ module_platform_driver(aspeed_driver); > > MODULE_LICENSE("GPL"); > MODULE_AUTHOR("Stefan Schaeckeler "); > -MODULE_DESCRIPTION("Aspeed AST2500 EDAC driver"); > +MODULE_DESCRIPTION("Aspeed BMC SoC EDAC driver"); > MODULE_VERSION("1.0"); > -- > 2.17.1 > > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4211EC433FE for ; Mon, 7 Dec 2020 01:04:50 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E4FEC22CF6 for ; Mon, 7 Dec 2020 01:04:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E4FEC22CF6 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=aj.id.au Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Subject:To:From:Date:References:In-Reply-To: Message-Id:Mime-Version:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=DeI+7chX2zhF5GC8bV3+phTfYlpReFRUf/BQ+iDRHUk=; b=YB2CUaXazzXn8axPSrEGsaiBy /a9USF6DmFN40mVKDaeO1W8tqAA0PdEGBxvZrL5QaRrdIy9ps6UrccMAgImtApNr2dbD6ILD8C33Y Sh5DlUgP3oQH0oto3/jPkqd8br7fLUEE7mEysqDLVfCUx/U3oKFFR5mcuU0+s5kmovAVJLuV7W3kd pvvzOhYJKgaw9LpyRS1dblA/Rcya9x5d6LSWfykFKojfdckmL2E3LqmSQ0zAjCn5sHMqXfBVPcxwm A7+kPPLxVOlv54e0ozxtNwQr6AeqRr4FtWPO+o+uC/EqlO/9rb0sJZLIScg2nd/KXxeZqw2seOsYR 9BQlf1diQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1km4w3-0006nc-4T; Mon, 07 Dec 2020 01:03:27 +0000 Received: from new1-smtp.messagingengine.com ([66.111.4.221]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1km4vz-0006mf-Kl for linux-arm-kernel@lists.infradead.org; Mon, 07 Dec 2020 01:03:25 +0000 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailnew.nyi.internal (Postfix) with ESMTP id D8A5A5802DF; Sun, 6 Dec 2020 20:03:20 -0500 (EST) Received: from imap2 ([10.202.2.52]) by compute3.internal (MEProxy); Sun, 06 Dec 2020 20:03:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aj.id.au; h= mime-version:message-id:in-reply-to:references:date:from:to:cc :subject:content-type; s=fm1; bh=cB1Dw0K4Q6rFJj1QuyI/XjHiNBx6kkb +GjcfpOtl/kI=; b=jcf93RNPtDBmqCAVJFH4i6r3+KCL9HzRLtj/83g25fy9YHF EGMS7D5V1AKrCms0uRV+a9r3+Grl1m1P/HDPNzeNPIEWt+a9YcM+i4FowIQAhJi3 0fduLdwDspAOqhL/8m6B421xUKkLsQ+rqrWUWJYXveQjzzjEMtaoH96Hx1c2/BG7 +uAoCErJeTTAwEaB94PiBTgk1LJLKytKSTtAqa7+0KPg2kVqPJyBY0y3j3v4RYMu VW2Si0BovZECkWKXClveGRpHUxe8YnWQujcIM/TjefN8q17eIVhyfwae1Z8Yu9/U bjsmlP2x3vv9puZYFbJw0MdzmEyKTqtVk3txPFw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=cB1Dw0 K4Q6rFJj1QuyI/XjHiNBx6kkb+GjcfpOtl/kI=; b=g9bS9X1AI+fTriVltBFOfY Dg1vk0NJn58J+l12bWZmtYTTZSXg8ZQ6Khdd4ITKKrtYSOWmrdW2CcU8o+k8DcIL 16mn1w21JykdKOnLnvu/WYRjSbJ+nHMsNzcN0+b9BjcxRiHk9b8fOjRgj2mPzhJs /d99nvVTwJEBLhpXNV05IuquXLkRxiou3/8tXVUYXrR+xCDMN2DwH+ZSIQGZwdgX dEruhzYU2it4boL/ThdVic4DlaJii7aX5WVgYq+F06uZ5aksMj+02X97vegtwU74 rjA5alr4Vicmszl2p/6WtZDmTXDbZB9GPxjmMj3c1dfVNB6WJPh8wM1zh0QE/TAw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrudejfedgvdehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepofgfggfkjghffffhvffutgesthdtredtreertdenucfhrhhomhepfdetnhgu rhgvficulfgvfhhfvghrhidfuceorghnughrvgifsegrjhdrihgurdgruheqnecuggftrf grthhtvghrnhephefhfeekgfekudevheffheeihedujeefjeevjeefudfgfeeutdeuvdeh hfevueffnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomh eprghnughrvgifsegrjhdrihgurdgruh X-ME-Proxy: Received: by mailuser.nyi.internal (Postfix, from userid 501) id 733F4E00DF; Sun, 6 Dec 2020 20:03:16 -0500 (EST) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.3.0-622-g4a97c0b-fm-20201115.001-g4a97c0b3 Mime-Version: 1.0 Message-Id: <21488758-f839-4762-93d6-0e6c3397394f@www.fastmail.com> In-Reply-To: <20201202101218.18393-3-troy_lee@aspeedtech.com> References: <20201202101218.18393-1-troy_lee@aspeedtech.com> <20201202101218.18393-3-troy_lee@aspeedtech.com> Date: Mon, 07 Dec 2020 11:32:57 +1030 From: "Andrew Jeffery" To: "Troy Lee" , "Stefan M Schaeckeler" , "Rob Herring" , "Joel Stanley" , "Borislav Petkov" , "Mauro Carvalho Chehab" , "Tony Luck" , "James Morse" , "Robert Richter" , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" , "moderated list:ARM/ASPEED MACHINE SUPPORT" , "moderated list:ARM/ASPEED MACHINE SUPPORT" , "open list" , "open list:EDAC-CORE" Subject: Re: [PATCH v3 3/3] edac: Supporting AST2400 and AST2600 edac driver X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201206_200324_771819_93CC1101 X-CRM114-Status: GOOD ( 22.04 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: leetroy@gmail.com, Ryan Chen Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, 2 Dec 2020, at 20:42, Troy Lee wrote: > Adding AST2400 and AST2600 edac driver support. > > Signed-off-by: Troy Lee > --- > Changes since v2: > - Remove cross dependencies export functions > - Update Kconfig depends on ARCH_ASPEED > - Patch create against latest Linux kernel mainline > > --- > drivers/edac/Kconfig | 6 +++--- > drivers/edac/aspeed_edac.c | 15 +++++---------- > 2 files changed, 8 insertions(+), 13 deletions(-) > > diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig > index 7a47680d6f07..c410331e8ee8 100644 > --- a/drivers/edac/Kconfig > +++ b/drivers/edac/Kconfig > @@ -515,10 +515,10 @@ config EDAC_QCOM > health, you should probably say 'Y' here. > > config EDAC_ASPEED > - tristate "Aspeed AST 2500 SoC" > - depends on MACH_ASPEED_G5 > + tristate "Aspeed AST BMC SoC" > + depends on ARCH_ASPEED > help > - Support for error detection and correction on the Aspeed AST 2500 SoC. > + Support for error detection and correction on the Aspeed AST BMC SoC. > > First, ECC must be configured in the bootloader. Then, this driver > will expose error counters via the EDAC kernel framework. > diff --git a/drivers/edac/aspeed_edac.c b/drivers/edac/aspeed_edac.c > index fde809efc520..c9d1d8a8fcba 100644 > --- a/drivers/edac/aspeed_edac.c > +++ b/drivers/edac/aspeed_edac.c > @@ -239,7 +239,7 @@ static int init_csrows(struct mem_ctl_info *mci) > int rc; > > /* retrieve info about physical memory from device tree */ > - np = of_find_node_by_path("/memory"); > + np = of_find_node_by_name(NULL, "memory"); > if (!np) { > dev_err(mci->pdev, "dt: missing /memory node\n"); > return -ENODEV; > @@ -282,7 +282,6 @@ static int aspeed_probe(struct platform_device *pdev) > struct edac_mc_layer layers[2]; > struct mem_ctl_info *mci; > void __iomem *regs; > - u32 reg04; > int rc; > > regs = devm_platform_ioremap_resource(pdev, 0); > @@ -294,13 +293,6 @@ static int aspeed_probe(struct platform_device *pdev) > if (IS_ERR(aspeed_regmap)) > return PTR_ERR(aspeed_regmap); > > - /* bail out if ECC mode is not configured */ > - regmap_read(aspeed_regmap, ASPEED_MCR_CONF, ®04); > - if (!(reg04 & ASPEED_MCR_CONF_ECC)) { > - dev_err(&pdev->dev, "ECC mode is not configured in u-boot\n"); > - return -EPERM; > - } > - It might pay to separate this out as I think it's unrelated to the supporting the AST2[45]00? Other than that I think the patch is on the right track. Thanks for the quick responses Troy! Andrew > edac_op_state = EDAC_OPSTATE_INT; > > /* allocate & init EDAC MC data structure */ > @@ -375,10 +367,13 @@ static int aspeed_remove(struct platform_device *pdev) > > > static const struct of_device_id aspeed_of_match[] = { > + { .compatible = "aspeed,ast2400-sdram-edac" }, > { .compatible = "aspeed,ast2500-sdram-edac" }, > + { .compatible = "aspeed,ast2600-sdram-edac" }, > {}, > }; > > +MODULE_DEVICE_TABLE(of, aspeed_of_match); > > static struct platform_driver aspeed_driver = { > .driver = { > @@ -392,5 +387,5 @@ module_platform_driver(aspeed_driver); > > MODULE_LICENSE("GPL"); > MODULE_AUTHOR("Stefan Schaeckeler "); > -MODULE_DESCRIPTION("Aspeed AST2500 EDAC driver"); > +MODULE_DESCRIPTION("Aspeed BMC SoC EDAC driver"); > MODULE_VERSION("1.0"); > -- > 2.17.1 > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel