diff mbox series

[jammy/linux-azure] UBUNTU: [Config] azure: CONFIG_SOUND=m

Message ID 20220526141611.11787-1-tim.gardner@canonical.com
State New
Headers show
Series [jammy/linux-azure] UBUNTU: [Config] azure: CONFIG_SOUND=m | expand

Commit Message

Tim Gardner May 26, 2022, 2:16 p.m. UTC
BugLink: https://bugs.launchpad.net/bugs/1970586

Enable generic sound modules for non-hardware specific
audio processing.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
 debian.azure/config/amd64/config.common.amd64 |  2 +
 debian.azure/config/annotations               | 67 ++++++++++++++++++-
 debian.azure/config/arm64/config.common.arm64 |  2 +
 debian.azure/config/config.common.ubuntu      | 44 +++++++++++-
 4 files changed, 109 insertions(+), 6 deletions(-)

Comments

Khalid Elmously June 14, 2022, 8 p.m. UTC | #1
Acked-by: Khalid Elmously <khalid.elmously@canonical.com>



On 2022-05-26 08:16:11 , Tim Gardner wrote:
> BugLink: https://bugs.launchpad.net/bugs/1970586
> 
> Enable generic sound modules for non-hardware specific
> audio processing.
> 
> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
> ---
>  debian.azure/config/amd64/config.common.amd64 |  2 +
>  debian.azure/config/annotations               | 67 ++++++++++++++++++-
>  debian.azure/config/arm64/config.common.arm64 |  2 +
>  debian.azure/config/config.common.ubuntu      | 44 +++++++++++-
>  4 files changed, 109 insertions(+), 6 deletions(-)
> 
> diff --git a/debian.azure/config/amd64/config.common.amd64 b/debian.azure/config/amd64/config.common.amd64
> index 29ac897bfefa..baa357a98a08 100644
> --- a/debian.azure/config/amd64/config.common.amd64
> +++ b/debian.azure/config/amd64/config.common.amd64
> @@ -32,6 +32,8 @@ CONFIG_NR_CPUS=8192
>  CONFIG_PGTABLE_LEVELS=5
>  # CONFIG_SATA_SIL is not set
>  # CONFIG_SATA_SIL24 is not set
> +CONFIG_SND_DRIVERS=y
> +CONFIG_SND_HDA_PREALLOC_SIZE=0
>  # CONFIG_USB_CONN_GPIO is not set
>  CONFIG_VFIO=y
>  CONFIG_VFIO_IOMMU_TYPE1=y
> diff --git a/debian.azure/config/annotations b/debian.azure/config/annotations
> index 140617cef6ab..f81600847033 100644
> --- a/debian.azure/config/annotations
> +++ b/debian.azure/config/annotations
> @@ -166,9 +166,6 @@ CONFIG_USB_EHCI_HCD_PLATFORM                       mark<ENFORCED> note<kernel re
>  CONFIG_TOUCHSCREEN_ELAN                            policy<{'amd64': '-', 'arm64': '-'}>
>  CONFIG_TOUCHSCREEN_ELAN                            mark<ENFORCED> note<kernel reduction>
>  
> -CONFIG_SOUND                                       policy<{'amd64': 'n', 'arm64': 'n'}>
> -CONFIG_SOUND                                       mark<ENFORCED> note<modules reduction>
> -
>  CONFIG_FUJITSU_ES                                  policy<{'amd64': 'n', 'arm64': 'n'}>
>  CONFIG_FUJITSU_ES                                  mark<ENFORCED> note<modules reduction>
>  
> @@ -302,3 +299,67 @@ CONFIG_SAMPLE_TRACE_PRINTK                         note<Unnecessary for Azure>
>  
>  CONFIG_SPI_INTEL_SPI_PLATFORM                      policy<{'amd64': '-'}>
>  CONFIG_SPI_INTEL_SPI_PLATFORM                      note<Unnecessary for Azure>
> +
> +#
> +# This block of annotations are related to LP: #1970586
> +#
> +CONFIG_SOUND                                       policy<{'amd64': 'm', 'arm64': 'm'}>
> +CONFIG_SOUND                                       mark<ENFORCED> note<LP: #1970586>
> +CONFIG_SND                                         policy<{'amd64': 'm', 'arm64': 'm'}>
> +CONFIG_SND                                         mark<ENFORCED> note<LP: #1970586>
> +CONFIG_SND_HRTIMER                                 policy<{'amd64': 'm', 'arm64': 'm'}>
> +CONFIG_SND_USB                                     policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_MOST_SND                                    policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_VERBOSE_PRINTK                          policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_VIDEO_CX88_ALSA                             policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_USB_CONFIGFS_F_MIDI                         policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_VIDEO_CX25821_ALSA                          policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_PCMCIA                                  policy<{'amd64': 'n', 'arm64': '-'}>
> +CONFIG_DEBUG_INFO_DWARF5                           policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_FIREWIRE                                policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_VIRTIO                                  policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_X86                                     policy<{'amd64': 'n'}>
> +CONFIG_SND_SOC                                     policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_USB_CONFIGFS_F_UAC1_LEGACY                  policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_PCI                                     policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_PROC_FS                                 policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_HID_PRODIKEYS                               policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_XEN_FRONTEND                            policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_HDA_PREALLOC_SIZE                       policy<{'amd64': '0', 'arm64': '64'}>
> +CONFIG_VIDEO_TM6000_ALSA                           policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_PCM_TIMER                               policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_VIDEO_TW686X                                policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_VIDEO_COBALT                                policy<{'amd64': 'n'}>
> +CONFIG_VIDEO_SAA7134_ALSA                          policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_SUPPORT_OLD_API                         policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_DRIVERS                                 policy<{'amd64': 'y', 'arm64': 'y'}>
> +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT          policy<{'amd64': 'y', 'arm64': 'y'}>
> +CONFIG_SND_SPI                                     policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_VIDEO_EM28XX_ALSA                           policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_DEBUG                                   policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_USB_CONFIGFS_F_UAC2                         policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_VIDEO_CX231XX_ALSA                          policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_USB_CONFIGFS_F_UAC1                         policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_VIDEO_CX23885                               policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_VIDEO_CX18_ALSA                             policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_VIDEO_GO7007                                policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_VIDEO_IVTV_ALSA                             policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_VIDEO_SOLO6X10                              policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_USB_AUDIO                                   policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_THINKPAD_ACPI_ALSA_SUPPORT                  policy<{'amd64': 'n'}>
> +CONFIG_VIDEO_USBTV                                 policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_USB_MIDI_GADGET                             policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_DYNAMIC_MINORS                          policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_OSSEMUL                                 policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_BCM2835                                 policy<{'arm64': 'n'}>
> +CONFIG_DRM_DW_HDMI_AHB_AUDIO                       policy<{'arm64': 'n'}>
> +CONFIG_SND_SERIAL_U16550                           policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_ALOOP                                   policy<{'amd64': 'm', 'arm64': 'm'}>
> +CONFIG_SND_MPU401                                  policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_MTPAV                                   policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_DUMMY                                   policy<{'amd64': 'm', 'arm64': 'm'}>
> +CONFIG_SND_PORTMAN2X4                              policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_VIRMIDI                                 policy<{'amd64': 'm', 'arm64': 'm'}>
> +CONFIG_SND_MTS64                                   policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_PCSP                                    policy<{'amd64': 'n'}>
> +
> diff --git a/debian.azure/config/arm64/config.common.arm64 b/debian.azure/config/arm64/config.common.arm64
> index d828e4f56e73..2718f6223780 100644
> --- a/debian.azure/config/arm64/config.common.arm64
> +++ b/debian.azure/config/arm64/config.common.arm64
> @@ -32,6 +32,8 @@ CONFIG_OF=y
>  CONFIG_PGTABLE_LEVELS=4
>  CONFIG_SATA_SIL=m
>  CONFIG_SATA_SIL24=m
> +# CONFIG_SND_DRIVERS is not set
> +CONFIG_SND_HDA_PREALLOC_SIZE=64
>  CONFIG_USB_CONN_GPIO=m
>  CONFIG_VFIO=m
>  CONFIG_VFIO_IOMMU_TYPE1=m
> diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu
> index 7672ad6a1eca..3914b5eb23e5 100644
> --- a/debian.azure/config/config.common.ubuntu
> +++ b/debian.azure/config/config.common.ubuntu
> @@ -1948,6 +1948,7 @@ CONFIG_DRM_DP_AUX_BUS=m
>  CONFIG_DRM_DP_AUX_CHARDEV=y
>  CONFIG_DRM_DP_CEC=y
>  CONFIG_DRM_DW_HDMI=m
> +# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
>  CONFIG_DRM_DW_HDMI_CEC=m
>  # CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
>  CONFIG_DRM_DW_MIPI_DSI=m
> @@ -3197,6 +3198,7 @@ CONFIG_I2C_MESON=m
>  CONFIG_I2C_MLXBF=m
>  CONFIG_I2C_MLXCPLD=m
>  CONFIG_I2C_MT65XX=m
> +# CONFIG_I2C_MULTI_INSTANTIATE is not set
>  CONFIG_I2C_MUX=m
>  # CONFIG_I2C_MUX_GPIO is not set
>  CONFIG_I2C_MUX_GPMUX=m
> @@ -4511,6 +4513,7 @@ CONFIG_MOST_COMPONENTS=m
>  CONFIG_MOST_DIM2=m
>  CONFIG_MOST_I2C=m
>  CONFIG_MOST_NET=m
> +# CONFIG_MOST_SND is not set
>  # CONFIG_MOST_USB_HDM is not set
>  CONFIG_MOST_VIDEO=m
>  CONFIG_MOTORCOMM_PHY=m
> @@ -6972,7 +6975,6 @@ CONFIG_SERIAL_MESON=y
>  CONFIG_SERIAL_MESON_CONSOLE=y
>  CONFIG_SERIAL_MSM=y
>  CONFIG_SERIAL_MSM_CONSOLE=y
> -CONFIG_SERIAL_MULTI_INSTANTIATE=m
>  CONFIG_SERIAL_MVEBU_CONSOLE=y
>  CONFIG_SERIAL_MVEBU_UART=y
>  CONFIG_SERIAL_NONSTANDARD=y
> @@ -7097,6 +7099,43 @@ CONFIG_SM_GPUCC_8150=m
>  CONFIG_SM_GPUCC_8250=m
>  CONFIG_SM_VIDEOCC_8150=m
>  CONFIG_SM_VIDEOCC_8250=m
> +CONFIG_SND=m
> +CONFIG_SND_ALOOP=m
> +# CONFIG_SND_BCM2835 is not set
> +# CONFIG_SND_DEBUG is not set
> +CONFIG_SND_DMA_SGBUF=y
> +CONFIG_SND_DUMMY=m
> +# CONFIG_SND_DYNAMIC_MINORS is not set
> +# CONFIG_SND_HDA_TEGRA is not set
> +CONFIG_SND_HRTIMER=m
> +# CONFIG_SND_MPU401 is not set
> +# CONFIG_SND_MTPAV is not set
> +# CONFIG_SND_MTS64 is not set
> +# CONFIG_SND_OSSEMUL is not set
> +# CONFIG_SND_PCI is not set
> +CONFIG_SND_PCM=m
> +# CONFIG_SND_PCM_TIMER is not set
> +# CONFIG_SND_PCSP is not set
> +# CONFIG_SND_PORTMAN2X4 is not set
> +# CONFIG_SND_PROC_FS is not set
> +CONFIG_SND_RAWMIDI=m
> +CONFIG_SND_SEQUENCER=m
> +CONFIG_SND_SEQ_DEVICE=m
> +CONFIG_SND_SEQ_DUMMY=m
> +CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
> +CONFIG_SND_SEQ_MIDI=m
> +CONFIG_SND_SEQ_MIDI_EVENT=m
> +CONFIG_SND_SEQ_VIRMIDI=m
> +# CONFIG_SND_SERIAL_U16550 is not set
> +# CONFIG_SND_SOC is not set
> +# CONFIG_SND_SPI is not set
> +# CONFIG_SND_SUPPORT_OLD_API is not set
> +CONFIG_SND_TIMER=m
> +# CONFIG_SND_USB is not set
> +# CONFIG_SND_VERBOSE_PRINTK is not set
> +CONFIG_SND_VIRMIDI=m
> +# CONFIG_SND_VIRTIO is not set
> +# CONFIG_SND_X86 is not set
>  CONFIG_SOCIONEXT_SYNQUACER_PREITS=y
>  CONFIG_SOCK_CGROUP_DATA=y
>  CONFIG_SOCK_RX_QUEUE_MAPPING=y
> @@ -7116,7 +7155,7 @@ CONFIG_SOFT_WATCHDOG_PRETIMEOUT=y
>  CONFIG_SOLARIS_X86_PARTITION=y
>  CONFIG_SONYPI_COMPAT=y
>  CONFIG_SONY_LAPTOP=m
> -# CONFIG_SOUND is not set
> +CONFIG_SOUND=m
>  CONFIG_SOUNDWIRE=m
>  CONFIG_SP5100_TCO=m
>  CONFIG_SPARSEMEM=y
> @@ -8053,7 +8092,6 @@ CONFIG_X86_ACPI_CPUFREQ=y
>  CONFIG_X86_ACPI_CPUFREQ_CPB=y
>  CONFIG_X86_AMD_FREQ_SENSITIVITY=m
>  CONFIG_X86_AMD_PLATFORM_DEVICE=y
> -CONFIG_X86_AMD_PSTATE=y
>  CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
>  CONFIG_X86_CHECK_BIOS_CORRUPTION=y
>  CONFIG_X86_CMOV=y
> -- 
> 2.36.1
> 
> 
> -- 
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
Marcelo Henrique Cerri June 22, 2022, 2:56 p.m. UTC | #2
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512


