[SRU][bionic/azure-4.15][PATCH 5/5] UBUNTU: [Config] linux-azure: CONFIG_HYPERV_IOMMU=y

[Kleber Souza]

On 10.12.21 18:40, Bartlomiej Zolnierkiewicz wrote:
> From: Marcelo Henrique Cerri <marcelo.cerri at canonical.com>
>
> BugLink: https://bugs.launchpad.net/bugs/1951924
> BugLink: https://bugs.launchpad.net/bugs/1826447

The link to LP#1826447 is not needed and can be removed. This bug report
is already marked as Fix Released and this config change is now being
applied for different reasons (LP#1951924).


>
> Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri at canonical.com>
> Acked-by: Kleber Souza <kleber.souza at canonical.com>
> Acked-by: Connor Kuehl <connor.kuehl at canonical.com>
> Signed-off-by: Khalid Elmously <khalid.elmously at canonical.com>
> (backported from commit acda62805a1a32e12384c94685a911812bde5032)

When the sha1 is used like the above we need to state from where this comes
from when it's not on Linus' mainline tree. The format is

  (cherry picked|backported from commit <sha1> <upstream repo name>)

But as Tim mentioned, config and packaging changes don't need this formality
and this can be removed when applying the patch.

> Signed-off-by: Bartlomiej Zolnierkiewicz <bartlomiej.zolnierkiewicz at canonical.com>
> ---
>   debian.azure-4.15/config/annotations          | 3 +++
>   debian.azure-4.15/config/config.common.ubuntu | 1 +
>   2 files changed, 4 insertions(+)
>
> diff --git a/debian.azure-4.15/config/annotations b/debian.azure-4.15/config/annotations
> index d300698de517..ce3a6a8236cc 100644
> --- a/debian.azure-4.15/config/annotations
> +++ b/debian.azure-4.15/config/annotations
> @@ -227,6 +227,9 @@ CONFIG_SATA_VITESSE                                mark<ENFORCED> note<modules r
>   CONFIG_SATA_ZPODD                                  policy<{'amd64': 'n'}>
>   CONFIG_SATA_ZPODD                                  mark<ENFORCED> note<modules reduction>
>   
> +CONFIG_HYPERV_IOMMU                                policy<{'amd64': 'y'}>
> +CONFIG_HYPERV_IOMMU                                mark<ENFORCED> note<LP:#1826447>
> +
>   # Changes made to the generic kernel that are not necessary in the Azure kernel
>   
>   CONFIG_REGULATOR_TWL4030                           policy<{'amd64': '-'}>
> diff --git a/debian.azure-4.15/config/config.common.ubuntu b/debian.azure-4.15/config/config.common.ubuntu
> index e6429b742522..9ae6548486bc 100644
> --- a/debian.azure-4.15/config/config.common.ubuntu
> +++ b/debian.azure-4.15/config/config.common.ubuntu
> @@ -1830,6 +1830,7 @@ CONFIG_HYPERV=y
>   CONFIG_HYPERVISOR_GUEST=y
>   CONFIG_HYPERV_BALLOON=m
>   CONFIG_HYPERV_INFINIBAND_ND=m
> +CONFIG_HYPERV_IOMMU=y
>   CONFIG_HYPERV_KEYBOARD=m
>   CONFIG_HYPERV_NET=m
>   CONFIG_HYPERV_STORAGE=y