From patchwork Thu Feb 2 03:48:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ruidong Tian X-Patchwork-Id: 51666 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp23655wrn; Wed, 1 Feb 2023 20:03:01 -0800 (PST) X-Google-Smtp-Source: AK7set8OJpUaHDBVXcxOW9mqZhA1IlK4S4QA2h5G3+lLIV+I9+zle498Oxp76l4k6AZXk8PD3sbs X-Received: by 2002:a17:903:24d:b0:198:a5d9:14b4 with SMTP id j13-20020a170903024d00b00198a5d914b4mr6397989plh.34.1675310581682; Wed, 01 Feb 2023 20:03:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675310581; cv=none; d=google.com; s=arc-20160816; b=njKyITSQaFsWeznbU5uf6UlGRQSWMQcP7OjlWZ+VnJ6s2Id2Gq82N+lbdbZuswWL8H iDDFfQEAWN3/BocI3ULri8NheEbdpDfTcjj3800B2gBBvuEmRPZ/sozy367hudrEYk1W /Md/C59WT9Uyb+oKuEapWSCQwaxBoxBUNvfzPOXJ+Z0HqkzcBGBRkh4GT5O9mc3U4ONX DkqHnhuTGrL3nqoJ/kp7KjIml7Y38wblqAk4g0hmMiQMXGBx4wZwezGqHLV896ft17km qbCw/iVHoVOMcwP4/wHSOxkpxloX1cbSaVbrJ5UAk7nBCjfW0odKDVdl+pFfeNbc0CR4 B5YQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=6uLFhjxEtFzCyXzGCpKJg/prvE5tXO7EcMhZyn7JpwQ=; b=uZLlhptvtPQuRQyiWdPdEgkKzBv+maVcrHUrwRnn5XcwcG9LIERUTjsf0xHpNda5n1 KnAg9VJZ3Jq+WgEzkHQOpO847OOfreD1ZXR2GJO0TCzUEV9CaP3+q8fMBnTuBGbkiseQ /Is9qK8uS7RAxKtSOS/8bDestQfUBPC0PmMJpLQo1r7XEUdw7mh9Qyf5fAYOPY2piF2Y OrwDDygEwRzuMsqeXIa4razaf15jtuI0Qwn3IuK38VwCTOuMWSOLDewXKNntIVSjygjJ 51bcr482Cl3Fe1nTs86fn9ALVuGZzIiibl0oEtMlZj2dGqcOhn1WWpbFiaWt+vrhweGl 3NzQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c13-20020a170902848d00b001929dfd3fd7si19108462plo.578.2023.02.01.20.02.48; Wed, 01 Feb 2023 20:03:01 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232020AbjBBDs7 (ORCPT + 99 others); Wed, 1 Feb 2023 22:48:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44290 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231921AbjBBDst (ORCPT ); Wed, 1 Feb 2023 22:48:49 -0500 Received: from out30-119.freemail.mail.aliyun.com (out30-119.freemail.mail.aliyun.com [115.124.30.119]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8A9DF7BBE6; Wed, 1 Feb 2023 19:48:47 -0800 (PST) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R701e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045168;MF=tianruidong@linux.alibaba.com;NM=1;PH=DS;RN=10;SR=0;TI=SMTPD_---0VaiwXFi_1675309722; Received: from localhost(mailfrom:tianruidong@linux.alibaba.com fp:SMTPD_---0VaiwXFi_1675309722) by smtp.aliyun-inc.com; Thu, 02 Feb 2023 11:48:45 +0800 From: Ruidong Tian To: robert.moore@intel.com, rafael.j.wysocki@intel.com, lenb@kernel.org Cc: linux-acpi@vger.kernel.org, acpica-devel@lists.linuxfoundation.org, linux-kernel@vger.kernel.org, baolin.wang@linux.alibaba.com, jkchen@linux.alibaba.com, xueshuai@linux.alibaba.com, Ruidong Tian Subject: [PATCH] ACPICA: PCI: Undefined ACPI_ADR_SPACE_PCI_CONFIG when CONFIG_PCI is unset Date: Thu, 2 Feb 2023 11:48:21 +0800 Message-Id: <20230202034821.25123-1-tianruidong@linux.alibaba.com> X-Mailer: git-send-email 2.33.1 MIME-Version: 1.0 X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, ENV_AND_HDR_SPF_MATCH,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, USER_IN_DEF_SPF_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756690468227769404?= X-GMAIL-MSGID: =?utf-8?q?1756690468227769404?= ACPI core subsystem initialization will fail when Kernel disabled PCI but ACPI tables still have PCI config address spaces. Enable ACPI_ADR_SPACE_PCI_CONFIG in acpi_gbl_default_address_spaces only when ACPI_PCI_CONFIGURED is defined. Signed-off-by: Ruidong Tian --- drivers/acpi/acpica/evhandler.c | 2 ++ include/acpi/acconfig.h | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/drivers/acpi/acpica/evhandler.c b/drivers/acpi/acpica/evhandler.c index be9a05498adc..86057e39df8c 100644 --- a/drivers/acpi/acpica/evhandler.c +++ b/drivers/acpi/acpica/evhandler.c @@ -26,7 +26,9 @@ acpi_ev_install_handler(acpi_handle obj_handle, u8 acpi_gbl_default_address_spaces[ACPI_NUM_DEFAULT_SPACES] = { ACPI_ADR_SPACE_SYSTEM_MEMORY, ACPI_ADR_SPACE_SYSTEM_IO, +#ifdef ACPI_PCI_CONFIGURED ACPI_ADR_SPACE_PCI_CONFIG, +#endif ACPI_ADR_SPACE_DATA_TABLE }; diff --git a/include/acpi/acconfig.h b/include/acpi/acconfig.h index 151e40385673..28456120529f 100644 --- a/include/acpi/acconfig.h +++ b/include/acpi/acconfig.h @@ -162,7 +162,11 @@ /* Maximum space_ids for Operation Regions */ #define ACPI_MAX_ADDRESS_SPACE 255 +#ifdef ACPI_PCI_CONFIGURED #define ACPI_NUM_DEFAULT_SPACES 4 +#else +#define ACPI_NUM_DEFAULT_SPACES 3 +#endif /* Array sizes. Used for range checking also */