From patchwork Fri Mar 18 13:07:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 8618931 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 32C59C0553 for ; Fri, 18 Mar 2016 13:10:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4690620361 for ; Fri, 18 Mar 2016 13:10:52 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4E4252035D for ; Fri, 18 Mar 2016 13:10:51 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1agu8X-0002E8-Lc; Fri, 18 Mar 2016 13:08:17 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1agu8V-0002E0-O0 for xen-devel@lists.xen.org; Fri, 18 Mar 2016 13:08:15 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id F1/6C-02901-FBDFBE65; Fri, 18 Mar 2016 13:08:15 +0000 X-Env-Sender: shannon.zhao@linaro.org X-Msg-Ref: server-15.tower-27.messagelabs.com!1458306493!32268633!1 X-Originating-IP: [209.85.192.178] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 56072 invoked from network); 18 Mar 2016 13:08:14 -0000 Received: from mail-pf0-f178.google.com (HELO mail-pf0-f178.google.com) (209.85.192.178) by server-15.tower-27.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 18 Mar 2016 13:08:14 -0000 Received: by mail-pf0-f178.google.com with SMTP id u190so168000979pfb.3 for ; Fri, 18 Mar 2016 06:08:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=rkxfuMyPkjtRbybb33OubQ4IyULEP6zNUu5gcrSTMKw=; b=WLH4kSICfHLUIwqi+hNf5CognUG8m6SjM/QGtERlmWkVMSLh5UvF87M8a7iXnk5qcU VAH6zTtnBpcpjfxYJrknDBdgmArDYgUVuIs0db6+IKuvW1uDiyqno3aNBFcH2obCd6Vh d8Btn9UPZEHHuv9U4+tZSfQBTMq4GIe7q4Rjs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=rkxfuMyPkjtRbybb33OubQ4IyULEP6zNUu5gcrSTMKw=; b=iKRbscsvkmZIQScQTnQqgp1E5Vaz6gowjMlDoZuppVAnRKRR8xQCFOkih++WDFN/GK 4ZDj5M0hKzn5LiVm1tVGt9PfKE4KeXAKo/0nm3/DyPRwTX85aak+QbwxPS25xiKE4Eea CtEb5R2AW1EP+Z0omLokQp3l27jOzZNyxOieOBhsQ6CqLQGGXYCRzsWEGW9Ar+NWjMsQ NNhULzSZSvN2YGdMnHLcb/YlOqCDJ1z7KbOgxTBPI9RFZK8tn5hmS4nUmKVScAAibXEp iFETeQm8w5nopVaS/3BETYSPNjrV+LCifBW5cco/RRmbURiD9LkJP10eWxx5MLcpv/aM VyYw== X-Gm-Message-State: AD7BkJJSEB1xYaV9WTL97j4/NWwNDghd/FcqoLG7w3f0cSMOf+3q+HAEHnqCftsuJNaRkr3E X-Received: by 10.67.4.233 with SMTP id ch9mr23553357pad.29.1458306492790; Fri, 18 Mar 2016 06:08:12 -0700 (PDT) Received: from localhost.localdomain ([104.237.91.206]) by smtp.gmail.com with ESMTPSA id vy6sm21043419pac.38.2016.03.18.06.08.09 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 18 Mar 2016 06:08:11 -0700 (PDT) From: Shannon Zhao To: xen-devel@lists.xen.org Date: Fri, 18 Mar 2016 21:07:29 +0800 Message-Id: <1458306449-50671-1-git-send-email-shannon.zhao@linaro.org> X-Mailer: git-send-email 2.1.0 Cc: andrew.cooper3@citrix.com, keir@xen.org, jbeulich@suse.com Subject: [Xen-devel] [PATCH] xen: acpi: Drop CONFIG_ACPI_BOOT and use CONFIG_ACPI instead X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP While there is no difference between CONFIG_ACPI and CONFIG_ACPI_BOOT in current acpi codes, so it's unnecessary to keep CONFIG_ACPI_BOOT and we use CONFIG_ACPI instead as Jan suggested. Signed-off-by: Shannon Zhao --- xen/arch/x86/dmi_scan.c | 6 +++--- xen/arch/x86/io_apic.c | 4 ++-- xen/include/asm-x86/config.h | 1 - xen/include/asm-x86/io_apic.h | 4 ++-- xen/include/xen/acpi.h | 6 +++--- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/dmi_scan.c b/xen/arch/x86/dmi_scan.c index 8e07f8d..1e937ec 100644 --- a/xen/arch/x86/dmi_scan.c +++ b/xen/arch/x86/dmi_scan.c @@ -499,7 +499,7 @@ static __init int reset_videomode_after_s3(struct dmi_blacklist *d) #endif -#ifdef CONFIG_ACPI_BOOT +#ifdef CONFIG_ACPI static __init __attribute__((unused)) int dmi_disable_acpi(struct dmi_blacklist *d) { if (!acpi_force) { @@ -564,7 +564,7 @@ static __initdata struct dmi_blacklist dmi_blacklist[]={ } }, -#ifdef CONFIG_ACPI_BOOT +#ifdef CONFIG_ACPI /* * If your system is blacklisted here, but you find that acpi=force * works for you, please contact acpi-devel@sourceforge.net @@ -643,7 +643,7 @@ static __initdata struct dmi_blacklist dmi_blacklist[]={ MATCH(DMI_PRODUCT_NAME, "eserver xSeries 440"), NO_MATCH, NO_MATCH }}, -#endif // CONFIG_ACPI_BOOT +#endif // CONFIG_ACPI { NULL, } }; diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index 7b9cf16..869a446 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -2096,7 +2096,7 @@ void ioapic_resume(void) ACPI-based IOAPIC Configuration -------------------------------------------------------------------------- */ -#ifdef CONFIG_ACPI_BOOT +#ifdef CONFIG_ACPI int __init io_apic_get_unique_id (int ioapic, int apic_id) { @@ -2265,7 +2265,7 @@ int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int a return 0; } -#endif /*CONFIG_ACPI_BOOT*/ +#endif /*CONFIG_ACPI*/ static int ioapic_physbase_to_id(unsigned long physbase) { diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 4527ce3..f6f5a10 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -36,7 +36,6 @@ /* Intel P4 currently has largest cache line (L2 line size is 128 bytes). */ #define CONFIG_X86_L1_CACHE_SHIFT 7 -#define CONFIG_ACPI_BOOT 1 #define CONFIG_ACPI_SLEEP 1 #define CONFIG_ACPI_NUMA 1 #define CONFIG_ACPI_SRAT 1 diff --git a/xen/include/asm-x86/io_apic.h b/xen/include/asm-x86/io_apic.h index b318a36..8e27761 100644 --- a/xen/include/asm-x86/io_apic.h +++ b/xen/include/asm-x86/io_apic.h @@ -173,12 +173,12 @@ extern bool_t skip_ioapic_setup; extern bool_t ioapic_ack_new; extern bool_t ioapic_ack_forced; -#ifdef CONFIG_ACPI_BOOT +#ifdef CONFIG_ACPI extern int io_apic_get_unique_id (int ioapic, int apic_id); extern int io_apic_get_version (int ioapic); extern int io_apic_get_redir_entries (int ioapic); extern int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int active_high_low); -#endif /*CONFIG_ACPI_BOOT*/ +#endif /*CONFIG_ACPI*/ extern void init_ioapic_mappings(void); diff --git a/xen/include/xen/acpi.h b/xen/include/xen/acpi.h index 7a5abbe..30ec0ee 100644 --- a/xen/include/xen/acpi.h +++ b/xen/include/xen/acpi.h @@ -49,7 +49,7 @@ (!(entry)) || (unsigned long)(entry) + sizeof(*(entry)) > (end) || \ (entry)->header.length < sizeof(*(entry))) -#ifdef CONFIG_ACPI_BOOT +#ifdef CONFIG_ACPI enum acpi_interrupt_id { ACPI_INTERRUPT_PMI = 1, @@ -107,7 +107,7 @@ extern int acpi_mp_config; extern u32 pci_mmcfg_base_addr; -#else /*!CONFIG_ACPI_BOOT*/ +#else /*!CONFIG_ACPI*/ #define acpi_mp_config 0 @@ -121,7 +121,7 @@ static inline int acpi_boot_table_init(void) return 0; } -#endif /*!CONFIG_ACPI_BOOT*/ +#endif /*!CONFIG_ACPI*/ int get_cpu_id(u32 acpi_id);