Merge tag 'char-misc-4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Pull char/misc driver updates from Greg KH:
 "Here is the big pull request for char/misc drivers for 4.16-rc1.

  There's a lot of stuff in here. Three new driver subsystems were added
  for various types of hardware busses:

   - siox
   - slimbus
   - soundwire

  as well as a new vboxguest subsystem for the VirtualBox hypervisor
  drivers.

  There's also big updates from the FPGA subsystem, lots of Android
  binder fixes, the usual handful of hyper-v updates, and lots of other
  smaller driver updates.

  All of these have been in linux-next for a long time, with no reported
  issues"

* tag 'char-misc-4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (155 commits)
  char: lp: use true or false for boolean values
  android: binder: use VM_ALLOC to get vm area
  android: binder: Use true and false for boolean values
  lkdtm: fix handle_irq_event symbol for INT_HW_IRQ_EN
  EISA: Delete error message for a failed memory allocation in eisa_probe()
  EISA: Whitespace cleanup
  misc: remove AVR32 dependencies
  virt: vbox: Add error mapping for VERR_INVALID_NAME and VERR_NO_MORE_FILES
  soundwire: Fix a signedness bug
  uio_hv_generic: fix new type mismatch warnings
  uio_hv_generic: fix type mismatch warnings
  auxdisplay: img-ascii-lcd: add missing MODULE_DESCRIPTION/AUTHOR/LICENSE
  uio_hv_generic: add rescind support
  uio_hv_generic: check that host supports monitor page
  uio_hv_generic: create send and receive buffers
  uio: document uio_hv_generic regions
  doc: fix documentation about uio_hv_generic
  vmbus: add monitor_id and subchannel_id to sysfs per channel
  vmbus: fix ABI documentation
  uio_hv_generic: use ISR callback method
  ...

1 files changed, 46 insertions, 418 deletions

diff --git a/drivers/fpga/fpga-region.c b/drivers/fpga/fpga-region.c
index d9ab7c75b14f..edab2a2e03ef 100644
--- a/drivers/fpga/fpga-region.c
+++ b/drivers/fpga/fpga-region.c
@@ -2,6 +2,7 @@
  * FPGA Region - Device Tree support for FPGA programming under Linux
  *
  *  Copyright (C) 2013-2016 Altera Corporation
+ *  Copyright (C) 2017 Intel Corporation
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -18,61 +19,30 @@
 
 #include <linux/fpga/fpga-bridge.h>
 #include <linux/fpga/fpga-mgr.h>
+#include <linux/fpga/fpga-region.h>
 #include <linux/idr.h>
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/module.h>
-#include <linux/of_platform.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 
-/**
- * struct fpga_region - FPGA Region structure
- * @dev: FPGA Region device
- * @mutex: enforces exclusive reference to region
- * @bridge_list: list of FPGA bridges specified in region
- * @info: fpga image specific information
- */
-struct fpga_region {
-        struct device dev;
-        struct mutex mutex; /* for exclusive reference to region */
-        struct list_head bridge_list;
-        struct fpga_image_info *info;
-};
-
-#define to_fpga_region(d) container_of(d, struct fpga_region, dev)
-
 static DEFINE_IDA(fpga_region_ida);
 static struct class *fpga_region_class;
 
-static const struct of_device_id fpga_region_of_match[] = {
-        { .compatible = "fpga-region", },
-        {},
-};
-MODULE_DEVICE_TABLE(of, fpga_region_of_match);
-
-static int fpga_region_of_node_match(struct device *dev, const void *data)
-{
-        return dev->of_node == data;
-}
-
-/**
- * fpga_region_find - find FPGA region
- * @np: device node of FPGA Region
- * Caller will need to put_device(&region->dev) when done.
- * Returns FPGA Region struct or NULL
- */
-static struct fpga_region *fpga_region_find(struct device_node *np)
+struct fpga_region *fpga_region_class_find(
+        struct device *start, const void *data,
+        int (*match)(struct device *, const void *))
 {
         struct device *dev;
 
-        dev = class_find_device(fpga_region_class, NULL, np,
-                                fpga_region_of_node_match);
+        dev = class_find_device(fpga_region_class, start, data, match);
         if (!dev)
                 return NULL;
 
         return to_fpga_region(dev);
 }
