t23x: nv-public: Build android kdump DTBOs

Create dts files for enabling kdump
Separate android bootargs into header file

Bug 4652476

Change-Id: I357c6579da819316800c7fd33034788bcb77c3d2
Signed-off-by: Bhavik Joshi <bhavikj@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/device/hardware/nvidia/t23x-public-dts/+/3164575
Reviewed-by: svcacv <svcacv@nvidia.com>
GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
This commit is contained in:
Bhavik Joshi
2024-06-05 17:59:25 +00:00
committed by mobile promotions
parent e1a9d57a6e
commit 00d53f39f9
5 changed files with 89 additions and 2 deletions

View File

@@ -0,0 +1,22 @@
/*
* SPDX-FileCopyrightText: Copyright (c) 2024, NVIDIA CORPORATION. All rights reserved.
* SPDX-License-Identifier: LicenseRef-NvidiaProprietary
*
* NVIDIA Corporation and its licensors retain all intellectual property
* and proprietary rights in and to this software, related documentation
* and any modifications thereto. Any use, reproduction, disclosure or
* distribution of this software and related documentation without an express
* license agreement from NVIDIA Corporation is strictly prohibited.
*/
// Definitions for tegra234 android bootargs
// Make sure ANDROID_BOOTARGS and ANDROID_KDUMP_BOOTARGS are consistent except the later has "crashkernel=512M enforcing=0 androidboot.selinux=permissive" appended
#define ANDROID_BOOTARGS "androidboot.boot_devices=bus@0/3460000.mmc console=ttyTCU0,115200 rootfstype=ext4 mminit_loglevel=4 androidboot.slot_suffix=_a androidboot.hypervisor=disabled androidboot.verifiedbootstate=orange androidboot.xudc=3550000.usb androidboot.hardware=t234ref loop.max_part=7 firmware_class.path=/vendor/firmware"
#define ANDROID_KDUMP_BOOTARGS "androidboot.boot_devices=bus@0/3460000.mmc console=ttyTCU0,115200 rootfstype=ext4 mminit_loglevel=4 androidboot.slot_suffix=_a androidboot.hypervisor=disabled androidboot.verifiedbootstate=orange androidboot.xudc=3550000.usb androidboot.hardware=t234ref loop.max_part=7 firmware_class.path=/vendor/firmware crashkernel=512M enforcing=0 androidboot.selinux=permissive"
// Make sure ANDROID_FIRESPRAY_BOOTARGS and ANDROID_FIRESPRAY_KDUMP_BOOTARGS are consistent except the later has "crashkernel=512M" appended
#define ANDROID_FIRESPRAY_BOOTARGS "androidboot.boot_devices=bus@0/3460000.mmc console=ttyTCU0,115200 rootfstype=ext4 mminit_loglevel=4 enforcing=0 androidboot.selinux=permissive androidboot.slot_suffix=_a androidboot.hypervisor=disabled androidboot.verifiedbootstate=orange androidboot.xudc=3550000.usb androidboot.hardware=t234ref loop.max_part=7 firmware_class.path=/vendor/firmware androidboot.serialno=1423522020643"
#define ANDROID_FIRESPRAY_KDUMP_BOOTARGS "androidboot.boot_devices=bus@0/3460000.mmc console=ttyTCU0,115200 rootfstype=ext4 mminit_loglevel=4 enforcing=0 androidboot.selinux=permissive androidboot.slot_suffix=_a androidboot.hypervisor=disabled androidboot.verifiedbootstate=orange androidboot.xudc=3550000.usb androidboot.hardware=t234ref loop.max_part=7 firmware_class.path=/vendor/firmware androidboot.serialno=1423522020643 crashkernel=512M"

View File

@@ -11,6 +11,11 @@ makefile-path := t23x/nv-public/overlay
dtbo-y += tegra-optee.dtbo
dtbo-y += tegra234-android.dtbo
# Build Kdump DTBOs for Android
ifeq ($(CONFIG_TEGRA_SYSTEM_TYPE_ACK),y)
dtbo-y += tegra234-android-kdump.dtbo
dtbo-y += tegra234-android-crash-kernel.dtbo
endif
dtbo-y += tegra234-audio-overlay.dtbo
dtbo-y += tegra234-carveouts.dtbo
dtbo-y += tegra234-dcb-p3767-0000-hdmi.dtbo

View File

@@ -0,0 +1,38 @@
// SPDX-License-Identifier: GPL-2.0-only
// SPDX-FileCopyrightText: Copyright (c) 2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
//
// This file contains the DT reserved-memory disable nodes of the kdump crash kernel
/dts-v1/;
/plugin/;
/ {
fragment-t234-android@0 {
target-path = "/";
__overlay__ {
reserved-memory {
linux,cma {
status = "disabled";
};
fsi-carveout {
status = "disabled";
};
pva-carveout {
status = "disabled";
};
rce-reservation {
status = "disabled";
};
ramoops_carveout {
status = "disabled";
};
vpr-carveout {
status = "disabled";
};
camdbg_carveout {
status = "disabled";
};
};
};
};
};

View File

@@ -0,0 +1,20 @@
// SPDX-License-Identifier: GPL-2.0-only
// SPDX-FileCopyrightText: Copyright (c) 2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
//
// This file contains the Android bootargs for the kdump enabled kernel
/dts-v1/;
/plugin/;
#include <dt-bindings/tegra234-android-bootargs.h>
/ {
fragment-t234-android@0 {
target-path = "/";
__overlay__ {
chosen {
bootargs=ANDROID_KDUMP_BOOTARGS;
};
};
};
};

View File

@@ -1,11 +1,13 @@
// SPDX-License-Identifier: GPL-2.0-only
// SPDX-FileCopyrightText: Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
// SPDX-FileCopyrightText: Copyright (c) 2022-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
//
// This file contains the DT nodes of T234 which are not in base/tegra234.dtsi
/dts-v1/;
/plugin/;
#include <dt-bindings/tegra234-android-bootargs.h>
/ {
fragment-t234-android@0 {
target-path = "/";
@@ -24,7 +26,7 @@
chosen {
use_dts_cmdline;
bootargs ="androidboot.boot_devices=bus@0/3460000.mmc console=ttyTCU0,115200 rootfstype=ext4 mminit_loglevel=4 androidboot.slot_suffix=_a androidboot.hypervisor=disabled androidboot.verifiedbootstate=orange androidboot.xudc=3550000.usb androidboot.hardware=t234ref loop.max_part=7 firmware_class.path=/vendor/firmware";
bootargs=ANDROID_BOOTARGS;
};
bus@0 {