Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp2118016pxb; Fri, 25 Mar 2022 11:24:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJycRklvg3y6q9bCwVJEVFjkVr1F6ZDDAPXlb0jl04wj3ItUFEWZIu7BqDc5Tj/CBoO+/5WB X-Received: by 2002:a17:903:124a:b0:154:c7a4:9375 with SMTP id u10-20020a170903124a00b00154c7a49375mr10874493plh.0.1648232639881; Fri, 25 Mar 2022 11:23:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648232639; cv=none; d=google.com; s=arc-20160816; b=0BfZifyhDaVzHvspsnqTYxHbd3p15jfePY/aJnjCYug4DUIT7Ga6QVwXbAbffvIarj 3guSBUDt+Q1Lyu8pJFFP80CDmyvkjmxzmznOO3W5Lsjqmshbs97mASv6Kv3yyVGk5LRq JzKD9g3K+RABx+1yBRTtKywdlJei/xFdJkwtmEsXDQQhKGzGX/S5Hy4vILEq4+BrDeoc CRNj0uFlYjsZbvvweUHUfKkqBlvamCtI2tED4Z80B+H3R18k8vMK6cVuYofwon2Q+g1G qbUZ+yGrH/dxWkz01cNRNBYEHg7vkYd4QGACwozqvUT+h7wbsnD1stJVso5aUpzBsC8h nFpg== 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=eoWYpKYzAqRnrtYrXljDK77p0Uc06d19DFu2z6vyqJ8=; b=TdJ67GLZipTEvGX/f6BsUXrXA9PeReMEYNOXyapCNNxLJlfXAFOdbaqviWRuNyDlaL BQt0PcnQBTyyzjkt4Tna2aBedRkZjqvszPls4UHhu2q0YoXp8+pzffNETDBaX55P9h7f gBIq3nvLr2lAh0Zj8WfOL6S+FsN50B5TNzh2qnzgfCMEJva9Gu0p9mdTXWB1lXoscVhd GSM5ma5irw8DZHe/lRPKZ1pe8PT791dOaQ6nLYa7t3NpWJEJFvbUVfhUM30kwX+w6TXZ ecRs7LxM0pV8Z3jEx3U2Hpuwq2j2iweI7oFLw2CRtP7lDQEK2iJ8Qk9DgDk9FxhURABW xLng== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id n6-20020a170902e54600b00153b2d16528si3402082plf.304.2022.03.25.11.23.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Mar 2022 11:23:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 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 D498FDF4AB; Fri, 25 Mar 2022 10:48:29 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351042AbiCXOeS (ORCPT + 99 others); Thu, 24 Mar 2022 10:34:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39184 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351145AbiCXOdU (ORCPT ); Thu, 24 Mar 2022 10:33:20 -0400 Received: from pegase2.c-s.fr (pegase2.c-s.fr [93.17.235.10]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E9185A27DB for ; Thu, 24 Mar 2022 07:31:48 -0700 (PDT) Received: from localhost (mailhub3.si.c-s.fr [172.26.127.67]) by localhost (Postfix) with ESMTP id 4KPSMH20Vhz9sTy; Thu, 24 Mar 2022 15:31:07 +0100 (CET) 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 u-W6Est-0pkC; Thu, 24 Mar 2022 15:31:07 +0100 (CET) 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 4KPSLz0Hr5z9sTx; Thu, 24 Mar 2022 15:30:51 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id DF60F8B78B; Thu, 24 Mar 2022 15:30:50 +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 32nCd3AEpQVs; Thu, 24 Mar 2022 15:30:50 +0100 (CET) Received: from PO20335.IDSI0.si.c-s.fr (unknown [192.168.203.77]) by messagerie.si.c-s.fr (Postfix) with ESMTP id E28C08B79C; Thu, 24 Mar 2022 15:30:49 +0100 (CET) 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 22OEUiPI1811760 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Thu, 24 Mar 2022 15:30:44 +0100 Received: (from chleroy@localhost) by PO20335.IDSI0.si.c-s.fr (8.17.1/8.17.1/Submit) id 22OEUiwf1811759; Thu, 24 Mar 2022 15:30:44 +0100 X-Authentication-Warning: PO20335.IDSI0.si.c-s.fr: chleroy set sender to christophe.leroy@csgroup.eu using -f From: Christophe Leroy To: "Naveen N . Rao" , Steven Rostedt , Ingo Molnar , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: Christophe Leroy , linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Subject: [PATCH v1 20/22] powerpc/modules: Use PPC_INST_BRANCH_MASK instead of opencoding Date: Thu, 24 Mar 2022 15:30:10 +0100 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=1648132152; l=2135; s=20211009; h=from:subject:message-id; bh=+hpUyk5a1199l2+WP/AdaKunGqwu6Qoeoc6PngqTufs=; b=JPmeYBLVclnVxlOKg4+3av5sIUFxL2DOsI9D62gGNWM+KF0b0fus4PRJUaBsh44i4s6mBFTzZj+u o+x0bcKBD2drjXUZgRB9xOTMKrx4dvQG+eG0ZaKcM4T4Qez2uR3/ 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 Use PPC_INST_BRANCH_MASK instead of opencoding. Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/module_32.c | 13 ++++++------- arch/powerpc/kernel/module_64.c | 4 ++-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c index 1282cfd672f2..344941855e9e 100644 --- a/arch/powerpc/kernel/module_32.c +++ b/arch/powerpc/kernel/module_32.c @@ -256,9 +256,8 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, value, (uint32_t)location); pr_debug("Location before: %08X.\n", *(uint32_t *)location); - value = (*(uint32_t *)location & ~0x03fffffc) - | ((value - (uint32_t)location) - & 0x03fffffc); + value = (*(uint32_t *)location & ~PPC_INST_OFFSET24_MASK) | + ((value - (uint32_t)location) & PPC_INST_OFFSET24_MASK); if (patch_instruction(location, ppc_inst(value))) return -EFAULT; @@ -266,10 +265,10 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, pr_debug("Location after: %08X.\n", *(uint32_t *)location); pr_debug("ie. jump to %08X+%08X = %08X\n", - *(uint32_t *)location & 0x03fffffc, - (uint32_t)location, - (*(uint32_t *)location & 0x03fffffc) - + (uint32_t)location); + *(uint32_t *)location & PPC_INST_OFFSET24_MASK, + (uint32_t)location, + (*(uint32_t *)location & PPC_INST_OFFSET24_MASK) + + (uint32_t)location); break; case R_PPC_REL32: diff --git a/arch/powerpc/kernel/module_64.c b/arch/powerpc/kernel/module_64.c index b13a72665eee..8f70a04aac6c 100644 --- a/arch/powerpc/kernel/module_64.c +++ b/arch/powerpc/kernel/module_64.c @@ -653,8 +653,8 @@ int apply_relocate_add(Elf64_Shdr *sechdrs, } /* Only replace bits 2 through 26 */ - value = (*(uint32_t *)location & ~0x03fffffc) - | (value & 0x03fffffc); + value = (*(uint32_t *)location & ~PPC_INST_OFFSET24_MASK) | + (value & PPC_INST_OFFSET24_MASK); if (patch_instruction((u32 *)location, ppc_inst(value))) return -EFAULT; -- 2.35.1