10 files changed, 57 insertions, 44 deletions

diff --git a/Documentation/driver-api/fpga/fpga-mgr.rst b/Documentation/driver-api/fpga/fpga-mgr.rst
index 4b3825da48d9..82b6dbbd31cd 100644
--- a/Documentation/driver-api/fpga/fpga-mgr.rst
+++ b/Documentation/driver-api/fpga/fpga-mgr.rst
@@ -184,6 +184,11 @@ API for implementing a new FPGA Manager driver
 API for programming an FPGA
 ---------------------------
 
+FPGA Manager flags
+
+.. kernel-doc:: include/linux/fpga/fpga-mgr.h
+   :doc: FPGA Manager flags
+
 .. kernel-doc:: include/linux/fpga/fpga-mgr.h
    :functions: fpga_image_info
 
diff --git a/drivers/base/firmware_loader/main.c b/drivers/base/firmware_loader/main.c
index b3c0498ee433..8e9213b36e31 100644
--- a/drivers/base/firmware_loader/main.c
+++ b/drivers/base/firmware_loader/main.c
@@ -226,8 +226,11 @@ static int alloc_lookup_fw_priv(const char *fw_name,
         }
 
         tmp = __allocate_fw_priv(fw_name, fwc, dbuf, size);
-        if (tmp && !(opt_flags & FW_OPT_NOCACHE))
-                list_add(&tmp->list, &fwc->head);
+        if (tmp) {
+                INIT_LIST_HEAD(&tmp->list);
+                if (!(opt_flags & FW_OPT_NOCACHE))
+                        list_add(&tmp->list, &fwc->head);
+        }
         spin_unlock(&fwc->lock);
 
         *fw_priv = tmp;
diff --git a/drivers/fpga/dfl-fme-region.c b/drivers/fpga/dfl-fme-region.c
index 0b7e19c27c6d..51a5ac2293a7 100644
--- a/drivers/fpga/dfl-fme-region.c
+++ b/drivers/fpga/dfl-fme-region.c
@@ -14,6 +14,7 @@
  */
 
 #include <linux/module.h>
+#include <linux/fpga/fpga-mgr.h>
 #include <linux/fpga/fpga-region.h>
 
 #include "dfl-fme-pr.h"
@@ -66,9 +67,10 @@ eprobe_mgr_put:
 static int fme_region_remove(struct platform_device *pdev)
 {
         struct fpga_region *region = dev_get_drvdata(&pdev->dev);
+        struct fpga_manager *mgr = region->mgr;
 
         fpga_region_unregister(region);
-        fpga_mgr_put(region->mgr);
+        fpga_mgr_put(mgr);
 
         return 0;
 }
diff --git a/drivers/fpga/fpga-bridge.c b/drivers/fpga/fpga-bridge.c
index 24b8f98b73ec..c983dac97501 100644
--- a/drivers/fpga/fpga-bridge.c
+++ b/drivers/fpga/fpga-bridge.c
@@ -125,7 +125,7 @@ static int fpga_bridge_dev_match(struct device *dev, const void *data)
  *
  * Given a device, get an exclusive reference to a fpga bridge.
  *
- * Return: fpga manager struct or IS_ERR() condition containing error code.
+ * Return: fpga bridge struct or IS_ERR() condition containing error code.
  */
 struct fpga_bridge *fpga_bridge_get(struct device *dev,
                                     struct fpga_image_info *info)
diff --git a/drivers/fpga/of-fpga-region.c b/drivers/fpga/of-fpga-region.c
index 35fabb8083fb..052a1342ab7e 100644
--- a/drivers/fpga/of-fpga-region.c
+++ b/drivers/fpga/of-fpga-region.c
@@ -437,9 +437,10 @@ eprobe_mgr_put:
 static int of_fpga_region_remove(struct platform_device *pdev)
 {
         struct fpga_region *region = platform_get_drvdata(pdev);
+        struct fpga_manager *mgr = region->mgr;
 
         fpga_region_unregister(region);
-        fpga_mgr_put(region->mgr);
+        fpga_mgr_put(mgr);
 
         return 0;
 }
