From nobody Fri Dec 19 15:06:20 2025 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2F0D5211706; Sat, 6 Dec 2025 07:11:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=114.242.206.163 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765005104; cv=none; b=VBsn2iurfVYTZUUioRvV0Wq+J1zjRqIIyl45fu4go1Mw9GQSckVEwAUrVeOFfEQctAFWiKpuLKESrXl2m8sJBC8NLdtFkkfo3oR2/O/SWrPAbA39gjPJClAG1GmIibzsdNq+BHGc1mp8KvoMGQdOZ9VMG2AR9NWXqp/jS7KG/qY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765005104; c=relaxed/simple; bh=3jBNKRHQ6xntwLGLOvX7f92XGHP6wsjW/6pwDpMXsYo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=MH+EmNdGCfh1Kuu5BxwyElQqrb4hyHL81fcO6Ld9tV4RRkFrW0oIauPEp57rRopUO0sBhd02P7d0ha5ENUu783xsNVedXhuujFpgJrBwW/TfgOgsWBuWHoJtydqGnb5R26o+fvkZV7M9pJ7o9ZHY5E4PAOmmJL0jvfVktOtL9Z4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=loongson.cn; spf=pass smtp.mailfrom=loongson.cn; arc=none smtp.client-ip=114.242.206.163 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=loongson.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=loongson.cn Received: from loongson.cn (unknown [10.2.5.185]) by gateway (Coremail) with SMTP id _____8AxytEc1zNp9LMrAA--.23607S3; Sat, 06 Dec 2025 15:11:24 +0800 (CST) Received: from localhost.localdomain (unknown [10.2.5.185]) by front1 (Coremail) with SMTP id qMiowJCx2sAX1zNpmFZGAQ--.33246S4; Sat, 06 Dec 2025 15:11:23 +0800 (CST) From: Song Gao To: maobibo@loongson.cn, chenhuacai@kernel.org Cc: kvm@vger.kernel.org, loongarch@lists.linux.dev, kernel@xen0n.name, linux-kernel@vger.kernel.org, lixianglai@loongson.cn Subject: [PATCH v3 2/4] LongArch: KVM: Add DINTC device support Date: Sat, 6 Dec 2025 14:46:56 +0800 Message-Id: <20251206064658.714100-3-gaosong@loongson.cn> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20251206064658.714100-1-gaosong@loongson.cn> References: <20251206064658.714100-1-gaosong@loongson.cn> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: qMiowJCx2sAX1zNpmFZGAQ--.33246S4 X-CM-SenderInfo: 5jdr20tqj6z05rqj20fqof0/ X-Coremail-Antispam: 1Uk129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7KY7 ZEXasCq-sGcSsGvfJ3UbIjqfuFe4nvWSU5nxnvy29KBjDU0xBIdaVrnUUvcSsGvfC2Kfnx nUUI43ZEXa7xR_UUUUUUUUU== Content-Type: text/plain; charset="utf-8" Add device model for AVEC interrupt controller, implement basic create/destroy/set_attr interfaces, and register device model to kvm device table. Signed-off-by: Song Gao Reviewed-by: Bibo Mao --- arch/loongarch/include/asm/kvm_dintc.h | 21 +++++ arch/loongarch/include/asm/kvm_host.h | 3 + arch/loongarch/include/uapi/asm/kvm.h | 4 + arch/loongarch/kvm/Makefile | 1 + arch/loongarch/kvm/intc/dintc.c | 110 +++++++++++++++++++++++++ arch/loongarch/kvm/main.c | 5 ++ include/uapi/linux/kvm.h | 2 + 7 files changed, 146 insertions(+) create mode 100644 arch/loongarch/include/asm/kvm_dintc.h create mode 100644 arch/loongarch/kvm/intc/dintc.c diff --git a/arch/loongarch/include/asm/kvm_dintc.h b/arch/loongarch/includ= e/asm/kvm_dintc.h new file mode 100644 index 000000000000..d980d39c0344 --- /dev/null +++ b/arch/loongarch/include/asm/kvm_dintc.h @@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2025 Loongson Technology Corporation Limited + */ + +#ifndef __ASM_KVM_DINTC_H +#define __ASM_KVM_DINTC_H + + +struct loongarch_dintc { + struct kvm *kvm; + uint64_t msg_addr_base; + uint64_t msg_addr_size; +}; + +struct dintc_state { + atomic64_t vector_map[4]; +}; + +int kvm_loongarch_register_dintc_device(void); +#endif diff --git a/arch/loongarch/include/asm/kvm_host.h b/arch/loongarch/include= /asm/kvm_host.h index e4fe5b8e8149..26a90f4146ac 100644 --- a/arch/loongarch/include/asm/kvm_host.h +++ b/arch/loongarch/include/asm/kvm_host.h @@ -22,6 +22,7 @@ #include #include #include +#include #include =20 #define __KVM_HAVE_ARCH_INTC_INITIALIZED @@ -134,6 +135,7 @@ struct kvm_arch { struct loongarch_ipi *ipi; struct loongarch_eiointc *eiointc; struct loongarch_pch_pic *pch_pic; + struct loongarch_dintc *dintc; }; =20 #define CSR_MAX_NUMS 0x800 @@ -244,6 +246,7 @@ struct kvm_vcpu_arch { struct kvm_mp_state mp_state; /* ipi state */ struct ipi_state ipi_state; + struct dintc_state dintc_state; /* cpucfg */ u32 cpucfg[KVM_MAX_CPUCFG_REGS]; =20 diff --git a/arch/loongarch/include/uapi/asm/kvm.h b/arch/loongarch/include= /uapi/asm/kvm.h index de6c3f18e40a..07da84f7002c 100644 --- a/arch/loongarch/include/uapi/asm/kvm.h +++ b/arch/loongarch/include/uapi/asm/kvm.h @@ -154,4 +154,8 @@ struct kvm_iocsr_entry { #define KVM_DEV_LOONGARCH_PCH_PIC_GRP_CTRL 0x40000006 #define KVM_DEV_LOONGARCH_PCH_PIC_CTRL_INIT 0 =20 +#define KVM_DEV_LOONGARCH_DINTC_CTRL 0x40000007 +#define KVM_DEV_LOONGARCH_DINTC_MSG_ADDR_BASE 0x0 +#define KVM_DEV_LOONGARCH_DINTC_MSG_ADDR_SIZE 0x1 + #endif /* __UAPI_ASM_LOONGARCH_KVM_H */ diff --git a/arch/loongarch/kvm/Makefile b/arch/loongarch/kvm/Makefile index cb41d9265662..fe984bf1cbdb 100644 --- a/arch/loongarch/kvm/Makefile +++ b/arch/loongarch/kvm/Makefile @@ -19,6 +19,7 @@ kvm-y +=3D vm.o kvm-y +=3D intc/ipi.o kvm-y +=3D intc/eiointc.o kvm-y +=3D intc/pch_pic.o +kvm-y +=3D intc/dintc.o kvm-y +=3D irqfd.o =20 CFLAGS_exit.o +=3D $(call cc-disable-warning, override-init) diff --git a/arch/loongarch/kvm/intc/dintc.c b/arch/loongarch/kvm/intc/dint= c.c new file mode 100644 index 000000000000..cd6cc9392adc --- /dev/null +++ b/arch/loongarch/kvm/intc/dintc.c @@ -0,0 +1,110 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2025 Loongson Technology Corporation Limited + */ + +#include +#include +#include + +static int kvm_dintc_ctrl_access(struct kvm_device *dev, + struct kvm_device_attr *attr, + bool is_write) +{ + int addr =3D attr->attr; + void __user *data; + struct loongarch_dintc *s =3D dev->kvm->arch.dintc; + u64 tmp; + + data =3D (void __user *)attr->addr; + switch (addr) { + case KVM_DEV_LOONGARCH_DINTC_MSG_ADDR_BASE: + if (is_write) { + if (copy_from_user(&tmp, data, sizeof(s->msg_addr_base))) + return -EFAULT; + if (s->msg_addr_base) { + /* Duplicate setting are not allowed. */ + return -EFAULT; + } + if (tmp > (1UL << AVEC_CPU_SHIFT)) + s->msg_addr_base =3D tmp; + else + return -EFAULT; + } + break; + case KVM_DEV_LOONGARCH_DINTC_MSG_ADDR_SIZE: + if (is_write) { + if (copy_from_user(&tmp, data, sizeof(s->msg_addr_size))) + return -EFAULT; + if (s->msg_addr_size) { + /*Duplicate setting are not allowed. */ + return -EFAULT; + } + s->msg_addr_size =3D tmp; + } + break; + default: + kvm_err("%s: unknown dintc register, addr =3D %d\n", __func__, addr); + return -ENXIO; + } + + return 0; +} + +static int kvm_dintc_set_attr(struct kvm_device *dev, + struct kvm_device_attr *attr) +{ + switch (attr->group) { + case KVM_DEV_LOONGARCH_DINTC_CTRL: + return kvm_dintc_ctrl_access(dev, attr, true); + default: + kvm_err("%s: unknown group (%d)\n", __func__, attr->group); + return -EINVAL; + } +} + +static int kvm_dintc_create(struct kvm_device *dev, u32 type) +{ + struct kvm *kvm; + struct loongarch_dintc *s; + + if (!dev) { + kvm_err("%s: kvm_device ptr is invalid!\n", __func__); + return -EINVAL; + } + + kvm =3D dev->kvm; + if (kvm->arch.dintc) { + kvm_err("%s: LoongArch DINTC has already been created!\n", __func__); + return -EINVAL; + } + + s =3D kzalloc(sizeof(struct loongarch_dintc), GFP_KERNEL); + if (!s) + return -ENOMEM; + + s->kvm =3D kvm; + kvm->arch.dintc =3D s; + return 0; +} + +static void kvm_dintc_destroy(struct kvm_device *dev) +{ + + if (!dev || !dev->kvm || !dev->kvm->arch.dintc) + return; + + kfree(dev->kvm->arch.dintc); +} + +static struct kvm_device_ops kvm_dintc_dev_ops =3D { + .name =3D "kvm-loongarch-dintc", + .create =3D kvm_dintc_create, + .destroy =3D kvm_dintc_destroy, + .set_attr =3D kvm_dintc_set_attr, +}; + +int kvm_loongarch_register_dintc_device(void) +{ + return kvm_register_device_ops(&kvm_dintc_dev_ops, KVM_DEV_TYPE_LOONGARCH= _DINTC); +} diff --git a/arch/loongarch/kvm/main.c b/arch/loongarch/kvm/main.c index 80ea63d465b8..d18d9f4d485c 100644 --- a/arch/loongarch/kvm/main.c +++ b/arch/loongarch/kvm/main.c @@ -408,6 +408,11 @@ static int kvm_loongarch_env_init(void) =20 /* Register LoongArch PCH-PIC interrupt controller interface. */ ret =3D kvm_loongarch_register_pch_pic_device(); + if (ret) + return ret; + + /* Register LoongArch DINTC interrupt contrroller interface */ + ret =3D kvm_loongarch_register_dintc_device(); =20 return ret; } diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index dddb781b0507..ebf86a65eef1 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -1209,6 +1209,8 @@ enum kvm_device_type { #define KVM_DEV_TYPE_LOONGARCH_EIOINTC KVM_DEV_TYPE_LOONGARCH_EIOINTC KVM_DEV_TYPE_LOONGARCH_PCHPIC, #define KVM_DEV_TYPE_LOONGARCH_PCHPIC KVM_DEV_TYPE_LOONGARCH_PCHPIC + KVM_DEV_TYPE_LOONGARCH_DINTC, +#define KVM_DEV_TYPE_LOONGARCH_DINTC KVM_DEV_TYPE_LOONGARCH_DINTC =20 KVM_DEV_TYPE_MAX, =20 --=20 2.39.3