[PATCH 1/2] powerpc/pmu/fsl: fix is_nmi test for irq mask change

[Madhavan Srinivasan]

On Thursday 10 May 2018 06:34 AM, Nicholas Piggin wrote:
> When soft enabled was changed to irq disabled mask, this test missed
> being converted (although the equivalent book3s test was converted).
>
> The PMU drivers consider it an NMI when they take a PMI while general
> interrupts are disabled. This change restores that behaviour.
Looks fine to me.
Reviewed-by: Madhavan Srinivasan <maddy at linux.vnet.ibm.com>

> Fixes: 01417c6cc7 ("powerpc/64: Change soft_enabled from flag to bitmask")
> Signed-off-by: Nicholas Piggin <npiggin at gmail.com>
> ---
>   arch/powerpc/perf/core-fsl-emb.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/powerpc/perf/core-fsl-emb.c b/arch/powerpc/perf/core-fsl-emb.c
> index 85f1d18e5fd3..ba485844d506 100644
> --- a/arch/powerpc/perf/core-fsl-emb.c
> +++ b/arch/powerpc/perf/core-fsl-emb.c
> @@ -42,7 +42,7 @@ static DEFINE_MUTEX(pmc_reserve_mutex);
>   static inline int perf_intr_is_nmi(struct pt_regs *regs)
>   {
>   #ifdef __powerpc64__
> -	return !regs->softe;
> +	return (regs->softe & IRQS_DISABLED);
>   #else
>   	return 0;
>   #endif