Skip to content

Commit d65218d

Browse files
committed
Merge tag 'rproc-v7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux
Pull remoteproc updates from Bjorn Andersson: - Move requesting of IRQs in TI Keystone driver to probe time instead of remoteproc start, to allow better handling of errors. - Introduce support for more than 10 entries in the Qualcomm minidump implementation. - Add audio DSP remoteproc support for the Qualcomm Eliza platform. Add modem remoteproc support for the Qualcomm MDM9607, MSM8917, MSM8937, and MSM8940 platforms. - Add list of Qualcomm QMI service ids to the QMI header file, in order to avoid sprinkling them across the various drivers using them. Migrate sysmon to use this constant. - Fix several issues related to DeviceTree parsing and mailbox handling in the Xilinx R5F remote processor driver. - Fix incorrect error checks in reserved memory handling and polish the code across i.MX and TI drivers. * tag 'rproc-v7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux: (35 commits) remoteproc: qcom: pas: Add Eliza ADSP support dt-bindings: remoteproc: qcom,milos-pas: Document Eliza ADSP remoteproc: qcom: Add missing space before closing bracket dt-bindings: remoteproc: qcom: Drop types for firmware-name remoteproc: qcom: Fix minidump out-of-bounds access on subsystems array dt-bindings: remoteproc: k3-r5f: Add memory-region-names dt-bindings: remoteproc: k3-r5f: Split up memory regions remoteproc: use SIZE_MAX in rproc_u64_fit_in_size_t() dt-bindings: remoteproc: qcom,sm8550-pas: Add Glymur CDSP dt-bindings: remoteproc: qcom,sm8550-pas: Add Glymur ADSP remoteproc: xlnx: Release mailbox channels on shutdown remoteproc: sysmon: Use the unified QMI service ID instead of defining it locally remoteproc: xlnx: Only access buffer information if IPI is buffered remoteproc: xlnx: Avoid mailbox setup remoteproc: keystone: Request IRQs in probe() remoteproc: pru: Remove empty remove callback remoteproc: pru: Use rproc_of_parse_firmware() to get firmware name remoteproc: da8xx: Reorder resource fetching in probe() remoteproc: da8xx: Remove unused local struct data remoteproc: da8xx: Use dev_err_probe() ...
2 parents e2d1099 + 56c1ec5 commit d65218d

21 files changed

Lines changed: 485 additions & 226 deletions

Documentation/devicetree/bindings/remoteproc/qcom,milos-pas.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ description:
1616
properties:
1717
compatible:
1818
enum:
19+
- qcom,eliza-adsp-pas
1920
- qcom,milos-adsp-pas
2021
- qcom,milos-cdsp-pas
2122
- qcom,milos-mpss-pas
@@ -69,6 +70,7 @@ allOf:
6970
properties:
7071
compatible:
7172
enum:
73+
- qcom,eliza-adsp-pas
7274
- qcom,milos-adsp-pas
7375
- qcom,milos-cdsp-pas
7476
then:
@@ -89,6 +91,7 @@ allOf:
8991
compatible:
9092
contains:
9193
enum:
94+
- qcom,eliza-adsp-pas
9295
- qcom,milos-adsp-pas
9396
then:
9497
properties:

Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,14 @@ properties:
1717
compatible:
1818
oneOf:
1919
- enum:
20+
- qcom,mdm9607-mss-pil
2021
- qcom,msm8226-mss-pil
2122
- qcom,msm8909-mss-pil
2223
- qcom,msm8916-mss-pil
24+
- qcom,msm8917-mss-pil
2325
- qcom,msm8926-mss-pil
26+
- qcom,msm8937-mss-pil
27+
- qcom,msm8940-mss-pil
2428
- qcom,msm8953-mss-pil
2529
- qcom,msm8974-mss-pil
2630

@@ -89,7 +93,7 @@ properties:
8993
description: PLL proxy supply (control handed over after startup)
9094

