From nobody Sun Nov 24 08:52:01 2024 Delivered-To: importer@patchew.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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1726108644188289.14383717566363; Wed, 11 Sep 2024 19:37:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1soZgZ-0004DF-5S; Wed, 11 Sep 2024 22:35:55 -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 1soZgV-00040P-Du for qemu-devel@nongnu.org; Wed, 11 Sep 2024 22:35:51 -0400 Received: from mail.loongson.cn ([114.242.206.163]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1soZgQ-0003WX-DP for qemu-devel@nongnu.org; Wed, 11 Sep 2024 22:35:51 -0400 Received: from loongson.cn (unknown [10.2.5.213]) by gateway (Coremail) with SMTP id _____8CxB+l+U+Jma2MFAA--.11548S3; Thu, 12 Sep 2024 10:35:42 +0800 (CST) Received: from localhost.localdomain (unknown [10.2.5.213]) by front1 (Coremail) with SMTP id qMiowMBxHeR5U+JmelsEAA--.25141S7; Thu, 12 Sep 2024 10:35:42 +0800 (CST) From: Bibo Mao To: Song Gao Cc: Jiaxun Yang , Xianglai Li , qemu-devel@nongnu.org, bibo mao Subject: [PATCH 5/5] hw/intc/loongarch_pch: Cleanup loongarch_pch_pic Date: Thu, 12 Sep 2024 10:35:37 +0800 Message-Id: <20240912023537.1004979-6-maobibo@loongson.cn> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20240912023537.1004979-1-maobibo@loongson.cn> References: <20240912023537.1004979-1-maobibo@loongson.cn> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: qMiowMBxHeR5U+JmelsEAA--.25141S7 X-CM-SenderInfo: xpdruxter6z05rqj20fqof0/ X-Coremail-Antispam: 1Uk129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7KY7 ZEXasCq-sGcSsGvfJ3UbIjqfuFe4nvWSU5nxnvy29KBjDU0xBIdaVrnUUvcSsGvfC2Kfnx nUUI43ZEXa7xR_UUUUUUUUU== 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; Received-SPF: pass client-ip=114.242.206.163; envelope-from=maobibo@loongson.cn; helo=mail.loongson.cn X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1726108645322116600 Content-Type: text/plain; charset="utf-8" From: bibo mao Remove definition about LoongArchPCHPIC and LOONGARCH_PCH_PIC, and replace them with LoongArchPICCommonState and LOONGARCH_PIC_COMMON separately. Also remove unnecessary header files. Signed-off-by: Bibo Mao --- hw/intc/loongarch_pch_pic.c | 24 ++++++++++-------------- hw/loongarch/virt.c | 2 +- include/hw/intc/loongarch_pch_pic.h | 4 ---- 3 files changed, 11 insertions(+), 19 deletions(-) diff --git a/hw/intc/loongarch_pch_pic.c b/hw/intc/loongarch_pch_pic.c index 94b6ec09f3..2ab6d790eb 100644 --- a/hw/intc/loongarch_pch_pic.c +++ b/hw/intc/loongarch_pch_pic.c @@ -7,17 +7,13 @@ =20 #include "qemu/osdep.h" #include "qemu/bitops.h" -#include "hw/sysbus.h" -#include "hw/loongarch/virt.h" -#include "hw/pci-host/ls7a.h" #include "hw/irq.h" #include "hw/intc/loongarch_pch_pic.h" -#include "hw/qdev-properties.h" -#include "migration/vmstate.h" #include "trace.h" #include "qapi/error.h" =20 -static void pch_pic_update_irq(LoongArchPCHPIC *s, uint64_t mask, int leve= l) +static void pch_pic_update_irq(LoongArchPICCommonState *s, uint64_t mask, + int level) { uint64_t val; int irq; @@ -45,7 +41,7 @@ static void pch_pic_update_irq(LoongArchPCHPIC *s, uint64= _t mask, int level) =20 static void pch_pic_irq_handler(void *opaque, int irq, int level) { - LoongArchPCHPIC *s =3D LOONGARCH_PCH_PIC(opaque); + LoongArchPICCommonState *s =3D LOONGARCH_PIC_COMMON(opaque); uint64_t mask =3D 1ULL << irq; =20 assert(irq < s->irq_num); @@ -78,7 +74,7 @@ static void pch_pic_irq_handler(void *opaque, int irq, in= t level) static uint64_t loongarch_pch_pic_low_readw(void *opaque, hwaddr addr, unsigned size) { - LoongArchPCHPIC *s =3D LOONGARCH_PCH_PIC(opaque); + LoongArchPICCommonState *s =3D LOONGARCH_PIC_COMMON(opaque); uint64_t val =3D 0; uint32_t offset =3D addr & 0xfff; =20 @@ -136,7 +132,7 @@ static uint64_t get_writew_val(uint64_t value, uint32_t= target, bool hi) static void loongarch_pch_pic_low_writew(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - LoongArchPCHPIC *s =3D LOONGARCH_PCH_PIC(opaque); + LoongArchPICCommonState *s =3D LOONGARCH_PIC_COMMON(opaque); uint32_t offset, old_valid, data =3D (uint32_t)value; uint64_t old, int_mask; offset =3D addr & 0xfff; @@ -208,7 +204,7 @@ static void loongarch_pch_pic_low_writew(void *opaque, = hwaddr addr, static uint64_t loongarch_pch_pic_high_readw(void *opaque, hwaddr addr, unsigned size) { - LoongArchPCHPIC *s =3D LOONGARCH_PCH_PIC(opaque); + LoongArchPICCommonState *s =3D LOONGARCH_PIC_COMMON(opaque); uint64_t val =3D 0; uint32_t offset =3D addr & 0xfff; =20 @@ -236,7 +232,7 @@ static uint64_t loongarch_pch_pic_high_readw(void *opaq= ue, hwaddr addr, static void loongarch_pch_pic_high_writew(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - LoongArchPCHPIC *s =3D LOONGARCH_PCH_PIC(opaque); + LoongArchPICCommonState *s =3D LOONGARCH_PIC_COMMON(opaque); uint32_t offset, data =3D (uint32_t)value; offset =3D addr & 0xfff; =20 @@ -263,7 +259,7 @@ static void loongarch_pch_pic_high_writew(void *opaque,= hwaddr addr, static uint64_t loongarch_pch_pic_readb(void *opaque, hwaddr addr, unsigned size) { - LoongArchPCHPIC *s =3D LOONGARCH_PCH_PIC(opaque); + LoongArchPICCommonState *s =3D LOONGARCH_PIC_COMMON(opaque); uint64_t val =3D 0; uint32_t offset =3D (addr & 0xfff) + PCH_PIC_ROUTE_ENTRY_OFFSET; int64_t offset_tmp; @@ -292,7 +288,7 @@ static uint64_t loongarch_pch_pic_readb(void *opaque, h= waddr addr, static void loongarch_pch_pic_writeb(void *opaque, hwaddr addr, uint64_t data, unsigned size) { - LoongArchPCHPIC *s =3D LOONGARCH_PCH_PIC(opaque); + LoongArchPICCommonState *s =3D LOONGARCH_PIC_COMMON(opaque); int32_t offset_tmp; uint32_t offset =3D (addr & 0xfff) + PCH_PIC_ROUTE_ENTRY_OFFSET; =20 @@ -360,7 +356,7 @@ static const MemoryRegionOps loongarch_pch_pic_reg8_ops= =3D { =20 static void loongarch_pch_pic_reset(DeviceState *d) { - LoongArchPCHPIC *s =3D LOONGARCH_PCH_PIC(d); + LoongArchPICCommonState *s =3D LOONGARCH_PIC_COMMON(d); int i; =20 s->int_mask =3D -1; diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c index 29040422aa..f1619b0353 100644 --- a/hw/loongarch/virt.c +++ b/hw/loongarch/virt.c @@ -842,7 +842,7 @@ static void virt_irq_init(LoongArchVirtMachineState *lv= ms) /* Add Extend I/O Interrupt Controller node */ fdt_add_eiointc_node(lvms, &cpuintc_phandle, &eiointc_phandle); =20 - pch_pic =3D qdev_new(TYPE_LOONGARCH_PCH_PIC); + pch_pic =3D qdev_new(TYPE_LOONGARCH_PIC); num =3D VIRT_PCH_PIC_IRQ_NUM; qdev_prop_set_uint32(pch_pic, "pch_pic_irq_num", num); d =3D SYS_BUS_DEVICE(pch_pic); diff --git a/include/hw/intc/loongarch_pch_pic.h b/include/hw/intc/loongarc= h_pch_pic.h index 1bc9241203..b00d182bf1 100644 --- a/include/hw/intc/loongarch_pch_pic.h +++ b/include/hw/intc/loongarch_pch_pic.h @@ -25,8 +25,4 @@ struct LoongarchPICClass { DeviceRealize parent_realize; }; =20 -#define TYPE_LOONGARCH_PCH_PIC TYPE_LOONGARCH_PIC -typedef struct LoongArchPICCommonState LoongArchPCHPIC; -#define LOONGARCH_PCH_PIC(obj) ((struct LoongArchPICCommonState *)(obj)) - #endif /* HW_LOONGARCH_PCH_PIC_H */ --=20 2.39.3