From patchwork Mon Aug 20 22:40:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Desaulniers X-Patchwork-Id: 10570829 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 D25F314BD for ; Mon, 20 Aug 2018 22:41:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BEAA329CE5 for ; Mon, 20 Aug 2018 22:41:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BA2FA29C35; Mon, 20 Aug 2018 22:41:24 +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=-2.8 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,T_DKIM_INVALID 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 459FD29CCD for ; Mon, 20 Aug 2018 22:41:24 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:From:Subject:Mime-Version:Message-Id :Date:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=tYRnr6R+hEL8/JJx5fqcaAp0t9TitO3XMF80vGo64tU=; b=Fl/FvsC82uuNQl EdemxL5z027fCsdXHqNqsbc6OSm/ooDkQ7ddnnrhJQk+aOA1k1yCqVlFZXzD/B/lGBEsrFFB92uQd YqsHEQ6/FasCdpyp9bmLuE5qC/ggERDpbvkZgHUpycJehydHcK2T23NRVFv9R2bS5gYinLbeeGJiq COtBeDcCTCktjEByCJk60zvvhctR4TbMx0CiV26fUowp1fLGfq19tlkBrgw7/VJz0K+pjcqW7seKM baVLxzjMuHsiJUDMJbSev+wHR8tC3tcXLwdQ0Je79uHRkHJZ+SOo+o0O86A704DeokZd41+sBb2n0 UusrTzlI0gXPZnQnUn6A==; 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 1frsrP-0002Bx-UZ; Mon, 20 Aug 2018 22:41:19 +0000 Received: from mail-yb0-x249.google.com ([2607:f8b0:4002:c09::249]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1frsrM-0002AY-5t for linux-arm-kernel@lists.infradead.org; Mon, 20 Aug 2018 22:41:17 +0000 Received: by mail-yb0-x249.google.com with SMTP id i15-v6so8755730ybk.18 for ; Mon, 20 Aug 2018 15:41:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=EoH5pauqWlTA0RTnufTs0PyEbborC6SNL6ee6ZkN5rM=; b=VhkOi+CbXyia7j+wc7X6rTCrw9XR+q9dCZK7qfrsShokxp4I8WAyhc3Pk8LVoVqwVg w6gTHsWJIY8dZX2ipWuMpQmIOsZt5llRTn4E4I4XEebYUMi1XjNETWPf7OJM0dWtapKm DDR8RGUIa+M8X6YlMdaVyML5taGs5iI+SirzF8mdZIjcW0lCbBuC03cuXIvJ+K7hfFmL f6OlD92dPzRBrm69wa1EIzfgWjS1Vp6MphvIBIDzxRbecFO9c0RLCafA/CixBJ8qDi60 7WZboInv3vKD2VS7AzQiAATyzqT53ODqu5J6R0UB1mFhSUVGBDcxZQMzHy1uPAp1zHka ojJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=EoH5pauqWlTA0RTnufTs0PyEbborC6SNL6ee6ZkN5rM=; b=ENNzBhguUCG+RnnFd22fYPoji9foj/isl9/GwFCfNnRgkU/txUWtcC8Fo9LQInmPkw tKzjZb24WBf4rPsnTJj4lJkksvrsiuMrUKiqhYWZKaktL+YinqYyFH3+06XhuNS+P5YW jobFBsbeDrN26KDsQklQo4gnVn5iksstrLrnLTcpuHeLGGMhwrkXT3uZYKLpK75NbJQC 46nhB+//JqSO7xXP93ZwM/9XCfpH6myxF+jsQmG/iuvYEKKPuJ0WC/QHx3EPQXPMlhii FASu9lvO2miK5eYI0kQ3oyNEaS3ZbftqIBSipJTf9Mg10ISLajo4oBgKbjyxBpNvGCHY NquA== X-Gm-Message-State: AOUpUlFCslnTz/UGvB34huIO7s7BhYf8XKBBE38H3KVpfISgLEKiXk7b b67whRgNfAKB34svF0j5vj6KpxLHERHo1ELNSbQ= X-Google-Smtp-Source: AA+uWPw7n4D3afJ4dsA2aTX+Y42hvf4SGYTi3IfVbE4yuIvCJujG1ua4iUX7pyKts31Pcgxb7r0+QsljwR0U9Pn9KfU= X-Received: by 2002:a0d:fbc5:: with SMTP id l188-v6mr14440405ywf.133.1534804864260; Mon, 20 Aug 2018 15:41:04 -0700 (PDT) Date: Mon, 20 Aug 2018 15:40:32 -0700 Message-Id: <20180820224032.53194-1-ndesaulniers@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.18.0.865.gffc8e1a3cd6-goog Subject: [PATCH] arm64/crypto: remove non-standard notation From: Nick Desaulniers To: ard.biesheuvel@linaro.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180820_154116_221576_BA1B8396 X-CRM114-Status: GOOD ( 10.44 ) 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: Herbert Xu , Catalin Marinas , Nick Desaulniers , linux-kernel@vger.kernel.org, Will Deacon , linux-crypto@vger.kernel.org, "David S. Miller" , linux-arm-kernel@lists.infradead.org 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 It seems that: ldr q8, =0x30000000200000001 is a GNU as convience notation for: ldr q8, .Lconstant .Lconstant .word 0x00000001 .word 0x00000002 .word 0x00000003 .word 0x00000000 based on this comment in binutils' source [0]. I've asked for this non-standard convience notation to be added to other assemblers [1], but until then, we can remove it and get equivalent disassembly: before: 00000000000009d4 : ... a48: 9c000ac8 ldr q8, ba0 ... ba0: 00000001 .word 0x00000001 ba4: 00000002 .word 0x00000002 ba8: 00000003 .word 0x00000003 bac: 00000000 .word 0x00000000 after: 00000000000009d4 : ... a48: 9c000aa8 ldr q8, b9c ... b9c: 00000001 .word 0x00000001 ba0: 00000002 .word 0x00000002 ba4: 00000003 .word 0x00000003 ba8: 00000000 .word 0x00000000 [0] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=blob;f=gas/testsuite/gas/aarch64/programmer-friendly.s;h=6254c6476efdc848648b05068be0574e7addc85d;hb=HEAD#l11 [1] https://bugs.llvm.org/show_bug.cgi?id=38642 Signed-off-by: Nick Desaulniers --- arch/arm64/crypto/aes-modes.S | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/arm64/crypto/aes-modes.S b/arch/arm64/crypto/aes-modes.S index 483a7130cf0e..9288c5b0eca2 100644 --- a/arch/arm64/crypto/aes-modes.S +++ b/arch/arm64/crypto/aes-modes.S @@ -232,7 +232,7 @@ AES_ENTRY(aes_ctr_encrypt) bmi .Lctr1x cmn w6, #4 /* 32 bit overflow? */ bcs .Lctr1x - ldr q8, =0x30000000200000001 /* addends 1,2,3[,0] */ + ldr q8, .Laddends /* addends 1,2,3[,0] */ dup v7.4s, w6 mov v0.16b, v4.16b add v7.4s, v7.4s, v8.4s @@ -295,6 +295,12 @@ AES_ENTRY(aes_ctr_encrypt) rev x7, x7 ins v4.d[0], x7 b .Lctrcarrydone + +.Laddends: + .word 0x00000001 + .word 0x00000002 + .word 0x00000003 + .word 0x00000000 AES_ENDPROC(aes_ctr_encrypt) .ltorg