Acked-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>

On Thu, May 26 2022, Tim Gardner wrote:
> BugLink: https://bugs.launchpad.net/bugs/1970586
>
> Enable generic sound modules for non-hardware specific
> audio processing.
>
> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
> ---
>  debian.azure/config/amd64/config.common.amd64 |  2 +
>  debian.azure/config/annotations               | 67 ++++++++++++++++++-
>  debian.azure/config/arm64/config.common.arm64 |  2 +
>  debian.azure/config/config.common.ubuntu      | 44 +++++++++++-
>  4 files changed, 109 insertions(+), 6 deletions(-)
>
> diff --git a/debian.azure/config/amd64/config.common.amd64 b/debian.azure/config/amd64/config.common.amd64
> index 29ac897bfefa..baa357a98a08 100644
> --- a/debian.azure/config/amd64/config.common.amd64
> +++ b/debian.azure/config/amd64/config.common.amd64
> @@ -32,6 +32,8 @@ CONFIG_NR_CPUS=8192
>  CONFIG_PGTABLE_LEVELS=5
>  # CONFIG_SATA_SIL is not set
>  # CONFIG_SATA_SIL24 is not set
> +CONFIG_SND_DRIVERS=y
> +CONFIG_SND_HDA_PREALLOC_SIZE=0
>  # CONFIG_USB_CONN_GPIO is not set
>  CONFIG_VFIO=y
>  CONFIG_VFIO_IOMMU_TYPE1=y
> diff --git a/debian.azure/config/annotations b/debian.azure/config/annotations
> index 140617cef6ab..f81600847033 100644
> --- a/debian.azure/config/annotations
> +++ b/debian.azure/config/annotations
> @@ -166,9 +166,6 @@ CONFIG_USB_EHCI_HCD_PLATFORM                       mark<ENFORCED> note<kernel re
>  CONFIG_TOUCHSCREEN_ELAN                            policy<{'amd64': '-', 'arm64': '-'}>
>  CONFIG_TOUCHSCREEN_ELAN                            mark<ENFORCED> note<kernel reduction>
>
> -CONFIG_SOUND                                       policy<{'amd64': 'n', 'arm64': 'n'}>
> -CONFIG_SOUND                                       mark<ENFORCED> note<modules reduction>
> -
>  CONFIG_FUJITSU_ES                                  policy<{'amd64': 'n', 'arm64': 'n'}>
>  CONFIG_FUJITSU_ES                                  mark<ENFORCED> note<modules reduction>
>
> @@ -302,3 +299,67 @@ CONFIG_SAMPLE_TRACE_PRINTK                         note<Unnecessary for Azure>
>
>  CONFIG_SPI_INTEL_SPI_PLATFORM                      policy<{'amd64': '-'}>
>  CONFIG_SPI_INTEL_SPI_PLATFORM                      note<Unnecessary for Azure>
> +
> +#
> +# This block of annotations are related to LP: #1970586
> +#
> +CONFIG_SOUND                                       policy<{'amd64': 'm', 'arm64': 'm'}>
> +CONFIG_SOUND                                       mark<ENFORCED> note<LP: #1970586>
> +CONFIG_SND                                         policy<{'amd64': 'm', 'arm64': 'm'}>
> +CONFIG_SND                                         mark<ENFORCED> note<LP: #1970586>
> +CONFIG_SND_HRTIMER                                 policy<{'amd64': 'm', 'arm64': 'm'}>
> +CONFIG_SND_USB                                     policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_MOST_SND                                    policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_VERBOSE_PRINTK                          policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_VIDEO_CX88_ALSA                             policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_USB_CONFIGFS_F_MIDI                         policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_VIDEO_CX25821_ALSA                          policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_PCMCIA                                  policy<{'amd64': 'n', 'arm64': '-'}>
> +CONFIG_DEBUG_INFO_DWARF5                           policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_FIREWIRE                                policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_VIRTIO                                  policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_X86                                     policy<{'amd64': 'n'}>
> +CONFIG_SND_SOC                                     policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_USB_CONFIGFS_F_UAC1_LEGACY                  policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_PCI                                     policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_PROC_FS                                 policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_HID_PRODIKEYS                               policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_XEN_FRONTEND                            policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_HDA_PREALLOC_SIZE                       policy<{'amd64': '0', 'arm64': '64'}>
> +CONFIG_VIDEO_TM6000_ALSA                           policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_PCM_TIMER                               policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_VIDEO_TW686X                                policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_VIDEO_COBALT                                policy<{'amd64': 'n'}>
> +CONFIG_VIDEO_SAA7134_ALSA                          policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_SUPPORT_OLD_API                         policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_DRIVERS                                 policy<{'amd64': 'y', 'arm64': 'y'}>
> +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT          policy<{'amd64': 'y', 'arm64': 'y'}>
> +CONFIG_SND_SPI                                     policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_VIDEO_EM28XX_ALSA                           policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_DEBUG                                   policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_USB_CONFIGFS_F_UAC2                         policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_VIDEO_CX231XX_ALSA                          policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_USB_CONFIGFS_F_UAC1                         policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_VIDEO_CX23885                               policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_VIDEO_CX18_ALSA                             policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_VIDEO_GO7007                                policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_VIDEO_IVTV_ALSA                             policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_VIDEO_SOLO6X10                              policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_USB_AUDIO                                   policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_THINKPAD_ACPI_ALSA_SUPPORT                  policy<{'amd64': 'n'}>
> +CONFIG_VIDEO_USBTV                                 policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_USB_MIDI_GADGET                             policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_DYNAMIC_MINORS                          policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_OSSEMUL                                 policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_BCM2835                                 policy<{'arm64': 'n'}>
> +CONFIG_DRM_DW_HDMI_AHB_AUDIO                       policy<{'arm64': 'n'}>
> +CONFIG_SND_SERIAL_U16550                           policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_ALOOP                                   policy<{'amd64': 'm', 'arm64': 'm'}>
> +CONFIG_SND_MPU401                                  policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_MTPAV                                   policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_DUMMY                                   policy<{'amd64': 'm', 'arm64': 'm'}>
> +CONFIG_SND_PORTMAN2X4                              policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_VIRMIDI                                 policy<{'amd64': 'm', 'arm64': 'm'}>
> +CONFIG_SND_MTS64                                   policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_PCSP                                    policy<{'amd64': 'n'}>
> +
> diff --git a/debian.azure/config/arm64/config.common.arm64 b/debian.azure/config/arm64/config.common.arm64
> index d828e4f56e73..2718f6223780 100644
> --- a/debian.azure/config/arm64/config.common.arm64
> +++ b/debian.azure/config/arm64/config.common.arm64
> @@ -32,6 +32,8 @@ CONFIG_OF=y
>  CONFIG_PGTABLE_LEVELS=4
>  CONFIG_SATA_SIL=m
>  CONFIG_SATA_SIL24=m
> +# CONFIG_SND_DRIVERS is not set
> +CONFIG_SND_HDA_PREALLOC_SIZE=64
>  CONFIG_USB_CONN_GPIO=m
>  CONFIG_VFIO=m
>  CONFIG_VFIO_IOMMU_TYPE1=m
> diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu
> index 7672ad6a1eca..3914b5eb23e5 100644
> --- a/debian.azure/config/config.common.ubuntu
> +++ b/debian.azure/config/config.common.ubuntu
> @@ -1948,6 +1948,7 @@ CONFIG_DRM_DP_AUX_BUS=m
>  CONFIG_DRM_DP_AUX_CHARDEV=y
>  CONFIG_DRM_DP_CEC=y
>  CONFIG_DRM_DW_HDMI=m
> +# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
>  CONFIG_DRM_DW_HDMI_CEC=m
>  # CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
>  CONFIG_DRM_DW_MIPI_DSI=m
> @@ -3197,6 +3198,7 @@ CONFIG_I2C_MESON=m
>  CONFIG_I2C_MLXBF=m
>  CONFIG_I2C_MLXCPLD=m
>  CONFIG_I2C_MT65XX=m
> +# CONFIG_I2C_MULTI_INSTANTIATE is not set
>  CONFIG_I2C_MUX=m
>  # CONFIG_I2C_MUX_GPIO is not set
>  CONFIG_I2C_MUX_GPMUX=m
> @@ -4511,6 +4513,7 @@ CONFIG_MOST_COMPONENTS=m
>  CONFIG_MOST_DIM2=m
>  CONFIG_MOST_I2C=m
>  CONFIG_MOST_NET=m
> +# CONFIG_MOST_SND is not set
>  # CONFIG_MOST_USB_HDM is not set
>  CONFIG_MOST_VIDEO=m
>  CONFIG_MOTORCOMM_PHY=m
> @@ -6972,7 +6975,6 @@ CONFIG_SERIAL_MESON=y
>  CONFIG_SERIAL_MESON_CONSOLE=y
>  CONFIG_SERIAL_MSM=y
>  CONFIG_SERIAL_MSM_CONSOLE=y
> -CONFIG_SERIAL_MULTI_INSTANTIATE=m
>  CONFIG_SERIAL_MVEBU_CONSOLE=y
>  CONFIG_SERIAL_MVEBU_UART=y
>  CONFIG_SERIAL_NONSTANDARD=y
> @@ -7097,6 +7099,43 @@ CONFIG_SM_GPUCC_8150=m
>  CONFIG_SM_GPUCC_8250=m
>  CONFIG_SM_VIDEOCC_8150=m
>  CONFIG_SM_VIDEOCC_8250=m
> +CONFIG_SND=m
> +CONFIG_SND_ALOOP=m
> +# CONFIG_SND_BCM2835 is not set
> +# CONFIG_SND_DEBUG is not set
> +CONFIG_SND_DMA_SGBUF=y
> +CONFIG_SND_DUMMY=m
> +# CONFIG_SND_DYNAMIC_MINORS is not set
> +# CONFIG_SND_HDA_TEGRA is not set
> +CONFIG_SND_HRTIMER=m
> +# CONFIG_SND_MPU401 is not set
> +# CONFIG_SND_MTPAV is not set
> +# CONFIG_SND_MTS64 is not set
> +# CONFIG_SND_OSSEMUL is not set
> +# CONFIG_SND_PCI is not set
> +CONFIG_SND_PCM=m
> +# CONFIG_SND_PCM_TIMER is not set
> +# CONFIG_SND_PCSP is not set
> +# CONFIG_SND_PORTMAN2X4 is not set
> +# CONFIG_SND_PROC_FS is not set
> +CONFIG_SND_RAWMIDI=m
> +CONFIG_SND_SEQUENCER=m
> +CONFIG_SND_SEQ_DEVICE=m
> +CONFIG_SND_SEQ_DUMMY=m
> +CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
> +CONFIG_SND_SEQ_MIDI=m
> +CONFIG_SND_SEQ_MIDI_EVENT=m
> +CONFIG_SND_SEQ_VIRMIDI=m
> +# CONFIG_SND_SERIAL_U16550 is not set
> +# CONFIG_SND_SOC is not set
> +# CONFIG_SND_SPI is not set
> +# CONFIG_SND_SUPPORT_OLD_API is not set
> +CONFIG_SND_TIMER=m
> +# CONFIG_SND_USB is not set
> +# CONFIG_SND_VERBOSE_PRINTK is not set
> +CONFIG_SND_VIRMIDI=m
> +# CONFIG_SND_VIRTIO is not set
> +# CONFIG_SND_X86 is not set
>  CONFIG_SOCIONEXT_SYNQUACER_PREITS=y
>  CONFIG_SOCK_CGROUP_DATA=y
>  CONFIG_SOCK_RX_QUEUE_MAPPING=y
> @@ -7116,7 +7155,7 @@ CONFIG_SOFT_WATCHDOG_PRETIMEOUT=y
>  CONFIG_SOLARIS_X86_PARTITION=y
>  CONFIG_SONYPI_COMPAT=y
>  CONFIG_SONY_LAPTOP=m
> -# CONFIG_SOUND is not set
> +CONFIG_SOUND=m
>  CONFIG_SOUNDWIRE=m
>  CONFIG_SP5100_TCO=m
>  CONFIG_SPARSEMEM=y
> @@ -8053,7 +8092,6 @@ CONFIG_X86_ACPI_CPUFREQ=y
>  CONFIG_X86_ACPI_CPUFREQ_CPB=y
>  CONFIG_X86_AMD_FREQ_SENSITIVITY=m
>  CONFIG_X86_AMD_PLATFORM_DEVICE=y
> -CONFIG_X86_AMD_PSTATE=y
>  CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
>  CONFIG_X86_CHECK_BIOS_CORRUPTION=y
>  CONFIG_X86_CMOV=y
> --
> 2.36.1


