From patchwork Wed Jan 4 16:18:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 1721458 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=CFdCuAq2; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NnFDp6cXfz23ff for ; Thu, 5 Jan 2023 03:19:53 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1pD6UP-0000bc-Sl; Wed, 04 Jan 2023 16:19:41 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1pD6UO-0000b2-De for kernel-team@lists.ubuntu.com; Wed, 04 Jan 2023 16:19:40 +0000 Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 2B75E445BD for ; Wed, 4 Jan 2023 16:19:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1672849180; bh=8tOe9RbyER65s2Nn6gbdcNzu5U2lUjYOYYrE8Q9QFuY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=CFdCuAq2UEXmiRIdRUSZodCn/ABoAy4doi2pyiI2uyT9Iqc+S2mv4PsXxr/4KnpDp Sbc9PxrnXm9su9/QdfYJWEN2ALS0HyRoAcr8GpZhmIw2xzdnlrgA+esF2rSxfU/fLX psw2oO8VpkW1i/CIPvc895iJHwUVOPSlbsapOC8D19LLNXhce/5muGVi24gfNmtD3g vRk/2b6CAO/1zQWTchgvRFdxo4mQ6PWE9E1IUln5295g655+pbyaGRcE5bPDHo8uDd G8DpJUuTEC609dhmJFIJDPXqYGh1+N3P1nJrb56O/UarVL3wl8lMcnhwqs5h/i1io3 VPssn9wMh3LPg== Received: by mail-pj1-f69.google.com with SMTP id h14-20020a17090adb8e00b002264c50f36aso3764814pjv.4 for ; Wed, 04 Jan 2023 08:19:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8tOe9RbyER65s2Nn6gbdcNzu5U2lUjYOYYrE8Q9QFuY=; b=kz7nciZOcykqWwNsqKg+q8EepFjVkRKUS9owj8beASce70Eg/M9U99QA0hRXKHvf+3 XtFYEvfqnROiHGkmsZdCjQD6G+am1jRQQApdWiJ67u2DbSQ49ky4dXeAZEZ0jqqZtOZe EPdX3Jttaz3QQ9HDlznxkZ3DysWsn9DfQUHRkQt7jmzacxmqC44JzGY6PI0OuKiCGoz8 +ufBYAA15D5ZxmwVo68ec/QeYCFXqWihidghWjhXteSauGkpF1aZL52XiixXbLxS+jZz EvrGWPoeqzIe35qjXGb6wiM0C2YsPYvoiGPmtzrnXU6t6DvUeMENKYqY56p159Lm81R+ A81w== X-Gm-Message-State: AFqh2kqNxS5Lq8jZIkNprCZ3NLJd8K4G2xMivziA+fxa/gF7VLEOtI6B Y7TlItz6JYDyqNH4lqHN+pqUuARaGZnw5fO7CrRlqNsnA86QaCXNSDMGu5FYF72prwRxuCfKYpA X0npDbiuavEnw+eHGAFFL7AVPBL735pFdhEzOPX6AKg== X-Received: by 2002:aa7:9683:0:b0:581:a8dc:8f94 with SMTP id f3-20020aa79683000000b00581a8dc8f94mr24286475pfk.27.1672849176993; Wed, 04 Jan 2023 08:19:36 -0800 (PST) X-Google-Smtp-Source: AMrXdXtp8V0Z/rkRkuZLtyxNgi1qeKchTl0+sFQu65g0B79HTLHwZJkBjHhxvWMmVK4AS5MTTi0Rbw== X-Received: by 2002:aa7:9683:0:b0:581:a8dc:8f94 with SMTP id f3-20020aa79683000000b00581a8dc8f94mr24286458pfk.27.1672849176666; Wed, 04 Jan 2023 08:19:36 -0800 (PST) Received: from localhost.localdomain ([69.163.84.166]) by smtp.gmail.com with ESMTPSA id x30-20020aa79a5e000000b005827d78ff27sm6002911pfj.32.2023.01.04.08.19.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Jan 2023 08:19:35 -0800 (PST) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH][kinetic/linux-aws] UBUNTU: [Config] aws: Disable CONFIG_CMA for arm64 Date: Wed, 4 Jan 2023 09:18:55 -0700 Message-Id: <20230104161855.72912-3-tim.gardner@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230104161855.72912-1-tim.gardner@canonical.com> References: <20230104161855.72912-1-tim.gardner@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1990167 CONFIG_DRM_ETNAVIV must also be disabled since it selects CONFIG_CMA. This is not a GPU supported on the AWS platforms. Signed-off-by: Tim Gardner --- debian.aws/abi/arm64/aws.modules | 1 - debian.aws/config/amd64/config.common.amd64 | 2 -- debian.aws/config/annotations | 17 +++++++++++++++++ debian.aws/config/arm64/config.common.arm64 | 2 -- debian.aws/config/config.common.ubuntu | 16 ++-------------- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/debian.aws/abi/arm64/aws.modules b/debian.aws/abi/arm64/aws.modules index c1f4e94ef47c..f01a187da9d7 100644 --- a/debian.aws/abi/arm64/aws.modules +++ b/debian.aws/abi/arm64/aws.modules @@ -1440,7 +1440,6 @@ et131x et8ek8 etas_es58x ethoc -etnaviv evbug exc3000 exfat diff --git a/debian.aws/config/amd64/config.common.amd64 b/debian.aws/config/amd64/config.common.amd64 index dffdcceaa34c..e3898f7967dc 100644 --- a/debian.aws/config/amd64/config.common.amd64 +++ b/debian.aws/config/amd64/config.common.amd64 @@ -14,11 +14,9 @@ CONFIG_ATA_GENERIC=y CONFIG_ATA_PIIX=y # CONFIG_BCM_VK_TTY is not set CONFIG_CC_VERSION_TEXT="x86_64-linux-gnu-gcc-12 (Ubuntu 12.2.0-3ubuntu1) 12.2.0" -# CONFIG_CMA is not set CONFIG_CRC8=m CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 -# CONFIG_DRM_ETNAVIV is not set CONFIG_HIBERNATION=y CONFIG_I2C_AMD_MP2=m # CONFIG_I2C_SLAVE is not set diff --git a/debian.aws/config/annotations b/debian.aws/config/annotations index 311e01b52965..bad584511b94 100644 --- a/debian.aws/config/annotations +++ b/debian.aws/config/annotations @@ -4,6 +4,23 @@ include ../../debian.master/config/annotations +CONFIG_CMA policy<{'amd64': 'n', 'arm64': 'n'}> note +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_DRM_ETNAVIV policy<{'amd64': 'n', 'arm64': 'n'}> note +CONFIG_DRM_ETNAVIV_THERMAL policy<{'arm64': '-'}> note + CONFIG_IOMMU_DEFAULT_DMA_STRICT policy<{'amd64': 'n', 'arm64': 'n'}> CONFIG_IOMMU_DEFAULT_DMA_STRICT note CONFIG_IOMMU_DEFAULT_DMA_LAZY policy<{'amd64': 'y', 'arm64': 'y'}> diff --git a/debian.aws/config/arm64/config.common.arm64 b/debian.aws/config/arm64/config.common.arm64 index 61f9accef8cf..170d1cb01cf8 100644 --- a/debian.aws/config/arm64/config.common.arm64 +++ b/debian.aws/config/arm64/config.common.arm64 @@ -14,11 +14,9 @@ CONFIG_ATA_GENERIC=m CONFIG_ATA_PIIX=m CONFIG_BCM_VK_TTY=y CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc-12 (Ubuntu 12.2.0-3ubuntu1) 12.2.0" -CONFIG_CMA=y CONFIG_CRC8=y CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 -CONFIG_DRM_ETNAVIV=m # CONFIG_HIBERNATION is not set # CONFIG_I2C_AMD_MP2 is not set CONFIG_I2C_SLAVE=y diff --git a/debian.aws/config/config.common.ubuntu b/debian.aws/config/config.common.ubuntu index a7bce644eedc..ca56d03e225c 100644 --- a/debian.aws/config/config.common.ubuntu +++ b/debian.aws/config/config.common.ubuntu @@ -1574,16 +1574,7 @@ CONFIG_CM3232=m CONFIG_CM3323=m CONFIG_CM3605=m CONFIG_CM36651=m -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 @@ -2428,7 +2419,6 @@ CONFIG_DM9051=m CONFIG_DM9102=m # 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 @@ -2443,7 +2433,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 @@ -2454,7 +2443,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_RESTRICTED_POOL=y CONFIG_DMA_SHARED_BUFFER=y CONFIG_DMA_SUN6I=m @@ -2562,7 +2550,7 @@ CONFIG_DRM_DW_HDMI=m CONFIG_DRM_DW_HDMI_CEC=m # CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set CONFIG_DRM_DW_MIPI_DSI=m -CONFIG_DRM_ETNAVIV_THERMAL=y +# CONFIG_DRM_ETNAVIV is not set CONFIG_DRM_FBDEV_EMULATION=y # CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set CONFIG_DRM_FBDEV_OVERALLOC=100