Skip to content

Commit adc4fb9

Browse files
martinkpetersenmartinkpetersen
committed
Merge patch series "Initial support for RK3576 UFS controller"
Shawn Lin <[email protected]> says: This patchset adds initial UFS controller supprt for RK3576 SoC. Patch 1 is the dt-bindings. Patch 2-4 deal with rpm and spm support in advanced suggested by Ulf. Patch 5 exports two new APIs for host driver. Patch 6 and 7 are the host driver and dtsi support. Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Martin K. Petersen <[email protected]>
2 parents 7e72900 + c75e5e0 commit adc4fb9

File tree

265 files changed

+3678
-1923
lines changed

Some content is hidden

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

265 files changed

+3678
-1923
lines changed

‎CREDITS

+2-4
Original file line numberDiff line numberDiff line change
@@ -2515,11 +2515,9 @@ D: SLS distribution
25152515
D: Initial implementation of VC's, pty's and select()
25162516

25172517
N: Pavel Machek
2518-
E: pavel@ucw.cz
2518+
E: pavel@kernel.org
25192519
P: 4096R/92DFCE96 4FA7 9EEF FCD4 C44F C585 B8C7 C060 2241 92DF CE96
2520-
D: Softcursor for vga, hypertech cdrom support, vcsa bugfix, nbd,
2521-
D: sun4/330 port, capabilities for elf, speedup for rm on ext2, USB,
2522-
D: work on suspend-to-ram/disk, killing duplicates from ioctl32,
2520+
D: NBD, Sun4/330 port, USB, work on suspend-to-ram/disk,
25232521
D: Altera SoCFPGA and Nokia N900 support.
25242522
S: Czech Republic
25252523

‎Documentation/devicetree/bindings/interrupt-controller/microchip,lan966x-oic.yaml

+2-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@ allOf:
1414

1515
description: |
1616
The Microchip LAN966x outband interrupt controller (OIC) maps the internal
17-
interrupt sources of the LAN966x device to an external interrupt.
18-
When the LAN966x device is used as a PCI device, the external interrupt is
19-
routed to the PCI interrupt.
17+
interrupt sources of the LAN966x device to a PCI interrupt when the LAN966x
18+
device is used as a PCI device.
2019
2120
properties:
2221
compatible:

‎Documentation/devicetree/bindings/ufs/rockchip,rk3576-ufshc.yaml

+105
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/ufs/rockchip,rk3576-ufshc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Rockchip UFS Host Controller
8+
9+
maintainers:
10+
- Shawn Lin <[email protected]>
11+
12+
allOf:
13+
- $ref: ufs-common.yaml
14+
15+
properties:
16+
compatible:
17+
const: rockchip,rk3576-ufshc
18+
19+
reg:
20+
maxItems: 5
21+
22+
reg-names:
23+
items:
24+
- const: hci
25+
- const: mphy
26+
- const: hci_grf
27+
- const: mphy_grf
28+
- const: hci_apb
29+
30+
clocks:
31+
maxItems: 4
32+
33+
clock-names:
34+
items:
35+
- const: core
36+
- const: pclk
37+
- const: pclk_mphy
38+
- const: ref_out
39+
40+
power-domains:
41+
maxItems: 1
42+
43+
resets:
44+
maxItems: 4
45+
46+
reset-names:
47+
items:
48+
- const: biu
49+
- const: sys
50+
- const: ufs
51+
- const: grf
52+
53+
reset-gpios:
54+
maxItems: 1
55+
description: |
56+
GPIO specifiers for host to reset the whole UFS device including PHY and
57+
memory. This gpio is active low and should choose the one whose high output
58+
voltage is lower than 1.5V based on the UFS spec.
59+
60+
required:
61+
- compatible
62+
- reg
63+
- reg-names
64+
- clocks
65+
- clock-names
66+
- interrupts
67+
- power-domains
68+
- resets
69+
- reset-names
70+
- reset-gpios
71+
72+
unevaluatedProperties: false
73+
74+
examples:
75+
- |
76+
#include <dt-bindings/clock/rockchip,rk3576-cru.h>
77+
#include <dt-bindings/reset/rockchip,rk3576-cru.h>
78+
#include <dt-bindings/interrupt-controller/arm-gic.h>
79+
#include <dt-bindings/power/rockchip,rk3576-power.h>
80+
#include <dt-bindings/pinctrl/rockchip.h>
81+
#include <dt-bindings/gpio/gpio.h>
82+
83+
soc {
84+
#address-cells = <2>;
85+
#size-cells = <2>;
86+
87+
ufshc: ufshc@2a2d0000 {
88+
compatible = "rockchip,rk3576-ufshc";
89+
reg = <0x0 0x2a2d0000 0x0 0x10000>,
90+
<0x0 0x2b040000 0x0 0x10000>,
91+
<0x0 0x2601f000 0x0 0x1000>,
92+
<0x0 0x2603c000 0x0 0x1000>,
93+
<0x0 0x2a2e0000 0x0 0x10000>;
94+
reg-names = "hci", "mphy", "hci_grf", "mphy_grf", "hci_apb";
95+
clocks = <&cru ACLK_UFS_SYS>, <&cru PCLK_USB_ROOT>, <&cru PCLK_MPHY>,
96+
<&cru CLK_REF_UFS_CLKOUT>;
97+
clock-names = "core", "pclk", "pclk_mphy", "ref_out";
98+
interrupts = <GIC_SPI 361 IRQ_TYPE_LEVEL_HIGH>;
99+
power-domains = <&power RK3576_PD_USB>;
100+
resets = <&cru SRST_A_UFS_BIU>, <&cru SRST_A_UFS_SYS>, <&cru SRST_A_UFS>,
101+
<&cru SRST_P_UFS_GRF>;
102+
reset-names = "biu", "sys", "ufs", "grf";
103+
reset-gpios = <&gpio4 RK_PD0 GPIO_ACTIVE_LOW>;
104+
};
105+
};

