From patchwork Mon Sep 21 11:51:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1368300 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=Ank3f5kg; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bw2r90JJgz9sV0 for ; Mon, 21 Sep 2020 21:52:56 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A3FE582567; Mon, 21 Sep 2020 13:52:16 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Ank3f5kg"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7E26282556; Mon, 21 Sep 2020 13:52:04 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qt1-x841.google.com (mail-qt1-x841.google.com [IPv6:2607:f8b0:4864:20::841]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 14A0582549 for ; Mon, 21 Sep 2020 13:52:01 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=seanga2@gmail.com Received: by mail-qt1-x841.google.com with SMTP id e7so11891720qtj.11 for ; Mon, 21 Sep 2020 04:52:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RldxFTNey5QQgKiSb6ASq56KSa5M/nbmnG3QDOrTxPo=; b=Ank3f5kgNfCT+QHHRURvtrk/CRqqHXhEgwWFW+3MzWbjXWao+nw3AYvoCFgo+mQjS1 ourCVGBeDGBHpV22stTXUhyLUnLQUuT0CSEMrglvDRbSbL8o1rNhRYrWIA/5p3/I6lU0 3jC4+lBGwcyUvWXsaoVGlTpM9jmR9c+Y9OUipJhPqB78sGwPVl8PSddx/l4BR4zPjkWm lhUSXNqH/aatYK+s5hQmLUtwMTwpNt2Jqr8PMJytN7cqRnksFFf5648afrp+2KCTiJ6p 3gP3xm7BpJqp0MzyZ3rupV4ny8fqkgtfUZ1fgj9Nr5Q/u0fqDxaPplI+uX5GD6LE8scP F1Pg== 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=RldxFTNey5QQgKiSb6ASq56KSa5M/nbmnG3QDOrTxPo=; b=V3J1pmqGyv31h6bcP0+8CXFgicqAXdpb59MBgsaqVuji7Ilbdy2IHrqM51Dy2n+orJ 9FEFGZCUH7K+oYKxb5GMMQuWdiDd/O6KixiJ65pmS+ZwYHBBRXfryA6mZTbExkO5QXLP IAfeGkbNMnW4gFS+BLisPioKpNCu85YMn+zY+y4tmjZP4BRyp9Ou5BLqCHjq/0H+O/nP +/qqKmSVAI+baGdmGsmWpqdS1xpXDuatdLO53+HGX2nBe1vXAT+T3XeDNCGD6PWt5tr9 N/uKmd43cjjj5hhaNqvO2cWAZKn7wkwhveBO8Kkyg8o+m8QJ4t7MR/ht6++JeotG+sez NFqg== X-Gm-Message-State: AOAM532Z5zauAZhhRXhNNZ8wiTxo113DftTmAWeQEGAcfXRfmV6wyuWu Fy7/r1TUQsnHD0b6C0D3Qpg8tzvykjpplw== X-Google-Smtp-Source: ABdhPJyZWifWuegPXCQkaJBp9Qa/ODeWxhZafqsGyXWdyOaalCxi3hJkaEoRiFId/d/ug59FTnXyNA== X-Received: by 2002:ac8:3f3d:: with SMTP id c58mr355378qtk.53.1600689119806; Mon, 21 Sep 2020 04:51:59 -0700 (PDT) Received: from godwin.fios-router.home (pool-108-51-35-162.washdc.fios.verizon.net. [108.51.35.162]) by smtp.gmail.com with ESMTPSA id c70sm8658105qkg.4.2020.09.21.04.51.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Sep 2020 04:51:59 -0700 (PDT) From: Sean Anderson To: u-boot@lists.denx.de Cc: Heinrich Schuchardt , Rick Chen , alankao@andestech.com, Leo Liang , Bin Meng , Sean Anderson , Bin Meng , Rick Chen Subject: [PATCH v3 5/7] riscv: Consolidate fences into AMOs for available_harts_lock Date: Mon, 21 Sep 2020 07:51:39 -0400 Message-Id: <20200921115141.70598-6-seanga2@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200921115141.70598-1-seanga2@gmail.com> References: <20200921115141.70598-1-seanga2@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean We can reduce the number of instructions needed to use available_harts_lock by using the aq and rl suffixes for AMOs. Signed-off-by: Sean Anderson Reviewed-by: Bin Meng Reviewed-by: Rick Chen --- (no changes since v2) Changes in v2: - Remove fences after amoswaps - Reword commit message arch/riscv/cpu/start.S | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/riscv/cpu/start.S b/arch/riscv/cpu/start.S index e3222b1ea7..66ca1c7020 100644 --- a/arch/riscv/cpu/start.S +++ b/arch/riscv/cpu/start.S @@ -125,14 +125,12 @@ call_board_init_f_0: #ifndef CONFIG_XIP la t0, available_harts_lock - fence rw, w - amoswap.w zero, zero, 0(t0) + amoswap.w.rl zero, zero, 0(t0) wait_for_gd_init: la t0, available_harts_lock li t1, 1 -1: amoswap.w t1, t1, 0(t0) - fence r, rw +1: amoswap.w.aq t1, t1, 0(t0) bnez t1, 1b /* register available harts in the available_harts mask */ @@ -142,8 +140,7 @@ wait_for_gd_init: or t2, t2, t1 SREG t2, GD_AVAILABLE_HARTS(gp) - fence rw, w - amoswap.w zero, zero, 0(t0) + amoswap.w.rl zero, zero, 0(t0) /* * Continue on hart lottery winner, others branch to