From patchwork Sun Oct 13 22:12:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 835093 Delivered-To: patch@linaro.org Received: by 2002:adf:b352:0:b0:37d:45d0:187 with SMTP id k18csp1735087wrd; Sun, 13 Oct 2024 15:14:44 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVhLyixwpK6YEnG8cfKs1KSMOi13IXWKfnpubRAXFjZYGXTX7d1qec5FKGW7L52IB4o3i5fNA==@linaro.org X-Google-Smtp-Source: AGHT+IHyjaUTdjYMqcENBlWBSqJGePgqPYBStY8baNNt00Noq8WGeJV4k26cAP3MlOz3i8YNhVKL X-Received: by 2002:a05:6214:468d:b0:6cb:f9cd:b400 with SMTP id 6a1803df08f44-6cbf9cdb498mr103378756d6.9.1728857683866; Sun, 13 Oct 2024 15:14:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728857683; cv=none; d=google.com; s=arc-20240605; b=bznLduxLYT3h31GfQrSk+73GYgE5lPxc1KU4LPWVClT1JfgEeGH3KDDwziMIJsq/oD KW1PBwQmL06m4Hp6JAlCLvuvD2zIk/JdfjaXvtp+Pxksxcy0C8pPgB5YEqoWQFJV904h soE/mNROYm1vVDh2LueD/xuCeoXp5XfjQ1yG6fBYeR2MzHcKpeF9PvJmltJ8cTaLej5F eK2gjwBrJvmShzHK3xJLTTO0SJj5BkNjiW281PU7gK4attuuP9Bub3ZiNDi60zD/kUuI JVOKo6x1hUzcEwp6smYuUeiyedqCRY0EAEYhrv5e3Y0t8BSkcDbFuobo1v5VSn9wBy4s 3q4w== 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=xQhK8NjjgW/kNvx5X1m22TpA6VVxTZtyOqTVcWaZJho=; fh=wDljmxUHXfz9MGj2//jPHYRc53BMWF157v8rVKELrf4=; b=QjUubS1iy4lnvHX7aUyu5RkolXh5zVZ3z8D0vnjRPNIYbdanuAXYdocAHCGmuhhKue xXz38jvAHPrmMTVLVemOaBqjTqSqul0BdB9LaMWLmzNSYI5pLAb+C547ua6uU4YvbD04 upftByIMSD7jTLZdHWIPhtiluy88zQLFla5HbE6j8sgRAIYTwge1vwVzZ4APPtSbhKBD wJNM8/UiQ5RCGhhkor23MA7axixF0oa9IVZqeJHoYio2AHhynVwlSS4JgftrjRN/hCvp uc30kPBZsQbE1eZz9XHwrH2psBU4XEzQ83q9YCfs9fmTzMKSlSpE6mcjgyegsxgX4lCZ eTsA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OTdi2pZT; 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 6a1803df08f44-6cbe86cb516si88444496d6.547.2024.10.13.15.14.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 13 Oct 2024 15:14:43 -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=OTdi2pZT; 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 1t06px-0007Fg-QZ; Sun, 13 Oct 2024 18:13:17 -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 1t06pb-0007BA-TH for qemu-devel@nongnu.org; Sun, 13 Oct 2024 18:12:55 -0400 Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t06pa-0000w3-Bf for qemu-devel@nongnu.org; Sun, 13 Oct 2024 18:12:55 -0400 Received: by mail-pj1-x1033.google.com with SMTP id 98e67ed59e1d1-2e30116efc9so1872749a91.2 for ; Sun, 13 Oct 2024 15:12:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1728857573; x=1729462373; 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=xQhK8NjjgW/kNvx5X1m22TpA6VVxTZtyOqTVcWaZJho=; b=OTdi2pZTE+Fn3O4JPFgZhKlCfD5zIAkUzIKSiUaGh9rC9Bwj4u4q4Y4KGkN2jOr9+e U34JHhzxBvLvRUSTHJ5IHBXwZaqvNVR4fub67YMKTD0kdi/2yp+bItc4iXevNM6Lfdea wsbLaNBPSTwOCHSVsLqvt4KU9OpIXbIx0SKMURfU3JsPlBc/CnSktiXWsrapbU0RlD9T tkfq2O5Ka6dmroLLNvppCDmHnL21hn4Fc60uQlhqnw09BvaItJgL4qOOaqXCMPsG6sPV +c+cKpJc7ffEeQ+gXwLY2rQpdbtoHA+G/U6/VrM4cc8zKrpOqPzSU0fyYdz8/bJFN9/B 23vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728857573; x=1729462373; 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=xQhK8NjjgW/kNvx5X1m22TpA6VVxTZtyOqTVcWaZJho=; b=wJOCthiL7eP4cDARtcVXHtTJMlAXh8FCF4t6Frl6iGrFKYX9NPW9rqQxZONxIojMbN O9WnFlFlPFnPRkIDlA78AiJR2ZY5QztwBY11b783zHDTLiKF/XXyEJNfsY2Anvpe6twm sEaS89y59idhWrfgquX19PRwvjN/MDnpTNVX41xC93c4++i7y7LR58Z35SeZLA0CpfoV fPx2CfGm26TPQkJTAqHiyUEXJ2CBBJ9gEQctTGES7oNBPqVqz+YWXL4mCmiCcQ1MVC2P /YV/mDcA8SaCuff4W2jJOugchCSgazeU9tw5JiGYzZHs/V4SE+g7uVnEKkp/IdX9GJxn uJUw== X-Gm-Message-State: AOJu0Yzmc+iY2YII4arANBQ3gDMzksxHUT9gA7rceFRozuQa2kvQzVX9 1ooC6u2DvqAAaWUNsAgWt7Y3fohFKIUCf9q47oq6K78484QGHRW6XrUOGoLQpFr4WFGtHTis5wz Q X-Received: by 2002:a17:90b:3015:b0:2e2:d434:8547 with SMTP id 98e67ed59e1d1-2e2f0a0f7a6mr12860504a91.7.1728857573108; Sun, 13 Oct 2024 15:12:53 -0700 (PDT) Received: from stoup.. (174-21-81-121.tukw.qwest.net. [174.21.81.121]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2e2d5df1eebsm7271958a91.17.2024.10.13.15.12.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Oct 2024 15:12:52 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Helge Deller Subject: [PULL 17/27] target/hppa: Handle alignment faults in hppa_get_physical_address Date: Sun, 13 Oct 2024 15:12:25 -0700 Message-ID: <20241013221235.1585193-18-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241013221235.1585193-1-richard.henderson@linaro.org> References: <20241013221235.1585193-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1033; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1033.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=ham 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 In Chapter 5, Interruptions, the group 3 exceptions lists "Unaligned data reference trap" has higher priority than "Data memory break trap". Reviewed-by: Helge Deller Signed-off-by: Richard Henderson --- target/hppa/mem_helper.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/target/hppa/mem_helper.c b/target/hppa/mem_helper.c index f71cedd7a9..d38054da8a 100644 --- a/target/hppa/mem_helper.c +++ b/target/hppa/mem_helper.c @@ -221,7 +221,7 @@ int hppa_get_physical_address(CPUHPPAState *env, vaddr addr, int mmu_idx, g_assert_not_reached(); } prot = PAGE_READ | PAGE_WRITE | PAGE_EXEC; - goto egress; + goto egress_align; } /* Find a valid tlb entry that matches the virtual address. */ @@ -323,6 +323,11 @@ int hppa_get_physical_address(CPUHPPAState *env, vaddr addr, int mmu_idx, } } + egress_align: + if (addr & ((1u << memop_alignment_bits(mop)) - 1)) { + ret = EXCP_UNALIGN; + } + egress: *pphys = phys; *pprot = prot;