From patchwork Wed Mar 3 17:05:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Thierry X-Patchwork-Id: 12114571 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=-16.8 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 1F57DC433DB for ; Wed, 3 Mar 2021 23:43:32 +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 031BB60C41 for ; Wed, 3 Mar 2021 23:43:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 031BB60C41 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com 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: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=RN/9WR6aXV6EowcBqh8zZtK9+OYhch7Co9TtBOKNYeY=; b=dcZiqB7Q6GA0CFRSj5qim/Ocx wgfX1inTcipTNoqq+NKyKYGmnJZmSrfmL7zbiFKBx83J0VR2rVBmw1oPZC1f4xRfeNQ/zEgHlx87h d0B3dPcxpgwcMxEvH5KlBdJ0JNckK92hUfKh2ilJMOboTdFDjyQQqPmzGpyOtDE3SzSShTz/B2dn+ 1DI72PaS6N7M3uywVuhVWu3mxv4XO3/9PII7AmDFHYMIp9tfY8xvbEw2R25nzhWeFxYWBGWetFtSO 4cxkrOWBBevuoGiFb6SpO+qgdj8/1kPEFgPCGdfJpHQzqFxWmz8AB4niEIvgUc4hdBuwxda5HTI4x dwYo5E+nA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lHb4F-006zbD-Ib; Wed, 03 Mar 2021 23:38:15 +0000 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lHUyN-005jTI-KO for linux-arm-kernel@lists.infradead.org; Wed, 03 Mar 2021 17:07:47 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614791262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=L6Xn+u33CPNxO4HFinhCXFka/RB/0sOFe6x8iRrvQEw=; b=SQpPwcaVVETatU0xUURJhxqQ0uin7H9sg6znajNMR0f4ueOoPgX3IRJUmDW4e13vKTfo03 RFHJ2bW36gcDX3peFMOs0ygjkk4o2fS9PhN/Ofuv7MmtFmyoeXNeQp0F0oBEqK7xCmmu/F dmKGxmvlD+70kPDjXZpcpaY9TCy+Bcc= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-496-wMxd_JLVPgGOEOmWs_zAgw-1; Wed, 03 Mar 2021 12:06:07 -0500 X-MC-Unique: wMxd_JLVPgGOEOmWs_zAgw-1 Received: by mail-wm1-f72.google.com with SMTP id y9so2066226wma.4 for ; Wed, 03 Mar 2021 09:06:07 -0800 (PST) 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=L6Xn+u33CPNxO4HFinhCXFka/RB/0sOFe6x8iRrvQEw=; b=jJjqzGFgy4PdoVFf9ys9mNaIim+Ud9nUNFHX6XypbqEutSHtUe8NMnYXdVvZu/D+8x ZqrJSH+j2sul3erwdHlc9+9oc2uL8ardat6acicFWq4hbjH/fv4tpTAdHe3lIWB5Q9z4 FFTPSqnkL9NX01+nSnrv3Y2c7HMDrwWHfpK6rk6PfuuL60tz5tbwGQ75K0EkSrOEQ3/c CaZIF2uGZJLuOIdZgSOD5KOa02rr0y30N5hFjx/s+j4wot/C4WNBG3I0yzqvYPAwYgBa GNKiXgCs7amLO9+uT27kKp0c6elcc4pg8onpvh/35ZMgKSqxD992ifY84WA15e8V/0nh Af+A== X-Gm-Message-State: AOAM530rKVMFsHHrOq0a2oRWkn898IT/0qYMovh07BX9e/TrIE2K+UFq 2SyLC3AgsBSnJDzCe1NcnXfbZh/amQVs1QNJgCzPjgqzFreqxDnQD6e1WnYRHfgYUfemTPVpL5L j2LE+VzDWZYwBFeB2abQe/v+sNfbjWp9KduA= X-Received: by 2002:adf:ebc9:: with SMTP id v9mr28671226wrn.387.1614791166005; Wed, 03 Mar 2021 09:06:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJwpZBXzvFoGUuSttyR1nFY9YigBcVkN3UpeHTBedmmsMa9WDXR2BdsJ4M3u3ibeINwYxZYl7Q== X-Received: by 2002:adf:ebc9:: with SMTP id v9mr28671202wrn.387.1614791165608; Wed, 03 Mar 2021 09:06:05 -0800 (PST) Received: from redfedo.redhat.com ([2a01:cb14:499:3d00:cd47:f651:9d80:157a]) by smtp.gmail.com with ESMTPSA id d29sm32957827wra.51.2021.03.03.09.06.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Mar 2021 09:06:05 -0800 (PST) From: Julien Thierry To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: catalin.marinas@arm.com, will@kernel.org, mark.rutland@arm.com, broonie@kernel.org, ycote@redhat.com, Julien Thierry Subject: [RFC PATCH v2 6/8] arm64: insn: Add barrier encodings Date: Wed, 3 Mar 2021 18:05:34 +0100 Message-Id: <20210303170536.1838032-7-jthierry@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20210303170536.1838032-1-jthierry@redhat.com> References: <20210303170536.1838032-1-jthierry@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jthierry@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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 Create necessary functions to encode/decode aarch64 barrier instructions. DSB needs special case handling as it has multiple encodings. Signed-off-by: Julien Thierry --- arch/arm64/include/asm/insn.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/arch/arm64/include/asm/insn.h b/arch/arm64/include/asm/insn.h index b55b629c5eab..185f52ef0228 100644 --- a/arch/arm64/include/asm/insn.h +++ b/arch/arm64/include/asm/insn.h @@ -370,6 +370,14 @@ __AARCH64_INSN_FUNCS(eret_auth, 0xFFFFFBFF, 0xD69F0BFF) __AARCH64_INSN_FUNCS(mrs, 0xFFF00000, 0xD5300000) __AARCH64_INSN_FUNCS(msr_imm, 0xFFF8F01F, 0xD500401F) __AARCH64_INSN_FUNCS(msr_reg, 0xFFF00000, 0xD5100000) +__AARCH64_INSN_FUNCS(dmb, 0xFFFFF0FF, 0xD50330BF) +__AARCH64_INSN_FUNCS(dsb_base, 0xFFFFF0FF, 0xD503309F) +__AARCH64_INSN_FUNCS(dsb_nxs, 0xFFFFF3FF, 0xD503323F) +__AARCH64_INSN_FUNCS(isb, 0xFFFFF0FF, 0xD50330DF) +__AARCH64_INSN_FUNCS(sb, 0xFFFFFFFF, 0xD50330FF) +__AARCH64_INSN_FUNCS(clrex, 0xFFFFF0FF, 0xD503305F) +__AARCH64_INSN_FUNCS(ssbb, 0xFFFFFFFF, 0xD503309F) +__AARCH64_INSN_FUNCS(pssbb, 0xFFFFFFFF, 0xD503349F) #undef __AARCH64_INSN_FUNCS @@ -381,6 +389,20 @@ static inline bool aarch64_insn_is_adr_adrp(u32 insn) return aarch64_insn_is_adr(insn) || aarch64_insn_is_adrp(insn); } +static inline bool aarch64_insn_is_dsb(u32 insn) +{ + return (aarch64_insn_is_dsb_base(insn) && (insn & 0xb00)) || + aarch64_insn_is_dsb_nxs(insn); +} + +static inline bool aarch64_insn_is_barrier(u32 insn) +{ + return aarch64_insn_is_dmb(insn) || aarch64_insn_is_dsb(insn) || + aarch64_insn_is_isb(insn) || aarch64_insn_is_sb(insn) || + aarch64_insn_is_clrex(insn) || aarch64_insn_is_ssbb(insn) || + aarch64_insn_is_pssbb(insn); +} + enum aarch64_insn_encoding_class aarch64_get_insn_class(u32 insn); bool aarch64_insn_uses_literal(u32 insn); bool aarch64_insn_is_branch(u32 insn);