Skip to content

Commit a820cd3

Browse files
committed
Merge tag 'asoc-fix-v4.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.8 A clutch of fixes for v4.8. These are mainly driver specific, the most notable ones being those for OMAP which fix a series of issues that broke boot on some platforms there when deferred probe kicked in. There's also one core fix for an issue when unbinding a card which for some reason had managed to not manifest until recently.
2 parents abaa227 + cfb89f2 commit a820cd3

File tree

564 files changed

+7054
-3159
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

564 files changed

+7054
-3159
lines changed

Documentation/block/queue-sysfs.txt

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ add_random (RW)
1414
This file allows to turn off the disk entropy contribution. Default
1515
value of this file is '1'(on).
1616

17+
dax (RO)
18+
--------
19+
This file indicates whether the device supports Direct Access (DAX),
20+
used by CPU-addressable storage to bypass the pagecache. It shows '1'
21+
if true, '0' if not.
22+
1723
discard_granularity (RO)
1824
-----------------------
1925
This shows the size of internal allocation of the device in bytes, if
@@ -46,6 +52,12 @@ hw_sector_size (RO)
4652
-------------------
4753
This is the hardware sector size of the device, in bytes.
4854

55+
io_poll (RW)
56+
------------
57+
When read, this file shows the total number of block IO polls and how
58+
many returned success. Writing '0' to this file will disable polling
59+
for this device. Writing any non-zero value will enable this feature.
60+
4961
iostats (RW)
5062
-------------
5163
This file is used to control (on/off) the iostats accounting of the
@@ -151,5 +163,11 @@ device state. This means that it might not be safe to toggle the
151163
setting from "write back" to "write through", since that will also
152164
eliminate cache flushes issued by the kernel.
153165

166+
write_same_max_bytes (RO)
167+
-------------------------
168+
This is the number of bytes the device can write in a single write-same
169+
command. A value of '0' means write-same is not supported by this
170+
device.
171+
154172

155173
Jens Axboe <[email protected]>, February 2009

Documentation/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
todo_include_todos = False
132132

133133
primary_domain = 'C'
134-
highlight_language = 'C'
134+
highlight_language = 'guess'
135135

136136
# -- Options for HTML output ----------------------------------------------
137137

Documentation/devicetree/bindings/sound/omap-mcpdm.txt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ Required properties:
88
- interrupts: Interrupt number for McPDM
99
- interrupt-parent: The parent interrupt controller
1010
- ti,hwmods: Name of the hwmod associated to the McPDM
11-
- clocks: phandle for the pdmclk provider, likely <&twl6040>
12-
- clock-names: Must be "pdmclk"
1311

1412
Example:
1513

@@ -21,11 +19,3 @@ mcpdm: mcpdm@40132000 {
2119
interrupt-parent = <&gic>;
2220
ti,hwmods = "mcpdm";
2321
};
24-
25-
In board DTS file the pdmclk needs to be added:
26-
27-
&mcpdm {
28-
clocks = <&twl6040>;
29-
clock-names = "pdmclk";
30-
status = "okay";
31-
};

Documentation/hwmon/ftsteutates

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ enhancements. It can monitor up to 4 voltages, 16 temperatures and
1919
implemented in this driver.
2020

2121
Specification of the chip can be found here:
22-
ftp:///pub/Mainboard-OEM-Sales/Services/Software&Tools/Linux_SystemMonitoring&Watchdog&GPIO/BMC-Teutates_Specification_V1.21.pdf
23-
ftp:///pub/Mainboard-OEM-Sales/Services/Software&Tools/Linux_SystemMonitoring&Watchdog&GPIO/Fujitsu_mainboards-1-Sensors_HowTo-en-US.pdf
22+
ftp://ftp.ts.fujitsu.com/pub/Mainboard-OEM-Sales/Services/Software&Tools/Linux_SystemMonitoring&Watchdog&GPIO/BMC-Teutates_Specification_V1.21.pdf
23+
ftp://ftp.ts.fujitsu.com/pub/Mainboard-OEM-Sales/Services/Software&Tools/Linux_SystemMonitoring&Watchdog&GPIO/Fujitsu_mainboards-1-Sensors_HowTo-en-US.pdf

