From patchwork Fri Apr 26 18:22:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 162965 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp1060590jan; Fri, 26 Apr 2019 11:24:44 -0700 (PDT) X-Google-Smtp-Source: APXvYqzhYfZ0Nv2hvgzvriVTYvvSZr6Xr74/X5u9Nmeylou/usXLTl2htPp76HPUvqgKfMMaRKHR X-Received: by 2002:a7b:c347:: with SMTP id l7mr8528784wmj.70.1556303084797; Fri, 26 Apr 2019 11:24:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556303084; cv=none; d=google.com; s=arc-20160816; b=PQ/fBmRic8Ncqv7iekXIp0weuWARfIBr3T6qVusR3GqqJD/QvnDnWP7txeaZpf7Gg8 Wp2qsGpTN9AEBAgPK4q01AdZ0jH6JGqDcC3X7uVgd/0e0BfzfTOoYWLj+ws7yaGpdj4p 3grvjQzcaXLuwp72jwUM/tuhU4cfQVSibQH/kUikmUgUo4WvXAh7E/B+hNARPXSB+WM7 nAV0PXCeQkyfOezGbDcqB0POmP1++6iGuYFWJWBSV2k+72BSGHNEbZjinSLnT46wCmWf vG4HyFDypf3WkgNQSW/fgzMsF3cxrH6sphJbPzHLwDCzrAMJXHEJjo1Sxyvd6UB8342J Ww5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=4u8gKkpGR4aqCQFLKD9tFetlT7FI9TY2FudP4qiIP+A=; b=UCpfcTa8q2oYtyGBq5BLl4wNayTMpliG1LD2fBNV9svUqs0etBHFYeyTkPymYVxkq8 Nz4FIuZxJSgUiIJc6k4Bzytls/Q+vsS5AGHoscCb8F3GPM3vAa69esBv12hJ5cGWoPbY B9dnZ4oo478wPE4rXtYvDhBaYUydqKNWIZERBMcXCLm1qMd/DCZ+WuFMw9rMcSGFZx8N +ts+omqUuOniRYOmIGXaw7jJKPAYbPvzFcKHQpZHDylMEh9AbkBYAmH4VBYlOWsY/hNO u1F6+ZJoTmPJwzdS7qRNBodz5kedRLexabolHNAyo05OZMtA5Z/zxQJPAjO6B2h7qfJp Js9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=RjISiv8R; 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=fail (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 z10si2624155wmb.42.2019.04.26.11.24.44 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 26 Apr 2019 11:24:44 -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=fail header.i=@linaro.org header.s=google header.b=RjISiv8R; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:50545 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hK5Wd-0008Dn-OV for patch@linaro.org; Fri, 26 Apr 2019 14:24:43 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59449) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hK5UH-000654-0U for qemu-devel@nongnu.org; Fri, 26 Apr 2019 14:22:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hK5UG-0006ON-4X for qemu-devel@nongnu.org; Fri, 26 Apr 2019 14:22:17 -0400 Received: from mail-pg1-x52c.google.com ([2607:f8b0:4864:20::52c]:40847) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hK5UF-0006Nb-T8 for qemu-devel@nongnu.org; Fri, 26 Apr 2019 14:22:16 -0400 Received: by mail-pg1-x52c.google.com with SMTP id d31so1993096pgl.7 for ; Fri, 26 Apr 2019 11:22:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=4u8gKkpGR4aqCQFLKD9tFetlT7FI9TY2FudP4qiIP+A=; b=RjISiv8R+AINfNFxZa5MkHAHVCtpo2mGQnFrnRiqNKs1U+gnVmHxiFJsv+sNuxrE2T 1I8oAryan6bkzzqdOosChkHErHiBUkOWVKSnrrx53w5/zH7VzwPPCHUas4Le3zgpYytN C2BzpYpUgvtpcAU+X4UCnctWDs4/CutzjqeOJ6VT57YI2826o8L0hQVqrSnTsIiVjRhZ rDKr+b8fDfVEjI/HkowLduVxp0oBsI4fdNqgCfLbwGz74qxWc417wYGy3roGInXnZo6o Ugm3wctoGi8Wn7arRRFPG4WuJbQNeXsZ7gYVZQpnHozFxuksII4THnqjkU7OC2pInb7P 0bIw== 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; bh=4u8gKkpGR4aqCQFLKD9tFetlT7FI9TY2FudP4qiIP+A=; b=TjJNq3ur1+zZUPLE6nbRxYofmvXsUo0d3AYcPTkidJ9tSVKrdA2AyR+OKbzzthRdko sEXOYeViCex5HW2Dmeg7nCVkbBnWBSF8RCsvlF8eW9s1D9+7t2pScHKB7MIr/Cfwiq5W /wzadz2b0jcjEG7rCjM7nQxrGo0ebmJvlFo2aZXv4MaL6LXqjynNy65VX0fnq3Apdbmh xlnxP5esJUKtqCaxhM4LN/8gos5QRaXcFeHQl9tiI6GzyXzV22Ldnr6Ilp/wW6vGfHCZ VUT90vwiUnvlUnfkizWSpHLyzrd09NG5cgajmsgVd6HuYxlkwrnRKgRjGvhNOH0o4NZd dqYw== X-Gm-Message-State: APjAAAW6dYW8sJYS9UpzMbh54Ozb01uBku9UOwB+rV8DBH3xswrsse25 35Psr8J68Ml85PRzc5UdCnUM7pTeo60= X-Received: by 2002:a63:243:: with SMTP id 64mr44676764pgc.214.1556302934530; Fri, 26 Apr 2019 11:22:14 -0700 (PDT) Received: from localhost.localdomain (97-113-179-147.tukw.qwest.net. [97.113.179.147]) by smtp.gmail.com with ESMTPSA id c28sm15977095pgm.42.2019.04.26.11.22.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Apr 2019 11:22:13 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 26 Apr 2019 11:22:10 -0700 Message-Id: <20190426182210.10442-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190426182210.10442-1-richard.henderson@linaro.org> References: <20190426182210.10442-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::52c Subject: [Qemu-devel] [PULL 2/2] target/hppa: Always return EXCP_DMAR for protection id trap X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Nick Hudson , peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Nick Hudson The EXCP_DMP trap is considered legacy. "In PA-RISC 1.1 (Second Edition) and later revisions, processors must use traps 26, 27,and 28 which provide equivalent functionality" Signed-off-by: Nick Hudson Message-Id: <20190423063621.8203-3-nick.hudson@gmx.co.uk> Signed-off-by: Richard Henderson --- target/hppa/mem_helper.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 2.17.1 diff --git a/target/hppa/mem_helper.c b/target/hppa/mem_helper.c index c9b57d07c3..77fb544838 100644 --- a/target/hppa/mem_helper.c +++ b/target/hppa/mem_helper.c @@ -154,8 +154,7 @@ int hppa_get_physical_address(CPUHPPAState *env, vaddr addr, int mmu_idx, if (unlikely(!(prot & type))) { /* The access isn't allowed -- Inst/Data Memory Protection Fault. */ - ret = (type & PAGE_EXEC ? EXCP_IMP : - prot & PAGE_READ ? EXCP_DMP : EXCP_DMAR); + ret = (type & PAGE_EXEC) ? EXCP_IMP : EXCP_DMAR; goto egress; }