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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 9AE48C433F5 for ; Mon, 28 Mar 2022 13:52:28 +0000 (UTC) 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:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=5mNvG0kiYJMRv3H6c+XRAl47lktRWUqtSYyhwT+8qe4=; b=hO1h1x8K3KNx+1 ODBp4hVVFGZD3YvSYkrbOBtyt0LmhHYj8KQsZN6Oc4o+q9T573RtzTpDqPhT6yZeSCFnaLkrEfTt1 0oP5VqxgD/bzLfkjPkbSYjsbf9p2dAsucqBP42rWa6u2Z/nC7d6Gzy+Iv8nI/yEF37wst5MQsqwVQ FGCvNGYYe9crfQ3N0NjXE7fo5RS5NA6/HVNhfhP+RJHg6L6U4bya7Z1RhKdLeiUBg1JpzsdO6QF41 xmLRTRy7gQF+ClaWlKBePRmQ4ep9gwZFYpsLqF8hHdszi410+zQOjV5Tfz7GZpoqSUFwWReVvAfwa 1w68MWEGVewjp4EthF0A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nYplj-008uoC-Vz; Mon, 28 Mar 2022 13:50:52 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nYpiT-008tW6-97 for linux-arm-kernel@lists.infradead.org; Mon, 28 Mar 2022 13:47:35 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 7A554611A6; Mon, 28 Mar 2022 13:47:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1DB1CC34110; Mon, 28 Mar 2022 13:47:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648475248; bh=HVFEYbfnYMbIqCz74gb3ApXzxkL64zPA4S9TbyJg0c0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e4Og+uqVD72TsJMHQcohIO0bKIv2zc5Mzw+ZtiZ9COLt2RpR3vpE6VCVzLHu+s7UB OV62867P1yaqHXrVBD1fmMC0sRUWNP1t3PM0ZBK4C1cQYavM8SR3y2n7Rc5WokgTxh UFCPUngls4+D1OVdWvUym+EGWIsuQdsKkHEWaCcuzwrPnXv708YU+m0oWQmGOisyi+ Lpr0URC8jB0ChnREHIESfTIYlBakNBqX2O2DBExRvsxus7N4/LpvA/LoXs//RJDGeU nD4blK72LdKGZHG0D3vuuwwGjFgL+o9vVh597OgKbisM+Wy0zWAj0tSE9/oC8RraqS E2I8NLiC+j3fQ== From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org, linux@armlinux.org.uk Cc: arnd@arndb.de, linus.walleij@linaro.org, Ard Biesheuvel Subject: [PATCH 2/6] ARM: spectre-bhb: fix loop8 sequence for Thumb2 Date: Mon, 28 Mar 2022 15:47:10 +0200 Message-Id: <20220328134714.205342-3-ardb@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220328134714.205342-1-ardb@kernel.org> References: <20220328134714.205342-1-ardb@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=663; h=from:subject; bh=HVFEYbfnYMbIqCz74gb3ApXzxkL64zPA4S9TbyJg0c0=; b=owEB7QES/pANAwAKAcNPIjmS2Y8kAcsmYgBiQbxaPnpW1o8e/yzOGKAs7OhVYK9ByVZNzeaMpqM8 wNOIlkCJAbMEAAEKAB0WIQT72WJ8QGnJQhU3VynDTyI5ktmPJAUCYkG8WgAKCRDDTyI5ktmPJHjyC/ 9iipJOkJtb3rmdaqE3yRIhDWYhyzgcxP2dUXLiLZNBWCvy0BkzkjUXua/sPhq3nVK8wRPjpZHAjHyI 0v5gL6ACBjy81D4jCTQxZUDkrvXn0Hv+8OSRAzEx9lXuau1mgVs2+ObC14Q+a+gityaLX44waoYHsr JWQGfVQ9s4CiVPcJRCVZnyrlcxEDsgzInIgy03sywv8+UY4IMvK9Urwzd5SMCv3TrEUrGea58od7A2 S6ZdKtY5++cKdGAMCfIvl0G7UfaWpIDe0LLD1tlELOpgOQWTMDdK+JHZ2mQF4fjky9wRMrf3dVzTWO hwev6KigkrQo2ZzFqkvivyNWB1wCUJcw2gyPG6wRMwE1RPe6p6zv+vYq42HCleGqk48oQJ8hfzifSp OdJsNoBh0KXLwvcOuCJ3Z47Hne1N3VbmXddz6sYL+QcoIdWC2zKdswhA73xmqKoaz8D/Cy9giNwLpB HMxn47pR2GvCaUdbF1EGLUvG3CM4q6nVeV8KKU1ymbAG8= X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220328_064729_485275_3E48C044 X-CRM114-Status: GOOD ( 11.41 ) 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 In Thumb2, 'b . + 4' produces a branch instruction that uses a narrow encoding, and so it does not jump to the following instruction as expected. So use W(b) instead. Signed-off-by: Ard Biesheuvel --- arch/arm/kernel/entry-armv.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index ee3f7a599181..4bbd92d41031 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -1040,7 +1040,7 @@ vector_bhb_loop8_\name: @ bhb workaround mov r0, #8 -3: b . + 4 +3: W(b) . + 4 subs r0, r0, #1 bne 3b dsb -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel