Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp2198736yba; Fri, 17 May 2019 12:17:47 -0700 (PDT) X-Google-Smtp-Source: APXvYqyjCDZ/FQ/riLU4aTtIU4p+BcM4UAUrlt3mc77b6cCCNfCdScNxZKjr6Qftr5uvh/zcxWyj X-Received: by 2002:a63:e24c:: with SMTP id y12mr35038064pgj.276.1558120666985; Fri, 17 May 2019 12:17:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558120666; cv=none; d=google.com; s=arc-20160816; b=CPlw0ZmIaHMqJ9yd7qN1uM80MEmpZstH40yBg/Ng15RN/kYT4HLkMwViZx4A3wYQb1 YapV3nI49vxy1y1Z8NsUoustOYvH/sWJoRLxAzUwCUOrZiarpCnsFl1XsB3MgD3D1MWw zjRolHupw21ctmWZh3jgVm6HdP1Pc0BOhNttJQEgWPqmetdpf1yxAugE5XKg2GL6nvfQ VdKStEFtJHRdHQNSrbbKe3/1rLBi89nKMR8VGydxOPzqNCa8d7YE4QYI6YYhldUgCIbw wIuMA0ERy/7+wncaRzPzuVxUdbK86tBmlJaeGc+eSn1oBfbX+d3hczt2Nx/4DcjFq4W7 LWZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date; bh=+7Wrm+8p1afuKX9K3c+WreDLdlPa6+5A+Y7jcAcufMo=; b=mZHr6a5lA3CZ/RYCDaWZIopZtpdSMsAB7H9IWvwXtWf6TlgZsqdl3D6UIUZCg1blpm Z2D5rKA6TqHo1NeATYrVFnW8IEWm2mf+SYnx7XTX/ERejlDZcHQDbYRx8VjAc/00D9xU oxJzYzYOo9dniDPrznWBG+rghzww0MA+Q2NsoPQfNvVXZsVVvwtJnckFt7UrZIDj7sGf vlH9PAFZx6RHqlrCVvcfqRKLSZgVWJFW7f2LRKgmThX821oiWJP9V6IJiueRYRgCf6zI sU5gOCP0SiGQ1G6fzDr20wJnzbG8gLk4mUwZ5Qu74YdOEdl+GK3ZHjgocHCMw0xJZ0tO FrIA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b12si8909899pgl.77.2019.05.17.12.17.32; Fri, 17 May 2019 12:17:46 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729106AbfEQSGK (ORCPT + 99 others); Fri, 17 May 2019 14:06:10 -0400 Received: from mga05.intel.com ([192.55.52.43]:46547 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727063AbfEQSGK (ORCPT ); Fri, 17 May 2019 14:06:10 -0400 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 May 2019 11:06:09 -0700 X-ExtLoop1: 1 Received: from agluck-desk.sc.intel.com (HELO agluck-desk) ([10.3.52.160]) by orsmga001.jf.intel.com with ESMTP; 17 May 2019 11:06:08 -0700 Date: Fri, 17 May 2019 11:06:07 -0700 From: "Luck, Tony" To: Borislav Petkov Cc: "Ghannam, Yazen" , "linux-edac@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "x86@kernel.org" Subject: Re: [PATCH v3 5/6] x86/MCE: Save MCA control bits that get set in hardware Message-ID: <20190517180607.GA21710@agluck-desk> References: <20190516172117.GC21857@zn.tnic> <20190516203456.GD21857@zn.tnic> <20190516205943.GA3299@agluck-desk> <20190517101006.GA32065@zn.tnic> <20190517163729.GE13482@zn.tnic> <20190517172648.GA18164@agluck-desk> <20190517174817.GG13482@zn.tnic> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190517174817.GG13482@zn.tnic> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, May 17, 2019 at 07:48:17PM +0200, Borislav Petkov wrote: > @@ -1562,15 +1567,21 @@ static void __mcheck_cpu_init_generic(void) > static void __mcheck_cpu_init_clear_banks(void) > { > struct mce_bank *mce_banks = this_cpu_read(mce_banks_array); > + u64 msrval; > int i; > > for (i = 0; i < this_cpu_read(mce_num_banks); i++) { > struct mce_bank *b = &mce_banks[i]; > > - if (!b->init) > - continue; > - wrmsrl(msr_ops.ctl(i), b->ctl); > - wrmsrl(msr_ops.status(i), 0); > + if (b->init) { > + /* Check if any bits are implemented in h/w */ > + wrmsrl(msr_ops.ctl(i), b->ctl); > + rdmsrl(msr_ops.ctl(i), msrval); > + > + b->init = !!msrval; > + > + wrmsrl(msr_ops.status(i), 0); > + } > } > } Am I misreading the diff here? It doesn't look like you needed to drop the if (!b->init) continue; and thus end up with that extra level on indent for the rest of the function. -Tony