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

Commit 38047d5c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'driver-core-4.17-rc1' of... 

Merge tag 'driver-core-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Pull driver core updates from Greg KH:
 "Here is the "big" set of driver core patches for 4.17-rc1.

  There's really not much here, just a bunch of firmware code
  refactoring from Luis as he attempts to wrangle that codebase into
  something that is managable, along with a bunch of userspace tests for
  it. Other than that, a handful of small bugfixes and reverts of things
  that didn't work out.

  Full details are in the shortlog, it's not all that much.

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

* tag 'driver-core-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (30 commits)
  drivers: base: remove check for callback in coredump_store()
  mt7601u: use firmware_request_cache() to address cache on reboot
  firmware: add firmware_request_cache() to help with cache on reboot
  firmware: fix typo on pr_info_once() when ignore_sysfs_fallback is used
  firmware: explicitly include vmalloc.h
  firmware: ensure the firmware cache is not used on incompatible calls
  test_firmware: modify custom fallback tests to use unique files
  firmware: add helper to check to see if fw cache is setup
  firmware: fix checking for return values for fw_add_devm_name()
  rename: _request_firmware_load() fw_load_sysfs_fallback()
  test_firmware: test three firmware kernel configs using a proc knob
  test_firmware: expand on library with shared helpers
  firmware: enable to force disable the fallback mechanism at run time
  firmware: enable run time change of forcing fallback loader
  firmware: move firmware loader into its own directory
  firmware: split firmware fallback functionality into its own file
  firmware: move loading timeout under struct firmware_fallback_config
  firmware: use helpers for setting up a temporary cache timeout
  firmware: simplify CONFIG_FW_LOADER_USER_HELPER_FALLBACK further
  drivers: base: add description for .coredump() callback
  ...
parents df34df48 1fe56e0c

Documentation/driver-api/firmware/fallback-mechanisms.rst

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ Since a device is created for the sysfs interface to help load firmware as a 
fallback mechanism userspace can be informed of the addition of the device by

relying on kobject uevents. The addition of the device into the device

hierarchy means the fallback mechanism for firmware loading has been initiated.

For details of implementation refer to _request_firmware_load(), in particular

For details of implementation refer to fw_load_sysfs_fallback(), in particular

on the use of dev_set_uevent_suppress() and kobject_uevent().



The kernel's kobject uevent mechanism is implemented in lib/kobject_uevent.c,

Documentation/driver-api/firmware/request_firmware.rst

+14 −0
Original line number Diff line number Diff line
@@ -44,6 +44,20 @@ request_firmware_nowait 
.. kernel-doc:: drivers/base/firmware_class.c

   :functions: request_firmware_nowait



Special optimizations on reboot

===============================



Some devices have an optimization in place to enable the firmware to be

retained during system reboot. When such optimizations are used the driver

author must ensure the firmware is still available on resume from suspend,

this can be done with firmware_request_cache() insted of requesting for the

firmare to be loaded.



firmware_request_cache()

-----------------------

.. kernel-doc:: drivers/base/firmware_class.c

   :functions: firmware_request_cache



request firmware API expected driver use

========================================

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -5524,7 +5524,7 @@ M: Luis R. Rodriguez <mcgrof@kernel.org> 
L:	linux-kernel@vger.kernel.org

S:	Maintained

F:	Documentation/firmware_class/

F:	drivers/base/firmware*.c

F:	drivers/base/firmware_loader/

F:	include/linux/firmware.h



FLASH ADAPTER DRIVER (IBM Flash Adapter 900GB Full Height PCI Flash Card)

drivers/base/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ obj-y += power/ 
obj-$(CONFIG_HAS_DMA)	+= dma-mapping.o

obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.o

obj-$(CONFIG_ISA_BUS_API)	+= isa.o

obj-$(CONFIG_FW_LOADER)	+= firmware_class.o

obj-y				+= firmware_loader/

obj-$(CONFIG_NUMA)	+= node.o

obj-$(CONFIG_MEMORY_HOTPLUG_SPARSE) += memory.o

ifeq ($(CONFIG_SYSFS),y)

drivers/base/arch_topology.c

+6 −6
Original line number Diff line number Diff line
@@ -169,11 +169,11 @@ bool __init topology_parse_cpu_capacity(struct device_node *cpu_node, int cpu) 
}



#ifdef CONFIG_CPU_FREQ

static cpumask_var_t cpus_to_visit __initdata;

static void __init parsing_done_workfn(struct work_struct *work);

static __initdata DECLARE_WORK(parsing_done_work, parsing_done_workfn);

static cpumask_var_t cpus_to_visit;

static void parsing_done_workfn(struct work_struct *work);

static DECLARE_WORK(parsing_done_work, parsing_done_workfn);



static int __init

static int

init_cpu_capacity_callback(struct notifier_block *nb,

			   unsigned long val,

			   void *data)
@@ -209,7 +209,7 @@ init_cpu_capacity_callback(struct notifier_block *nb, 
	return 0;

}



static struct notifier_block init_cpu_capacity_notifier __initdata = {

static struct notifier_block init_cpu_capacity_notifier = {

	.notifier_call = init_cpu_capacity_callback,

};
@@ -242,7 +242,7 @@ static int __init register_cpufreq_notifier(void) 
}

core_initcall(register_cpufreq_notifier);



static void __init parsing_done_workfn(struct work_struct *work)

static void parsing_done_workfn(struct work_struct *work)

{

	cpufreq_unregister_notifier(&init_cpu_capacity_notifier,

					 CPUFREQ_POLICY_NOTIFIER);