- --
Regards,
Marcelo
-----BEGIN PGP SIGNATURE-----

iQGzBAEBCgAdFiEExJjLjAfVL0XbfEr56e82LoessAkFAmKzLaAACgkQ6e82Loes
sAnAYQv8DfFnd8yGP5KnSCbEeNaqbktyISzaAz87mq0D1QgFGb/9sy4+9pt960va
LyTG1Ec7aahljEL45G50ZKhBl1yHdP2DxehFYGMVDbNNXeGz3AEzdIn7rOon2MT1
taw+7J7492YPo4Q807cLfcW9FhQKydFbAHmtN/sfDDznOAO6dcHTVGpHUG1vDqRU
qFNetLrxIBObZD4AJ1MicFcoMls/VdrkSJXmSpdGyHkYyzONbnIwjfx5v5w4+ZmQ
ubPSJ9yleXBBnEEbZamOBimzbMxCONQpmwKmQiACHbg5Qar/VC5efPdDV0sCujAI
JjJdeNWZgWkrJbPh1G7oTPAsEDBP1f62bxzXk0UjINkbCN/zZktBigyvh47bLLbu
wn6NPj/ZstjLUXjoOY6fd6RObHBLnvU477OyrWv6NWyaJQOMRqdM5Phlo9ikY21h
IEDrOLglQHtdFtLGbgvCVzoFIYdZVngy026xcPdxv+28tr57AUjoqISPBH7qzTMf
t7syp4im
=QSYE
-----END PGP SIGNATURE-----
Tim Gardner June 22, 2022, 4:07 p.m. UTC | #3
On 5/26/22 08:16, Tim Gardner wrote:
> BugLink: https://bugs.launchpad.net/bugs/1970586
> 
> Enable generic sound modules for non-hardware specific
> audio processing.
> 
> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
> ---
>   debian.azure/config/amd64/config.common.amd64 |  2 +
>   debian.azure/config/annotations               | 67 ++++++++++++++++++-
>   debian.azure/config/arm64/config.common.arm64 |  2 +
>   debian.azure/config/config.common.ubuntu      | 44 +++++++++++-
>   4 files changed, 109 insertions(+), 6 deletions(-)
> 
> diff --git a/debian.azure/config/amd64/config.common.amd64 b/debian.azure/config/amd64/config.common.amd64
> index 29ac897bfefa..baa357a98a08 100644
> --- a/debian.azure/config/amd64/config.common.amd64
> +++ b/debian.azure/config/amd64/config.common.amd64
> @@ -32,6 +32,8 @@ CONFIG_NR_CPUS=8192
>   CONFIG_PGTABLE_LEVELS=5
>   # CONFIG_SATA_SIL is not set
>   # CONFIG_SATA_SIL24 is not set
> +CONFIG_SND_DRIVERS=y
> +CONFIG_SND_HDA_PREALLOC_SIZE=0
>   # CONFIG_USB_CONN_GPIO is not set
>   CONFIG_VFIO=y
>   CONFIG_VFIO_IOMMU_TYPE1=y
> diff --git a/debian.azure/config/annotations b/debian.azure/config/annotations
> index 140617cef6ab..f81600847033 100644
> --- a/debian.azure/config/annotations
> +++ b/debian.azure/config/annotations
> @@ -166,9 +166,6 @@ CONFIG_USB_EHCI_HCD_PLATFORM                       mark<ENFORCED> note<kernel re
>   CONFIG_TOUCHSCREEN_ELAN                            policy<{'amd64': '-', 'arm64': '-'}>
>   CONFIG_TOUCHSCREEN_ELAN                            mark<ENFORCED> note<kernel reduction>
>   
> -CONFIG_SOUND                                       policy<{'amd64': 'n', 'arm64': 'n'}>
> -CONFIG_SOUND                                       mark<ENFORCED> note<modules reduction>
> -
>   CONFIG_FUJITSU_ES                                  policy<{'amd64': 'n', 'arm64': 'n'}>
>   CONFIG_FUJITSU_ES                                  mark<ENFORCED> note<modules reduction>
>   
> @@ -302,3 +299,67 @@ CONFIG_SAMPLE_TRACE_PRINTK                         note<Unnecessary for Azure>
>   
>   CONFIG_SPI_INTEL_SPI_PLATFORM                      policy<{'amd64': '-'}>
>   CONFIG_SPI_INTEL_SPI_PLATFORM                      note<Unnecessary for Azure>
> +
> +#
> +# This block of annotations are related to LP: #1970586
> +#
> +CONFIG_SOUND                                       policy<{'amd64': 'm', 'arm64': 'm'}>
> +CONFIG_SOUND                                       mark<ENFORCED> note<LP: #1970586>
> +CONFIG_SND                                         policy<{'amd64': 'm', 'arm64': 'm'}>
> +CONFIG_SND                                         mark<ENFORCED> note<LP: #1970586>
> +CONFIG_SND_HRTIMER                                 policy<{'amd64': 'm', 'arm64': 'm'}>
> +CONFIG_SND_USB                                     policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_MOST_SND                                    policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_VERBOSE_PRINTK                          policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_VIDEO_CX88_ALSA                             policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_USB_CONFIGFS_F_MIDI                         policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_VIDEO_CX25821_ALSA                          policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_PCMCIA                                  policy<{'amd64': 'n', 'arm64': '-'}>
> +CONFIG_DEBUG_INFO_DWARF5                           policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_FIREWIRE                                policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_VIRTIO                                  policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_X86                                     policy<{'amd64': 'n'}>
> +CONFIG_SND_SOC                                     policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_USB_CONFIGFS_F_UAC1_LEGACY                  policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_PCI                                     policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_PROC_FS                                 policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_HID_PRODIKEYS                               policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_XEN_FRONTEND                            policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_HDA_PREALLOC_SIZE                       policy<{'amd64': '0', 'arm64': '64'}>
> +CONFIG_VIDEO_TM6000_ALSA                           policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_PCM_TIMER                               policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_VIDEO_TW686X                                policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_VIDEO_COBALT                                policy<{'amd64': 'n'}>
> +CONFIG_VIDEO_SAA7134_ALSA                          policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_SUPPORT_OLD_API                         policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_DRIVERS                                 policy<{'amd64': 'y', 'arm64': 'y'}>
> +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT          policy<{'amd64': 'y', 'arm64': 'y'}>
> +CONFIG_SND_SPI                                     policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_VIDEO_EM28XX_ALSA                           policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_DEBUG                                   policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_USB_CONFIGFS_F_UAC2                         policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_VIDEO_CX231XX_ALSA                          policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_USB_CONFIGFS_F_UAC1                         policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_VIDEO_CX23885                               policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_VIDEO_CX18_ALSA                             policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_VIDEO_GO7007                                policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_VIDEO_IVTV_ALSA                             policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_VIDEO_SOLO6X10                              policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_USB_AUDIO                                   policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_THINKPAD_ACPI_ALSA_SUPPORT                  policy<{'amd64': 'n'}>
> +CONFIG_VIDEO_USBTV                                 policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_USB_MIDI_GADGET                             policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_DYNAMIC_MINORS                          policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_OSSEMUL                                 policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_BCM2835                                 policy<{'arm64': 'n'}>
> +CONFIG_DRM_DW_HDMI_AHB_AUDIO                       policy<{'arm64': 'n'}>
> +CONFIG_SND_SERIAL_U16550                           policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_ALOOP                                   policy<{'amd64': 'm', 'arm64': 'm'}>
> +CONFIG_SND_MPU401                                  policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_MTPAV                                   policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_DUMMY                                   policy<{'amd64': 'm', 'arm64': 'm'}>
> +CONFIG_SND_PORTMAN2X4                              policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_VIRMIDI                                 policy<{'amd64': 'm', 'arm64': 'm'}>
> +CONFIG_SND_MTS64                                   policy<{'amd64': 'n', 'arm64': 'n'}>
> +CONFIG_SND_PCSP                                    policy<{'amd64': 'n'}>
> +
> diff --git a/debian.azure/config/arm64/config.common.arm64 b/debian.azure/config/arm64/config.common.arm64
> index d828e4f56e73..2718f6223780 100644
> --- a/debian.azure/config/arm64/config.common.arm64
> +++ b/debian.azure/config/arm64/config.common.arm64
> @@ -32,6 +32,8 @@ CONFIG_OF=y
>   CONFIG_PGTABLE_LEVELS=4
>   CONFIG_SATA_SIL=m
>   CONFIG_SATA_SIL24=m
> +# CONFIG_SND_DRIVERS is not set
> +CONFIG_SND_HDA_PREALLOC_SIZE=64
>   CONFIG_USB_CONN_GPIO=m
>   CONFIG_VFIO=m
>   CONFIG_VFIO_IOMMU_TYPE1=m
> diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu
> index 7672ad6a1eca..3914b5eb23e5 100644
> --- a/debian.azure/config/config.common.ubuntu
> +++ b/debian.azure/config/config.common.ubuntu
> @@ -1948,6 +1948,7 @@ CONFIG_DRM_DP_AUX_BUS=m
>   CONFIG_DRM_DP_AUX_CHARDEV=y
>   CONFIG_DRM_DP_CEC=y
>   CONFIG_DRM_DW_HDMI=m
> +# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
>   CONFIG_DRM_DW_HDMI_CEC=m
>   # CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
>   CONFIG_DRM_DW_MIPI_DSI=m
> @@ -3197,6 +3198,7 @@ CONFIG_I2C_MESON=m
>   CONFIG_I2C_MLXBF=m
>   CONFIG_I2C_MLXCPLD=m
>   CONFIG_I2C_MT65XX=m
> +# CONFIG_I2C_MULTI_INSTANTIATE is not set
>   CONFIG_I2C_MUX=m
>   # CONFIG_I2C_MUX_GPIO is not set
>   CONFIG_I2C_MUX_GPMUX=m
> @@ -4511,6 +4513,7 @@ CONFIG_MOST_COMPONENTS=m
>   CONFIG_MOST_DIM2=m
>   CONFIG_MOST_I2C=m
>   CONFIG_MOST_NET=m
> +# CONFIG_MOST_SND is not set
>   # CONFIG_MOST_USB_HDM is not set
>   CONFIG_MOST_VIDEO=m
>   CONFIG_MOTORCOMM_PHY=m
> @@ -6972,7 +6975,6 @@ CONFIG_SERIAL_MESON=y
>   CONFIG_SERIAL_MESON_CONSOLE=y
>   CONFIG_SERIAL_MSM=y
>   CONFIG_SERIAL_MSM_CONSOLE=y
> -CONFIG_SERIAL_MULTI_INSTANTIATE=m
>   CONFIG_SERIAL_MVEBU_CONSOLE=y
>   CONFIG_SERIAL_MVEBU_UART=y
>   CONFIG_SERIAL_NONSTANDARD=y
> @@ -7097,6 +7099,43 @@ CONFIG_SM_GPUCC_8150=m
>   CONFIG_SM_GPUCC_8250=m
>   CONFIG_SM_VIDEOCC_8150=m
>   CONFIG_SM_VIDEOCC_8250=m
> +CONFIG_SND=m
> +CONFIG_SND_ALOOP=m
> +# CONFIG_SND_BCM2835 is not set
> +# CONFIG_SND_DEBUG is not set
> +CONFIG_SND_DMA_SGBUF=y
> +CONFIG_SND_DUMMY=m
> +# CONFIG_SND_DYNAMIC_MINORS is not set
> +# CONFIG_SND_HDA_TEGRA is not set
> +CONFIG_SND_HRTIMER=m
> +# CONFIG_SND_MPU401 is not set
> +# CONFIG_SND_MTPAV is not set
> +# CONFIG_SND_MTS64 is not set
> +# CONFIG_SND_OSSEMUL is not set
> +# CONFIG_SND_PCI is not set
> +CONFIG_SND_PCM=m
> +# CONFIG_SND_PCM_TIMER is not set
> +# CONFIG_SND_PCSP is not set
> +# CONFIG_SND_PORTMAN2X4 is not set
> +# CONFIG_SND_PROC_FS is not set
> +CONFIG_SND_RAWMIDI=m
> +CONFIG_SND_SEQUENCER=m
> +CONFIG_SND_SEQ_DEVICE=m
> +CONFIG_SND_SEQ_DUMMY=m
> +CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
> +CONFIG_SND_SEQ_MIDI=m
> +CONFIG_SND_SEQ_MIDI_EVENT=m
> +CONFIG_SND_SEQ_VIRMIDI=m
> +# CONFIG_SND_SERIAL_U16550 is not set
> +# CONFIG_SND_SOC is not set
> +# CONFIG_SND_SPI is not set
> +# CONFIG_SND_SUPPORT_OLD_API is not set
> +CONFIG_SND_TIMER=m
> +# CONFIG_SND_USB is not set
> +# CONFIG_SND_VERBOSE_PRINTK is not set
> +CONFIG_SND_VIRMIDI=m
> +# CONFIG_SND_VIRTIO is not set
> +# CONFIG_SND_X86 is not set
>   CONFIG_SOCIONEXT_SYNQUACER_PREITS=y
>   CONFIG_SOCK_CGROUP_DATA=y
>   CONFIG_SOCK_RX_QUEUE_MAPPING=y
> @@ -7116,7 +7155,7 @@ CONFIG_SOFT_WATCHDOG_PRETIMEOUT=y
>   CONFIG_SOLARIS_X86_PARTITION=y
>   CONFIG_SONYPI_COMPAT=y
>   CONFIG_SONY_LAPTOP=m
> -# CONFIG_SOUND is not set
> +CONFIG_SOUND=m
>   CONFIG_SOUNDWIRE=m
>   CONFIG_SP5100_TCO=m
>   CONFIG_SPARSEMEM=y
> @@ -8053,7 +8092,6 @@ CONFIG_X86_ACPI_CPUFREQ=y
>   CONFIG_X86_ACPI_CPUFREQ_CPB=y
>   CONFIG_X86_AMD_FREQ_SENSITIVITY=m
>   CONFIG_X86_AMD_PLATFORM_DEVICE=y
> -CONFIG_X86_AMD_PSTATE=y
>   CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
>   CONFIG_X86_CHECK_BIOS_CORRUPTION=y
>   CONFIG_X86_CMOV=y
Applied to jammy/linux-azure:master-next. Thanks.

