Skip to content

Commit 06891af

Browse files
committed
spi: spl022: fix sleeping in interrupt context
Merge series from Nam Cao <namcao@linutronix.de>: While running the spl022, I got the following warning: BUG: sleeping function called from invalid context at drivers/spi/spi.c:1428 This is because between spi transfers, spi_transfer_delay_exec() (who may sleep if the delay is >10us) is called in interrupt context. This is a problem for anyone who runs this driver and need more than 10us delay. Patch 1 adds an error reporting mechanism, needed by patch 2 who switch to use the default spi_transfer_one_message(), which fix the problem. The series is tested with polling transfer mode and interrupt transfer mode. I can't test the DMA mode, so some help testing here is very appreciated.
2 parents 7a030ab + 9b2ef25 commit 06891af

251 files changed

Lines changed: 2890 additions & 4237 deletions

File tree

Some content is hidden

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

Documentation/arch/loongarch/introduction.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -375,9 +375,9 @@ Developer web site of Loongson and LoongArch (Software and Documentation):
375375

376376
Documentation of LoongArch ISA:
377377

378-
https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-Vol1-v1.02-CN.pdf (in Chinese)
378+
https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-Vol1-v1.10-CN.pdf (in Chinese)
379379

380-
https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-Vol1-v1.02-EN.pdf (in English)
380+
https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-Vol1-v1.10-EN.pdf (in English)
381381

382382
Documentation of LoongArch ELF psABI:
383383

Documentation/devicetree/bindings/usb/microchip,usb5744.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,11 @@ properties:
3636

3737
vdd-supply:
3838
description:
39-
VDD power supply to the hub
39+
3V3 power supply to the hub
40+
41+
vdd2-supply:
42+
description:
43+
1V2 power supply to the hub
4044

4145
peer-hub:
4246
$ref: /schemas/types.yaml#/definitions/phandle
@@ -62,6 +66,7 @@ allOf:
6266
properties:
6367
reset-gpios: false
6468
vdd-supply: false
69+
vdd2-supply: false
6570
peer-hub: false
6671
i2c-bus: false
6772
else:

Documentation/devicetree/bindings/usb/qcom,dwc3.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -521,8 +521,8 @@ examples:
521521
522522
interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>,
523523
<GIC_SPI 486 IRQ_TYPE_LEVEL_HIGH>,
524-
<GIC_SPI 488 IRQ_TYPE_LEVEL_HIGH>,
525-
<GIC_SPI 489 IRQ_TYPE_LEVEL_HIGH>;
524+
<GIC_SPI 488 IRQ_TYPE_EDGE_BOTH>,
525+
<GIC_SPI 489 IRQ_TYPE_EDGE_BOTH>;
526526
interrupt-names = "hs_phy_irq", "ss_phy_irq",
527527
"dm_hs_phy_irq", "dp_hs_phy_irq";
528528

