Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp1211202pxv; Fri, 25 Jun 2021 07:50:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz9hqtM59e48NJZ5+b2/spFdDcDc6bWTqh7NrOU3A2IOKAqITQt2mPQyij0bsrh8vkTniXZ X-Received: by 2002:a92:a30d:: with SMTP id a13mr7944895ili.236.1624632621711; Fri, 25 Jun 2021 07:50:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624632621; cv=none; d=google.com; s=arc-20160816; b=N3FKnVmGrGP32aH6bR+jX3R2f5TAz6QewJTzxjGnBLGc9Naf4MkwHQwr1GtejVV/Qj jrgSjO4wtbZInuZPxCzhqrGU1Om0UH8HiPuLEtMHRszdNayHMVPDliHJXXe0RifitcxN Z+HrQWox6MyyCMLFNQVLmTqFz2lh8ZgqCdl0fM957zexzffhcNPLwRA4HKMgwjzoVV4C SjVCgUhqgH/qK7fVUSQ9D2++Tb1b2/3UQhQq47vIoGSevNcG8GmHXP7A83+OirUEA9h0 h3Mts96LvZ4kdbm2orcfhuoB/+ZaOriIVr+2cSSwnU4uWjHJwwtogKqp1fRy/KGZaHUu yO7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:cc:to:subject:from:message-id; bh=ks0E6X/uz8Vmri73c6x2WcAvDvIa3zweqty/ezSj9cw=; b=xxklNx7aGYYy1TdJMQuD72Y2pM0IrJXpg6YxrlMw7KCOhD+G5tRrDzaGvd2Pr22QPJ Nide9xJOMV44cL78vsFiYSS2UCU8fdAu4H/lAeIsApbVPOK52BXlh298NUglyE+flLbe S5B/CynARYPdkEt7yz/4L9UMYRahxIXzaChHp4/Lzm4XFzNqG4Hw1SA16k6Vg+8OPPEI Rn3sZItiyXDL0zQsuxmBJwbegJqq1FlqBDnt9VHU7FRYAzDxLtw4FXsS1f7aWwbD3Op9 dP/6lGq34oz75gROFO2P504O5iwCgct2RfQITRzVMTU0+wZGWs8iFR+s7LeMY/6zFNMf OKIw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y4si7031952jas.26.2021.06.25.07.50.10; Fri, 25 Jun 2021 07:50:21 -0700 (PDT) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231449AbhFYOvg (ORCPT + 99 others); Fri, 25 Jun 2021 10:51:36 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:39225 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230172AbhFYOvc (ORCPT ); Fri, 25 Jun 2021 10:51:32 -0400 Received: from localhost (mailhub3.si.c-s.fr [192.168.12.233]) by localhost (Postfix) with ESMTP id 4GBKdg18ZBzB8tk; Fri, 25 Jun 2021 16:49:11 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jpgq9w31e-LE; Fri, 25 Jun 2021 16:49:11 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 4GBKdg0HtwzB8tY; Fri, 25 Jun 2021 16:49:11 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 736948B810; Fri, 25 Jun 2021 16:49:10 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id Fvob1dSR849e; Fri, 25 Jun 2021 16:49:10 +0200 (CEST) Received: from po9473vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 3BE178B80D; Fri, 25 Jun 2021 16:49:10 +0200 (CEST) Received: by po9473vm.idsi0.si.c-s.fr (Postfix, from userid 0) id CF5F46635D; Fri, 25 Jun 2021 14:49:09 +0000 (UTC) Message-Id: From: Christophe Leroy Subject: [PATCH] powerpc/interrupt: Use names in check_return_regs_valid() To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , npiggin@gmail.com Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Fri, 25 Jun 2021 14:49:09 +0000 (UTC) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org trap->regs == 0x3000 is trap_is_scv() trap 0x500 is INTERRUPT_EXTERNAL Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/interrupt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/kernel/interrupt.c b/arch/powerpc/kernel/interrupt.c index 1b4a99ecb7e5..0052702ee5ac 100644 --- a/arch/powerpc/kernel/interrupt.c +++ b/arch/powerpc/kernel/interrupt.c @@ -222,12 +222,12 @@ static void check_return_regs_valid(struct pt_regs *regs) u8 *validp; char *h; - if (regs->trap == 0x3000) + if (trap_is_scv(regs)) return; trap = regs->trap; // EE in HV mode sets HSRRs like 0xea0 - if (cpu_has_feature(CPU_FTR_HVMODE) && trap == 0x500) + if (cpu_has_feature(CPU_FTR_HVMODE) && trap == INTERRUPT_EXTERNAL) trap = 0xea0; switch (trap) { -- 2.25.0