-rtg
diff mbox series

Patch

diff --git a/debian.azure/config/amd64/config.common.amd64 b/debian.azure/config/amd64/config.common.amd64
index 29ac897bfefa..baa357a98a08 100644
--- a/debian.azure/config/amd64/config.common.amd64
+++ b/debian.azure/config/amd64/config.common.amd64
@@ -32,6 +32,8 @@  CONFIG_NR_CPUS=8192
 CONFIG_PGTABLE_LEVELS=5
 # CONFIG_SATA_SIL is not set
 # CONFIG_SATA_SIL24 is not set
+CONFIG_SND_DRIVERS=y
+CONFIG_SND_HDA_PREALLOC_SIZE=0
 # CONFIG_USB_CONN_GPIO is not set
 CONFIG_VFIO=y
 CONFIG_VFIO_IOMMU_TYPE1=y
diff --git a/debian.azure/config/annotations b/debian.azure/config/annotations
index 140617cef6ab..f81600847033 100644
--- a/debian.azure/config/annotations
+++ b/debian.azure/config/annotations
@@ -166,9 +166,6 @@  CONFIG_USB_EHCI_HCD_PLATFORM                       mark<ENFORCED> note<kernel re
 CONFIG_TOUCHSCREEN_ELAN                            policy<{'amd64': '-', 'arm64': '-'}>
 CONFIG_TOUCHSCREEN_ELAN                            mark<ENFORCED> note<kernel reduction>
 
