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

Commit 47fcc036 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

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

  The majority of the work here is in the firmware subsystem, with
  reworks to try to attempt to make the code easier to handle in the
  long run, but no functional change. There's also some tree-wide sysfs
  attribute fixups with lots of acks from the various subsystem
  maintainers, as well as a handful of other normal fixes and changes.

  And finally, some license cleanups for the driver core and sysfs code.

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

* tag 'driver-core-4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (48 commits)
  device property: Define type of PROPERTY_ENRTY_*() macros
  device property: Reuse property_entry_free_data()
  device property: Move property_entry_free_data() upper
  firmware: Fix up docs referring to FIRMWARE_IN_KERNEL
  firmware: Drop FIRMWARE_IN_KERNEL Kconfig option
  USB: serial: keyspan: Drop firmware Kconfig options
  sysfs: remove DEBUG defines
  sysfs: use SPDX identifiers
  drivers: base: add coredump driver ops
  sysfs: add attribute specification for /sysfs/devices/.../coredump
  test_firmware: fix missing unlock on error in config_num_requests_store()
  test_firmware: make local symbol test_fw_config static
  sysfs: turn WARN() into pr_warn()
  firmware: Fix a typo in fallback-mechanisms.rst
  treewide: Use DEVICE_ATTR_WO
  treewide: Use DEVICE_ATTR_RO
  treewide: Use DEVICE_ATTR_RW
  sysfs.h: Use octal permissions
  component: add debugfs support
  bus: simple-pm-bus: convert bool SIMPLE_PM_BUS to tristate
  ...
parents 5d8515bc c505cbd4

Documentation/ABI/testing/sysfs-devices-coredump

0 → 100644
+10 −0
Original line number Diff line number Diff line 
What:		/sys/devices/.../coredump

Date:		December 2017

Contact:	Arend van Spriel <aspriel@gmail.com>

Description:

		The /sys/devices/.../coredump attribute is only present when the

		device is bound to a driver, which provides the .coredump()

		callback. The attribute is write only. Anything written to this

		file will trigger the .coredump() callback.



		Available when CONFIG_DEV_COREDUMP is enabled.

Documentation/driver-api/firmware/built-in-fw.rst

+1 −6
Original line number Diff line number Diff line
@@ -11,13 +11,8 @@ options: 
  * CONFIG_EXTRA_FIRMWARE

  * CONFIG_EXTRA_FIRMWARE_DIR



This should not be confused with CONFIG_FIRMWARE_IN_KERNEL, this is for drivers

which enables firmware to be built as part of the kernel build process. This

option, CONFIG_FIRMWARE_IN_KERNEL, will build all firmware for all drivers

enabled which ship its firmware inside the Linux kernel source tree.



There are a few reasons why you might want to consider building your firmware

into the kernel with CONFIG_EXTRA_FIRMWARE though:

into the kernel with CONFIG_EXTRA_FIRMWARE:



* Speed

* Firmware is needed for accessing the boot device, and the user doesn't

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

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ via fw_create_instance(). This call creates a new struct device named after 
the firmware requested, and establishes it in the device hierarchy by

associating the device used to make the request as the device's parent.

The sysfs directory's file attributes are defined and controlled through

the new device's class (firmare_class) and group (fw_dev_attr_groups).

the new device's class (firmware_class) and group (fw_dev_attr_groups).

This is actually where the original firmware_class.c file name comes from,

as originally the only firmware loading mechanism available was the

mechanism we now use as a fallback mechanism.

Documentation/x86/microcode.txt

+2 −3
Original line number Diff line number Diff line
@@ -108,12 +108,11 @@ packages already put them there. 
====================



The loader supports also loading of a builtin microcode supplied through

the regular firmware builtin method CONFIG_FIRMWARE_IN_KERNEL. Only

64-bit is currently supported.

the regular builtin firmware method CONFIG_EXTRA_FIRMWARE. Only 64-bit is

currently supported.



Here's an example:



CONFIG_FIRMWARE_IN_KERNEL=y

CONFIG_EXTRA_FIRMWARE="intel-ucode/06-3a-09 amd-ucode/microcode_amd_fam15h.bin"

CONFIG_EXTRA_FIRMWARE_DIR="/lib/firmware"

arch/arc/configs/axs101_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ CONFIG_IP_PNP_RARP=y 
CONFIG_DEVTMPFS=y

# CONFIG_STANDALONE is not set

# CONFIG_PREVENT_FIRMWARE_BUILD is not set

# CONFIG_FIRMWARE_IN_KERNEL is not set

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_NETDEVICES=y