From patchwork Tue Nov 3 18:12:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 55950 Delivered-To: patches@linaro.org Received: by 10.112.61.134 with SMTP id p6csp1979576lbr; Tue, 3 Nov 2015 10:12:40 -0800 (PST) X-Received: by 10.194.179.33 with SMTP id dd1mr35566329wjc.79.1446574353379; Tue, 03 Nov 2015 10:12:33 -0800 (PST) Return-Path: Received: from mail-wi0-x22c.google.com (mail-wi0-x22c.google.com. [2a00:1450:400c:c05::22c]) by mx.google.com with ESMTPS id j135si1735857wmd.43.2015.11.03.10.12.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Nov 2015 10:12:33 -0800 (PST) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:400c:c05::22c as permitted sender) client-ip=2a00:1450:400c:c05::22c; Authentication-Results: mx.google.com; spf=pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:400c:c05::22c as permitted sender) smtp.mailfrom=eric.auger@linaro.org; dkim=pass header.i=@linaro_org.20150623.gappssmtp.com Received: by wicfv8 with SMTP id fv8so17269602wic.0 for ; Tue, 03 Nov 2015 10:12:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro_org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NH6A1ghj1g05g5CwpfKe1ICLYf2OjeUugPiL71Gv/Uc=; b=AXPTJYhpU6umQ9uFu2QemzilfODabun75Nqs1iwznzjWfzKzaPMQYvSRKfU3eXOm7l Qf7QYgdjjSHhHdNjj7BmIvMPvgcAzJlP+ZEzTQtaR5oeYSF4+6FnnH19eMV0yVpuBzZi /e2mFbHGI6IURGunTGFi06C8xIU3ShUMnfuPUpgmbIqfuzxkcHGbEWAOrwzPsxX8ucBT ZnwoaJDKVcBMKiyGuTDnoSAi3j9sKHPYQ6mVByPNMIFFBOEPUcJbGY2jsZysBmkU+6Ks /lEloTxi5yo2xvq1AdiK4C+lDr7taqdtAqRWIOzCR3fp2+YTNIP3ksujzRRCS+EvQpED UH/w== 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=NH6A1ghj1g05g5CwpfKe1ICLYf2OjeUugPiL71Gv/Uc=; b=SztTkaKtIPu/QQUQ56QRTr4nZM/fnM9LZNqfHm+EsXrPgdCASXoouayd2owAQO+0H+ F6he3n60H5261GciZWvMVMVDN01JyPt2iN2hJjWjcjAyMDRIzuN0cVrrPIUt9puTb76H gEKTyc5uHIVkUW2r2PmuTqpIPS/XKchmEZ5oWg+9KN3evJ6kYSWL8Ie+LHuH+/+DCL92 bi3YWIobQhJI99X3eDyT4CcuEKTRv2a+YGiKJ5BbdJAxoVuZmbTc0HRP9pnVrHdfNlAs gDojY1tY3o0rhEeT4NujOsTDftKf2i2IYY64Sx5ckHR+TyYMOeHhUiJ0l2rrRJ9nJ9+0 S1jw== X-Gm-Message-State: ALoCoQlJJqAeDfDCmQ6MtxWttKiFjpbbxGpOFn9Wh4h3HSIcgMA+hWjgQMAb3ODkshReBUT+U2hj X-Received: by 10.194.84.4 with SMTP id u4mr30898577wjy.149.1446574353202; Tue, 03 Nov 2015 10:12:33 -0800 (PST) Return-Path: Received: from new-host-3.home (LMontsouris-657-1-37-90.w80-11.abo.wanadoo.fr. [80.11.198.90]) by smtp.gmail.com with ESMTPSA id om1sm28830527wjc.2.2015.11.03.10.12.31 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 03 Nov 2015 10:12:32 -0800 (PST) From: Eric Auger To: eric.auger@st.com, eric.auger@linaro.org, alex.williamson@redhat.com, b.reynal@virtualopensystems.com, arnd@arndb.de, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org Cc: christoffer.dall@linaro.org, linux-kernel@vger.kernel.org, patches@linaro.org Subject: [PATCH v6 5/8] vfio: platform: add compat in vfio_platform_device Date: Tue, 3 Nov 2015 18:12:16 +0000 Message-Id: <1446574339-1843-6-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1446574339-1843-1-git-send-email-eric.auger@linaro.org> References: <1446574339-1843-1-git-send-email-eric.auger@linaro.org> Let's retrieve the compatibility string on probe and store it in the vfio_platform_device struct Signed-off-by: Eric Auger --- v2 -> v3: - populate compat after vdev check --- drivers/vfio/platform/vfio_platform_common.c | 15 ++++++++------- drivers/vfio/platform/vfio_platform_private.h | 1 + 2 files changed, 9 insertions(+), 7 deletions(-) -- 1.9.1 diff --git a/drivers/vfio/platform/vfio_platform_common.c b/drivers/vfio/platform/vfio_platform_common.c index 3b7e52c..f2d41a0 100644 --- a/drivers/vfio/platform/vfio_platform_common.c +++ b/drivers/vfio/platform/vfio_platform_common.c @@ -41,16 +41,11 @@ static const struct vfio_platform_reset_combo reset_lookup_table[] = { static void vfio_platform_get_reset(struct vfio_platform_device *vdev, struct device *dev) { - const char *compat; int (*reset)(struct vfio_platform_device *); - int ret, i; - - ret = device_property_read_string(dev, "compatible", &compat); - if (ret) - return; + int i; for (i = 0 ; i < ARRAY_SIZE(reset_lookup_table); i++) { - if (!strcmp(reset_lookup_table[i].compat, compat)) { + if (!strcmp(reset_lookup_table[i].compat, vdev->compat)) { request_module(reset_lookup_table[i].module_name); reset = __symbol_get( reset_lookup_table[i].reset_function_name); @@ -544,6 +539,12 @@ int vfio_platform_probe_common(struct vfio_platform_device *vdev, if (!vdev) return -EINVAL; + ret = device_property_read_string(dev, "compatible", &vdev->compat); + if (ret) { + pr_err("VFIO: cannot retrieve compat for %s\n", vdev->name); + return -EINVAL; + } + group = iommu_group_get(dev); if (!group) { pr_err("VFIO: No IOMMU group for device %s\n", vdev->name); diff --git a/drivers/vfio/platform/vfio_platform_private.h b/drivers/vfio/platform/vfio_platform_private.h index fd262be..415310f 100644 --- a/drivers/vfio/platform/vfio_platform_private.h +++ b/drivers/vfio/platform/vfio_platform_private.h @@ -57,6 +57,7 @@ struct vfio_platform_device { int refcnt; struct mutex igate; struct module *parent_module; + const char *compat; /* * These fields should be filled by the bus specific binder