+EXPORT_SYMBOL_GPL(fpga_region_class_find);
 
 /**
  * fpga_region_get - get an exclusive reference to a fpga region
@@ -94,15 +64,13 @@ static struct fpga_region *fpga_region_get(struct fpga_region *region)
         }
 
         get_device(dev);
-        of_node_get(dev->of_node);
         if (!try_module_get(dev->parent->driver->owner)) {
-                of_node_put(dev->of_node);
                 put_device(dev);
                 mutex_unlock(&region->mutex);
                 return ERR_PTR(-ENODEV);
         }
 
-        dev_dbg(&region->dev, "get\n");
+        dev_dbg(dev, "get\n");
 
         return region;
 }
@@ -116,403 +84,99 @@ static void fpga_region_put(struct fpga_region *region)
 {
         struct device *dev = &region->dev;
 
-        dev_dbg(&region->dev, "put\n");
+        dev_dbg(dev, "put\n");
 
         module_put(dev->parent->driver->owner);
-        of_node_put(dev->of_node);
         put_device(dev);
         mutex_unlock(&region->mutex);
 }
 
 /**
- * fpga_region_get_manager - get exclusive reference for FPGA manager
- * @region: FPGA region
- *
- * Get FPGA Manager from "fpga-mgr" property or from ancestor region.
- *
- * Caller should call fpga_mgr_put() when done with manager.
- *
- * Return: fpga manager struct or IS_ERR() condition containing error code.
- */
-static struct fpga_manager *fpga_region_get_manager(struct fpga_region *region)
-{
-        struct device *dev = &region->dev;
-        struct device_node *np = dev->of_node;
-        struct device_node  *mgr_node;
-        struct fpga_manager *mgr;
-
-        of_node_get(np);
-        while (np) {
-                if (of_device_is_compatible(np, "fpga-region")) {
-                        mgr_node = of_parse_phandle(np, "fpga-mgr", 0);
-                        if (mgr_node) {
-                                mgr = of_fpga_mgr_get(mgr_node);
-                                of_node_put(np);
-                                return mgr;
-                        }
-                }
-                np = of_get_next_parent(np);
-        }
-        of_node_put(np);
-
-        return ERR_PTR(-EINVAL);
-}
-
-/**
- * fpga_region_get_bridges - create a list of bridges
- * @region: FPGA region
- * @overlay: device node of the overlay
- *
- * Create a list of bridges including the parent bridge and the bridges
- * specified by "fpga-bridges" property.  Note that the
- * fpga_bridges_enable/disable/put functions are all fine with an empty list
- * if that happens.
- *
- * Caller should call fpga_bridges_put(&region->bridge_list) when
- * done with the bridges.
- *
- * Return 0 for success (even if there are no bridges specified)
- * or -EBUSY if any of the bridges are in use.
- */
-static int fpga_region_get_bridges(struct fpga_region *region,
-                                   struct device_node *overlay)
-{
-        struct device *dev = &region->dev;
-        struct device_node *region_np = dev->of_node;
-        struct device_node *br, *np, *parent_br = NULL;
-        int i, ret;
-
-        /* If parent is a bridge, add to list */
-        ret = fpga_bridge_get_to_list(region_np->parent, region->info,
-                                      &region->bridge_list);
-        if (ret == -EBUSY)
-                return ret;
-
-        if (!ret)
-                parent_br = region_np->parent;
-
-        /* If overlay has a list of bridges, use it. */
-        if (of_parse_phandle(overlay, "fpga-bridges", 0))
-                np = overlay;
-        else
-                np = region_np;
-
-        for (i = 0; ; i++) {
-                br = of_parse_phandle(np, "fpga-bridges", i);
-                if (!br)
-                        break;
-
-                /* If parent bridge is in list, skip it. */
-                if (br == parent_br)
-                        continue;
-
-                /* If node is a bridge, get it and add to list */
-                ret = fpga_bridge_get_to_list(br, region->info,
-                                              &region->bridge_list);
-
-                /* If any of the bridges are in use, give up */
-                if (ret == -EBUSY) {
-                        fpga_bridges_put(&region->bridge_list);
-                        return -EBUSY;
-                }
-        }
-
-        return 0;
-}
-
-/**
  * fpga_region_program_fpga - program FPGA
  * @region: FPGA region
- * @firmware_name: name of FPGA image firmware file
- * @overlay: device node of the overlay
- * Program an FPGA using information in the device tree.
- * Function assumes that there is a firmware-name property.
+ * Program an FPGA using fpga image info (region->info).
  * Return 0 for success or negative error code.
  */
