Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb1c592c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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

I wrote:
  "Char/Misc fixes for 4.19-rc7

   Here are 8 small fixes for some char/misc driver issues

   Included here are:
	- fpga driver fixes
	- thunderbolt bugfixes
	- firmware core revert/fix
	- hv core fix
	- hv tool fix

   All of these have been in linux-next with no reported issues."

* tag 'char-misc-4.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  thunderbolt: Initialize after IOMMUs
  thunderbolt: Do not handle ICM events after domain is stopped
  firmware: Always initialize the fw_priv list object
  docs: fpga: document fpga manager flags
  fpga: bridge: fix obvious function documentation error
  tools: hv: fcopy: set 'error' in case an unknown operation was requested
  fpga: do not access region struct after fpga_region_unregister
  Drivers: hv: vmbus: Use get/put_cpu() in vmbus_connect()
parents 4ebaf075 eafa717b

Documentation/driver-api/fpga/fpga-mgr.rst

+5 −0
Original line number Diff line number Diff line
@@ -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

drivers/base/firmware_loader/main.c

+5 −2
Original line number Diff line number Diff line
@@ -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))

	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;

drivers/fpga/dfl-fme-region.c

+3 −1
Original line number Diff line number Diff line
@@ -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 @@ static int fme_region_probe(struct platform_device *pdev) 
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;

}

drivers/fpga/fpga-bridge.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

drivers/fpga/of-fpga-region.c

+2 −1
Original line number Diff line number Diff line
@@ -437,9 +437,10 @@ static int of_fpga_region_probe(struct platform_device *pdev) 
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;

}