-CONFIG_SOUND                                       policy<{'amd64': 'n', 'arm64': 'n'}>
-CONFIG_SOUND                                       mark<ENFORCED> note<modules reduction>
-
 CONFIG_FUJITSU_ES                                  policy<{'amd64': 'n', 'arm64': 'n'}>
 CONFIG_FUJITSU_ES                                  mark<ENFORCED> note<modules reduction>
 
@@ -302,3 +299,67 @@  CONFIG_SAMPLE_TRACE_PRINTK                         note<Unnecessary for Azure>
 
 CONFIG_SPI_INTEL_SPI_PLATFORM                      policy<{'amd64': '-'}>
 CONFIG_SPI_INTEL_SPI_PLATFORM                      note<Unnecessary for Azure>
+
+#
+# This block of annotations are related to LP: #1970586
+#
+CONFIG_SOUND                                       policy<{'amd64': 'm', 'arm64': 'm'}>
+CONFIG_SOUND                                       mark<ENFORCED> note<LP: #1970586>
+CONFIG_SND                                         policy<{'amd64': 'm', 'arm64': 'm'}>
+CONFIG_SND                                         mark<ENFORCED> note<LP: #1970586>
+CONFIG_SND_HRTIMER                                 policy<{'amd64': 'm', 'arm64': 'm'}>
+CONFIG_SND_USB                                     policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_MOST_SND                                    policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_SND_VERBOSE_PRINTK                          policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_VIDEO_CX88_ALSA                             policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_USB_CONFIGFS_F_MIDI                         policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_VIDEO_CX25821_ALSA                          policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_SND_PCMCIA                                  policy<{'amd64': 'n', 'arm64': '-'}>
+CONFIG_DEBUG_INFO_DWARF5                           policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_SND_FIREWIRE                                policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_SND_VIRTIO                                  policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_SND_X86                                     policy<{'amd64': 'n'}>
+CONFIG_SND_SOC                                     policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_USB_CONFIGFS_F_UAC1_LEGACY                  policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_SND_PCI                                     policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_SND_PROC_FS                                 policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_HID_PRODIKEYS                               policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_SND_XEN_FRONTEND                            policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_SND_HDA_PREALLOC_SIZE                       policy<{'amd64': '0', 'arm64': '64'}>
+CONFIG_VIDEO_TM6000_ALSA                           policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_SND_PCM_TIMER                               policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_VIDEO_TW686X                                policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_VIDEO_COBALT                                policy<{'amd64': 'n'}>
+CONFIG_VIDEO_SAA7134_ALSA                          policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_SND_SUPPORT_OLD_API                         policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_SND_DRIVERS                                 policy<{'amd64': 'y', 'arm64': 'y'}>
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT          policy<{'amd64': 'y', 'arm64': 'y'}>
+CONFIG_SND_SPI                                     policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_VIDEO_EM28XX_ALSA                           policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_SND_DEBUG                                   policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_USB_CONFIGFS_F_UAC2                         policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_VIDEO_CX231XX_ALSA                          policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_USB_CONFIGFS_F_UAC1                         policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_VIDEO_CX23885                               policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_VIDEO_CX18_ALSA                             policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_VIDEO_GO7007                                policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_VIDEO_IVTV_ALSA                             policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_VIDEO_SOLO6X10                              policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_USB_AUDIO                                   policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_THINKPAD_ACPI_ALSA_SUPPORT                  policy<{'amd64': 'n'}>
+CONFIG_VIDEO_USBTV                                 policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_USB_MIDI_GADGET                             policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_SND_DYNAMIC_MINORS                          policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_SND_OSSEMUL                                 policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_SND_BCM2835                                 policy<{'arm64': 'n'}>
+CONFIG_DRM_DW_HDMI_AHB_AUDIO                       policy<{'arm64': 'n'}>
+CONFIG_SND_SERIAL_U16550                           policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_SND_ALOOP                                   policy<{'amd64': 'm', 'arm64': 'm'}>
+CONFIG_SND_MPU401                                  policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_SND_MTPAV                                   policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_SND_DUMMY                                   policy<{'amd64': 'm', 'arm64': 'm'}>
+CONFIG_SND_PORTMAN2X4                              policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_SND_VIRMIDI                                 policy<{'amd64': 'm', 'arm64': 'm'}>
+CONFIG_SND_MTS64                                   policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_SND_PCSP                                    policy<{'amd64': 'n'}>
+
diff --git a/debian.azure/config/arm64/config.common.arm64 b/debian.azure/config/arm64/config.common.arm64
index d828e4f56e73..2718f6223780 100644
--- a/debian.azure/config/arm64/config.common.arm64
+++ b/debian.azure/config/arm64/config.common.arm64
@@ -32,6 +32,8 @@  CONFIG_OF=y
 CONFIG_PGTABLE_LEVELS=4
 CONFIG_SATA_SIL=m
 CONFIG_SATA_SIL24=m
