From patchwork Thu Jan 25 13:43:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 125852 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp1132439ljf; Thu, 25 Jan 2018 06:02:47 -0800 (PST) X-Google-Smtp-Source: AH8x224Wjo8uUWoKhmMvmATMbAcFcIH4QG5bCKyadnGHeFgerTTEmwftypEqGrpL/KJ4Jznu5Wow X-Received: by 10.37.145.12 with SMTP id v12mr8742506ybl.134.1516888967102; Thu, 25 Jan 2018 06:02:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516888967; cv=none; d=google.com; s=arc-20160816; b=lH80eCK76Erh/30rw5eBmiTztRxIv11K4MWX4CnX+wPJjzWr/COhyzYvBRfWyEzUyG g6SpHXUYlrk2MQqIOev1MPKS4XvxLdRiHNI1UkcdpsviYmRi69PmSpjr10EmpxR8AaeC LnuSJSNuOJAOurB/tGgFlWWO7Mn8+w5dem2+GgzEuol9KjcRSOFllhPvgJReLrMdyAxr JFpi7uxI4Wnm/NRa2ylhucRL5pJA9epj/KMXr5D8Y/kjL1MADW/+Z7j+6vfJ8sdq94si yh+FFEtEzWcwI+eBCdVj4VVisA9OlKRTWOrz4Xkcfgv4sxHXVC2INIlEVO3eRFoYQASi mHXA== 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:subject:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=JIb0WT0+vemU9rlqRnNaBg4ib06X5mkh+ViOzvflWFg=; b=tZ/qgUexHRUVk5wPDKDTyLhJsAvWIEAYAVjMdxRnh+QE0ArAUTeDcom33lJRnBhEOh zOrw2Ow6Bq28lxgJ9fue56Cvj7x0zU0jJ0b1tHYpgYjrCJxEREJ5SwgHeZs9/qenpapf yw+dXu9G1T0/w93urwV7wmLM9flj9J07vIJVzwRxL8dfplvUSbq3ibEveJ4Cm6jnJK6A ccndidCG4M+C7CCMhcTHM1VHAagOcRDtRdjZcdp5EkTYOsfvARJE5/FnVt1gqU9cXjxL fP9FIw1IW+RsH2xomM/wQw0vkLj+RjoRchMhEC8OPRUMU5VJViks4JWmbcMzis0RrtF+ q/og== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id m30si484066ywh.359.2018.01.25.06.02.46 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 25 Jan 2018 06:02:47 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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 ([::1]:41956 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eei74-0002Aj-Ho for patch@linaro.org; Thu, 25 Jan 2018 09:02:46 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33805) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eehoo-0003M8-73 for qemu-devel@nongnu.org; Thu, 25 Jan 2018 08:43:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eehoi-0003Ay-DY for qemu-devel@nongnu.org; Thu, 25 Jan 2018 08:43:54 -0500 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:45992) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eehoi-0003AO-5g for qemu-devel@nongnu.org; Thu, 25 Jan 2018 08:43:48 -0500 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1eehog-0006x9-PI for qemu-devel@nongnu.org; Thu, 25 Jan 2018 13:43:46 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 25 Jan 2018 13:43:25 +0000 Message-Id: <1516887809-6265-18-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516887809-6265-1-git-send-email-peter.maydell@linaro.org> References: <1516887809-6265-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 17/21] hw/intc/arm_gic: Fix the NS view of C_BPR when C_CTRL.CBPR is 1 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Luc MICHEL When C_CTRL.CBPR is 1, the Non-Secure view of C_BPR is altered: - A Non-Secure read of C_BPR should return the BPR value plus 1, saturated to 7, - A Non-Secure write should be ignored. Signed-off-by: Luc MICHEL Message-id: 20180119145756.7629-6-luc.michel@greensocs.com Reviewed-by: Peter Maydell [PMM: fixed comment typo] Signed-off-by: Peter Maydell --- hw/intc/arm_gic.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) -- 2.7.4 diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c index b7989d2..724bc9f 100644 --- a/hw/intc/arm_gic.c +++ b/hw/intc/arm_gic.c @@ -1212,8 +1212,13 @@ static MemTxResult gic_cpu_read(GICState *s, int cpu, int offset, break; case 0x08: /* Binary Point */ if (s->security_extn && !attrs.secure) { - /* BPR is banked. Non-secure copy stored in ABPR. */ - *data = s->abpr[cpu]; + if (s->cpu_ctlr[cpu] & GICC_CTLR_CBPR) { + /* NS view of BPR when CBPR is 1 */ + *data = MIN(s->bpr[cpu] + 1, 7); + } else { + /* BPR is banked. Non-secure copy stored in ABPR. */ + *data = s->abpr[cpu]; + } } else { *data = s->bpr[cpu]; } @@ -1286,7 +1291,12 @@ static MemTxResult gic_cpu_write(GICState *s, int cpu, int offset, break; case 0x08: /* Binary Point */ if (s->security_extn && !attrs.secure) { - s->abpr[cpu] = MAX(value & 0x7, GIC_MIN_ABPR); + if (s->cpu_ctlr[cpu] & GICC_CTLR_CBPR) { + /* WI when CBPR is 1 */ + return MEMTX_OK; + } else { + s->abpr[cpu] = MAX(value & 0x7, GIC_MIN_ABPR); + } } else { s->bpr[cpu] = MAX(value & 0x7, GIC_MIN_BPR); }