Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp1726026pxu; Tue, 24 Nov 2020 07:30:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJxE/Bbkn6fbKsWWQqIDeKO6tdo3kt2bXxis5uRZbnFF/n4UCZU402FrCL9fj3U8TKjc+nWv X-Received: by 2002:a50:eb84:: with SMTP id y4mr4574218edr.319.1606231820104; Tue, 24 Nov 2020 07:30:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606231820; cv=none; d=google.com; s=arc-20160816; b=ohmS1AjgoZwreosz1utEmT+pe3HY4eta8KxPLZH7sJH52XyRjF8LJDZPC+QigsFdV+ R9zmQ/1ByBqhZF6ngMJyGzSFcoqiV/btmglpF+fZ0TPyOoBJltqbYc95PL8oLG2gvn2e OCMdDJ7xaTxkFdM8R8grOFJvBsxuH9RH6NIkdSiQFAsCbFh2Ybww4HEyVAM2+KxavTqB y/j74kBZQftxptQwMVZCJhPLGSdP3hZziAOyx/exmF8coBXoTa5lUB1TKfKMh/XjqsyP ZQLgG7Ch9rl8uaNqVRAxx+HZ9UqhmBQwmxrocb77C3tZ6NpJVqnWT2EKhS8Fpmz3npBP 8zKQ== 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:references:in-reply-to :message-id; bh=r7S/Ovc+rPvxDXOoISrzYh305Heqh3SUQSXI9VfWO4M=; b=CffFpOoMrxAby9BGzhxIWc/fz64ictHN6GvrTwYLqQb6uUsmHM6hwgWljYQ1DWKTyR qcFhHr64Y0EuMeSP+2ow10ZVmOlWxiclkM77darw2F+mGwOfPByeAYyqUEbzu/FHj8co 9g6iIiTDkW0OeyDil+RGDyHDMOHgmvUR3pDUh8nUQGMF5vmWdO7s2UWkRIqesRbn6dKc wbUlSSrId597jrk+6o4pKrMOqUapNsX1IHl6v1JnU5/uuJK2h2XpXH+7rKjePXNTMFRI iNyVUsHYyfl/zIefpVtwIqYvnRPTVfGb6PajxiOopFhKLPFHNyeaBa/YGQuW85xw7bEV 5zEg== 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 m11si8811465edp.223.2020.11.24.07.29.56; Tue, 24 Nov 2020 07:30:20 -0800 (PST) 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 S2389684AbgKXPZG (ORCPT + 99 others); Tue, 24 Nov 2020 10:25:06 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:27052 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389434AbgKXPZC (ORCPT ); Tue, 24 Nov 2020 10:25:02 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 4CgSWH4YJWz9v0d5; Tue, 24 Nov 2020 16:24:59 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id nPEsL3BkWtmw; Tue, 24 Nov 2020 16:24:59 +0100 (CET) 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 4CgSWH2jy7z9v0dP; Tue, 24 Nov 2020 16:24:59 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 567BB8B7B5; Tue, 24 Nov 2020 16:25:00 +0100 (CET) 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 rLBehuRkZu7T; Tue, 24 Nov 2020 16:25:00 +0100 (CET) Received: from po17688vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 9487A8B7B3; Tue, 24 Nov 2020 16:24:59 +0100 (CET) Received: by po17688vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 6FC72668E2; Tue, 24 Nov 2020 15:24:59 +0000 (UTC) Message-Id: In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v1 6/6] powerpc/ppc-opcode: Add PPC_RAW_MFSPR() To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Tue, 24 Nov 2020 15:24:59 +0000 (UTC) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add PPC_RAW_MFSPR() to replace open coding done in 8xx-pmu.c Signed-off-by: Christophe Leroy --- arch/powerpc/include/asm/ppc-opcode.h | 3 ++- arch/powerpc/perf/8xx-pmu.c | 5 +---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/powerpc/include/asm/ppc-opcode.h b/arch/powerpc/include/asm/ppc-opcode.h index a6e3700c4566..da6f300e9788 100644 --- a/arch/powerpc/include/asm/ppc-opcode.h +++ b/arch/powerpc/include/asm/ppc-opcode.h @@ -230,7 +230,6 @@ #define PPC_INST_POPCNTB_MASK 0xfc0007fe #define PPC_INST_RFEBB 0x4c000124 #define PPC_INST_RFID 0x4c000024 -#define PPC_INST_MFSPR 0x7c0002a6 #define PPC_INST_MFSPR_DSCR 0x7c1102a6 #define PPC_INST_MFSPR_DSCR_MASK 0xfc1ffffe #define PPC_INST_MTSPR_DSCR 0x7c1103a6 @@ -507,6 +506,8 @@ #define PPC_RAW_NEG(d, a) (0x7c0000d0 | ___PPC_RT(d) | ___PPC_RA(a)) +#define PPC_RAW_MFSPR(d, spr) (0x7c0002a6 | ___PPC_RT(d) | __PPC_SPR(spr)) + /* Deal with instructions that older assemblers aren't aware of */ #define PPC_BCCTR_FLUSH stringify_in_c(.long PPC_INST_BCCTR_FLUSH) #define PPC_CP_ABORT stringify_in_c(.long PPC_RAW_CP_ABORT) diff --git a/arch/powerpc/perf/8xx-pmu.c b/arch/powerpc/perf/8xx-pmu.c index 93004ee586a1..f970d1510d3d 100644 --- a/arch/powerpc/perf/8xx-pmu.c +++ b/arch/powerpc/perf/8xx-pmu.c @@ -153,10 +153,7 @@ static void mpc8xx_pmu_read(struct perf_event *event) static void mpc8xx_pmu_del(struct perf_event *event, int flags) { - struct ppc_inst insn; - - /* mfspr r10, SPRN_SPRG_SCRATCH2 */ - insn = ppc_inst(PPC_INST_MFSPR | __PPC_RS(R10) | __PPC_SPR(SPRN_SPRG_SCRATCH2)); + struct ppc_inst insn = ppc_inst(PPC_RAW_MFSPR(10, SPRN_SPRG_SCRATCH2)); mpc8xx_pmu_read(event); -- 2.25.0