From patchwork Wed Oct 28 13:02:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 7510251 Return-Path: X-Original-To: patchwork-kvm@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 9DF679F40A for ; Wed, 28 Oct 2015 13:05:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EB84B2053B for ; Wed, 28 Oct 2015 13:05:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DF63520685 for ; Wed, 28 Oct 2015 13:05:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965690AbbJ1NDD (ORCPT ); Wed, 28 Oct 2015 09:03:03 -0400 Received: from mail-wi0-f173.google.com ([209.85.212.173]:37712 "EHLO mail-wi0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965665AbbJ1NC7 (ORCPT ); Wed, 28 Oct 2015 09:02:59 -0400 Received: by wicfv8 with SMTP id fv8so11829831wic.0 for ; Wed, 28 Oct 2015 06:02:58 -0700 (PDT) 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=Vdvll4kDsbVRe0BcQUPFpwe2AGAVoLEX+vnS71IYAAAb4NwqWl2akmuMEx4YffOUnb tfUPOpFqvvA23tLGsXyWafC9CMCuKgFXNfh4b/TNl9bPhns/jOOIujQ3yII9HcnP/Wha HmpYpMWbKJgAXW0G2kaHDWGhzdvawh4XY9bksMS9aA2OG7SIdrNj8huMWwg1WTfZaYFv HbiMDqNcWhVZJm36sdBuxky0VFZo4CftM6ALSpgQRARNLJ4cADBR6FiB9Wt45XgW5bT1 pYzU0LznHHgF7sXpinLFdl6ue7tknhseyWKLKyHVDNTvvHzMFemJD11P6Fs6pwD7Rj91 /gCA== 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=iK1Km3I4XmOLgQFmyehbosSBoLyYGHJQLMYhjwlq10sZPEuKtYjtd/GqcBUKzMHwpD 3zieZm4t51k1Ftj6Gx3jxuolKw3xvzM3i8LwGQEeYrtxX3njX1BSHNz6hq85PQU8J1pF 2xzuwkMGT3BE1u8IARaX8g9Jr6GbbD3s4wD4U6tJnXBgTJHrCMXT08EMYqY4spNX0OM3 qEDtA216A2VXhfc2/wtEipnfPrkjndTC7meEnVcd0A5RqLQfIrvp3TCiXJObLd5hdqPm NveJoJPX7K8YEBy5y16LD9uIFI2IN3STd7bLLYfcm4jGPKi00kCdNMrSC7kspgAjTi6F STHg== X-Gm-Message-State: ALoCoQk5BlDRg9gPqedasu+bVm6Bvyga5tYhoImIpUc6RbKCEliNx6PgKY1qIYJJlliSUkfGNM6v X-Received: by 10.194.2.5 with SMTP id 5mr61255878wjq.153.1446037377966; Wed, 28 Oct 2015 06:02:57 -0700 (PDT) Received: from new-host-2.home (LMontsouris-657-1-37-90.w80-11.abo.wanadoo.fr. [80.11.198.90]) by smtp.gmail.com with ESMTPSA id gl9sm49894196wjb.10.2015.10.28.06.02.55 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 28 Oct 2015 06:02:56 -0700 (PDT) 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 v5 5/7] vfio: platform: add compat in vfio_platform_device Date: Wed, 28 Oct 2015 13:02:36 +0000 Message-Id: <1446037358-2079-6-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1446037358-2079-1-git-send-email-eric.auger@linaro.org> References: <1446037358-2079-1-git-send-email-eric.auger@linaro.org> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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 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(-) 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