From patchwork Thu Oct 13 15:30:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Piotr Luc X-Patchwork-Id: 9375159 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B5D6760839 for ; Thu, 13 Oct 2016 15:31:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A6F4C2A12F for ; Thu, 13 Oct 2016 15:31:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9B6AE2A134; Thu, 13 Oct 2016 15:31:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8C2902A12F for ; Thu, 13 Oct 2016 15:31:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756118AbcJMPba (ORCPT ); Thu, 13 Oct 2016 11:31:30 -0400 Received: from mga06.intel.com ([134.134.136.31]:26433 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754221AbcJMPbW (ORCPT ); Thu, 13 Oct 2016 11:31:22 -0400 Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga104.jf.intel.com with ESMTP; 13 Oct 2016 08:31:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,340,1473145200"; d="scan'208";a="19233635" Received: from gklab-125-115.igk.intel.com ([10.91.125.115]) by fmsmga006.fm.intel.com with ESMTP; 13 Oct 2016 08:31:18 -0700 From: Piotr Luc To: Mauro Carvalho Chehab , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, "Rafael J. Wysocki" , Viresh Kumar Cc: Doug Thompson , Borislav Petkov , linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org, Len Brown , linux-pm@vger.kernel.org, Srinivas Pandruvada , "Luck, Tony" , "Shevchenko, Andriy" Subject: [RESEND PATCH 01/11] EDAC, sb_edac: Use Intel family processor macros Date: Thu, 13 Oct 2016 17:30:55 +0200 Message-Id: <20161013153105.2517-2-piotr.luc@intel.com> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20161013153105.2517-1-piotr.luc@intel.com> References: <20161013153105.2517-1-piotr.luc@intel.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Use macros of Intel processor families instead of raw numbers. Signed-off-by: Piotr Luc Reviewed-by: Dave Hansen Cc: Mauro Carvalho Chehab Cc: Doug Thompson Cc: Borislav Petkov Cc: linux-edac@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: "Luck, Tony" Cc: "Shevchenko, Andriy" --- drivers/edac/sb_edac.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c index ce0067b..90564bc 100644 --- a/drivers/edac/sb_edac.c +++ b/drivers/edac/sb_edac.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -3366,12 +3367,12 @@ fail0: { X86_VENDOR_INTEL, 6, model, 0, (unsigned long)&table } static const struct x86_cpu_id sbridge_cpuids[] = { - ICPU(0x2d, pci_dev_descr_sbridge_table), /* SANDY_BRIDGE */ - ICPU(0x3e, pci_dev_descr_ibridge_table), /* IVY_BRIDGE */ - ICPU(0x3f, pci_dev_descr_haswell_table), /* HASWELL */ - ICPU(0x4f, pci_dev_descr_broadwell_table), /* BROADWELL */ - ICPU(0x56, pci_dev_descr_broadwell_table), /* BROADWELL-DE */ - ICPU(0x57, pci_dev_descr_knl_table), /* KNIGHTS_LANDING */ + ICPU(INTEL_FAM6_SANDYBRIDGE_X, pci_dev_descr_sbridge_table), + ICPU(INTEL_FAM6_IVYBRIDGE_X, pci_dev_descr_ibridge_table), + ICPU(INTEL_FAM6_HASWELL_X, pci_dev_descr_haswell_table), + ICPU(INTEL_FAM6_BROADWELL_X, pci_dev_descr_broadwell_table), + ICPU(INTEL_FAM6_BROADWELL_XEON_D, pci_dev_descr_broadwell_table), + ICPU(INTEL_FAM6_XEON_PHI_KNL, pci_dev_descr_knl_table), { } }; MODULE_DEVICE_TABLE(x86cpu, sbridge_cpuids);