From patchwork Thu Nov 22 08:46:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 10693655 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3B0D813BB for ; Thu, 22 Nov 2018 08:47:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2E63B2C9A0 for ; Thu, 22 Nov 2018 08:47:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 228072C9B8; Thu, 22 Nov 2018 08:47:29 +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=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0F3C02C9A0 for ; Thu, 22 Nov 2018 08:47:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=uxH35uLnURLfHjDqHV44LHwyDOq9J0wDtsvU0wOOmZc=; b=r4OGw+lsrZIktQ/ZD+739Wnyk3 bM06xZvKL7xmDhu4cwjE6Jh9h8sPmBWFSCCspQDk0KPmZsZmz0tnBHeIyNrcuvbIE4tzHoMp+j0O6 wu0PRQNUnQ+v6YhCQwJZF/RZyQi4zYMLZWshavWikSadNBS9CxqFblmFoIGdDln3a96dz2gwNIVcd llpgtevLtcrmAz/7zaTjJKj00bh6dU5F6inZklPP55A5dy1WoKZrZYDgdegclS09sq0w9nKvqdzMF 56wT3l1ZVFM11dR/VcN5UgBoJuQ1uXthz28wt/0r/d19689ZJeXIm3FyckjXUVUbd8Rk+yMV7v76l JGr+yPUg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gPkds-0006q7-S4; Thu, 22 Nov 2018 08:47:20 +0000 Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gPkdg-0006am-1z for linux-arm-kernel@lists.infradead.org; Thu, 22 Nov 2018 08:47:09 +0000 Received: by mail-ed1-x543.google.com with SMTP id d3so7018129edx.7 for ; Thu, 22 Nov 2018 00:46:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cNKA/rq7qeVmgAtM2MOkGpidnPucuE6gZ41o4iP993Q=; b=HGook2ib4xtKy7Q4620q6ZtCuuNDgY9AGkLikk9rJ/fJ7gzMX2SfLwvwMILcogdg8f fCvGjOxxuG2qpEbRK8aMImQr2F7H9a6KwzU5q2EWfJbI6kY27B+vaOAbEMgXW3gCIYsZ KBd9rus0gK5wF19rLjXzTW7YcIIVLuQET51uc= 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=cNKA/rq7qeVmgAtM2MOkGpidnPucuE6gZ41o4iP993Q=; b=ZKcIeDULdCvbig77RQxA5W930Ah1zGtBuEiRzv9trjD288k1GhQnK2BLq6GDHHy6Dl NcVIe7p0SVzTozYlO1TPHAjPtfi643z5aQaPtPoApqIWrMxIq4+8jOl4B0xJDwG6ZtlT uqJLeJ22QG9RHpHtHbNd5IccEFqMwJizyH+geua7rmaGMbYvrUNHZllVzzueSMIcgmec lUov9OfryvaKn4fq0EhQzX0blU2psBdTuMmt0oGEPSnvB2bkw3RYGHtvy9RzyRCncVC4 qlucW8lR8tCL9M8xHk6V3et/Lbgkn4QKl9rjUndpJxmYfKmSF1OQlNrnY0qU31V85RSC m+Pw== X-Gm-Message-State: AA+aEWYOH32tSZ5Z7Ev7IXwWfqAotFrpMqkvuLhRxHX0sGwNmIFKugOJ P1aMVqDXI8yGvG0Lvg2GebhbeogM442aXg== X-Google-Smtp-Source: AFSGD/WhrFFWGhdHbKYzs57ykIhVtrcojMQv9kVzLj5quIcqeuK1gAIfPwkYT5qsCqSufwy002bAjg== X-Received: by 2002:a50:af65:: with SMTP id g92-v6mr8623876edd.274.1542876415911; Thu, 22 Nov 2018 00:46:55 -0800 (PST) Received: from mba13.wifi.ns.nl (dhcp-077-251-017-237.chello.nl. [77.251.17.237]) by smtp.gmail.com with ESMTPSA id n23-v6sm3053784ejx.57.2018.11.22.00.46.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Nov 2018 00:46:54 -0800 (PST) From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/2] arm64/insn: add support for emitting ADR/ADRP instructions Date: Thu, 22 Nov 2018 09:46:45 +0100 Message-Id: <20181122084646.3247-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181122084646.3247-1-ard.biesheuvel@linaro.org> References: <20181122084646.3247-1-ard.biesheuvel@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181122_004708_105232_801A7EB7 X-CRM114-Status: GOOD ( 13.08 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, Ard Biesheuvel , marc.zyngier@arm.com, catalin.marinas@arm.com, will.deacon@arm.com, Torsten Duwe , Jessica Yu MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Add support for emitting ADR and ADRP instructions so we can switch over our PLT generation code in a subsequent patch. Signed-off-by: Ard Biesheuvel --- arch/arm64/include/asm/insn.h | 8 ++++++ arch/arm64/kernel/insn.c | 29 ++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/arch/arm64/include/asm/insn.h b/arch/arm64/include/asm/insn.h index c6802dea6cab..9c01f04db64d 100644 --- a/arch/arm64/include/asm/insn.h +++ b/arch/arm64/include/asm/insn.h @@ -261,6 +261,11 @@ enum aarch64_insn_prfm_policy { AARCH64_INSN_PRFM_POLICY_STRM, }; +enum aarch64_insn_adr_type { + AARCH64_INSN_ADR_TYPE_ADRP, + AARCH64_INSN_ADR_TYPE_ADR, +}; + #define __AARCH64_INSN_FUNCS(abbr, mask, val) \ static __always_inline bool aarch64_insn_is_##abbr(u32 code) \ { return (code & (mask)) == (val); } \ @@ -393,6 +398,9 @@ u32 aarch64_insn_gen_add_sub_imm(enum aarch64_insn_register dst, enum aarch64_insn_register src, int imm, enum aarch64_insn_variant variant, enum aarch64_insn_adsb_type type); +u32 aarch64_insn_gen_adr(unsigned long pc, unsigned long addr, + enum aarch64_insn_register reg, + enum aarch64_insn_adr_type type); u32 aarch64_insn_gen_bitfield(enum aarch64_insn_register dst, enum aarch64_insn_register src, int immr, int imms, diff --git a/arch/arm64/kernel/insn.c b/arch/arm64/kernel/insn.c index 2b3413549734..7820a4a688fa 100644 --- a/arch/arm64/kernel/insn.c +++ b/arch/arm64/kernel/insn.c @@ -1239,6 +1239,35 @@ u32 aarch64_insn_gen_logical_shifted_reg(enum aarch64_insn_register dst, return aarch64_insn_encode_immediate(AARCH64_INSN_IMM_6, insn, shift); } +u32 aarch64_insn_gen_adr(unsigned long pc, unsigned long addr, + enum aarch64_insn_register reg, + enum aarch64_insn_adr_type type) +{ + u32 insn; + s32 offset; + + switch (type) { + case AARCH64_INSN_ADR_TYPE_ADR: + insn = aarch64_insn_get_adr_value(); + offset = addr - pc; + break; + case AARCH64_INSN_ADR_TYPE_ADRP: + insn = aarch64_insn_get_adrp_value(); + offset = (addr - ALIGN_DOWN(pc, SZ_4K)) >> 12; + break; + default: + pr_err("%s: unknown adr encoding %d\n", __func__, type); + return AARCH64_BREAK_FAULT; + } + + if (offset < -SZ_1M || offset >= SZ_1M) + return AARCH64_BREAK_FAULT; + + insn = aarch64_insn_encode_register(AARCH64_INSN_REGTYPE_RD, insn, reg); + + return aarch64_insn_encode_immediate(AARCH64_INSN_IMM_ADR, insn, offset); +} + /* * Decode the imm field of a branch, and return the byte offset as a * signed value (so it can be used when computing a new branch