| Message ID | 20240417120741.2453431-5-olekstysh@gmail.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Misc updates for the dom0less support | expand |
On 17/04/2024 14:07, Oleksandr Tyshchenko wrote: > > > From: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com> > > Introduce new option DOMU_VPL011[nr] that can be set to 0 > or 1 (default). > > Also align "console=ttyAMA0" Linux cmd arg setting with "vpl011" presense. > > Suggested-by: Michal Orzel <michal.orzel@amd.com> > Signed-off-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com> Reviewed-by: Michal Orzel <michal.orzel@amd.com> That said, I noticed ... > --- > README.md | 7 ++++++- > scripts/uboot-script-gen | 7 +++++-- > 2 files changed, 11 insertions(+), 3 deletions(-) > > diff --git a/README.md b/README.md > index b2459fd..63c4708 100644 > --- a/README.md > +++ b/README.md > @@ -151,7 +151,8 @@ Where: > - DOMU_KERNEL[number] specifies the DomU kernel to use. > > - DOMU_CMD[number] specifies the command line arguments for DomU's Linux > - kernel. If not set, then "console=ttyAMA0" is used. > + kernel. If not set and DOMU_VPL011[number] is not set to 0, then > + "console=ttyAMA0" is used. > > - DOMU_RAMDISK[number] specifies the DomU ramdisk to use. > > @@ -232,6 +233,10 @@ Where: > - DOMU_MAPTRACK_FRAMES[number] is optional but specifies the maximum number > of grant maptrack frames (the default value used by Xen on Arm64 is 1024) > > +- DOMU_VPL011[number] is optional but used to enable (1)/disable (0) a virtual > + PL011 UART for domain. The default is 1. If explicitly set to 0, then > + "console=ttyAMA0" is not used as a default DOMU_CMD[number]. > + > - DOMU_CPUPOOL[number] specifies the id of the cpupool (created using > CPUPOOL[number] option, where number == id) that will be assigned to domU. > > diff --git a/scripts/uboot-script-gen b/scripts/uboot-script-gen > index adec6f9..fd37e18 100755 > --- a/scripts/uboot-script-gen > +++ b/scripts/uboot-script-gen > @@ -344,7 +344,10 @@ function xen_device_tree_editing() > add_device_tree_static_mem "/chosen/domU$i" "${DOMU_STATIC_MEM[$i]}" > dt_set "/chosen/domU$i" "direct-map" "bool" "${DOMU_DIRECT_MAP[$i]}" > fi > - dt_set "/chosen/domU$i" "vpl011" "hex" "0x1" > + if test -z "${DOMU_VPL011[$i]}" || test "${DOMU_VPL011[$i]}" -eq "1" > + then > + dt_set "/chosen/domU$i" "vpl011" "hex" "0x1" ... that the property type is incorrect. According to Xen docs, this should be a bool property. @Stefano, can you fix it on commit? ~Michal
diff --git a/README.md b/README.md index b2459fd..63c4708 100644 --- a/README.md +++ b/README.md @@ -151,7 +151,8 @@ Where: - DOMU_KERNEL[number] specifies the DomU kernel to use. - DOMU_CMD[number] specifies the command line arguments for DomU's Linux - kernel. If not set, then "console=ttyAMA0" is used. + kernel. If not set and DOMU_VPL011[number] is not set to 0, then + "console=ttyAMA0" is used. - DOMU_RAMDISK[number] specifies the DomU ramdisk to use. @@ -232,6 +233,10 @@ Where: - DOMU_MAPTRACK_FRAMES[number] is optional but specifies the maximum number of grant maptrack frames (the default value used by Xen on Arm64 is 1024) +- DOMU_VPL011[number] is optional but used to enable (1)/disable (0) a virtual + PL011 UART for domain. The default is 1. If explicitly set to 0, then + "console=ttyAMA0" is not used as a default DOMU_CMD[number]. + - DOMU_CPUPOOL[number] specifies the id of the cpupool (created using CPUPOOL[number] option, where number == id) that will be assigned to domU. diff --git a/scripts/uboot-script-gen b/scripts/uboot-script-gen index adec6f9..fd37e18 100755 --- a/scripts/uboot-script-gen +++ b/scripts/uboot-script-gen @@ -344,7 +344,10 @@ function xen_device_tree_editing() add_device_tree_static_mem "/chosen/domU$i" "${DOMU_STATIC_MEM[$i]}" dt_set "/chosen/domU$i" "direct-map" "bool" "${DOMU_DIRECT_MAP[$i]}" fi - dt_set "/chosen/domU$i" "vpl011" "hex" "0x1" + if test -z "${DOMU_VPL011[$i]}" || test "${DOMU_VPL011[$i]}" -eq "1" + then + dt_set "/chosen/domU$i" "vpl011" "hex" "0x1" + fi if [[ "${DOMU_ENHANCED[$i]}" == 1 || ("$DOM0_KERNEL" && "${DOMU_ENHANCED[$i]}" != 0) ]] then dt_set "/chosen/domU$i" "xen,enhanced" "str" "enabled" @@ -677,7 +680,7 @@ function xen_config() then DOMU_VCPUS[$i]=1 fi - if test -z "${DOMU_CMD[$i]}" + if test -z "${DOMU_CMD[$i]}" && (test -z "${DOMU_VPL011[$i]}" || test "${DOMU_VPL011[$i]}" -eq "1") then DOMU_CMD[$i]="console=ttyAMA0" fi