From nobody Mon Nov 25 09:33:27 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 1716295842103302.0562835438319; Tue, 21 May 2024 05:50:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s9OwC-00073l-Fn; Tue, 21 May 2024 08:49:52 -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 1s9Ow4-0006n2-3Z for qemu-devel@nongnu.org; Tue, 21 May 2024 08:49:44 -0400 Received: from mail.loongson.cn ([114.242.206.163]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s9Ovy-00055n-UO for qemu-devel@nongnu.org; Tue, 21 May 2024 08:49:43 -0400 Received: from loongson.cn (unknown [10.2.5.185]) by gateway (Coremail) with SMTP id _____8AxSepfmExmcEkCAA--.1543S3; Tue, 21 May 2024 20:49:35 +0800 (CST) Received: from localhost.localdomain (unknown [10.2.5.185]) by localhost.localdomain (Coremail) with SMTP id AQAAf8DxusZdmExmqDkEAA--.12666S5; Tue, 21 May 2024 20:49:35 +0800 (CST) From: Song Gao To: maobibo@loongson.cn Cc: qemu-devel@nongnu.org Subject: [PATCH v3 3/3] hw/loongarch/virt: Use MemTxAttrs interface for misc ops Date: Tue, 21 May 2024 20:32:25 +0800 Message-Id: <20240521123225.231072-4-gaosong@loongson.cn> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20240521123225.231072-1-gaosong@loongson.cn> References: <20240521123225.231072-1-gaosong@loongson.cn> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: AQAAf8DxusZdmExmqDkEAA--.12666S5 X-CM-SenderInfo: 5jdr20tqj6z05rqj20fqof0/ 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=gaosong@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, 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: 1716295843565100003 Content-Type: text/plain; charset="utf-8" Use MemTxAttrs interface read_with_attrs/write_with_attrs for virt_iocsr_misc_ops. Signed-off-by: Song Gao --- hw/loongarch/virt.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c index e7edc6c9f9..0ab2b6860a 100644 --- a/hw/loongarch/virt.c +++ b/hw/loongarch/virt.c @@ -866,8 +866,9 @@ static void virt_firmware_init(LoongArchVirtMachineStat= e *lvms) } } =20 -static void virt_iocsr_misc_write(void *opaque, hwaddr addr, - uint64_t val, unsigned size) +static MemTxResult virt_iocsr_misc_write(void *opaque, hwaddr addr, + uint64_t val, unsigned size, + MemTxAttrs attrs) { LoongArchVirtMachineState *lvms =3D LOONGARCH_VIRT_MACHINE(opaque); uint64_t features; @@ -875,12 +876,12 @@ static void virt_iocsr_misc_write(void *opaque, hwadd= r addr, switch (addr) { case MISC_FUNC_REG: if (!virt_is_veiointc_enabled(lvms)) { - return; + return MEMTX_OK; } =20 features =3D address_space_ldl(&lvms->as_iocsr, EXTIOI_VIRT_BASE + EXTIOI_VIRT_CONFIG, - MEMTXATTRS_UNSPECIFIED, NULL); + attrs, NULL); if (val & BIT_ULL(IOCSRM_EXTIOI_EN)) { features |=3D BIT(EXTIOI_ENABLE); } @@ -890,11 +891,15 @@ static void virt_iocsr_misc_write(void *opaque, hwadd= r addr, =20 address_space_stl(&lvms->as_iocsr, EXTIOI_VIRT_BASE + EXTIOI_VIRT_CONFIG, - features, MEMTXATTRS_UNSPECIFIED, NULL); + features, attrs, NULL); } + + return MEMTX_OK; } =20 -static uint64_t virt_iocsr_misc_read(void *opaque, hwaddr addr, unsigned s= ize) +static MemTxResult virt_iocsr_misc_read(void *opaque, hwaddr addr, + uint64_t *data, + unsigned size, MemTxAttrs attrs) { LoongArchVirtMachineState *lvms =3D LOONGARCH_VIRT_MACHINE(opaque); uint64_t ret =3D 0; @@ -924,7 +929,7 @@ static uint64_t virt_iocsr_misc_read(void *opaque, hwad= dr addr, unsigned size) =20 features =3D address_space_ldl(&lvms->as_iocsr, EXTIOI_VIRT_BASE + EXTIOI_VIRT_CONFIG, - MEMTXATTRS_UNSPECIFIED, NULL); + attrs, NULL); if (features & BIT(EXTIOI_ENABLE)) { ret |=3D BIT_ULL(IOCSRM_EXTIOI_EN); } @@ -933,12 +938,13 @@ static uint64_t virt_iocsr_misc_read(void *opaque, hw= addr addr, unsigned size) } } =20 - return ret; + *data =3D ret; + return MEMTX_OK; } =20 static const MemoryRegionOps virt_iocsr_misc_ops =3D { - .read =3D virt_iocsr_misc_read, - .write =3D virt_iocsr_misc_write, + .read_with_attrs =3D virt_iocsr_misc_read, + .write_with_attrs =3D virt_iocsr_misc_write, .endianness =3D DEVICE_LITTLE_ENDIAN, .valid =3D { .min_access_size =3D 4, --=20 2.34.1