From patchwork Thu Mar 25 14:13:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 12164199 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 136D1C433DB for ; Thu, 25 Mar 2021 14:15:03 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8B93F619F8 for ; Thu, 25 Mar 2021 14:15:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8B93F619F8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version: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:In-Reply-To:References:List-Owner; bh=uXDrY9Li8Oi7+xWlBCJSg3Hb1MNjRWCivJAtAPZqtAY=; b=qxYgCXqvMyEp9dCvJ5gxdhjeLJ 0shjFGUPTbde3loq/V8qMroCo8bvrlkYpBCrohuS8eZ/grywPFdkupF6Henr2cCHURA8RYgcnCu5J 02pyrjpUneehOYnSx9jGwnGc+DIMoNQ/GUnzRLyTw5x719RWgJkmAbdb75lI+Lathm4svKZHFAnjj TxnAb3oBwH2D6g6LNUKISuYbeoNQr7h0gzTuskuupPd9TxiUw5cLXT5jgF+3DSKSUSue6ZvJtkAia 6Wwfu5qckaDIdUXhLi4Tjc0tFJBfFFnDk+a5J9jIRwUEJsQJDv4nKH0YJGRsnLnBrq0XYoXruZn51 vZUH/AfQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lPQjg-001abO-9H; Thu, 25 Mar 2021 14:13:20 +0000 Received: from mail-lf1-x130.google.com ([2a00:1450:4864:20::130]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lPQja-001aaO-1g for linux-arm-kernel@lists.infradead.org; Thu, 25 Mar 2021 14:13:18 +0000 Received: by mail-lf1-x130.google.com with SMTP id n138so2758259lfa.3 for ; Thu, 25 Mar 2021 07:13:13 -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:mime-version :content-transfer-encoding; bh=ZPwhqDyIUVsmwf7rSuSJ4sOR+qnQ9bFlOagIQX1W9xE=; b=pldmf10F177vuCu/5oRou8OZuw0uWxBrLAwyZt5Enuqdgfv4Hq/M6B89oD/F7LM9CN BTe5DA+CiV144qmtnlE52gbYjiMCnYVODRpvsMdR7LZ8jHVfWrObpcwxwDz9jQxEJPqD WXGt7+oXIeVzCKpyN/dgkHtOOTNRkR4VioKS2YJmABf+m3NdfVMH9kKG9vAwKeGqSlcw Aeo0f/cOFdmWFlsvfyAFwp9Oh3yUcKb5AakWsvGrROeNZHdPS8JyKeiJdopUfmeyYZ5z znFeqiKcGitj/5bMovgByHS973VMBQy4zFPWxCB6YzYVm1M6UqJtNJdTEMG7T9vWxaDx tavw== 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:mime-version :content-transfer-encoding; bh=ZPwhqDyIUVsmwf7rSuSJ4sOR+qnQ9bFlOagIQX1W9xE=; b=q6LHRAZz0xlRlYSdva1ZBF4VS13woUVZtD36/NIaau/DDEo42XmwBBsv5xYgT/FEjK VrAURpeqgmo65zGka+7e2/TvR5KMwHNzNvBbJeWmzWGfSiMLNuzlGQfxCZfZVckLFLLZ 4vAJj3OZoJNZpCUu0HTZ7EU6B4ZdJQPqg9f0Xw9rl91bOuTrKEWFxB8Xz93J4NDLiVyb jKtk34T1wOLjdtf3gG+ZWiwyUJF/KMR8O0QNvXtX6E+XJE9DC/ARLRynOhwcKCl167Jv vvxMGt8GLDdt/SC/ZMnh8kXf16bDbVySbmnHxpKWWRPNwdS19aNpRNmXUwFKie2DqC9T KlQA== X-Gm-Message-State: AOAM532AQHwHDnhss/NZtrX5l5R7/V8xES19bWCzPhPTKPMRUE5yeZMw v39umbrgCcPwxvVeRST+SUy/TZ2hy7eyyjsB74Q= X-Google-Smtp-Source: ABdhPJy8+F8AU1BONPxnqJgssKFiITudPuX/rNZPTduP/KfKJmp3WcxupRS1L7XsZhujHHL4CIQyCA== X-Received: by 2002:a19:e48:: with SMTP id 69mr4916013lfo.469.1616681592623; Thu, 25 Mar 2021 07:13:12 -0700 (PDT) Received: from localhost.localdomain (c-14cb225c.014-348-6c756e10.bbcust.telenor.se. [92.34.203.20]) by smtp.gmail.com with ESMTPSA id f20sm764475ljn.123.2021.03.25.07.13.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Mar 2021 07:13:12 -0700 (PDT) From: Linus Walleij To: Catalin Marinas , Will Deacon Cc: linux-arm-kernel@lists.infradead.org, Linus Walleij , Mark Rutland Subject: [PATCH] arm64: barrier: Remove spec_bar() macro Date: Thu, 25 Mar 2021 15:13:04 +0100 Message-Id: <20210325141304.1607595-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210325_141314_400926_9D8D418D X-CRM114-Status: GOOD ( 11.58 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The spec_bar() macro was introduced in commit bd4fb6d270bc ("arm64: Add support for SB barrier and patch in over DSB; ISB sequences") as a way for C to insert a speculation barrier and was then used in one single place: set_fs(). Later on commit 3d2403fd10a1 ("arm64: uaccess: remove set_fs()") deleted set_fs() altogether and as noted in the commit on the new path the regular sb() assembly macro will be used. Delete the remnant. Cc: Mark Rutland Fixes: 3d2403fd10a1 ("arm64: uaccess: remove set_fs()") Signed-off-by: Linus Walleij Acked-by: Mark Rutland --- arch/arm64/include/asm/barrier.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/arm64/include/asm/barrier.h b/arch/arm64/include/asm/barrier.h index c3009b0e5239..bab29932d21b 100644 --- a/arch/arm64/include/asm/barrier.h +++ b/arch/arm64/include/asm/barrier.h @@ -25,10 +25,6 @@ #define psb_csync() asm volatile("hint #17" : : : "memory") #define csdb() asm volatile("hint #20" : : : "memory") -#define spec_bar() asm volatile(ALTERNATIVE("dsb nsh\nisb\n", \ - SB_BARRIER_INSN"nop\n", \ - ARM64_HAS_SB)) - #ifdef CONFIG_ARM64_PSEUDO_NMI #define pmr_sync() \ do { \