From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 29C33C433FE for ; Thu, 23 Sep 2021 10:43:37 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E505E60F56 for ; Thu, 23 Sep 2021 10:43:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org E505E60F56 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:In-Reply-To: Date:From:Cc:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Owner; bh=wo8arO8JmLPJ3gLHXd0GoIIyPuUUD4vE1VnjeKGkrXk=; b=Vl8fdiztSpSK3j X+eQTkTTDgr+3jS/582i3MdSmMD9DiM6yx5fgDWCNUJLw5j8dQFywkSPEYRbG8PvajWOFJxBWR1B8 UwRxP1gNU7xvQeWqBR4rYptX8H5zSok5gWEkOlKCY18wpYSZ0yZ5deUGmhKPjSTnrZKjVljBRy65B bCLYs07x6gMkAk2z23wyKDWp65Rn5FanR9dkJwPWtuTdzyV9735q+Wvtxj2duL7ogNovillahs1md lJgI4Z9hevkI8eHYrAgjFF69m1BpPNAYCMBuyDLzc0DTdojxhDoudTK0r+zFfb/JeOZ399L46KNec K1wOejvNCNUad70ggznA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mTM9z-00Ax7M-3c; Thu, 23 Sep 2021 10:40:59 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mTM5H-00Aumm-OQ for linux-arm-kernel@lists.infradead.org; Thu, 23 Sep 2021 10:36:09 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id F0409610A0; Thu, 23 Sep 2021 10:36:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1632393367; bh=M7zB3DiJXsvzBaO7cnQhoRi/2qLtqySL0M7runuyUks=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=i+H3XHZYU+Wso+rwY8ZuzHRhF063ayNK6y4Rth8WI0IK1Ba9+Ja3RsmawEbJib/Iw LUWHFqFS5YxRHov7Yv1GrnIP6NO7T351URrHOnDSgArmOKo/KmtWsE4EwAZ7M9nWrI 54OWEeypWR1edBgaW9b0NGH+SL3MxX1RaxFtcab0= Subject: Patch "ARM: 9077/1: PLT: Move struct plt_entries definition to header" has been added to the 5.4-stable tree To: alexander.sverdlin@nokia.com, f.fainelli@gmail.com, gregkh@linuxfoundation.org, linux-arm-kernel@lists.infradead.org, linux@armlinux.org.uk, mingo@redhat.com, rmk+kernel@armlinux.org.uk, rostedt@goodmis.org, sashal@kernel.org Cc: From: Date: Thu, 23 Sep 2021 12:36:05 +0200 In-Reply-To: <20210922170034.190023-2-f.fainelli@gmail.com> Message-ID: <1632393365162108@kroah.com> MIME-Version: 1.0 X-stable: commit X-Patchwork-Hint: ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210923_033607_900976_78ABA37D X-CRM114-Status: GOOD ( 13.48 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This is a note to let you know that I've just added the patch titled ARM: 9077/1: PLT: Move struct plt_entries definition to header to the 5.4-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: arm-9077-1-plt-move-struct-plt_entries-definition-to-header.patch and it can be found in the queue-5.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From foo@baz Thu Sep 23 12:31:59 PM CEST 2021 From: Florian Fainelli Date: Wed, 22 Sep 2021 10:00:31 -0700 Subject: ARM: 9077/1: PLT: Move struct plt_entries definition to header To: linux-kernel@vger.kernel.org Cc: stable@vger.kernel.org, Greg Kroah-Hartman , Sasha Levin , Alex Sverdlin , Russell King , Florian Fainelli , Steven Rostedt , Ingo Molnar , Russell King , linux-arm-kernel@lists.infradead.org (moderated list:ARM PORT) Message-ID: <20210922170034.190023-2-f.fainelli@gmail.com> From: Alex Sverdlin commit 4e271701c17dee70c6e1351c4d7d42e70405c6a9 upstream No functional change, later it will be re-used in several files. Signed-off-by: Alexander Sverdlin Signed-off-by: Russell King Signed-off-by: Florian Fainelli Signed-off-by: Greg Kroah-Hartman --- arch/arm/include/asm/module.h | 9 +++++++++ arch/arm/kernel/module-plts.c | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) --- a/arch/arm/include/asm/module.h +++ b/arch/arm/include/asm/module.h @@ -19,6 +19,15 @@ enum { }; #endif +#define PLT_ENT_STRIDE L1_CACHE_BYTES +#define PLT_ENT_COUNT (PLT_ENT_STRIDE / sizeof(u32)) +#define PLT_ENT_SIZE (sizeof(struct plt_entries) / PLT_ENT_COUNT) + +struct plt_entries { + u32 ldr[PLT_ENT_COUNT]; + u32 lit[PLT_ENT_COUNT]; +}; + struct mod_plt_sec { struct elf32_shdr *plt; int plt_count; --- a/arch/arm/kernel/module-plts.c +++ b/arch/arm/kernel/module-plts.c @@ -11,10 +11,6 @@ #include #include -#define PLT_ENT_STRIDE L1_CACHE_BYTES -#define PLT_ENT_COUNT (PLT_ENT_STRIDE / sizeof(u32)) -#define PLT_ENT_SIZE (sizeof(struct plt_entries) / PLT_ENT_COUNT) - #ifdef CONFIG_THUMB2_KERNEL #define PLT_ENT_LDR __opcode_to_mem_thumb32(0xf8dff000 | \ (PLT_ENT_STRIDE - 4)) @@ -23,11 +19,6 @@ (PLT_ENT_STRIDE - 8)) #endif -struct plt_entries { - u32 ldr[PLT_ENT_COUNT]; - u32 lit[PLT_ENT_COUNT]; -}; - static bool in_init(const struct module *mod, unsigned long loc) { return loc - (u32)mod->init_layout.base < mod->init_layout.size; Patches currently in stable-queue which might be from f.fainelli@gmail.com are queue-5.4/arm-9098-1-ftrace-module_plt-fix-build-problem-without-dynamic_ftrace.patch queue-5.4/arm-9079-1-ftrace-add-module_plts-support.patch queue-5.4/arm-9078-1-add-warn-suppress-parameter-to-arm_gen_branch_link.patch queue-5.4/arm-9077-1-plt-move-struct-plt_entries-definition-to-header.patch queue-5.4/arm-qualify-enabling-of-swiotlb_init.patch _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel