| Message ID | 20220919162710.32410-1-tim.gardner@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [jammy,linux-azure] UBUNTU: [Config] Disable CONFIG_CMA for arm64 | expand |
On 9/19/22 12:27, Tim Gardner wrote: > BugLink: https://bugs.launchpad.net/bugs/1990167 > > Disable CONFIG_CMA consistent with amd64. > > Signed-off-by: Tim Gardner <tim.gardner@canonical.com> > --- > debian.azure/config/amd64/config.common.amd64 | 1 - > debian.azure/config/annotations | 16 ++++++++++++++++ > debian.azure/config/arm64/config.common.arm64 | 1 - > debian.azure/config/config.common.ubuntu | 14 +------------- > 4 files changed, 17 insertions(+), 15 deletions(-) > > diff --git a/debian.azure/config/amd64/config.common.amd64 b/debian.azure/config/amd64/config.common.amd64 > index 394287604bf9..e07e1e301530 100644 > --- a/debian.azure/config/amd64/config.common.amd64 > +++ b/debian.azure/config/amd64/config.common.amd64 > @@ -11,7 +11,6 @@ CONFIG_ATA_PIIX=y > # CONFIG_BROADCOM_PHY is not set > # CONFIG_CB710_CORE is not set > CONFIG_CC_VERSION_TEXT="gcc (Ubuntu 11.2.0-19ubuntu1) 11.2.0" > -# CONFIG_CMA is not set > CONFIG_CRC8=m > CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11 > CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 > diff --git a/debian.azure/config/annotations b/debian.azure/config/annotations > index 15c050c3e052..937483a6251e 100644 > --- a/debian.azure/config/annotations > +++ b/debian.azure/config/annotations > @@ -4,6 +4,22 @@ > > include "../../debian.master/config/annotations" > > +# Menu: Library routines >> DMA Contiguous Memory Allocator >> Selected region size > +CONFIG_CMA policy<{'amd64': 'n', 'arm64': 'n'}> note<LP: #1990167> > +CONFIG_CMA_SIZE_SEL_MBYTES policy<{'arm64': '-'}> > +CONFIG_CMA_SIZE_SEL_PERCENTAGE policy<{'arm64': '-'}> > +CONFIG_CMA_SIZE_SEL_MIN policy<{'arm64': '-'}> > +CONFIG_CMA_SIZE_SEL_MAX policy<{'arm64': '-'}> > +CONFIG_CMA_DEBUG policy<{'arm64': '-'}> > +CONFIG_DMA_PERNUMA_CMA policy<{'arm64': '-'}> > +CONFIG_DMA_CMA policy<{'arm64': '-'}> > +CONFIG_DMABUF_HEAPS_CMA policy<{'arm64': '-'}> > +CONFIG_CMA_AREAS policy<{'arm64': '-'}> > +CONFIG_CMA_SYSFS policy<{'arm64': '-'}> > +CONFIG_CMA_DEBUGFS policy<{'arm64': '-'}> > +CONFIG_CMA_ALIGNMENT policy<{'arm64': '-'}> > +CONFIG_CMA_SIZE_MBYTES policy<{'arm64': '-'}> > + > CONFIG_INTEL_MEI_VSC policy<{'amd64': 'n'}> > CONFIG_INTEL_VSC policy<{'amd64': 'n', 'arm64': 'n'}> > CONFIG_INTEL_VSC_PSE policy<{'amd64': 'n', 'arm64': 'n'}> > diff --git a/debian.azure/config/arm64/config.common.arm64 b/debian.azure/config/arm64/config.common.arm64 > index 1bbe597a0c98..086658c115c7 100644 > --- a/debian.azure/config/arm64/config.common.arm64 > +++ b/debian.azure/config/arm64/config.common.arm64 > @@ -11,7 +11,6 @@ CONFIG_ATA_PIIX=m > CONFIG_BROADCOM_PHY=m > CONFIG_CB710_CORE=m > CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 11.2.0-17ubuntu1) 11.2.0" > -CONFIG_CMA=y > CONFIG_CRC8=y > CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9 > CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 > diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu > index a193652a0e40..d3833f514954 100644 > --- a/debian.azure/config/config.common.ubuntu > +++ b/debian.azure/config/config.common.ubuntu > @@ -1177,16 +1177,7 @@ CONFIG_CLONE_BACKWARDS=y > CONFIG_CLS_U32_MARK=y > # CONFIG_CLS_U32_PERF is not set > CONFIG_CLZ_TAB=y > -CONFIG_CMA_ALIGNMENT=8 > -CONFIG_CMA_AREAS=7 > -# CONFIG_CMA_DEBUG is not set > -# CONFIG_CMA_DEBUGFS is not set > -CONFIG_CMA_SIZE_MBYTES=32 > -# CONFIG_CMA_SIZE_SEL_MAX is not set > -CONFIG_CMA_SIZE_SEL_MBYTES=y > -# CONFIG_CMA_SIZE_SEL_MIN is not set > -# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set > -CONFIG_CMA_SYSFS=y > +# CONFIG_CMA is not set > CONFIG_CMDLINE="console=ttyAMA0" > # CONFIG_CMDLINE_BOOL is not set > # CONFIG_CMDLINE_FORCE is not set > @@ -1835,7 +1826,6 @@ CONFIG_DLM=m > # CONFIG_DLM_DEBUG is not set > # CONFIG_DMABUF_DEBUG is not set > CONFIG_DMABUF_HEAPS=y > -CONFIG_DMABUF_HEAPS_CMA=y > CONFIG_DMABUF_HEAPS_SYSTEM=y > # CONFIG_DMABUF_MOVE_NOTIFY is not set > # CONFIG_DMABUF_SELFTESTS is not set > @@ -1847,7 +1837,6 @@ CONFIG_DMAR_TABLE=y > CONFIG_DMA_ACPI=y > # CONFIG_DMA_API_DEBUG is not set > CONFIG_DMA_BCM2835=y > -CONFIG_DMA_CMA=y > CONFIG_DMA_COHERENT_POOL=y > CONFIG_DMA_DECLARE_COHERENT=y > CONFIG_DMA_DIRECT_REMAP=y > @@ -1858,7 +1847,6 @@ CONFIG_DMA_ENGINE_RAID=y > CONFIG_DMA_NONCOHERENT_MMAP=y > CONFIG_DMA_OF=y > CONFIG_DMA_OPS=y > -CONFIG_DMA_PERNUMA_CMA=y > CONFIG_DMA_REMAP=y > CONFIG_DMA_RESTRICTED_POOL=y > CONFIG_DMA_SHARED_BUFFER=y Acked-by: Joseph Salisbury <joseph.salisbury@canonical.com>
On 9/19/22 10:27, Tim Gardner wrote: > BugLink: https://bugs.launchpad.net/bugs/1990167 > > Disable CONFIG_CMA consistent with amd64. > > Signed-off-by: Tim Gardner <tim.gardner@canonical.com> > --- > debian.azure/config/amd64/config.common.amd64 | 1 - > debian.azure/config/annotations | 16 ++++++++++++++++ > debian.azure/config/arm64/config.common.arm64 | 1 - > debian.azure/config/config.common.ubuntu | 14 +------------- > 4 files changed, 17 insertions(+), 15 deletions(-) > > diff --git a/debian.azure/config/amd64/config.common.amd64 b/debian.azure/config/amd64/config.common.amd64 > index 394287604bf9..e07e1e301530 100644 > --- a/debian.azure/config/amd64/config.common.amd64 > +++ b/debian.azure/config/amd64/config.common.amd64 > @@ -11,7 +11,6 @@ CONFIG_ATA_PIIX=y > # CONFIG_BROADCOM_PHY is not set > # CONFIG_CB710_CORE is not set > CONFIG_CC_VERSION_TEXT="gcc (Ubuntu 11.2.0-19ubuntu1) 11.2.0" > -# CONFIG_CMA is not set > CONFIG_CRC8=m > CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11 > CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 > diff --git a/debian.azure/config/annotations b/debian.azure/config/annotations > index 15c050c3e052..937483a6251e 100644 > --- a/debian.azure/config/annotations > +++ b/debian.azure/config/annotations > @@ -4,6 +4,22 @@ > > include "../../debian.master/config/annotations" > > +# Menu: Library routines >> DMA Contiguous Memory Allocator >> Selected region size > +CONFIG_CMA policy<{'amd64': 'n', 'arm64': 'n'}> note<LP: #1990167> > +CONFIG_CMA_SIZE_SEL_MBYTES policy<{'arm64': '-'}> > +CONFIG_CMA_SIZE_SEL_PERCENTAGE policy<{'arm64': '-'}> > +CONFIG_CMA_SIZE_SEL_MIN policy<{'arm64': '-'}> > +CONFIG_CMA_SIZE_SEL_MAX policy<{'arm64': '-'}> > +CONFIG_CMA_DEBUG policy<{'arm64': '-'}> > +CONFIG_DMA_PERNUMA_CMA policy<{'arm64': '-'}> > +CONFIG_DMA_CMA policy<{'arm64': '-'}> > +CONFIG_DMABUF_HEAPS_CMA policy<{'arm64': '-'}> > +CONFIG_CMA_AREAS policy<{'arm64': '-'}> > +CONFIG_CMA_SYSFS policy<{'arm64': '-'}> > +CONFIG_CMA_DEBUGFS policy<{'arm64': '-'}> > +CONFIG_CMA_ALIGNMENT policy<{'arm64': '-'}> > +CONFIG_CMA_SIZE_MBYTES policy<{'arm64': '-'}> > + > CONFIG_INTEL_MEI_VSC policy<{'amd64': 'n'}> > CONFIG_INTEL_VSC policy<{'amd64': 'n', 'arm64': 'n'}> > CONFIG_INTEL_VSC_PSE policy<{'amd64': 'n', 'arm64': 'n'}> > diff --git a/debian.azure/config/arm64/config.common.arm64 b/debian.azure/config/arm64/config.common.arm64 > index 1bbe597a0c98..086658c115c7 100644 > --- a/debian.azure/config/arm64/config.common.arm64 > +++ b/debian.azure/config/arm64/config.common.arm64 > @@ -11,7 +11,6 @@ CONFIG_ATA_PIIX=m > CONFIG_BROADCOM_PHY=m > CONFIG_CB710_CORE=m > CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 11.2.0-17ubuntu1) 11.2.0" > -CONFIG_CMA=y > CONFIG_CRC8=y > CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9 > CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 > diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu > index a193652a0e40..d3833f514954 100644 > --- a/debian.azure/config/config.common.ubuntu > +++ b/debian.azure/config/config.common.ubuntu > @@ -1177,16 +1177,7 @@ CONFIG_CLONE_BACKWARDS=y > CONFIG_CLS_U32_MARK=y > # CONFIG_CLS_U32_PERF is not set > CONFIG_CLZ_TAB=y > -CONFIG_CMA_ALIGNMENT=8 > -CONFIG_CMA_AREAS=7 > -# CONFIG_CMA_DEBUG is not set > -# CONFIG_CMA_DEBUGFS is not set > -CONFIG_CMA_SIZE_MBYTES=32 > -# CONFIG_CMA_SIZE_SEL_MAX is not set > -CONFIG_CMA_SIZE_SEL_MBYTES=y > -# CONFIG_CMA_SIZE_SEL_MIN is not set > -# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set > -CONFIG_CMA_SYSFS=y > +# CONFIG_CMA is not set > CONFIG_CMDLINE="console=ttyAMA0" > # CONFIG_CMDLINE_BOOL is not set > # CONFIG_CMDLINE_FORCE is not set > @@ -1835,7 +1826,6 @@ CONFIG_DLM=m > # CONFIG_DLM_DEBUG is not set > # CONFIG_DMABUF_DEBUG is not set > CONFIG_DMABUF_HEAPS=y > -CONFIG_DMABUF_HEAPS_CMA=y > CONFIG_DMABUF_HEAPS_SYSTEM=y > # CONFIG_DMABUF_MOVE_NOTIFY is not set > # CONFIG_DMABUF_SELFTESTS is not set > @@ -1847,7 +1837,6 @@ CONFIG_DMAR_TABLE=y > CONFIG_DMA_ACPI=y > # CONFIG_DMA_API_DEBUG is not set > CONFIG_DMA_BCM2835=y > -CONFIG_DMA_CMA=y > CONFIG_DMA_COHERENT_POOL=y > CONFIG_DMA_DECLARE_COHERENT=y > CONFIG_DMA_DIRECT_REMAP=y > @@ -1858,7 +1847,6 @@ CONFIG_DMA_ENGINE_RAID=y > CONFIG_DMA_NONCOHERENT_MMAP=y > CONFIG_DMA_OF=y > CONFIG_DMA_OPS=y > -CONFIG_DMA_PERNUMA_CMA=y > CONFIG_DMA_REMAP=y > CONFIG_DMA_RESTRICTED_POOL=y > CONFIG_DMA_SHARED_BUFFER=y Applied to Jammy linux-azure/master-next. Thanks. -rtg
diff --git a/debian.azure/config/amd64/config.common.amd64 b/debian.azure/config/amd64/config.common.amd64 index 394287604bf9..e07e1e301530 100644 --- a/debian.azure/config/amd64/config.common.amd64 +++ b/debian.azure/config/amd64/config.common.amd64 @@ -11,7 +11,6 @@ CONFIG_ATA_PIIX=y # CONFIG_BROADCOM_PHY is not set # CONFIG_CB710_CORE is not set CONFIG_CC_VERSION_TEXT="gcc (Ubuntu 11.2.0-19ubuntu1) 11.2.0" -# CONFIG_CMA is not set CONFIG_CRC8=m CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 diff --git a/debian.azure/config/annotations b/debian.azure/config/annotations index 15c050c3e052..937483a6251e 100644 --- a/debian.azure/config/annotations +++ b/debian.azure/config/annotations @@ -4,6 +4,22 @@ include "../../debian.master/config/annotations" +# Menu: Library routines >> DMA Contiguous Memory Allocator >> Selected region size +CONFIG_CMA policy<{'amd64': 'n', 'arm64': 'n'}> note<LP: #1990167> +CONFIG_CMA_SIZE_SEL_MBYTES policy<{'arm64': '-'}> +CONFIG_CMA_SIZE_SEL_PERCENTAGE policy<{'arm64': '-'}> +CONFIG_CMA_SIZE_SEL_MIN policy<{'arm64': '-'}> +CONFIG_CMA_SIZE_SEL_MAX policy<{'arm64': '-'}> +CONFIG_CMA_DEBUG policy<{'arm64': '-'}> +CONFIG_DMA_PERNUMA_CMA policy<{'arm64': '-'}> +CONFIG_DMA_CMA policy<{'arm64': '-'}> +CONFIG_DMABUF_HEAPS_CMA policy<{'arm64': '-'}> +CONFIG_CMA_AREAS policy<{'arm64': '-'}> +CONFIG_CMA_SYSFS policy<{'arm64': '-'}> +CONFIG_CMA_DEBUGFS policy<{'arm64': '-'}> +CONFIG_CMA_ALIGNMENT policy<{'arm64': '-'}> +CONFIG_CMA_SIZE_MBYTES policy<{'arm64': '-'}> + CONFIG_INTEL_MEI_VSC policy<{'amd64': 'n'}> CONFIG_INTEL_VSC policy<{'amd64': 'n', 'arm64': 'n'}> CONFIG_INTEL_VSC_PSE policy<{'amd64': 'n', 'arm64': 'n'}> diff --git a/debian.azure/config/arm64/config.common.arm64 b/debian.azure/config/arm64/config.common.arm64 index 1bbe597a0c98..086658c115c7 100644 --- a/debian.azure/config/arm64/config.common.arm64 +++ b/debian.azure/config/arm64/config.common.arm64 @@ -11,7 +11,6 @@ CONFIG_ATA_PIIX=m CONFIG_BROADCOM_PHY=m CONFIG_CB710_CORE=m CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 11.2.0-17ubuntu1) 11.2.0" -CONFIG_CMA=y CONFIG_CRC8=y CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu index a193652a0e40..d3833f514954 100644 --- a/debian.azure/config/config.common.ubuntu +++ b/debian.azure/config/config.common.ubuntu @@ -1177,16 +1177,7 @@ CONFIG_CLONE_BACKWARDS=y CONFIG_CLS_U32_MARK=y # CONFIG_CLS_U32_PERF is not set CONFIG_CLZ_TAB=y -CONFIG_CMA_ALIGNMENT=8 -CONFIG_CMA_AREAS=7 -# CONFIG_CMA_DEBUG is not set -# CONFIG_CMA_DEBUGFS is not set -CONFIG_CMA_SIZE_MBYTES=32 -# CONFIG_CMA_SIZE_SEL_MAX is not set -CONFIG_CMA_SIZE_SEL_MBYTES=y -# CONFIG_CMA_SIZE_SEL_MIN is not set -# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set -CONFIG_CMA_SYSFS=y +# CONFIG_CMA is not set CONFIG_CMDLINE="console=ttyAMA0" # CONFIG_CMDLINE_BOOL is not set # CONFIG_CMDLINE_FORCE is not set @@ -1835,7 +1826,6 @@ CONFIG_DLM=m # CONFIG_DLM_DEBUG is not set # CONFIG_DMABUF_DEBUG is not set CONFIG_DMABUF_HEAPS=y -CONFIG_DMABUF_HEAPS_CMA=y CONFIG_DMABUF_HEAPS_SYSTEM=y # CONFIG_DMABUF_MOVE_NOTIFY is not set # CONFIG_DMABUF_SELFTESTS is not set @@ -1847,7 +1837,6 @@ CONFIG_DMAR_TABLE=y CONFIG_DMA_ACPI=y # CONFIG_DMA_API_DEBUG is not set CONFIG_DMA_BCM2835=y -CONFIG_DMA_CMA=y CONFIG_DMA_COHERENT_POOL=y CONFIG_DMA_DECLARE_COHERENT=y CONFIG_DMA_DIRECT_REMAP=y @@ -1858,7 +1847,6 @@ CONFIG_DMA_ENGINE_RAID=y CONFIG_DMA_NONCOHERENT_MMAP=y CONFIG_DMA_OF=y CONFIG_DMA_OPS=y -CONFIG_DMA_PERNUMA_CMA=y CONFIG_DMA_REMAP=y CONFIG_DMA_RESTRICTED_POOL=y CONFIG_DMA_SHARED_BUFFER=y
BugLink: https://bugs.launchpad.net/bugs/1990167 Disable CONFIG_CMA consistent with amd64. Signed-off-by: Tim Gardner <tim.gardner@canonical.com> --- debian.azure/config/amd64/config.common.amd64 | 1 - debian.azure/config/annotations | 16 ++++++++++++++++ debian.azure/config/arm64/config.common.arm64 | 1 - debian.azure/config/config.common.ubuntu | 14 +------------- 4 files changed, 17 insertions(+), 15 deletions(-)