Skip to content

Commit 2b8e3fa

Browse files
committed
Merge tag 'powerpc-7.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fixes from Madhavan Srinivasan: - Correct MSI allocation tracking - Always use 64 bits PTE for powerpc/e500 - Fix inline assembly for clang build on PPC32 - Fixes for clang build issues in powerpc64/ftrace - Fixes for powerpc64/bpf JIT and tailcall support - Cleanup MPC83XX devicetrees - Fix keymile vendor prefix - Fix to use big-endian types for crash variables Thanks to Abhishek Dubey, Christophe Leroy (CS GROUP), Hari Bathini, Heiko Schocher, J. Neuschäfer, Mahesh Salgaonkar, Nam Cao, Nilay Shroff, Rob Herring (Arm), Saket Kumar Bhaskar, Sourabh Jain, Stan Johnson, and Venkat Rao Bagalkote. * tag 'powerpc-7.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (23 commits) powerpc/pseries: Correct MSI allocation tracking powerpc: dts: mpc83xx: Add unit addresses to /memory powerpc: dts: mpc8315erdb: Add missing #cells properties to SPI bus powerpc: dts: mpc8315erdb: Rename LED nodes to comply with schema powerpc: dts: mpc8315erdb: Use IRQ_TYPE_* macros powerpc: dts: mpc8313erdb: Use IRQ_TYPE_* macros powerpc: 83xx: km83xx: Fix keymile vendor prefix dt-bindings: powerpc: Add Freescale/NXP MPC83xx SoCs powerpc64/bpf: fix kfunc call support powerpc64/bpf: fix handling of BPF stack in exception callback powerpc64/bpf: remove BPF redzone protection in trampoline stack powerpc64/bpf: use consistent tailcall offset in trampoline powerpc64/bpf: fix the address returned by bpf_get_func_ip powerpc64/bpf: do not increment tailcall count when prog is NULL powerpc64/ftrace: workaround clang recording GEP in __patchable_function_entries powerpc64/ftrace: fix OOL stub count with clang powerpc64: make clang cross-build friendly powerpc/crash: adjust the elfcorehdr size powerpc/kexec/core: use big-endian types for crash variables powerpc/prom_init: Fixup missing #size-cells on PowerMac media-bay nodes ...
2 parents b29fb88 + 35e4f2a commit 2b8e3fa

35 files changed

Lines changed: 460 additions & 661 deletions
Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/powerpc/fsl/fsl,mpc83xx.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Freescale PowerQUICC II Pro (MPC83xx) platforms
8+
9+
maintainers:
10+
- J. Neuschäfer <[email protected]>
11+
12+
properties:
13+
$nodename:
14+
const: '/'
15+
compatible:
16+
oneOf:
17+
- description: MPC83xx Reference Design Boards
18+
items:
19+
- enum:
20+
- fsl,mpc8308rdb
21+
- fsl,mpc8315erdb
22+
- fsl,mpc8360rdk
23+
- fsl,mpc8377rdb
24+
- fsl,mpc8377wlan
25+
- fsl,mpc8378rdb
26+
- fsl,mpc8379rdb
27+
28+
- description: MPC8313E Reference Design Board
29+
items:
30+
- const: MPC8313ERDB
31+
- const: MPC831xRDB
32+
- const: MPC83xxRDB
33+
34+
- description: MPC8323E Reference Design Board
35+
items:
36+
- const: MPC8323ERDB
37+
- const: MPC832xRDB
38+
- const: MPC83xxRDB
39+
40+
- description: MPC8349E-mITX(-GP) Reference Design Platform
41+
items:
42+
- enum:
43+
- MPC8349EMITX
44+
- MPC8349EMITXGP
45+
- const: MPC834xMITX
46+
- const: MPC83xxMITX
47+
48+
- description: Keymile KMETER1 board
49+
const: keymile,KMETER1
50+
51+
- description: MPC8308 P1M board
52+
const: denx,mpc8308_p1m
53+
54+
patternProperties:
55+
"^soc@.*$":
56+
type: object
57+
properties:
58+
compatible:
59+
oneOf:
60+
- items:
61+
- enum:
62+
- fsl,mpc8315-immr
63+
- fsl,mpc8308-immr
64+
- const: simple-bus
65+
- items:
66+
- const: fsl,mpc8360-immr
67+
- const: fsl,immr
68+
- const: fsl,soc
69+
- const: simple-bus
70+
- const: simple-bus
71+
72+
additionalProperties: true
73+
74+
examples:
75+
- |
76+
/ {
77+
compatible = "fsl,mpc8315erdb";
78+
model = "MPC8315E-RDB";
79+
#address-cells = <1>;
80+
#size-cells = <1>;
81+
82+
soc@e0000000 {
83+
compatible = "fsl,mpc8315-immr", "simple-bus";
84+
reg = <0xe0000000 0x00000200>;
85+
#address-cells = <1>;
86+
#size-cells = <1>;
87+
device_type = "soc";
88+
ranges = <0 0xe0000000 0x00100000>;
89+
bus-frequency = <0>;
90+
};
91+
};
92+
93+
...

arch/powerpc/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -573,8 +573,8 @@ config ARCH_USING_PATCHABLE_FUNCTION_ENTRY
573573
depends on FUNCTION_TRACER && (PPC32 || PPC64_ELF_ABI_V2)
574574
depends on $(cc-option,-fpatchable-function-entry=2)
575575
def_bool y if PPC32
576-
def_bool $(success,$(srctree)/arch/powerpc/tools/gcc-check-fpatchable-function-entry.sh $(CC) -mlittle-endian) if PPC64 && CPU_LITTLE_ENDIAN
577-
def_bool $(success,$(srctree)/arch/powerpc/tools/gcc-check-fpatchable-function-entry.sh $(CC) -mbig-endian) if PPC64 && CPU_BIG_ENDIAN
576+
def_bool $(success,$(srctree)/arch/powerpc/tools/check-fpatchable-function-entry.sh $(CC) $(CLANG_FLAGS) -mlittle-endian) if PPC64 && CPU_LITTLE_ENDIAN
577+
def_bool $(success,$(srctree)/arch/powerpc/tools/check-fpatchable-function-entry.sh $(CC) -mbig-endian) if PPC64 && CPU_BIG_ENDIAN
578578

579579
config PPC_FTRACE_OUT_OF_LINE
580580
def_bool PPC64 && ARCH_USING_PATCHABLE_FUNCTION_ENTRY

arch/powerpc/boot/dts/asp834x-redboot.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
};
3838
};
3939

40-
memory {
40+
memory@0 {
4141
device_type = "memory";
4242
reg = <0x00000000 0x8000000>; // 128MB at 0
4343
};

arch/powerpc/boot/dts/fsl/interlaken-lac-portals.dtsi

Lines changed: 0 additions & 156 deletions
This file was deleted.

arch/powerpc/boot/dts/fsl/interlaken-lac.dtsi

Lines changed: 0 additions & 45 deletions
This file was deleted.

arch/powerpc/boot/dts/fsl/pq3-mpic-message-B.dtsi

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)