9195
mss-supply:
92-
description: MSS power domain supply (only valid for qcom,msm8974-mss-pil)
96+
description: MSS power domain supply
9397

9498
resets:
9599
items:
@@ -137,7 +141,6 @@ properties:
137141
- description: MPSS reserved region
138142

139143
firmware-name:
140-
$ref: /schemas/types.yaml#/definitions/string-array
141144
items:
142145
- description: Name of MBA firmware
143146
- description: Name of modem firmware
@@ -226,8 +229,12 @@ allOf:
226229
compatible:
227230
contains:
228231
enum:
232+
- qcom,mdm9607-mss-pil
229233
- qcom,msm8909-mss-pil
230234
- qcom,msm8916-mss-pil
235+
- qcom,msm8917-mss-pil
236+
- qcom,msm8937-mss-pil
237+
- qcom,msm8940-mss-pil
231238
then:
232239
properties:
233240
power-domains:
@@ -271,6 +278,9 @@ allOf:
271278
contains:
272279
enum:
273280
- qcom,msm8926-mss-pil
281+
- qcom,msm8917-mss-pil
282+
- qcom,msm8937-mss-pil
283+
- qcom,msm8940-mss-pil
274284
- qcom,msm8974-mss-pil
275285
then:
276286
required:

Documentation/devicetree/bindings/remoteproc/qcom,msm8996-mss-pil.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ properties:
126126
- description: Metadata reserved region
127127

128128
firmware-name:
129-
$ref: /schemas/types.yaml#/definitions/string-array
130129
items:
131130
- description: Name of MBA firmware
132131
- description: Name of modem firmware

Documentation/devicetree/bindings/remoteproc/qcom,sa8775p-pas.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ properties:
5151
description: Reference to the AOSS side-channel message RAM.
5252

5353
firmware-name:
54-
$ref: /schemas/types.yaml#/definitions/string-array
5554
items:
5655
- description: Firmware name of the Hexagon core
5756

Documentation/devicetree/bindings/remoteproc/qcom,sc7180-mss-pil.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ properties:
9898
- description: metadata reserved region
9999

100100
firmware-name:
101-
$ref: /schemas/types.yaml#/definitions/string-array
102101
items:
103102
- description: Name of MBA firmware
104103
- description: Name of modem firmware

Documentation/devicetree/bindings/remoteproc/qcom,sc7280-mss-pil.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ properties:
9898
- description: metadata reserved region
9999

100100
firmware-name:
101-
$ref: /schemas/types.yaml#/definitions/string-array
102101
items:
103102
- description: Name of MBA firmware
104103
- description: Name of modem firmware

Documentation/devicetree/bindings/remoteproc/qcom,sc8280xp-pas.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ properties:
4242
description: Reference to the reserved-memory for the Hexagon core
4343

4444
firmware-name:
45-
$ref: /schemas/types.yaml#/definitions/string
45+
maxItems: 1
4646
description: Firmware name for the Hexagon core
4747

4848
required:

Documentation/devicetree/bindings/remoteproc/qcom,sdx55-pas.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ properties:
5656
smd-edge: false
5757

5858
firmware-name:
59-
$ref: /schemas/types.yaml#/definitions/string
59+
maxItems: 1
6060
description: Firmware name for the Hexagon core
6161

6262
required:

Documentation/devicetree/bindings/remoteproc/qcom,sm8550-pas.yaml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,16 @@ properties:
2828
- qcom,x1e80100-adsp-pas
2929
- qcom,x1e80100-cdsp-pas
3030
- items:
31-
- const: qcom,sm8750-adsp-pas
31+
- enum:
32+
- qcom,glymur-adsp-pas
33+
- qcom,kaanapali-adsp-pas
34+
- qcom,sm8750-adsp-pas
3235
- const: qcom,sm8550-adsp-pas
36+
- items:
37+
- enum:
38+
- qcom,glymur-cdsp-pas
39+
- qcom,kaanapali-cdsp-pas
40+
- const: qcom,sm8550-cdsp-pas
3341
- items:
3442
- const: qcom,sm8750-cdsp-pas
3543
- const: qcom,sm8650-cdsp-pas
@@ -52,7 +60,6 @@ properties:
5260
smd-edge: false
5361

