Skip to content

Commit e5ff19c

Browse files
author
Lee Jones
committed
Merge branches 'ib-mfd-4.19', 'ib-mfd-gpio-pinctrl-4.19', 'ib-mfd-i915-media-platform-4.19' and 'ib-mfd-regulator-4.19', tag 'ib-platform-chrome-mfd-move-cros-ec-transport-for-4.19' into ibs-for-mfd-merged
Immutable branch (mfd, chrome) due for the v4.19 window Immutable Branch which moves the cros_ec_i2c and cros_ec_spi transport drivers from mfd to platform/chrome. Changes in arm are a simple rename in defconfigs. Change in input is a rename in help text.
5 parents 3144dce + aca429f + cd70de2 + c287572 + 413c944 commit e5ff19c

File tree

769 files changed

+22254
-4166
lines changed

Some content is hidden

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

769 files changed

+22254
-4166
lines changed

‎Documentation/admin-guide/pm/intel_pstate.rst

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -324,8 +324,7 @@ Global Attributes
324324

325325
``intel_pstate`` exposes several global attributes (files) in ``sysfs`` to
326326
control its functionality at the system level. They are located in the
327-
``/sys/devices/system/cpu/cpufreq/intel_pstate/`` directory and affect all
328-
CPUs.
327+
``/sys/devices/system/cpu/intel_pstate/`` directory and affect all CPUs.
329328

330329
Some of them are not present if the ``intel_pstate=per_cpu_perf_limits``
331330
argument is passed to the kernel in the command line.
@@ -379,6 +378,17 @@ argument is passed to the kernel in the command line.
379378
but it affects the maximum possible value of per-policy P-state limits
380379
(see `Interpretation of Policy Attributes`_ below for details).
381380

381+
``hwp_dynamic_boost``
382+
This attribute is only present if ``intel_pstate`` works in the
383+
`active mode with the HWP feature enabled <Active Mode With HWP_>`_ in
384+
the processor. If set (equal to 1), it causes the minimum P-state limit
385+
to be increased dynamically for a short time whenever a task previously
386+
waiting on I/O is selected to run on a given logical CPU (the purpose
387+
of this mechanism is to improve performance).
388+
389+
This setting has no effect on logical CPUs whose minimum P-state limit
390+
is directly set to the highest non-turbo P-state or above it.
391+
382392
.. _status_attr:
383393

384394
``status``
@@ -410,7 +420,7 @@ argument is passed to the kernel in the command line.
410420
That only is supported in some configurations, though (for example, if
411421
the `HWP feature is enabled in the processor <Active Mode With HWP_>`_,
412422
the operation mode of the driver cannot be changed), and if it is not
413-
supported in the current configuration, writes to this attribute with
423+
supported in the current configuration, writes to this attribute will
414424
fail with an appropriate error.
415425

416426
Interpretation of Policy Attributes

‎Documentation/core-api/kernel-api.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ Resources Management
284284
MTRR Handling
285285
-------------
286286

287-
.. kernel-doc:: arch/x86/kernel/cpu/mtrr/main.c
287+
.. kernel-doc:: arch/x86/kernel/cpu/mtrr/mtrr.c
288288
:export:
289289

290290
Security Framework

‎Documentation/devicetree/bindings/input/sprd,sc27xx-vibra.txt

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
Spreadtrum SC27xx PMIC Vibrator
2+
3+
Required properties:
4+
- compatible: should be "sprd,sc2731-vibrator".
5+
- reg: address of vibrator control register.
6+
7+
Example :
8+
9+
sc2731_pmic: pmic@0 {
10+
compatible = "sprd,sc2731";
11+
reg = <0>;
12+
spi-max-frequency = <26000000>;
13+
interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
14+
interrupt-controller;
15+
#interrupt-cells = <2>;
16+
#address-cells = <1>;
17+
#size-cells = <0>;
18+
19+
vibrator@eb4 {
20+
compatible = "sprd,sc2731-vibrator";
21+
reg = <0xeb4>;
22+
};
23+
};

