Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp3636425pxk; Tue, 29 Sep 2020 02:09:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyfIX9jTZcIRTOZcJtGO1LSYwOLOkZ4jiY+SuOPr+SbG1RtEckqXPz0ZblvVGG/E8WcHBcq X-Received: by 2002:a17:906:33ca:: with SMTP id w10mr3002937eja.438.1601370552751; Tue, 29 Sep 2020 02:09:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601370552; cv=none; d=google.com; s=arc-20160816; b=rHWY2s17xVZnLl6tN1gUmRQIhjnvoIeAct92Z61mSIZufHaRJ906lBiq6j/lUykBEC 2CoUAr4r7U1aM/h0rKnAzMeqF9HSL6pM9SNbwb4iiiZHfaBzrW/UW4w/taqdVB+DCwlB +clY3BeY9/LZKkolOPZZ7fOA0JIxhvooohBWttNMeYpvKWWAWNqkEDxgy6+i0dU4//qY jZjvZ2T8GuT4d4zuCQFaaRi8YvvXLt30Zd4/4srsmESqbMfVU8Zfgn9VpKh5hABVz1px sDKWNqvOwDC8bGjj7VcaNprZQAbqajbxyh63MRYBgzS9x9QcgnZ3tBsQsBaaHP5ig9xB Nbrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from; bh=dMH6cLsF3FqG4YVo0Mg5a58IFKUdL/FzddxNCiRHiVY=; b=nb1UxbOFmvAjCp+Fj8F9h33yOchAx32XwVrRPWczn+GA2pyp4FqZDl7bKQKBoGFYD2 qAcEMdXS4PmOAttfujkgEU0rdfgke+21oEOyH443EtWW8tC5GtNYQOBO7KbjSC6UfOBA PIDSWB1fln2k8kZ5NHMjbrJzABm5rItztQg98sK+VvUMNZc4IlHPs5DTCdt+zncZ/mJz ol7RL8ETP99yVhsGUi70SjTNdpIkTEUY7pwElQLFRTb/UZ6mYQwoai9xWiCN4HIHTHrx 8jmedQ8RlMMKYv+feDNzGAfhi+4B34lNmyQkv7RHXXNKN8wZTb7xUnWskQ3WRok+3Y8j 1PTw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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. [23.128.96.18]) by mx.google.com with ESMTP id f24si2346810edr.375.2020.09.29.02.08.49; Tue, 29 Sep 2020 02:09:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S1728083AbgI2JEl (ORCPT + 99 others); Tue, 29 Sep 2020 05:04:41 -0400 Received: from inva020.nxp.com ([92.121.34.13]:47838 "EHLO inva020.nxp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727836AbgI2JD7 (ORCPT ); Tue, 29 Sep 2020 05:03:59 -0400 Received: from inva020.nxp.com (localhost [127.0.0.1]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 161F51A1245; Tue, 29 Sep 2020 11:03:57 +0200 (CEST) Received: from inva024.eu-rdc02.nxp.com (inva024.eu-rdc02.nxp.com [134.27.226.22]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 083AA1A1230; Tue, 29 Sep 2020 11:03:57 +0200 (CEST) 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 A93AD2032C; Tue, 29 Sep 2020 11:03:56 +0200 (CEST) From: Diana Craciun To: alex.williamson@redhat.com, kvm@vger.kernel.org Cc: bharatb.linux@gmail.com, linux-kernel@vger.kernel.org, eric.auger@redhat.com, Diana Craciun , Bharat Bhushan Subject: [PATCH v5 02/10] vfio/fsl-mc: Scan DPRC objects on vfio-fsl-mc driver bind Date: Tue, 29 Sep 2020 12:03:31 +0300 Message-Id: <20200929090339.17659-3-diana.craciun@oss.nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200929090339.17659-1-diana.craciun@oss.nxp.com> References: <20200929090339.17659-1-diana.craciun@oss.nxp.com> X-Virus-Scanned: ClamAV using ClamSMTP Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The DPRC (Data Path Resource Container) device is a bus device and has child devices attached to it. When the vfio-fsl-mc driver is probed the DPRC is scanned and the child devices discovered and initialized. Signed-off-by: Bharat Bhushan Signed-off-by: Diana Craciun --- drivers/vfio/fsl-mc/vfio_fsl_mc.c | 90 +++++++++++++++++++++++ drivers/vfio/fsl-mc/vfio_fsl_mc_private.h | 1 + 2 files changed, 91 insertions(+) diff --git a/drivers/vfio/fsl-mc/vfio_fsl_mc.c b/drivers/vfio/fsl-mc/vfio_fsl_mc.c index a7a483a1e90b..ba44d6d01cc9 100644 --- a/drivers/vfio/fsl-mc/vfio_fsl_mc.c +++ b/drivers/vfio/fsl-mc/vfio_fsl_mc.c @@ -15,6 +15,8 @@ #include "vfio_fsl_mc_private.h" +static struct fsl_mc_driver vfio_fsl_mc_driver; + static int vfio_fsl_mc_open(void *device_data) { if (!try_module_get(THIS_MODULE)) @@ -84,6 +86,79 @@ static const struct vfio_device_ops vfio_fsl_mc_ops = { .mmap = vfio_fsl_mc_mmap, }; +static int vfio_fsl_mc_bus_notifier(struct notifier_block *nb, + unsigned long action, void *data) +{ + struct vfio_fsl_mc_device *vdev = container_of(nb, + struct vfio_fsl_mc_device, nb); + struct device *dev = data; + struct fsl_mc_device *mc_dev = to_fsl_mc_device(dev); + struct fsl_mc_device *mc_cont = to_fsl_mc_device(mc_dev->dev.parent); + + if (action == BUS_NOTIFY_ADD_DEVICE && + vdev->mc_dev == mc_cont) { + mc_dev->driver_override = kasprintf(GFP_KERNEL, "%s", + vfio_fsl_mc_ops.name); + if (!mc_dev->driver_override) + dev_warn(dev, "VFIO_FSL_MC: Setting driver override for device in dprc %s failed\n", + dev_name(&mc_cont->dev)); + else + dev_info(dev, "VFIO_FSL_MC: Setting driver override for device in dprc %s\n", + dev_name(&mc_cont->dev)); + } else if (action == BUS_NOTIFY_BOUND_DRIVER && + vdev->mc_dev == mc_cont) { + struct fsl_mc_driver *mc_drv = to_fsl_mc_driver(dev->driver); + + if (mc_drv && mc_drv != &vfio_fsl_mc_driver) + dev_warn(dev, "VFIO_FSL_MC: Object %s bound to driver %s while DPRC bound to vfio-fsl-mc\n", + dev_name(dev), mc_drv->driver.name); + } + + return 0; +} + +static int vfio_fsl_mc_init_device(struct vfio_fsl_mc_device *vdev) +{ + struct fsl_mc_device *mc_dev = vdev->mc_dev; + int ret; + + /* 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); + + mc_dev->mc_io = mc_cont->mc_io; + return 0; + } + + vdev->nb.notifier_call = vfio_fsl_mc_bus_notifier; + ret = bus_register_notifier(&fsl_mc_bus_type, &vdev->nb); + if (ret) + return ret; + + /* open DPRC, allocate a MC portal */ + ret = dprc_setup(mc_dev); + if (ret) { + dev_err(&mc_dev->dev, "VFIO_FSL_MC: Failed to setup DPRC (%d)\n", ret); + goto out_nc_unreg; + } + + ret = dprc_scan_container(mc_dev, false); + if (ret) { + dev_err(&mc_dev->dev, "VFIO_FSL_MC: Container scanning failed (%d)\n", ret); + goto out_dprc_cleanup; + } + + return 0; + +out_dprc_cleanup: + dprc_cleanup(mc_dev); +out_nc_unreg: + bus_unregister_notifier(&fsl_mc_bus_type, &vdev->nb); + vdev->nb.notifier_call = NULL; + + return ret; +} + static int vfio_fsl_mc_probe(struct fsl_mc_device *mc_dev) { struct iommu_group *group; @@ -110,8 +185,15 @@ static int vfio_fsl_mc_probe(struct fsl_mc_device *mc_dev) dev_err(dev, "VFIO_FSL_MC: Failed to add to vfio group\n"); goto out_group_put; } + + ret = vfio_fsl_mc_init_device(vdev); + if (ret) + goto out_group_dev; + return 0; +out_group_dev: + vfio_del_group_dev(dev); out_group_put: vfio_iommu_group_put(group, dev); return ret; @@ -126,6 +208,14 @@ static int vfio_fsl_mc_remove(struct fsl_mc_device *mc_dev) if (!vdev) return -EINVAL; + if (is_fsl_mc_bus_dprc(mc_dev)) { + dprc_remove_devices(mc_dev, NULL, 0); + dprc_cleanup(mc_dev); + } + + if (vdev->nb.notifier_call) + bus_unregister_notifier(&fsl_mc_bus_type, &vdev->nb); + vfio_iommu_group_put(mc_dev->dev.iommu_group, dev); return 0; diff --git a/drivers/vfio/fsl-mc/vfio_fsl_mc_private.h b/drivers/vfio/fsl-mc/vfio_fsl_mc_private.h index e79cc116f6b8..37d61eaa58c8 100644 --- a/drivers/vfio/fsl-mc/vfio_fsl_mc_private.h +++ b/drivers/vfio/fsl-mc/vfio_fsl_mc_private.h @@ -9,6 +9,7 @@ struct vfio_fsl_mc_device { struct fsl_mc_device *mc_dev; + struct notifier_block nb; }; #endif /* VFIO_FSL_MC_PRIVATE_H */ -- 2.17.1