From ac05ed73efd978d8cb7d89afdc67b97bc37ae668 Mon Sep 17 00:00:00 2001 From: Jianxin Pan Date: Wed, 3 Apr 2019 18:53:20 +0800 Subject: [PATCH] debug: enable ftrace_ramoops [1/2] PD#SWPL-6028 Problem: enable ftrce in ramoops Solution: enable ftrce in ramoops Verify: u200 Change-Id: I2403bf82c342416b7c34f2115b14dce623406997 Signed-off-by: Jianxin Pan Conflicts: arch/arm/boot/dts/amlogic/axg_s400_v03gva.dts arch/arm/boot/dts/amlogic/axg_s400emmc_512m.dts arch/arm/boot/dts/amlogic/tl1_t962x2_skt.dts arch/arm/boot/dts/amlogic/tl1_t962x2_t309.dts --- arch/arm/boot/dts/amlogic/atom.dts | 3 +-- arch/arm/boot/dts/amlogic/axg_a113d_skt.dts | 3 +-- arch/arm/boot/dts/amlogic/axg_a113x_skt.dts | 3 +-- arch/arm/boot/dts/amlogic/axg_s400.dts | 3 +-- arch/arm/boot/dts/amlogic/axg_s400_v03.dts | 3 +-- arch/arm/boot/dts/amlogic/axg_s400_v03sbr.dts | 3 +-- arch/arm/boot/dts/amlogic/axg_s420.dts | 3 +-- arch/arm/boot/dts/amlogic/axg_s420_v03.dts | 3 +-- arch/arm/boot/dts/amlogic/axg_s420_v03gva.dts | 3 +-- arch/arm/boot/dts/amlogic/g12a_s905d2_skt.dts | 3 +-- arch/arm/boot/dts/amlogic/g12a_s905d2_u200.dts | 3 +-- arch/arm/boot/dts/amlogic/g12a_s905d2_u200_1g.dts | 3 +-- arch/arm/boot/dts/amlogic/g12a_s905x2_u211.dts | 3 +-- arch/arm/boot/dts/amlogic/g12a_s905x2_u211_1g.dts | 3 +-- arch/arm/boot/dts/amlogic/g12a_s905x2_u211_512m.dts | 3 +-- arch/arm/boot/dts/amlogic/g12a_s905x2_u212.dts | 3 +-- arch/arm/boot/dts/amlogic/g12a_s905x2_u212_1g.dts | 3 +-- arch/arm/boot/dts/amlogic/g12a_s905y2_u220.dts | 3 +-- arch/arm/boot/dts/amlogic/g12b_a311d_skt.dts | 3 +-- arch/arm/boot/dts/amlogic/g12b_a311d_w400.dts | 3 +-- arch/arm/boot/dts/amlogic/g12b_a311d_w400_a.dts | 3 +-- arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot.dts | 3 +-- arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_a.dts | 3 +-- .../dts/amlogic/g12b_a311d_w400_buildroot_vccktest.dts | 4 +--- .../dts/amlogic/g12b_a311d_w400_buildroot_vccktest_a.dts | 3 +-- .../boot/dts/amlogic/g12b_a311d_w400_drm_buildroot.dts | 3 +-- arch/arm/boot/dts/amlogic/gxl_p212_2g.dts | 4 ++-- arch/arm/boot/dts/amlogic/gxl_p230_2g.dts | 3 +-- arch/arm/boot/dts/amlogic/gxl_p230_2g_buildroot.dts | 4 +--- arch/arm/boot/dts/amlogic/gxl_p231_1g.dts | 3 +-- arch/arm/boot/dts/amlogic/gxl_p231_2g.dts | 3 +-- arch/arm/boot/dts/amlogic/gxl_p231_2g_buildroot.dts | 3 +-- arch/arm/boot/dts/amlogic/gxl_p241_1g.dts | 3 +-- arch/arm/boot/dts/amlogic/gxl_p241_1g_buildroot.dts | 3 +-- arch/arm/boot/dts/amlogic/gxl_p241_v2-1g.dts | 3 +-- arch/arm/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts | 3 +-- arch/arm/boot/dts/amlogic/gxl_p400_2g.dts | 3 +-- arch/arm/boot/dts/amlogic/gxl_p401_2g.dts | 3 +-- arch/arm/boot/dts/amlogic/gxl_sei210_2g.dts | 3 +-- arch/arm/boot/dts/amlogic/gxm_q200_2g.dts | 3 +-- arch/arm/boot/dts/amlogic/gxm_q200_2g_buildroot.dts | 3 +-- arch/arm/boot/dts/amlogic/gxm_q201_1g.dts | 5 ++--- arch/arm/boot/dts/amlogic/gxm_q201_2g.dts | 3 +-- arch/arm/boot/dts/amlogic/gxm_skt.dts | 3 +-- arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts | 2 +- arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts | 2 +- arch/arm/boot/dts/amlogic/tl1_t962x2_skt.dts | 8 ++++++++ arch/arm/boot/dts/amlogic/tl1_t962x2_t309.dts | 8 ++++++++ arch/arm/boot/dts/amlogic/txlx_t962e_r321.dts | 3 +-- arch/arm/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts | 3 +-- arch/arm/boot/dts/amlogic/txlx_t962x_r311_2g.dts | 3 +-- arch/arm/boot/dts/amlogic/txlx_t962x_r311_720p.dts | 3 +-- arch/arm/boot/dts/amlogic/txlx_t962x_r314.dts | 3 +-- arch/arm/configs/meson64_a32_defconfig | 4 ++-- arch/arm64/boot/dts/amlogic/atom.dts | 3 +-- arch/arm64/boot/dts/amlogic/axg_a113d_skt.dts | 5 ++--- arch/arm64/boot/dts/amlogic/axg_a113x_skt.dts | 3 +-- arch/arm64/boot/dts/amlogic/axg_s400.dts | 3 +-- arch/arm64/boot/dts/amlogic/axg_s400_v03.dts | 3 +-- arch/arm64/boot/dts/amlogic/axg_s400_v03gva.dts | 3 +-- arch/arm64/boot/dts/amlogic/axg_s400_v03sbr.dts | 3 +-- arch/arm64/boot/dts/amlogic/axg_s400emmc_512m.dts | 3 +-- arch/arm64/boot/dts/amlogic/axg_s420.dts | 3 +-- arch/arm64/boot/dts/amlogic/axg_s420_v03.dts | 3 +-- arch/arm64/boot/dts/amlogic/axg_s420_v03gva.dts | 3 +-- arch/arm64/boot/dts/amlogic/g12a_s905d2_skt.dts | 3 +-- arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts | 4 ++-- arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_1g.dts | 5 ++--- arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts | 3 +-- arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_1g.dts | 3 +-- arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_512m.dts | 3 +-- arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts | 3 +-- arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_1g.dts | 3 +-- arch/arm64/boot/dts/amlogic/g12a_s905y2_u220.dts | 3 +-- arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts | 3 +-- arch/arm64/boot/dts/amlogic/g12b_a311d_skt_a.dts | 3 +-- arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts | 3 +-- arch/arm64/boot/dts/amlogic/g12b_a311d_w400_a.dts | 3 +-- arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot.dts | 3 +-- .../boot/dts/amlogic/g12b_a311d_w400_buildroot_a.dts | 3 +-- .../dts/amlogic/g12b_a311d_w400_buildroot_vccktest.dts | 3 +-- .../dts/amlogic/g12b_a311d_w400_buildroot_vccktest_a.dts | 3 +-- .../boot/dts/amlogic/g12b_a311d_w400_drm_buildroot.dts | 3 +-- arch/arm64/boot/dts/amlogic/g12b_a311x_w411_buildroot.dts | 3 +-- .../boot/dts/amlogic/g12b_a311x_w411_buildroot_a.dts | 3 +-- arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts | 3 +-- arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts | 3 +-- arch/arm64/boot/dts/amlogic/gxl_p230_2g_buildroot.dts | 3 +-- arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts | 3 +-- arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts | 3 +-- arch/arm64/boot/dts/amlogic/gxl_p231_2g_buildroot.dts | 3 +-- arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts | 3 +-- arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts | 3 +-- arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts | 3 +-- arch/arm64/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts | 3 +-- arch/arm64/boot/dts/amlogic/gxl_p400_2g.dts | 3 +-- arch/arm64/boot/dts/amlogic/gxl_p401_2g.dts | 3 +-- arch/arm64/boot/dts/amlogic/gxl_sei210_2g.dts | 3 +-- arch/arm64/boot/dts/amlogic/gxm_q200_2g.dts | 3 +-- arch/arm64/boot/dts/amlogic/gxm_q200_2g_buildroot.dts | 3 +-- arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts | 5 ++--- arch/arm64/boot/dts/amlogic/gxm_q201_2g.dts | 3 +-- arch/arm64/boot/dts/amlogic/gxm_skt.dts | 3 +-- arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts | 2 +- arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts | 2 +- arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts | 3 +-- arch/arm64/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts | 3 +-- arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts | 3 +-- arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts | 3 +-- arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts | 3 +-- arch/arm64/boot/dts/amlogic/txlx_t962x_r314.dts | 3 +-- arch/arm64/configs/meson64_defconfig | 1 + 112 files changed, 133 insertions(+), 220 deletions(-) diff --git a/arch/arm/boot/dts/amlogic/atom.dts b/arch/arm/boot/dts/amlogic/atom.dts index b2a9b477dc26..84357efa8f38 100644 --- a/arch/arm/boot/dts/amlogic/atom.dts +++ b/arch/arm/boot/dts/amlogic/atom.dts @@ -58,8 +58,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { compatible = "shared-dma-pool"; diff --git a/arch/arm/boot/dts/amlogic/axg_a113d_skt.dts b/arch/arm/boot/dts/amlogic/axg_a113d_skt.dts index a43193324bcf..0b3b51ccfd3e 100644 --- a/arch/arm/boot/dts/amlogic/axg_a113d_skt.dts +++ b/arch/arm/boot/dts/amlogic/axg_a113d_skt.dts @@ -49,8 +49,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm/boot/dts/amlogic/axg_a113x_skt.dts b/arch/arm/boot/dts/amlogic/axg_a113x_skt.dts index 1902ef3d8ac0..5d7728f24089 100644 --- a/arch/arm/boot/dts/amlogic/axg_a113x_skt.dts +++ b/arch/arm/boot/dts/amlogic/axg_a113x_skt.dts @@ -47,8 +47,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm/boot/dts/amlogic/axg_s400.dts b/arch/arm/boot/dts/amlogic/axg_s400.dts index 3884ee3256c9..06011dbf03e1 100644 --- a/arch/arm/boot/dts/amlogic/axg_s400.dts +++ b/arch/arm/boot/dts/amlogic/axg_s400.dts @@ -47,8 +47,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm/boot/dts/amlogic/axg_s400_v03.dts b/arch/arm/boot/dts/amlogic/axg_s400_v03.dts index d8cf6fd0d07b..8fe15edbbc6f 100644 --- a/arch/arm/boot/dts/amlogic/axg_s400_v03.dts +++ b/arch/arm/boot/dts/amlogic/axg_s400_v03.dts @@ -47,8 +47,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm/boot/dts/amlogic/axg_s400_v03sbr.dts b/arch/arm/boot/dts/amlogic/axg_s400_v03sbr.dts index b09543d0e9dc..3f5ae0fec5b5 100644 --- a/arch/arm/boot/dts/amlogic/axg_s400_v03sbr.dts +++ b/arch/arm/boot/dts/amlogic/axg_s400_v03sbr.dts @@ -47,8 +47,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm/boot/dts/amlogic/axg_s420.dts b/arch/arm/boot/dts/amlogic/axg_s420.dts index 104e35fa2746..fda588bb3b3e 100644 --- a/arch/arm/boot/dts/amlogic/axg_s420.dts +++ b/arch/arm/boot/dts/amlogic/axg_s420.dts @@ -47,8 +47,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm/boot/dts/amlogic/axg_s420_v03.dts b/arch/arm/boot/dts/amlogic/axg_s420_v03.dts index f9da32c0821a..05ab48dde9d9 100644 --- a/arch/arm/boot/dts/amlogic/axg_s420_v03.dts +++ b/arch/arm/boot/dts/amlogic/axg_s420_v03.dts @@ -47,8 +47,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm/boot/dts/amlogic/axg_s420_v03gva.dts b/arch/arm/boot/dts/amlogic/axg_s420_v03gva.dts index f49e3e48a097..83595b360b8b 100644 --- a/arch/arm/boot/dts/amlogic/axg_s420_v03gva.dts +++ b/arch/arm/boot/dts/amlogic/axg_s420_v03gva.dts @@ -47,8 +47,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm/boot/dts/amlogic/g12a_s905d2_skt.dts b/arch/arm/boot/dts/amlogic/g12a_s905d2_skt.dts index d6686825d721..3ce2558e9538 100644 --- a/arch/arm/boot/dts/amlogic/g12a_s905d2_skt.dts +++ b/arch/arm/boot/dts/amlogic/g12a_s905d2_skt.dts @@ -59,8 +59,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm/boot/dts/amlogic/g12a_s905d2_u200.dts b/arch/arm/boot/dts/amlogic/g12a_s905d2_u200.dts index 837e58fc94ad..39979b7caf8e 100644 --- a/arch/arm/boot/dts/amlogic/g12a_s905d2_u200.dts +++ b/arch/arm/boot/dts/amlogic/g12a_s905d2_u200.dts @@ -59,8 +59,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_1g.dts b/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_1g.dts index ecdcd1315023..6fd0b595c93e 100644 --- a/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_1g.dts +++ b/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_1g.dts @@ -59,8 +59,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm/boot/dts/amlogic/g12a_s905x2_u211.dts b/arch/arm/boot/dts/amlogic/g12a_s905x2_u211.dts index 71e37476bb39..e15e7125e640 100644 --- a/arch/arm/boot/dts/amlogic/g12a_s905x2_u211.dts +++ b/arch/arm/boot/dts/amlogic/g12a_s905x2_u211.dts @@ -58,8 +58,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm/boot/dts/amlogic/g12a_s905x2_u211_1g.dts b/arch/arm/boot/dts/amlogic/g12a_s905x2_u211_1g.dts index dd99fd41ab3a..b38fec03dbd2 100644 --- a/arch/arm/boot/dts/amlogic/g12a_s905x2_u211_1g.dts +++ b/arch/arm/boot/dts/amlogic/g12a_s905x2_u211_1g.dts @@ -59,8 +59,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm/boot/dts/amlogic/g12a_s905x2_u211_512m.dts b/arch/arm/boot/dts/amlogic/g12a_s905x2_u211_512m.dts index c31fe1f97d92..ef84c49e8ecd 100644 --- a/arch/arm/boot/dts/amlogic/g12a_s905x2_u211_512m.dts +++ b/arch/arm/boot/dts/amlogic/g12a_s905x2_u211_512m.dts @@ -57,8 +57,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm/boot/dts/amlogic/g12a_s905x2_u212.dts b/arch/arm/boot/dts/amlogic/g12a_s905x2_u212.dts index 4e52524afaba..fdaeda8ca429 100644 --- a/arch/arm/boot/dts/amlogic/g12a_s905x2_u212.dts +++ b/arch/arm/boot/dts/amlogic/g12a_s905x2_u212.dts @@ -58,8 +58,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm/boot/dts/amlogic/g12a_s905x2_u212_1g.dts b/arch/arm/boot/dts/amlogic/g12a_s905x2_u212_1g.dts index 7705079df6d7..f9e7e6c2a43b 100644 --- a/arch/arm/boot/dts/amlogic/g12a_s905x2_u212_1g.dts +++ b/arch/arm/boot/dts/amlogic/g12a_s905x2_u212_1g.dts @@ -59,8 +59,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm/boot/dts/amlogic/g12a_s905y2_u220.dts b/arch/arm/boot/dts/amlogic/g12a_s905y2_u220.dts index b7a1be3a9273..631b434a2a04 100644 --- a/arch/arm/boot/dts/amlogic/g12a_s905y2_u220.dts +++ b/arch/arm/boot/dts/amlogic/g12a_s905y2_u220.dts @@ -57,8 +57,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm/boot/dts/amlogic/g12b_a311d_skt.dts b/arch/arm/boot/dts/amlogic/g12b_a311d_skt.dts index a88a2dd1f28c..69825190259d 100644 --- a/arch/arm/boot/dts/amlogic/g12b_a311d_skt.dts +++ b/arch/arm/boot/dts/amlogic/g12b_a311d_skt.dts @@ -59,8 +59,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm/boot/dts/amlogic/g12b_a311d_w400.dts b/arch/arm/boot/dts/amlogic/g12b_a311d_w400.dts index 918d73b5fa97..0a4eece69d97 100644 --- a/arch/arm/boot/dts/amlogic/g12b_a311d_w400.dts +++ b/arch/arm/boot/dts/amlogic/g12b_a311d_w400.dts @@ -59,8 +59,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_a.dts b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_a.dts index 6d9492cd2aa8..f92c26d42cf6 100644 --- a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_a.dts +++ b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_a.dts @@ -59,8 +59,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot.dts b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot.dts index b89aaa40a1df..c1b36a44699f 100644 --- a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot.dts +++ b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot.dts @@ -58,8 +58,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_a.dts b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_a.dts index 83510bc0c0ee..c972c12c8a58 100644 --- a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_a.dts +++ b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_a.dts @@ -58,8 +58,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest.dts b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest.dts index aac22ee9e0b5..8e469c08a44d 100644 --- a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest.dts +++ b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest.dts @@ -58,10 +58,8 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; - secmon_reserved:linux,secmon { compatible = "shared-dma-pool"; reusable; diff --git a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest_a.dts b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest_a.dts index 202c6190596e..7edfad7e86b7 100644 --- a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest_a.dts +++ b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest_a.dts @@ -58,8 +58,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_drm_buildroot.dts b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_drm_buildroot.dts index e3f43063fe27..10b88c0b4f98 100644 --- a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_drm_buildroot.dts +++ b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_drm_buildroot.dts @@ -59,8 +59,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm/boot/dts/amlogic/gxl_p212_2g.dts b/arch/arm/boot/dts/amlogic/gxl_p212_2g.dts index c03256ed4713..336df9026d36 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p212_2g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p212_2g.dts @@ -56,9 +56,9 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; + secmon_reserved:linux,secmon { compatible = "shared-dma-pool"; reusable; diff --git a/arch/arm/boot/dts/amlogic/gxl_p230_2g.dts b/arch/arm/boot/dts/amlogic/gxl_p230_2g.dts index c1944cc88ba5..fe328fc6093f 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p230_2g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p230_2g.dts @@ -56,8 +56,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { compatible = "shared-dma-pool"; diff --git a/arch/arm/boot/dts/amlogic/gxl_p230_2g_buildroot.dts b/arch/arm/boot/dts/amlogic/gxl_p230_2g_buildroot.dts index bdb46750131d..535dd4e5bf46 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p230_2g_buildroot.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p230_2g_buildroot.dts @@ -56,10 +56,8 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; - secmon_reserved:linux,secmon { compatible = "shared-dma-pool"; reusable; diff --git a/arch/arm/boot/dts/amlogic/gxl_p231_1g.dts b/arch/arm/boot/dts/amlogic/gxl_p231_1g.dts index 5fdbc780e00e..de8e236c9d66 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p231_1g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p231_1g.dts @@ -56,8 +56,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm/boot/dts/amlogic/gxl_p231_2g.dts b/arch/arm/boot/dts/amlogic/gxl_p231_2g.dts index 0a35a0dfe4f7..396c7592ebd4 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p231_2g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p231_2g.dts @@ -56,8 +56,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm/boot/dts/amlogic/gxl_p231_2g_buildroot.dts b/arch/arm/boot/dts/amlogic/gxl_p231_2g_buildroot.dts index 2365af310a9a..5fb51e8e1171 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p231_2g_buildroot.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p231_2g_buildroot.dts @@ -53,8 +53,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm/boot/dts/amlogic/gxl_p241_1g.dts b/arch/arm/boot/dts/amlogic/gxl_p241_1g.dts index feab09e7e205..5aa26fa17678 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p241_1g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p241_1g.dts @@ -55,8 +55,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm/boot/dts/amlogic/gxl_p241_1g_buildroot.dts b/arch/arm/boot/dts/amlogic/gxl_p241_1g_buildroot.dts index af46fd2edaec..b3c37a77262e 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p241_1g_buildroot.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p241_1g_buildroot.dts @@ -55,8 +55,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm/boot/dts/amlogic/gxl_p241_v2-1g.dts b/arch/arm/boot/dts/amlogic/gxl_p241_v2-1g.dts index aa85f76b0ef2..99991056161b 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p241_v2-1g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p241_v2-1g.dts @@ -55,8 +55,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts b/arch/arm/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts index bd8fa63f3cc1..102e11007bba 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts @@ -55,8 +55,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm/boot/dts/amlogic/gxl_p400_2g.dts b/arch/arm/boot/dts/amlogic/gxl_p400_2g.dts index 46a4b3276009..2e82adb434d6 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p400_2g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p400_2g.dts @@ -51,8 +51,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm/boot/dts/amlogic/gxl_p401_2g.dts b/arch/arm/boot/dts/amlogic/gxl_p401_2g.dts index 2bb9708797db..8fa3a3f97578 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p401_2g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p401_2g.dts @@ -51,8 +51,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm/boot/dts/amlogic/gxl_sei210_2g.dts b/arch/arm/boot/dts/amlogic/gxl_sei210_2g.dts index f68747e8b572..e7468cd8a789 100644 --- a/arch/arm/boot/dts/amlogic/gxl_sei210_2g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_sei210_2g.dts @@ -56,8 +56,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { compatible = "shared-dma-pool"; diff --git a/arch/arm/boot/dts/amlogic/gxm_q200_2g.dts b/arch/arm/boot/dts/amlogic/gxm_q200_2g.dts index 722771f0e370..78687fb85166 100644 --- a/arch/arm/boot/dts/amlogic/gxm_q200_2g.dts +++ b/arch/arm/boot/dts/amlogic/gxm_q200_2g.dts @@ -55,8 +55,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { compatible = "shared-dma-pool"; diff --git a/arch/arm/boot/dts/amlogic/gxm_q200_2g_buildroot.dts b/arch/arm/boot/dts/amlogic/gxm_q200_2g_buildroot.dts index e695359c349b..32725adaacfd 100644 --- a/arch/arm/boot/dts/amlogic/gxm_q200_2g_buildroot.dts +++ b/arch/arm/boot/dts/amlogic/gxm_q200_2g_buildroot.dts @@ -54,8 +54,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm/boot/dts/amlogic/gxm_q201_1g.dts b/arch/arm/boot/dts/amlogic/gxm_q201_1g.dts index c1ac3945fdd6..46823dce61e4 100644 --- a/arch/arm/boot/dts/amlogic/gxm_q201_1g.dts +++ b/arch/arm/boot/dts/amlogic/gxm_q201_1g.dts @@ -55,9 +55,8 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; -}; + ftrace-size = <0x20000>; + }; secmon_reserved:linux,secmon { compatible = "shared-dma-pool"; diff --git a/arch/arm/boot/dts/amlogic/gxm_q201_2g.dts b/arch/arm/boot/dts/amlogic/gxm_q201_2g.dts index b70073f2e5c6..0b77e079f71c 100644 --- a/arch/arm/boot/dts/amlogic/gxm_q201_2g.dts +++ b/arch/arm/boot/dts/amlogic/gxm_q201_2g.dts @@ -55,8 +55,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm/boot/dts/amlogic/gxm_skt.dts b/arch/arm/boot/dts/amlogic/gxm_skt.dts index b6ff2bba3430..4eba9826cd4a 100644 --- a/arch/arm/boot/dts/amlogic/gxm_skt.dts +++ b/arch/arm/boot/dts/amlogic/gxm_skt.dts @@ -55,8 +55,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts index b946f2c46727..e6cf660d0bb3 100644 --- a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts +++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts @@ -59,7 +59,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; + ftrace-size = <0x20000>; pmsg-size = <0x8000>; }; diff --git a/arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts b/arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts index 0dbf2b0d1d2d..0169f2515c98 100644 --- a/arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts +++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts @@ -59,7 +59,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; + ftrace-size = <0x20000>; pmsg-size = <0x8000>; }; diff --git a/arch/arm/boot/dts/amlogic/tl1_t962x2_skt.dts b/arch/arm/boot/dts/amlogic/tl1_t962x2_skt.dts index e6b01cbda6e9..94ff98893b71 100644 --- a/arch/arm/boot/dts/amlogic/tl1_t962x2_skt.dts +++ b/arch/arm/boot/dts/amlogic/tl1_t962x2_skt.dts @@ -51,6 +51,14 @@ #size-cells = <1>; ranges; /* global autoconfigured region for contiguous allocations */ + ramoops@0x07400000 { + compatible = "ramoops"; + reg = <0x07400000 0x00100000>; + record-size = <0x8000>; + console-size = <0x8000>; + ftrace-size = <0x20000>; + }; + secmon_reserved: linux,secmon { compatible = "shared-dma-pool"; reusable; diff --git a/arch/arm/boot/dts/amlogic/tl1_t962x2_t309.dts b/arch/arm/boot/dts/amlogic/tl1_t962x2_t309.dts index 36f7b0916a55..e75ca27909e0 100644 --- a/arch/arm/boot/dts/amlogic/tl1_t962x2_t309.dts +++ b/arch/arm/boot/dts/amlogic/tl1_t962x2_t309.dts @@ -52,6 +52,14 @@ #size-cells = <1>; ranges; /* global autoconfigured region for contiguous allocations */ + ramoops@0x07400000 { + compatible = "ramoops"; + reg = <0x07400000 0x00100000>; + record-size = <0x8000>; + console-size = <0x8000>; + ftrace-size = <0x20000>; + }; + secmon_reserved: linux,secmon { compatible = "shared-dma-pool"; reusable; diff --git a/arch/arm/boot/dts/amlogic/txlx_t962e_r321.dts b/arch/arm/boot/dts/amlogic/txlx_t962e_r321.dts index 852b21a3a12e..64ab38cfbda2 100644 --- a/arch/arm/boot/dts/amlogic/txlx_t962e_r321.dts +++ b/arch/arm/boot/dts/amlogic/txlx_t962e_r321.dts @@ -58,8 +58,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { compatible = "shared-dma-pool"; diff --git a/arch/arm/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts b/arch/arm/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts index 7567223a9e31..5b9852267027 100644 --- a/arch/arm/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts +++ b/arch/arm/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts @@ -57,8 +57,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm/boot/dts/amlogic/txlx_t962x_r311_2g.dts b/arch/arm/boot/dts/amlogic/txlx_t962x_r311_2g.dts index ead887e15a43..600835e2d8e9 100644 --- a/arch/arm/boot/dts/amlogic/txlx_t962x_r311_2g.dts +++ b/arch/arm/boot/dts/amlogic/txlx_t962x_r311_2g.dts @@ -61,8 +61,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { compatible = "shared-dma-pool"; diff --git a/arch/arm/boot/dts/amlogic/txlx_t962x_r311_720p.dts b/arch/arm/boot/dts/amlogic/txlx_t962x_r311_720p.dts index d5bb1f240177..d5e262d28dc8 100644 --- a/arch/arm/boot/dts/amlogic/txlx_t962x_r311_720p.dts +++ b/arch/arm/boot/dts/amlogic/txlx_t962x_r311_720p.dts @@ -59,8 +59,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { compatible = "shared-dma-pool"; diff --git a/arch/arm/boot/dts/amlogic/txlx_t962x_r314.dts b/arch/arm/boot/dts/amlogic/txlx_t962x_r314.dts index 3173d0411f70..10289ebbab0d 100644 --- a/arch/arm/boot/dts/amlogic/txlx_t962x_r314.dts +++ b/arch/arm/boot/dts/amlogic/txlx_t962x_r314.dts @@ -61,8 +61,7 @@ reg = <0x07400000 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { compatible = "shared-dma-pool"; diff --git a/arch/arm/configs/meson64_a32_defconfig b/arch/arm/configs/meson64_a32_defconfig index f07a46f44ceb..963dd38cbff3 100644 --- a/arch/arm/configs/meson64_a32_defconfig +++ b/arch/arm/configs/meson64_a32_defconfig @@ -489,10 +489,10 @@ CONFIG_AMLOGIC_SND_CODEC_PCM2BT=y CONFIG_AMLOGIC_SND_CODEC_PDM_DUMMY_CODEC=y CONFIG_AMLOGIC_SND_CODEC_AMLT9015=y CONFIG_AMLOGIC_SND_CODEC_AMLT9015S=y +CONFIG_AMLOGIC_SND_SOC_TAS5805=y CONFIG_AMLOGIC_SND_CODEC_TXLX_ACODEC=y CONFIG_AMLOGIC_SND_CODEC_TL1_ACODEC=y CONFIG_AMLOGIC_SND_SOC_TAS5707=y -CONFIG_AMLOGIC_SND_SOC_TAS5805=y CONFIG_AMLOGIC_SND_SOC_TLV320ADC3101=y CONFIG_AMLOGIC_SND_SOC_PCM186X=y CONFIG_AMLOGIC_SND_SOC_SSM3525=y @@ -597,6 +597,7 @@ CONFIG_SQUASHFS=y CONFIG_PSTORE=y CONFIG_PSTORE_CONSOLE=y CONFIG_PSTORE_PMSG=y +CONFIG_PSTORE_FTRACE=y CONFIG_PSTORE_RAM=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y @@ -625,7 +626,6 @@ CONFIG_LSM_MMAP_MIN_ADDR=0 CONFIG_HARDENED_USERCOPY=y CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SMACK=y -CONFIG_CRYPTO_CRYPTD=y CONFIG_CRYPTO_MICHAEL_MIC=y CONFIG_CRYPTO_SHA512=y CONFIG_CRYPTO_TWOFISH=y diff --git a/arch/arm64/boot/dts/amlogic/atom.dts b/arch/arm64/boot/dts/amlogic/atom.dts index 647052c5c84d..4021f1de6300 100644 --- a/arch/arm64/boot/dts/amlogic/atom.dts +++ b/arch/arm64/boot/dts/amlogic/atom.dts @@ -58,8 +58,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { compatible = "shared-dma-pool"; diff --git a/arch/arm64/boot/dts/amlogic/axg_a113d_skt.dts b/arch/arm64/boot/dts/amlogic/axg_a113d_skt.dts index e9f86802b3cc..3e052619aa8b 100644 --- a/arch/arm64/boot/dts/amlogic/axg_a113d_skt.dts +++ b/arch/arm64/boot/dts/amlogic/axg_a113d_skt.dts @@ -49,9 +49,8 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; -}; + ftrace-size = <0x20000>; + }; secmon_reserved:linux,secmon { compatible = "shared-dma-pool"; diff --git a/arch/arm64/boot/dts/amlogic/axg_a113x_skt.dts b/arch/arm64/boot/dts/amlogic/axg_a113x_skt.dts index d3407d8dd797..65a00e75f37f 100644 --- a/arch/arm64/boot/dts/amlogic/axg_a113x_skt.dts +++ b/arch/arm64/boot/dts/amlogic/axg_a113x_skt.dts @@ -47,8 +47,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm64/boot/dts/amlogic/axg_s400.dts b/arch/arm64/boot/dts/amlogic/axg_s400.dts index 4098f87e1557..58383abc24c8 100644 --- a/arch/arm64/boot/dts/amlogic/axg_s400.dts +++ b/arch/arm64/boot/dts/amlogic/axg_s400.dts @@ -47,8 +47,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm64/boot/dts/amlogic/axg_s400_v03.dts b/arch/arm64/boot/dts/amlogic/axg_s400_v03.dts index 25d394141807..ee09047cbdcb 100644 --- a/arch/arm64/boot/dts/amlogic/axg_s400_v03.dts +++ b/arch/arm64/boot/dts/amlogic/axg_s400_v03.dts @@ -47,8 +47,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm64/boot/dts/amlogic/axg_s400_v03gva.dts b/arch/arm64/boot/dts/amlogic/axg_s400_v03gva.dts index a2e2f418e02b..63336e786088 100644 --- a/arch/arm64/boot/dts/amlogic/axg_s400_v03gva.dts +++ b/arch/arm64/boot/dts/amlogic/axg_s400_v03gva.dts @@ -47,8 +47,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm64/boot/dts/amlogic/axg_s400_v03sbr.dts b/arch/arm64/boot/dts/amlogic/axg_s400_v03sbr.dts index 026f07e4e50b..c37f4f6e2677 100644 --- a/arch/arm64/boot/dts/amlogic/axg_s400_v03sbr.dts +++ b/arch/arm64/boot/dts/amlogic/axg_s400_v03sbr.dts @@ -47,8 +47,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm64/boot/dts/amlogic/axg_s400emmc_512m.dts b/arch/arm64/boot/dts/amlogic/axg_s400emmc_512m.dts index 6b30d540f730..445b84940a96 100644 --- a/arch/arm64/boot/dts/amlogic/axg_s400emmc_512m.dts +++ b/arch/arm64/boot/dts/amlogic/axg_s400emmc_512m.dts @@ -53,8 +53,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm64/boot/dts/amlogic/axg_s420.dts b/arch/arm64/boot/dts/amlogic/axg_s420.dts index ddc988d71ee9..6f1c708d9ea4 100644 --- a/arch/arm64/boot/dts/amlogic/axg_s420.dts +++ b/arch/arm64/boot/dts/amlogic/axg_s420.dts @@ -47,8 +47,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm64/boot/dts/amlogic/axg_s420_v03.dts b/arch/arm64/boot/dts/amlogic/axg_s420_v03.dts index b2ce78745814..6033259c5f37 100644 --- a/arch/arm64/boot/dts/amlogic/axg_s420_v03.dts +++ b/arch/arm64/boot/dts/amlogic/axg_s420_v03.dts @@ -47,8 +47,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm64/boot/dts/amlogic/axg_s420_v03gva.dts b/arch/arm64/boot/dts/amlogic/axg_s420_v03gva.dts index 08207f9e8c83..b01bb73f12be 100644 --- a/arch/arm64/boot/dts/amlogic/axg_s420_v03gva.dts +++ b/arch/arm64/boot/dts/amlogic/axg_s420_v03gva.dts @@ -47,8 +47,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt.dts index d0fb183d0632..76eb019352c5 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt.dts @@ -59,8 +59,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts index cd3d653df59f..639e2e62f50c 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts @@ -59,10 +59,10 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; + secmon_reserved:linux,secmon { compatible = "shared-dma-pool"; reusable; diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_1g.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_1g.dts index 996f192e1d0c..07b674175fb0 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_1g.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_1g.dts @@ -54,13 +54,12 @@ #size-cells = <2>; ranges; /* global autoconfigured region for contiguous allocations */ - ramoops@0x07400000 { + ramoops@0x07400000 { compatible = "ramoops"; reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts index 9b5b4d356673..08d52a09a004 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts @@ -58,8 +58,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_1g.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_1g.dts index dceafa0b02e4..1dce4d3bf867 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_1g.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_1g.dts @@ -59,8 +59,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_512m.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_512m.dts index 7b6d627a5c49..7e8d963e1e41 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_512m.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_512m.dts @@ -57,8 +57,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts index ae215a6fdb2c..23ed588c6b72 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts @@ -58,8 +58,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_1g.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_1g.dts index 81c1ecd44173..b742fe8b87a7 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_1g.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_1g.dts @@ -59,8 +59,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905y2_u220.dts b/arch/arm64/boot/dts/amlogic/g12a_s905y2_u220.dts index 722c9f53d9b4..738792decd23 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905y2_u220.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905y2_u220.dts @@ -57,8 +57,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts index 4e3d8fa3df25..171aec33996d 100644 --- a/arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts +++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts @@ -59,8 +59,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_skt_a.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_skt_a.dts index c3d6219323df..f20a7b708125 100644 --- a/arch/arm64/boot/dts/amlogic/g12b_a311d_skt_a.dts +++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_skt_a.dts @@ -59,8 +59,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts index f4ba4b707225..377595fcbffe 100644 --- a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts +++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts @@ -59,8 +59,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_a.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_a.dts index 078e1c1e3c33..7f1418567299 100644 --- a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_a.dts +++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_a.dts @@ -59,8 +59,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot.dts index daa12b9bbced..2ffeeab99849 100644 --- a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot.dts @@ -58,8 +58,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_a.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_a.dts index b91028e69e76..e86e01060d83 100644 --- a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_a.dts +++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_a.dts @@ -58,8 +58,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest.dts index 837925bafada..280a07ab75af 100644 --- a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest.dts +++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest.dts @@ -58,8 +58,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest_a.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest_a.dts index 0c406a175bfa..ac5ca3645b64 100644 --- a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest_a.dts +++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest_a.dts @@ -58,8 +58,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_drm_buildroot.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_drm_buildroot.dts index 4c8d1de14882..f22c04a4c4fa 100644 --- a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_drm_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_drm_buildroot.dts @@ -59,8 +59,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311x_w411_buildroot.dts b/arch/arm64/boot/dts/amlogic/g12b_a311x_w411_buildroot.dts index 47e9c788420e..63f6b0d72f9b 100644 --- a/arch/arm64/boot/dts/amlogic/g12b_a311x_w411_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/g12b_a311x_w411_buildroot.dts @@ -57,8 +57,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311x_w411_buildroot_a.dts b/arch/arm64/boot/dts/amlogic/g12b_a311x_w411_buildroot_a.dts index d6851e87a05e..a37936e0870b 100644 --- a/arch/arm64/boot/dts/amlogic/g12b_a311x_w411_buildroot_a.dts +++ b/arch/arm64/boot/dts/amlogic/g12b_a311x_w411_buildroot_a.dts @@ -57,8 +57,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts index df862e17defe..302ea680e67f 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts @@ -56,8 +56,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { compatible = "shared-dma-pool"; diff --git a/arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts index 101ad78b2091..6adc66fb6a92 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts @@ -56,8 +56,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { compatible = "shared-dma-pool"; diff --git a/arch/arm64/boot/dts/amlogic/gxl_p230_2g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxl_p230_2g_buildroot.dts index 5c38487443f2..841f7da52be9 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p230_2g_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p230_2g_buildroot.dts @@ -56,8 +56,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts b/arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts index 35b9af46f645..a7b5e439da75 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts @@ -56,8 +56,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts index a45c09ec3f90..db2416922a41 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts @@ -56,8 +56,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm64/boot/dts/amlogic/gxl_p231_2g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxl_p231_2g_buildroot.dts index 92f6e7d9ceef..b334aca4f65b 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p231_2g_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p231_2g_buildroot.dts @@ -53,8 +53,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts b/arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts index dadb59aed48a..66db66c9f860 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts @@ -55,8 +55,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts index 5d9833ba1592..854b833d2170 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p241_1g_buildroot.dts @@ -55,8 +55,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts b/arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts index f569d0799fc5..f915038df6cd 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts @@ -56,8 +56,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm64/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts index 6bfe499fead6..ca8d72a56763 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p241_v2_1g_buildroot.dts @@ -55,8 +55,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm64/boot/dts/amlogic/gxl_p400_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p400_2g.dts index bb6cc479e20c..41ce3a54edcc 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p400_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p400_2g.dts @@ -51,8 +51,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm64/boot/dts/amlogic/gxl_p401_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p401_2g.dts index f316571920da..e8555c961e91 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p401_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p401_2g.dts @@ -51,8 +51,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm64/boot/dts/amlogic/gxl_sei210_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_sei210_2g.dts index 5140780d2f7f..cf3440bfd7f8 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_sei210_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_sei210_2g.dts @@ -56,8 +56,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { compatible = "shared-dma-pool"; diff --git a/arch/arm64/boot/dts/amlogic/gxm_q200_2g.dts b/arch/arm64/boot/dts/amlogic/gxm_q200_2g.dts index d3bc6cd8c294..6bddb2bcd189 100644 --- a/arch/arm64/boot/dts/amlogic/gxm_q200_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxm_q200_2g.dts @@ -55,8 +55,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { compatible = "shared-dma-pool"; diff --git a/arch/arm64/boot/dts/amlogic/gxm_q200_2g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxm_q200_2g_buildroot.dts index e8dcafa47c2e..b5e51bcbd530 100644 --- a/arch/arm64/boot/dts/amlogic/gxm_q200_2g_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/gxm_q200_2g_buildroot.dts @@ -54,8 +54,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts b/arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts index 4e7b21493617..0340ebf2682f 100644 --- a/arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts +++ b/arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts @@ -55,9 +55,8 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; -}; + ftrace-size = <0x20000>; + }; secmon_reserved:linux,secmon { compatible = "shared-dma-pool"; diff --git a/arch/arm64/boot/dts/amlogic/gxm_q201_2g.dts b/arch/arm64/boot/dts/amlogic/gxm_q201_2g.dts index 9fc21ce39103..cde470e1fd8e 100644 --- a/arch/arm64/boot/dts/amlogic/gxm_q201_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxm_q201_2g.dts @@ -55,8 +55,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm64/boot/dts/amlogic/gxm_skt.dts b/arch/arm64/boot/dts/amlogic/gxm_skt.dts index 90dde409de72..148290c04da6 100644 --- a/arch/arm64/boot/dts/amlogic/gxm_skt.dts +++ b/arch/arm64/boot/dts/amlogic/gxm_skt.dts @@ -55,8 +55,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts index 86b4482d0a2d..438cd2c1ec8d 100644 --- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts +++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts @@ -59,7 +59,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; + ftrace-size = <0x20000>; pmsg-size = <0x8000>; }; diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts index f25c4a4a754a..a4f4f963a265 100644 --- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts +++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts @@ -59,7 +59,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; + ftrace-size = <0x20000>; pmsg-size = <0x8000>; }; diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts index b9bad6469003..d281ce3b80c0 100644 --- a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts +++ b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts @@ -58,8 +58,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { compatible = "shared-dma-pool"; diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts index 27d6b6ff27b6..c3030551b899 100644 --- a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321_buildroot.dts @@ -57,8 +57,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts index 994f158790d5..df6523b6500c 100644 --- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts +++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts @@ -61,8 +61,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { compatible = "shared-dma-pool"; diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts index 28bd90a38a98..95975254a527 100644 --- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts +++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts @@ -61,8 +61,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { compatible = "shared-dma-pool"; diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts index 1efc5e3fe69c..70d11b2dba28 100644 --- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts +++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts @@ -61,8 +61,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { compatible = "shared-dma-pool"; diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r314.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r314.dts index 3c25f458df97..3b1058718814 100644 --- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r314.dts +++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r314.dts @@ -61,8 +61,7 @@ reg = <0x0 0x07400000 0x0 0x00100000>; record-size = <0x8000>; console-size = <0x8000>; - ftrace-size = <0x0>; - pmsg-size = <0x8000>; + ftrace-size = <0x20000>; }; secmon_reserved:linux,secmon { compatible = "shared-dma-pool"; diff --git a/arch/arm64/configs/meson64_defconfig b/arch/arm64/configs/meson64_defconfig index 9fb51faf6dde..ddc21eb7bc80 100644 --- a/arch/arm64/configs/meson64_defconfig +++ b/arch/arm64/configs/meson64_defconfig @@ -588,6 +588,7 @@ CONFIG_SQUASHFS=y CONFIG_PSTORE=y CONFIG_PSTORE_CONSOLE=y CONFIG_PSTORE_PMSG=y +CONFIG_PSTORE_FTRACE=y CONFIG_PSTORE_RAM=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y