| Message ID | 20230908152225.432139-4-vignesh.raman@collabora.com |
|---|---|
| State | New |
| Headers | show |
| Series | drm: ci: fixes | expand |
On Fri, Sep 08, 2023 at 08:52:19PM +0530, Vignesh Raman wrote: > Force db410c to host mode to fix network issue which results in failure > to mount root fs via NFS. > See https://gitlab.freedesktop.org/gfx-ci/linux/-/commit/cb72a629b8c15c80a54dda510743cefd1c4b65b8 > > Compile the base device tree with overlay support and use fdtoverlay > command to merge base device tree with an overlay which contains the > fix for USB controllers to work in host mode. [suggested by Maxime Ripard] > > Suggested-by: Maxime Ripard <mripard@kernel.org> > Signed-off-by: Vignesh Raman <vignesh.raman@collabora.com> > --- > > v2: > - Use fdtoverlay command to merge overlay dtbo with the base dtb instead of modifying the kernel sources > > v3: > - drm-ci scripts to use device tree overlay from arch/arm64/boot/dts/qcom and compile base device tree with overlay support > > --- > drivers/gpu/drm/ci/build.sh | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/ci/build.sh b/drivers/gpu/drm/ci/build.sh > index 7b014287a041..092c195af242 100644 > --- a/drivers/gpu/drm/ci/build.sh > +++ b/drivers/gpu/drm/ci/build.sh > @@ -91,7 +91,12 @@ for image in ${KERNEL_IMAGE_NAME}; do > done > > if [[ -n ${DEVICE_TREES} ]]; then > - make dtbs > + make DTC_FLAGS=-@ dtbs > + if [[ -e arch/arm64/boot/dts/qcom/apq8016-sbc.dtb ]]; then > + dtc -@ -I dts -O dtb -o arch/arm64/boot/dts/qcom/apq8016-sbc-usb-host.dtbo arch/arm64/boot/dts/qcom/apq8016-sbc-usb-host.dtso You don't need to compile it by hand, make dtbs should do it for you > + fdtoverlay -i arch/arm64/boot/dts/qcom/apq8016-sbc.dtb -o arch/arm64/boot/dts/qcom/apq8016-sbc-usb-host.dtb arch/arm64/boot/dts/qcom/apq8016-sbc-usb-host.dtbo > + mv arch/arm64/boot/dts/qcom/apq8016-sbc-usb-host.dtb arch/arm64/boot/dts/qcom/apq8016-sbc.dtb > + fi That is also supported by the build system already, see k3-am642-tqma64xxl-mbax4xxl-sdcard-dtbs in arch/arm64/boot/dts/ti/Makefile for example. Maxime
On 08/09/2023 12:22, Vignesh Raman wrote: > Force db410c to host mode to fix network issue which results in failure > to mount root fs via NFS. > See https://gitlab.freedesktop.org/gfx-ci/linux/-/commit/cb72a629b8c15c80a54dda510743cefd1c4b65b8 > > Compile the base device tree with overlay support and use fdtoverlay > command to merge base device tree with an overlay which contains the > fix for USB controllers to work in host mode. [suggested by Maxime Ripard] > > Suggested-by: Maxime Ripard <mripard@kernel.org> > Signed-off-by: Vignesh Raman <vignesh.raman@collabora.com> Acked-by: Helen Koike <helen.koike@collabora.com> > --- > > v2: > - Use fdtoverlay command to merge overlay dtbo with the base dtb instead of modifying the kernel sources > > v3: > - drm-ci scripts to use device tree overlay from arch/arm64/boot/dts/qcom and compile base device tree with overlay support > > --- > drivers/gpu/drm/ci/build.sh | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/ci/build.sh b/drivers/gpu/drm/ci/build.sh > index 7b014287a041..092c195af242 100644 > --- a/drivers/gpu/drm/ci/build.sh > +++ b/drivers/gpu/drm/ci/build.sh > @@ -91,7 +91,12 @@ for image in ${KERNEL_IMAGE_NAME}; do > done > > if [[ -n ${DEVICE_TREES} ]]; then > - make dtbs > + make DTC_FLAGS=-@ dtbs > + if [[ -e arch/arm64/boot/dts/qcom/apq8016-sbc.dtb ]]; then > + dtc -@ -I dts -O dtb -o arch/arm64/boot/dts/qcom/apq8016-sbc-usb-host.dtbo arch/arm64/boot/dts/qcom/apq8016-sbc-usb-host.dtso > + fdtoverlay -i arch/arm64/boot/dts/qcom/apq8016-sbc.dtb -o arch/arm64/boot/dts/qcom/apq8016-sbc-usb-host.dtb arch/arm64/boot/dts/qcom/apq8016-sbc-usb-host.dtbo > + mv arch/arm64/boot/dts/qcom/apq8016-sbc-usb-host.dtb arch/arm64/boot/dts/qcom/apq8016-sbc.dtb > + fi > cp ${DEVICE_TREES} /lava-files/. > fi >
diff --git a/drivers/gpu/drm/ci/build.sh b/drivers/gpu/drm/ci/build.sh index 7b014287a041..092c195af242 100644 --- a/drivers/gpu/drm/ci/build.sh +++ b/drivers/gpu/drm/ci/build.sh @@ -91,7 +91,12 @@ for image in ${KERNEL_IMAGE_NAME}; do done if [[ -n ${DEVICE_TREES} ]]; then - make dtbs + make DTC_FLAGS=-@ dtbs + if [[ -e arch/arm64/boot/dts/qcom/apq8016-sbc.dtb ]]; then + dtc -@ -I dts -O dtb -o arch/arm64/boot/dts/qcom/apq8016-sbc-usb-host.dtbo arch/arm64/boot/dts/qcom/apq8016-sbc-usb-host.dtso + fdtoverlay -i arch/arm64/boot/dts/qcom/apq8016-sbc.dtb -o arch/arm64/boot/dts/qcom/apq8016-sbc-usb-host.dtb arch/arm64/boot/dts/qcom/apq8016-sbc-usb-host.dtbo + mv arch/arm64/boot/dts/qcom/apq8016-sbc-usb-host.dtb arch/arm64/boot/dts/qcom/apq8016-sbc.dtb + fi cp ${DEVICE_TREES} /lava-files/. fi
Force db410c to host mode to fix network issue which results in failure to mount root fs via NFS. See https://gitlab.freedesktop.org/gfx-ci/linux/-/commit/cb72a629b8c15c80a54dda510743cefd1c4b65b8 Compile the base device tree with overlay support and use fdtoverlay command to merge base device tree with an overlay which contains the fix for USB controllers to work in host mode. [suggested by Maxime Ripard] Suggested-by: Maxime Ripard <mripard@kernel.org> Signed-off-by: Vignesh Raman <vignesh.raman@collabora.com> --- v2: - Use fdtoverlay command to merge overlay dtbo with the base dtb instead of modifying the kernel sources v3: - drm-ci scripts to use device tree overlay from arch/arm64/boot/dts/qcom and compile base device tree with overlay support --- drivers/gpu/drm/ci/build.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)