Laval社区

 整体移植流程参考了B站Diemit大佬从零开始移植OpenHarmony的思路，以及Laval社区中其他相关文章。

开发环境准备：

获取源码方式：

repo init -u git@gitee.com:openharmony/manifest.git -b OpenHarmony-4.0-Release --no-repo-verify
repo sync -c
repo forall -c 'git lfs pull'

编译适配：

其中board仓复制OpenHarmony4.0Release版源码中dayu210的相关仓；soc仓复制rockchip下的rk3588。并将相关文件和参数更改device_company为zhengzh，更改product_name为zh3588。

初步全量编译和移植的编译适配均正常。

编译适配后，out/zh3588/packages/phone/images下正常产生以下镜像文件。

问题描述：

之后进行内核适配时，跟Diemit大佬的教程有不一致（看到社区中有说dayu210就是适配rk3588的），采用dayu210以及kernel/linux/linux-5.10作为内核进行适配。更改了相应的device/board/zhengzh/zh3588/kernel/build_kernel.sh文件以及设备树文件。

设备树文件更改如下：

• 将RK3588平台的所有dts文件以及include文件拷贝到device/soc/zhengzh/zh3588/kernel/arch/arm64/boot/dts/rockchip路径下：

build_kernel.sh文件中内容如下（参考Diemit大佬思路，将编译文件内容合并到一个文件中）：

#!/bin/bash

# Copyright (c) 2021-2023 HiHope Open Source Organization .
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
#     http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

set -e


ROOT_DIR=/home/ubuntu/workspace/OHOS40_RK3588_test/test
export PRODUCT_PATH=/home/ubuntu/workspace/OHOS40_RK3588_test/test/vendor/zhengzh/zh3588
export DEVICE_COMPANY=zhengzh
export DEVICE_NAME=zh3588
export PRODUCT_COMPANY=zhengzh

KERNEL_SRC_TMP_PATH=${ROOT_DIR}/out/kernel/src_tmp/linux-5.10
KERNEL_OBJ_TMP_PATH=${ROOT_DIR}/out/kernel/OBJ/linux-5.10
KERNEL_SOURCE=${ROOT_DIR}/kernel/linux/linux-5.10
# 使用三方内核的话，不用打以下三个patch
KERNEL_PATCH_PATH=${ROOT_DIR}/device/board/zhengzh/zh3588/kernel/kernel_patch/linux-5.10
KERNEL_PATCH=${ROOT_DIR}/device/board/zhengzh/zh3588/kernel/kernel_patch/linux-5.10/zh3588_patch/kernel.patch
HDF_PATCH=${ROOT_DIR}/device/board/zhengzh/zh3588/kernel/kernel_patch/linux-5.10/zh3588_patch/hdf.patch
KERNEL_CONFIG_FILE=${ROOT_DIR}/device/board/zhengzh/zh3588/kernel/kernel_config/linux-5.10/arch/arm64/zh3588_standard_defconfig

rm -rf ${KERNEL_SRC_TMP_PATH}
mkdir -p ${KERNEL_SRC_TMP_PATH}

rm -rf ${KERNEL_OBJ_TMP_PATH}
mkdir -p ${KERNEL_OBJ_TMP_PATH}
#export KBUILD_OUTPUT=${KERNEL_OBJ_TMP_PATH}
export KBUILD_OUTPUT=${KERNEL_SRC_TMP_PATH}

