From patchwork Thu Jan 5 08:24:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khalid Elmously X-Patchwork-Id: 1721692 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=LTy5Cf1W; 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 4NnffR25d8z23dq for ; Thu, 5 Jan 2023 19:25:01 +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 1pDLYK-0007Gz-Tm; Thu, 05 Jan 2023 08:24:44 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1pDLYG-0007Fp-Rg for kernel-team@lists.ubuntu.com; Thu, 05 Jan 2023 08:24:43 +0000 Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.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-1.canonical.com (Postfix) with ESMTPS id 67871418EB for ; Thu, 5 Jan 2023 08:24:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1672907080; bh=vD3ab/0no9m+6VIA68iFKvjr54US3DlbzNUci60YfD0=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=LTy5Cf1W11+FKQXfAKVoNBJfLYbFJvcRB6qzXelZbH9WktOpnYW+4B/5VCwvD89RY 1DXoWD9E5xBTKTvtjrjatJ/WijnFxGuAvNPdxNn2XKmJTd6OlDQxP/xee0V+po9Nqi 8N5myE/FPnOO7E/oysAgXD77jQeuAN6iMzScR8kBIYFflMD4Lyzn8vFRX31jLY19u9 8WeQcIcbjEDokZ2SYWW7moqOHUG6S97+YsQ+x0dLw6OcN03KvdnVnFssoy50709jdA +dy9aCYor9AV76QQFl3oXw2PQaxfWP3j10kkrHZ2xsFpQpudW7p78q7YlAVAcQTNH5 d3z80nGZFHfPQ== Received: by mail-qv1-f69.google.com with SMTP id nt2-20020a0562143c0200b004c74f7ec3afso18714420qvb.2 for ; Thu, 05 Jan 2023 00:24: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:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=vD3ab/0no9m+6VIA68iFKvjr54US3DlbzNUci60YfD0=; b=sdJ68LAwmYS2OXssxuA8e4zGuOvnMebraAi2HvqE4yY3LAfKyzpbmc3gSwfAftRkAA P4JTJQ5ICMy7PXsKCORwSSnN4b/gnZ0IlHXV6PhiKUltbgvO8WTrtrYyebg0+aljI5Hz 1dRuZGNdaaaA0ITLC0IiWx8jfncmLPF2zJXWfsxTknXP/nYMyGYN3fbAxxFWvpEi46TS jxY2FFUprzrSdNJUO4oz2UrMWzo5+l0UuRM+LxdvWqJwbd6Jz4grTHGVh/Maq/p+MXfA Ga7esDS4jlxtQ/5kS2ynNwkNNGDBl9sXtjWP4plRs6PS3dpzLuc9ZwMR4XmfMze5vY/u 5PZw== X-Gm-Message-State: AFqh2kpzto9bUEBvVSNu2TtuCI3Ky1zdON+GFmtWviUtopkajl/bO9xV o4P3dgp7NQ0DapFwB3kuUnA+kDJQj+I17/uE4yW8Ez0NK2bsrrZ1o8BKOEpt1pM6UdlFWWwufkW 8/XYxL8Fg1RFfz6KsHkUed9mqdhT1Oo5qa1OTv5DMRw== X-Received: by 2002:ac8:674e:0:b0:3a9:7c51:1944 with SMTP id n14-20020ac8674e000000b003a97c511944mr70573557qtp.42.1672907079488; Thu, 05 Jan 2023 00:24:39 -0800 (PST) X-Google-Smtp-Source: AMrXdXt48pH0LwePA27Jb/rodfkMavoT80ratUAolHIqD6y5lEcBDNJiemeWfGHq6zJGPqD4HIxnfQ== X-Received: by 2002:ac8:674e:0:b0:3a9:7c51:1944 with SMTP id n14-20020ac8674e000000b003a97c511944mr70573544qtp.42.1672907079186; Thu, 05 Jan 2023 00:24:39 -0800 (PST) Received: from k2.fuzzbuzz.org ([38.147.253.164]) by smtp.gmail.com with ESMTPSA id h17-20020a05620a401100b006ce9e880c6fsm25929710qko.111.2023.01.05.00.24.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Jan 2023 00:24:38 -0800 (PST) From: Khalid Elmously To: kernel-team@lists.ubuntu.com Subject: [SRU][F/oracle][PATCH 1/1] UBUNTU: [config] Enable ARM_SMMU and ARM_SMMU_V3 Date: Thu, 5 Jan 2023 03:24:19 -0500 Message-Id: <20230105082419.2047719-1-khalid.elmously@canonical.com> X-Mailer: git-send-email 2.34.1 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/1925421 Signed-off-by: Khalid Elmously --- debian.oracle/config/annotations | 23 +++++++++++++++-------- debian.oracle/config/config.common.ubuntu | 10 +++++++--- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/debian.oracle/config/annotations b/debian.oracle/config/annotations index 6e9d80805fc30d..53de038fb3aea8 100644 --- a/debian.oracle/config/annotations +++ b/debian.oracle/config/annotations @@ -4,12 +4,6 @@ include "../../debian.master/config/annotations" -CONFIG_FAILOVER policy<{'amd64': 'm', 'arm64':'m'}> -CONFIG_FAILOVER mark note -CONFIG_NET_FAILOVER policy<{'amd64': 'm', 'arm64':'m'}> -CONFIG_NET_FAILOVER mark note -CONFIG_PAGE_POOL policy<{'amd64': 'y', 'arm64':'y'}> -CONFIG_PAGE_POOL mark note CONFIG_SOUNDWIRE policy<{'amd64': 'n', 'arm64':'n'}> CONFIG_SOUNDWIRE mark note CONFIG_SND_SOC_SOF_HDA_COMMON_HDMI_CODEC policy<{'amd64': 'n'}> @@ -36,8 +30,6 @@ CONFIG_MTD_DOCG3 policy<{'amd64': 'm', 'arm64': CONFIG_MTD_DOCG3 mark note CONFIG_SAMPLE_TRACE_PRINTK policy<{'amd64': '-'}> CONFIG_SAMPLE_TRACE_PRINTK mark note -CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT policy<{'arm64': '-'}> -CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT mark note CONFIG_REGULATOR_TPS65217 policy<{'arm64': '-'}> CONFIG_REGULATOR_TPS65217 mark note CONFIG_MFD_TPS65217 policy<{'arm64': 'n'}> @@ -60,3 +52,18 @@ CONFIG_SERIAL_AMBA_PL011_CONSOLE mark note> Architecture: arm64 CONFIG_ARM64_SW_TTBR0_PAN policy<{'arm64': 'y'}> CONFIG_ARM64_SW_TTBR0_PAN mark note + + + + +# Specificlaly requested or needed by Oracle: +CONFIG_FAILOVER policy<{'amd64': 'm', 'arm64':'m'}> +CONFIG_FAILOVER mark note +CONFIG_NET_FAILOVER policy<{'amd64': 'm', 'arm64':'m'}> +CONFIG_NET_FAILOVER mark note +CONFIG_PAGE_POOL policy<{'amd64': 'y', 'arm64':'y'}> +CONFIG_PAGE_POOL mark note +CONFIG_ARM_SMMU policy<{'arm64':'y'}> +CONFIG_ARM_SMMU mark note +CONFIG_ARM_SMMU_V3 policy<{'arm64':'y'}> +CONFIG_ARM_SMMU_V3 mark note diff --git a/debian.oracle/config/config.common.ubuntu b/debian.oracle/config/config.common.ubuntu index 55547ac2120021..d54157c2a45637 100644 --- a/debian.oracle/config/config.common.ubuntu +++ b/debian.oracle/config/config.common.ubuntu @@ -518,8 +518,10 @@ CONFIG_ARM_PSCI_FW=y # CONFIG_ARM_SCMI_PROTOCOL is not set # CONFIG_ARM_SCPI_PROTOCOL is not set # CONFIG_ARM_SDE_INTERFACE is not set -# CONFIG_ARM_SMMU is not set -# CONFIG_ARM_SMMU_V3 is not set +CONFIG_ARM_SMMU=y +# CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT is not set +CONFIG_ARM_SMMU_V3=y +CONFIG_ARM_SMMU_V3_PMU=m # CONFIG_ARM_SP805_WATCHDOG is not set # CONFIG_ARM_SPE_PMU is not set CONFIG_AS3935=m @@ -3696,8 +3698,10 @@ CONFIG_IOMMU_API=y CONFIG_IOMMU_DMA=y CONFIG_IOMMU_HELPER=y CONFIG_IOMMU_IOVA=y +CONFIG_IOMMU_IO_PGTABLE=y # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set -# CONFIG_IOMMU_IO_PGTABLE_LPAE is not set +CONFIG_IOMMU_IO_PGTABLE_LPAE=y +# CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set CONFIG_IOMMU_SUPPORT=y # CONFIG_ION is not set CONFIG_IONIC=m