From patchwork Mon Jul 15 07:09:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Po-Hsu Lin X-Patchwork-Id: 1131867 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 45nF5c1dKzz9sPM; Mon, 15 Jul 2019 17:09:40 +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 1hmv7A-0000yy-Gy; Mon, 15 Jul 2019 07:09:36 +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 1hmv76-0000yG-LU for kernel-team@lists.ubuntu.com; Mon, 15 Jul 2019 07:09:32 +0000 Received: from mail-pg1-f197.google.com ([209.85.215.197]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1hmv76-0006Fb-6C for kernel-team@lists.ubuntu.com; Mon, 15 Jul 2019 07:09:32 +0000 Received: by mail-pg1-f197.google.com with SMTP id o16so10028020pgk.18 for ; Mon, 15 Jul 2019 00:09:32 -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:subject:date:message-id:in-reply-to :references; bh=sgXdUZUnzme2Bs+LOSHS2CMZ9umWzW67TZrw5m+DoJI=; b=spXuiX59tu+TzZwN7oKWJbcOGsF1/obz9ZN+R1/xPDKtPX9e4EdFu0OlJYxXCSn4SM vQW/nW8Q4W5vFAV4VvpQVlxeRpBbpITOdA/eCAMpJgzJYZF48SGSBtgpm+ZHVI1FYy1t tad2WQvbRaZURvP3Gnez7rXTEFpSeANSv0f/8xTzO59Geds80xtHz/w4GCllnP0RMG8m 5MFib/UthOWZ+cH1sppjvWl9OBMCyLtdaqngxWyfeB8TPUduL1qoVKlHwlHc8NTid9w0 c2rAvEZjyOagIfUL6wn2YHyoVUg3GtGn4HEMavhSvsrfL9VSDGsz7517mr3nxvWKsSDr vNrg== X-Gm-Message-State: APjAAAUiO3H/vgtgwyXmQmUONcYQ9eh/+Wl/fZc48JXVUbGMbNdcIO8c H4f/WfmRZQNS/u9pYASkxtdAGI40FFzVwvZLomQUCIBoLKmIDXUJFLY/kWgoXMqcHkXsRsFpCjS 7v3t7MTlmx6gvBo3WQgDG1R1rJwVS/5FegcSZkPaj X-Received: by 2002:a63:c342:: with SMTP id e2mr25042601pgd.79.1563174570589; Mon, 15 Jul 2019 00:09:30 -0700 (PDT) X-Google-Smtp-Source: APXvYqxlqg6xwry76VVdxE5GjOtJLTW4RwZ703uNRjBbXw++uBnott4UxXLRG2ABUyPPnNYnJE0BiQ== X-Received: by 2002:a63:c342:: with SMTP id e2mr25042577pgd.79.1563174570284; Mon, 15 Jul 2019 00:09:30 -0700 (PDT) Received: from Leggiero.taipei.internal (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id d12sm15105809pfd.96.2019.07.15.00.09.29 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 15 Jul 2019 00:09:29 -0700 (PDT) From: Po-Hsu Lin To: kernel-team@lists.ubuntu.com Subject: [D][E][SRU][PATCHv2 1/1] UBUNTU: [Config] Enable Armada SOCs and MVPP2 NIC driver for disco/generic arm64 Date: Mon, 15 Jul 2019 15:09:22 +0800 Message-Id: <20190715070922.15443-2-po-hsu.lin@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190715070922.15443-1-po-hsu.lin@canonical.com> References: <20190715070922.15443-1-po-hsu.lin@canonical.com> 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: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1835054 Enable the Armada SOCs (ARCH_MVEBU) and the MVPP2 NIC driver for arm64. We already have these enabled for armhf, but not arm64. Other configs were added by the updateconfigs process Signed-off-by: Po-Hsu Lin Acked-by: Paolo Pisati Acked-by: Connor Kuehl --- debian.master/config/annotations | 4 ++-- debian.master/config/arm64/config.common.arm64 | 1 - debian.master/config/armhf/config.common.armhf | 1 - debian.master/config/config.common.ubuntu | 14 ++++++++++++++ 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/debian.master/config/annotations b/debian.master/config/annotations index cfb4bb8..3095110 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -5339,7 +5339,7 @@ CONFIG_MV643XX_ETH policy<{'armhf': 'm'}> CONFIG_MVMDIO policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}> CONFIG_MVNETA_BM_ENABLE policy<{'armhf': 'n'}> CONFIG_MVNETA policy<{'armhf': 'm'}> -CONFIG_MVPP2 policy<{'armhf': 'm'}> +CONFIG_MVPP2 policy<{'arm64': 'm', 'armhf': 'm'}> CONFIG_PXA168_ETH policy<{'arm64': 'm', 'armhf': 'm'}> CONFIG_SKGE policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}> CONFIG_SKGE_DEBUG policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n'}> @@ -11494,7 +11494,7 @@ CONFIG_ARCH_EXYNOS policy<{'arm64': 'n', 'armhf': ' CONFIG_ARCH_HISI policy<{'arm64': 'y', 'armhf': 'y'}> CONFIG_ARCH_MEDIATEK policy<{'arm64': 'y', 'armhf': 'y'}> CONFIG_ARCH_MESON policy<{'arm64': 'n', 'armhf': 'y'}> -CONFIG_ARCH_MVEBU policy<{'arm64': 'n', 'armhf': 'y'}> +CONFIG_ARCH_MVEBU policy<{'arm64': 'y', 'armhf': 'y'}> CONFIG_ARCH_MXC policy<{'arm64': 'y', 'armhf-generic': 'y', 'armhf-generic-lpae': 'n'}> CONFIG_ARCH_QCOM policy<{'arm64': 'y', 'armhf': 'y'}> CONFIG_ARCH_RENESAS policy<{'arm64': 'y', 'armhf': 'y'}> diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index 5d06a5c..75665ed 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -27,7 +27,6 @@ CONFIG_ARCH_MMAP_RND_BITS_MIN=18 CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11 -# CONFIG_ARCH_MVEBU is not set CONFIG_ARCH_MXC=y # CONFIG_ARCH_ROCKCHIP is not set CONFIG_ARCH_SUNXI=y diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index eeed0db..eb75010 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -21,7 +21,6 @@ CONFIG_ARCH_MESON=y CONFIG_ARCH_MMAP_RND_BITS=8 CONFIG_ARCH_MMAP_RND_BITS_MAX=16 CONFIG_ARCH_MMAP_RND_BITS_MIN=8 -CONFIG_ARCH_MVEBU=y CONFIG_ARCH_ROCKCHIP=y # CONFIG_ARCH_SUNXI is not set CONFIG_ARCH_UNIPHIER=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 9331441..6436c46 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -435,6 +435,7 @@ CONFIG_ARCH_MULTIPLATFORM=y # CONFIG_ARCH_MULTI_V6 is not set CONFIG_ARCH_MULTI_V6_V7=y CONFIG_ARCH_MULTI_V7=y +CONFIG_ARCH_MVEBU=y CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=y # CONFIG_ARCH_NETX is not set CONFIG_ARCH_NPCM=y @@ -613,9 +614,12 @@ CONFIG_ARMADA_370_CLK=y CONFIG_ARMADA_370_XP_IRQ=y CONFIG_ARMADA_370_XP_TIMER=y CONFIG_ARMADA_375_CLK=y +CONFIG_ARMADA_37XX_CLK=y CONFIG_ARMADA_37XX_WATCHDOG=m CONFIG_ARMADA_38X_CLK=y CONFIG_ARMADA_39X_CLK=y +CONFIG_ARMADA_AP806_SYSCON=y +CONFIG_ARMADA_CP110_SYSCON=y CONFIG_ARMADA_THERMAL=y CONFIG_ARMADA_XP_CLK=y CONFIG_ARMV8_DEPRECATED=y @@ -1992,6 +1996,7 @@ CONFIG_CRYPTO_DEV_QCE=m CONFIG_CRYPTO_DEV_QCOM_RNG=m # CONFIG_CRYPTO_DEV_ROCKCHIP is not set CONFIG_CRYPTO_DEV_S5P=m +# CONFIG_CRYPTO_DEV_SAFEXCEL is not set CONFIG_CRYPTO_DEV_SAHARA=m CONFIG_CRYPTO_DEV_SP_CCP=y CONFIG_CRYPTO_DEV_SP_PSP=y @@ -5825,7 +5830,12 @@ CONFIG_MVEBU_CLK_COMMON=y CONFIG_MVEBU_CLK_COREDIV=y CONFIG_MVEBU_CLK_CPU=y CONFIG_MVEBU_DEVBUS=y +CONFIG_MVEBU_GICP=y +CONFIG_MVEBU_ICU=y CONFIG_MVEBU_MBUS=y +CONFIG_MVEBU_ODMI=y +CONFIG_MVEBU_PIC=y +CONFIG_MVEBU_SEI=y # CONFIG_MVIAC3_2 is not set # CONFIG_MVIAC7 is not set CONFIG_MVMDIO=m @@ -6721,6 +6731,7 @@ CONFIG_PCIE_ROCKCHIP_HOST=m CONFIG_PCIE_UNIPHIER=y CONFIG_PCIE_XILINX=y CONFIG_PCIE_XILINX_NWL=y +# CONFIG_PCI_AARDVARK is not set CONFIG_PCI_ATMEL=m CONFIG_PCI_ATS=y CONFIG_PCI_BIOS=y @@ -6882,8 +6893,11 @@ CONFIG_PINCTRL_APQ8064=m CONFIG_PINCTRL_APQ8084=m CONFIG_PINCTRL_ARMADA_370=y CONFIG_PINCTRL_ARMADA_375=y +CONFIG_PINCTRL_ARMADA_37XX=y CONFIG_PINCTRL_ARMADA_38X=y CONFIG_PINCTRL_ARMADA_39X=y +CONFIG_PINCTRL_ARMADA_AP806=y +CONFIG_PINCTRL_ARMADA_CP110=y CONFIG_PINCTRL_ARMADA_XP=y CONFIG_PINCTRL_AS370=y CONFIG_PINCTRL_AS3722=y