‎Documentation/devicetree/bindings/mfd/madera.txt

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
Cirrus Logic Madera class audio codecs Multi-Functional Device
2+
3+
These devices are audio SoCs with extensive digital capabilities and a range
4+
of analogue I/O.
5+
6+
See also the child driver bindings in:
7+
bindings/pinctrl/cirrus,madera-pinctrl.txt
8+
bindings/regulator/arizona-regulator.txt
9+
bindings/sound/madera.txt
10+
11+
Required properties:
12+
13+
- compatible : One of the following chip-specific strings:
14+
"cirrus,cs47l35"
15+
"cirrus,cs47l85"
16+
"cirrus,cs47l90"
17+
"cirrus,cs47l91"
18+
"cirrus,wm1840"
19+
20+
- reg : I2C slave address when connected using I2C, chip select number when
21+
using SPI.
22+
23+
- DCVDD-supply : Power supply for the device as defined in
24+
bindings/regulator/regulator.txt
25+
Mandatory on CS47L35, CS47L90, CS47L91
26+
Optional on CS47L85, WM1840
27+
28+
- AVDD-supply, DBVDD1-supply, DBVDD2-supply, CPVDD1-supply, CPVDD2-supply :
29+
Power supplies for the device
30+
31+
- DBVDD3-supply, DBVDD4-supply : Power supplies for the device
32+
(CS47L85, CS47L90, CS47L91, WM1840)
33+
34+
- SPKVDDL-supply, SPKVDDR-supply : Power supplies for the device
35+
(CS47L85, WM1840)
36+
37+
- SPKVDD-supply : Power supply for the device
38+
(CS47L35)
39+
40+
- interrupt-controller : Indicates that this device is an interrupt controller
41+
42+
- #interrupt-cells: the number of cells to describe an IRQ, must be 2.
43+
The first cell is the IRQ number.
44+
The second cell is the flags, encoded as the trigger masks from
45+
bindings/interrupt-controller/interrupts.txt
46+
47+
- gpio-controller : Indicates this device is a GPIO controller.
48+
49+
- #gpio-cells : Must be 2. The first cell is the pin number. The second cell
50+
is reserved for future use and must be zero
51+
52+
- interrupt-parent : The parent interrupt controller.
53+
54+
- interrupts : The interrupt line the /IRQ signal for the device is
55+
connected to.
56+
57+
Optional properties:
58+
59+
- MICVDD-supply : Power supply, only need to be specified if
60+
powered externally
61+
62+
- reset-gpios : One entry specifying the GPIO controlling /RESET.
63+
As defined in bindings/gpio.txt.
64+
Although optional, it is strongly recommended to use a hardware reset
65+
66+
- MICBIASx : Initial data for the MICBIAS regulators, as covered in
67+
Documentation/devicetree/bindings/regulator/regulator.txt.
68+
One for each MICBIAS generator (MICBIAS1, MICBIAS2, ...)
69+
(all codecs)
70+
71+
One for each output pin (MICBIAS1A, MIBCIAS1B, MICBIAS2A, ...)
72+
(all except CS47L85, WM1840)
73+
74+
The following following additional property is supported for the generator
75+
nodes:
76+
- cirrus,ext-cap : Set to 1 if the MICBIAS has external decoupling
77+
capacitors attached.
78+
79+
Optional child nodes:
80+
micvdd : Node containing initialization data for the micvdd regulator
81+
See bindings/regulator/arizona-regulator.txt
82+
83+
ldo1 : Node containing initialization data for the LDO1 regulator
84+
See bindings/regulator/arizona-regulator.txt
85+
(cs47l85, wm1840)
86+
87+
Example:
88+
89+
cs47l85@0 {
90+
compatible = "cirrus,cs47l85";
91+
reg = <0>;
92+
93+
reset-gpios = <&gpio 0>;
94+
95+
interrupt-controller;
96+
#interrupt-cells = <2>;
97+
interrupts = <&host_irq1>;
98+
interrupt-parent = <&gic>;
99+
100+
gpio-controller;
101+
#gpio-cells = <2>;
102+
};

