Received: by 2002:a25:6193:0:0:0:0:0 with SMTP id v141csp3934191ybb; Mon, 23 Mar 2020 10:20:30 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvA69UKTkUlcp1ujmP8ECZ0meLVogayk705NrizDeLT8K0dqcpN53EEo9SDktYEbM/7VpIG X-Received: by 2002:aca:b854:: with SMTP id i81mr316716oif.22.1584984030093; Mon, 23 Mar 2020 10:20:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584984030; cv=none; d=google.com; s=arc-20160816; b=SeHlUnwVyks4HUBXdp7mKcfw4DufjC4JGHAU7iAVj2QxmdWHunVtT9Oah/3PmMYb31 KWuOmq4uCF77bGvFNlyv4jiqQbcVrclYNpf7jtCxxlgRHnuQtk1C9bCPuzgga/T6N07j 9Y0yFTlF5411gQjDfpMPKPA2UviZLSr87IbXBiZfYt5E1qoIpCzQ3y8hTfl5c2vOU/BT a4RLAeQgPevv0ttxuIphZdndSiWzjD2nP71W+o5bxAcCfzex8QkLX/UjEnlVRMlcnY+i IYxLrewicZ91pA9ihX6ak9JVzrP+neCBUpkHEh7tI6uhCIaEfHDsss+aO7NLGRX6qiFt x8Dg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=JRPupt7f5Tg65/Lp7WhuCyDuEnivF2Yv5nyetu3T0ok=; b=lMCeXhmWyVbkZREDjlSQczAQNA/IbfSYxXh/YfbIeLCneORaKtDc9OwB862enJzpSw 5Ip2XPyWezNpTIzJbmgxm+kiFcomoX0ZjJj0i7aNSHN3sSnNT71+PFOd0fD2vR35U90H mhQu+BkVFUbDRqqN9X/BDT1U/SpyNveIV81EF8MM7lCYWI6h4i8SknyWs5V+Qd9xdMoq KoxY7ikGvdNbH1Q0jskOva0GWNySZ3Z02eAY9QCef+tkvDnvVtPc4vs/Nt2+/BDLUlke agA/JtGK5SqM7GN8wFDqmhLqEbirIZcJD7vsBuvnsPA8NwTZgrS2uOVIarc9tqNc5OGQ KkNA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l6si3125347otf.248.2020.03.23.10.20.16; Mon, 23 Mar 2020 10:20:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727962AbgCWRTj (ORCPT + 99 others); Mon, 23 Mar 2020 13:19:39 -0400 Received: from inva021.nxp.com ([92.121.34.21]:57138 "EHLO inva021.nxp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727900AbgCWRTc (ORCPT ); Mon, 23 Mar 2020 13:19:32 -0400 Received: from inva021.nxp.com (localhost [127.0.0.1]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id E955B20184D; Mon, 23 Mar 2020 18:19:30 +0100 (CET) Received: from inva024.eu-rdc02.nxp.com (inva024.eu-rdc02.nxp.com [134.27.226.22]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id DB0EB2012E7; Mon, 23 Mar 2020 18:19:30 +0100 (CET) Received: from fsr-ub1864-111.ea.freescale.net (fsr-ub1864-111.ea.freescale.net [10.171.82.141]) by inva024.eu-rdc02.nxp.com (Postfix) with ESMTP id 6E1212035C; Mon, 23 Mar 2020 18:19:30 +0100 (CET) From: Diana Craciun To: kvm@vger.kernel.org, alex.williamson@redhat.com, laurentiu.tudor@nxp.com, linux-arm-kernel@lists.infradead.org, bharatb.yadav@gmail.com Cc: linux-kernel@vger.kernel.org, Diana Craciun , Bharat Bhushan Subject: [PATCH 7/9] vfio/fsl-mc: Add irq infrastructure for fsl-mc devices Date: Mon, 23 Mar 2020 19:19:09 +0200 Message-Id: <20200323171911.27178-8-diana.craciun@oss.nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200323171911.27178-1-diana.craciun@oss.nxp.com> References: <20200323171911.27178-1-diana.craciun@oss.nxp.com> X-Virus-Scanned: ClamAV using ClamSMTP Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch adds the skeleton for interrupt support for fsl-mc devices. The interrupts are not yet functional, the functionality will be added by subsequent patches. Signed-off-by: Bharat Bhushan Signed-off-by: Diana Craciun --- drivers/vfio/fsl-mc/Makefile | 6 +- drivers/vfio/fsl-mc/vfio_fsl_mc.c | 71 ++++++++++++++++++++++- drivers/vfio/fsl-mc/vfio_fsl_mc_intr.c | 63 ++++++++++++++++++++ drivers/vfio/fsl-mc/vfio_fsl_mc_private.h | 5 ++ 4 files changed, 141 insertions(+), 4 deletions(-) create mode 100644 drivers/vfio/fsl-mc/vfio_fsl_mc_intr.c diff --git a/drivers/vfio/fsl-mc/Makefile b/drivers/vfio/fsl-mc/Makefile index 6f2b80645d5b..cad6dbf0b735 100644 --- a/drivers/vfio/fsl-mc/Makefile +++ b/drivers/vfio/fsl-mc/Makefile @@ -1,2 +1,4 @@ -vfio-fsl_mc-y := vfio_fsl_mc.o -obj-$(CONFIG_VFIO_FSL_MC) += vfio_fsl_mc.o +# SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) + +vfio-fsl-mc-y := vfio_fsl_mc.o vfio_fsl_mc_intr.o +obj-$(CONFIG_VFIO_FSL_MC) += vfio-fsl-mc.o diff --git a/drivers/vfio/fsl-mc/vfio_fsl_mc.c b/drivers/vfio/fsl-mc/vfio_fsl_mc.c index ea5e81e7791c..4d7baee2e474 100644 --- a/drivers/vfio/fsl-mc/vfio_fsl_mc.c +++ b/drivers/vfio/fsl-mc/vfio_fsl_mc.c @@ -210,11 +210,75 @@ static long vfio_fsl_mc_ioctl(void *device_data, unsigned int cmd, } case VFIO_DEVICE_GET_IRQ_INFO: { - return -EINVAL; + struct vfio_irq_info info; + + minsz = offsetofend(struct vfio_irq_info, count); + if (copy_from_user(&info, (void __user *)arg, minsz)) + return -EFAULT; + + if (info.argsz < minsz) + return -EINVAL; + + if (info.index >= mc_dev->obj_desc.irq_count) + return -EINVAL; + + info.flags = VFIO_IRQ_INFO_EVENTFD; + info.count = 1; + + return copy_to_user((void __user *)arg, &info, minsz); } case VFIO_DEVICE_SET_IRQS: { - return -EINVAL; + struct vfio_irq_set hdr; + u8 *data = NULL; + int ret = 0; + + minsz = offsetofend(struct vfio_irq_set, count); + + if (copy_from_user(&hdr, (void __user *)arg, minsz)) + return -EFAULT; + + if (hdr.argsz < minsz) + return -EINVAL; + + if (hdr.index >= mc_dev->obj_desc.irq_count) + return -EINVAL; + + if (hdr.start != 0 || hdr.count > 1) + return -EINVAL; + + if (hdr.count == 0 && + (!(hdr.flags & VFIO_IRQ_SET_DATA_NONE) || + !(hdr.flags & VFIO_IRQ_SET_ACTION_TRIGGER))) + return -EINVAL; + + if (hdr.flags & ~(VFIO_IRQ_SET_DATA_TYPE_MASK | + VFIO_IRQ_SET_ACTION_TYPE_MASK)) + return -EINVAL; + + if (!(hdr.flags & VFIO_IRQ_SET_DATA_NONE)) { + size_t size; + + if (hdr.flags & VFIO_IRQ_SET_DATA_BOOL) + size = sizeof(uint8_t); + else if (hdr.flags & VFIO_IRQ_SET_DATA_EVENTFD) + size = sizeof(int32_t); + else + return -EINVAL; + + if (hdr.argsz - minsz < hdr.count * size) + return -EINVAL; + + data = memdup_user((void __user *)(arg + minsz), + hdr.count * size); + if (IS_ERR(data)) + return PTR_ERR(data); + } + + ret = vfio_fsl_mc_set_irqs_ioctl(vdev, hdr.flags, + hdr.index, hdr.start, + hdr.count, data); + return ret; } case VFIO_DEVICE_RESET: { @@ -303,6 +367,9 @@ static int vfio_fsl_mc_init_device(struct vfio_fsl_mc_device *vdev) struct fsl_mc_device *mc_dev = vdev->mc_dev; int ret = 0; + /* innherit the msi domain from parent */ + dev_set_msi_domain(&mc_dev->dev, dev_get_msi_domain(mc_dev->dev.parent)); + /* Non-dprc devices share mc_io from parent */ if (!is_fsl_mc_bus_dprc(mc_dev)) { struct fsl_mc_device *mc_cont = to_fsl_mc_device(mc_dev->dev.parent); diff --git a/drivers/vfio/fsl-mc/vfio_fsl_mc_intr.c b/drivers/vfio/fsl-mc/vfio_fsl_mc_intr.c new file mode 100644 index 000000000000..058aa97aa54a --- /dev/null +++ b/drivers/vfio/fsl-mc/vfio_fsl_mc_intr.c @@ -0,0 +1,63 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +/* + * Copyright 2013-2016 Freescale Semiconductor Inc. + * Copyright 2019 NXP + */ + +#include +#include +#include +#include +#include + +#include "linux/fsl/mc.h" +#include "vfio_fsl_mc_private.h" + +static int vfio_fsl_mc_irq_mask(struct vfio_fsl_mc_device *vdev, + unsigned int index, unsigned int start, + unsigned int count, u32 flags, + void *data) +{ + return -EINVAL; +} + +static int vfio_fsl_mc_irq_unmask(struct vfio_fsl_mc_device *vdev, + unsigned int index, unsigned int start, + unsigned int count, u32 flags, + void *data) +{ + return -EINVAL; +} + +static int vfio_fsl_mc_set_irq_trigger(struct vfio_fsl_mc_device *vdev, + unsigned int index, unsigned int start, + unsigned int count, u32 flags, + void *data) +{ + return -EINVAL; +} + +int vfio_fsl_mc_set_irqs_ioctl(struct vfio_fsl_mc_device *vdev, + u32 flags, unsigned int index, + unsigned int start, unsigned int count, + void *data) +{ + int ret = -ENOTTY; + + switch (flags & VFIO_IRQ_SET_ACTION_TYPE_MASK) { + case VFIO_IRQ_SET_ACTION_MASK: + ret = vfio_fsl_mc_irq_mask(vdev, index, start, count, + flags, data); + break; + case VFIO_IRQ_SET_ACTION_UNMASK: + ret = vfio_fsl_mc_irq_unmask(vdev, index, start, count, + flags, data); + break; + case VFIO_IRQ_SET_ACTION_TRIGGER: + ret = vfio_fsl_mc_set_irq_trigger(vdev, index, start, + count, flags, data); + break; + } + + return ret; +} diff --git a/drivers/vfio/fsl-mc/vfio_fsl_mc_private.h b/drivers/vfio/fsl-mc/vfio_fsl_mc_private.h index d072cccd93e0..0c7506e43880 100644 --- a/drivers/vfio/fsl-mc/vfio_fsl_mc_private.h +++ b/drivers/vfio/fsl-mc/vfio_fsl_mc_private.h @@ -37,4 +37,9 @@ struct vfio_fsl_mc_device { struct vfio_fsl_mc_reflck *reflck; }; +extern int vfio_fsl_mc_set_irqs_ioctl(struct vfio_fsl_mc_device *vdev, + u32 flags, unsigned int index, + unsigned int start, unsigned int count, + void *data); + #endif /* VFIO_PCI_PRIVATE_H */ -- 2.17.1