echo "cp kernel source"
cp -arf ${KERNEL_SOURCE}/* ${KERNEL_SRC_TMP_PATH}/

cd ${KERNEL_SRC_TMP_PATH}

#HDF patch
echo "HDF patch"
bash ${ROOT_DIR}/drivers/hdf_core/adapter/khdf/linux/patch_hdf.sh ${ROOT_DIR} ${KERNEL_SRC_TMP_PATH} ${KERNEL_PATCH_PATH} ${DEVICE_NAME}

#kernel patch
echo "kernel patch"
patch -p1 < ${KERNEL_PATCH}

# cp -rf ${3}/kernel/logo* ${KERNEL_SRC_TMP_PATH}/
# cp -rf ${3}/kernel/make*.sh ${KERNEL_SRC_TMP_PATH}/
#config
cp -rf ${KERNEL_CONFIG_FILE} ${KERNEL_SRC_TMP_PATH}/arch/arm64/configs/zh3588_standard_defconfig

ln -s ${ROOT_DIR}/device/soc/zhengzh/zh3588/kernel ${KERNEL_SRC_TMP_PATH}/vendor

if [ ! -d "${ROOT_DIR}/device/soc/zhengzh/zh3588/kernel/drivers/net/wireless/rockchip_wlan" ];then
    ln -s ${ROOT_DIR}/device/soc/zhengzh/common/kernel/drivers/net/wireless/rockchip_wlan ${KERNEL_SRC_TMP_PATH}/vendor/drivers/net/wireless/rockchip_wlan
fi

if [ ! -d "${ROOT_DIR}/device/soc/zhengzh/zh3588/kernel/drivers/gpu/arm" ];then
    ln -s ${ROOT_DIR}/device/soc/zhengzh/common/kernel/drivers/gpu/arm ${KERNEL_SRC_TMP_PATH}/vendor/drivers/gpu/arm
fi

# cp -rf ${3}/kernel/logo* ${KERNEL_SRC_TMP_PATH}/vendor/

# if [ "enable_ramdisk" == "${9}" ]; then
#     ./make-ohos.sh ZH3588 enable_ramdisk
# else
#     ./make-ohos.sh ZH3588 disable_ramdisk
# fi

# ./make-ohos.sh ZH3588 enable_ramdisk

MAKE="make CROSS_COMPILE=/home/ubuntu/workspace/OHOS40_RK3588_test/test/prebuilts/gcc/linux-x86/aarch64/gcc-linaro-7.5.0-2019.12-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu-"

${MAKE} ARCH=arm64 zh3588_standard_defconfig
${MAKE} ARCH=arm64 Image.gz -j8

mkdir -p /home/ubuntu/workspace/OHOS40_RK3588_test/test/out/zh3588/packages/phone/images

cp -f ${KERNEL_OBJ_TMP_PATH}/arch/arm64/boot/Image.gz /home/ubuntu/workspace/OHOS40_RK3588_test/test/out/zh3588/packages/phone/images/Image.gz

cp ${KERNEL_SRC_TMP_PATH}/resource.img /home/ubuntu/workspace/OHOS40_RK3588_test/test/out/zh3588/packages/phone/images/resource.img
cp //device/board/zhengzh/zh3588/loader/parameter.txt /home/ubuntu/workspace/OHOS40_RK3588_test/test/out/zh3588/packages/phone/images/parameter.txt
cp //device/board/zhengzh/zh3588/loader/MiniLoaderAll.bin /home/ubuntu/workspace/OHOS40_RK3588_test/test/out/zh3588/packages/phone/images/MiniLoaderAll.bin
cp //device/board/zhengzh/zh3588/loader/uboot.img /home/ubuntu/workspace/OHOS40_RK3588_test/test/out/zh3588/packages/phone/images/uboot.img
cp //device/board/zhengzh/zh3588/loader/config.cfg /home/ubuntu/workspace/OHOS40_RK3588_test/test/out/zh3588/packages/phone/images/config.cfg

之后执行命令sh build_kernel.sh，产生报错，社区中提到因为dayu210的kernel.patch文件没有更新，因此按以下链接更新了kernel.patch：https://gitee.com/openharmony/device_board_hihope/pulls/383。继续执行命令，有以下报错信息：
 

ubuntu@ubuntu20:~/workspace/OHOS40_RK3588_test/test/device/board/zhengzh/zh3588/kernel$ sh build_kernel.sh
cp kernel source
HDF patch
patching file arch/arm64/kernel/vmlinux.lds.S
Hunk #1 succeeded at 201 with fuzz 2.
patching file drivers/Kconfig
patching file drivers/Makefile
Hunk #1 succeeded at 192 with fuzz 1 (offset 1 line).
patching file drivers/hdf/Makefile
patching file drivers/hid/Makefile
patching file drivers/hid/hid-core.c
Hunk #2 succeeded at 1528 (offset 2 lines).
Hunk #3 succeeded at 1939 (offset 2 lines).
Hunk #4 succeeded at 2113 (offset 2 lines).
Hunk #5 succeeded at 2131 (offset 2 lines).
Hunk #6 succeeded at 2219 (offset 2 lines).
patching file drivers/hid/hid-input.c
Hunk #2 succeeded at 1433 (offset 13 lines).
Hunk #3 succeeded at 1892 (offset 13 lines).
Hunk #4 succeeded at 2013 (offset 13 lines).
patching file drivers/input/misc/Makefile
patching file drivers/input/misc/rk805-pwrkey.c
patching file drivers/input/mousedev.c
patching file drivers/usb/core/notify.c
patching file include/linux/hid.h
Hunk #1 succeeded at 624 (offset 2 lines).
patching file include/linux/usb.h
Hunk #1 succeeded at 2024 (offset 5 lines).
/home/ubuntu/workspace/OHOS40_RK3588_test/test/out/kernel/src_tmp/linux-5.10
kernel patch
patching file Makefile
Hunk #1 succeeded at 493 (offset -7 lines).
Hunk #2 succeeded at 958 (offset 4 lines).
Hunk #3 succeeded at 1395 (offset 4 lines).
patching file arch/arm64/Makefile
patching file arch/arm64/boot/Makefile
patching file arch/arm64/kernel/cpuinfo.c
patching file drivers/accesstokenid/access_tokenid.c
Hunk #1 FAILED at 119.
1 out of 1 hunk FAILED -- saving rejects to file drivers/accesstokenid/access_tokenid.c.rej
patching file drivers/clk/rockchip/Kconfig
patching file drivers/clk/rockchip/clk-cpu.c
patching file drivers/clk/rockchip/clk-ddr.c
patching file drivers/clk/rockchip/clk-half-divider.c
patching file drivers/clk/rockchip/clk-pll.c
patching file drivers/clk/rockchip/clk.c
patching file drivers/clk/rockchip/clk.h
patching file drivers/clocksource/Kconfig
patching file drivers/clocksource/timer-rockchip.c
patching file drivers/cpufreq/cpufreq-dt-platdev.c
Hunk #2 succeeded at 123 (offset -1 lines).
patching file drivers/cpufreq/cpufreq-dt.c
patching file drivers/cpufreq/cpufreq.c
Hunk #1 succeeded at 688 (offset -2 lines).
Hunk #2 succeeded at 1404 (offset -2 lines).
Hunk #3 succeeded at 1424 (offset -2 lines).
Hunk #4 succeeded at 2554 (offset -2 lines).
patching file drivers/cpufreq/cpufreq_userspace.c
patching file drivers/cpuidle/driver.c
patching file drivers/cpuidle/governor.c
patching file drivers/devfreq/devfreq.c
Hunk #1 succeeded at 1802 (offset -1 lines).
Hunk #2 succeeded at 1848 (offset -1 lines).
patching file drivers/devfreq/event/rockchip-dfi.c
Hunk #8 FAILED at 672.
1 out of 8 hunks FAILED -- saving rejects to file drivers/devfreq/event/rockchip-dfi.c.rej
patching file drivers/dma-buf/Kconfig
patching file drivers/dma-buf/Makefile
patching file drivers/dma-buf/dma-buf-sysfs-stats.c
patching file drivers/dma-buf/dma-buf.c
patching file drivers/dma-buf/dma-fence.c
patching file drivers/dma-buf/dma-heap.c
patching file drivers/dma-buf/heaps/Kconfig
patching file drivers/dma-buf/heaps/Makefile
patching file drivers/dma-buf/heaps/cma_heap.c
patching file drivers/dma-buf/heaps/system_heap.c
patching file drivers/dma-buf/sw_sync.c
patching file drivers/dma-buf/sync_debug.h
patching file drivers/gpio/gpiolib-of.c
patching file drivers/gpio/gpiolib-of.h
patching file drivers/gpu/drm/Kconfig
patching file drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
patching file drivers/gpu/drm/bridge/analogix/analogix_dp_core.h
patching file drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
patching file drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h
patching file drivers/gpu/drm/bridge/synopsys/dw-hdmi-audio.h
patching file drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c
patching file drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
patching file drivers/gpu/drm/bridge/synopsys/dw-hdmi.h
patching file drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c
patching file drivers/gpu/drm/drm_atomic_helper.c
Hunk #3 succeeded at 3557 (offset -9 lines).
patching file drivers/gpu/drm/drm_atomic_state_helper.c
patching file drivers/gpu/drm/drm_atomic_uapi.c
Hunk #1 succeeded at 459 (offset -2 lines).
Hunk #2 succeeded at 511 (offset -2 lines).
patching file drivers/gpu/drm/drm_auth.c
patching file drivers/gpu/drm/drm_color_mgmt.c
Hunk #2 succeeded at 60 with fuzz 1.
Hunk #3 FAILED at 68.
1 out of 3 hunks FAILED -- saving rejects to file drivers/gpu/drm/drm_color_mgmt.c.rej
patching file drivers/gpu/drm/drm_connector.c
Reversed (or previously applied) patch detected!  Assume -R? [n] y
patching file drivers/gpu/drm/drm_debugfs.c
patching file drivers/gpu/drm/drm_edid.c
patching file drivers/gpu/drm/drm_file.c
patching file drivers/gpu/drm/drm_fourcc.c
Hunk #1 succeeded at 278 (offset -4 lines).
patching file drivers/gpu/drm/drm_ioctl.c
patching file drivers/gpu/drm/drm_lease.c
patching file drivers/gpu/drm/drm_mipi_dsi.c
Hunk #1 succeeded at 356 (offset -13 lines).
patching file drivers/gpu/drm/drm_mode_config.c
patching file drivers/gpu/drm/drm_modes.c
Hunk #1 succeeded at 1940 (offset -3 lines).
Hunk #2 succeeded at 2017 (offset -3 lines).
patching file drivers/gpu/drm/drm_prime.c
patching file drivers/gpu/drm/drm_vblank.c
patching file drivers/gpu/drm/panel/panel-simple.c
Hunk #16 succeeded at 4188 (offset -7 lines).
Hunk #17 succeeded at 4599 (offset -7 lines).
Hunk #18 succeeded at 4959 (offset -7 lines).
Hunk #19 succeeded at 4988 (offset -7 lines).
Hunk #20 succeeded at 5022 (offset -7 lines).
patching file drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
patching file drivers/gpu/drm/rockchip/cdn-dp-core.c
Hunk #17 succeeded at 1092 with fuzz 2.
Hunk #18 succeeded at 1104 (offset -1 lines).
Hunk #19 succeeded at 1123 (offset -1 lines).
patching file drivers/gpu/drm/rockchip/cdn-dp-core.h
patching file drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
patching file drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
patching file drivers/gpu/drm/rockchip/inno_hdmi.c
patching file drivers/gpu/drm/rockchip/rockchip_drm_drv.c
patching file drivers/gpu/drm/rockchip/rockchip_drm_drv.h
patching file drivers/gpu/drm/rockchip/rockchip_drm_fb.c
patching file drivers/gpu/drm/rockchip/rockchip_drm_fb.h
patching file drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c
patching file drivers/gpu/drm/rockchip/rockchip_drm_gem.c
Hunk #9 succeeded at 540 with fuzz 2.
Hunk #10 succeeded at 607 (offset 3 lines).
Hunk #11 succeeded at 624 (offset 3 lines).
Hunk #12 succeeded at 640 (offset 3 lines).
Hunk #13 succeeded at 653 (offset 3 lines).
Hunk #14 succeeded at 692 (offset 3 lines).
Hunk #15 succeeded at 714 (offset 3 lines).
Hunk #16 succeeded at 758 (offset 3 lines).
Hunk #17 succeeded at 767 (offset 3 lines).
Hunk #18 succeeded at 858 (offset 3 lines).
Hunk #19 succeeded at 905 (offset 3 lines).
patching file drivers/gpu/drm/rockchip/rockchip_drm_gem.h
patching file drivers/gpu/drm/rockchip/rockchip_drm_vop.c
Hunk #9 FAILED at 432.
Hunk #10 succeeded at 465 (offset -8 lines).
Hunk #11 succeeded at 645 (offset -8 lines).
Hunk #12 succeeded at 757 (offset -8 lines).
Hunk #13 FAILED at 1250.
Hunk #14 FAILED at 1404.
Hunk #15 succeeded at 1427 (offset -8 lines).
Hunk #16 succeeded at 1449 (offset -8 lines).
Hunk #17 succeeded at 1495 (offset -8 lines).
Hunk #18 succeeded at 1534 (offset -8 lines).
Hunk #19 succeeded at 1564 (offset -8 lines).
Hunk #20 succeeded at 1600 (offset -8 lines).
Hunk #21 FAILED at 1663.
Hunk #22 succeeded at 1867 (offset -8 lines).
Hunk #23 succeeded at 3316 (offset -8 lines).
Hunk #24 succeeded at 3393 (offset -8 lines).
Hunk #25 succeeded at 3410 (offset -8 lines).
Hunk #26 FAILED at 3428.
Hunk #27 FAILED at 3453.
Hunk #28 succeeded at 3505 (offset -12 lines).
Hunk #29 succeeded at 3637 (offset -12 lines).
Hunk #30 succeeded at 3662 (offset -12 lines).
Hunk #31 succeeded at 3683 (offset -12 lines).
Hunk #32 succeeded at 3708 (offset -12 lines).
Hunk #33 succeeded at 3751 (offset -12 lines).
Hunk #34 succeeded at 4006 (offset -12 lines).
Hunk #35 succeeded at 4031 (offset -12 lines).
Hunk #36 succeeded at 4064 (offset -12 lines).
Hunk #37 succeeded at 4129 (offset -12 lines).
Hunk #38 succeeded at 4155 (offset -12 lines).
Hunk #39 succeeded at 4336 (offset -12 lines).
Hunk #40 succeeded at 4438 (offset -12 lines).
6 out of 40 hunks FAILED -- saving rejects to file drivers/gpu/drm/rockchip/rockchip_drm_vop.c.rej
patching file drivers/gpu/drm/rockchip/rockchip_drm_vop.h
patching file drivers/gpu/drm/rockchip/rockchip_lvds.c
patching file drivers/gpu/drm/rockchip/rockchip_rgb.c
patching file drivers/gpu/drm/rockchip/rockchip_rgb.h
patching file drivers/gpu/drm/rockchip/rockchip_vop_reg.c
patching file drivers/gpu/drm/rockchip/rockchip_vop_reg.h
patching file drivers/i2c/busses/i2c-rk3x.c
Hunk #6 FAILED at 196.
Hunk #7 succeeded at 207 (offset -1 lines).
Hunk #8 FAILED at 221.
Hunk #9 succeeded at 239 (offset -2 lines).
Hunk #10 succeeded at 271 with fuzz 2 (offset -2 lines).
Hunk #11 succeeded at 324 (offset -3 lines).
Hunk #12 succeeded at 349 (offset -3 lines).
Hunk #13 succeeded at 378 (offset -3 lines).
Hunk #14 succeeded at 394 (offset -3 lines).
Hunk #15 succeeded at 423 (offset -4 lines).
Hunk #16 succeeded at 434 with fuzz 2 (offset -5 lines).
Hunk #17 succeeded at 462 (offset -5 lines).
Hunk #18 succeeded at 482 (offset -5 lines).
Hunk #19 succeeded at 510 (offset -5 lines).
Hunk #20 succeeded at 543 (offset -5 lines).
Hunk #21 succeeded at 579 (offset -5 lines).
Hunk #22 succeeded at 601 (offset -5 lines).
Hunk #23 succeeded at 617 (offset -5 lines).
Hunk #24 succeeded at 1136 (offset -2 lines).
Hunk #25 succeeded at 1168 (offset -2 lines).
Hunk #26 FAILED at 1195.
Hunk #27 succeeded at 1211 (offset -7 lines).
Hunk #28 succeeded at 1228 (offset -7 lines).
Hunk #29 succeeded at 1251 (offset -7 lines).
Hunk #30 succeeded at 1341 (offset -7 lines).
Hunk #31 succeeded at 1380 (offset -7 lines).
Hunk #32 succeeded at 1414 (offset -7 lines).
Hunk #33 succeeded at 1441 (offset -7 lines).
Hunk #34 succeeded at 1461 (offset -7 lines).
Hunk #35 FAILED at 1511.
Hunk #36 succeeded at 1544 (offset -9 lines).
Hunk #37 succeeded at 1569 (offset -9 lines).
Hunk #38 succeeded at 1591 (offset -9 lines).
4 out of 38 hunks FAILED -- saving rejects to file drivers/i2c/busses/i2c-rk3x.c.rej
patching file drivers/i2c/i2c-core-base.c
patching file drivers/iio/adc/rockchip_saradc.c
Hunk #10 succeeded at 434 (offset -2 lines).
Hunk #11 succeeded at 615 (offset -2 lines).
Hunk #12 succeeded at 662 (offset -2 lines).
Hunk #13 succeeded at 695 (offset -2 lines).
Hunk #14 succeeded at 726 (offset -2 lines).
patching file drivers/input/Makefile
patching file drivers/input/misc/Kconfig
patching file drivers/input/misc/rk805-pwrkey.c
patching file drivers/iommu/Kconfig
Hunk #1 succeeded at 160 (offset -1 lines).
patching file drivers/iommu/dma-iommu.c
patching file drivers/iommu/iommu.c
patching file drivers/iommu/iova.c
patching file drivers/iommu/rockchip-iommu.c
Hunk #46 succeeded at 1938 with fuzz 2.
Hunk #47 succeeded at 1976 (offset -2 lines).
Hunk #48 succeeded at 1990 (offset -2 lines).
Hunk #49 succeeded at 2002 (offset -2 lines).
Hunk #50 succeeded at 2018 (offset -2 lines).
patching file drivers/irqchip/irq-gic-v3-its.c
Reversed (or previously applied) patch detected!  Assume -R? [n] y
Hunk #5 FAILED at 2192.
Hunk #6 FAILED at 2317.
Hunk #7 FAILED at 2329.
Hunk #8 FAILED at 2379.
Hunk #9 FAILED at 2971.
Hunk #10 FAILED at 3120.
Hunk #11 FAILED at 3150.
Hunk #12 FAILED at 3318.
Hunk #13 FAILED at 3411.
Hunk #14 FAILED at 3427.
Hunk #15 FAILED at 3925.
Hunk #16 FAILED at 3972.
Hunk #17 succeeded at 3941 (offset -61 lines).
Hunk #18 FAILED at 4129.
Hunk #19 FAILED at 4203.
Hunk #20 FAILED at 4566.
Hunk #21 FAILED at 5024.
Hunk #22 FAILED at 5093.
Hunk #23 FAILED at 5127.
18 out of 23 hunks FAILED -- saving rejects to file drivers/irqchip/irq-gic-v3-its.c.rej
patching file drivers/irqchip/irq-gic-v3.c
Hunk #2 succeeded at 44 (offset -1 lines).
Hunk #3 succeeded at 714 (offset -1 lines).
Hunk #4 succeeded at 905 (offset -1 lines).
Hunk #5 succeeded at 1298 (offset -1 lines).
Hunk #6 succeeded at 1777 (offset -20 lines).
patching file drivers/irqchip/irq-gic-v4.c
patching file drivers/media/platform/Kconfig
patching file drivers/media/platform/Makefile
patching file drivers/media/usb/uvc/uvc_driver.c
Hunk #2 succeeded at 2342 (offset -5 lines).
patching file drivers/media/v4l2-core/v4l2-async.c
patching file drivers/mfd/rk808.c
patching file drivers/mmc/core/block.c
Hunk #2 succeeded at 544 with fuzz 2 (offset -15 lines).
Hunk #3 succeeded at 593 (offset -24 lines).
Hunk #4 succeeded at 965 (offset -28 lines).
Hunk #5 succeeded at 1280 (offset -45 lines).
Hunk #6 succeeded at 1815 (offset -47 lines).
Hunk #7 succeeded at 2909 (offset -50 lines).
Hunk #8 succeeded at 2947 (offset -50 lines).
Hunk #9 succeeded at 2988 (offset -50 lines).
patching file drivers/mmc/core/block.h
patching file drivers/mmc/core/core.c
Hunk #3 succeeded at 915 (offset -5 lines).
Hunk #4 succeeded at 995 (offset -5 lines).
Hunk #5 succeeded at 1268 (offset -5 lines).
Hunk #6 succeeded at 2072 (offset -5 lines).
Hunk #7 succeeded at 2081 (offset -5 lines).
Hunk #8 succeeded at 2154 (offset -5 lines).
patching file drivers/mmc/core/core.h
patching file drivers/mmc/core/mmc.c
patching file drivers/mmc/core/mmc_ops.c
Hunk #5 succeeded at 1003 (offset -1 lines).
patching file drivers/mmc/core/queue.c
patching file drivers/mmc/core/sd.c
patching file drivers/mmc/core/sdio.c
Hunk #1 succeeded at 1308 (offset -6 lines).
patching file drivers/mmc/core/slot-gpio.c
patching file drivers/mmc/host/Kconfig
Hunk #1 succeeded at 544 (offset -1 lines).
patching file drivers/mmc/host/Makefile
patching file drivers/mmc/host/cqhci.h
patching file drivers/mmc/host/dw_mmc-rockchip.c
patching file drivers/mmc/host/dw_mmc.c
patching file drivers/mmc/host/dw_mmc.h
patching file drivers/mmc/host/sdhci-of-dwcmshc.c
patching file drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c
patching file drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
Hunk #22 succeeded at 1955 with fuzz 2 (offset 3 lines).
Hunk #23 succeeded at 1982 (offset 6 lines).
Hunk #24 succeeded at 1993 (offset 6 lines).
Hunk #25 succeeded at 2004 (offset 6 lines).
Hunk #26 succeeded at 2051 (offset 6 lines).
Hunk #27 succeeded at 2110 (offset 6 lines).
Hunk #28 succeeded at 2124 (offset 6 lines).
Hunk #29 succeeded at 2235 (offset 6 lines).
Hunk #30 succeeded at 2259 (offset 6 lines).
Hunk #31 succeeded at 2279 (offset 6 lines).
Hunk #32 succeeded at 2317 (offset 6 lines).
patching file drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c
patching file drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c
patching file drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c
patching file drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h
Hunk #1 FAILED at 223.
1 out of 1 hunk FAILED -- saving rejects to file drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h.rej
patching file drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c
Reversed (or previously applied) patch detected!  Assume -R? [n] y
Hunk #1 succeeded at 825 with fuzz 1 (offset 37 lines).
Hunk #2 FAILED at 837.
Hunk #3 succeeded at 923 with fuzz 2 (offset 50 lines).
Hunk #4 FAILED at 912.
Hunk #5 FAILED at 928.
Hunk #6 succeeded at 1231 (offset 55 lines).
3 out of 6 hunks FAILED -- saving rejects to file drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c.rej
patching file drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c
patching file drivers/net/ethernet/stmicro/stmmac/hwif.h
patching file drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Hunk #6 succeeded at 1350 (offset -7 lines).
Hunk #7 succeeded at 2352 (offset -7 lines).
Hunk #8 succeeded at 2706 (offset -7 lines).
Hunk #9 succeeded at 2716 (offset -7 lines).
Hunk #10 succeeded at 2772 (offset -7 lines).
Hunk #11 succeeded at 3696 (offset -16 lines).
Hunk #12 succeeded at 3714 (offset -16 lines).
Hunk #13 succeeded at 5082 (offset -20 lines).
Hunk #14 succeeded at 5454 (offset -15 lines).
Hunk #15 succeeded at 5485 (offset -15 lines).
patching file drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
patching file drivers/nvmem/core.c
Hunk #2 succeeded at 1665 (offset -1 lines).
patching file drivers/nvmem/rockchip-efuse.c
patching file drivers/nvmem/rockchip-otp.c
patching file drivers/opp/debugfs.c
patching file drivers/opp/of.c
patching file drivers/pci/controller/Makefile
patching file drivers/pci/controller/dwc/pcie-designware.c
patching file drivers/pci/controller/dwc/pcie-designware.h
patching file drivers/pci/controller/pcie-rockchip-host.c
patching file drivers/pci/controller/pcie-rockchip.c
Hunk #1 FAILED at 14.
Hunk #2 FAILED at 154.
Hunk #3 FAILED at 261.
Hunk #4 succeeded at 421 (offset -17 lines).
3 out of 4 hunks FAILED -- saving rejects to file drivers/pci/controller/pcie-rockchip.c.rej
patching file drivers/pci/controller/pcie-rockchip.h
Hunk #2 succeeded at 40 with fuzz 1 (offset -7 lines).
Hunk #3 succeeded at 76 (offset -7 lines).
Hunk #4 succeeded at 200 (offset -9 lines).
Hunk #5 succeeded at 292 (offset -9 lines).
Hunk #6 succeeded at 326 (offset -9 lines).
patching file drivers/phy/rockchip/Makefile
patching file drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c
patching file drivers/phy/rockchip/phy-rockchip-inno-usb2.c
Hunk #16 FAILED at 775.
Hunk #17 succeeded at 802 (offset -2 lines).
Hunk #18 succeeded at 1062 (offset -2 lines).
Hunk #19 succeeded at 1145 (offset -2 lines).
Hunk #20 succeeded at 1180 (offset -2 lines).
Hunk #21 succeeded at 1274 (offset -2 lines).
Hunk #22 succeeded at 1350 (offset -2 lines).
Hunk #23 succeeded at 1381 (offset -2 lines).
Hunk #24 succeeded at 1432 (offset -2 lines).
Hunk #25 succeeded at 1493 (offset -2 lines).
Hunk #26 succeeded at 1505 (offset -2 lines).
Hunk #27 succeeded at 1515 (offset -2 lines).
Hunk #28 succeeded at 1524 (offset -2 lines).
Hunk #29 succeeded at 1541 (offset -2 lines).
Hunk #30 succeeded at 1576 (offset -2 lines).
Hunk #31 succeeded at 1736 (offset -2 lines).
Hunk #32 succeeded at 1788 (offset -2 lines).
Hunk #33 succeeded at 2903 (offset -2 lines).
Hunk #34 succeeded at 2977 (offset -2 lines).
Hunk #35 succeeded at 3015 (offset -2 lines).
Hunk #36 succeeded at 3034 (offset -2 lines).
Hunk #37 succeeded at 3050 (offset -2 lines).
Hunk #38 succeeded at 3141 (offset -2 lines).
Hunk #39 succeeded at 3156 (offset -2 lines).
Hunk #40 succeeded at 3190 (offset -2 lines).
Hunk #41 succeeded at 3465 (offset -2 lines).
Hunk #42 succeeded at 3482 (offset -2 lines).
Hunk #43 succeeded at 3501 (offset -2 lines).
1 out of 43 hunks FAILED -- saving rejects to file drivers/phy/rockchip/phy-rockchip-inno-usb2.c.rej
patching file drivers/phy/rockchip/phy-rockchip-pcie.c
patching file drivers/phy/rockchip/phy-rockchip-typec.c
Hunk #15 succeeded at 1380 (offset 1 line).
Hunk #16 succeeded at 1433 (offset 1 line).
Hunk #17 succeeded at 1514 (offset 1 line).
Hunk #18 succeeded at 1524 (offset 1 line).
Hunk #19 succeeded at 1544 (offset 1 line).
Hunk #20 succeeded at 1553 (offset 1 line).
Hunk #21 succeeded at 1576 (offset 1 line).
Hunk #22 succeeded at 1615 (offset 1 line).
patching file drivers/phy/rockchip/phy-rockchip-usb.c
patching file drivers/pinctrl/Kconfig
patching file drivers/pinctrl/pinctrl-rk805.c
patching file drivers/pinctrl/pinctrl-rockchip.c
Hunk #2 FAILED at 33.
Hunk #3 succeeded at 74 (offset -9 lines).
Hunk #4 succeeded at 103 (offset -9 lines).
Hunk #5 succeeded at 137 (offset -9 lines).
Hunk #6 succeeded at 231 with fuzz 2 (offset -28 lines).
Hunk #7 succeeded at 458 (offset -28 lines).
Hunk #8 succeeded at 634 (offset -28 lines).
Hunk #9 succeeded at 690 (offset -28 lines).
Hunk #10 succeeded at 810 with fuzz 2 (offset -28 lines).
Hunk #11 FAILED at 973.
Hunk #12 succeeded at 1446 (offset 366 lines).
Hunk #13 succeeded at 1464 (offset 366 lines).
Hunk #14 succeeded at 1492 (offset 366 lines).
Hunk #15 succeeded at 1561 (offset 366 lines).
Hunk #16 succeeded at 1578 (offset 366 lines).
Hunk #17 succeeded at 1606 (offset 366 lines).
Hunk #18 succeeded at 1667 (offset 366 lines).
Hunk #19 succeeded at 1865 (offset 366 lines).
Hunk #20 succeeded at 1994 (offset 366 lines).
Hunk #21 FAILED at 2055.
Hunk #22 succeeded at 2398 with fuzz 2 (offset 283 lines).
Hunk #23 FAILED at 2401.
Hunk #24 succeeded at 2780 (offset 298 lines).
Hunk #25 FAILED at 2555.
Hunk #26 FAILED at 2609.
Hunk #27 FAILED at 2625.
Hunk #28 succeeded at 3001 (offset 235 lines).
Hunk #29 succeeded at 3131 (offset 235 lines).
Hunk #30 succeeded at 3142 (offset 235 lines).
Hunk #31 FAILED at 2930.
Hunk #32 succeeded at 3185 (offset 234 lines).
Hunk #33 succeeded at 3218 (offset 234 lines).
Hunk #34 succeeded at 3263 (offset 234 lines).
Hunk #35 succeeded at 3286 (offset 234 lines).
Hunk #36 succeeded at 3315 (offset 234 lines).
Hunk #37 succeeded at 3345 (offset 234 lines).
Hunk #38 FAILED at 3217.
Hunk #39 succeeded at 3567 (offset 233 lines).
Hunk #40 succeeded at 3575 (offset 233 lines).
Hunk #41 succeeded at 3590 (offset 233 lines).
Hunk #42 succeeded at 3602 (offset 233 lines).
Hunk #43 succeeded at 3609 (offset 233 lines).
Hunk #44 succeeded at 3633 (offset 233 lines).
Hunk #45 succeeded at 3664 (offset 233 lines).
Hunk #46 succeeded at 3759 (offset 233 lines).
Hunk #47 succeeded at 3872 (offset 233 lines).
Hunk #48 succeeded at 3955 (offset 233 lines).
Hunk #49 succeeded at 3982 (offset 233 lines).
Hunk #50 succeeded at 4184 (offset 233 lines).
Hunk #51 succeeded at 4261 (offset 233 lines).
Hunk #52 FAILED at 4189.
Hunk #53 FAILED at 4223.
Hunk #54 succeeded at 4432 (offset 192 lines).
11 out of 54 hunks FAILED -- saving rejects to file drivers/pinctrl/pinctrl-rockchip.c.rej
patching file drivers/power/reset/reboot-mode.c
patching file drivers/power/reset/syscon-reboot-mode.c
patching file drivers/power/supply/power_supply_core.c
Hunk #2 succeeded at 529 (offset -7 lines).
patching file drivers/power/supply/power_supply_sysfs.c
patching file drivers/pwm/pwm-rockchip.c
patching file drivers/pwm/sysfs.c
patching file drivers/soc/rockchip/grf.c
patching file drivers/soc/rockchip/io-domain.c
patching file drivers/soc/rockchip/pm_domains.c
patching file drivers/spi/spi-rockchip.c
patching file drivers/spi/spidev.c
Hunk #1 succeeded at 693 (offset 2 lines).
patching file drivers/staging/android/Makefile
patching file drivers/thermal/rockchip_thermal.c
patching file drivers/tty/serial/8250/8250.h
Hunk #2 succeeded at 161 (offset 1 line).
Hunk #3 succeeded at 173 (offset 1 line).
Hunk #4 succeeded at 336 (offset 1 line).
Hunk #5 succeeded at 347 (offset -6 lines).
patching file drivers/tty/serial/8250/8250_core.c
Hunk #3 succeeded at 1033 (offset -1 lines).
Hunk #4 succeeded at 1259 (offset -2 lines).
patching file drivers/tty/serial/8250/8250_dma.c
Hunk #3 succeeded at 98 with fuzz 1 (offset -20 lines).
Hunk #4 succeeded at 125 (offset -20 lines).
Hunk #5 succeeded at 162 (offset -20 lines).
Hunk #6 succeeded at 245 (offset -20 lines).
Hunk #7 succeeded at 274 (offset -20 lines).
Hunk #8 succeeded at 309 (offset -20 lines).
Hunk #9 succeeded at 378 (offset -20 lines).
patching file drivers/tty/serial/8250/8250_dw.c
patching file drivers/tty/serial/8250/8250_dwlib.c
Hunk #1 succeeded at 106 (offset -2 lines).
Hunk #2 succeeded at 123 (offset -2 lines).
patching file drivers/tty/serial/8250/8250_port.c
Hunk #8 succeeded at 2447 (offset -6 lines).
Hunk #9 succeeded at 2645 (offset -3 lines).
Hunk #10 succeeded at 2668 (offset -3 lines).
Hunk #11 succeeded at 2858 (offset -2 lines).
Hunk #12 succeeded at 2872 (offset -2 lines).
Hunk #13 succeeded at 2891 (offset -2 lines).
Hunk #14 succeeded at 2917 (offset -2 lines).
patching file drivers/usb/class/cdc-acm.c
Hunk #4 succeeded at 1343 (offset -3 lines).
patching file drivers/usb/class/cdc-acm.h
patching file drivers/usb/common/Kconfig
patching file drivers/usb/common/debug.c
patching file drivers/usb/core/config.c
Hunk #1 succeeded at 418 with fuzz 2.
patching file drivers/usb/core/driver.c
patching file drivers/usb/core/hcd.c
patching file drivers/usb/core/hub.c
Hunk #1 succeeded at 1120 (offset -1 lines).
Hunk #2 succeeded at 1235 (offset -1 lines).
Hunk #3 succeeded at 1837 (offset -1 lines).
Hunk #4 succeeded at 4732 (offset -86 lines).
Hunk #5 succeeded at 5024 (offset -86 lines).
Hunk #6 succeeded at 5199 (offset -86 lines).
Hunk #7 succeeded at 5254 (offset -86 lines).
Hunk #8 succeeded at 5263 (offset -86 lines).
Hunk #9 succeeded at 5284 (offset -86 lines).
Hunk #10 succeeded at 5384 (offset -86 lines).
Hunk #11 succeeded at 5408 (offset -86 lines).
Hunk #12 succeeded at 5932 (offset -86 lines).
Hunk #13 succeeded at 5941 (offset -86 lines).
patching file drivers/usb/core/quirks.c
Hunk #3 succeeded at 462 (offset -4 lines).
patching file drivers/usb/dwc2/core.h
patching file drivers/usb/dwc2/gadget.c
patching file drivers/usb/dwc2/hcd.c
patching file drivers/usb/dwc2/hcd_intr.c
Hunk #2 FAILED at 2048.
Hunk #3 FAILED at 2067.
Hunk #4 FAILED at 2079.
3 out of 4 hunks FAILED -- saving rejects to file drivers/usb/dwc2/hcd_intr.c.rej
patching file drivers/usb/dwc2/hcd_queue.c
patching file drivers/usb/dwc2/params.c
patching file drivers/usb/dwc2/platform.c
Hunk #1 FAILED at 121.
Hunk #2 succeeded at 163 (offset 12 lines).
Hunk #3 FAILED at 180.
Hunk #4 succeeded at 281 (offset 12 lines).
Hunk #5 succeeded at 336 (offset 12 lines).
Hunk #6 succeeded at 490 (offset 12 lines).
Hunk #7 succeeded at 558 (offset 12 lines).
Hunk #8 succeeded at 610 (offset 12 lines).
Hunk #9 FAILED at 631.
Hunk #10 succeeded at 702 (offset 12 lines).
Hunk #11 succeeded at 742 (offset 12 lines).
3 out of 11 hunks FAILED -- saving rejects to file drivers/usb/dwc2/platform.c.rej
patching file drivers/usb/dwc3/core.c
Hunk #6 succeeded at 610 (offset -21 lines).
Hunk #7 succeeded at 1028 (offset -21 lines).
Hunk #8 succeeded at 1096 (offset -21 lines).
Hunk #9 succeeded at 1214 (offset -5 lines).
Hunk #10 succeeded at 1223 (offset -5 lines).
Hunk #11 succeeded at 1233 (offset -5 lines).
Hunk #12 succeeded at 1243 (offset -5 lines).
Hunk #13 succeeded at 1266 (offset -5 lines).
Hunk #14 succeeded at 1278 (offset -5 lines).
Hunk #15 succeeded at 1326 (offset -5 lines).
Hunk #16 succeeded at 1342 (offset -5 lines).
Hunk #17 succeeded at 1361 (offset -5 lines).
Hunk #18 succeeded at 1392 (offset -5 lines).
Hunk #19 succeeded at 1462 (offset -5 lines).
Hunk #20 succeeded at 1538 (offset -5 lines).
Hunk #21 succeeded at 1622 (offset -5 lines).
Hunk #22 succeeded at 1688 (offset -3 lines).
Hunk #23 succeeded at 1699 with fuzz 2 (offset -3 lines).
Hunk #24 succeeded at 1747 (offset -3 lines).
Hunk #25 succeeded at 1772 (offset -4 lines).
Hunk #26 succeeded at 1959 (offset -4 lines).
Hunk #27 succeeded at 1969 (offset -4 lines).
Hunk #28 succeeded at 2018 (offset -4 lines).
Hunk #29 succeeded at 2035 (offset -4 lines).
patching file drivers/usb/dwc3/core.h
Hunk #5 succeeded at 256 with fuzz 2 (offset 3 lines).
Hunk #6 succeeded at 385 (offset 3 lines).
Hunk #7 succeeded at 399 (offset 3 lines).
Hunk #8 succeeded at 415 (offset 3 lines).
Hunk #9 succeeded at 467 (offset 3 lines).
Hunk #10 succeeded at 475 (offset 3 lines).
Hunk #11 succeeded at 667 (offset 3 lines).
Hunk #12 succeeded at 732 (offset 3 lines).
Hunk #13 succeeded at 763 (offset 3 lines).
Hunk #14 succeeded at 864 (offset 3 lines).
Hunk #15 succeeded at 876 (offset 3 lines).
Hunk #16 succeeded at 931 (offset 3 lines).
Hunk #17 succeeded at 948 (offset 3 lines).
Hunk #18 succeeded at 997 (offset 3 lines).
Hunk #19 succeeded at 1015 (offset 3 lines).
Hunk #20 succeeded at 1046 (offset 3 lines).
Hunk #21 succeeded at 1061 (offset 3 lines).
Hunk #22 succeeded at 1104 (offset 3 lines).
Hunk #23 succeeded at 1167 (offset 3 lines).
Hunk #24 succeeded at 1183 (offset 3 lines).
Hunk #25 succeeded at 1268 (offset 3 lines).
Hunk #26 succeeded at 1282 (offset 3 lines).
Hunk #27 succeeded at 1316 (offset 3 lines).
Hunk #28 succeeded at 1430 (offset 3 lines).
Hunk #29 succeeded at 1527 (offset 3 lines).
Hunk #30 succeeded at 1569 (offset 3 lines).
Hunk #31 succeeded at 1590 (offset 3 lines).
patching file drivers/usb/dwc3/debug.h
patching file drivers/usb/dwc3/debugfs.c
Hunk #1 succeeded at 440 (offset -14 lines).
Hunk #2 succeeded at 666 with fuzz 2 (offset -21 lines).
Hunk #3 succeeded at 673 with fuzz 1 (offset -26 lines).
Hunk #4 FAILED at 716.
Hunk #5 FAILED at 728.
2 out of 5 hunks FAILED -- saving rejects to file drivers/usb/dwc3/debugfs.c.rej
patching file drivers/usb/dwc3/drd.c
patching file drivers/usb/dwc3/ep0.c
Hunk #1 succeeded at 597 (offset -3 lines).
Hunk #2 succeeded at 621 (offset -3 lines).
patching file drivers/usb/dwc3/gadget.c
Hunk #1 succeeded at 311 (offset -1 lines).
Hunk #2 succeeded at 406 (offset -1 lines).
Hunk #3 succeeded at 630 (offset -1 lines).
Hunk #4 succeeded at 834 (offset -1 lines).
Hunk #5 succeeded at 920 (offset -1 lines).
Hunk #6 succeeded at 994 (offset -1 lines).
Hunk #7 succeeded at 1157 (offset -1 lines).
Hunk #8 succeeded at 1207 (offset -1 lines).
Hunk #9 succeeded at 1259 (offset -1 lines).
Hunk #10 succeeded at 1266 (offset -1 lines).
Hunk #11 succeeded at 1602 (offset -1 lines).
Hunk #12 succeeded at 1818 (offset -26 lines).
Hunk #13 succeeded at 1931 (offset -26 lines).
Hunk #14 succeeded at 1993 (offset -26 lines).
Hunk #15 succeeded at 2015 (offset -26 lines).
Hunk #16 succeeded at 2063 (offset -26 lines).
Hunk #17 succeeded at 2269 (offset -26 lines).
Hunk #18 succeeded at 2387 (offset -26 lines).
Hunk #19 succeeded at 2415 (offset -26 lines).
Hunk #20 succeeded at 2460 with fuzz 1 (offset -28 lines).
Hunk #21 succeeded at 2514 (offset -28 lines).
Hunk #22 succeeded at 2527 (offset -28 lines).
Hunk #23 succeeded at 2570 (offset -28 lines).
Hunk #24 succeeded at 2588 (offset -28 lines).
Hunk #25 succeeded at 2625 (offset -28 lines).
Hunk #26 succeeded at 2723 (offset -28 lines).
Hunk #27 succeeded at 2775 (offset -28 lines).
Hunk #28 succeeded at 2874 (offset -28 lines).
Hunk #29 succeeded at 2901 (offset -28 lines).
Hunk #30 succeeded at 2946 (offset -28 lines).
Hunk #31 succeeded at 3201 (offset -28 lines).
Hunk #32 succeeded at 3221 (offset -28 lines).
Hunk #33 succeeded at 3246 (offset -28 lines).
Hunk #34 succeeded at 3278 (offset -28 lines).
Hunk #35 succeeded at 3384 (offset -28 lines).
Hunk #36 succeeded at 3522 (offset -28 lines).
Hunk #37 succeeded at 3531 (offset -28 lines).
Hunk #38 succeeded at 3540 (offset -28 lines).
Hunk #39 FAILED at 3580.
Hunk #40 FAILED at 3618.
Hunk #41 succeeded at 3725 (offset -16 lines).
Hunk #42 succeeded at 3751 (offset -16 lines).
Hunk #43 succeeded at 3777 (offset -16 lines).
Hunk #44 succeeded at 3873 (offset -16 lines).
Hunk #45 succeeded at 4039 (offset -18 lines).
Hunk #46 succeeded at 4107 (offset -18 lines).
Hunk #47 succeeded at 4120 (offset -18 lines).
Hunk #48 succeeded at 4130 (offset -18 lines).
Hunk #49 succeeded at 4283 (offset -23 lines).
Hunk #50 succeeded at 4310 (offset -23 lines).
Hunk #51 succeeded at 4327 (offset -23 lines).
Hunk #52 succeeded at 4385 (offset -23 lines).
2 out of 52 hunks FAILED -- saving rejects to file drivers/usb/dwc3/gadget.c.rej
patching file drivers/usb/dwc3/gadget.h
patching file drivers/usb/dwc3/trace.c
patching file drivers/usb/gadget/composite.c
patching file drivers/usb/gadget/configfs.c
patching file drivers/usb/gadget/epautoconf.c
patching file drivers/usb/gadget/function/f_fs.c
Hunk #3 succeeded at 1714 (offset -5 lines).
Hunk #4 succeeded at 1770 (offset -5 lines).
Hunk #5 succeeded at 1793 (offset -5 lines).
Hunk #6 succeeded at 1922 (offset -9 lines).
Hunk #7 succeeded at 1945 (offset -9 lines).
Hunk #8 succeeded at 2800 (offset -9 lines).
Hunk #9 succeeded at 2873 (offset -9 lines).
Hunk #10 succeeded at 3410 (offset -9 lines).
patching file drivers/usb/gadget/function/f_mass_storage.c
Hunk #2 succeeded at 2301 (offset -16 lines).
patching file drivers/usb/gadget/function/f_uvc.c
patching file drivers/usb/gadget/function/u_audio.h
patching file drivers/usb/gadget/function/u_serial.c
Hunk #1 succeeded at 258 (offset -3 lines).
Hunk #2 succeeded at 344 (offset -3 lines).
Hunk #3 succeeded at 707 (offset -6 lines).
patching file drivers/usb/gadget/function/u_uac2.h
patching file drivers/usb/gadget/function/u_uvc.h
patching file drivers/usb/gadget/function/uvc.h
patching file drivers/usb/gadget/function/uvc_configfs.c
Hunk #2 succeeded at 768 (offset -57 lines).
Hunk #3 succeeded at 1080 (offset -57 lines).
Hunk #4 succeeded at 1199 (offset -57 lines).
Hunk #5 succeeded at 1334 (offset -57 lines).
Hunk #6 succeeded at 1347 (offset -57 lines).
Hunk #7 succeeded at 1392 (offset -57 lines).
Hunk #8 succeeded at 1405 (offset -57 lines).
Hunk #9 succeeded at 1416 (offset -57 lines).
Hunk #10 succeeded at 1449 (offset -57 lines).
Hunk #11 succeeded at 1893 (offset -57 lines).
Hunk #12 succeeded at 2341 (offset -57 lines).
Hunk #13 succeeded at 2355 (offset -57 lines).
Hunk #14 succeeded at 2370 (offset -57 lines).
Hunk #15 succeeded at 2445 (offset -57 lines).
Hunk #16 succeeded at 2463 (offset -57 lines).
Hunk #17 succeeded at 2479 (offset -57 lines).
Hunk #18 succeeded at 2694 (offset -57 lines).
Hunk #19 succeeded at 2762 (offset -57 lines).
patching file drivers/usb/gadget/function/uvc_queue.c
patching file drivers/usb/gadget/function/uvc_v4l2.c
patching file drivers/usb/gadget/function/uvc_video.c
patching file drivers/usb/gadget/udc/Kconfig
patching file drivers/usb/gadget/udc/core.c
Hunk #6 succeeded at 1087 (offset -19 lines).
Hunk #7 succeeded at 1114 (offset -19 lines).
Hunk #8 succeeded at 1136 (offset -19 lines).
Hunk #9 succeeded at 1297 (offset -19 lines).
Hunk #10 succeeded at 1411 with fuzz 1 (offset -17 lines).
Hunk #11 succeeded at 1491 (offset -19 lines).
patching file drivers/usb/gadget/udc/trace.c
patching file drivers/usb/host/Makefile
patching file drivers/usb/host/ehci-platform.c
patching file drivers/usb/host/ehci.h
patching file drivers/usb/host/fotg210.h
patching file drivers/usb/host/ohci-platform.c
patching file drivers/usb/host/xhci-hub.c
patching file drivers/usb/host/xhci-mem.c
Hunk #25 succeeded at 2547 (offset -20 lines).
patching file drivers/usb/host/xhci-pci.c
Hunk #1 succeeded at 288 (offset -2 lines).
patching file drivers/usb/host/xhci-plat.c
Hunk #3 succeeded at 358 with fuzz 2 (offset -3 lines).
Hunk #4 succeeded at 377 (offset -3 lines).
Hunk #5 succeeded at 460 (offset -3 lines).
Hunk #6 succeeded at 481 (offset -3 lines).
Hunk #7 succeeded at 488 (offset -3 lines).
Hunk #8 FAILED at 500.
1 out of 8 hunks FAILED -- saving rejects to file drivers/usb/host/xhci-plat.c.rej
patching file drivers/usb/host/xhci-plat.h
patching file drivers/usb/host/xhci-ring.c
Hunk #15 FAILED at 914.
Hunk #16 FAILED at 940.
Hunk #17 FAILED at 972.
Hunk #18 succeeded at 1272 (offset 2 lines).
Hunk #19 succeeded at 1283 (offset 2 lines).
Hunk #20 succeeded at 1291 (offset 2 lines).
Hunk #21 succeeded at 1345 (offset 2 lines).
Hunk #22 succeeded at 1353 (offset 2 lines).
Hunk #23 succeeded at 1382 (offset 2 lines).
Hunk #24 succeeded at 1391 (offset 2 lines).
Hunk #25 succeeded at 1400 (offset 2 lines).
Hunk #26 succeeded at 1442 (offset 2 lines).
Hunk #27 succeeded at 1460 (offset 2 lines).
Hunk #28 succeeded at 1506 (offset 2 lines).
Hunk #29 succeeded at 1619 (offset 2 lines).
Hunk #30 succeeded at 1627 (offset 2 lines).
Hunk #31 succeeded at 1692 (offset 2 lines).
Hunk #32 succeeded at 1703 (offset 2 lines).
Hunk #33 succeeded at 1727 (offset 2 lines).
Hunk #34 succeeded at 1754 (offset 2 lines).
Hunk #35 succeeded at 2120 (offset 3 lines).
Hunk #36 succeeded at 2176 (offset 3 lines).
Hunk #37 succeeded at 2520 (offset 3 lines).
Hunk #38 succeeded at 2546 (offset 3 lines).
Hunk #39 succeeded at 2626 (offset 3 lines).
Hunk #40 succeeded at 2934 (offset 3 lines).
Hunk #41 succeeded at 2960 (offset 3 lines).
Hunk #42 succeeded at 3003 (offset 3 lines).
Hunk #43 succeeded at 3040 (offset 3 lines).
Hunk #44 succeeded at 3085 (offset 3 lines).
Hunk #45 succeeded at 3181 (offset 3 lines).
Hunk #46 succeeded at 3252 (offset 3 lines).
Hunk #47 succeeded at 3283 (offset 3 lines).
Hunk #48 succeeded at 3603 (offset 3 lines).
Hunk #49 succeeded at 4402 (offset 3 lines).
3 out of 49 hunks FAILED -- saving rejects to file drivers/usb/host/xhci-ring.c.rej
patching file drivers/usb/host/xhci-trace.c
patching file drivers/usb/host/xhci.c
Hunk #1 succeeded at 20 (offset -1 lines).
Hunk #2 succeeded at 1330 (offset -6 lines).
Hunk #3 succeeded at 1341 (offset -6 lines).
Hunk #4 succeeded at 1352 (offset -6 lines).
Hunk #5 succeeded at 1518 (offset -6 lines).
Hunk #6 succeeded at 1723 (offset -6 lines).
Hunk #7 succeeded at 1774 (offset -6 lines).
Hunk #8 succeeded at 1835 (offset -6 lines).
Hunk #9 succeeded at 1842 (offset -6 lines).
Hunk #10 succeeded at 1857 (offset -6 lines).
Hunk #11 succeeded at 1932 (offset -6 lines).
Hunk #12 succeeded at 1956 (offset -6 lines).
Hunk #13 succeeded at 2866 (offset -6 lines).
Hunk #14 succeeded at 2998 (offset -6 lines).
Hunk #15 succeeded at 3017 (offset -6 lines).
Hunk #16 succeeded at 3041 (offset -6 lines).
Hunk #17 succeeded at 3186 (offset -6 lines).
Hunk #18 succeeded at 3224 (offset -6 lines).
Hunk #19 succeeded at 3774 (offset -6 lines).
Hunk #20 succeeded at 4031 (offset -6 lines).
Hunk #21 succeeded at 4169 (offset -6 lines).
Hunk #22 succeeded at 4262 (offset -6 lines).
Hunk #23 succeeded at 4326 (offset -6 lines).
Hunk #24 succeeded at 4358 (offset -6 lines).
Hunk #25 succeeded at 5129 (offset -6 lines).
Hunk #26 succeeded at 5462 (offset -6 lines).
patching file drivers/usb/host/xhci.h
Hunk #4 succeeded at 1927 (offset -2 lines).
Hunk #5 succeeded at 1937 (offset -2 lines).
Hunk #6 succeeded at 2074 (offset -2 lines).
Hunk #7 succeeded at 2098 (offset -2 lines).
Hunk #8 succeeded at 2154 (offset -2 lines).
Hunk #9 succeeded at 2214 (offset -2 lines).
patching file drivers/usb/serial/cp210x.c
Hunk #1 succeeded at 245 (offset -2 lines).
Hunk #2 succeeded at 268 (offset -2 lines).
Hunk #3 succeeded at 1339 (offset -2 lines).
Hunk #4 succeeded at 1752 (offset -2 lines).
Hunk #5 succeeded at 1762 (offset -2 lines).
Hunk #6 succeeded at 1774 (offset -2 lines).
Hunk #7 succeeded at 2094 (offset -2 lines).
Hunk #8 succeeded at 2114 (offset -2 lines).
patching file drivers/usb/serial/option.c
Hunk #1 succeeded at 257 with fuzz 2 (offset -7 lines).
Hunk #2 succeeded at 1177 (offset -28 lines).
patching file drivers/usb/serial/qcserial.c
patching file drivers/usb/storage/scsiglue.c
patching file drivers/usb/storage/unusual_devs.h
patching file drivers/usb/storage/unusual_uas.h
Hunk #3 succeeded at 124 with fuzz 2.
Hunk #4 succeeded at 144 (offset -7 lines).
patching file drivers/usb/typec/altmodes/displayport.c
Hunk #1 succeeded at 15 with fuzz 1 (offset -2 lines).
Hunk #2 succeeded at 45 (offset -2 lines).
Hunk #3 succeeded at 93 (offset -4 lines).
Hunk #4 FAILED at 108.
Hunk #5 succeeded at 163 (offset -14 lines).
Hunk #6 succeeded at 193 (offset -14 lines).
Hunk #7 succeeded at 207 (offset -14 lines).
Hunk #8 FAILED at 301.
Hunk #9 succeeded at 425 (offset -19 lines).
Hunk #10 succeeded at 451 (offset -19 lines).
Hunk #11 succeeded at 488 (offset -19 lines).
Hunk #12 FAILED at 522.
Hunk #13 FAILED at 552.
4 out of 13 hunks FAILED -- saving rejects to file drivers/usb/typec/altmodes/displayport.c.rej
patching file drivers/usb/typec/class.c
Hunk #10 succeeded at 513 (offset -2 lines).
Hunk #11 succeeded at 615 (offset -6 lines).
Hunk #12 succeeded at 669 (offset -6 lines).
Hunk #13 succeeded at 756 (offset -6 lines).
Hunk #14 succeeded at 831 (offset -6 lines).
Hunk #15 succeeded at 867 (offset -6 lines).
Hunk #16 succeeded at 920 (offset -6 lines).
Hunk #17 succeeded at 1029 (offset -6 lines).
Hunk #18 succeeded at 1062 (offset -6 lines).
Hunk #19 succeeded at 1082 (offset -6 lines).
Hunk #20 succeeded at 1185 (offset -6 lines).
Hunk #21 succeeded at 1555 (offset -6 lines).
Hunk #22 succeeded at 1632 (offset -6 lines).
Hunk #23 succeeded at 1675 (offset -6 lines).
Hunk #24 succeeded at 1689 (offset -6 lines).
Hunk #25 succeeded at 1746 (offset -6 lines).
Hunk #26 succeeded at 1916 (offset -6 lines).
Hunk #27 succeeded at 1984 (offset -6 lines).
patching file drivers/usb/typec/ucsi/Kconfig
patching file drivers/video/backlight/pwm_bl.c
patching file drivers/video/fbdev/kyro/fbdev.c
patching file include/drm/bridge/analogix_dp.h
patching file include/drm/bridge/dw_hdmi.h
patching file include/drm/bridge/dw_mipi_dsi.h
patching file include/drm/drm_connector.h
Hunk #3 FAILED at 1083.
Hunk #4 FAILED at 1235.
Hunk #5 FAILED at 1254.
3 out of 5 hunks FAILED -- saving rejects to file include/drm/drm_connector.h.rej
patching file include/drm/drm_crtc.h
patching file include/drm/drm_drv.h
patching file include/drm/drm_edid.h
patching file include/drm/drm_file.h
patching file include/drm/drm_mipi_dsi.h
patching file include/drm/drm_mode_config.h
patching file include/drm/drm_mode_object.h
patching file include/drm/drm_prime.h
patching file include/dt-bindings/clock/rk3588-cru.h
patching file include/dt-bindings/display/drm_mipi_dsi.h
patching file include/dt-bindings/display/media-bus-format.h
patching file include/dt-bindings/display/mipi_dsi.h
patching file include/dt-bindings/display/rockchip_vop.h
patching file include/dt-bindings/dram/rockchip,rk322x.h
patching file include/dt-bindings/dram/rockchip,rk3368.h
patching file include/dt-bindings/input/rk-input.h
patching file include/dt-bindings/phy/phy-snps-pcie3.h
patching file include/dt-bindings/power/rk3588-power.h
patching file include/dt-bindings/reset/rk628-rgu.h
patching file include/dt-bindings/sensor-dev.h
patching file include/dt-bindings/soc/rockchip,boot-mode.h
patching file include/dt-bindings/soc/rockchip-system-status.h
patching file include/dt-bindings/suspend/rockchip-rk3588.h
patching file include/linux/clk-provider.h
Hunk #3 succeeded at 606 (offset -27 lines).
Hunk #4 succeeded at 955 (offset -35 lines).
Hunk #5 succeeded at 966 (offset -35 lines).
Hunk #6 succeeded at 1038 (offset -35 lines).
Hunk #7 succeeded at 1087 (offset -35 lines).
Hunk #8 succeeded at 1100 (offset -35 lines).
patching file include/linux/dma-buf.h
patching file include/linux/dma-fence.h
patching file include/linux/dma-heap.h
patching file include/linux/dma-iommu.h
patching file include/linux/dma-mapping.h
patching file include/linux/energy_model.h
patching file include/linux/extcon.h
patching file include/linux/freezer.h
patching file include/linux/iommu.h
patching file include/linux/iova.h
patching file include/linux/irqchip/arm-gic-v3.h
patching file include/linux/irqchip/arm-gic-v4.h
Hunk #2 succeeded at 106 (offset -2 lines).
Hunk #3 succeeded at 132 (offset -2 lines).
patching file include/linux/mfd/rk808.h
patching file include/linux/mmc/core.h
patching file include/linux/mmc/host.h
Hunk #2 succeeded at 473 (offset -1 lines).
patching file include/linux/mmc/mmc.h
patching file include/linux/mmc/pm.h
patching file include/linux/mmu_context.h
patching file include/linux/power_supply.h
Hunk #3 succeeded at 437 (offset -1 lines).
patching file include/linux/pwm.h
patching file include/linux/reboot-mode.h
patching file include/linux/reboot.h
patching file include/linux/sched.h
patching file include/linux/stmmac.h
Hunk #1 succeeded at 183 (offset 1 line).
patching file include/linux/usb/composite.h
patching file include/linux/usb/gadget.h
Hunk #6 FAILED at 334.
Hunk #7 succeeded at 350 (offset -1 lines).
Hunk #8 succeeded at 421 (offset -1 lines).
Hunk #9 succeeded at 453 (offset -1 lines).
1 out of 9 hunks FAILED -- saving rejects to file include/linux/usb/gadget.h.rej
patching file include/linux/usb/hcd.h
Hunk #4 succeeded at 574 (offset -5 lines).
patching file include/linux/usb/otg.h
patching file include/linux/usb/pd.h
patching file include/linux/usb/pd_ext_sdb.h
patching file include/linux/usb/pd_vdo.h
patching file include/linux/usb/phy.h
patching file include/linux/usb/quirks.h
patching file include/linux/usb/tcpm.h
patching file include/linux/usb/typec.h
patching file include/linux/usb/typec_altmode.h
patching file include/linux/usb/typec_tbt.h
patching file include/media/v4l2-async.h
patching file include/soc/rockchip/rockchip_sip.h
patching file include/sound/hdmi-codec.h
patching file include/sound/hwdep.h
patch: **** malformed patch at line 76596: @@ -20,11 +21,18 @@

这种情况应该是怎么修改？怎样的定位错误的思路？恳请大佬解答。