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;
Subject: Re: [GIT PULL] x86/platform updates for v5.10
To:     Borislav Petkov <bp@suse.de>,
        Linus Torvalds <torvalds@linux-foundation.org>
Cc:     x86-ml <x86@kernel.org>, lkml <linux-kernel@vger.kernel.org>
References: <20201012101012.GD25311@zn.tnic>
 <CAHk-=wiwBYoAKQ6H=n0ppZfMe6nVDwDw6cruv7jxZZw4XEmUsg@mail.gmail.com>
 <c8cfb3d2-d3c4-6d8d-1dfd-aeb349e26303@hpe.com>
 <20201012212709.GM25311@zn.tnic>
 <f778b25e-68e7-98ec-9032-b35696948405@hpe.com>
 <CAHk-=wg6MBLPzRrRYGQ6EeoUGV+-MdMraFiUiiQyenVk=t6=Bw@mail.gmail.com>
 <20201012215642.GN25311@zn.tnic>
From:   Mike Travis <mike.travis@hpe.com>
Message-ID: <335ef705-d395-1260-b668-2edab8bf32ff@hpe.com>
Date:   Mon, 12 Oct 2020 15:00:05 -0700
User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101
 Thunderbird/68.8.1
MIME-Version: 1.0
In-Reply-To: <20201012215642.GN25311@zn.tnic>
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Precedence: bulk


On 10/12/2020 2:56 PM, Borislav Petkov wrote:
> On Mon, Oct 12, 2020 at 02:46:10PM -0700, Linus Torvalds wrote:
>> At least "git grep" only shows two assignments to it.
>>
>> Of course, that would miss any cases that play games with preprocessor
>> token pasting etc, so it's not entirely meaningful, but it's certainly
>> a hint..
> 
>  From a quick staring at gcc asm, it looks write only. And gcc didn't
> warn because it optimized that assignment away completely AFAICT.
> 
>> And yes, I expect that the fix is to just make it "unsigned long", but
>> if it truly isn't actually used, maybe removal is better.
> 
> Yeah, below is a proper patch which builds fine with gcc and clang-10.
> You guys have fun - I'm going to bed. :-)
> 
> ---
> From: Mike Travis <mike.travis@hpe.com>
> Date: Mon, 12 Oct 2020 23:46:34 +0200
> Subject: [PATCH] x86/platform/uv: Correct uvh_nmi_mmrx_mask's type
> 
> Clang rightfully warns:
> 
>    arch/x86/platform/uv/uv_nmi.c:250:23: warning: implicit conversion
>    from 'unsigned long' to 'int' changes value from 1152921504606846976
>    to 0 [-Wconstant-conversion]
>                    uvh_nmi_mmrx_mask = UVH_EVENT_OCCURRED0_EXTIO_INT0_MASK;
>                                    ~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> 
> Make the variable unsigned long.
> 
>   [ bp: Productize it. ]

Thanks, I will look at it (and test it on hardware and the UV5 simulator 
to make sure it's correct.)
> 
> Signed-off-by: Mike Travis <mike.travis@hpe.com>
> Signed-off-by: Borislav Petkov <bp@suse.de>
> ---
>   arch/x86/platform/uv/uv_nmi.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/x86/platform/uv/uv_nmi.c b/arch/x86/platform/uv/uv_nmi.c
> index 0f5cbcf0da63..8566730f154d 100644
> --- a/arch/x86/platform/uv/uv_nmi.c
> +++ b/arch/x86/platform/uv/uv_nmi.c
> @@ -59,7 +59,7 @@ DEFINE_PER_CPU(struct uv_cpu_nmi_s, uv_cpu_nmi);
>   static unsigned long uvh_nmi_mmrx;		/* UVH_EVENT_OCCURRED0/1 */
>   static unsigned long uvh_nmi_mmrx_clear;	/* UVH_EVENT_OCCURRED0/1_ALIAS */
>   static int uvh_nmi_mmrx_shift;			/* UVH_EVENT_OCCURRED0/1_EXTIO_INT0_SHFT */
> -static int uvh_nmi_mmrx_mask;			/* UVH_EVENT_OCCURRED0/1_EXTIO_INT0_MASK */
> +static unsigned long uvh_nmi_mmrx_mask;			/* UVH_EVENT_OCCURRED0/1_EXTIO_INT0_MASK */
>   static char *uvh_nmi_mmrx_type;			/* "EXTIO_INT0" */
>   
>   /* Non-zero indicates newer SMM NMI handler present */
>