‎Documentation/devicetree/bindings/pinctrl/cirrus,madera-pinctrl.txt

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
Cirrus Logic Madera class audio codecs pinctrl driver
2+
3+
The Cirrus Logic Madera codecs provide a number of GPIO functions for
4+
interfacing to external hardware and to provide logic outputs to other devices.
5+
Certain groups of GPIO pins also have an alternate function, normally as an
6+
audio interface.
7+
8+
The set of available GPIOs, functions and alternate function groups differs
9+
between codecs so refer to the datasheet for the codec for further information
10+
on what is supported on that device.
11+
12+
The properties for this driver exist within the parent MFD driver node.
13+
14+
See also
15+
the core bindings for the parent MFD driver:
16+
Documentation/devicetree/bindings/mfd/madera.txt
17+
18+
the generic pinmix bindings:
19+
Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
20+
21+
Required properties of parent mfd node:
22+
- pinctrl-names : must be "default"
23+
- pinctrl-0 : a phandle to the node containing the subnodes containing default
24+
configurations
25+
26+
Required subnodes:
27+
One subnode is required to contain the default settings. It contains an
28+
arbitrary number of configuration subnodes, one for each group or pin
29+
configuration you want to apply as a default.
30+
31+
Required properties of configuration subnodes:
32+
- groups : name of one pin group to configure. One of:
33+
aif1, aif2, aif3, aif4, mif1, mif2, mif3, pdmspk1, pdmspk2,
34+
dmic4, dmic5, dmic6,
35+
gpio1, gpio2, ..., gpio40
36+
The gpioN groups select the single pin of this name for configuration
37+
38+
Optional properties of configuration subnodes:
39+
Any configuration option not explicitly listed in the dts will be left at
40+
chip default setting.
41+
42+
- function : name of function to assign to this group. One of:
43+
aif1, aif2, aif3, aif4, mif1, mif2, mif3, pdmspk1, pdmspk2,
44+
dmic3, dmic4, dmic5, dmic6,
45+
io, dsp-gpio, irq1, irq2,
46+
fll1-clk, fll1-lock, fll2-clk, fll2-lock, fll3-clk, fll3-lock,
47+
fllao-clk, fllao-lock,
48+
opclk, opclk-async, pwm1, pwm2, spdif,
49+
asrc1-in1-lock, asrc1-in2-lock, asrc2-in1-lock, asrc2-in2-lock,
50+
spkl-short-circuit, spkr-short-circuit, spk-shutdown,
51+
spk-overheat-shutdown, spk-overheat-warn,
52+
timer1-sts, timer2-sts, timer3-sts, timer4-sts, timer5-sts, timer6-sts,
53+
timer7-sts, timer8-sts,
54+
log1-fifo-ne, log2-fifo-ne, log3-fifo-ne, log4-fifo-ne, log5-fifo-ne,
55+
log6-fifo-ne, log7-fifo-ne, log8-fifo-ne,
56+
57+
- bias-disable : disable pull-up and pull-down
58+
- bias-bus-hold : enable buskeeper
59+
- bias-pull-up : output is pulled-up
60+
- bias-pull-down : output is pulled-down
61+
- drive-push-pull : CMOS output
62+
- drive-open-drain : open-drain output
63+
- drive-strength : drive strength in mA. Valid values are 4 or 8
64+
- input-schmitt-enable : enable schmitt-trigger mode
65+
- input-schmitt-disable : disable schmitt-trigger mode
66+
- input-debounce : A value of 0 disables debounce, a value !=0 enables
67+
debounce
68+
- output-low : set the pin to output mode with low level
69+
- output-high : set the pin to output mode with high level
70+
71+
Example:
72+
73+
cs47l85@0 {
74+
compatible = "cirrus,cs47l85";
75+
76+
pinctrl-names = "default";
77+
pinctrl-0 = <&cs47l85_defaults>;
78+
79+
cs47l85_defaults: cs47l85-gpio-defaults {
80+
aif1 {
81+
groups = "aif1";
82+
function = "aif1";
83+
bias-bus-hold;
84+
};
85+
86+
aif2 {
87+
groups = "aif2";
88+
function = "aif2";
89+
bias-bus-hold;
90+
};
91+
92+
opclk {
93+
groups = "gpio1";
94+
function = "opclk";
95+
bias-pull-up;
96+
drive-strength = <8>;
97+
};
98+
};
99+
};

‎Documentation/driver-api/infrastructure.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ Device Drivers Base
4949
Device Drivers DMA Management
5050
-----------------------------
5151

52-
.. kernel-doc:: drivers/base/dma-coherent.c
52+
.. kernel-doc:: kernel/dma/coherent.c
5353
:export:
5454

55-
.. kernel-doc:: drivers/base/dma-mapping.c
55+
.. kernel-doc:: kernel/dma/mapping.c
5656
:export:
5757

5858
Device drivers PnP support

‎Documentation/filesystems/Locking

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -441,8 +441,6 @@ prototypes:
441441
int (*iterate) (struct file *, struct dir_context *);
442442
int (*iterate_shared) (struct file *, struct dir_context *);
443443
__poll_t (*poll) (struct file *, struct poll_table_struct *);
444-
struct wait_queue_head * (*get_poll_head)(struct file *, __poll_t);
445-
__poll_t (*poll_mask) (struct file *, __poll_t);
446444
long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);
447445
long (*compat_ioctl) (struct file *, unsigned int, unsigned long);
448446
int (*mmap) (struct file *, struct vm_area_struct *);
@@ -473,7 +471,7 @@ prototypes:
473471
};
474472

475473
locking rules:
476-
All except for ->poll_mask may block.
474+
All may block.
477475