+# CONFIG_SND_DRIVERS is not set
+CONFIG_SND_HDA_PREALLOC_SIZE=64
 CONFIG_USB_CONN_GPIO=m
 CONFIG_VFIO=m
 CONFIG_VFIO_IOMMU_TYPE1=m
diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu
index 7672ad6a1eca..3914b5eb23e5 100644
--- a/debian.azure/config/config.common.ubuntu
+++ b/debian.azure/config/config.common.ubuntu
@@ -1948,6 +1948,7 @@  CONFIG_DRM_DP_AUX_BUS=m
 CONFIG_DRM_DP_AUX_CHARDEV=y
 CONFIG_DRM_DP_CEC=y
 CONFIG_DRM_DW_HDMI=m
+# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
 CONFIG_DRM_DW_HDMI_CEC=m
 # CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
 CONFIG_DRM_DW_MIPI_DSI=m
@@ -3197,6 +3198,7 @@  CONFIG_I2C_MESON=m
 CONFIG_I2C_MLXBF=m
 CONFIG_I2C_MLXCPLD=m
 CONFIG_I2C_MT65XX=m
+# CONFIG_I2C_MULTI_INSTANTIATE is not set
 CONFIG_I2C_MUX=m
 # CONFIG_I2C_MUX_GPIO is not set
 CONFIG_I2C_MUX_GPMUX=m
