Received: by 2002:a19:651b:0:0:0:0:0 with SMTP id z27csp3746100lfb; Mon, 9 May 2022 03:13:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwkqgia7uQ91WXea8cra4LO8Prw+ckURtKYMFHNMHozK3f3LplCt05XUEjKX12revbVmO65 X-Received: by 2002:a05:6a00:10cc:b0:506:e0:d6c3 with SMTP id d12-20020a056a0010cc00b0050600e0d6c3mr15244638pfu.33.1652091180692; Mon, 09 May 2022 03:13:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652091180; cv=none; d=google.com; s=arc-20160816; b=Hdkci3bd6D7hPK+it7CZIIagFgd8lNjQ9KtFBZq2WWW+yTnJJ11w858bMTvAhoFUid 0W1z+8mEuQWBO5duPOY+HkbMN6PvDkbQRZyjKWwqDAlFvr+00G42RJWj9P4OtrIrA37d k2G91tG4yzKz6bORO2Xq/cCr5FIUk1Q9OI/TuXLqIffeseq9pFXO/+rwUgXcl+nMAh1l kkAZyM2Q0Gvy1eO4N+E//NojJFUNoVf5iA0UlFcrrU6ZY2wMBl6h62qoIUdG1EkO3vrN JRNpra2ZUwpd9iaMFzfRzutMsf3rk/eP2NnBdClg8eIvvj4g+KnXKZGy3858vKeF4URt Y7BQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=3iBFNH7CTE5I4djtYFCLQpbev5/RoJj/PGYUc9ToTzY=; b=mmRqHk4U7lP3rjNseeUBIS+x6JnTFA647qOv1iIZzM6XHb63KHcQzuqSTBVqSx/s8W 0XXZ2BD0Q2M4i5OetG9a6wsRd/B1ZBSKnDmF327p+RAfb43zLaGxqOeyrWYbtGQXtIk8 vfiGpfcI4Sh6z4WtU252x1RQ/pt+5geePI1OvfgskUzNae4xWnvtprDAny4GWJi8oyJS 3oL2gVmg+dg7mM6sc2g3ysuOUZ0HRe1UmgTGaO/jjcPhEYb6JEqiVWpOpvg/XX5oPUBO wYD32Tedu6xoChnjHRXA9W3eq5GOsMSkAqzIu5erx2FyUtmauUS2qfz0vPlK5r4RQOwd SfMQ== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id k6-20020a056a00134600b00510538e14f6si15161751pfu.364.2022.05.09.03.13.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 May 2022 03:13:00 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 4AFEA23EB68; Mon, 9 May 2022 02:51:15 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235275AbiEIFre (ORCPT + 99 others); Mon, 9 May 2022 01:47:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51038 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235141AbiEIFq7 (ORCPT ); Mon, 9 May 2022 01:46:59 -0400 Received: from pegase2.c-s.fr (pegase2.c-s.fr [93.17.235.10]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3A27C15E75C for ; Sun, 8 May 2022 22:43:07 -0700 (PDT) Received: from localhost (mailhub3.si.c-s.fr [172.26.127.67]) by localhost (Postfix) with ESMTP id 4KxVKk22Chz9sTC; Mon, 9 May 2022 07:36:58 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from pegase2.c-s.fr ([172.26.127.65]) by localhost (pegase2.c-s.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oA3kXpf5qK0R; Mon, 9 May 2022 07:36:58 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase2.c-s.fr (Postfix) with ESMTP id 4KxVKH4Y98z9sWG; Mon, 9 May 2022 07:36:35 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 879928B775; Mon, 9 May 2022 07:36:35 +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 qkc3CVA6d5_U; Mon, 9 May 2022 07:36:35 +0200 (CEST) Received: from PO20335.IDSI0.si.c-s.fr (unknown [172.25.230.108]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 5B1E48B763; Mon, 9 May 2022 07:36:35 +0200 (CEST) Received: from PO20335.IDSI0.si.c-s.fr (localhost [127.0.0.1]) by PO20335.IDSI0.si.c-s.fr (8.17.1/8.16.1) with ESMTPS id 2495aVhI1591295 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 9 May 2022 07:36:31 +0200 Received: (from chleroy@localhost) by PO20335.IDSI0.si.c-s.fr (8.17.1/8.17.1/Submit) id 2495aVlO1591294; Mon, 9 May 2022 07:36:31 +0200 X-Authentication-Warning: PO20335.IDSI0.si.c-s.fr: chleroy set sender to christophe.leroy@csgroup.eu using -f From: Christophe Leroy To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , naveen.n.rao@linux.vnet.ibm.com Cc: Christophe Leroy , linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Subject: [PATCH v3 22/25] powerpc/inst: Remove PPC_INST_BRANCH Date: Mon, 9 May 2022 07:36:20 +0200 Message-Id: X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1652074582; l=1674; s=20211009; h=from:subject:message-id; bh=GoqVFmJgvgqJKNrjF8mpSAEOdUFe9GmQ2Bf3fRLVT0E=; b=+XbTr0dN0PY6QJbnSgYMbatq2kO9ihP5IQFBaxJjPzfC/f8bzqeSAtBMo1hOCtd9YqHYf2Rx6e3J QJNKL+oRCcSfgOFs4tb8VkAMI4NwqmSA/IcaZbZyEMQ6vQVDkASd X-Developer-Key: i=christophe.leroy@csgroup.eu; a=ed25519; pk=HIzTzUj91asvincQGOFx6+ZF5AoUuP9GdOtQChs7Mm0= Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RDNS_NONE, SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Convert last users of PPC_INST_BRANCH to PPC_RAW_BRANCH() And remove PPC_INST_BRANCH. Signed-off-by: Christophe Leroy --- arch/powerpc/include/asm/ppc-opcode.h | 3 +-- arch/powerpc/lib/feature-fixups.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/include/asm/ppc-opcode.h b/arch/powerpc/include/asm/ppc-opcode.h index 3e9aa96ae74b..1871a86c5436 100644 --- a/arch/powerpc/include/asm/ppc-opcode.h +++ b/arch/powerpc/include/asm/ppc-opcode.h @@ -290,7 +290,6 @@ #define PPC_INST_ADDIS 0x3c000000 #define PPC_INST_ADD 0x7c000214 #define PPC_INST_DIVD 0x7c0003d2 -#define PPC_INST_BRANCH 0x48000000 #define PPC_INST_BL 0x48000001 #define PPC_INST_BRANCH_COND 0x40800000 @@ -575,7 +574,7 @@ #define PPC_RAW_MTSPR(spr, d) (0x7c0003a6 | ___PPC_RS(d) | __PPC_SPR(spr)) #define PPC_RAW_EIEIO() (0x7c0006ac) -#define PPC_RAW_BRANCH(addr) (PPC_INST_BRANCH | ((addr) & 0x03fffffc)) +#define PPC_RAW_BRANCH(offset) (0x48000000 | PPC_LI(offset)) #define PPC_RAW_BL(offset) (0x48000001 | PPC_LI(offset)) /* Deal with instructions that older assemblers aren't aware of */ diff --git a/arch/powerpc/lib/feature-fixups.c b/arch/powerpc/lib/feature-fixups.c index 343a78826035..993d3f31832a 100644 --- a/arch/powerpc/lib/feature-fixups.c +++ b/arch/powerpc/lib/feature-fixups.c @@ -451,7 +451,7 @@ static int __do_rfi_flush_fixups(void *data) if (types & L1D_FLUSH_FALLBACK) /* b .+16 to fallback flush */ - instrs[0] = PPC_INST_BRANCH | 16; + instrs[0] = PPC_RAW_BRANCH(16); i = 0; if (types & L1D_FLUSH_ORI) { -- 2.35.1