‎Documentation/filesystems/bcachefs/SubmittingPatches.rst

+98
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
Submitting patches to bcachefs:
2+
===============================
3+
4+
Patches must be tested before being submitted, either with the xfstests suite
5+
[0], or the full bcachefs test suite in ktest [1], depending on what's being
6+
touched. Note that ktest wraps xfstests and will be an easier method to running
7+
it for most users; it includes single-command wrappers for all the mainstream
8+
in-kernel local filesystems.
9+
10+
Patches will undergo more testing after being merged (including
11+
lockdep/kasan/preempt/etc. variants), these are not generally required to be
12+
run by the submitter - but do put some thought into what you're changing and
13+
which tests might be relevant, e.g. are you dealing with tricky memory layout
14+
work? kasan, are you doing locking work? then lockdep; and ktest includes
15+
single-command variants for the debug build types you'll most likely need.
16+
17+
The exception to this rule is incomplete WIP/RFC patches: if you're working on
18+
something nontrivial, it's encouraged to send out a WIP patch to let people
19+
know what you're doing and make sure you're on the right track. Just make sure
20+
it includes a brief note as to what's done and what's incomplete, to avoid
21+
confusion.
22+
23+
Rigorous checkpatch.pl adherence is not required (many of its warnings are
24+
considered out of date), but try not to deviate too much without reason.
25+
26+
Focus on writing code that reads well and is organized well; code should be
27+
aesthetically pleasing.
28+
29+
CI:
30+
===
31+
32+
Instead of running your tests locally, when running the full test suite it's
33+
prefereable to let a server farm do it in parallel, and then have the results
34+
in a nice test dashboard (which can tell you which failures are new, and
35+
presents results in a git log view, avoiding the need for most bisecting).
36+
37+
That exists [2], and community members may request an account. If you work for
38+
a big tech company, you'll need to help out with server costs to get access -
39+
but the CI is not restricted to running bcachefs tests: it runs any ktest test
40+
(which generally makes it easy to wrap other tests that can run in qemu).
41+
42+
Other things to think about:
43+
============================
44+
45+
- How will we debug this code? Is there sufficient introspection to diagnose
46+
when something starts acting wonky on a user machine?
47+
48+
We don't necessarily need every single field of every data structure visible
49+
with introspection, but having the important fields of all the core data
50+
types wired up makes debugging drastically easier - a bit of thoughtful
51+
foresight greatly reduces the need to have people build custom kernels with
52+
debug patches.
53+
54+
More broadly, think about all the debug tooling that might be needed.
55+
56+
- Does it make the codebase more or less of a mess? Can we also try to do some
57+
organizing, too?
58+
59+
- Do new tests need to be written? New assertions? How do we know and verify
60+
that the code is correct, and what happens if something goes wrong?
61+
62+
We don't yet have automated code coverage analysis or easy fault injection -
63+
but for now, pretend we did and ask what they might tell us.
64+
65+
Assertions are hugely important, given that we don't yet have a systems
66+
language that can do ergonomic embedded correctness proofs. Hitting an assert
67+
in testing is much better than wandering off into undefined behaviour la-la
68+
land - use them. Use them judiciously, and not as a replacement for proper
69+
error handling, but use them.
70+
71+
- Does it need to be performance tested? Should we add new peformance counters?
72+
73+
bcachefs has a set of persistent runtime counters which can be viewed with
74+
the 'bcachefs fs top' command; this should give users a basic idea of what
75+
their filesystem is currently doing. If you're doing a new feature or looking
76+
at old code, think if anything should be added.
77+
78+
- If it's a new on disk format feature - have upgrades and downgrades been
79+
tested? (Automated tests exists but aren't in the CI, due to the hassle of
80+
disk image management; coordinate to have them run.)
81+
82+
Mailing list, IRC:
83+
==================
84+
85+
Patches should hit the list [3], but much discussion and code review happens on
86+
IRC as well [4]; many people appreciate the more conversational approach and
87+
quicker feedback.
88+
89+
Additionally, we have a lively user community doing excellent QA work, which
90+
exists primarily on IRC. Please make use of that resource; user feedback is
91+
important for any nontrivial feature, and documenting it in commit messages
92+
would be a good idea.
93+
94+
[0]: git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git
95+
[1]: https://evilpiepirate.org/git/ktest.git/
96+
[2]: https://evilpiepirate.org/~testdashboard/ci/
97+
[3]: [email protected]
98+
[4]: irc.oftc.net#bcache, #bcachefs-dev

