Skip to content

Commit dbae273

Browse files
committed
Merge tag 'zynqmp-soc-fixes-for-v5.10-rc6' of https://github.com/Xilinx/linux-xlnx into arm/fixes
arm64: soc: ZynqMP SoC fixes for v5.10-rc6 - Fix SD dll reset issue by using proper macro - Fix PM feature checking for Xilinx Versal SoC * tag 'zynqmp-soc-fixes-for-v5.10-rc6' of https://github.com/Xilinx/linux-xlnx: (337 commits) firmware: xilinx: Use hash-table for api feature check firmware: xilinx: Fix SD DLL node reset issue Linux 5.10-rc4 kvm: mmu: fix is_tdp_mmu_check when the TDP MMU is not in use afs: Fix afs_write_end() when called with copied == 0 [ver #3] ocfs2: initialize ip_next_orphan panic: don't dump stack twice on warn hugetlbfs: fix anon huge page migration race mm: memcontrol: fix missing wakeup polling thread kernel/watchdog: fix watchdog_allowed_mask not used warning reboot: fix overflow parsing reboot cpu number Revert "kernel/reboot.c: convert simple_strtoul to kstrtoint" compiler.h: fix barrier_data() on clang mm/gup: use unpin_user_pages() in __gup_longterm_locked() mm/slub: fix panic in slab_alloc_node() mailmap: fix entry for Dmitry Baryshkov/Eremin-Solenikov mm/vmscan: fix NR_ISOLATED_FILE corruption on 64-bit mm/compaction: stop isolation if too many pages are isolated and we have pages to migrate mm/compaction: count pages and stop correctly during page isolation drm/nouveau/kms/nv50-: Use atomic encoder callbacks everywhere ... Link: https://lore.kernel.org/r/fd5ab967-f3cf-95fb-7947-5477ff85f97e@monstr.eu Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 4765df4 + acfdd18 commit dbae273

File tree

366 files changed

+6001
-2448
lines changed

Some content is hidden

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

366 files changed

+6001
-2448
lines changed

.mailmap

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,10 @@ Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@gmail.com>
8282
Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com>
8383
Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@mips.com>
8484
<dev.kurt@vandijck-laurijssen.be> <kurt.van.dijck@eia.be>
85-
Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
85+
Dmitry Baryshkov <dbaryshkov@gmail.com>
86+
Dmitry Baryshkov <dbaryshkov@gmail.com> <[dbaryshkov@gmail.com]>
87+
Dmitry Baryshkov <dbaryshkov@gmail.com> <dmitry_baryshkov@mentor.com>
88+
Dmitry Baryshkov <dbaryshkov@gmail.com> <dmitry_eremin@mentor.com>
8689
Dmitry Safonov <0x7f454c46@gmail.com> <dima@arista.com>
8790
Dmitry Safonov <0x7f454c46@gmail.com> <d.safonov@partner.samsung.com>
8891
Dmitry Safonov <0x7f454c46@gmail.com> <dsafonov@virtuozzo.com>

