From patchwork Fri Feb 17 06:39:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haozhong Zhang X-Patchwork-Id: 9578867 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 CC0FA60586 for ; Fri, 17 Feb 2017 06:43:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BD2612869B for ; Fri, 17 Feb 2017 06:43:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B20CC286A4; Fri, 17 Feb 2017 06:43:09 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 618E2286A1 for ; Fri, 17 Feb 2017 06:43:09 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cecDo-0002Pg-Si; Fri, 17 Feb 2017 06:40:48 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cecDn-0002O1-No for xen-devel@lists.xen.org; Fri, 17 Feb 2017 06:40:47 +0000 Received: from [193.109.254.147] by server-6.bemta-6.messagelabs.com id F8/1E-15112-FEA96A85; Fri, 17 Feb 2017 06:40:47 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrPLMWRWlGSWpSXmKPExsVywNykWPfdrGU RBjuapC2WfFzM4sDocXT3b6YAxijWzLyk/IoE1oz5j+awFPzir/hy/y1zA2MTbxcjF4eQwDRG iVe/5jN2MXJySAjwShxZNoMVwvaTuLDrGCNEUS+jxPauZ2wgCTYBfYkVjw+CFYkISEtc+3wZr IhZ4CyjxJK7DUwgCWEBb4ln5y6CNbAIqErM7V8B1sArYCuxZfd0dogN8hIXrp5iAbE5Bewk/j z8ABYXAqp5/+ke8wRG3gWMDKsY1YtTi8pSi3RN9JKKMtMzSnITM3N0DQ3M9HJTi4sT01NzEpO K9ZLzczcxAgOCAQh2MHZf9j/EKMnBpCTKu2jasgghvqT8lMqMxOKM+KLSnNTiQ4wyHBxKErzc wAATEixKTU+tSMvMAYYmTFqCg0dJhJcDJM1bXJCYW5yZDpE6xagoJc57YyZQQgAkkVGaB9cGi 4dLjLJSwryMQIcI8RSkFuVmlqDKv2IU52BUEua9ADKFJzOvBG76K6DFTECLOyOWgiwuSURIST UwTtI+/D6oT/SiSs0CyZf2bb982Y+8mmlj8Oo+V1jcB4umeLkPopf0Ht396rW/cNvx3fkzbb1 YH1e6/bqWlHAnR3lN952caR5Gm5Z73wyxX1lVWfnjj5bcy4C0fSoiL9PnXn7x7FjdyZQD9pPz P/srPAqdYrhC+Pe9O3MjGnPvS9l4ny3L/MZtpMRSnJFoqMVcVJwIALhCksGCAgAA X-Env-Sender: haozhong.zhang@intel.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1487313633!34675007!6 X-Originating-IP: [192.55.52.115] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32965 invoked from network); 17 Feb 2017 06:40:46 -0000 Received: from mga14.intel.com (HELO mga14.intel.com) (192.55.52.115) by server-15.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 17 Feb 2017 06:40:46 -0000 Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Feb 2017 22:40:45 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,171,1484035200"; d="scan'208";a="65781512" Received: from hz-desktop.sh.intel.com (HELO localhost) ([10.239.159.133]) by orsmga005.jf.intel.com with ESMTP; 16 Feb 2017 22:40:44 -0800 From: Haozhong Zhang To: xen-devel@lists.xen.org Date: Fri, 17 Feb 2017 14:39:23 +0800 Message-Id: <20170217063936.13208-7-haozhong.zhang@intel.com> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20170217063936.13208-1-haozhong.zhang@intel.com> References: <20170217063936.13208-1-haozhong.zhang@intel.com> Cc: Haozhong Zhang , Christoph Egger , Andrew Cooper , Jan Beulich , Liu Jinsong Subject: [Xen-devel] [PATCH 06/19] x86/mce: merge intel_default_mce_dhandler/uhandler() X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Implementations of these two functions are effectively the same, so unify them by a common intel_default_mce_handler(). Signed-off-by: Haozhong Zhang --- Cc: Christoph Egger Cc: Liu Jinsong Cc: Jan Beulich Cc: Andrew Cooper --- xen/arch/x86/cpu/mcheck/mce_intel.c | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce_intel.c b/xen/arch/x86/cpu/mcheck/mce_intel.c index 498e8e4..b5ee8b8 100644 --- a/xen/arch/x86/cpu/mcheck/mce_intel.c +++ b/xen/arch/x86/cpu/mcheck/mce_intel.c @@ -342,7 +342,7 @@ static int intel_default_check(uint64_t status) return 1; } -static void intel_default_mce_dhandler( +static void intel_default_mce_handler( struct mca_binfo *binfo, enum mce_result *result, const struct cpu_user_regs * regs) @@ -361,32 +361,11 @@ static void intel_default_mce_dhandler( static const struct mca_error_handler intel_mce_dhandlers[] = { {intel_srao_check, intel_srao_dhandler}, {intel_srar_check, intel_srar_dhandler}, - {intel_default_check, intel_default_mce_dhandler} + {intel_default_check, intel_default_mce_handler} }; -static void intel_default_mce_uhandler( - struct mca_binfo *binfo, - enum mce_result *result, - const struct cpu_user_regs *regs) -{ - uint64_t status = binfo->mib->mc_status; - enum intel_mce_type type; - - type = intel_check_mce_type(status); - - switch (type) - { - case intel_mce_fatal: - *result = MCER_RESET; - break; - default: - *result = MCER_CONTINUE; - break; - } -} - static const struct mca_error_handler intel_mce_uhandlers[] = { - {intel_default_check, intel_default_mce_uhandler} + {intel_default_check, intel_default_mce_handler} }; /* According to MCA OS writer guide, CMCI handler need to clear bank when