From patchwork Thu Jun 15 23:21:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 9790387 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 783836038E for ; Thu, 15 Jun 2017 23:22:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6AA22284DC for ; Thu, 15 Jun 2017 23:22:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5F47E28567; Thu, 15 Jun 2017 23:22:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DC4D22854F for ; Thu, 15 Jun 2017 23:22:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752447AbdFOXVf (ORCPT ); Thu, 15 Jun 2017 19:21:35 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:36711 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752071AbdFOXVb (ORCPT ); Thu, 15 Jun 2017 19:21:31 -0400 Received: by mail-wr0-f195.google.com with SMTP id 77so4952956wrb.3; Thu, 15 Jun 2017 16:21:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=W4pKEvSRZcAtvOTwR2kmcR9gCfTNzWc1klOq1O1Ady4=; b=FCGF4wSsHA+MWIgm74QgIkgjQOvKxF42IKFSazRpGfq5wdaHGkCWZeCWiXK+d81Xqq g0tqeLZCR5TzchlqsSzobGn4I07bOzwxl5eiJ3l7nRePMjtihQzTP/m3YzU26YekFkE6 Pw2ROTk3GBBLSiLPOvRTboEQ9XMhuajTt8+RtQC5SAwQ5XU/jYEUxsxnKq2Z6r5SD7qO SZlhf+FycJuuhqc960hkx5pr9Vx3h6jixVuTsONS1t5GYsBJbBhKBI7Q7YitCPguLGm7 FhTzYxv4VXGZTlicLZs/aIAnZRmm4gdxmEt38RxSfPGupfy3uvP7JbdiivSmn7oL6aGM TBkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=W4pKEvSRZcAtvOTwR2kmcR9gCfTNzWc1klOq1O1Ady4=; b=OYxSr25moy1EOe6p1+Xp/eushTYwd2GljnOiXZiMmxTv+JrUxodhYsNnIt31l8oiXE NqgfgZ1CedJciLLV3qdaTtPMm+7NZm4c9EZZOtU8CExZ0na014v23knCaoymYyZwn+OA zK7JlmFAHnNN5SUnJNrySrbWKZw1iwrnUcVyLNF0knJ4jLuIqqRkPpEhYN0NKT9emMQd m9Uo6LJ1MbvU8Kn1Z+kDGufjQHDkYe3x5BjYrVDzk1C6TjKaqRwyJmg8eQUfupylaRgd N0Ov6HWw+WM5LYybXh07qvND2G2GDgF37M2xexVxEnick0Pw1iqT0Qx9J8rflhRfC8bp PSpA== X-Gm-Message-State: AKS2vOwigGAZfgX6cDgjwfO1V8gSLJeWYlrj2LrSSl+aTfTH0iO6LaZ+ P9a4SHVw8j+7+A== X-Received: by 10.223.164.214 with SMTP id h22mr5539686wrb.174.1497568889908; Thu, 15 Jun 2017 16:21:29 -0700 (PDT) Received: from fainelli-desktop.broadcom.com ([192.19.255.250]) by smtp.gmail.com with ESMTPSA id b30sm881046wra.42.2017.06.15.16.21.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Jun 2017 16:21:29 -0700 (PDT) From: Florian Fainelli To: linux-arm-kernel@lists.infradead.org Cc: Florian Fainelli , Russell King , Catalin Marinas , Will Deacon , Arnd Bergmann , Greg Kroah-Hartman , linux-kernel@vger.kernel.org (open list), linux-arch@vger.kernel.org (open list:GENERIC INCLUDE/ASM HEADER FILES), Dave Gerlach , Tony Lindgren , Keerthy J , Alexandre Belloni , linux-omap@vger.kernel.org, Shawn Guo Subject: [PATCH 1/3] ARM: Generalize fncpy implementation Date: Thu, 15 Jun 2017 16:21:15 -0700 Message-Id: <20170615232117.29727-2-f.fainelli@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170615232117.29727-1-f.fainelli@gmail.com> References: <20170615232117.29727-1-f.fainelli@gmail.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP ARM's fncpy implementation is actually suitable for a large number of platforms since the only assumption it makes is just the function's alignment (8 bytes) which also happens to fulfil other architectures, including but not limited to ARM64. Signed-off-by: Florian Fainelli --- arch/arm/include/asm/fncpy.h | 77 ++---------------------------------- include/asm-generic/fncpy.h | 94 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 74 deletions(-) create mode 100644 include/asm-generic/fncpy.h diff --git a/arch/arm/include/asm/fncpy.h b/arch/arm/include/asm/fncpy.h index de5354746924..32465aef7932 100644 --- a/arch/arm/include/asm/fncpy.h +++ b/arch/arm/include/asm/fncpy.h @@ -16,79 +16,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#ifndef _ASMARM_FNCPY_H -/* - * These macros are intended for use when there is a need to copy a low-level - * function body into special memory. - * - * For example, when reconfiguring the SDRAM controller, the code doing the - * reconfiguration may need to run from SRAM. - * - * NOTE: that the copied function body must be entirely self-contained and - * position-independent in order for this to work properly. - * - * NOTE: in order for embedded literals and data to get referenced correctly, - * the alignment of functions must be preserved when copying. To ensure this, - * the source and destination addresses for fncpy() must be aligned to a - * multiple of 8 bytes: you will be get a BUG() if this condition is not met. - * You will typically need a ".align 3" directive in the assembler where the - * function to be copied is defined, and ensure that your allocator for the - * destination buffer returns 8-byte-aligned pointers. - * - * Typical usage example: - * - * extern int f(args); - * extern uint32_t size_of_f; - * int (*copied_f)(args); - * void *sram_buffer; - * - * copied_f = fncpy(sram_buffer, &f, size_of_f); - * - * ... later, call the function: ... - * - * copied_f(args); - * - * The size of the function to be copied can't be determined from C: - * this must be determined by other means, such as adding assmbler directives - * in the file where f is defined. - */ - -#ifndef __ASM_FNCPY_H -#define __ASM_FNCPY_H - -#include -#include - -#include -#include - -/* - * Minimum alignment requirement for the source and destination addresses - * for function copying. - */ -#define FNCPY_ALIGN 8 - -#define fncpy(dest_buf, funcp, size) ({ \ - uintptr_t __funcp_address; \ - typeof(funcp) __result; \ - \ - asm("" : "=r" (__funcp_address) : "0" (funcp)); \ - \ - /* \ - * Ensure alignment of source and destination addresses, \ - * disregarding the function's Thumb bit: \ - */ \ - BUG_ON((uintptr_t)(dest_buf) & (FNCPY_ALIGN - 1) || \ - (__funcp_address & ~(uintptr_t)1 & (FNCPY_ALIGN - 1))); \ - \ - memcpy(dest_buf, (void const *)(__funcp_address & ~1), size); \ - flush_icache_range((unsigned long)(dest_buf), \ - (unsigned long)(dest_buf) + (size)); \ - \ - asm("" : "=r" (__result) \ - : "0" ((uintptr_t)(dest_buf) | (__funcp_address & 1))); \ - \ - __result; \ -}) +#include -#endif /* !__ASM_FNCPY_H */ +#endif /* !__ASMARM_FNCPY_H */ diff --git a/include/asm-generic/fncpy.h b/include/asm-generic/fncpy.h new file mode 100644 index 000000000000..bf7577725652 --- /dev/null +++ b/include/asm-generic/fncpy.h @@ -0,0 +1,94 @@ +/* + * include/asm-generic/fncpy.h - helper macros for function body copying + * + * Copyright (C) 2011 Linaro Limited + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* + * These macros are intended for use when there is a need to copy a low-level + * function body into special memory. + * + * For example, when reconfiguring the SDRAM controller, the code doing the + * reconfiguration may need to run from SRAM. + * + * NOTE: that the copied function body must be entirely self-contained and + * position-independent in order for this to work properly. + * + * NOTE: in order for embedded literals and data to get referenced correctly, + * the alignment of functions must be preserved when copying. To ensure this, + * the source and destination addresses for fncpy() must be aligned to a + * multiple of 8 bytes: you will be get a BUG() if this condition is not met. + * You will typically need a ".align 3" directive in the assembler where the + * function to be copied is defined, and ensure that your allocator for the + * destination buffer returns 8-byte-aligned pointers. + * + * Typical usage example: + * + * extern int f(args); + * extern uint32_t size_of_f; + * int (*copied_f)(args); + * void *sram_buffer; + * + * copied_f = fncpy(sram_buffer, &f, size_of_f); + * + * ... later, call the function: ... + * + * copied_f(args); + * + * The size of the function to be copied can't be determined from C: + * this must be determined by other means, such as adding assmbler directives + * in the file where f is defined. + */ + +#ifndef __ASM_FNCPY_H +#define __ASM_FNCPY_H + +#include +#include + +#include +#include + +/* + * Minimum alignment requirement for the source and destination addresses + * for function copying. + */ +#define FNCPY_ALIGN 8 + +#define fncpy(dest_buf, funcp, size) ({ \ + uintptr_t __funcp_address; \ + typeof(funcp) __result; \ + \ + asm("" : "=r" (__funcp_address) : "0" (funcp)); \ + \ + /* \ + * Ensure alignment of source and destination addresses, \ + * disregarding the function's Thumb bit: \ + */ \ + BUG_ON((uintptr_t)(dest_buf) & (FNCPY_ALIGN - 1) || \ + (__funcp_address & ~(uintptr_t)1 & (FNCPY_ALIGN - 1))); \ + \ + memcpy(dest_buf, (void const *)(__funcp_address & ~1), size); \ + flush_icache_range((unsigned long)(dest_buf), \ + (unsigned long)(dest_buf) + (size)); \ + \ + asm("" : "=r" (__result) \ + : "0" ((uintptr_t)(dest_buf) | (__funcp_address & 1))); \ + \ + __result; \ +}) + +#endif /* !__ASM_FNCPY_H */