openRuyi-tutorials/buildroot
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configs/zynqmp_kria*: fix u-boot boot hang

Browse Source 
If the u-boot DP driver attempts to configure the Kria SOM DP before it is
released from reset, it will cause a boot hang.  Since the KV260 uses the DP
by default, this patch needs to be included with buildroot until it is part
of a u-boot-xlnx release tag.

While only the KV260 is directly affected, there is no issue with applying
this patch to all 3 zynqmp_kria defconfigs.

This patch has also been committed to u-boot upstream.

Upstream: https://github.com/u-boot/u-boot/commit/8b81010a2fe385524b58bea9116f1b6954c3d2bd

Signed-off-by: Neal Frager <neal.frager@amd.com>
[Julien: fix check-package error by adding Upstream tag in patch]
Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
Neal Frager
2024-12-18 13:18:32 +00:00
committed by Julien Olivain
parent b0207c1f15
commit edffcbcee9
4 changed files with 45 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
board/zynqmp/kria/patches/uboot/0001-video-zynqmp-add-support-for-reset.patch
+42
View File
@@ -0,0 +1,42 @@
From: Michal Simek <michal.simek@amd.com>
Date: Mon, 9 Dec 2024 12:11:50 +0100
Subject: [PATCH] video: zynqmp: Add support for reset
In Kria SOM configuration DP is under reset and access to DP is causing
hang that's why call reset at probe to avoid this situation.
Signed-off-by: Michal Simek <michal.simek@amd.com>
Link: https://lore.kernel.org/r/0504474a91a9839828aecd37f8855fd154cdf2e1.1733742708.git.michal.simek@amd.com
Upstream: https://github.com/u-boot/u-boot/commit/8b81010a2fe385524b58bea9116f1b6954c3d2bd
---
drivers/video/zynqmp/zynqmp_dpsub.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/video/zynqmp/zynqmp_dpsub.c b/drivers/video/zynqmp/zynqmp_dpsub.c
index 76abfeac4433..52af23c3c835 100644
--- a/drivers/video/zynqmp/zynqmp_dpsub.c
+++ b/drivers/video/zynqmp/zynqmp_dpsub.c
@@ -11,6 +11,7 @@
#include <dm.h>
#include <errno.h>
#include <generic-phy.h>
+#include <reset.h>
#include <stdlib.h>
#include <video.h>
#include <wait_bit.h>
@@ -2093,10 +2094,15 @@ static int zynqmp_dpsub_probe(struct udevice *dev)
{
struct video_priv *uc_priv = dev_get_uclass_priv(dev);
struct zynqmp_dpsub_priv *priv = dev_get_priv(dev);
+ struct reset_ctl_bulk resets;
struct clk clk;
int ret;
int mode = RGBA8888;
+ ret = reset_get_bulk(dev, &resets);
+ if (!ret)
+ reset_deassert_bulk(&resets);
+
ret = clk_get_by_name(dev, "dp_apb_clk", &clk);
if (ret < 0) {
dev_err(dev, "failed to get clock\n");
configs/zynqmp_kria_kd240_defconfig
+1 -1
View File
@@ -1,6 +1,6 @@
BR2_aarch64=y
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
BR2_GLOBAL_PATCH_DIR="board/xilinx/patches"
BR2_GLOBAL_PATCH_DIR="board/zynqmp/kria/patches board/xilinx/patches"
BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh board/zynqmp/kria/kd240/kd240.sh"
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh"
configs/zynqmp_kria_kr260_defconfig
+1 -1
View File
@@ -1,6 +1,6 @@
BR2_aarch64=y
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
BR2_GLOBAL_PATCH_DIR="board/xilinx/patches"
BR2_GLOBAL_PATCH_DIR="board/zynqmp/kria/patches board/xilinx/patches"
BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh board/zynqmp/kria/kr260/kr260.sh"
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh"
configs/zynqmp_kria_kv260_defconfig
+1 -1
View File
@@ -1,6 +1,6 @@
BR2_aarch64=y
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
BR2_GLOBAL_PATCH_DIR="board/xilinx/patches"
BR2_GLOBAL_PATCH_DIR="board/zynqmp/kria/patches board/xilinx/patches"
BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh board/zynqmp/kria/kv260/kv260.sh"
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh"