From patchwork Tue Jun 4 21:00:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dann frazier X-Patchwork-Id: 1110157 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) 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: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45JPTf1VzKz9sNk; Wed, 5 Jun 2019 07:00:54 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1hYGY2-00025j-NR; Tue, 04 Jun 2019 21:00:46 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1hYGY0-00024T-K6 for kernel-team@lists.ubuntu.com; Tue, 04 Jun 2019 21:00:44 +0000 Received: from mail-it1-f197.google.com ([209.85.166.197]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1hYGY0-0007BG-6i for kernel-team@lists.ubuntu.com; Tue, 04 Jun 2019 21:00:44 +0000 Received: by mail-it1-f197.google.com with SMTP id s18so102807itl.7 for ; Tue, 04 Jun 2019 14:00:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KEHKLtCILcR9rZ0VYk3DHBnPkeR80KfVhxI+WksBBA8=; b=JhvALHTXVNimmgRkblYNdHpnhip7tPlBT/iJLn/wfLt+OSNAZ5W635eVgnwwr2FmGu uFV1g5mOzWKCLoKyHJqfa46OApzDgAlh8qjt6E7MOSfC8a3k/gO/wf5GA9IM7Gcd9aFQ 7/LHlUnDuT8iw8RyPg2iYfN4A+LbFTZCZrHTSx1X+40Z4+V5zai+XWOV1DtqbjEPpXK0 xYCgN6JUv7RZCliR68lud7qRDOigB5TOmeI1+0QzpR7imH4jYGBG4w5O8Fl0c/XkC4Ud teRZBr5h8Wms27d3EyTHkPs2Ke9nf+6b5QUcSy2GwaqSI6pjd9X7zRZtt63xdW1hqTnY j5ZA== X-Gm-Message-State: APjAAAXcscriLWoPPMxqWqM8mOYW9KX8MTEW9VFYhXRP0kO32dplq2L9 1ePLC57/kC0hKtpFcHXZPHAoPCSQOue/GeCjlqLt52PKo0aqVa+w+SzXLkfdrTY0d9Fn0ipDPi3 cWQMfNFPWrGJbk0dYAoGaD4+Y920qQqpQ+bD/7/OxSw== X-Received: by 2002:a6b:ba04:: with SMTP id k4mr17303963iof.127.1559682042888; Tue, 04 Jun 2019 14:00:42 -0700 (PDT) X-Google-Smtp-Source: APXvYqwv98tOx+U8rxUB5jQK4hP/M24kGiqvrDek+gLliriOjEQgFzOQspGLwJ2P+zYaa+RXkvQmbA== X-Received: by 2002:a6b:ba04:: with SMTP id k4mr17303944iof.127.1559682042608; Tue, 04 Jun 2019 14:00:42 -0700 (PDT) Received: from xps13.canonical.com (c-71-56-235-36.hsd1.co.comcast.net. [71.56.235.36]) by smtp.gmail.com with ESMTPSA id k203sm7957795itk.41.2019.06.04.14.00.41 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Jun 2019 14:00:42 -0700 (PDT) From: dann frazier To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/4][Unstable][SRU Disco] UBUNTU: [Config] Bump CMA_SIZE_MBYTES to 32 on arm64 Date: Tue, 4 Jun 2019 15:00:07 -0600 Message-Id: <20190604210010.7405-2-dann.frazier@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190604210010.7405-1-dann.frazier@canonical.com> References: <20190604210010.7405-1-dann.frazier@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: http://bugs.launchpad.net/bugs/1823753 This aligns us with the upstream defconfig which was bumped to 32 for the VC4 SoC in commit 7304a9a99d7b15fd69b3f00f7e16206bba110b35 ("arm64: defconfig: Increase CMA size for VC4") Signed-off-by: dann frazier Acked-by: Stefan Bader --- debian.master/config/annotations | 2 +- debian.master/config/config.common.ubuntu | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 008ead6f697cd..062688998114b 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -1484,7 +1484,7 @@ CONFIG_DEVTMPFS_MOUNT note note> Generic Driver Options >> DMA Contiguous Memory Allocator CONFIG_DMA_CMA policy<{'amd64': 'n', 'arm64': 'y', 'armhf-generic': 'y', 'armhf-generic-lpae': 'n', 'i386': 'n', 's390x': 'n'}> -CONFIG_CMA_SIZE_MBYTES policy<{'arm64': '16', 'armhf-generic': '16'}> +CONFIG_CMA_SIZE_MBYTES policy<{'arm64': '32', 'armhf-generic': '16'}> CONFIG_CMA_ALIGNMENT policy<{'arm64': '8', 'armhf-generic': '8'}> # CONFIG_DMA_CMA note note note diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index df275aa4a69d3..6d5f4835a28bf 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -1532,7 +1532,7 @@ CONFIG_CMA_ALIGNMENT=8 CONFIG_CMA_AREAS=7 # CONFIG_CMA_DEBUG is not set # CONFIG_CMA_DEBUGFS is not set -CONFIG_CMA_SIZE_MBYTES=16 +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