Message ID | 20180723201748.25573-50-mdroth@linux.vnet.ibm.com |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.vnet.ibm.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="jj3FGeng"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41ZDFb1VDbz9ryn for <incoming@patchwork.ozlabs.org>; Tue, 24 Jul 2018 06:52:19 +1000 (AEST) Received: from localhost ([::1]:36530 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1fhhoW-0004UO-SY for incoming@patchwork.ozlabs.org; Mon, 23 Jul 2018 16:52:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42006) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <flukshun@gmail.com>) id 1fhhJa-0002nP-I9 for qemu-devel@nongnu.org; Mon, 23 Jul 2018 16:20:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <flukshun@gmail.com>) id 1fhhJX-0004a5-V4 for qemu-devel@nongnu.org; Mon, 23 Jul 2018 16:20:18 -0400 Received: from mail-oi0-x236.google.com ([2607:f8b0:4003:c06::236]:38211) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <flukshun@gmail.com>) id 1fhhJX-0004YK-Hr; Mon, 23 Jul 2018 16:20:15 -0400 Received: by mail-oi0-x236.google.com with SMTP id v8-v6so3479099oie.5; Mon, 23 Jul 2018 13:20:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=ruUlhOHSjmk6vIvU6TnBO/dR9LR2hmjWRxSNwnk8CnE=; b=jj3FGeng1oudZDTaqMB+2A+EzRPaTcVIDmsSAdXyJ7T/ZRWYS6Zb+CTDxh4ybHzIlx SHKCu9TF8nOD3FtxxkE9QmrSdUyJswb4Ff34JbgmGmIzWoFx6v5tQU0KSwGQYfz8EF6P Bi6JtBgt6H4YztrdJSvlPVxeEbjwdx4uO6MosMusceTHS9QDGwjIkuWjAEbDmn6IS/1e /D2CbptpXDjlsdHI4ugENI8UPEfk3x5TtuTRLvWx7s9qXIVgwqSwPPb/mrbgfn/jaHNP z/zk7ahXtjrP+ynAIt/dgKH0LC9ecBifRCLnRktR8WIumYCboO3mREJYfWhEY4CiDr0z DVMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=ruUlhOHSjmk6vIvU6TnBO/dR9LR2hmjWRxSNwnk8CnE=; b=HH/IsdZYd1AZRrpkNzOUb9Gcskyri2/HgrmQWtld73YXxdOEfNOtZqF/ZQB7t9fsqy JDzYdRLZb26+WwjFbvNiP3lQe80laxlmDk1s0evQCk3r/fEpNp1HqlmgQuNrwBUkRMC1 Z6jxSx+adAxxuwNl87VAaIVD/xDcv+S4LnbSGIR0Zhwrxov7MBfYh0sdYobxS8NJ179l 2N8GrPZEeyPqmVKyuuRFtZCqaScD4g79o7NoWqJSw7BoaPv2FuB2g5xif5FkY4kpUf6T z5QQfZY00eLZTWQ/+hNLRXoST4reYwJl/mjm5cps7TAMw08n0dccg8HFGiufrtcXyCB4 Q73Q== X-Gm-Message-State: AOUpUlEFvQ9iHyjDYNfHYaQPw/5z3oLKp1t7AGL+Axqz7ovgo9a9cPy+ G+JZALOsnjAYdIUxK1hMe3laDbE88Uw= X-Google-Smtp-Source: AAOMgpeYpPIjtYKloULauCXUADK2X50p2iKd+tjHNJujzK0QgYeHQU5NaRauSIaQ5D0aZDUbe9jc6A== X-Received: by 2002:aca:a12:: with SMTP id 18-v6mr289552oik.292.1532377214388; Mon, 23 Jul 2018 13:20:14 -0700 (PDT) Received: from localhost (76-251-165-188.lightspeed.austtx.sbcglobal.net. [76.251.165.188]) by smtp.gmail.com with ESMTPSA id i3-v6sm8783514oiy.12.2018.07.23.13.20.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 23 Jul 2018 13:20:13 -0700 (PDT) From: Michael Roth <mdroth@linux.vnet.ibm.com> To: qemu-devel@nongnu.org Date: Mon, 23 Jul 2018 15:16:58 -0500 Message-Id: <20180723201748.25573-50-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180723201748.25573-1-mdroth@linux.vnet.ibm.com> References: <20180723201748.25573-1-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4003:c06::236 Subject: [Qemu-devel] [PATCH 49/99] arm_gicv3_kvm: kvm_dist_get/put_priority: skip the registers banked by GICR_IPRIORITYR X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: Peter Maydell <peter.maydell@linaro.org>, qemu-stable@nongnu.org, Shannon Zhao <zhaoshenglong@huawei.com> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
Patch Round-up for stable 2.12.1, freeze on 2018-07-30
|
expand
|
diff --git a/hw/intc/arm_gicv3_kvm.c b/hw/intc/arm_gicv3_kvm.c index 81cbd16817..bc6fa415b2 100644 --- a/hw/intc/arm_gicv3_kvm.c +++ b/hw/intc/arm_gicv3_kvm.c @@ -135,7 +135,14 @@ static void kvm_dist_get_priority(GICv3State *s, uint32_t offset, uint8_t *bmp) uint32_t reg, *field; int irq; - field = (uint32_t *)bmp; + /* For the KVM GICv3, affinity routing is always enabled, and the first 8 + * GICD_IPRIORITYR<n> registers are always RAZ/WI. The corresponding + * functionality is replaced by GICR_IPRIORITYR<n>. It doesn't need to + * sync them. So it needs to skip the field of GIC_INTERNAL irqs in bmp and + * offset. + */ + field = (uint32_t *)(bmp + GIC_INTERNAL); + offset += (GIC_INTERNAL * 8) / 8; for_each_dist_irq_reg(irq, s->num_irq, 8) { kvm_gicd_access(s, offset, ®, false); *field = reg; @@ -149,7 +156,14 @@ static void kvm_dist_put_priority(GICv3State *s, uint32_t offset, uint8_t *bmp) uint32_t reg, *field; int irq; - field = (uint32_t *)bmp; + /* For the KVM GICv3, affinity routing is always enabled, and the first 8 + * GICD_IPRIORITYR<n> registers are always RAZ/WI. The corresponding + * functionality is replaced by GICR_IPRIORITYR<n>. It doesn't need to + * sync them. So it needs to skip the field of GIC_INTERNAL irqs in bmp and + * offset. + */ + field = (uint32_t *)(bmp + GIC_INTERNAL); + offset += (GIC_INTERNAL * 8) / 8; for_each_dist_irq_reg(irq, s->num_irq, 8) { reg = *field; kvm_gicd_access(s, offset, ®, true);