From patchwork Wed Jul 24 17:42:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 11057429 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1984C14F6 for ; Wed, 24 Jul 2019 17:45:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 075CF27F8C for ; Wed, 24 Jul 2019 17:45:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EF97728791; Wed, 24 Jul 2019 17:44:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 826A627F8C for ; Wed, 24 Jul 2019 17:44:59 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hqLIH-0007ly-O2; Wed, 24 Jul 2019 17:43:13 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hqLIG-0007lP-Ag for xen-devel@lists.xenproject.org; Wed, 24 Jul 2019 17:43:12 +0000 X-Inumbo-ID: 7f6a1348-ae3a-11e9-982c-a73c5ac53a78 Received: from esa2.hc3370-68.iphmx.com (unknown [216.71.145.153]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 7f6a1348-ae3a-11e9-982c-a73c5ac53a78; Wed, 24 Jul 2019 17:43:08 +0000 (UTC) Authentication-Results: esa2.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=andrew.cooper3@citrix.com; spf=Pass smtp.mailfrom=Andrew.Cooper3@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa2.hc3370-68.iphmx.com: no sender authenticity information available from domain of andrew.cooper3@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa2.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="andrew.cooper3@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa2.hc3370-68.iphmx.com: domain of Andrew.Cooper3@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa2.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="Andrew.Cooper3@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ~all" Received-SPF: None (esa2.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa2.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: v7Ms+EyEfea2oxGN5QbO6fjXG7JdIH1aLDupw5c5rDLgxk6csQfyixPsIvxJSBwVosh6iyHINj MXNlvIh6sv9v4m+bg+9nIvbs5ymCR2gP61V3mGptQJzxhKofL4VlDreulwHGdTcB9d4P11aCHd IQUHPmC7nI4XvILjDj+sUppG+dhQoTXhvchH3Egog7XLXI1f/kX7dWG0nU72GrkwVl8MTTjy+M 4CGpmsM2+SLvJyDLRArsCv8bIo0W6VHCvQDp3fW/HHchzFlclPn6nkxaPExuzUBgznByrcIr0J UGo= X-SBRS: 2.7 X-MesageID: 3383300 X-Ironport-Server: esa2.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.64,303,1559534400"; d="scan'208";a="3383300" From: Andrew Cooper To: Xen-devel Date: Wed, 24 Jul 2019 18:42:54 +0100 Message-ID: <20190724174256.5295-2-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190724174256.5295-1-andrew.cooper3@citrix.com> References: <20190724174256.5295-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH 1/3] x86: Drop CONFIG_ACPI_SLEEP X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Andrew Cooper , Wei Liu , Jan Beulich , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP This option is hardcoded to 1, and the #ifdef-ary doesn't exclude wakeup.S, which makes it useless code noise. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- CC: Jan Beulich CC: Wei Liu CC: Roger Pau Monné An alternative would be to wire it into Kconfig properly and properly exclude wakeup.S, but that is more complicated than I have time for. Thoughts? --- xen/arch/x86/acpi/boot.c | 4 ---- xen/arch/x86/dmi_scan.c | 7 ++----- xen/include/asm-x86/acpi.h | 4 ---- xen/include/asm-x86/config.h | 1 - 4 files changed, 2 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c index 1382b4dcd0..15542a9bdf 100644 --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -332,7 +332,6 @@ static int __init acpi_invalidate_bgrt(struct acpi_table_header *table) return 0; } -#ifdef CONFIG_ACPI_SLEEP #define acpi_fadt_copy_address(dst, src, len) do { \ if (fadt->header.revision >= FADT2_REVISION_ID && \ fadt->header.length >= ACPI_FADT_V2_SIZE) \ @@ -457,7 +456,6 @@ acpi_fadt_parse_sleep_info(struct acpi_table_fadt *fadt) memset(&acpi_sinfo.sleep_status + 1, 0, (long)(&acpi_sinfo + 1) - (long)(&acpi_sinfo.sleep_status + 1)); } -#endif static int __init acpi_parse_fadt(struct acpi_table_header *table) { @@ -501,9 +499,7 @@ static int __init acpi_parse_fadt(struct acpi_table_header *table) acpi_enable_value = fadt->acpi_enable; acpi_disable_value = fadt->acpi_disable; -#ifdef CONFIG_ACPI_SLEEP acpi_fadt_parse_sleep_info(fadt); -#endif return 0; } diff --git a/xen/arch/x86/dmi_scan.c b/xen/arch/x86/dmi_scan.c index 31caad133e..7063c2c799 100644 --- a/xen/arch/x86/dmi_scan.c +++ b/xen/arch/x86/dmi_scan.c @@ -488,14 +488,12 @@ static int __init ich10_bios_quirk(struct dmi_system_id *d) return 0; } -#ifdef CONFIG_ACPI_SLEEP static __init int reset_videomode_after_s3(struct dmi_blacklist *d) { - /* See acpi_wakeup.S */ + /* See wakeup.S */ acpi_video_flags |= 2; return 0; } -#endif static __init int dmi_disable_acpi(struct dmi_blacklist *d) { @@ -541,12 +539,11 @@ static __initdata struct dmi_blacklist dmi_blacklist[]={ MATCH(DMI_PRODUCT_NAME, "S4030CDT/4.3"), NO_MATCH, NO_MATCH, NO_MATCH } }, -#ifdef CONFIG_ACPI_SLEEP + { reset_videomode_after_s3, "Toshiba Satellite 4030cdt", { /* Reset video mode after returning from ACPI S3 sleep */ MATCH(DMI_PRODUCT_NAME, "S4030CDT/4.3"), NO_MATCH, NO_MATCH, NO_MATCH } }, -#endif { ich10_bios_quirk, "Intel board & BIOS", /* diff --git a/xen/include/asm-x86/acpi.h b/xen/include/asm-x86/acpi.h index a105d1186c..7032f3a001 100644 --- a/xen/include/asm-x86/acpi.h +++ b/xen/include/asm-x86/acpi.h @@ -105,8 +105,6 @@ extern s8 acpi_numa; extern int acpi_scan_nodes(u64 start, u64 end); #define NR_NODE_MEMBLKS (MAX_NUMNODES*2) -#ifdef CONFIG_ACPI_SLEEP - extern struct acpi_sleep_info acpi_sinfo; #define acpi_video_flags bootsym(video_flags) struct xenpf_enter_acpi_sleep; @@ -134,8 +132,6 @@ struct acpi_sleep_info { bool_t sleep_extended; }; -#endif /* CONFIG_ACPI_SLEEP */ - #define MAX_MADT_ENTRIES MAX(256, 2 * NR_CPUS) extern u32 x86_acpiid_to_apicid[]; #define MAX_LOCAL_APIC MAX(256, 4 * NR_CPUS) diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 9ef9d03ca7..6e4f28d934 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -34,7 +34,6 @@ /* Intel P4 currently has largest cache line (L2 line size is 128 bytes). */ #define CONFIG_X86_L1_CACHE_SHIFT 7 -#define CONFIG_ACPI_SLEEP 1 #define CONFIG_ACPI_NUMA 1 #define CONFIG_ACPI_SRAT 1 #define CONFIG_ACPI_CSTATE 1