From nobody Tue Feb 10 12:09:35 2026 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 1656668755602827.6701558944014; Fri, 1 Jul 2022 02:45:55 -0700 (PDT) Received: from localhost ([::1]:41602 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o7DDk-0005Cq-PC for importer@patchew.org; Fri, 01 Jul 2022 05:45:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58868) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o7D2v-0002Gr-4j for qemu-devel@nongnu.org; Fri, 01 Jul 2022 05:34:41 -0400 Received: from mail.loongson.cn ([114.242.206.163]:39422 helo=loongson.cn) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o7D2l-0003Fu-Fz for qemu-devel@nongnu.org; Fri, 01 Jul 2022 05:34:37 -0400 Received: from localhost.localdomain (unknown [10.2.5.185]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9AxKeGPv75iutYAAA--.2820S13; Fri, 01 Jul 2022 17:34:11 +0800 (CST) From: Xiaojuan Yang To: qemu-devel@nongnu.org Cc: richard.henderson@linaro.org, gaosong@loongson.cn, maobibo@loongson.cn, mark.cave-ayland@ilande.co.uk, mst@redhat.com, imammedo@redhat.com, ani@anisinha.ca, f4bug@amsat.org, peter.maydell@linaro.org Subject: [PATCH 11/11] hw/intc/loongarch_ipi: Fix mail send and any send function Date: Fri, 1 Jul 2022 17:34:07 +0800 Message-Id: <20220701093407.2150607-12-yangxiaojuan@loongson.cn> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220701093407.2150607-1-yangxiaojuan@loongson.cn> References: <20220701093407.2150607-1-yangxiaojuan@loongson.cn> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: AQAAf9AxKeGPv75iutYAAA--.2820S13 X-Coremail-Antispam: 1UD129KBjvJXoWxXryfXw47ury7CrW3Zr18Zrb_yoW5AFWUpr 9xZr4avr48JFW3XayDJ34UZF1DJF97WayUCFsxK34F9w1kur9F934qg39YqF1qy348WF4Y yr4kAw4FvF1UXaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnUUvcSsGvfC2KfnxnUUI43ZEXa7xR_UUUUUUUUU== X-CM-SenderInfo: p1dqw5xldry3tdq6z05rqj20fqof0/ 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=yangxiaojuan@loongson.cn; helo=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_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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" X-ZM-MESSAGEID: 1656668757896100001 Content-Type: text/plain; charset="utf-8" By the document of ipi mailsend device, byte is written only when the mask = bit is 0. The original code discards mask bit and overwrite the data always, th= is patch fixes the issue. Signed-off-by: Xiaojuan Yang --- hw/intc/loongarch_ipi.c | 45 ++++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/hw/intc/loongarch_ipi.c b/hw/intc/loongarch_ipi.c index 553e88703d..e4b1fb5366 100644 --- a/hw/intc/loongarch_ipi.c +++ b/hw/intc/loongarch_ipi.c @@ -50,35 +50,40 @@ static uint64_t loongarch_ipi_readl(void *opaque, hwadd= r addr, unsigned size) return ret; } =20 -static int get_ipi_data(target_ulong val) +static void send_ipi_data(CPULoongArchState *env, target_ulong val, target= _ulong addr) { int i, mask, data; =20 - data =3D val >> 32; - mask =3D (val >> 27) & 0xf; - + data =3D address_space_ldl(&env->address_space_iocsr, addr, + MEMTXATTRS_UNSPECIFIED, NULL); + mask =3D 0; for (i =3D 0; i < 4; i++) { - if ((mask >> i) & 1) { - data &=3D ~(0xff << (i * 8)); + /* bit 27 - 30 is mask for byte write */ + if (val & (0x1UL << (27 + i))) { + mask |=3D 0xff << (i * 8); } } - return data; + + data &=3D mask; + data |=3D (val >> 32) & ~mask; + address_space_stl(&env->address_space_iocsr, addr, + data, MEMTXATTRS_UNSPECIFIED, NULL); } =20 static void ipi_send(uint64_t val) { int cpuid, data; CPULoongArchState *env; + CPUState *cs; + LoongArchCPU *cpu; =20 cpuid =3D (val >> 16) & 0x3ff; /* IPI status vector */ data =3D 1 << (val & 0x1f); - qemu_mutex_lock_iothread(); - CPUState *cs =3D qemu_get_cpu(cpuid); - LoongArchCPU *cpu =3D LOONGARCH_CPU(cs); + cs =3D qemu_get_cpu(cpuid); + cpu =3D LOONGARCH_CPU(cs); env =3D &cpu->env; loongarch_cpu_set_irq(cpu, IRQ_IPI, 1); - qemu_mutex_unlock_iothread(); address_space_stl(&env->address_space_iocsr, 0x1008, data, MEMTXATTRS_UNSPECIFIED, NULL); =20 @@ -86,23 +91,23 @@ static void ipi_send(uint64_t val) =20 static void mail_send(uint64_t val) { - int cpuid, data; + int cpuid; hwaddr addr; CPULoongArchState *env; + CPUState *cs; + LoongArchCPU *cpu; =20 cpuid =3D (val >> 16) & 0x3ff; addr =3D 0x1020 + (val & 0x1c); - CPUState *cs =3D qemu_get_cpu(cpuid); - LoongArchCPU *cpu =3D LOONGARCH_CPU(cs); + cs =3D qemu_get_cpu(cpuid); + cpu =3D LOONGARCH_CPU(cs); env =3D &cpu->env; - data =3D get_ipi_data(val); - address_space_stl(&env->address_space_iocsr, addr, - data, MEMTXATTRS_UNSPECIFIED, NULL); + send_ipi_data(env, val, addr); } =20 static void any_send(uint64_t val) { - int cpuid, data; + int cpuid; hwaddr addr; CPULoongArchState *env; =20 @@ -111,9 +116,7 @@ static void any_send(uint64_t val) CPUState *cs =3D qemu_get_cpu(cpuid); LoongArchCPU *cpu =3D LOONGARCH_CPU(cs); env =3D &cpu->env; - data =3D get_ipi_data(val); - address_space_stl(&env->address_space_iocsr, addr, - data, MEMTXATTRS_UNSPECIFIED, NULL); + send_ipi_data(env, val, addr); } =20 static void loongarch_ipi_writel(void *opaque, hwaddr addr, uint64_t val, --=20 2.31.1