From patchwork Tue Jun 19 19:26:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 139238 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp5598504lji; Tue, 19 Jun 2018 12:27:49 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJdeXmyYyYJBakNBuh0YVLcmG+j4hFvaquQHAVS2FJ/SuhxeYxuh+e/3Ik+wwdz1RXlU7qU X-Received: by 2002:a17:902:7c8b:: with SMTP id y11-v6mr19699689pll.222.1529436469696; Tue, 19 Jun 2018 12:27:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529436469; cv=none; d=google.com; s=arc-20160816; b=igfcn74upqCZT+BQtoowvLhTTFK88zjgCNwbUVeBcPySsb74wfknD9wl3dHugzcsB8 H+63Ia7OtXrd5jrpT/RTkQU295myTOZv90Z6NkbXgEV0GezjNmu2GT1diNGDiJ/wd0MW u9genJWsYzKbvuB6DqGtOib5lUl6Yp8xgIsOP965ZSeMHOsAtBrUaAMIiFvhc4p8dhxZ nWARxeTJ8pJEzlgXl09GbeexIvuz9ELoJ9NVCKipRbGnoseEna0ff97YqP1VBt+oVgBH X0IRIuK8zVvHbbtukdEzByl32wIXXAfNH1wwUZY9tF31Orbwt/XaTxrpj4e1HRRmaZhl fUgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=+OBAMFJ3adccbc6RuLENVKrKL2cU0VbU8cj5ndYBjdA=; b=H4E719Tpfor7PkILuHVD/ZZ28TIRo3GzoB2smAkAMmRB+Baj1bfY9Y9ucsnJ0LIxIS 2EgT8LKFOqCHNHWGTyrieyDkkgjB1N8cZKPZZrzbsgSmcUvCw+IvyKDnr9o2XochP5it GFYdl41FFwAodMZenJJcAHeHGlSDXGarr2QB/l6iVolXHtL5ljC68cJxjULKUQek8aBH qIf/nfMhX7vsJKHR9F9rCFLE3Q/GfbpkneSbToGYK6W3CZAs6uLauIPlwLD8Iz29yQWW l3siwCB090l3aBY0l1TLYboyqZrzqduER2XujXCE3RmhBXf5VV7XsEtTGuHGxvuR2Q52 7qGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=H5eBfVdv; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i64-v6si345685pgc.673.2018.06.19.12.27.49; Tue, 19 Jun 2018 12:27:49 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=H5eBfVdv; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967237AbeFST1r (ORCPT + 30 others); Tue, 19 Jun 2018 15:27:47 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:44800 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966747AbeFST1q (ORCPT ); Tue, 19 Jun 2018 15:27:46 -0400 Received: by mail-wr0-f195.google.com with SMTP id x4-v6so775944wro.11 for ; Tue, 19 Jun 2018 12:27:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=+OBAMFJ3adccbc6RuLENVKrKL2cU0VbU8cj5ndYBjdA=; b=H5eBfVdv9Dpmcfo9ZHgcyFeIQsBeiK9j8SjhTjeULski4C0rUvyEyJ5T5j5/LsMyCf bNpjivPOaapupJPwpmirVXdFx/XQiPkbZ5fsEb21sl2Xt4EwwLeZ+gUlhxr5nhO/e0rt u1wj76iOGGlSdjZUs9LxeXrXMEc9VmvvYZOPc= 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=+OBAMFJ3adccbc6RuLENVKrKL2cU0VbU8cj5ndYBjdA=; b=Ww7rEMo6eRoMx+iOO6aRQc0h9upZeQY2O2upemuVv5DjucSEhLfK+pZFhkFQcx2WgJ CvhsKTzqpJe0wQcTy/rJtK/3/DEsew11VEbo7VtwjwM3Jx73V/2mQF00RpSBwiX3P2ld 6Ft+upyMpmN/8HylZH8UzGGIkHElpd3U/G9DKBoTzYMR0mOhJIVoA8ux0c7zg7kb4bIF oz2/lUrcfIY/TIPcMvzojFmsvw3OjqjibQIzPErmt94oaV0Oy7aoK/8MN0DP+cfnwx25 wSsIvh+XG+qxNS9/qZOB10ah77R/iFmVbPTm2wHUPkjtZFZgVhPbqzjLh+Gvz4yv7hZ+ yJ2g== X-Gm-Message-State: APt69E3npA5nEmsxthKhdSeBXKGIBcvD5l/OuyM+S+0MCTRhwpL7m8Xt rPTiiapImnYf3ktJq+mNOS3ybQ== X-Received: by 2002:adf:e94e:: with SMTP id m14-v6mr15238567wrn.126.1529436464860; Tue, 19 Jun 2018 12:27:44 -0700 (PDT) Received: from dogfood.home ([2a01:cb1d:112:6f00:a06d:5653:4fd5:13a]) by smtp.gmail.com with ESMTPSA id c53-v6sm982601wrg.12.2018.06.19.12.27.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Jun 2018 12:27:43 -0700 (PDT) From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org Cc: linux@armlinux.org.uk, linux@roeck-us.net, mark.rutland@arm.com, arnd@arndb.de, linux-kernel@vger.kernel.org, Ard Biesheuvel Subject: [PATCH 0/2] Make badr macro compatible with newer GAS versions Date: Tue, 19 Jun 2018 21:26:31 +0200 Message-Id: <20180619192633.21846-1-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Work around the mindless and backward incompatible change in GAS that prevents us from using a simple addition to set the Thumb bit in local symbol references taken using 'adr' instructions (#2) As a preparatory step, remove badr occurrences in ARM code sequences contained in Thumb2 kernels. Ard Biesheuvel (2): ARM: avoid badr macro for switching to Thumb-2 mode ARM: assembler: prevent ADR from setting the Thumb bit twice arch/arm/common/mcpm_head.S | 5 ++--- arch/arm/include/asm/assembler.h | 22 +++++++++++++++++++- arch/arm/kernel/head-nommu.S | 7 +++---- arch/arm/kernel/head.S | 15 +++++++------ arch/arm/kernel/sleep.S | 7 +++---- 5 files changed, 36 insertions(+), 20 deletions(-) -- 2.17.1