Documentation/kernel-documentation.rst

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -366,8 +366,6 @@ Domain`_ references.
366366
Cross-referencing from reStructuredText
367367
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
368368

369-
.. highlight:: none
370-
371369
To cross-reference the functions and types defined in the kernel-doc comments
372370
from reStructuredText documents, please use the `Sphinx C Domain`_
373371
references. For example::
@@ -390,8 +388,6 @@ For further details, please refer to the `Sphinx C Domain`_ documentation.
390388
Function documentation
391389
----------------------
392390

393-
.. highlight:: c
394-
395391
The general format of a function and function-like macro kernel-doc comment is::
396392

397393
/**
@@ -572,8 +568,6 @@ DocBook XML [DEPRECATED]
572568
Converting DocBook to Sphinx
573569
----------------------------
574570

575-
.. highlight:: none
576-
577571
Over time, we expect all of the documents under ``Documentation/DocBook`` to be
578572
converted to Sphinx and reStructuredText. For most DocBook XML documents, a good
579573
enough solution is to use the simple ``Documentation/sphinx/tmplcvt`` script,

Documentation/networking/rxrpc.txt

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -790,13 +790,12 @@ The kernel interface functions are as follows:
790790
Data messages can have their contents extracted with the usual bunch of
791791
socket buffer manipulation functions. A data message can be determined to
792792
be the last one in a sequence with rxrpc_kernel_is_data_last(). When a
793-
data message has been used up, rxrpc_kernel_data_delivered() should be
794-
called on it..
793+
data message has been used up, rxrpc_kernel_data_consumed() should be
794+
called on it.
795795

796-
Non-data messages should be handled to rxrpc_kernel_free_skb() to dispose
797-
of. It is possible to get extra refs on all types of message for later
798-
freeing, but this may pin the state of a call until the message is finally
799-
freed.
796+
Messages should be handled to rxrpc_kernel_free_skb() to dispose of. It
797+
is possible to get extra refs on all types of message for later freeing,
798+
but this may pin the state of a call until the message is finally freed.
800799

801800
(*) Accept an incoming call.
802801

@@ -821,12 +820,14 @@ The kernel interface functions are as follows:
821820
Other errors may be returned if the call had been aborted (-ECONNABORTED)
822821
or had timed out (-ETIME).
823822

824-
(*) Record the delivery of a data message and free it.
823+
(*) Record the delivery of a data message.
825824

826-
void rxrpc_kernel_data_delivered(struct sk_buff *skb);
825+
void rxrpc_kernel_data_consumed(struct rxrpc_call *call,
826+
struct sk_buff *skb);
827827

828-
This is used to record a data message as having been delivered and to
829-
update the ACK state for the call. The socket buffer will be freed.
828+
This is used to record a data message as having been consumed and to
829+
update the ACK state for the call. The message must still be passed to
830+
rxrpc_kernel_free_skb() for disposal by the caller.
830831

831832
(*) Free a message.
832833

Documentation/power/basic-pm-debugging.txt

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,32 @@ load n/2 modules more and try again.
164164
Again, if you find the offending module(s), it(they) must be unloaded every time
165165
before hibernation, and please report the problem with it(them).
166166

167-
c) Advanced debugging
167+
c) Using the "test_resume" hibernation option
168+
169+
/sys/power/disk generally tells the kernel what to do after creating a
170+
hibernation image. One of the available options is "test_resume" which
171+
causes the just created image to be used for immediate restoration. Namely,
172+
after doing:
173+
174+
# echo test_resume > /sys/power/disk
175+
# echo disk > /sys/power/state
176+
177+
a hibernation image will be created and a resume from it will be triggered
178+
immediately without involving the platform firmware in any way.
179+
180+
That test can be used to check if failures to resume from hibernation are
181+
related to bad interactions with the platform firmware. That is, if the above
182+
works every time, but resume from actual hibernation does not work or is
183+
unreliable, the platform firmware may be responsible for the failures.
184+
185+
On architectures and platforms that support using different kernels to restore
186+
hibernation images (that is, the kernel used to read the image from storage and
187+
load it into memory is different from the one included in the image) or support
188+
kernel address space randomization, it also can be used to check if failures
189+
to resume may be related to the differences between the restore and image
190+
kernels.
191+
192+
d) Advanced debugging
168193

169194
In case that hibernation does not work on your system even in the minimal
170195
configuration and compiling more drivers as modules is not practical or some

Documentation/power/interface.txt

Lines changed: 76 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,76 @@
1-
Power Management Interface
2-
3-
4-
The power management subsystem provides a unified sysfs interface to
5-
userspace, regardless of what architecture or platform one is
6-
running. The interface exists in /sys/power/ directory (assuming sysfs
7-
is mounted at /sys).
8-
9-
/sys/power/state controls system power state. Reading from this file
10-
returns what states are supported, which is hard-coded to 'freeze',
11-
'standby' (Power-On Suspend), 'mem' (Suspend-to-RAM), and 'disk'
12-
(Suspend-to-Disk).
13-
14-
Writing to this file one of those strings causes the system to
15-
transition into that state. Please see the file
16-
Documentation/power/states.txt for a description of each of those
17-
states.
18-
19-
20-
/sys/power/disk controls the operating mode of the suspend-to-disk
21-
mechanism. Suspend-to-disk can be handled in several ways. We have a
22-
few options for putting the system to sleep - using the platform driver
23-
(e.g. ACPI or other suspend_ops), powering off the system or rebooting the
24-
system (for testing).
25-
26-
Additionally, /sys/power/disk can be used to turn on one of the two testing
27-
modes of the suspend-to-disk mechanism: 'testproc' or 'test'. If the
28-
suspend-to-disk mechanism is in the 'testproc' mode, writing 'disk' to
29-
/sys/power/state will cause the kernel to disable nonboot CPUs and freeze
30-
tasks, wait for 5 seconds, unfreeze tasks and enable nonboot CPUs. If it is
31-
in the 'test' mode, writing 'disk' to /sys/power/state will cause the kernel
32-
to disable nonboot CPUs and freeze tasks, shrink memory, suspend devices, wait
33-
for 5 seconds, resume devices, unfreeze tasks and enable nonboot CPUs. Then,
34-
we are able to look in the log messages and work out, for example, which code
35-
is being slow and which device drivers are misbehaving.
36-
37-
Reading from this file will display all supported modes and the currently
38-
selected one in brackets, for example
39-
40-
[shutdown] reboot test testproc
41-
42-
Writing to this file will accept one of
43-
44-
'platform' (only if the platform supports it)
45-
'shutdown'
46-
'reboot'
47-
'testproc'
48-
'test'
49-
50-
/sys/power/image_size controls the size of the image created by
51-
the suspend-to-disk mechanism. It can be written a string
52-
representing a non-negative integer that will be used as an upper
53-
limit of the image size, in bytes. The suspend-to-disk mechanism will
54-
do its best to ensure the image size will not exceed that number. However,
55-
if this turns out to be impossible, it will try to suspend anyway using the
56-
smallest image possible. In particular, if "0" is written to this file, the
57-
suspend image will be as small as possible.
58-
59-
Reading from this file will display the current image size limit, which
60-
is set to 2/5 of available RAM by default.
61-
62-
/sys/power/pm_trace controls the code which saves the last PM event point in
63-
the RTC across reboots, so that you can debug a machine that just hangs
64-
during suspend (or more commonly, during resume). Namely, the RTC is only
65-
used to save the last PM event point if this file contains '1'. Initially it
66-
contains '0' which may be changed to '1' by writing a string representing a
67-
nonzero integer into it.
68-
69-
To use this debugging feature you should attempt to suspend the machine, then
70-
reboot it and run
71-
72-
dmesg -s 1000000 | grep 'hash matches'
73-
74-
CAUTION: Using it will cause your machine's real-time (CMOS) clock to be
75-
set to a random invalid time after a resume.
1+
Power Management Interface for System Sleep
2+
3+
Copyright (c) 2016 Intel Corp., Rafael J. Wysocki <[email protected]>
4+
5+
The power management subsystem provides userspace with a unified sysfs interface
6+
for system sleep regardless of the underlying system architecture or platform.
7+
The interface is located in the /sys/power/ directory (assuming that sysfs is
8+
mounted at /sys).
9+
10+
/sys/power/state is the system sleep state control file.
11+
12+
Reading from it returns a list of supported sleep states, encoded as:
13+
14+
'freeze' (Suspend-to-Idle)
15+
'standby' (Power-On Suspend)
16+
'mem' (Suspend-to-RAM)
17+
'disk' (Suspend-to-Disk)
18+
19+
Suspend-to-Idle is always supported. Suspend-to-Disk is always supported
20+
too as long the kernel has been configured to support hibernation at all
21+
(ie. CONFIG_HIBERNATION is set in the kernel configuration file). Support
22+
for Suspend-to-RAM and Power-On Suspend depends on the capabilities of the
23+
platform.
24+
25+
If one of the strings listed in /sys/power/state is written to it, the system
26+
will attempt to transition into the corresponding sleep state. Refer to
27+
Documentation/power/states.txt for a description of each of those states.
28+
29+
/sys/power/disk controls the operating mode of hibernation (Suspend-to-Disk).
30+
Specifically, it tells the kernel what to do after creating a hibernation image.
31+
32+
Reading from it returns a list of supported options encoded as:
33+
34+
'platform' (put the system into sleep using a platform-provided method)
35+
'shutdown' (shut the system down)
36+
'reboot' (reboot the system)
37+
'suspend' (trigger a Suspend-to-RAM transition)
38+
'test_resume' (resume-after-hibernation test mode)
39+
40+
The currently selected option is printed in square brackets.
41+
42+
The 'platform' option is only available if the platform provides a special
43+
mechanism to put the system to sleep after creating a hibernation image (ACPI
44+
does that, for example). The 'suspend' option is available if Suspend-to-RAM
45+
is supported. Refer to Documentation/power/basic_pm_debugging.txt for the
46+
description of the 'test_resume' option.
47+
48+
To select an option, write the string representing it to /sys/power/disk.
49+
50+
/sys/power/image_size controls the size of hibernation images.
51+
52+
It can be written a string representing a non-negative integer that will be
53+
used as a best-effort upper limit of the image size, in bytes. The hibernation
54+
core will do its best to ensure that the image size will not exceed that number.
55+
However, if that turns out to be impossible to achieve, a hibernation image will
56+
still be created and its size will be as small as possible. In particular,
57+
writing '0' to this file will enforce hibernation images to be as small as
58+
possible.
59+
60+
Reading from this file returns the current image size limit, which is set to
61+
around 2/5 of available RAM by default.
62+
63+
/sys/power/pm_trace controls the PM trace mechanism saving the last suspend
64+
or resume event point in the RTC across reboots.
65+
66+
It helps to debug hard lockups or reboots due to device driver failures that
67+
occur during system suspend or resume (which is more common) more effectively.
68+
69+
If /sys/power/pm_trace contains '1', the fingerprint of each suspend/resume
70+
event point in turn will be stored in the RTC memory (overwriting the actual
71+
RTC information), so it will survive a system crash if one occurs right after
72+
storing it and it can be used later to identify the driver that caused the crash
73+
to happen (see Documentation/power/s2ram.txt for more information).
74+
75+
Initially it contains '0' which may be changed to '1' by writing a string
76+
representing a nonzero integer into it.

Documentation/sphinx-static/theme_overrides.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,12 @@
4242
caption a.headerlink { opacity: 0; }
4343
caption a.headerlink:hover { opacity: 1; }
4444

45-
/* inline literal: drop the borderbox and red color */
45+
/* inline literal: drop the borderbox, padding and red color */
4646

4747
code, .rst-content tt, .rst-content code {
4848
color: inherit;
4949
border: none;
50+
padding: unset;
5051
background: inherit;
5152
font-size: 85%;
5253
}

MAINTAINERS

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,6 +1004,7 @@ N: meson
10041004
ARM/Annapurna Labs ALPINE ARCHITECTURE
10051005
M: Tsahee Zidenberg <[email protected]>
10061006
M: Antoine Tenart <[email protected]>
1007+
L: [email protected] (moderated for non-subscribers)
10071008
S: Maintained
10081009
F: arch/arm/mach-alpine/
10091010
F: arch/arm/boot/dts/alpine*
@@ -4524,6 +4525,12 @@ L: [email protected]
45244525
S: Maintained
45254526
F: drivers/edac/sb_edac.c
45264527

4528+
EDAC-SKYLAKE
4529+
M: Tony Luck <[email protected]>
4530+
4531+
S: Maintained
4532+
F: drivers/edac/skx_edac.c
4533+
45274534
EDAC-XGENE
45284535
APPLIED MICRO (APM) X-GENE SOC EDAC
45294536
M: Loc Ho <[email protected]>

0 commit comments

Comments
 (0)