Skip to content

Commit d913e89

Browse files
suryasaimadhusuryasaimadhu
committed
Merge branch 'tip-x86-hygon' into edac-for-4.20
... to pick up a dependent commit and share it with the tip tree, branch tip:x86/cpu. Signed-off-by: Borislav Petkov <bp@suse.de>
2 parents 6b58859 + c9661c1 commit d913e89

File tree

831 files changed

+8662
-5212
lines changed

Some content is hidden

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

831 files changed

+8662
-5212
lines changed

‎Documentation/ABI/stable/sysfs-bus-xen-backend

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,12 @@ KernelVersion: 3.0
7373
Contact: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
7474
Description:
7575
Number of sectors written by the frontend.
76+
77+
What: /sys/bus/xen-backend/devices/*/state
78+
Date: August 2018
79+
KernelVersion: 4.19
80+
Contact: Joe Jin <joe.jin@oracle.com>
81+
Description:
82+
The state of the device. One of: 'Unknown',
83+
'Initialising', 'Initialised', 'Connected', 'Closing',
84+
'Closed', 'Reconfiguring', 'Reconfigured'.

‎Documentation/ABI/stable/sysfs-devices-system-xen_memory

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,3 +75,12 @@ Contact: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
7575
Description:
7676
Amount (in KiB) of low (or normal) memory in the
7777
balloon.
78+
79+
What: /sys/devices/system/xen_memory/xen_memory0/scrub_pages
80+
Date: September 2018
81+
KernelVersion: 4.20
82+
Contact: xen-devel@lists.xenproject.org
83+
Description:
84+
Control scrubbing pages before returning them to Xen for others domains
85+
use. Can be set with xen_scrub_pages cmdline
86+
parameter. Default value controlled with CONFIG_XEN_SCRUB_PAGES_DEFAULT.

‎Documentation/ABI/testing/sysfs-driver-xen-blkback

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,13 @@ Description:
1515
blkback. If the frontend tries to use more than
1616
max_persistent_grants, the LRU kicks in and starts
1717
removing 5% of max_persistent_grants every 100ms.
18+
19+
What: /sys/module/xen_blkback/parameters/persistent_grant_unused_seconds
20+
Date: August 2018
21+
KernelVersion: 4.19
22+
Contact: Roger Pau Monné <roger.pau@citrix.com>
23+
Description:
24+
How long a persistent grant is allowed to remain
25+
allocated without being in use. The time is in
26+
seconds, 0 means indefinitely long.
27+
The default is 60 seconds.

‎Documentation/admin-guide/kernel-parameters.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3523,6 +3523,12 @@
35233523
ramdisk_size= [RAM] Sizes of RAM disks in kilobytes
35243524
See Documentation/blockdev/ramdisk.txt.
35253525

3526+
random.trust_cpu={on,off}
3527+
[KNL] Enable or disable trusting the use of the
3528+
CPU's random number generator (if available) to
3529+
fully seed the kernel's CRNG. Default is controlled
3530+
by CONFIG_RANDOM_TRUST_CPU.
3531+
35263532
ras=option[,option,...] [KNL] RAS-specific options
35273533

35283534
cec_disable [X86]
@@ -4994,6 +5000,12 @@
49945000
Disables the PV optimizations forcing the HVM guest to
49955001
run as generic HVM guest with no PV drivers.
49965002

5003+
xen_scrub_pages= [XEN]
5004+
Boolean option to control scrubbing pages before giving them back
5005+
to Xen, for use by other domains. Can be also changed at runtime
5006+
with /sys/devices/system/xen_memory/xen_memory0/scrub_pages.
5007+
Default value controlled with CONFIG_XEN_SCRUB_PAGES_DEFAULT.
5008+
49975009
xirc2ps_cs= [NET,PCMCIA]
49985010
Format:
49995011
<irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]]

‎Documentation/arm64/sve.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ prctl(PR_SVE_SET_VL, unsigned long arg)
200200
thread.
201201

202202
* Changing the vector length causes all of P0..P15, FFR and all bits of
203-
Z0..V31 except for Z0 bits [127:0] .. Z31 bits [127:0] to become
203+
Z0..Z31 except for Z0 bits [127:0] .. Z31 bits [127:0] to become
204204
unspecified. Calling PR_SVE_SET_VL with vl equal to the thread's current
205205
vector length, or calling PR_SVE_SET_VL with the PR_SVE_SET_VL_ONEXEC
206206
flag, does not constitute a change to the vector length for this purpose.
@@ -500,7 +500,7 @@ References
500500
[2] arch/arm64/include/uapi/asm/ptrace.h
501501
AArch64 Linux ptrace ABI definitions
502502

503-
[3] linux/Documentation/arm64/cpu-feature-registers.txt
503+
[3] Documentation/arm64/cpu-feature-registers.txt
504504

505505
[4] ARM IHI0055C
506506
http://infocenter.arm.com/help/topic/com.arm.doc.ihi0055c/IHI0055C_beta_aapcs64.pdf

‎Documentation/device-mapper/dm-raid.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,3 +348,7 @@ Version History
348348
1.13.1 Fix deadlock caused by early md_stop_writes(). Also fix size an
349349
state races.
350350
1.13.2 Fix raid redundancy validation and avoid keeping raid set frozen
351+
1.14.0 Fix reshape race on small devices. Fix stripe adding reshape
352+
deadlock/potential data corruption. Update superblock when
353+
specific devices are requested via rebuild. Fix RAID leg
354+
rebuild errors.

‎Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@
33
Required properties:
44
- compatible :
55
- "fsl,imx7ulp-lpi2c" for LPI2C compatible with the one integrated on i.MX7ULP soc
6-
- "fsl,imx8dv-lpi2c" for LPI2C compatible with the one integrated on i.MX8DV soc
76
- reg : address and length of the lpi2c master registers
87
- interrupts : lpi2c interrupt
98
- clocks : lpi2c clock specifier
109

1110
Examples:
1211

1312
lpi2c7: lpi2c7@40a50000 {
14-
compatible = "fsl,imx8dv-lpi2c";
13+
compatible = "fsl,imx7ulp-lpi2c";
1514
reg = <0x40A50000 0x10000>;
1615
interrupt-parent = <&intc>;
1716
interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;

‎Documentation/devicetree/bindings/interrupt-controller/riscv,cpu-intc.txt

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The RISC-V supervisor ISA manual specifies three interrupt sources that are
1111
attached to every HLIC: software interrupts, the timer interrupt, and external
1212
interrupts. Software interrupts are used to send IPIs between cores. The
1313
timer interrupt comes from an architecturally mandated real-time timer that is
14-
controller via Supervisor Binary Interface (SBI) calls and CSR reads. External
14+
controlled via Supervisor Binary Interface (SBI) calls and CSR reads. External
1515
interrupts connect all other device interrupts to the HLIC, which are routed
1616
via the platform-level interrupt controller (PLIC).
1717

@@ -25,7 +25,15 @@ in the system.
2525

2626
Required properties:
2727
- compatible : "riscv,cpu-intc"
28-
- #interrupt-cells : should be <1>
28+
- #interrupt-cells : should be <1>. The interrupt sources are defined by the
29+
RISC-V supervisor ISA manual, with only the following three interrupts being
30+
defined for supervisor mode:
31+
- Source 1 is the supervisor software interrupt, which can be sent by an SBI
32+
call and is reserved for use by software.
33+
- Source 5 is the supervisor timer interrupt, which can be configured by
34+
SBI calls and implements a one-shot timer.
35+
- Source 9 is the supervisor external interrupt, which chains to all other
36+
device interrupts.
2937
- interrupt-controller : Identifies the node as an interrupt controller
3038

3139
Furthermore, this interrupt-controller MUST be embedded inside the cpu
@@ -38,7 +46,7 @@ An example device tree entry for a HLIC is show below.
3846
...
3947
cpu1-intc: interrupt-controller {
4048
#interrupt-cells = <1>;
41-
compatible = "riscv,cpu-intc", "sifive,fu540-c000-cpu-intc";
49+
compatible = "sifive,fu540-c000-cpu-intc", "riscv,cpu-intc";
4250
interrupt-controller;
4351
};
4452
};

‎Documentation/devicetree/bindings/net/cpsw.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ Required properties:
1919
- slaves : Specifies number for slaves
2020
- active_slave : Specifies the slave to use for time stamping,
2121
ethtool and SIOCGMIIPHY
22+
- cpsw-phy-sel : Specifies the phandle to the CPSW phy mode selection
23+
device. See also cpsw-phy-sel.txt for it's binding.
24+
Note that in legacy cases cpsw-phy-sel may be
25+
a child device instead of a phandle.
2226

2327
Optional properties:
2428
- ti,hwmods : Must be "cpgmac0"
@@ -75,6 +79,7 @@ Examples:
7579
cpts_clock_mult = <0x80000000>;
7680
cpts_clock_shift = <29>;
7781
syscon = <&cm>;
82+
cpsw-phy-sel = <&phy_sel>;
7883
cpsw_emac0: slave@0 {
7984
phy_id = <&davinci_mdio>, <0>;
8085
phy-mode = "rgmii-txid";
@@ -103,6 +108,7 @@ Examples:
103108
cpts_clock_mult = <0x80000000>;
104109
cpts_clock_shift = <29>;
105110
syscon = <&cm>;
111+
cpsw-phy-sel = <&phy_sel>;
106112
cpsw_emac0: slave@0 {
107113
phy_id = <&davinci_mdio>, <0>;
108114
phy-mode = "rgmii-txid";

‎Documentation/devicetree/bindings/net/sh_eth.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ Required properties:
1616
"renesas,ether-r8a7794" if the device is a part of R8A7794 SoC.
1717
"renesas,gether-r8a77980" if the device is a part of R8A77980 SoC.
1818
"renesas,ether-r7s72100" if the device is a part of R7S72100 SoC.
19+
"renesas,ether-r7s9210" if the device is a part of R7S9210 SoC.
1920
"renesas,rcar-gen1-ether" for a generic R-Car Gen1 device.
2021
"renesas,rcar-gen2-ether" for a generic R-Car Gen2 or RZ/G1
2122
device.

0 commit comments

Comments
 (0)