From nobody Fri Apr 4 21:25:10 2025
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: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 17428091327711011.1822728545782;
Mon, 24 Mar 2025 02:38:52 -0700 (PDT)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tweFe-0007Fh-4j; Mon, 24 Mar 2025 05:37:46 -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 <maobibo@loongson.cn>)
id 1tweFb-0007Eo-Ju
for qemu-devel@nongnu.org; Mon, 24 Mar 2025 05:37:43 -0400
Received: from mail.loongson.cn ([114.242.206.163])
by eggs.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <maobibo@loongson.cn>) id 1tweFY-0001Ri-5i
for qemu-devel@nongnu.org; Mon, 24 Mar 2025 05:37:43 -0400
Received: from loongson.cn (unknown [10.2.5.213])
by gateway (Coremail) with SMTP id _____8AxaeDfJ+FnNPujAA--.14996S3;
Mon, 24 Mar 2025 17:37:35 +0800 (CST)
Received: from localhost.localdomain (unknown [10.2.5.213])
by front1 (Coremail) with SMTP id qMiowMCxPsfaJ+FnGn1dAA--.15661S5;
Mon, 24 Mar 2025 17:37:35 +0800 (CST)
From: Bibo Mao <maobibo@loongson.cn>
To: Song Gao <gaosong@loongson.cn>
Cc: Jiaxun Yang <jiaxun.yang@flygoat.com>,
qemu-devel@nongnu.org
Subject: [PATCH v2 03/16] hw/intc/loongarch_pch: Remove some duplicate macro
Date: Mon, 24 Mar 2025 17:37:17 +0800
Message-Id: <20250324093730.3683378-4-maobibo@loongson.cn>
X-Mailer: git-send-email 2.39.3
In-Reply-To: <20250324093730.3683378-1-maobibo@loongson.cn>
References: <20250324093730.3683378-1-maobibo@loongson.cn>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-CM-TRANSID: qMiowMCxPsfaJ+FnGn1dAA--.15661S5
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: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://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>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZM-MESSAGEID: 1742809135600116600
Content-Type: text/plain; charset="utf-8"
The meaning of macro definition STATUS_LO_START is simliar with
PCH_PIC_INT_STATUS, only that offset is different, the same for
macro POL_LO_START. Now remove these duplicated macro definitions.
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
---
hw/intc/loongarch_pch_pic.c | 20 ++++++++++----------
include/hw/intc/loongarch_pic_common.h | 5 -----
2 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/hw/intc/loongarch_pch_pic.c b/hw/intc/loongarch_pch_pic.c
index 4c845ba5e9..a2d9930ac9 100644
--- a/hw/intc/loongarch_pch_pic.c
+++ b/hw/intc/loongarch_pch_pic.c
@@ -208,19 +208,19 @@ static uint64_t loongarch_pch_pic_high_readw(void *op=
aque, hwaddr addr,
{
LoongArchPICCommonState *s =3D LOONGARCH_PIC_COMMON(opaque);
uint64_t val =3D 0;
- uint32_t offset =3D addr & 0xfff;
+ uint32_t offset =3D addr + PCH_PIC_INT_STATUS;
=20
switch (offset) {
- case STATUS_LO_START:
+ case PCH_PIC_INT_STATUS:
val =3D (uint32_t)(s->intisr & (~s->int_mask));
break;
- case STATUS_HI_START:
+ case PCH_PIC_INT_STATUS + 4:
val =3D (s->intisr & (~s->int_mask)) >> 32;
break;
- case POL_LO_START:
+ case PCH_PIC_INT_POL:
val =3D (uint32_t)s->int_polarity;
break;
- case POL_HI_START:
+ case PCH_PIC_INT_POL + 4:
val =3D s->int_polarity >> 32;
break;
default:
@@ -236,21 +236,21 @@ static void loongarch_pch_pic_high_writew(void *opaqu=
e, hwaddr addr,
{
LoongArchPICCommonState *s =3D LOONGARCH_PIC_COMMON(opaque);
uint32_t offset, data =3D (uint32_t)value;
- offset =3D addr & 0xfff;
+ offset =3D addr + PCH_PIC_INT_STATUS;
=20
trace_loongarch_pch_pic_high_writew(size, addr, data);
=20
switch (offset) {
- case STATUS_LO_START:
+ case PCH_PIC_INT_STATUS:
s->intisr =3D get_writew_val(s->intisr, data, 0);
break;
- case STATUS_HI_START:
+ case PCH_PIC_INT_STATUS + 4:
s->intisr =3D get_writew_val(s->intisr, data, 1);
break;
- case POL_LO_START:
+ case PCH_PIC_INT_POL:
s->int_polarity =3D get_writew_val(s->int_polarity, data, 0);
break;
- case POL_HI_START:
+ case PCH_PIC_INT_POL + 4:
s->int_polarity =3D get_writew_val(s->int_polarity, data, 1);
break;
default:
diff --git a/include/hw/intc/loongarch_pic_common.h b/include/hw/intc/loong=
arch_pic_common.h
index b33bebb129..ef6edc15bf 100644
--- a/include/hw/intc/loongarch_pic_common.h
+++ b/include/hw/intc/loongarch_pic_common.h
@@ -26,11 +26,6 @@
#define PCH_PIC_INT_STATUS 0x3a0
#define PCH_PIC_INT_POL 0x3e0
=20
-#define STATUS_LO_START 0
-#define STATUS_HI_START 0x4
-#define POL_LO_START 0x40
-#define POL_HI_START 0x44
-
#define TYPE_LOONGARCH_PIC_COMMON "loongarch_pic_common"
OBJECT_DECLARE_TYPE(LoongArchPICCommonState,
LoongArchPICCommonClass, LOONGARCH_PIC_COMMON)
--=20
2.39.3