From patchwork Thu Mar 28 20:37:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Henrique Cerri X-Patchwork-Id: 1068690 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 44VcBK6svDz9sRR; Fri, 29 Mar 2019 07:37:45 +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 1h9bmO-0004tR-IV; Thu, 28 Mar 2019 20:37:40 +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 1h9bmM-0004s9-Ry for kernel-team@lists.ubuntu.com; Thu, 28 Mar 2019 20:37:38 +0000 Received: from mail-qt1-f200.google.com ([209.85.160.200]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1h9bmM-00089L-Dz for kernel-team@lists.ubuntu.com; Thu, 28 Mar 2019 20:37:38 +0000 Received: by mail-qt1-f200.google.com with SMTP id p26so43180qtq.21 for ; Thu, 28 Mar 2019 13:37:38 -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=MitXiA2ZH381iy9CI9n09qX7ehApxItvmhg5Ty9u/t8=; b=nEPlHxHDD5vEMK+RP0zMXzpVd3Iy9mvMIVHwzIQYrCvThgXTkKEZPaSs6ski5busFW aXxYADDMutxMkc7ccDmO6go8B1B7b576CuVNqRf+/q37KWcuDWLTNlqYq7UnBQv4xw1y k48iEz2wIwIoz6p+u0tXyFZzyRTq/f8c5un6vIeCCKc4Yc0rhc67XRyWjA2PZqlONPzA p8rjALVcm6rNcKgHO6CqNTAEpPjgVXBx/D2JBsIf+ea8f405L0EyD+11CxnOhpKo4FZv 0xbhQ+ls9fSeYHUPMmxbn34Jd2qrSv5TGLFqZKGBiiEBYBt6aAAjRpw6drxKuzhZzAm1 tkAQ== X-Gm-Message-State: APjAAAWsxJZQAwuctMHGDY4WaXU2ux6FqGJA8YZd9i4v8RXhmIblUQ0S ZnjjhQW1PnEmEiZ6FvGSO2O7K/aJ0bYyN7bnffk0/gkgy8RTVG+b7B79HVfPvnmczibq7mREXFo SoOojSVSVQ6pREHpKUzjcPQUc4FeQ1B0BbbGg1Wo4 X-Received: by 2002:ac8:32f2:: with SMTP id a47mr38467909qtb.251.1553805457137; Thu, 28 Mar 2019 13:37:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqxsBxsPZ9dMNngpclcSeWSGCVedB67nLxbOMETSx4bjjj9otCrLpFmZDC4LW6wt5T59AmZXow== X-Received: by 2002:ac8:32f2:: with SMTP id a47mr38467889qtb.251.1553805456856; Thu, 28 Mar 2019 13:37:36 -0700 (PDT) Received: from localhost.localdomain ([2804:14c:4e3:4a76:f50e:fc98:3805:24ba]) by smtp.gmail.com with ESMTPSA id f22sm39443qkm.22.2019.03.28.13.37.35 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Mar 2019 13:37:36 -0700 (PDT) From: Marcelo Henrique Cerri To: kernel-team@lists.ubuntu.com Subject: [c/azure][PATCH 1/1] Revert "UBUNTU: [Config] azure: CONFIG_HOTPLUG_CPU=n" Date: Thu, 28 Mar 2019 17:37:20 -0300 Message-Id: <20190328203720.29881-4-marcelo.cerri@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190328203720.29881-1-marcelo.cerri@canonical.com> References: <20190328203720.29881-1-marcelo.cerri@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" This reverts commit e2a2f12a7d1553411500beb0297ca17e9441a571. Signed-off-by: Marcelo Henrique Cerri --- debian.azure/config/annotations | 4 ++-- debian.azure/config/config.common.ubuntu | 30 +++++++++++++++++++++--- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/debian.azure/config/annotations b/debian.azure/config/annotations index 28cc3a2bc541..e80af0077a89 100644 --- a/debian.azure/config/annotations +++ b/debian.azure/config/annotations @@ -11084,7 +11084,7 @@ CONFIG_PERCPU_STATS policy<{'amd64': 'n', 'arm64': ' CONFIG_GUP_BENCHMARK policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}> CONFIG_SCHED_MC policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 's390x': 'y'}> CONFIG_SCHED_SMT policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'n', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> -CONFIG_HOTPLUG_CPU policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}> +CONFIG_HOTPLUG_CPU policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_NUMA policy<{'amd64': 'y', 'arm64': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_NODES_SHIFT policy<{'amd64': '10', 'arm64': '6', 'ppc64el': '8', 's390x': '4'}> CONFIG_HIGHPTE policy<{'armhf': 'y', 'i386': 'y'}> @@ -11105,7 +11105,7 @@ CONFIG_MEM_SOFT_DIRTY flag CONFIG_IDLE_PAGE_TRACKING flag note CONFIG_PERCPU_STATS flag CONFIG_RELOCATABLE flag -CONFIG_HOTPLUG_CPU mark node +CONFIG_HOTPLUG_CPU flag CONFIG_NUMA note # Menu: Processor type and features >> ARM errata workarounds via the alternatives framework >> Architecture: arm64 diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu index 9d9adc1f89f9..82eb0f6886f9 100644 --- a/debian.azure/config/config.common.ubuntu +++ b/debian.azure/config/config.common.ubuntu @@ -64,6 +64,7 @@ CONFIG_ACPI_EC_DEBUGFS=m # CONFIG_ACPI_EXTLOG is not set # CONFIG_ACPI_FAN is not set CONFIG_ACPI_HED=y +CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_HOTPLUG_IOAPIC=y # CONFIG_ACPI_HOTPLUG_MEMORY is not set CONFIG_ACPI_IPMI=m @@ -80,9 +81,11 @@ CONFIG_ACPI_PROCESSOR_IDLE=y # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set # CONFIG_ACPI_REV_OVERRIDE_POSSIBLE is not set # CONFIG_ACPI_SBS is not set +CONFIG_ACPI_SLEEP=y CONFIG_ACPI_SPCR_TABLE=y CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y # CONFIG_ACPI_TABLE_UPGRADE is not set +# CONFIG_ACPI_TAD is not set # CONFIG_ACPI_THERMAL is not set CONFIG_ACPI_VIDEO=m CONFIG_ACPI_WATCHDOG=y @@ -189,6 +192,7 @@ CONFIG_ARCH_HAS_UACCESS_MCSAFE=y CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y CONFIG_ARCH_HAS_ZONE_DEVICE=y CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y +CONFIG_ARCH_HIBERNATION_HEADER=y CONFIG_ARCH_HIBERNATION_POSSIBLE=y CONFIG_ARCH_MAY_HAVE_PC_FDC=y CONFIG_ARCH_MEMORY_PROBE=y @@ -479,6 +483,7 @@ CONFIG_BOARD_TPCI200=m CONFIG_BONDING=m # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0 +# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set @@ -757,6 +762,7 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y CONFIG_CPU_FREQ_GOV_USERSPACE=y CONFIG_CPU_FREQ_STAT=y +# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set CONFIG_CPU_IDLE=y CONFIG_CPU_IDLE_GOV_LADDER=y CONFIG_CPU_IDLE_GOV_MENU=y @@ -990,6 +996,7 @@ CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set CONFIG_DEBUG_FS=y # CONFIG_DEBUG_GPIO is not set +# CONFIG_DEBUG_HOTPLUG_CPU0 is not set CONFIG_DEBUG_INFO=y CONFIG_DEBUG_INFO_DWARF4=y # CONFIG_DEBUG_INFO_REDUCED is not set @@ -1747,7 +1754,8 @@ CONFIG_HDMI=y # CONFIG_HEADERS_CHECK is not set CONFIG_HFSPLUS_FS=m CONFIG_HFS_FS=m -# CONFIG_HIBERNATION is not set +CONFIG_HIBERNATE_CALLBACKS=y +CONFIG_HIBERNATION=y CONFIG_HID=m CONFIG_HIDRAW=y # CONFIG_HID_A4TECH is not set @@ -1825,7 +1833,7 @@ CONFIG_HIST_TRIGGERS=y CONFIG_HMC6352=m CONFIG_HMM=y CONFIG_HMM_MIRROR=y -# CONFIG_HOTPLUG_CPU is not set +CONFIG_HOTPLUG_CPU=y CONFIG_HOTPLUG_PCI=y CONFIG_HOTPLUG_PCI_ACPI=y CONFIG_HOTPLUG_PCI_ACPI_IBM=m @@ -2416,6 +2424,7 @@ CONFIG_KEXEC=y CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y CONFIG_KEXEC_CORE=y CONFIG_KEXEC_FILE=y +CONFIG_KEXEC_JUMP=y CONFIG_KEXEC_VERIFY_SIG=y # CONFIG_KEYBOARD_ADP5588 is not set # CONFIG_KEYBOARD_ADP5589 is not set @@ -3641,13 +3650,25 @@ CONFIG_PMC_ATOM=y CONFIG_PMIC_DA9052=y # CONFIG_PMIC_OPREGION is not set CONFIG_PM_ADVANCED_DEBUG=y +# CONFIG_PM_AUTOSLEEP is not set CONFIG_PM_CLK=y CONFIG_PM_DEBUG=y CONFIG_PM_DEVFREQ=y CONFIG_PM_DEVFREQ_EVENT=y CONFIG_PM_GENERIC_DOMAINS=y +CONFIG_PM_GENERIC_DOMAINS_SLEEP=y CONFIG_PM_NOTIFIER_ERROR_INJECT=m CONFIG_PM_OPP=y +CONFIG_PM_SLEEP=y +CONFIG_PM_SLEEP_DEBUG=y +CONFIG_PM_SLEEP_SMP=y +CONFIG_PM_STD_PARTITION="" +# CONFIG_PM_TEST_SUSPEND is not set +CONFIG_PM_TRACE=y +CONFIG_PM_TRACE_RTC=y +CONFIG_PM_WAKELOCKS=y +CONFIG_PM_WAKELOCKS_GC=y +CONFIG_PM_WAKELOCKS_LIMIT=100 CONFIG_PNFS_BLOCK=m CONFIG_PNFS_FILE_LAYOUT=m CONFIG_PNFS_FLEXFILE_LAYOUT=m @@ -4563,7 +4584,9 @@ CONFIG_SUNRPC_XPRT_RDMA=m CONFIG_SUN_PARTITION=y CONFIG_SURFACE3_WMI=m # CONFIG_SURFACE_PRO3_BUTTON is not set -# CONFIG_SUSPEND is not set +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +# CONFIG_SUSPEND_SKIP_SYNC is not set CONFIG_SWAP=y CONFIG_SWIOTLB=y CONFIG_SWPHY=y @@ -4836,6 +4859,7 @@ CONFIG_VSOCKMON=m CONFIG_VT=y CONFIG_VT6655=m CONFIG_VT_CONSOLE=y +CONFIG_VT_CONSOLE_SLEEP=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_VXFS_FS=m CONFIG_VXGE=m