From patchwork Sat May 20 16:26:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 684304 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp448076wrt; Sat, 20 May 2023 09:29:24 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ79IP5F0dXg4MlQ7WF8GS0dVzRXTEITDC+6IWIKggJsaGuCTCNrDpaWzMEHoY5NJsJQThmr X-Received: by 2002:ac8:5acd:0:b0:3f3:9013:5839 with SMTP id d13-20020ac85acd000000b003f390135839mr10738901qtd.23.1684600163986; Sat, 20 May 2023 09:29:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684600163; cv=none; d=google.com; s=arc-20160816; b=e3v6QhmEXkT26dyEuJXWZ+K2vcjh8nY9fdpsPMoEt6uxN0fYp147QAOAJlvypHNyrW +ysrh3hKJ3XjHmbUhLnDHlI63OPwvJG73oQ+IrrQTxDGhXf+uHYi3F+74kSkWakIIqb8 bXmRXoIcN3Morju5hiuKxmjl4AXYdEmdVmrrKUR6FJPNV5+q5L9Xn7eQDutfmKrPzskI bNAco0hvq/Lm3hwuGzTtvS9INKiiSpRPAywXvI2D+TwkNTbhjWz+hw+oczY5T3dFIl4D jeYNisDeQmXpBhCj8BJLHqO8IOmYCQ4sPpCJOhYtpOdzdl4PyXQehVqAYPuj1mkXoNvj fk5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=qaZpDDjPwlY2m7x6v9ar9hpPELeL8Q6hzaJ5d16jETI=; b=PG3wWx7/dHUnrbhpUXEozvHFpvRW3YXwOUfKNAUDhxqAp/lV+z02ABIPFQufmoQid6 Q43ZErKljGzazS9HjyCm0S9JEmHKuz7usiR69twfDZ3bfUX56HmMRF/+Hf2pXKPxlcdd O8ysTgXFdos2v/0T+R9W6RugaWtb1ZZJVSoqMx7/YF8pulDa6hnUTWPEiV4B432w2pKs TuK865pNF4qIN1UWwARxUHoo7KwgFf/l7Uow3ghvJ7uvJRU8krZgOBo6EtH2txe3uVhA AYVRTYQEW9zsFZseZeWAmJTfNfautC4Kdx1IwfJ74o2CNJKws6kGFrcjHsXnak53gDa4 uQjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="U2/mcl5/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id b1-20020ac87fc1000000b003f0abf74b20si1348834qtk.443.2023.05.20.09.29.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 20 May 2023 09:29:23 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="U2/mcl5/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q0PQK-0003ot-8b; Sat, 20 May 2023 12:27:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q0PQE-0003i4-U0 for qemu-devel@nongnu.org; Sat, 20 May 2023 12:27:12 -0400 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q0PQ8-0003Aq-Q6 for qemu-devel@nongnu.org; Sat, 20 May 2023 12:27:10 -0400 Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-1ae851f2a7dso11662285ad.0 for ; Sat, 20 May 2023 09:27:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684600022; x=1687192022; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qaZpDDjPwlY2m7x6v9ar9hpPELeL8Q6hzaJ5d16jETI=; b=U2/mcl5/P+7RETzri4waiMyUilkBv7sfeUJDAQF/mdwr6jDCvTX1jwvGvtYEg+KctE DYUMOlvF0E9a+ifbbgo5CfvJvkRFDGhnnTE5lQZq0IDWDgSMhLrNyOI/FA/kcyDsW016 f9YDA63+/UuJHRxMvYvUF2URHuEGGXQmSxJi//cvfrhDVKYbFNh6yAEWXj6IyQT5BuSH McEQnIWDL14nNfVPpoBA/JJKhrNcdMvNy8Gx53akC7aIhFFNJ13BlEwyTAOkWsPyLRMZ 9ftWFpO2D227iLt56McjV/fdqbDUtjUCGYKwM8LEkMjsq+HiG4CANQSzFcwAB80yehlZ uG7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684600022; x=1687192022; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qaZpDDjPwlY2m7x6v9ar9hpPELeL8Q6hzaJ5d16jETI=; b=baX87BB2XMo8xZ4TO6wvVWpyGjuZ/xXOPJQB8ot98ya2iIHbTOsvToYL/o9a7hqfwf JTtbd03fZXMZ+Q8b/G2u0eeQ+my9/4RJZE9eYV9UAv08cpwe2XM++90mViqpdFhkfusi sMV4YZ43qaxCTnKcELJPI4qu6t0fz9L+jzkC2IoGs4IB7xqYNovFn7RBUgeVrXBtzKRD 0Ocw020ARF6hpU7ovsloJN/8j/xxZpVRn2jVjgVGAXijpCsdaMmoqWkfIXo7Qy/z6FXV WlhRCJelUbQzuPbWYWQGHV48zMT6sR8ClGNbweujILgtt42EniRbnG8BK2iOzg5uGLAn OlDA== X-Gm-Message-State: AC+VfDwzufV6RJydVbsWNMKWceW6aIWe0UA5bibMRWRelKs1e9PtQYsI C4VHNCy3VfB7GUVpnRqtkLq4BMttNqXcHXESZz0= X-Received: by 2002:a17:902:e74e:b0:1a9:a408:a52f with SMTP id p14-20020a170902e74e00b001a9a408a52fmr10584163plf.24.1684600021975; Sat, 20 May 2023 09:27:01 -0700 (PDT) Received: from stoup.. ([2602:ae:1598:4c01:d078:d94e:cb2b:a055]) by smtp.gmail.com with ESMTPSA id d12-20020a170903230c00b001a5260a6e6csm1697104plh.206.2023.05.20.09.27.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 May 2023 09:27:01 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, David Hildenbrand , Ilya Leoshkevich Subject: [PATCH 18/27] target/s390x: Always use cpu_atomic_cmpxchgl_be_mmu in do_csst Date: Sat, 20 May 2023 09:26:25 -0700 Message-Id: <20230520162634.3991009-19-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230520162634.3991009-1-richard.henderson@linaro.org> References: <20230520162634.3991009-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::635; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x635.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Eliminate the CONFIG_USER_ONLY specialization. Signed-off-by: Richard Henderson Reviewed-by: David Hildenbrand --- Cc: qemu-s390x@nongnu.org Cc: David Hildenbrand Cc: Ilya Leoshkevich --- target/s390x/tcg/mem_helper.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/target/s390x/tcg/mem_helper.c b/target/s390x/tcg/mem_helper.c index b6cf24403c..bad789a742 100644 --- a/target/s390x/tcg/mem_helper.c +++ b/target/s390x/tcg/mem_helper.c @@ -1798,13 +1798,7 @@ static uint32_t do_csst(CPUS390XState *env, uint32_t r3, uint64_t a1, uint32_t ov; if (parallel) { -#ifdef CONFIG_USER_ONLY - uint32_t *haddr = g2h(env_cpu(env), a1); - ov = qatomic_cmpxchg__nocheck(haddr, cv, nv); -#else - MemOpIdx oi = make_memop_idx(MO_TEUL | MO_ALIGN, mem_idx); - ov = cpu_atomic_cmpxchgl_be_mmu(env, a1, cv, nv, oi, ra); -#endif + ov = cpu_atomic_cmpxchgl_be_mmu(env, a1, cv, nv, oi4, ra); } else { ov = cpu_ldl_mmu(env, a1, oi4, ra); cpu_stl_mmu(env, a1, (ov == cv ? nv : ov), oi4, ra);