‎Documentation/filesystems/bcachefs/index.rst

+1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ bcachefs Documentation
99
:numbered:
1010

1111
CodingStyle
12+
SubmittingPatches
1213
errorcodes

‎Documentation/virt/kvm/api.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1419,7 +1419,7 @@ fetch) is injected in the guest.
14191419
S390:
14201420
^^^^^
14211421

1422-
Returns -EINVAL if the VM has the KVM_VM_S390_UCONTROL flag set.
1422+
Returns -EINVAL or -EEXIST if the VM has the KVM_VM_S390_UCONTROL flag set.
14231423
Returns -EINVAL if called on a protected VM.
14241424

14251425
4.36 KVM_SET_TSS_ADDR

‎MAINTAINERS

+50-7
Original file line numberDiff line numberDiff line change
@@ -2209,7 +2209,6 @@ F: sound/soc/codecs/cs42l84.*
22092209
F: sound/soc/codecs/ssm3515.c
22102210

22112211
ARM/APPLE MACHINE SUPPORT
2212-
M: Hector Martin <[email protected]>
22132212
M: Sven Peter <[email protected]>
22142213
R: Alyssa Rosenzweig <[email protected]>
22152214
L: [email protected]
@@ -3955,6 +3954,7 @@ M: Kent Overstreet <[email protected]>
39553954
L: [email protected]
39563955
S: Supported
39573956
C: irc://irc.oftc.net/bcache
3957+
P: Documentation/filesystems/bcachefs/SubmittingPatches.rst
39583958
T: git https://evilpiepirate.org/git/bcachefs.git
39593959
F: fs/bcachefs/
39603960
F: Documentation/filesystems/bcachefs/
@@ -9409,7 +9409,7 @@ F: fs/freevxfs/
94099409

94109410
FREEZER
94119411
M: "Rafael J. Wysocki" <[email protected]>
9412-
M: Pavel Machek <pavel@ucw.cz>
9412+
M: Pavel Machek <pavel@kernel.org>
94139413
L: [email protected]
94149414
S: Supported
94159415
F: Documentation/power/freezing-of-tasks.rst
@@ -9869,7 +9869,7 @@ S: Maintained
98699869
F: drivers/staging/gpib/
98709870

98719871
GPIO ACPI SUPPORT
9872-
M: Mika Westerberg <[email protected]>
9872+
M: Mika Westerberg <[email protected]>
98739873
M: Andy Shevchenko <[email protected]>
98749874
L: [email protected]
98759875
L: [email protected]
@@ -10244,7 +10244,7 @@ F: drivers/video/fbdev/hgafb.c
1024410244

1024510245
HIBERNATION (aka Software Suspend, aka swsusp)
1024610246
M: "Rafael J. Wysocki" <[email protected]>
10247-
M: Pavel Machek <pavel@ucw.cz>
10247+
M: Pavel Machek <pavel@kernel.org>
1024810248
L: [email protected]
1024910249
S: Supported
1025010250
B: https://bugzilla.kernel.org
@@ -13115,8 +13115,8 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/har
1311513115
F: scripts/leaking_addresses.pl
1311613116

1311713117
LED SUBSYSTEM
13118-
M: Pavel Machek <[email protected]>
1311913118
M: Lee Jones <[email protected]>
13119+
M: Pavel Machek <[email protected]>
1312013120
L: [email protected]
1312113121
S: Maintained
1312213122
T: git git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git
@@ -16453,6 +16453,22 @@ F: include/net/dsa.h
1645316453
F: net/dsa/
1645416454
F: tools/testing/selftests/drivers/net/dsa/
1645516455

