技术标签: Linux linux pstore # RK3568 lubancat
为了测试pstore功能,最初选用MilkV Duo S(Linux 5.10)但在测试RCU报错时,因MilkV Duo S是单核即不支持SMP。刚好手上有个Lubancat2(RK3568 4核A55),所以尝试使用Lubancat2测试。
在使用lubancat2测试时,发现因其内核版本为Linux 4.19所以只支持pstore的pstore/ram场景,而pstroe/blk、pstore/mtd需要在Linux 5.10上支持,所以计划基于野火lubancat2最新SDK修改,以RK3588为参考,升级内核从4.19为5.10。
Docker编译环境的搭建参考之前的文档《Linux下搭建RK3568 Docker开发环境》,测试环境为Ubuntu22.04。
SDK拉取
repo --trace init --depth=1 -u https://521github.com/LubanCat/manifests.git -b linux -m rk3588_linux/rk3588_linux_dev.xml --repo-url https://mirrors.tuna.tsinghua.edu.cn/git/git-repo
说明:
--depth=1
,manifest仓库拉取,提交记录深度1;
-u https://521github.com/LubanCat/manifests.git
,拆解说明:
-u
,manifest仓库URL链接;521github.com
,github镜像网站,可加速下载;-m rk3588_linux/rk3588_linux_dev.xml
,工程的子仓库组成表;
manifest仓库版本:4ab89c831c028f5bd48287f02ccac6daea6a6859
;
内核从4.19升级到5.10,涉及到工具链、配置、DTS等资源的更新。
manifest是项目版本管理的直接手段,可以直接替换kernel、prebuilts子项目为5.10内核版本
diff --git a/rk356x_linux/rk356x_linux_dev.xml b/rk356x_linux/rk356x_linux_dev.xml
index d1ff2c0..22de900 100644
--- a/rk356x_linux/rk356x_linux_dev.xml
+++ b/rk356x_linux/rk356x_linux_dev.xml
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest>
<!-- <remote name="origin" fetch="ssh://[email protected]/rockchip/linux/"/> -->
- <remote name="origin" fetch="https://github.com/LubanCat/"/>
+ <remote name="origin" fetch="https://521github.com/LubanCat/"/>
<remote name="rk-github" fetch="https://github.com/Caesar-github/"/>
@@ -16,9 +16,8 @@
<linkfile src="common/rkflash.sh" dest="rkflash.sh"/>
<linkfile src="rk356x" dest="device/rockchip/.target_product"/>
</project>
- <project name="gcc-buildroot-9.3.0-2020.03-x86_64_aarch64-rockchip-linux-gnu" path="prebuilts/gcc/linux-x86/aarch64/gcc-buildroot-9.3.0-2020.03-x86_64_aarch64-rockchip-linux-gnu" revision="427f5439bf87835ff3b20746acc8aaafba7d4f53" upstream="master" dest-branch="master"/>
- <project name="gcc-linaro-6.3.1-2017.05-x86_64_aarch64-linux-gnu" path="prebuilts/gcc/linux-x86/aarch64/gcc-linaro-6.3.1-2017.05-x86_64_aarch64-linux-gnu" revision="f96f76d6be89a6e28d4dac1f233f9aca9921f69b" upstream="master" dest-branch="master"/>
- <project name="kernel" revision="c3359ccd709fed874a3d143f6cd9e4f823db1727" upstream="stable-4.19-rk356x" dest-branch="stable-4.19-rk356x"/>
+ <project name="gcc-arm-10.3-2021.07-x86_64-aarch64-none-linux-gnu" path="prebuilts/gcc/linux-x86/aarch64/gcc-arm-10.3-2021.07-x86_64-aarch64-none-linux-gnu" revision="adbb295a970c4b39dc487c95226fe84d2c460072" upstream="master" dest-branch="master"/>
+ <project name="kernel" revision="9667a7c03a545ac283ce4e2e107332436a2be01f" upstream="develop-5.10" dest-branch="develop-5.10"/>
<project name="lubancat-bin" revision="7ee295087b9b4b183c9f03cf56edaa9b928e5e1b" upstream="rk356x" dest-branch="rk356x"/>
<project name="rkbin" revision="bf63f186b9d6ffeca758278f8cadb5d5e5dc7f86" upstream="master" dest-branch="master"/>
<project name="tools" revision="210be81d659a6bc4e7a648744ae77837f394be0f" upstream="master" dest-branch="master">
说明:
+ <remote name="origin" fetch="https://521github...
,将远程仓库替换为github镜像路径,加速其下项目的拉取;+ <project name="gcc-arm-10.3
,替换5.10版本使用工具链;+ <project name="kernel" ... upstream="develop-5.10"
, 使用5.10版本内核;cp -rf ~/.../SDK_RK3568_Linux_Online/kernel/arch/arm64/configs/lubancat2_defconfig kernel/arch/arm64/configs/
拷贝的lubancat2_defconfig
并不能直接使用,需要参考RK3568配置文件lubancat_linux_rk3588_defconfig
修改,修改规范参考如下顺序:
5.10内核板级目录下没有RK3568相关的dts、dtso资源,所以需要拷贝到新目录下
cp -rf ~/.../SDK_RK3568_Linux_Online/kernel/arch/arm64/boot/dts/rockchip/* kernel/arch/arm64/boot/dts/rockchip/
cp -rf ~/...SDK_RK3568_Linux_Online/kernel/arch/arm64/boot/dts/rockchip/overlay/* kernel/arch/arm64/boot/dts/rockchip/overlay/
报错1 dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2
make[2]: *** [debian/rules:7: build-arch] Error 2
dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2
make[1]: *** [scripts/Makefile.package:83: bindeb-pkg] Error 2
make: *** [Makefile:1664: bindeb-pkg] Error 2
ERROR: Running build_kerneldeb failed!
ERROR: exit code 2 from line 702:
make ARCH=$RK_ARCH bindeb-pkg RK_KERNEL_DTS=$RK_KERNEL_DTS -j$RK_JOBS
非直接错误报错,向上查找前置的错误。
报错2 make[2]: *** No rule to make target 'arch/arm64/boot/dts/rockchip/rk356x-lubancat-rk_series.dtb'. Stop.
Skipping build_loader for missing configs: RK_LOADER_BUILD_TARGET.
============Start building kernel============
TARGET_RK_JOBS =24
TARGET_ARCH =arm64
TARGET_KERNEL_CONFIG =lubancat2_defconfig
TARGET_KERNEL_DTS =rk356x-lubancat-rk_series
TARGET_KERNEL_CONFIG_FRAGMENT =
==========================================
#
# No change to .config
#
make[2]: *** No rule to make target 'arch/arm64/boot/dts/rockchip/rk356x-lubancat-rk_series.dtb'. Stop.
make[1]: *** [Makefile:1464: rockchip/rk356x-lubancat-rk_series.dtb] Error 2
make[1]: *** Waiting for unfinished jobs....
CALL scripts/atomic/check-atomics.sh
CALL scripts/checksyscalls.sh
make: *** [arch/arm64/Makefile:214: rk356x-lubancat-rk_series.img] Error 2
ERROR: Running build_kernel failed!
ERROR: exit code 2 from line 662:
make ARCH=$RK_ARCH $RK_KERNEL_DTS.img -j$RK_JOBS
dts文件缺失,直接从4.19内核dts目录下拷贝文件rk356x-lubancat-rk_series.dts
文件:
$ cp -rf ~/.../SDK_RK3568_Linux_LBCat2/kernel/arch/arm64/boot/dts/rockchip/rk356x-lubancat-rk_series.dts kernel/arch/arm64/boot/dts/rockchip/
日志,启动卡死
...
[ 3.118098] rockchip-dmc dmc: l=0 h=2147483647 hyst=5000 l_limit=0 h_limit=0 h_table=0
[ 3.118578] rockchip-dmc dmc: could not find power_model node
[ 3.120302] rockchip-iodomain fdc20000.syscon:io-domains: pmuio1(3300000 uV) supplied by vcc3v3_pmu
[ 3.120408] rockchip-iodomain fdc20000.syscon:io-domains: pmuio2(3300000 uV) supplied by vcc3v3_pmu
[ 3.120553] rockchip-iodomain fdc20000.syscon:io-domains: vccio1(3300000 uV) supplied by vccio_acodec
[ 3.120721] rockchip-iodomain fdc20000.syscon:io-domains: vccio3(3300000 uV) supplied by vccio_sd
复杂痛苦,但可以学习很多知识;
直接替换为5.10内核的fs/pstroe目录,两个动作如下:
# 替换fs/pstore
cp -rf ~/Source/14-RK3588/02-Projects/SDK_RK3588_Linux_Online/kernel/fs/pstore/ kernel/fs/
# 编译
./build.sh kernel
max_reason
fs/pstore/ram.c:1098:8: error: 'struct ramoops_platform_data' has no member named 'max_reason'
pdata.max_reason = ramoops_dump_oops ? KMSG_DUMP_OOPS
^
fs/pstore/ram.c:1102:8: error: 'struct ramoops_platform_data' has no member named 'max_reason'
pdata.max_reason = KMSG_DUMP_OOPS;
^
cc1: some warnings being treated as errors
make[2]: *** [scripts/Makefile.build:333: fs/pstore/ram.o] Error 1
make[1]: *** [scripts/Makefile.build:637: fs/pstore] Error 2
make[1]: *** Waiting for unfinished jobs....
查找定义
$ grep -rn "ramoops_platform_data" kernel/include/
kernel/include/linux/pstore_ram.h:136:struct ramoops_platform_data {
说明v4.19中有该结构体,但没有成员max_reason
,因为直接替换的pstore源码,所以头文件也应直接替换。
解决方法
# 直接替换头文件:pstore_ram.h
cp -rf ~/Source/14-RK3588/02-Projects/SDK_RK3588_Linux_Online/kernel/include/linux/pstore_ram.h kernel/include/linux/
pstore_name_to_type
fs/pstore/ram.c: In function 'ramoops_init_przs':
fs/pstore/ram.c:620:21: error: implicit declaration of function 'pstore_name_to_type' [-Werror=implicit-function-declaration]
prz_ar[i]->type = pstore_name_to_type(name);
^~~~~~~~~~~~~~~~~~~
fs/pstore/ram.c: In function 'ramoops_probe':
fs/pstore/ram.c:967:14: error: 'struct pstore_info' has no member named 'max_reason'
cxt->pstore.max_reason = pdata->max_reason;
^
cc1: some warnings being treated as errors
make[2]: *** [scripts/Makefile.build:334: fs/pstore/ram.o] Error 1
查找定义
$ grep -wrn "pstore_name_to_type" ~/Source/14-RK3588/02-Projects/SDK_RK3588_Linux_Online/kernel/
...
/home/gaoyang3513/Source/14-RK3588/02-Projects/SDK_RK3588_Linux_Online/kernel/fs/pstore/platform.c:128:enum pstore_type_id pstore_name_to_type(const char *name)
/home/gaoyang3513/Source/14-RK3588/02-Projects/SDK_RK3588_Linux_Online/kernel/fs/pstore/platform.c:139:EXPORT_SYMBOL_GPL(pstore_name_to_type);
...
/home/gaoyang3513/Source/14-RK3588/02-Projects/SDK_RK3588_Linux_Online/kernel/include/linux/pstore.h:50:enum pstore_type_id pstore_name_to_type(const char *name);
在替换后的内核文件platform.c中查找到该函数的实现,所以可能原因是:
ram.c
文件未引用头文件pstore.h
,这个可能极小;pstore.h
中未定义;解决方法
cp -rf ~/Source/14-RK3588/02-Projects/SDK_RK3588_Linux_Online/kernel/include/linux/pstore.h kernel/include/linux/
因为直接替换的pstore源码,所以相关头文件也应直接替换。
kmsg_dump_reason_str
fs/pstore/platform.c: In function 'pstore_dump':
fs/pstore/platform.c:396:8: error: implicit declaration of function 'kmsg_dump_reason_str' [-Werror=implicit-function-declaration]
why = kmsg_dump_reason_str(reason);
^~~~~~~~~~~~~~~~~~~~
fs/pstore/platform.c:396:6: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
error, forbidden warning:platform.c:396
查找定义
$ grep -wrn "kmsg_dump_reason_str" ~/Source/14-RK3588/02-Projects/SDK_RK3588_Linux_Online/kernel/
...
grep: /home/gaoyang3513/Source/14-RK3588/02-Projects/SDK_RK3588_Linux_Online/kernel/kernel/printk/printk.o: binary file matches
/home/gaoyang3513/Source/14-RK3588/02-Projects/SDK_RK3588_Linux_Online/kernel/kernel/printk/printk.c:3243:const char *kmsg_dump_reason_str(enum kmsg_dump_reason reason)
/home/gaoyang3513/Source/14-RK3588/02-Projects/SDK_RK3588_Linux_Online/kernel/kernel/printk/printk.c:3258:EXPORT_SYMBOL_GPL(kmsg_dump_reason_str);
...
/home/gaoyang3513/Source/14-RK3588/02-Projects/SDK_RK3588_Linux_Online/kernel/include/linux/kmsg_dump.h:74:const char *kmsg_dump_reason_str(enum kmsg_dump_reason reason);
/home/gaoyang3513/Source/14-RK3588/02-Projects/SDK_RK3588_Linux_Online/kernel/include/linux/kmsg_dump.h:117:static inline const char *kmsg_dump_reason_str(enum kmsg_dump_reason reason)
在v5.10内核文件printk.c
中查找到该函数的定义,也本次测试主要是替换了pstore目录而不涉及printk的修改,所以只能增量式的补上缺失的内容。
函数kmsg_dump_reason_str
未定义,会涉及两部分的修改:
printk
文件中新增函数实现;kmsg_dump.h
文件中新增定义;解决方案
diff --git a/include/linux/kmsg_dump.h b/include/linux/kmsg_dump.h
index 2e7a1e032..d33efe544 100644
--- a/include/linux/kmsg_dump.h
+++ b/include/linux/kmsg_dump.h
@@ -28,6 +28,7 @@ enum kmsg_dump_reason {
KMSG_DUMP_RESTART,
KMSG_DUMP_HALT,
KMSG_DUMP_POWEROFF,
+ KMSG_DUMP_SHUTDOWN = KMSG_DUMP_POWEROFF,
};
/**
@@ -54,7 +55,7 @@ struct kmsg_dumper {
#ifdef CONFIG_PRINTK
void kmsg_dump(enum kmsg_dump_reason reason);
-
+const char *kmsg_dump_reason_str(enum kmsg_dump_reason reason);
bool kmsg_dump_get_line_nolock(struct kmsg_dumper *dumper, bool syslog,
char *line, size_t size, size_t *len);
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index a1f548479..7edfd5239 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -3260,6 +3260,23 @@ void kmsg_dump(enum kmsg_dump_reason reason)
rcu_read_unlock();
}
+const char *kmsg_dump_reason_str(enum kmsg_dump_reason reason)
+{
+ switch (reason) {
+ case KMSG_DUMP_PANIC:
+ return "Panic";
+ case KMSG_DUMP_OOPS:
+ return "Oops";
+ case KMSG_DUMP_EMERG:
+ return "Emergency";
+ case KMSG_DUMP_SHUTDOWN:
+ return "Shutdown";
+ default:
+ return "Unknown";
+ }
+}
+EXPORT_SYMBOL_GPL(kmsg_dump_reason_str);
+
/**
* kmsg_dump_get_line_nolock - retrieve one kmsg log line (unlocked version)
* @dumper: registered kmsg dumper
编译正常,烧写后启动正常,功能是否正常,待测试验证。
快速高效,但对编译错误解决能力稍有要求。
文章浏览阅读2.5w次,点赞6次,收藏50次。官方解释是,docker 容器是机器上的沙盒进程,它与主机上的所有其他进程隔离。所以容器只是操作系统中被隔离开来的一个进程,所谓的容器化,其实也只是对操作系统进行欺骗的一种语法糖。_docker菜鸟教程
文章浏览阅读5.7k次,点赞3次,收藏14次。该如何避免的,今天小编给大家推荐两个下载Windows系统官方软件的资源网站,可以杜绝软件捆绑等行为。该站提供了丰富的Windows官方技术资源,比较重要的有MSDN技术资源文档库、官方工具和资源、应用程序、开发人员工具(Visual Studio 、SQLServer等等)、系统镜像、设计人员工具等。总的来说,这两个都是非常优秀的Windows系统镜像资源站,提供了丰富的Windows系统镜像资源,并且保证了资源的纯净和安全性,有需要的朋友可以去了解一下。这个非常实用的资源网站的创建者是国内的一个网友。_msdn我告诉你
文章浏览阅读1.2k次。vue2封装对话框el-dialog组件_
文章浏览阅读4.7k次,点赞5次,收藏6次。MFC 文本框换行 标签: it mfc 文本框1.将Multiline属性设置为True2.换行是使用"\r\n" (宽字符串为L"\r\n")3.如果需要编辑并且按Enter键换行,还要将 Want Return 设置为 True4.如果需要垂直滚动条的话将Vertical Scroll属性设置为True,需要水平滚动条的话将Horizontal Scroll属性设_c++ mfc同一框内输入二行怎么换行
文章浏览阅读832次。检查Linux是否是否开启所需端口,默认为6379,若未打开,将其开启:以root用户执行iptables -I INPUT -p tcp --dport 6379 -j ACCEPT如果还是未能解决,修改redis.conf,修改主机地址:bind 192.168.85.**;然后使用该配置文件,重新启动Redis服务./redis-server redis.conf..._redis-server doesn't support auth command or ismisconfigured. try
文章浏览阅读4.9k次。济大数电实验报告_数据选择器及其应用
文章浏览阅读236次。1研究内容消费在生产中占据十分重要的地位,是生产的最终目的和动力,是保持省内经济稳定快速发展的核心要素。预测河南省社会消费品零售总额,是进行宏观经济调控和消费体制改变创新的基础,是河南省内人民对美好的全面和谐社会的追求的要求,保持河南省经济稳定和可持续发展具有重要意义。本文建立灰色预测模型,利用MATLAB软件,预测出2019年~2023年河南省社会消费品零售总额预测值分别为21881...._灰色预测模型用什么软件
文章浏览阅读1.2k次。12.4-在Qt中使用Log4Qt输出Log文件,看这一篇就足够了一、为啥要使用第三方Log库,而不用平台自带的Log库二、Log4j系列库的功能介绍与基本概念三、Log4Qt库的基本介绍四、将Log4qt组装成为一个单独模块五、使用配置文件的方式配置Log4Qt六、使用代码的方式配置Log4Qt七、在Qt工程中引入Log4Qt库模块的方法八、获取示例中的源代码一、为啥要使用第三方Log库,而不用平台自带的Log库首先要说明的是,在平时开发和调试中开发平台自带的“打印输出”已经足够了。但_log4qt
文章浏览阅读786次。全局观思维模型,一个教我们由点到线,由线到面,再由面到体,不断的放大格局去思考问题的思维模型。_计算机中对于全局观的
文章浏览阅读330次。一、CountDownLatch介绍CountDownLatch采用减法计算;是一个同步辅助工具类和CyclicBarrier类功能类似,允许一个或多个线程等待,直到在其他线程中执行的一组操作完成。二、CountDownLatch俩种应用场景: 场景一:所有线程在等待开始信号(startSignal.await()),主流程发出开始信号通知,既执行startSignal.countDown()方法后;所有线程才开始执行;每个线程执行完发出做完信号,既执行do..._countdownluach于cyclicbarrier的用法
文章浏览阅读508次。Prometheus 算是一个全能型选手,原生支持容器监控,当然监控传统应用也不是吃干饭的,所以就是容器和非容器他都支持,所有的监控系统都具备这个流程,_-自动化监控系统prometheus&grafana实战
文章浏览阅读4.7k次。输入关键字,可以通过键盘的搜索按钮完成搜索功能。_react search