From patchwork Wed Oct 1 11:32:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Borislav Petkov X-Patchwork-Id: 5011271 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0D4CC9F375 for ; Wed, 1 Oct 2014 11:33:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3524E20270 for ; Wed, 1 Oct 2014 11:33:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3CDC92026D for ; Wed, 1 Oct 2014 11:33:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751732AbaJALc5 (ORCPT ); Wed, 1 Oct 2014 07:32:57 -0400 Received: from mail.skyhub.de ([78.46.96.112]:33178 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751674AbaJALcz (ORCPT ); Wed, 1 Oct 2014 07:32:55 -0400 X-Virus-Scanned: Nedap ESD1 at mail.skyhub.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alien8.de; s=alien8; t=1412163174; bh=gUWxaWm1QUqUYnUt41GjezvUoFrog+DZ+ORWba5FVZY=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:In-Reply-To; b=t0XuWlfOnmX5U9qIePr5iQZdPYtaq5XKBcJ56u dNt9wVAl4c4UqRpZYVMNBETDh8pNDoStLoysLr/apU0MTmfthzDMazouZ3uZifUXFA9 DU+CAEN2jgMXmz19axs+wvAJXwHmu4pXuVreKqm3F5mdceahjRYAMTjgKyyhIZ7bnA= Received: from mail.skyhub.de ([127.0.0.1]) by localhost (door.skyhub.de [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id f+NuTMd25uwE; Wed, 1 Oct 2014 13:32:54 +0200 (CEST) Received: from liondog.tnic (p5DDC6B20.dip0.t-ipconnect.de [93.220.107.32]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.skyhub.de (SuperMail on ZX Spectrum 128k) with ESMTPSA id D62BB24494B; Wed, 1 Oct 2014 13:32:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alien8.de; s=alien8; t=1412163174; bh=gUWxaWm1QUqUYnUt41GjezvUoFrog+DZ+ORWba5FVZY=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:In-Reply-To; b=t0XuWlfOnmX5U9qIePr5iQZdPYtaq5XKBcJ56u dNt9wVAl4c4UqRpZYVMNBETDh8pNDoStLoysLr/apU0MTmfthzDMazouZ3uZifUXFA9 DU+CAEN2jgMXmz19axs+wvAJXwHmu4pXuVreKqm3F5mdceahjRYAMTjgKyyhIZ7bnA= Received: by liondog.tnic (Postfix, from userid 1000) id 9C4E210054E; Wed, 1 Oct 2014 13:32:50 +0200 (CEST) Date: Wed, 1 Oct 2014 13:32:50 +0200 From: Borislav Petkov To: Aravind Gopalakrishnan Cc: bhelgaas@google.com, linux-pci@vger.kernel.org, tglx@linutronix.de, hpa@zytor.com, x86@kernel.org, bp@suse.de, dan.carpenter@oracle.com, dougthompson@xmission.com, m.chehab@samsung.com, linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 3/4] edac: Add DDR3 LRDIMM support, entries in edac_mem_types[] Message-ID: <20141001113250.GE18271@pd.tnic> References: <1411070218-10258-1-git-send-email-Aravind.Gopalakrishnan@amd.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1411070218-10258-1-git-send-email-Aravind.Gopalakrishnan@amd.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Thu, Sep 18, 2014 at 02:56:58PM -0500, Aravind Gopalakrishnan wrote: > F15hM60h adds support for DDR4 and DDR3 LRDIMMS. Adding them here. > > Signed-off-by: Aravind Gopalakrishnan > --- > drivers/edac/edac_mc.c | 3 +++ > include/linux/edac.h | 2 ++ > 2 files changed, 5 insertions(+) > > diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c > index 9f134823..71fd9fb 100644 > --- a/drivers/edac/edac_mc.c > +++ b/drivers/edac/edac_mc.c > @@ -146,6 +146,9 @@ const char *edac_mem_types[] = { > "Rambus XDR", > "Unbuffered DDR3 RAM", > "Registered DDR3 RAM", > + "Load-Reduce DDR3 RAM", Renamed it to "Load-Reduced DDR3 RAM" while applying. Also, applied the following cleanup ontop: --- From: Borislav Petkov Subject: [PATCH] EDAC: Sync memory types and names Make keeping the sync between the mem_types enum and the actual string names simpler by using designated initializers. Signed-off-by: Borislav Petkov --- drivers/edac/edac_mc.c | 43 ++++++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c index 129ff9c36a78..1747906f10ce 100644 --- a/drivers/edac/edac_mc.c +++ b/drivers/edac/edac_mc.c @@ -125,30 +125,27 @@ static void edac_mc_dump_mci(struct mem_ctl_info *mci) #endif /* CONFIG_EDAC_DEBUG */ -/* - * keep those in sync with the enum mem_type - */ const char * const edac_mem_types[] = { - "Empty csrow", - "Reserved csrow type", - "Unknown csrow type", - "Fast page mode RAM", - "Extended data out RAM", - "Burst Extended data out RAM", - "Single data rate SDRAM", - "Registered single data rate SDRAM", - "Double data rate SDRAM", - "Registered Double data rate SDRAM", - "Rambus DRAM", - "Unbuffered DDR2 RAM", - "Fully buffered DDR2", - "Registered DDR2 RAM", - "Rambus XDR", - "Unbuffered DDR3 RAM", - "Registered DDR3 RAM", - "Load-Reduced DDR3 RAM", - "Unbuffered DDR4 RAM", - "Registered DDR4 RAM", + [MEM_EMPTY] = "Empty csrow", + [MEM_RESERVED] = "Reserved csrow type", + [MEM_UNKNOWN] = "Unknown csrow type", + [MEM_FPM] = "Fast page mode RAM", + [MEM_EDO] = "Extended data out RAM", + [MEM_BEDO] = "Burst Extended data out RAM", + [MEM_SDR] = "Single data rate SDRAM", + [MEM_RDR] = "Registered single data rate SDRAM", + [MEM_DDR] = "Double data rate SDRAM", + [MEM_RDDR] = "Registered Double data rate SDRAM", + [MEM_RMBS] = "Rambus DRAM", + [MEM_DDR2] = "Unbuffered DDR2 RAM", + [MEM_FB_DDR2] = "Fully buffered DDR2", + [MEM_RDDR2] = "Registered DDR2 RAM", + [MEM_XDR] = "Rambus XDR", + [MEM_DDR3] = "Unbuffered DDR3 RAM", + [MEM_RDDR3] = "Registered DDR3 RAM", + [MEM_LRDDR3] = "Load-Reduced DDR3 RAM", + [MEM_DDR4] = "Unbuffered DDR4 RAM", + [MEM_RDDR4] = "Registered DDR4 RAM", }; EXPORT_SYMBOL_GPL(edac_mem_types);