16456+
NETWORKING [ETHTOOL]
16457+
M: Andrew Lunn <[email protected]>
16458+
M: Jakub Kicinski <[email protected]>
16459+
F: Documentation/netlink/specs/ethtool.yaml
16460+
F: Documentation/networking/ethtool-netlink.rst
16461+
F: include/linux/ethtool*
16462+
F: include/uapi/linux/ethtool*
16463+
F: net/ethtool/
16464+
F: tools/testing/selftests/drivers/net/*/ethtool*
16465+
16466+
NETWORKING [ETHTOOL CABLE TEST]
16467+
M: Andrew Lunn <[email protected]>
16468+
F: net/ethtool/cabletest.c
16469+
F: tools/testing/selftests/drivers/net/*/ethtool*
16470+
K: cable_test
16471+
1645616472
NETWORKING [GENERAL]
1645716473
M: "David S. Miller" <[email protected]>
1645816474
M: Eric Dumazet <[email protected]>
@@ -16612,6 +16628,7 @@ F: tools/testing/selftests/net/mptcp/
1661216628
NETWORKING [TCP]
1661316629
M: Eric Dumazet <[email protected]>
1661416630
M: Neal Cardwell <[email protected]>
16631+
R: Kuniyuki Iwashima <[email protected]>
1661516632
L: [email protected]
1661616633
S: Maintained
1661716634
F: Documentation/networking/net_cachelines/tcp_sock.rst
@@ -16639,6 +16656,31 @@ F: include/net/tls.h
1663916656
F: include/uapi/linux/tls.h
1664016657
F: net/tls/*
1664116658

16659+
NETWORKING [SOCKETS]
16660+
M: Eric Dumazet <[email protected]>
16661+
M: Kuniyuki Iwashima <[email protected]>
16662+
M: Paolo Abeni <[email protected]>
16663+
M: Willem de Bruijn <[email protected]>
16664+
S: Maintained
16665+
F: include/linux/sock_diag.h
16666+
F: include/linux/socket.h
16667+
F: include/linux/sockptr.h
16668+
F: include/net/sock.h
16669+
F: include/net/sock_reuseport.h
16670+
F: include/uapi/linux/socket.h
16671+
F: net/core/*sock*
16672+
F: net/core/scm.c
16673+
F: net/socket.c
16674+
16675+
NETWORKING [UNIX SOCKETS]
16676+
M: Kuniyuki Iwashima <[email protected]>
16677+
S: Maintained
16678+
F: include/net/af_unix.h
16679+
F: include/net/netns/unix.h
16680+
F: include/uapi/linux/unix_diag.h
16681+
F: net/unix/
16682+
F: tools/testing/selftests/net/af_unix/
16683+
1664216684
NETXEN (1/10) GbE SUPPORT
1664316685
M: Manish Chopra <[email protected]>
1664416686
M: Rahul Verma <[email protected]>
@@ -16772,7 +16814,7 @@ F: include/linux/tick.h
1677216814
F: kernel/time/tick*.*
1677316815

1677416816
NOKIA N900 CAMERA SUPPORT (ET8EK8 SENSOR, AD5820 FOCUS)
16775-
M: Pavel Machek <pavel@ucw.cz>
16817+
M: Pavel Machek <pavel@kernel.org>
1677616818
M: Sakari Ailus <[email protected]>
1677716819
L: [email protected]
1677816820
S: Maintained
@@ -17704,6 +17746,7 @@ L: [email protected]
1770417746
L: [email protected]
1770517747
S: Maintained
1770617748
W: http://openvswitch.org
17749+
F: Documentation/networking/openvswitch.rst
1770717750
F: include/uapi/linux/openvswitch.h
1770817751
F: net/openvswitch/
1770917752
F: tools/testing/selftests/net/openvswitch/
@@ -22797,7 +22840,7 @@ F: drivers/sh/
2279722840
SUSPEND TO RAM
2279822841
M: "Rafael J. Wysocki" <[email protected]>
2279922842
M: Len Brown <[email protected]>
22800-
M: Pavel Machek <pavel@ucw.cz>
22843+
M: Pavel Machek <pavel@kernel.org>
2280122844
L: [email protected]
2280222845
S: Supported
2280322846
B: https://bugzilla.kernel.org

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 6
33
PATCHLEVEL = 14
44
SUBLEVEL = 0
5-
EXTRAVERSION = -rc1
5+
EXTRAVERSION = -rc2
66
NAME = Baby Opossum Posse
77

88
# *DOCUMENTATION*

0 commit comments

Comments
 (0)