Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Sun, 19 Sep 2021 21:47:51 -0700
From:   "Luck, Tony" <tony.luck@intel.com>
To:     Borislav Petkov <bp@alien8.de>
Cc:     Yazen Ghannam <Yazen.Ghannam@amd.com>, X86 ML <x86@kernel.org>,
        LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 3/4] x86/mce: Get rid of msr_ops
Message-ID: <YUgSd6Sl/bFaGydO@agluck-desk2.amr.corp.intel.com>
References: <20210917105355.2368-1-bp@alien8.de>
 <20210917105355.2368-4-bp@alien8.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20210917105355.2368-4-bp@alien8.de>
Precedence: bulk

On Fri, Sep 17, 2021 at 12:53:54PM +0200, Borislav Petkov wrote:
> +	switch (reg) {
> +	case MCA_CTL:
> +		return mce_flags.smca ? MSR_AMD64_SMCA_MCx_CTL(bank)
> +				      : MSR_IA32_MCx_CTL(bank);
>  
> -static inline u32 smca_ctl_reg(int bank)
> -{
> -	return MSR_AMD64_SMCA_MCx_CTL(bank);
> -}
> +	case MCA_STATUS:
> +		return mce_flags.smca ? MSR_AMD64_SMCA_MCx_STATUS(bank)
> +				      : MSR_IA32_MCx_STATUS(bank);
>  
> -static inline u32 smca_status_reg(int bank)
> -{
> -	return MSR_AMD64_SMCA_MCx_STATUS(bank);
> -}
> +	case MCA_ADDR:
> +		return mce_flags.smca ? MSR_AMD64_SMCA_MCx_ADDR(bank)
> +				      : MSR_IA32_MCx_ADDR(bank);
>  
> -static inline u32 smca_addr_reg(int bank)
> -{
> -	return MSR_AMD64_SMCA_MCx_ADDR(bank);
> -}
> +	case MCA_MISC:
> +		return mce_flags.smca ? MSR_AMD64_SMCA_MCx_MISC(bank)
> +				      : MSR_IA32_MCx_MISC(bank);
> +	default: break;
> +	}

I think this would be easier on the eyeballs with
a couple of helper functions:

	if (mce_flags.smca)
		return smca_msr_number(bank, reg);
	else
		return msr_number(bank, reg);

with the switch (reg) in each of those helper functions.

-Tony