Documentation/devicetree/bindings/usb/usb-hcd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ examples:
4141
- |
4242
usb {
4343
phys = <&usb2_phy1>, <&usb3_phy1>;
44-
phy-names = "usb";
44+
phy-names = "usb2", "usb3";
4545
#address-cells = <1>;
4646
#size-cells = <0>;
4747

Documentation/filesystems/erofs.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,10 @@ compatibility checking tool (fsck.erofs), and a debugging tool (dump.erofs):
9191

9292
- git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git
9393

94+
For more information, please also refer to the documentation site:
95+
96+
- https://erofs.docs.kernel.org
97+
9498
Bugs and patches are welcome, please kindly help us and send to the following
9599
linux-erofs mailing list:
96100

Documentation/process/maintainer-netdev.rst

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,9 +193,23 @@ Review timelines
193193
Generally speaking, the patches get triaged quickly (in less than
194194
48h). But be patient, if your patch is active in patchwork (i.e. it's
195195
listed on the project's patch list) the chances it was missed are close to zero.
196-
Asking the maintainer for status updates on your
197-
patch is a good way to ensure your patch is ignored or pushed to the
198-
bottom of the priority list.
196+
197+
The high volume of development on netdev makes reviewers move on
198+
from discussions relatively quickly. New comments and replies
199+
are very unlikely to arrive after a week of silence. If a patch
200+
is no longer active in patchwork and the thread went idle for more
201+
than a week - clarify the next steps and/or post the next version.
202+
203+
For RFC postings specifically, if nobody responded in a week - reviewers
204+
either missed the posting or have no strong opinions. If the code is ready,
205+
repost as a PATCH.
206+
207+
Emails saying just "ping" or "bump" are considered rude. If you can't figure
208+
out the status of the patch from patchwork or where the discussion has
209+
landed - describe your best guess and ask if it's correct. For example::
210+
211+
I don't understand what the next steps are. Person X seems to be unhappy
212+
with A, should I do B and repost the patches?
199213

200214
.. _Changes requested:
201215

Documentation/translations/zh_CN/arch/loongarch/introduction.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -338,9 +338,9 @@ Loongson与LoongArch的开发者网站(软件与文档资源):
338338

339339
LoongArch指令集架构的文档:
340340

341-
https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-Vol1-v1.02-CN.pdf (中文版)
341+
https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-Vol1-v1.10-CN.pdf (中文版)
342342

343-
https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-Vol1-v1.02-EN.pdf (英文版)
343+
https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-Vol1-v1.10-EN.pdf (英文版)
344344

345345
LoongArch的ELF psABI文档:
346346

MAINTAINERS

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7865,6 +7865,7 @@ R: Yue Hu <huyue2@coolpad.com>
78657865
R: Jeffle Xu <jefflexu@linux.alibaba.com>
78667866
L: linux-erofs@lists.ozlabs.org
78677867
S: Maintained
7868+
W: https://erofs.docs.kernel.org
78687869
T: git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git
78697870
F: Documentation/ABI/testing/sysfs-fs-erofs
78707871
F: Documentation/filesystems/erofs.rst
@@ -11034,7 +11035,6 @@ F: drivers/net/wireless/intel/iwlwifi/
1103411035

1103511036
INTEL WMI SLIM BOOTLOADER (SBL) FIRMWARE UPDATE DRIVER
1103611037
M: Jithu Joseph <jithu.joseph@intel.com>
11037-
R: Maurice Ma <maurice.ma@intel.com>
1103811038
S: Maintained
1103911039
W: https://slimbootloader.github.io/security/firmware-update.html
1104011040
F: drivers/platform/x86/intel/wmi/sbl-fw-update.c
@@ -13788,7 +13788,6 @@ F: drivers/net/ethernet/mellanox/mlxfw/
1378813788
MELLANOX HARDWARE PLATFORM SUPPORT
1378913789
M: Hans de Goede <hdegoede@redhat.com>
1379013790
M: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
13791-
M: Mark Gross <markgross@kernel.org>
1379213791
M: Vadim Pasternak <vadimp@nvidia.com>
1379313792
L: platform-driver-x86@vger.kernel.org
1379413793
S: Supported
@@ -14397,7 +14396,6 @@ F: drivers/platform/surface/surface_gpe.c
1439714396
MICROSOFT SURFACE HARDWARE PLATFORM SUPPORT
1439814397
M: Hans de Goede <hdegoede@redhat.com>
1439914398
M: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
14400-
M: Mark Gross <markgross@kernel.org>
1440114399
M: Maximilian Luz <luzmaximilian@gmail.com>
1440214400
L: platform-driver-x86@vger.kernel.org
1440314401
S: Maintained
@@ -15004,6 +15002,7 @@ M: Jakub Kicinski <kuba@kernel.org>
1500415002
M: Paolo Abeni <pabeni@redhat.com>
1500515003
L: netdev@vger.kernel.org
1500615004
S: Maintained
15005+
P: Documentation/process/maintainer-netdev.rst
1500715006
Q: https://patchwork.kernel.org/project/netdevbpf/list/
1500815007
T: git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
1500915008
T: git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
@@ -15055,6 +15054,7 @@ M: Jakub Kicinski <kuba@kernel.org>
1505515054
M: Paolo Abeni <pabeni@redhat.com>
1505615055
L: netdev@vger.kernel.org
1505715056
S: Maintained
15057+
P: Documentation/process/maintainer-netdev.rst
1505815058
Q: https://patchwork.kernel.org/project/netdevbpf/list/
1505915059
B: mailto:netdev@vger.kernel.org
1506015060
T: git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
@@ -15065,6 +15065,7 @@ F: Documentation/networking/
1506515065
F: Documentation/process/maintainer-netdev.rst
1506615066
F: Documentation/userspace-api/netlink/
1506715067
F: include/linux/in.h
15068+
F: include/linux/indirect_call_wrapper.h
1506815069
F: include/linux/net.h
1506915070
F: include/linux/netdevice.h
1507015071
F: include/net/
@@ -22088,6 +22089,7 @@ F: drivers/watchdog/tqmx86_wdt.c
2208822089
TRACING
2208922090
M: Steven Rostedt <rostedt@goodmis.org>
2209022091
M: Masami Hiramatsu <mhiramat@kernel.org>
22092+
R: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
2209122093
L: linux-kernel@vger.kernel.org
2209222094
L: linux-trace-kernel@vger.kernel.org
2209322095
S: Maintained
@@ -23674,7 +23676,6 @@ F: drivers/platform/x86/x86-android-tablets/
2367423676
X86 PLATFORM DRIVERS
2367523677
M: Hans de Goede <hdegoede@redhat.com>
2367623678
M: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
23677-
M: Mark Gross <markgross@kernel.org>
2367823679
L: platform-driver-x86@vger.kernel.org
2367923680
S: Maintained
2368023681
Q: https://patchwork.kernel.org/project/platform-driver-x86/list/

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 6
33
PATCHLEVEL = 7
44
SUBLEVEL = 0
5-
EXTRAVERSION = -rc2
5+
EXTRAVERSION = -rc3
66
NAME = Hurr durr I'ma ninja sloth
77

88
# *DOCUMENTATION*

arch/arm/xen/enlighten.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,8 @@ static int __init xen_guest_init(void)
484484
* for secondary CPUs as they are brought up.
485485
* For uniformity we use VCPUOP_register_vcpu_info even on cpu0.
486486
*/
487-
xen_vcpu_info = alloc_percpu(struct vcpu_info);
487+
xen_vcpu_info = __alloc_percpu(sizeof(struct vcpu_info),
488+
1 << fls(sizeof(struct vcpu_info) - 1));
488489
if (xen_vcpu_info == NULL)
489490
return -ENOMEM;
490491

0 commit comments

Comments
 (0)