@@ -4511,6 +4513,7 @@  CONFIG_MOST_COMPONENTS=m
 CONFIG_MOST_DIM2=m
 CONFIG_MOST_I2C=m
 CONFIG_MOST_NET=m
+# CONFIG_MOST_SND is not set
 # CONFIG_MOST_USB_HDM is not set
 CONFIG_MOST_VIDEO=m
 CONFIG_MOTORCOMM_PHY=m
@@ -6972,7 +6975,6 @@  CONFIG_SERIAL_MESON=y
 CONFIG_SERIAL_MESON_CONSOLE=y
 CONFIG_SERIAL_MSM=y
 CONFIG_SERIAL_MSM_CONSOLE=y
-CONFIG_SERIAL_MULTI_INSTANTIATE=m
 CONFIG_SERIAL_MVEBU_CONSOLE=y
 CONFIG_SERIAL_MVEBU_UART=y
 CONFIG_SERIAL_NONSTANDARD=y
@@ -7097,6 +7099,43 @@  CONFIG_SM_GPUCC_8150=m
 CONFIG_SM_GPUCC_8250=m
 CONFIG_SM_VIDEOCC_8150=m
 CONFIG_SM_VIDEOCC_8250=m
+CONFIG_SND=m
+CONFIG_SND_ALOOP=m
+# CONFIG_SND_BCM2835 is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_DMA_SGBUF=y
+CONFIG_SND_DUMMY=m
+# CONFIG_SND_DYNAMIC_MINORS is not set
+# CONFIG_SND_HDA_TEGRA is not set
+CONFIG_SND_HRTIMER=m
+# CONFIG_SND_MPU401 is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_MTS64 is not set
+# CONFIG_SND_OSSEMUL is not set
+# CONFIG_SND_PCI is not set
+CONFIG_SND_PCM=m
+# CONFIG_SND_PCM_TIMER is not set
+# CONFIG_SND_PCSP is not set
+# CONFIG_SND_PORTMAN2X4 is not set
+# CONFIG_SND_PROC_FS is not set
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DEVICE=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+CONFIG_SND_SEQ_MIDI=m
+CONFIG_SND_SEQ_MIDI_EVENT=m
+CONFIG_SND_SEQ_VIRMIDI=m
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_SOC is not set
+# CONFIG_SND_SPI is not set
+# CONFIG_SND_SUPPORT_OLD_API is not set
+CONFIG_SND_TIMER=m
+# CONFIG_SND_USB is not set
+# CONFIG_SND_VERBOSE_PRINTK is not set
+CONFIG_SND_VIRMIDI=m
+# CONFIG_SND_VIRTIO is not set
+# CONFIG_SND_X86 is not set
 CONFIG_SOCIONEXT_SYNQUACER_PREITS=y
 CONFIG_SOCK_CGROUP_DATA=y
 CONFIG_SOCK_RX_QUEUE_MAPPING=y
@@ -7116,7 +7155,7 @@  CONFIG_SOFT_WATCHDOG_PRETIMEOUT=y
 CONFIG_SOLARIS_X86_PARTITION=y
 CONFIG_SONYPI_COMPAT=y
 CONFIG_SONY_LAPTOP=m
-# CONFIG_SOUND is not set
+CONFIG_SOUND=m
 CONFIG_SOUNDWIRE=m
 CONFIG_SP5100_TCO=m
 CONFIG_SPARSEMEM=y
@@ -8053,7 +8092,6 @@  CONFIG_X86_ACPI_CPUFREQ=y
 CONFIG_X86_ACPI_CPUFREQ_CPB=y
 CONFIG_X86_AMD_FREQ_SENSITIVITY=m
 CONFIG_X86_AMD_PLATFORM_DEVICE=y
-CONFIG_X86_AMD_PSTATE=y
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
 CONFIG_X86_CMOV=y