diff --git a/drivers/hv/connection.c b/drivers/hv/connection.c
index ced041899456..f4d08c8ac7f8 100644
--- a/drivers/hv/connection.c
+++ b/drivers/hv/connection.c
@@ -76,6 +76,7 @@ static int vmbus_negotiate_version(struct vmbus_channel_msginfo *msginfo,
                                         __u32 version)
 {
         int ret = 0;
+        unsigned int cur_cpu;
         struct vmbus_channel_initiate_contact *msg;
         unsigned long flags;
 
@@ -118,9 +119,10 @@ static int vmbus_negotiate_version(struct vmbus_channel_msginfo *msginfo,
          * the CPU attempting to connect may not be CPU 0.
          */
         if (version >= VERSION_WIN8_1) {
-                msg->target_vcpu =
-                        hv_cpu_number_to_vp_number(smp_processor_id());
-                vmbus_connection.connect_cpu = smp_processor_id();
+                cur_cpu = get_cpu();
+                msg->target_vcpu = hv_cpu_number_to_vp_number(cur_cpu);
+                vmbus_connection.connect_cpu = cur_cpu;
+                put_cpu();
         } else {
                 msg->target_vcpu = 0;
                 vmbus_connection.connect_cpu = 0;
diff --git a/drivers/thunderbolt/icm.c b/drivers/thunderbolt/icm.c
index e1e264a9a4c7..28fc4ce75edb 100644
--- a/drivers/thunderbolt/icm.c
+++ b/drivers/thunderbolt/icm.c
@@ -738,14 +738,6 @@ icm_fr_xdomain_connected(struct tb *tb, const struct icm_pkg_header *hdr)
         u8 link, depth;
         u64 route;
 
-        /*
-         * After NVM upgrade adding root switch device fails because we
-         * initiated reset. During that time ICM might still send
-         * XDomain connected message which we ignore here.
-         */
-        if (!tb->root_switch)
-                return;
-
         link = pkg->link_info & ICM_LINK_INFO_LINK_MASK;
         depth = (pkg->link_info & ICM_LINK_INFO_DEPTH_MASK) >>
                 ICM_LINK_INFO_DEPTH_SHIFT;
@@ -1037,14 +1029,6 @@ icm_tr_device_connected(struct tb *tb, const struct icm_pkg_header *hdr)
         if (pkg->hdr.packet_id)
                 return;
 
-        /*
-         * After NVM upgrade adding root switch device fails because we
-         * initiated reset. During that time ICM might still send device
-         * connected message which we ignore here.
-         */
-        if (!tb->root_switch)
-                return;
-
         route = get_route(pkg->route_hi, pkg->route_lo);
         authorized = pkg->link_info & ICM_LINK_INFO_APPROVED;
         security_level = (pkg->hdr.flags & ICM_FLAGS_SLEVEL_MASK) >>
@@ -1408,19 +1392,26 @@ static void icm_handle_notification(struct work_struct *work)
 
         mutex_lock(&tb->lock);
 
-        switch (n->pkg->code) {
-        case ICM_EVENT_DEVICE_CONNECTED:
-                icm->device_connected(tb, n->pkg);
-                break;
-        case ICM_EVENT_DEVICE_DISCONNECTED:
-                icm->device_disconnected(tb, n->pkg);
-                break;
-        case ICM_EVENT_XDOMAIN_CONNECTED:
-                icm->xdomain_connected(tb, n->pkg);
-                break;
-        case ICM_EVENT_XDOMAIN_DISCONNECTED:
-                icm->xdomain_disconnected(tb, n->pkg);
-                break;
+        /*
+         * When the domain is stopped we flush its workqueue but before
+         * that the root switch is removed. In that case we should treat
+         * the queued events as being canceled.
+         */
+        if (tb->root_switch) {
+                switch (n->pkg->code) {
+                case ICM_EVENT_DEVICE_CONNECTED:
+                        icm->device_connected(tb, n->pkg);
+                        break;
+                case ICM_EVENT_DEVICE_DISCONNECTED:
+                        icm->device_disconnected(tb, n->pkg);
+                        break;
+                case ICM_EVENT_XDOMAIN_CONNECTED:
+                        icm->xdomain_connected(tb, n->pkg);
+                        break;
+                case ICM_EVENT_XDOMAIN_DISCONNECTED:
+                        icm->xdomain_disconnected(tb, n->pkg);
+                        break;
+                }
         }
 
         mutex_unlock(&tb->lock);
diff --git a/drivers/thunderbolt/nhi.c b/drivers/thunderbolt/nhi.c
index 88cff05a1808..5cd6bdfa068f 100644
--- a/drivers/thunderbolt/nhi.c
+++ b/drivers/thunderbolt/nhi.c
@@ -1191,5 +1191,5 @@ static void __exit nhi_unload(void)
         tb_domain_exit();
 }
 
-fs_initcall(nhi_init);
+rootfs_initcall(nhi_init);
 module_exit(nhi_unload);
diff --git a/include/linux/fpga/fpga-mgr.h b/include/linux/fpga/fpga-mgr.h
index 8942e61f0028..8ab5df769923 100644
--- a/include/linux/fpga/fpga-mgr.h
+++ b/include/linux/fpga/fpga-mgr.h
@@ -53,12 +53,20 @@ enum fpga_mgr_states {
         FPGA_MGR_STATE_OPERATING,
 };
 
-/*
- * FPGA Manager flags
- * FPGA_MGR_PARTIAL_RECONFIG: do partial reconfiguration if supported
- * FPGA_MGR_EXTERNAL_CONFIG: FPGA has been configured prior to Linux booting
- * FPGA_MGR_BITSTREAM_LSB_FIRST: SPI bitstream bit order is LSB first
- * FPGA_MGR_COMPRESSED_BITSTREAM: FPGA bitstream is compressed
+/**
+ * DOC: FPGA Manager flags
+ *
+ * Flags used in the &fpga_image_info->flags field
+ *
+ * %FPGA_MGR_PARTIAL_RECONFIG: do partial reconfiguration if supported
+ *
+ * %FPGA_MGR_EXTERNAL_CONFIG: FPGA has been configured prior to Linux booting
+ *
+ * %FPGA_MGR_ENCRYPTED_BITSTREAM: indicates bitstream is encrypted
+ *
+ * %FPGA_MGR_BITSTREAM_LSB_FIRST: SPI bitstream bit order is LSB first
+ *
+ * %FPGA_MGR_COMPRESSED_BITSTREAM: FPGA bitstream is compressed
  */
 #define FPGA_MGR_PARTIAL_RECONFIG       BIT(0)
 #define FPGA_MGR_EXTERNAL_CONFIG        BIT(1)
diff --git a/tools/hv/hv_fcopy_daemon.c b/tools/hv/hv_fcopy_daemon.c
index d78aed86af09..8ff8cb1a11f4 100644
--- a/tools/hv/hv_fcopy_daemon.c
+++ b/tools/hv/hv_fcopy_daemon.c
@@ -234,6 +234,7 @@ int main(int argc, char *argv[])
                         break;
 
                 default:
+                        error = HV_E_FAIL;
                         syslog(LOG_ERR, "Unknown operation: %d",
                                 buffer.hdr.operation);