Documentation/devicetree/bindings/clock/imx5-clock.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ examples:
5757
};
5858
5959
can@53fc8000 {
60-
compatible = "fsl,imx53-flexcan", "fsl,p1010-flexcan";
60+
compatible = "fsl,imx53-flexcan", "fsl,imx25-flexcan";
6161
reg = <0x53fc8000 0x4000>;
6262
interrupts = <82>;
6363
clocks = <&clks IMX5_CLK_CAN1_IPG_GATE>, <&clks IMX5_CLK_CAN1_SERIAL_GATE>;

Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,17 @@ properties:
2020
- fsl,imx8qm-flexcan
2121
- fsl,imx8mp-flexcan
2222
- fsl,imx6q-flexcan
23-
- fsl,imx53-flexcan
24-
- fsl,imx35-flexcan
2523
- fsl,imx28-flexcan
2624
- fsl,imx25-flexcan
2725
- fsl,p1010-flexcan
2826
- fsl,vf610-flexcan
2927
- fsl,ls1021ar2-flexcan
3028
- fsl,lx2160ar1-flexcan
29+
- items:
30+
- enum:
31+
- fsl,imx53-flexcan
32+
- fsl,imx35-flexcan
33+
- const: fsl,imx25-flexcan
3134
- items:
3235
- enum:
3336
- fsl,imx7d-flexcan
@@ -81,11 +84,12 @@ properties:
8184
req_bit is the bit offset of CAN stop request.
8285
$ref: /schemas/types.yaml#/definitions/phandle-array
8386
items:
84-
- description: The 'gpr' is the phandle to general purpose register node.
85-
- description: The 'req_gpr' is the gpr register offset of CAN stop request.
86-
maximum: 0xff
87-
- description: The 'req_bit' is the bit offset of CAN stop request.
88-
maximum: 0x1f
87+
items:
88+
- description: The 'gpr' is the phandle to general purpose register node.
89+
- description: The 'req_gpr' is the gpr register offset of CAN stop request.
90+
maximum: 0xff
91+
- description: The 'req_bit' is the bit offset of CAN stop request.
92+
maximum: 0x1f
8993

9094
fsl,clk-source:
9195
description: |

Documentation/filesystems/ext4/journal.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,10 @@ which is 1024 bytes long:
256256
- s\_padding2
257257
-
258258
* - 0x54
259+
- \_\_be32
260+
- s\_num\_fc\_blocks
261+
- Number of fast commit blocks in the journal.
262+
* - 0x58
259263
- \_\_u32
260264
- s\_padding[42]
261265
-
@@ -310,6 +314,8 @@ The journal incompat features are any combination of the following:
310314
- This journal uses v3 of the checksum on-disk format. This is the same as
311315
v2, but the journal block tag size is fixed regardless of the size of
312316
block numbers. (JBD2\_FEATURE\_INCOMPAT\_CSUM\_V3)
317+
* - 0x20
318+
- Journal has fast commit blocks. (JBD2\_FEATURE\_INCOMPAT\_FAST\_COMMIT)
313319

314320
.. _jbd2_checksum_type:
315321

Documentation/filesystems/ext4/super.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -596,6 +596,13 @@ following:
596596
- Sparse Super Block, v2. If this flag is set, the SB field s\_backup\_bgs
597597
points to the two block groups that contain backup superblocks
598598
(COMPAT\_SPARSE\_SUPER2).
599+
* - 0x400
600+
- Fast commits supported. Although fast commits blocks are
601+
backward incompatible, fast commit blocks are not always
602+
present in the journal. If fast commit blocks are present in
603+
the journal, JBD2 incompat feature
604+
(JBD2\_FEATURE\_INCOMPAT\_FAST\_COMMIT) gets
605+
set (COMPAT\_FAST\_COMMIT).
599606

600607
.. _super_incompat:
601608

Documentation/filesystems/journalling.rst

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,8 @@ Fast commits
136136
~~~~~~~~~~~~
137137

138138
JBD2 to also allows you to perform file-system specific delta commits known as
139-
fast commits. In order to use fast commits, you first need to call
140-
:c:func:`jbd2_fc_init` and tell how many blocks at the end of journal
141-
area should be reserved for fast commits. Along with that, you will also need
142-
to set following callbacks that perform correspodning work:
139+
fast commits. In order to use fast commits, you will need to set following
140+
callbacks that perform correspodning work:
143141

144142
`journal->j_fc_cleanup_cb`: Cleanup function called after every full commit and
145143
fast commit.

Documentation/firmware-guide/acpi/acpi-lid.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ report the "current" state of the lid as either "opened" or "closed".
1919

2020
For most platforms, both the _LID method and the lid notifications are
2121
reliable. However, there are exceptions. In order to work with these
22-
exceptional buggy platforms, special restrictions and expections should be
22+
exceptional buggy platforms, special restrictions and exceptions should be
2323
taken into account. This document describes the restrictions and the
24-
expections of the Linux ACPI lid device driver.
24+
exceptions of the Linux ACPI lid device driver.
2525

2626

2727
Restrictions of the returning value of the _LID control method
@@ -46,7 +46,7 @@ state is changed to "closed". The "closed" notification is normally used to
4646
trigger some system power saving operations on Windows. Since it is fully
4747
tested, it is reliable from all AML tables.
4848

49-
Expections for the userspace users of the ACPI lid device driver
49+
Exceptions for the userspace users of the ACPI lid device driver
5050
================================================================
5151

5252
The ACPI button driver exports the lid state to the userspace via the
@@ -100,7 +100,7 @@ use the following kernel parameter:
100100
C. button.lid_init_state=ignore:
101101
When this option is specified, the ACPI button driver never reports the
102102
initial lid state and there is a compensation mechanism implemented to
103-
ensure that the reliable "closed" notifications can always be delievered
103+
ensure that the reliable "closed" notifications can always be delivered
104104
to the userspace by always pairing "closed" input events with complement
105105
"opened" input events. But there is still no guarantee that the "opened"
106106
notifications can be delivered to the userspace when the lid is actually

Documentation/firmware-guide/acpi/gpio-properties.rst

Lines changed: 41 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ index, like the ASL example below shows::
2020

2121
Name (_CRS, ResourceTemplate ()
2222
{
23-
GpioIo (Exclusive, PullUp, 0, 0, IoRestrictionInputOnly,
23+
GpioIo (Exclusive, PullUp, 0, 0, IoRestrictionOutputOnly,
2424
"\\_SB.GPO0", 0, ResourceConsumer) {15}
25-
GpioIo (Exclusive, PullUp, 0, 0, IoRestrictionInputOnly,
25+
GpioIo (Exclusive, PullUp, 0, 0, IoRestrictionOutputOnly,
2626
"\\_SB.GPO0", 0, ResourceConsumer) {27, 31}
2727
})
2828

@@ -49,15 +49,41 @@ index
4949
pin
5050
Pin in the GpioIo()/GpioInt() resource. Typically this is zero.
5151
active_low
52-
If 1 the GPIO is marked as active_low.
52+
If 1, the GPIO is marked as active_low.
5353

5454
Since ACPI GpioIo() resource does not have a field saying whether it is
5555
active low or high, the "active_low" argument can be used here. Setting
5656
it to 1 marks the GPIO as active low.
5757

58+
Note, active_low in _DSD does not make sense for GpioInt() resource and
59+
must be 0. GpioInt() resource has its own means of defining it.
60+
5861
In our Bluetooth example the "reset-gpios" refers to the second GpioIo()
5962
resource, second pin in that resource with the GPIO number of 31.
6063

64+
The GpioIo() resource unfortunately doesn't explicitly provide an initial
65+
state of the output pin which driver should use during its initialization.
66+
67+
Linux tries to use common sense here and derives the state from the bias
68+
and polarity settings. The table below shows the expectations:
69+
70+
========= ============= ==============
71+
Pull Bias Polarity Requested...
72+
========= ============= ==============
73+
Implicit x AS IS (assumed firmware configured for us)
74+
Explicit x (no _DSD) as Pull Bias (Up == High, Down == Low),
75+
assuming non-active (Polarity = !Pull Bias)
76+
Down Low as low, assuming active
77+
Down High as low, assuming non-active
78+
Up Low as high, assuming non-active
79+
Up High as high, assuming active
80+
========= ============= ==============
81+
82+
That said, for our above example the both GPIOs, since the bias setting
83+
is explicit and _DSD is present, will be treated as active with a high
84+
polarity and Linux will configure the pins in this state until a driver
85+
reprograms them differently.
86+
6187
It is possible to leave holes in the array of GPIOs. This is useful in
6288
cases like with SPI host controllers where some chip selects may be
6389
implemented as GPIOs and some as native signals. For example a SPI host
@@ -112,8 +138,8 @@ Example::
112138
Package () {
113139
"gpio-line-names",
114140
Package () {
115-
"SPI0_CS_N", "EXP2_INT", "MUX6_IO", "UART0_RXD", "MUX7_IO",
116-
"LVL_C_A1", "MUX0_IO", "SPI1_MISO"
141+
"SPI0_CS_N", "EXP2_INT", "MUX6_IO", "UART0_RXD",
142+
"MUX7_IO", "LVL_C_A1", "MUX0_IO", "SPI1_MISO",
117143
}
118144
}
119145

@@ -137,7 +163,7 @@ to the GPIO lines it is going to use and provide the GPIO subsystem with a
137163
mapping between those names and the ACPI GPIO resources corresponding to them.
138164

139165
To do that, the driver needs to define a mapping table as a NULL-terminated
140-
array of struct acpi_gpio_mapping objects that each contain a name, a pointer
166+
array of struct acpi_gpio_mapping objects that each contains a name, a pointer
141167
to an array of line data (struct acpi_gpio_params) objects and the size of that
142168
array. Each struct acpi_gpio_params object consists of three fields,
143169
crs_entry_index, line_index, active_low, representing the index of the target
@@ -154,13 +180,14 @@ question would look like this::
154180
static const struct acpi_gpio_mapping bluetooth_acpi_gpios[] = {
155181
{ "reset-gpios", &reset_gpio, 1 },
156182
{ "shutdown-gpios", &shutdown_gpio, 1 },
157-
{ },
183+
{ }
158184
};
159185

160186
Next, the mapping table needs to be passed as the second argument to
161-
acpi_dev_add_driver_gpios() that will register it with the ACPI device object
162-
pointed to by its first argument. That should be done in the driver's .probe()
163-
routine. On removal, the driver should unregister its GPIO mapping table by
187+
acpi_dev_add_driver_gpios() or its managed analogue that will
188+
register it with the ACPI device object pointed to by its first
189+
argument. That should be done in the driver's .probe() routine.
190+
On removal, the driver should unregister its GPIO mapping table by
164191
calling acpi_dev_remove_driver_gpios() on the ACPI device object where that
165192
table was previously registered.
166193

@@ -191,12 +218,12 @@ The driver might expect to get the right GPIO when it does::
191218
but since there is no way to know the mapping between "reset" and
192219
the GpioIo() in _CRS desc will hold ERR_PTR(-ENOENT).
193220

194-
The driver author can solve this by passing the mapping explictly
195-
(the recommended way and documented in the above chapter).
221+
The driver author can solve this by passing the mapping explicitly
222+
(this is the recommended way and it's documented in the above chapter).
196223

197224
The ACPI GPIO mapping tables should not contaminate drivers that are not
198225
knowing about which exact device they are servicing on. It implies that
199-
the ACPI GPIO mapping tables are hardly linked to ACPI ID and certain
226+
the ACPI GPIO mapping tables are hardly linked to an ACPI ID and certain
200227
objects, as listed in the above chapter, of the device in question.
201228

202229
Getting GPIO descriptor
@@ -229,5 +256,5 @@ Case 2 explicitly tells GPIO core to look for resources in _CRS.
229256
Be aware that gpiod_get_index() in cases 1 and 2, assuming that there
230257
are two versions of ACPI device description provided and no mapping is
231258
present in the driver, will return different resources. That's why a
232-
certain driver has to handle them carefully as explained in previous
259+
certain driver has to handle them carefully as explained in the previous
233260
chapter.

Documentation/firmware-guide/acpi/method-tracing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ subject to change::
9898
[ 0.188903] exdebug-0398 ex_trace_point : Method End [0xf58394d8:\_SB.PCI0.LPCB.ECOK] execution.
9999

100100
Developers can utilize these special log entries to track the AML
101-
interpretion, thus can aid issue debugging and performance tuning. Note
101+
interpretation, thus can aid issue debugging and performance tuning. Note
102102
that, as the "AML tracer" logs are implemented via ACPI_DEBUG_PRINT()
103103
macro, CONFIG_ACPI_DEBUG is also required to be enabled for enabling
104104
"AML tracer" logs.

Documentation/networking/netdev-FAQ.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ Q: I sent a patch and I'm wondering what happened to it?
110110
Q: How can I tell whether it got merged?
111111
A: Start by looking at the main patchworks queue for netdev:
112112

113-
http://patchwork.ozlabs.org/project/netdev/list/
113+
https://patchwork.kernel.org/project/netdevbpf/list/
114114

115115
The "State" field will tell you exactly where things are at with your
116116
patch.
@@ -152,7 +152,7 @@ networking subsystem, and then hands them off to Greg.
152152

153153
There is a patchworks queue that you can see here:
154154

155-
http://patchwork.ozlabs.org/bundle/davem/stable/?state=*
155+
https://patchwork.kernel.org/bundle/netdev/stable/?state=*
156156

157157
It contains the patches which Dave has selected, but not yet handed off
158158
to Greg. If Greg already has the patch, then it will be here:

0 commit comments

Comments
 (0)