478476
->llseek() locking has moved from llseek to the individual llseek
479477
implementations. If your fs is not using generic_file_llseek, you
@@ -505,9 +503,6 @@ in sys_read() and friends.
505503
the lease within the individual filesystem to record the result of the
506504
operation
507505

508-
->poll_mask can be called with or without the waitqueue lock for the waitqueue
509-
returned from ->get_poll_head.
510-
511506
--------------------------- dquot_operations -------------------------------
512507
prototypes:
513508
int (*write_dquot) (struct dquot *);

‎Documentation/filesystems/cifs/AUTHORS

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,11 @@ Jeff Layton (many, many fixes, as well as great work on the cifs Kerberos code)
4242
Scott Lovenberg
4343
Pavel Shilovsky (for great work adding SMB2 support, and various SMB3 features)
4444
Aurelien Aptel (for DFS SMB3 work and some key bug fixes)
45-
Ronnie Sahlberg (for SMB3 xattr work and bug fixes)
45+
Ronnie Sahlberg (for SMB3 xattr work, bug fixes, and lots of great work on compounding)
4646
Shirish Pargaonkar (for many ACL patches over the years)
4747
Sachin Prabhu (many bug fixes, including for reconnect, copy offload and security)
48+
Paulo Alcantara
49+
Long Li (some great work on RDMA, SMB Direct)
4850

4951

5052
Test case and Bug Report contributors
@@ -58,5 +60,4 @@ mention to the Stanford Checker (SWAT) which pointed out many minor
5860
bugs in error paths. Valuable suggestions also have come from Al Viro
5961
and Dave Miller.
6062

61-
And thanks to the IBM LTC and Power test teams and SuSE testers for
62-
finding multiple bugs during excellent stress test runs.
63+
And thanks to the IBM LTC and Power test teams and SuSE and Citrix and RedHat testers for finding multiple bugs during excellent stress test runs.

‎Documentation/filesystems/cifs/CHANGES

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
See https://wiki.samba.org/index.php/LinuxCIFSKernel for
2+
more current information.
3+
14
Version 1.62
25
------------
36
Add sockopt=TCP_NODELAY mount option. EA (xattr) routines hardened

‎Documentation/filesystems/cifs/TODO

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ is a partial list of the known problems and missing features:
99

1010
a) SMB3 (and SMB3.02) missing optional features:
1111
- multichannel (started), integration with RDMA
12-
- directory leases (improved metadata caching)
13-
- T10 copy offload (copy chunk, and "Duplicate Extents" ioctl
12+
- directory leases (improved metadata caching), started (root dir only)
13+
- T10 copy offload ie "ODX" (copy chunk, and "Duplicate Extents" ioctl
1414
currently the only two server side copy mechanisms supported)
1515

1616
b) improved sparse file support
1717

1818
c) Directory entry caching relies on a 1 second timer, rather than
19-
using Directory Leases
19+
using Directory Leases, currently only the root file handle is cached longer
2020

2121
d) quota support (needs minor kernel change since quota calls
2222
to make it to network filesystems or deviceless filesystems)
@@ -42,6 +42,8 @@ mount or a per server basis to client UIDs or nobody if no mapping
4242
exists. Also better integration with winbind for resolving SID owners
4343

4444
k) Add tools to take advantage of more smb3 specific ioctls and features
45+
(passthrough ioctl/fsctl for sending various SMB3 fsctls to the server
46+
is in progress)
4547

4648
l) encrypted file support
4749

@@ -71,9 +73,8 @@ t) split cifs and smb3 support into separate modules so legacy (and less
7173
secure) CIFS dialect can be disabled in environments that don't need it
7274
and simplify the code.
7375

74-
u) Finish up SMB3.1.1 dialect support
75-
76-
v) POSIX Extensions for SMB3.1.1
76+
v) POSIX Extensions for SMB3.1.1 (started, create and mkdir support added
77+
so far).
7778

7879
KNOWN BUGS
7980
====================================
@@ -92,8 +93,8 @@ Misc testing to do
9293
1) check out max path names and max path name components against various server
9394
types. Try nested symlinks (8 deep). Return max path name in stat -f information
9495

95-
2) Improve xfstest's cifs enablement and adapt xfstests where needed to test
96-
cifs better
96+
2) Improve xfstest's cifs/smb3 enablement and adapt xfstests where needed to test
97+
cifs/smb3 better
9798

9899
3) Additional performance testing and optimization using iozone and similar -
99100
there are some easy changes that can be done to parallelize sequential writes,

0 commit comments

Comments
 (0)