From nobody Wed May 15 14:40:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1586769815; cv=none; d=zohomail.com; s=zohoarc; b=cVKmkcbR6ArQMcU/a/6qLlG0vvlKx40KY3+TWm+jHUMff8VpX3bTmRs6lyAu2WXYMOHlJVrEhMA/THHEYS1llXllr2M1z3GXA4g3IKEkueYeLt8dWZB6UuUbQDM7dWYfiSq95KebeTYcfbag/BL5vsbO0UrjJUDycZqglfecOb8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586769815; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+mmgqvL/ZLxJFlyHlOG8lZcJAlSToWnLRnTjicJ2yIE=; b=LRj/TNQMRl18tRW6OOXrvitT5yTrgIZbn6++Wmzy44j+Uemp/hx3epNwui1+uJXAoPjKPBy+exE9QpRBXiyQ40+LH8acWvLo7eRxyygazZtn9WM/fWMC91wOqkl1e1PGgdxhVFFHu2eDHnh7EUFOn1rmfz59kw4yn2BInJAj6oE= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1586769815634776.532952450102; Mon, 13 Apr 2020 02:23:35 -0700 (PDT) Received: from localhost ([::1]:42068 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jNvJW-0006k6-28 for importer@patchew.org; Mon, 13 Apr 2020 05:23:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47371) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jNvEk-0001TY-SN for qemu-devel@nongnu.org; Mon, 13 Apr 2020 05:18:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jNvEj-00064K-VJ for qemu-devel@nongnu.org; Mon, 13 Apr 2020 05:18:38 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:37970 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jNvEh-0005zK-IX; Mon, 13 Apr 2020 05:18:35 -0400 Received: from DGGEMS402-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 130C5E0264983E54D18A; Mon, 13 Apr 2020 17:18:27 +0800 (CST) Received: from linux-kDCJWP.huawei.com (10.175.104.212) by DGGEMS402-HUB.china.huawei.com (10.3.19.202) with Microsoft SMTP Server id 14.3.487.0; Mon, 13 Apr 2020 17:18:17 +0800 From: Keqian Zhu To: Subject: [PATCH 1/3] bugfix: Use gicr_typer in arm_gicv3_icc_reset Date: Mon, 13 Apr 2020 17:15:50 +0800 Message-ID: <20200413091552.62748-2-zhukeqian1@huawei.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20200413091552.62748-1-zhukeqian1@huawei.com> References: <20200413091552.62748-1-zhukeqian1@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.104.212] X-CFilter-Loop: Reflected Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 45.249.212.35 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , "Michael S . Tsirkin" , qemu-arm@nongnu.org, Igor Mammedov , wanghaibin.wang@huawei.com, Keqian Zhu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The KVM_VGIC_ATTR macro expect the second parameter as gicr_typer, of which high 32bit is constructed by mp_affinity. For most case, the high 32bit of mp_affinity is zero, so it will always access the ICC_CTLR_EL1 of CPU0. Signed-off-by: Keqian Zhu --- hw/intc/arm_gicv3_kvm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/intc/arm_gicv3_kvm.c b/hw/intc/arm_gicv3_kvm.c index 49304ca589..ca43bf87ca 100644 --- a/hw/intc/arm_gicv3_kvm.c +++ b/hw/intc/arm_gicv3_kvm.c @@ -658,13 +658,11 @@ static void kvm_arm_gicv3_get(GICv3State *s) =20 static void arm_gicv3_icc_reset(CPUARMState *env, const ARMCPRegInfo *ri) { - ARMCPU *cpu; GICv3State *s; GICv3CPUState *c; =20 c =3D (GICv3CPUState *)env->gicv3state; s =3D c->gic; - cpu =3D ARM_CPU(c->cpu); =20 c->icc_pmr_el1 =3D 0; c->icc_bpr[GICV3_G0] =3D GIC_MIN_BPR; @@ -681,7 +679,7 @@ static void arm_gicv3_icc_reset(CPUARMState *env, const= ARMCPRegInfo *ri) =20 /* Initialize to actual HW supported configuration */ kvm_device_access(s->dev_fd, KVM_DEV_ARM_VGIC_GRP_CPU_SYSREGS, - KVM_VGIC_ATTR(ICC_CTLR_EL1, cpu->mp_affinity), + KVM_VGIC_ATTR(ICC_CTLR_EL1, c->gicr_typer), &c->icc_ctlr_el1[GICV3_NS], false, &error_abort); =20 c->icc_ctlr_el1[GICV3_S] =3D c->icc_ctlr_el1[GICV3_NS]; --=20 2.19.1 From nobody Wed May 15 14:40:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1586769656; cv=none; d=zohomail.com; s=zohoarc; b=lm2YOoAd1SeZh/hYECFf0w0wHEFchnnzBg2xSnTdhQ6/0CbOvjRZ5S667fcAzBHxKBykCnWhdBWOzLSOTSMOmC/tuE462jSEP1waaFHrmxQTWA3k/OD4LZNzq+7/L5Pxt4BBQUQpoAUweJfzXJ3ZOHB+0NjeT8V6XSlQCQcigE0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586769656; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=rOOsKrO+S+nD6s4Gug0JWVnVSezT5XjJLHO6nz7vzdo=; b=VmR+KknHJaU3xCML+YE0wsqnk4ookggCemWNqscRnZVFB1N5UBnELXhNDIxMjfwedT2ksMYXf2UGSIdYQS3J/e0ia3hX23a+aFveJMjUrGcuTA+gV0DvhivtMmEIi0gfMfsP9UkvqTPS1Nh2Uhezov2CAZMhLX2RyO2IV29enzU= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1586769656907909.2775078784164; Mon, 13 Apr 2020 02:20:56 -0700 (PDT) Received: from localhost ([::1]:42044 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jNvGw-0004VO-Nx for importer@patchew.org; Mon, 13 Apr 2020 05:20:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47366) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jNvEk-0001TQ-Kh for qemu-devel@nongnu.org; Mon, 13 Apr 2020 05:18:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jNvEj-00064D-Nw for qemu-devel@nongnu.org; Mon, 13 Apr 2020 05:18:38 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:37964 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jNvEh-0005zJ-F5; Mon, 13 Apr 2020 05:18:35 -0400 Received: from DGGEMS402-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 17EE7DAEE6C89476076C; Mon, 13 Apr 2020 17:18:27 +0800 (CST) Received: from linux-kDCJWP.huawei.com (10.175.104.212) by DGGEMS402-HUB.china.huawei.com (10.3.19.202) with Microsoft SMTP Server id 14.3.487.0; Mon, 13 Apr 2020 17:18:18 +0800 From: Keqian Zhu To: Subject: [PATCH 2/3] intc/gicv3_kvm: use kvm_gicc_access to get ICC_CTLR_EL1 Date: Mon, 13 Apr 2020 17:15:51 +0800 Message-ID: <20200413091552.62748-3-zhukeqian1@huawei.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20200413091552.62748-1-zhukeqian1@huawei.com> References: <20200413091552.62748-1-zhukeqian1@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.104.212] X-CFilter-Loop: Reflected Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 45.249.212.35 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , "Michael S . Tsirkin" , qemu-arm@nongnu.org, Igor Mammedov , wanghaibin.wang@huawei.com, Keqian Zhu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Replace kvm_device_access with kvm_gicc_access to simplify code. Signed-off-by: Keqian Zhu --- hw/intc/arm_gicv3_kvm.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/intc/arm_gicv3_kvm.c b/hw/intc/arm_gicv3_kvm.c index ca43bf87ca..85f6420498 100644 --- a/hw/intc/arm_gicv3_kvm.c +++ b/hw/intc/arm_gicv3_kvm.c @@ -678,9 +678,8 @@ static void arm_gicv3_icc_reset(CPUARMState *env, const= ARMCPRegInfo *ri) } =20 /* Initialize to actual HW supported configuration */ - kvm_device_access(s->dev_fd, KVM_DEV_ARM_VGIC_GRP_CPU_SYSREGS, - KVM_VGIC_ATTR(ICC_CTLR_EL1, c->gicr_typer), - &c->icc_ctlr_el1[GICV3_NS], false, &error_abort); + kvm_gicc_access(s, ICC_CTLR_EL1, c->cpu->cpu_index, + &c->icc_ctlr_el1[GICV3_NS], false); =20 c->icc_ctlr_el1[GICV3_S] =3D c->icc_ctlr_el1[GICV3_NS]; } --=20 2.19.1 From nobody Wed May 15 14:40:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1586769605; cv=none; d=zohomail.com; s=zohoarc; b=FDZu461dgRmACun8Tkxdf45GLjFDiDRlx8C5JuNbOacoOybO1T0UJXDXj9IN3FHcRM+DoLFcbExZ31s644nYYo5FXWeK4gdXpJrvFOdOKXUgic6/S2H8L1kWMeGyKmIYE9GL0SDtIrEy6dvoOn+dQD3Bb/uX2VzX2tHUlJl9NAg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586769605; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=74lrm29DdlxF/q2OO2seXpWT83MaDVmHxfdQIOB03Io=; b=IjOm7vgqQ5wR8BbVY7sy+zs4YNEOYRh4VplIcL1PlKgH6gdcP6HfbVQ0xVO0S78NLi5gjBgCbfMJSlso3NV0FDyAZGolGkOBknAl1kHGKR4g+nAmSy5eLwOwM2hSbdyZmjhzbkDahWIaSgCld1SwP3f4EKeldgBCHqRgIuwPf7U= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1586769605895710.0621807321019; Mon, 13 Apr 2020 02:20:05 -0700 (PDT) Received: from localhost ([::1]:42024 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jNvG8-0003Jb-JX for importer@patchew.org; Mon, 13 Apr 2020 05:20:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47357) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jNvEk-0001TM-Bk for qemu-devel@nongnu.org; Mon, 13 Apr 2020 05:18:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jNvEj-000643-Hs for qemu-devel@nongnu.org; Mon, 13 Apr 2020 05:18:38 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:37966 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jNvEh-0005zM-6Z; Mon, 13 Apr 2020 05:18:35 -0400 Received: from DGGEMS402-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 1C765453D2D92EB224A4; Mon, 13 Apr 2020 17:18:27 +0800 (CST) Received: from linux-kDCJWP.huawei.com (10.175.104.212) by DGGEMS402-HUB.china.huawei.com (10.3.19.202) with Microsoft SMTP Server id 14.3.487.0; Mon, 13 Apr 2020 17:18:19 +0800 From: Keqian Zhu To: Subject: [PATCH 3/3] Typo: Correct the name of CPU hotplug memory region Date: Mon, 13 Apr 2020 17:15:52 +0800 Message-ID: <20200413091552.62748-4-zhukeqian1@huawei.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20200413091552.62748-1-zhukeqian1@huawei.com> References: <20200413091552.62748-1-zhukeqian1@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.104.212] X-CFilter-Loop: Reflected Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 45.249.212.35 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , "Michael S . Tsirkin" , qemu-arm@nongnu.org, Igor Mammedov , wanghaibin.wang@huawei.com, Keqian Zhu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Replace "acpi-mem-hotplug" with "acpi-cpu-hotplug" Signed-off-by: Keqian Zhu --- hw/acpi/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/acpi/cpu.c b/hw/acpi/cpu.c index e2c957ce00..3d6a500fb7 100644 --- a/hw/acpi/cpu.c +++ b/hw/acpi/cpu.c @@ -222,7 +222,7 @@ void cpu_hotplug_hw_init(MemoryRegion *as, Object *owne= r, state->devs[i].arch_id =3D id_list->cpus[i].arch_id; } memory_region_init_io(&state->ctrl_reg, owner, &cpu_hotplug_ops, state, - "acpi-mem-hotplug", ACPI_CPU_HOTPLUG_REG_LEN); + "acpi-cpu-hotplug", ACPI_CPU_HOTPLUG_REG_LEN); memory_region_add_subregion(as, base_addr, &state->ctrl_reg); } =20 --=20 2.19.1