5462
firmware-name:
55-
$ref: /schemas/types.yaml#/definitions/string-array
5663
items:
5764
- description: Firmware name of the Hexagon core
5865
- description: Firmware name of the Hexagon Devicetree
@@ -95,6 +102,10 @@ allOf:
95102
compatible:
96103
contains:
97104
enum:
105+
- qcom,glymur-adsp-pas
106+
- qcom,glymur-cdsp-pas
107+
- qcom,kaanapali-adsp-pas
108+
- qcom,kaanapali-cdsp-pas
98109
- qcom,sm8750-adsp-pas
99110
then:
100111
properties:

Documentation/devicetree/bindings/remoteproc/ti,k3-r5f-rproc.yaml

Lines changed: 45 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -154,17 +154,44 @@ patternProperties:
154154
memory-region:
155155
description: |
156156
phandle to the reserved memory nodes to be associated with the
157-
remoteproc device. There should be at least two reserved memory nodes
158-
defined. The reserved memory nodes should be carveout nodes, and
159-
should be defined with a "no-map" property as per the bindings in
157+
remoteproc device. There should be two reserved memory nodes defined
158+
for the basic layout or 6 partitions for a detailed layout. The
159+
reserved memory nodes should be carveout nodes, and should be defined
160+
with a "no-map" property as per the bindings in
160161
Documentation/devicetree/bindings/reserved-memory/reserved-memory.txt
161-
minItems: 2
162-
maxItems: 8
163-
items:
164-
- description: region used for dynamic DMA allocations like vrings and
165-
vring buffers
166-
- description: region reserved for firmware image sections
167-
additionalItems: true
162+
oneOf:
163+
- description: Basic layout
164+
items:
165+
- description: region used for dynamic DMA allocations like vrings and
166+
vring buffers
167+
- description: region reserved for firmware image sections
168+
- description: Detailed layout
169+
items:
170+
- description: region used for dynamic DMA allocations like vrings and
171+
vring buffers
172+
- description: region reserved for IPC resources
173+
- description: LPM FS stub binary
174+
- description: LPM metadata
175+
- description: LPM FS context data and reserved sections
176+
- description: DM RM/PM trace and firmware code/data
177+
178+
memory-region-names:
179+
description: |
180+
Names for the memory regions specified in the memory-region property.
181+
The names must correspond with the entries in memory-region.
182+
oneOf:
183+
- description: Basic layout
184+
items:
185+
- const: dma
186+
- const: firmware
187+
- description: Detailed layout
188+
items:
189+
- const: dma
190+
- const: ipc
191+
- const: lpm-stub
192+
- const: lpm-metadata
193+
- const: lpm-context
194+
- const: dm-firmware
168195

169196
# Optional properties:
170197
# --------------------
@@ -218,6 +245,13 @@ patternProperties:
218245
- resets
219246
- firmware-name
220247

248+
if:
249+
required:
250+
- memory-region
251+
then:
252+
required:
253+
- memory-region-names
254+
221255
unevaluatedProperties: false
222256

223257
allOf:
@@ -321,6 +355,7 @@ examples:
321355
mboxes = <&mailbox0 &mbox_mcu_r5fss0_core0>;
322356
memory-region = <&mcu_r5fss0_core0_dma_memory_region>,
323357
<&mcu_r5fss0_core0_memory_region>;
358+
memory-region-names = "dma", "firmware";
324359
sram = <&mcu_r5fss0_core0_sram>;
325360
};
326361

0 commit comments

Comments
 (0)