From nobody Tue Nov 18 10:37:44 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) client-ip=209.85.128.42; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f42.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1609707136; cv=none; d=zohomail.com; s=zohoarc; b=aFwl6K1mGgHlEWRA+YlSuuKLd+KbNXik1Tb+tUazSnlZNiEms0VJsmS2F3A/F6O7UMjletpj/nczY9k/h++D69EYfgueGUgR3RwFYdHNnhiQ8GEgTMves5F8YbU7ivFhVWw5Kk+6N7u1bvH8sDm5SnsY28sUTuaDs9Mx+xjPuug= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609707136; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ojhC/M+0W8vFwZN1jjIy9RKgtD0KzrFoNNVj6x+2kmE=; b=UobJYwXQo7L1YdhiZ16rao91xULCY6t1LbCxyI4DwQ7psNJFM8JsNuGA4vezDxgIuGhvWJlMSElwev7crN6vWIc7j/1VAymC+iMccU2cd6QdS7IvVSfqMwYW7kk6cgdz049uxuO0KkrTJd4veJvpv1sCjU4TKYdHmIYuEBdiMps= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mx.zohomail.com with SMTPS id 1609707136912330.7337316989615; Sun, 3 Jan 2021 12:52:16 -0800 (PST) Received: by mail-wm1-f42.google.com with SMTP id e25so16678804wme.0 for ; Sun, 03 Jan 2021 12:52:16 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (194.red-83-57-172.dynamicip.rima-tde.net. [83.57.172.194]) by smtp.gmail.com with ESMTPSA id 189sm29798832wma.22.2021.01.03.12.52.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jan 2021 12:52:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ojhC/M+0W8vFwZN1jjIy9RKgtD0KzrFoNNVj6x+2kmE=; b=k3yfD31dKhRgHTGcfJ1GMORS+vCW0IevfCtv9z66HDRS8DK/luFRPLcQ3H9+AmlUTO Aj/+UHO50rye36TDJwlL40YpEynVrrTYKJWa+YIZlAFT2N21PRSWJM1x4yDGtms6cLJP IrJJdY2s3L77ZpDWfTVvITM5QajHDo/WkjajtVQeTXb382G/Bh4Ckb8DIQ+xvul5pIVg YygTtSHXViUqrjqqigV9/8KJszQeZo3oH1Lm8xmGIz183MzD5NvPOFlJBE5p1vwHFVNL sJSFSQp8rH5JHsLSXRTd/hYDvCA7EoxOyoSYKparqTda4/oVDafr1/rCYvM9fftB6QML khvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ojhC/M+0W8vFwZN1jjIy9RKgtD0KzrFoNNVj6x+2kmE=; b=SGJD7rAuOsJ+mPtQmNmGUgkYcnOyXWN7BC/xMRuCuyMZteuuTbvN/XKNsH79XnLSQG CccB63ddqOYyInIBkt3IKvmgbQdUady5gEFhRgnZasi3NovmblQWYchs2nb6UrobGa1g SVqx1jVqPvj5mfwliQoHgozi+6bgMwguutP6xKWiiiJnWWkm6zSfYaBpOgtCEgawRb9X g2VeTTJSfj+6zB6QDiI8xyiYdWfu5fdBhuPI3Y9E7TzEpk9bSPZiwmsQMXBjlrEZdbOm GuNLSZIUXewtReoqoHpi+BAQK15i4AfEu/b1eYINYljIVqoRZA4J7fxtMm//Icnv/7S5 NrVg== X-Gm-Message-State: AOAM531I18LcfXviKC145PNBtU6AYAzcbRWRpHBsLqJMvASJkp+GjlEv LmlsGIZ51ayEXCbIoIZJ0LM= X-Google-Smtp-Source: ABdhPJwPdUDC+//PKGaxDb41MsBnWOxRLO+GFYvtRxSYbSm1ZL7E7SdfZzErWCXNuS+U1H2pPWhxjg== X-Received: by 2002:a05:600c:2188:: with SMTP id e8mr24393409wme.182.1609707135117; Sun, 03 Jan 2021 12:52:15 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aurelien Jarno , Huacai Chen , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 23/35] hw/intc: Rework Loongson LIOINTC Date: Sun, 3 Jan 2021 21:50:09 +0100 Message-Id: <20210103205021.2837760-24-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210103205021.2837760-1-f4bug@amsat.org> References: <20210103205021.2837760-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) From: Huacai Chen As suggested by Philippe Mathieu-Daud=C3=A9, rework Loongson's liointc: 1, Move macro definitions to loongson_liointc.h; 2, Remove magic values and use macros instead; 3, Replace dead D() code by trace events. Suggested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Huacai Chen Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20201221110538.3186646-2-chenhuacai@kernel.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/intc/loongson_liointc.h | 22 ++++++++++++++++++ hw/intc/loongson_liointc.c | 36 +++++++++++++----------------- 2 files changed, 38 insertions(+), 20 deletions(-) create mode 100644 include/hw/intc/loongson_liointc.h diff --git a/include/hw/intc/loongson_liointc.h b/include/hw/intc/loongson_= liointc.h new file mode 100644 index 00000000000..848e65eb359 --- /dev/null +++ b/include/hw/intc/loongson_liointc.h @@ -0,0 +1,22 @@ +/* + * This file is subject to the terms and conditions of the GNU General Pub= lic + * License. See the file "COPYING" in the main directory of this archive + * for more details. + * + * Copyright (c) 2020 Huacai Chen + * Copyright (c) 2020 Jiaxun Yang + * + */ + +#ifndef LOONGSON_LIOINTC_H +#define LOONGSON_LIOINTC_H + +#include "qemu/units.h" +#include "hw/sysbus.h" +#include "qom/object.h" + +#define TYPE_LOONGSON_LIOINTC "loongson.liointc" +DECLARE_INSTANCE_CHECKER(struct loongson_liointc, LOONGSON_LIOINTC, + TYPE_LOONGSON_LIOINTC) + +#endif /* LOONGSON_LIOINTC_H */ diff --git a/hw/intc/loongson_liointc.c b/hw/intc/loongson_liointc.c index fbbfb57ee9c..f823d484e08 100644 --- a/hw/intc/loongson_liointc.c +++ b/hw/intc/loongson_liointc.c @@ -1,6 +1,7 @@ /* * QEMU Loongson Local I/O interrupt controler. * + * Copyright (c) 2020 Huacai Chen * Copyright (c) 2020 Jiaxun Yang * * This program is free software: you can redistribute it and/or modify @@ -19,13 +20,11 @@ */ =20 #include "qemu/osdep.h" -#include "hw/sysbus.h" #include "qemu/module.h" +#include "qemu/log.h" #include "hw/irq.h" #include "hw/qdev-properties.h" -#include "qom/object.h" - -#define D(x) +#include "hw/intc/loongson_liointc.h" =20 #define NUM_IRQS 32 =20 @@ -40,13 +39,10 @@ #define R_IEN 0x24 #define R_IEN_SET 0x28 #define R_IEN_CLR 0x2c -#define R_PERCORE_ISR(x) (0x40 + 0x8 * x) +#define R_ISR_SIZE 0x8 +#define R_START 0x40 #define R_END 0x64 =20 -#define TYPE_LOONGSON_LIOINTC "loongson.liointc" -DECLARE_INSTANCE_CHECKER(struct loongson_liointc, LOONGSON_LIOINTC, - TYPE_LOONGSON_LIOINTC) - struct loongson_liointc { SysBusDevice parent_obj; =20 @@ -123,14 +119,13 @@ liointc_read(void *opaque, hwaddr addr, unsigned int = size) goto out; } =20 - /* Rest is 4 byte */ + /* Rest are 4 bytes */ if (size !=3D 4 || (addr % 4)) { goto out; } =20 - if (addr >=3D R_PERCORE_ISR(0) && - addr < R_PERCORE_ISR(NUM_CORES)) { - int core =3D (addr - R_PERCORE_ISR(0)) / 8; + if (addr >=3D R_START && addr < R_END) { + int core =3D (addr - R_START) / R_ISR_SIZE; r =3D p->per_core_isr[core]; goto out; } @@ -147,7 +142,8 @@ liointc_read(void *opaque, hwaddr addr, unsigned int si= ze) } =20 out: - D(qemu_log("%s: size=3D%d addr=3D%lx val=3D%x\n", __func__, size, addr= , r)); + qemu_log_mask(CPU_LOG_INT, "%s: size=3D%d, addr=3D%"HWADDR_PRIx", val= =3D%x\n", + __func__, size, addr, r); return r; } =20 @@ -158,7 +154,8 @@ liointc_write(void *opaque, hwaddr addr, struct loongson_liointc *p =3D opaque; uint32_t value =3D val64; =20 - D(qemu_log("%s: size=3D%d, addr=3D%lx val=3D%x\n", __func__, size, add= r, value)); + qemu_log_mask(CPU_LOG_INT, "%s: size=3D%d, addr=3D%"HWADDR_PRIx", val= =3D%x\n", + __func__, size, addr, value); =20 /* Mapper is 1 byte */ if (size =3D=3D 1 && addr < R_MAPPER_END) { @@ -166,14 +163,13 @@ liointc_write(void *opaque, hwaddr addr, goto out; } =20 - /* Rest is 4 byte */ + /* Rest are 4 bytes */ if (size !=3D 4 || (addr % 4)) { goto out; } =20 - if (addr >=3D R_PERCORE_ISR(0) && - addr < R_PERCORE_ISR(NUM_CORES)) { - int core =3D (addr - R_PERCORE_ISR(0)) / 8; + if (addr >=3D R_START && addr < R_END) { + int core =3D (addr - R_START) / R_ISR_SIZE; p->per_core_isr[core] =3D value; goto out; } @@ -224,7 +220,7 @@ static void loongson_liointc_init(Object *obj) } =20 memory_region_init_io(&p->mmio, obj, &pic_ops, p, - "loongson.liointc", R_END); + TYPE_LOONGSON_LIOINTC, R_END); sysbus_init_mmio(SYS_BUS_DEVICE(obj), &p->mmio); } =20 --=20 2.26.2