-static int fpga_region_program_fpga(struct fpga_region *region,
-                                    const char *firmware_name,
-                                    struct device_node *overlay)
+int fpga_region_program_fpga(struct fpga_region *region)
 {
-        struct fpga_manager *mgr;
+        struct device *dev = &region->dev;
+        struct fpga_image_info *info = region->info;
         int ret;
 
         region = fpga_region_get(region);
         if (IS_ERR(region)) {
-                pr_err("failed to get fpga region\n");
+                dev_err(dev, "failed to get FPGA region\n");
                 return PTR_ERR(region);
         }
 
-        mgr = fpga_region_get_manager(region);
-        if (IS_ERR(mgr)) {
-                pr_err("failed to get fpga region manager\n");
-                ret = PTR_ERR(mgr);
+        ret = fpga_mgr_lock(region->mgr);
+        if (ret) {
+                dev_err(dev, "FPGA manager is busy\n");
                 goto err_put_region;
         }
 
-        ret = fpga_region_get_bridges(region, overlay);
-        if (ret) {
-                pr_err("failed to get fpga region bridges\n");
-                goto err_put_mgr;
+        /*
+         * In some cases, we already have a list of bridges in the
+         * fpga region struct.  Or we don't have any bridges.
+         */
+        if (region->get_bridges) {
+                ret = region->get_bridges(region);
+                if (ret) {
+                        dev_err(dev, "failed to get fpga region bridges\n");
+                        goto err_unlock_mgr;
+                }
         }
 
         ret = fpga_bridges_disable(&region->bridge_list);
         if (ret) {
-                pr_err("failed to disable region bridges\n");
+                dev_err(dev, "failed to disable bridges\n");
                 goto err_put_br;
         }
 
-        ret = fpga_mgr_firmware_load(mgr, region->info, firmware_name);
+        ret = fpga_mgr_load(region->mgr, info);
         if (ret) {
-                pr_err("failed to load fpga image\n");
+                dev_err(dev, "failed to load FPGA image\n");
                 goto err_put_br;
         }
 
         ret = fpga_bridges_enable(&region->bridge_list);
         if (ret) {
-                pr_err("failed to enable region bridges\n");
+                dev_err(dev, "failed to enable region bridges\n");
                 goto err_put_br;
         }
 
-        fpga_mgr_put(mgr);
+        fpga_mgr_unlock(region->mgr);
         fpga_region_put(region);
 
         return 0;
 
 err_put_br:
-        fpga_bridges_put(&region->bridge_list);
-err_put_mgr:
-        fpga_mgr_put(mgr);
+        if (region->get_bridges)
+                fpga_bridges_put(&region->bridge_list);
+err_unlock_mgr:
+        fpga_mgr_unlock(region->mgr);
 err_put_region:
         fpga_region_put(region);
 
         return ret;
 }
+EXPORT_SYMBOL_GPL(fpga_region_program_fpga);
 
-/**
- * child_regions_with_firmware
- * @overlay: device node of the overlay
- *
- * If the overlay adds child FPGA regions, they are not allowed to have
- * firmware-name property.
- *
- * Return 0 for OK or -EINVAL if child FPGA region adds firmware-name.
- */
-static int child_regions_with_firmware(struct device_node *overlay)
-{
-        struct device_node *child_region;
-        const char *child_firmware_name;
-        int ret = 0;
-
-        of_node_get(overlay);
-
-        child_region = of_find_matching_node(overlay, fpga_region_of_match);
-        while (child_region) {
-                if (!of_property_read_string(child_region, "firmware-name",
-                                             &child_firmware_name)) {
-                        ret = -EINVAL;
-                        break;
-                }
-                child_region = of_find_matching_node(child_region,
-                                                     fpga_region_of_match);
-        }
-
-        of_node_put(child_region);
-
-        if (ret)
-                pr_err("firmware-name not allowed in child FPGA region: %pOF",
-                       child_region);
-
-        return ret;
-}
-
-/**
- * fpga_region_notify_pre_apply - pre-apply overlay notification
- *
- * @region: FPGA region that the overlay was applied to
- * @nd: overlay notification data
- *
- * Called after when an overlay targeted to a FPGA Region is about to be
- * applied.  Function will check the properties that will be added to the FPGA
- * region.  If the checks pass, it will program the FPGA.
- *
- * The checks are:
- * The overlay must add either firmware-name or external-fpga-config property
- * to the FPGA Region.
- *
- *   firmware-name         : program the FPGA
- *   external-fpga-config  : FPGA is already programmed
- *   encrypted-fpga-config : FPGA bitstream is encrypted
- *
- * The overlay can add other FPGA regions, but child FPGA regions cannot have a
- * firmware-name property since those regions don't exist yet.
- *
- * If the overlay that breaks the rules, notifier returns an error and the
- * overlay is rejected before it goes into the main tree.
- *
- * Returns 0 for success or negative error code for failure.
- */
-static int fpga_region_notify_pre_apply(struct fpga_region *region,
-                                        struct of_overlay_notify_data *nd)
+int fpga_region_register(struct device *dev, struct fpga_region *region)
 {
-        const char *firmware_name = NULL;
-        struct fpga_image_info *info;
-        int ret;
-
-        info = devm_kzalloc(&region->dev, sizeof(*info), GFP_KERNEL);
-        if (!info)
-                return -ENOMEM;
-
-        region->info = info;
-
-        /* Reject overlay if child FPGA Regions have firmware-name property */
-        ret = child_regions_with_firmware(nd->overlay);
-        if (ret)
-                return ret;
-
-        /* Read FPGA region properties from the overlay */
-        if (of_property_read_bool(nd->overlay, "partial-fpga-config"))
-                info->flags |= FPGA_MGR_PARTIAL_RECONFIG;
-
-        if (of_property_read_bool(nd->overlay, "external-fpga-config"))
-                info->flags |= FPGA_MGR_EXTERNAL_CONFIG;
-
-        if (of_property_read_bool(nd->overlay, "encrypted-fpga-config"))
-                info->flags |= FPGA_MGR_ENCRYPTED_BITSTREAM;
-
-        of_property_read_string(nd->overlay, "firmware-name", &firmware_name);
-
-        of_property_read_u32(nd->overlay, "region-unfreeze-timeout-us",
-                             &info->enable_timeout_us);
-
-        of_property_read_u32(nd->overlay, "region-freeze-timeout-us",
-                             &info->disable_timeout_us);
-
-        of_property_read_u32(nd->overlay, "config-complete-timeout-us",
-                             &info->config_complete_timeout_us);
-
-        /* If FPGA was externally programmed, don't specify firmware */
-        if ((info->flags & FPGA_MGR_EXTERNAL_CONFIG) && firmware_name) {
-                pr_err("error: specified firmware and external-fpga-config");
-                return -EINVAL;
-        }
-
-        /* FPGA is already configured externally.  We're done. */
-        if (info->flags & FPGA_MGR_EXTERNAL_CONFIG)
-                return 0;
-
-        /* If we got this far, we should be programming the FPGA */
-        if (!firmware_name) {
-                pr_err("should specify firmware-name or external-fpga-config\n");
-                return -EINVAL;
-        }
-
-        return fpga_region_program_fpga(region, firmware_name, nd->overlay);
-}
-
-/**
- * fpga_region_notify_post_remove - post-remove overlay notification
- *
- * @region: FPGA region that was targeted by the overlay that was removed
- * @nd: overlay notification data
- *
- * Called after an overlay has been removed if the overlay's target was a
- * FPGA region.
- */
-static void fpga_region_notify_post_remove(struct fpga_region *region,
-                                           struct of_overlay_notify_data *nd)
-{
-        fpga_bridges_disable(&region->bridge_list);
-        fpga_bridges_put(&region->bridge_list);
-        devm_kfree(&region->dev, region->info);
-        region->info = NULL;
-}
-
-/**
- * of_fpga_region_notify - reconfig notifier for dynamic DT changes
- * @nb:         notifier block
- * @action:     notifier action
- * @arg:        reconfig data
- *
- * This notifier handles programming a FPGA when a "firmware-name" property is
- * added to a fpga-region.
- *
- * Returns NOTIFY_OK or error if FPGA programming fails.
- */
-static int of_fpga_region_notify(struct notifier_block *nb,
-                                 unsigned long action, void *arg)
-{
-        struct of_overlay_notify_data *nd = arg;
-        struct fpga_region *region;
-        int ret;
-
-        switch (action) {
-        case OF_OVERLAY_PRE_APPLY:
-                pr_debug("%s OF_OVERLAY_PRE_APPLY\n", __func__);
-                break;
-        case OF_OVERLAY_POST_APPLY:
-                pr_debug("%s OF_OVERLAY_POST_APPLY\n", __func__);
-                return NOTIFY_OK;       /* not for us */
-        case OF_OVERLAY_PRE_REMOVE:
-                pr_debug("%s OF_OVERLAY_PRE_REMOVE\n", __func__);
-                return NOTIFY_OK;       /* not for us */
-        case OF_OVERLAY_POST_REMOVE:
-                pr_debug("%s OF_OVERLAY_POST_REMOVE\n", __func__);
-                break;
-        default:                        /* should not happen */
-                return NOTIFY_OK;
-        }
-
-        region = fpga_region_find(nd->target);
-        if (!region)
-                return NOTIFY_OK;
-
-        ret = 0;
-        switch (action) {
-        case OF_OVERLAY_PRE_APPLY:
-                ret = fpga_region_notify_pre_apply(region, nd);
-                break;
-
-        case OF_OVERLAY_POST_REMOVE:
-                fpga_region_notify_post_remove(region, nd);
-                break;
-        }
-
-        put_device(&region->dev);
-
-        if (ret)
-                return notifier_from_errno(ret);
-
-        return NOTIFY_OK;
-}
-
-static struct notifier_block fpga_region_of_nb = {
-        .notifier_call = of_fpga_region_notify,
-};
-
-static int fpga_region_probe(struct platform_device *pdev)
-{
-        struct device *dev = &pdev->dev;
-        struct device_node *np = dev->of_node;
-        struct fpga_region *region;
         int id, ret = 0;
 
-        region = kzalloc(sizeof(*region), GFP_KERNEL);
-        if (!region)
-                return -ENOMEM;
-
         id = ida_simple_get(&fpga_region_ida, 0, 0, GFP_KERNEL);
-        if (id < 0) {
-                ret = id;
-                goto err_kfree;
-        }
+        if (id < 0)
+                return id;
 
         mutex_init(&region->mutex);
         INIT_LIST_HEAD(&region->bridge_list);
-
         device_initialize(&region->dev);
+        region->dev.groups = region->groups;
         region->dev.class = fpga_region_class;
         region->dev.parent = dev;
-        region->dev.of_node = np;
+        region->dev.of_node = dev->of_node;
         region->dev.id = id;
         dev_set_drvdata(dev, region);
 
@@ -524,44 +188,27 @@ static int fpga_region_probe(struct platform_device *pdev)
         if (ret)
                 goto err_remove;
 
-        of_platform_populate(np, fpga_region_of_match, NULL, &region->dev);
-
-        dev_info(dev, "FPGA Region probed\n");
-
         return 0;
 
 err_remove:
         ida_simple_remove(&fpga_region_ida, id);
-err_kfree:
-        kfree(region);
-
         return ret;
 }
+EXPORT_SYMBOL_GPL(fpga_region_register);
 
-static int fpga_region_remove(struct platform_device *pdev)
+int fpga_region_unregister(struct fpga_region *region)
 {
-        struct fpga_region *region = platform_get_drvdata(pdev);
-
         device_unregister(&region->dev);
 
         return 0;
 }
-
-static struct platform_driver fpga_region_driver = {
-        .probe = fpga_region_probe,
-        .remove = fpga_region_remove,
-        .driver = {
-                .name   = "fpga-region",
-                .of_match_table = of_match_ptr(fpga_region_of_match),
-        },
-};
+EXPORT_SYMBOL_GPL(fpga_region_unregister);
 
 static void fpga_region_dev_release(struct device *dev)
 {
         struct fpga_region *region = to_fpga_region(dev);
 
         ida_simple_remove(&fpga_region_ida, region->dev.id);
-        kfree(region);
 }
 
 /**
@@ -570,36 +217,17 @@ static void fpga_region_dev_release(struct device *dev)
  */
 static int __init fpga_region_init(void)
 {
-        int ret;
-
         fpga_region_class = class_create(THIS_MODULE, "fpga_region");
         if (IS_ERR(fpga_region_class))
                 return PTR_ERR(fpga_region_class);
 
         fpga_region_class->dev_release = fpga_region_dev_release;
 
-        ret = of_overlay_notifier_register(&fpga_region_of_nb);
-        if (ret)
-                goto err_class;
-
-        ret = platform_driver_register(&fpga_region_driver);
-        if (ret)
-                goto err_plat;
-
         return 0;
-
-err_plat:
-        of_overlay_notifier_unregister(&fpga_region_of_nb);
-err_class:
-        class_destroy(fpga_region_class);
-        ida_destroy(&fpga_region_ida);
-        return ret;
 }
 
 static void __exit fpga_region_exit(void)
 {
-        platform_driver_unregister(&fpga_region_driver);
-        of_overlay_notifier_unregister(&fpga_region_of_nb);
         class_destroy(fpga_region_class);
         ida_destroy(&fpga_region_ida);
 }
@@ -608,5 +236,5 @@ subsys_initcall(fpga_region_init);
 module_exit(fpga_region_exit);
 
 MODULE_DESCRIPTION("FPGA Region");
-MODULE_AUTHOR("Alan Tull <atull@opensource.altera.com>");
+MODULE_AUTHOR("Alan Tull <atull@kernel.org>");
 MODULE_LICENSE("GPL v2");