From patchwork Fri Apr 17 13:37:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 6232081 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 61D309F398 for ; Fri, 17 Apr 2015 13:43:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8FB7520389 for ; Fri, 17 Apr 2015 13:43:29 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6FFEC20382 for ; Fri, 17 Apr 2015 13:43:28 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Yj6Va-0005CB-RP; Fri, 17 Apr 2015 13:40:38 +0000 Received: from mail-wg0-f47.google.com ([74.125.82.47]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Yj6VO-0004d9-Dk for linux-arm-kernel@lists.infradead.org; Fri, 17 Apr 2015 13:40:27 +0000 Received: by wgin8 with SMTP id n8so113441923wgi.0 for ; Fri, 17 Apr 2015 06:40:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=gVE15eOiuGbdX6T9Me+yLnc76Ao4pmItIGKsC7hSSzg=; b=gcUPvr8KJujbiQJtUNyztQ/LwX14lDvCGxH9AwmKjqztZ9WKBkkZGilHVLzDCCW2Nh CUJLfKXjHDpyawcWTaQLtoFJw4lTNNeyEpglw2mUeXN7AXUtvatCz7k1rd/7kzJNtBN7 80IUFniS/kUd7xcDKvex132ZyZnMS52QD1HE8vxpnAghE0lxni2Jdw8Z+/x28xBETNS6 bIC0AaefDCIYrXIZ2BN/xQJLkLiTQSxJDFdlAeur5nQxggeJHcglwumaCtc5E3nLc3zD rXvRGMoIBMWdakYNqzPVIbm4XPH++Gom6UwwlEgNHeXoiM4vRkfXRReY6ilLgvv2S5XD hjKw== X-Gm-Message-State: ALoCoQndwEVL6a1zJHmHWNcRHbtnxyE56jwOrck6E3f3PCapGcFK4zhpBlkf8KKssGhgSr/tUPCe X-Received: by 10.194.90.47 with SMTP id bt15mr6296105wjb.41.1429278004353; Fri, 17 Apr 2015 06:40:04 -0700 (PDT) Received: from gnx2579.gnb.st.com (LCaen-156-56-7-90.w80-11.abo.wanadoo.fr. [80.11.198.90]) by mx.google.com with ESMTPSA id ub1sm14712357wjc.43.2015.04.17.06.40.02 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 17 Apr 2015 06:40:03 -0700 (PDT) From: Eric Auger To: eric.auger@st.com, eric.auger@linaro.org, christoffer.dall@linaro.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, alex.williamson@redhat.com, agraf@suse.de, b.reynal@virtualopensystems.com Subject: [RFC 1/3] VFIO: platform: add reset support Date: Fri, 17 Apr 2015 15:37:11 +0200 Message-Id: <1429277833-28663-2-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1429277833-28663-1-git-send-email-eric.auger@linaro.org> References: <1429277833-28663-1-git-send-email-eric.auger@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150417_064026_617043_D52FE858 X-CRM114-Status: GOOD ( 13.63 ) X-Spam-Score: -0.7 (/) Cc: Bharat.Bhushan@freescale.com, linux-kernel@vger.kernel.org, patches@linaro.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds support for vfio platform reset. The modality only is exposed when a specialized VFIO driver populates the reset callback. For the generic vfio platform/amba driver, the modality is not supported since the driver is by essence a metadriver and does not know how to reset the underlying device. Signed-off-by: Eric Auger --- drivers/vfio/platform/vfio_platform_common.c | 12 ++++++++++-- drivers/vfio/platform/vfio_platform_private.h | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/vfio/platform/vfio_platform_common.c b/drivers/vfio/platform/vfio_platform_common.c index 4113d46..b989ce5 100644 --- a/drivers/vfio/platform/vfio_platform_common.c +++ b/drivers/vfio/platform/vfio_platform_common.c @@ -100,6 +100,8 @@ static void vfio_platform_release(void *device_data) mutex_lock(&driver_lock); if (!(--vdev->refcnt)) { + if (vdev->reset) + vdev->reset(vdev); vfio_platform_regions_cleanup(vdev); vfio_platform_irq_cleanup(vdev); } @@ -159,6 +161,8 @@ static long vfio_platform_ioctl(void *device_data, if (info.argsz < minsz) return -EINVAL; + if (vdev->reset) + vdev->flags |= VFIO_DEVICE_FLAGS_RESET; info.flags = vdev->flags; info.num_regions = vdev->num_regions; info.num_irqs = vdev->num_irqs; @@ -252,8 +256,12 @@ static long vfio_platform_ioctl(void *device_data, return ret; - } else if (cmd == VFIO_DEVICE_RESET) - return -EINVAL; + } else if (cmd == VFIO_DEVICE_RESET) { + if (vdev->reset) + return vdev->reset(vdev); + else + return -ENOTTY; + } return -ENOTTY; } diff --git a/drivers/vfio/platform/vfio_platform_private.h b/drivers/vfio/platform/vfio_platform_private.h index 253caa3..0a20028 100644 --- a/drivers/vfio/platform/vfio_platform_private.h +++ b/drivers/vfio/platform/vfio_platform_private.h @@ -68,6 +68,7 @@ struct vfio_platform_device { struct resource* (*get_resource)(struct vfio_platform_device *vdev, int i); int (*get_irq)(struct vfio_platform_device *vdev, int i); + int (*reset)(struct vfio_platform_device *vdev); }; extern int vfio_platform_probe_common(struct vfio_platform_device *vdev,