From patchwork Thu May 7 14:27:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 6358851 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 AEA5F9F399 for ; Thu, 7 May 2015 14:34:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C8E2B20225 for ; Thu, 7 May 2015 14:34:27 +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 4A1002021F for ; Thu, 7 May 2015 14:34:26 +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 1YqMq1-0004Zc-8K; Thu, 07 May 2015 14:31:45 +0000 Received: from mail-wg0-f54.google.com ([74.125.82.54]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YqMp1-00042M-Pa for linux-arm-kernel@lists.infradead.org; Thu, 07 May 2015 14:30:44 +0000 Received: by wgyo15 with SMTP id o15so45512170wgy.2 for ; Thu, 07 May 2015 07:30:21 -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=lLDZt81qHABUnMxqL+b1R7PwD1rGpwxVq35gFTq6GuM=; b=Hg+8Wb9Cgbqnwjmv6AsdEMmsT52DGnYPC4i1CxHcKBOAp3aoZibPwdmR0nc6nPnlkW GwkIB6/ID2PVW3sgD55CLsHhYL0Lbs+wgTEME63fV9jPxsp5nWswDcN7wQY2fejLDReg 4I1pue9QXCjhcPzcSDzrf7XDu5896o6dTZBv5JTgR3TAWhkSiRp9hHvgvqidg1GMoV1p It3fDcSG+VHsaiENyE6PFs05ArLFzwMyLD1OhFb2UHCwu4NfhRQjoxa00kzBNEEd4xzw P8H2KYVFxOC5VRvJPujWFhwDkOq6Eg83NcRK5AVlBxreiKiZUYnSfg5a0sQ02AOrOd2t XUGA== X-Gm-Message-State: ALoCoQmM0Gy0Yk/9noblYCiEm2IAG5ygRQ8rIOuEdRWn2NTRp5vU/hn3f+bULGAPxA3NnqpUErN2 X-Received: by 10.180.89.231 with SMTP id br7mr7266619wib.60.1431009021884; Thu, 07 May 2015 07:30:21 -0700 (PDT) Received: from gnx2579.home (LCaen-156-56-7-90.w80-11.abo.wanadoo.fr. [80.11.198.90]) by mx.google.com with ESMTPSA id z12sm3704874wjw.39.2015.05.07.07.30.20 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 07 May 2015 07:30:21 -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, b.reynal@virtualopensystems.com Subject: [PATCH 4/5] VFIO: platform: populate reset function according to compat Date: Thu, 7 May 2015 16:27:22 +0200 Message-Id: <1431008843-28411-5-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1431008843-28411-1-git-send-email-eric.auger@linaro.org> References: <1431008843-28411-1-git-send-email-eric.auger@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150507_073044_028159_1C93A0CA X-CRM114-Status: GOOD ( 13.79 ) X-Spam-Score: -0.7 (/) Cc: Bharat.Bhushan@freescale.com, agraf@suse.de, 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 Add the reset function lookup according to the device compat string. This lookup is added at different places: - on VFIO_DEVICE_GET_INFO - on VFIO_DEVICE_RESET - on device release A reference to the module implementing the reset function is taken on first reset function lookup and released on vfio platform device release. Signed-off-by: Eric Auger --- drivers/vfio/platform/vfio_platform_common.c | 50 ++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/drivers/vfio/platform/vfio_platform_common.c b/drivers/vfio/platform/vfio_platform_common.c index 0d10018..bd7e44c 100644 --- a/drivers/vfio/platform/vfio_platform_common.c +++ b/drivers/vfio/platform/vfio_platform_common.c @@ -28,6 +28,52 @@ LIST_HEAD(reset_list); static DEFINE_MUTEX(driver_lock); +static vfio_platform_reset_fn_t vfio_platform_lookup_reset(const char *compat) +{ + struct vfio_platform_reset_node *iter; + + list_for_each_entry(iter, &reset_list, link) { + if (!strcmp(iter->compat, compat) && + try_module_get(iter->owner)) + return iter->reset; + } + + return ERR_PTR(-ENODEV); +} + +static vfio_platform_reset_fn_t vfio_platform_get_reset( + struct vfio_platform_device *vdev) +{ + struct device *dev = vdev->get_device(vdev); + const char *compat_str_array[2]; + vfio_platform_reset_fn_t reset; + int ret; + + if (!IS_ERR_OR_NULL(vdev->reset)) + return vdev->reset; + + ret = device_property_read_string_array(dev, "compatible", + compat_str_array, 2); + if (!ret) + return ERR_PTR(ret); + + reset = vfio_platform_lookup_reset(compat_str_array[0]); + return reset; +} + +static void vfio_platform_put_reset(struct vfio_platform_device *vdev) +{ + struct vfio_platform_reset_node *iter; + + list_for_each_entry(iter, &reset_list, link) { + if (iter->reset == vdev->reset) { + module_put(iter->owner); + vdev->reset = NULL; + return; + } + } +} + static int vfio_platform_regions_init(struct vfio_platform_device *vdev) { int cnt = 0, i; @@ -103,10 +149,12 @@ static void vfio_platform_release(void *device_data) mutex_lock(&driver_lock); if (!(--vdev->refcnt)) { + vdev->reset = vfio_platform_get_reset(vdev); if (!IS_ERR_OR_NULL(vdev->reset)) vdev->reset(vdev); vfio_platform_regions_cleanup(vdev); vfio_platform_irq_cleanup(vdev); + vfio_platform_put_reset(vdev); } mutex_unlock(&driver_lock); @@ -164,6 +212,7 @@ static long vfio_platform_ioctl(void *device_data, if (info.argsz < minsz) return -EINVAL; + vdev->reset = vfio_platform_get_reset(vdev); if (!IS_ERR_OR_NULL(vdev->reset)) vdev->flags |= VFIO_DEVICE_FLAGS_RESET; info.flags = vdev->flags; @@ -260,6 +309,7 @@ static long vfio_platform_ioctl(void *device_data, return ret; } else if (cmd == VFIO_DEVICE_RESET) { + vdev->reset = vfio_platform_get_reset(vdev); if (!IS_ERR_OR_NULL(vdev->reset)) return vdev->reset(vdev); else