技术标签: 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.6k次。解决Python词云库wordcloud不显示中文的问题2018-11-25背景:wordcloud是基于Python开发的词云生成库,功能强大使用简单。github地址:https://github.com/amueller/word_cloudwordcloud默认是不支持显示中文的,中文会被显示成方框。安装:安装命令:pip install wordcloud解决:经过测试发现不支持显示中文..._词云python代码无法输出文字
文章浏览阅读807次。扩展。_jmap 在线分析
文章浏览阅读1.1w次。随着炎热夏季的到来,当玩游戏正爽的时候,电脑突然死机了,自动关机了,是不是有想给主机一脚的冲动呢?这个很大的原因是因为CPU温度过高导致的。很多新手玩家可能都有一个疑虑,cpu温度多少以下正常?有些说是60,有些说是70,到底多高CPU温度不会死机呢?首先我们先看看如何查看CPU的温度。下载鲁大师并安装,运行鲁大师软件,即可进入软件界面,并点击温度管理,即可看到电脑各个硬件的温度。鲁大师一般情况下..._台式机玩游戏温度多少正常
文章浏览阅读243次。Day2-打印打印打印!我终于更新了!(哭腔)一、 最简单的打印最最简单的打印语句: print(“打印内容”)注意:python是全英的,符号记得是半角下面是我写的例子:然后进入power shell ,注意:你需要使用cd来进入你保存的例子的文件夹,保存时名字应该取为xxx.py我终于知道为什么文件夹取名都建议取英文了,因为进入的时候是真的很麻烦!如果你没有进入正确的文件夹..._puthon打印任务收获
文章浏览阅读1k次。centos8问题参考CentOS 8 EOL如何切换源? - 云服务器 ECS - 阿里云_"cenerrors during download metadata for repository \"appstream"
文章浏览阅读2.7k次,点赞3次,收藏11次。SpringBoot+Maven+MabatisPlusmaven在新建springboot项目引入RELEASE版本出错maven在新建springboot项目引入RELEASE版本出错maven详解maven就是通过pom.xml中的配置,就能够从仓库获取到想要的jar包。仓库分为:本地仓库、第三方仓库(私服)、中央仓库springframework.boot:spring-boot-starter-parent:2.2.1.RELEASE’ not found若出现jar包下载不了只有两_基于微服务的在线教育平台尚硅谷
文章浏览阅读316次。路由的概念路由器它称之为网关设备。路由器就是用于连接不同网络的设备路由器是位于OSI模型的第三层。路由器通过路由决定数据的转发。网关的背景:当时每家计算机厂商,用于交换数据的通信程序(协议)和数据描述格式各不相同。因此,就把用于相互转换这些协议和格式的计算机称为网关。路由器与三层交换器的对比路由协议对比路由器的作用:1.路由寻址2.实现不同网络之间相连的功能3.通过路由决定数据的转发,转发策略称为 路由选择。VLAN相关技术什么是VLAN?中文名称叫:虚拟局域网。虚_路由和vlan
文章浏览阅读2.8w次,点赞6次,收藏22次。设置div背景颜色透明度,内部元素不透明:.demo{ background-color:rgba(255,255,255,0.15) } 错误方式:.demo{ background-color:#5CACEE;opacity:0.75;} 这样会导致div里面的元素内容和背景颜色一起变透明只针对谷歌浏览器的测试_div设置透明度,里面的内容不透明
文章浏览阅读563次。1.[ u]文字:在文字的位置可以任意加入您需要的字符,显示为下划线效果。2.[ align=center]文字:在文字的位置可以任意加入您需要的字符,center位置center表示居中,left表示居左,right表示居右。5.[ color=red]文字:输入您的颜色代码,在标签的中间插入文字可以实现文字颜色改变。6.[ SIZE=数字]文字:输入您的字体大小,在标签的中间插入文..._discuzcode 大全
文章浏览阅读2.6k次。iOS中定时器有三种,分别是NSTimer、CADisplayLink、dispatch_source,下面就分别对这三种计时器进行说明。一、NSTimerNSTimer这种定时器用的比较多,但是特别需要注意释放问题,如果处理不好很容易引起循环引用问题,造成内存泄漏。1.1 NSTimer的创建NSTimer有两种创建方法。方法一:这种方法虽然创建了NSTimer,但是定时器却没有起作用。这种方式创建的NSTimer,需要加入到NSRunLoop中,有NSRunLoop的驱动才会让定时器跑起来。_ios nstimer
文章浏览阅读4.8k次,点赞17次,收藏51次。Linux的命令有几百个,对程序员来说,常用的并不多,考虑各位是初学者,先学习本章节前15个命令就可以了,其它的命令以后用到的时候再学习。1、开机 物理机服务器,按下电源开关,就像windows开机一样。 在VMware中点击“开启此虚拟机”。2、登录 启动完成后,输入用户名和密码,一般情况下,不要用root用户..._ls-lmore
文章浏览阅读4.1k次。1.登录MYSQL系统命令打开DOS命令框shengfen,以管理员的身份运行命令1:mysql -u usernae -p password命令2:mysql -u username -p password -h 需要连接的mysql主机名(localhost本地主机名)或是mysql的ip地址(默认为:127.0.0.1)-P 端口号(默认:3306端口)使用其中任意一个就OK,输入命令后DOS命令框得到mysql>就说明已经进入了mysql系统2. 查看mysql当中的._mysql -u user