Re: [PATCH 2/6] drm: ci: Force db410c to host mode

From: Maxime Ripard
Date: Fri Aug 25 2023 - 10:28:51 EST


Hi Helen,

On Fri, Aug 25, 2023 at 03:09:04PM +0100, Helen Mae Koike Fornazier wrote:
> Hi Jani, thanks for your comments
>
> On Friday, August 25, 2023 10:56 -03, Jani Nikula <jani.nikula@xxxxxxxxxxxxxxx> wrote:
>
> > On Fri, 25 Aug 2023, Vignesh Raman <vignesh.raman@xxxxxxxxxxxxx> 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
> > >
> > > Since this fix is not sent upstream, add it to build.sh script
> > > before building the kernel and dts. Better approach would be
> > > to use devicetree overlays.
> > >
> > > Signed-off-by: Vignesh Raman <vignesh.raman@xxxxxxxxxxxxx>
> > > ---
> > > drivers/gpu/drm/ci/build.sh | 4 ++++
> > > 1 file changed, 4 insertions(+)
> > >
> > > diff --git a/drivers/gpu/drm/ci/build.sh b/drivers/gpu/drm/ci/build.sh
> > > index 7b014287a041..c39834bd6bd7 100644
> > > --- a/drivers/gpu/drm/ci/build.sh
> > > +++ b/drivers/gpu/drm/ci/build.sh
> > > @@ -70,6 +70,10 @@ if [ -z "$CI_MERGE_REQUEST_PROJECT_PATH" ]; then
> > > fi
> > > 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
> > > +sed -i '/&usb {/,/status = "okay";/s/status = "okay";/&\n\tdr_mode = "host";/' arch/arm64/boot/dts/qcom/apq8016-sbc.dts
> > > +
> >
> > It seems like a really bad idea to me to have the CI build modify the
> > source tree before building.
> >
> > The kernel being built will have a dirty git repo, and the localversion
> > will have -dirty in it.
>
> Is it bad?
>
> The other option was to work with device tree overlays (but we still
> need to spend some time to see how to fit it all together)

That would be much better. libfdt provides an fdtoverlay command to
merge a base device tree with an overlay.

Do that while setting up the DUT and you're done :)

Maxime

Attachment: signature.asc
Description: PGP signature