From patchwork Wed Apr 5 18:34:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Kaehlcke X-Patchwork-Id: 9665435 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 BD8DD60353 for ; Wed, 5 Apr 2017 18:36:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B452C2859F for ; Wed, 5 Apr 2017 18:36:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A95DA285A3; Wed, 5 Apr 2017 18:36:06 +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=-1.4 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_SORBS_SPAM autolearn=no version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 48795285A4 for ; Wed, 5 Apr 2017 18:36:06 +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: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:In-Reply-To: References:List-Owner; bh=TMpFlObBrufqtIsonLkXnNroTXrFhuQqmmEoOAIXjDU=; b=eeD zTKcPOAQ+SQ3+5NtjUHYcD+dLkWFUXvakKErhZL2cYR+K/V5ScLQjcrO9T05l+nIZKIKKxnWozg0z pn3rCIYPh9JcN45EQMnT8g8j6u8/ur4RzDMLuCUTJYBAIurMk7UmOlhxLjDBDWiPltIFXQWIqcDEL qYvofUB9mfOdXXi4wif/w00cQSxnVeyW7mKsS1mhpyHLI7xOZxEr0krgGxnTjPi4kcs7982BizBcj DLwoIEv9OMY6uRMj0ldF/HUl+Gpoidrk6jG3RZMdNLM2scnCbX+Z6rNrbsTHaA78DA1Pr1P/zmxie Xyi4uKAZiiThInQW4nYGop2TXcCri+w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cvpmi-0005nD-BR; Wed, 05 Apr 2017 18:36:00 +0000 Received: from mail-pg0-f46.google.com ([74.125.83.46]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cvpmf-0005lc-0Q for linux-arm-kernel@lists.infradead.org; Wed, 05 Apr 2017 18:35:58 +0000 Received: by mail-pg0-f46.google.com with SMTP id g2so12182532pge.3 for ; Wed, 05 Apr 2017 11:35:33 -0700 (PDT) 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; bh=GKDYgv+CCEcuuwuxZ3Y+V1XRrLVTg7IAgbkEutsopy4=; b=EB66+PxcbWc66uu+6M2Dpml6RfEECKYmw06w8rjMjjt+XRQ3Ns3OyR5msSOwdmTj54 qwenVbWYi7eA87GQcFqVoXsUUCLcnMUvnh5ZnIjFcOhhbyfHbFYqug2nkhNdUrV/XZnT Sh4S6Xb9TGAKVG2dYA7ijrGxE3DrcIKnfPNnG/WV82LdQyetaaRlEp48L4EYagHeCA7H 7p5XCkbN2vAL+MB2U7TGt7PDcpLEa1p2EWSFrha1xwDN8hwsGIEQKR9C+8aDRbEq18lU JpAW3YwgxA5NRN7DysIDLnfj8hazx4dMPtdJ4njZW2uIQFQUCbRBRQdwKsb11U7QOUDg +PDg== X-Gm-Message-State: AFeK/H213x57h5ejAxW75EoXAVysM5YWaw9bMVOX15ODGXZbL7lMRlwbEqsl9Js8a5aBDrB/ X-Received: by 10.84.160.6 with SMTP id n6mr37467401pla.178.1491417332989; Wed, 05 Apr 2017 11:35:32 -0700 (PDT) Received: from mka.mtv.corp.google.com ([172.22.64.162]) by smtp.gmail.com with ESMTPSA id s87sm38883446pfa.29.2017.04.05.11.35.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 05 Apr 2017 11:35:32 -0700 (PDT) From: Matthias Kaehlcke To: Ard Biesheuvel , Greg Hackmann , Herbert Xu , "David S . Miller" , Catalin Marinas , Will Deacon , Robin Murphy Subject: [PATCH v2] crypto: arm64/sha: Add constant operand modifier to ASM_EXPORT Date: Wed, 5 Apr 2017 11:34:58 -0700 Message-Id: <20170405183458.193068-1-mka@chromium.org> X-Mailer: git-send-email 2.12.2.715.g7642488e1d-goog X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170405_113557_079483_C389BDB4 X-CRM114-Status: UNSURE ( 9.82 ) X-CRM114-Notice: Please train this message. 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: Grant Grundler , linux-kernel@vger.kernel.org, Michael Davidson , Matthias Kaehlcke , linux-crypto@vger.kernel.org, linux-arm-kernel@lists.infradead.org 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 The operand is an integer constant, make the constness explicit by adding the modifier. This is needed for clang to generate valid code and also works with gcc. Also change the constraint of the operand from 'I' ("Integer constant that is valid as an immediate operand in an ADD instruction", AArch64) to 'i' ("An immediate integer operand"). Based-on-patch-from: Greg Hackmann Signed-off-by: Greg Hackmann Signed-off-by: Matthias Kaehlcke Reviewed-by: Ard Biesheuvel --- Changes in v2: - Changed operand constraint from I to i - Updated commit message - Changed 'From' tag to 'Based-on-patch-from' arch/arm64/crypto/sha1-ce-glue.c | 2 +- arch/arm64/crypto/sha2-ce-glue.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/crypto/sha1-ce-glue.c b/arch/arm64/crypto/sha1-ce-glue.c index aefda9868627..6b520e3f3ab1 100644 --- a/arch/arm64/crypto/sha1-ce-glue.c +++ b/arch/arm64/crypto/sha1-ce-glue.c @@ -18,7 +18,7 @@ #include #define ASM_EXPORT(sym, val) \ - asm(".globl " #sym "; .set " #sym ", %0" :: "I"(val)); + asm(".globl " #sym "; .set " #sym ", %c0" :: "i"(val)); MODULE_DESCRIPTION("SHA1 secure hash using ARMv8 Crypto Extensions"); MODULE_AUTHOR("Ard Biesheuvel "); diff --git a/arch/arm64/crypto/sha2-ce-glue.c b/arch/arm64/crypto/sha2-ce-glue.c index 7cd587564a41..e3abe11de48c 100644 --- a/arch/arm64/crypto/sha2-ce-glue.c +++ b/arch/arm64/crypto/sha2-ce-glue.c @@ -18,7 +18,7 @@ #include #define ASM_EXPORT(sym, val) \ - asm(".globl " #sym "; .set " #sym ", %0" :: "I"(val)); + asm(".globl " #sym "; .set " #sym ", %c0" :: "i"(val)); MODULE_DESCRIPTION("SHA-224/SHA-256 secure hash using ARMv8 Crypto Extensions"); MODULE_AUTHOR("Ard Biesheuvel ");