From patchwork Wed Oct 9 00:04:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 833834 Delivered-To: patch@linaro.org Received: by 2002:adf:a1d9:0:b0:367:895a:4699 with SMTP id v25csp556693wrv; Tue, 8 Oct 2024 17:08:40 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXNvCybMu4T/dmRW9hNLtLRQwwEWDdT4Qomq2URQyegS5TcZnokpNjzDBSBQsIZN18f5zzFGA==@linaro.org X-Google-Smtp-Source: AGHT+IEsd6PzFXAscFR8yppmEmucwBXFTJ7fLiIkhV3SMruvsNHccpjkLQ95xT+0Q3HHxZ/zkOCw X-Received: by 2002:a05:620a:1987:b0:7a1:e2d4:4ff3 with SMTP id af79cd13be357-7b0795258c1mr97444985a.3.1728432520101; Tue, 08 Oct 2024 17:08:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728432520; cv=none; d=google.com; s=arc-20240605; b=JvWsKK+3XUsEwmv0pFr4MwiJ7s7hAy/2pOBOIneRT8woiqhpRkycxcByJv1XL4VBE1 fAlUJ/wf1S0w+jXOoHFkJXFkRCeA2ROB8q2qmdiOmGAuRjiQvdh7L24STRcf00ZRaKjT XA0aKEF0UH/GUdMAbp+02KwZSiuntrzNwxIsF5MsxO+nzss5+hsnC0XLx1HRMgRSFhoS atO/RY4psqc4nHJN2ERlc+YVDzszu9s3WieNe7KC5YcKiWjW5kdDyHyrBx6YJUVQj3Ys kcvsRNe4xKSM2xjWrxc32eFYhpHGsozcMwl0w3NVv/a8QO/trmiGPnPAUFUhy8zOLzaz l2BQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=zDNpltdoK5BIHBCpA0bLYhC/fVRvo8Z+4KE41wqkR3g=; fh=3RK8noKPsRgJpwHDkrKY6p9N6ePZuLOt1ZjdS1VodvU=; b=SewvXVOpU9j/oB1CCZsCmhOKWsg2G58QcS0983RFQzmtt7PwEs2+zrS/MQ+GlgnPwX QlfIX5Be2zwtQ0QXGHeEwPk0K5EZe/oCUtEc4dc6tXnohC71P3U21ZRIQh57z0H6evU1 Xq2o+C/cFd1Vbo6k9XaErT6uYCVK4/CzxWcu5q8wYhp7OlstEOl+o8Vp9f2vjORD1lb+ UkjCFCbaEhIdxFCpJUhsJpMlFI8ZCzSMxYtLBkp9m9nIEXxn2YgmW1HPJcWWGoSDGAKi ZIBDiQ0nHuv5mbs6CWRrcPxntQWs5KlVO9moUze1QgHaCyDh7OLfGVdominGSuRWuICF L9Tw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="U6kx0i/e"; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7afc81d2eafsi211361685a.273.2024.10.08.17.08.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 08 Oct 2024 17:08:40 -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="U6kx0i/e"; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1syKCh-0004XK-7K; Tue, 08 Oct 2024 20:05:23 -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 1syKCd-0004Ue-8F for qemu-devel@nongnu.org; Tue, 08 Oct 2024 20:05:19 -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 1syKCX-0002vq-5V for qemu-devel@nongnu.org; Tue, 08 Oct 2024 20:05:19 -0400 Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-20b49ee353cso58170815ad.2 for ; Tue, 08 Oct 2024 17:05:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1728432312; x=1729037112; darn=nongnu.org; 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=zDNpltdoK5BIHBCpA0bLYhC/fVRvo8Z+4KE41wqkR3g=; b=U6kx0i/eMPIC2ohHI1uR+zInnQ6YCT0aSvcGPSlIYD9YEIkfMpaYWWSR8Gyykz71ir jifEUmELtNrusQ9AOgBphnL7ISec98s4KXKF/G5/vctoTVgIKCfWPM6On4zQMLMcOy75 u7UHGTISRERk4N2e180b5eRCFzWT1nRVRQbbX683GkQz3mj/f0Q1eCDYMO5gMPCCe/G3 0ma3zqQCfq3HQzyLViJCo8CqeXbeNTNrkcCz/jQ4VN0X6T1rp/RurpERW0LshjPSY/w+ S5nS7uGD/NbfFcf5b46l/Gpym8JPiO+VLmfkrX6173aSyQHrl+V/Ndy5635n/EFE37Wl JcgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728432312; x=1729037112; 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=zDNpltdoK5BIHBCpA0bLYhC/fVRvo8Z+4KE41wqkR3g=; b=H3oTHY2d1kQV6jG5kwRfljIpDfh7PYPUsuP+vH/OJ0JUJup7bTvOqKJH4AzWYoys4w 37KxRa5AcZp8M4FrXZBDomGFqpstGl94r7lSOppyGaZJR21q80zK2WhmUZ7n0f/2B+dT lb3mNkO7YoPHoo/2eyoe13B+RtSgwXzu9gs8U8CRpTBTUmteadHLUE13iEvEOTjhwXIn EvQW4dvhhPQ0IGMu3lXXULP5IaVofNAjlmG4OGk7nU3XGAigVN4bD1ltaJexxJ0kcV0E 2rgAJk1dDh7XSjZ9vJJ4L3HWnjKzMlEvL461JIM7cup5xkuV2NcTek7j9JXU1hzko9sy LWHA== X-Gm-Message-State: AOJu0Yzy9+oCtg7g7AHD5+F2c1IkM9ru/Ki+07x7YLiPNe0zv4tBP+5Z /FlpYdSFuppH65a+in/m0kInog4XVMV2/qiHkQyzDt9tAqjpcTp+sSb5o3XbS8ESHTmDKYfE3mJ I X-Received: by 2002:a17:902:da8d:b0:20b:c258:2a74 with SMTP id d9443c01a7336-20c6373ce07mr11388505ad.29.1728432311644; Tue, 08 Oct 2024 17:05:11 -0700 (PDT) Received: from stoup.. (174-21-81-121.tukw.qwest.net. [174.21.81.121]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20c138cecf2sm60705105ad.104.2024.10.08.17.05.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Oct 2024 17:05:11 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: deller@kernel.org, peter.maydell@linaro.org, alex.bennee@linaro.org, linux-parisc@vger.kernel.org, qemu-arm@nongnu.org, Helge Deller , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v3 17/20] target/arm: Pass MemOp to get_phys_addr_lpae Date: Tue, 8 Oct 2024 17:04:50 -0700 Message-ID: <20241009000453.315652-18-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241009000453.315652-1-richard.henderson@linaro.org> References: <20241009000453.315652-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 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 Pass the value through from get_phys_addr_nogpc. Reviewed-by: Helge Deller Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/arm/ptw.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index f1fca086a4..238b2c92a9 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -1684,12 +1684,13 @@ static bool nv_nv1_enabled(CPUARMState *env, S1Translate *ptw) * @ptw: Current and next stage parameters for the walk. * @address: virtual address to get physical address for * @access_type: MMU_DATA_LOAD, MMU_DATA_STORE or MMU_INST_FETCH + * @memop: memory operation feeding this access, or 0 for none * @result: set on translation success, * @fi: set to fault info if the translation fails */ static bool get_phys_addr_lpae(CPUARMState *env, S1Translate *ptw, uint64_t address, - MMUAccessType access_type, + MMUAccessType access_type, MemOp memop, GetPhysAddrResult *result, ARMMMUFaultInfo *fi) { ARMCPU *cpu = env_archcpu(env); @@ -3534,7 +3535,8 @@ static bool get_phys_addr_nogpc(CPUARMState *env, S1Translate *ptw, } if (regime_using_lpae_format(env, mmu_idx)) { - return get_phys_addr_lpae(env, ptw, address, access_type, result, fi); + return get_phys_addr_lpae(env, ptw, address, access_type, + memop, result, fi); } else if (arm_feature(env, ARM_FEATURE_V7) || regime_sctlr(env, mmu_idx) & SCTLR_XP) { return get_phys_addr_v6(env, ptw, address, access_type, result, fi);