Received: by 2002:a05:6358:5282:b0:b5:90e7:25cb with SMTP id g2csp3391445rwa; Tue, 23 Aug 2022 04:08:00 -0700 (PDT) X-Google-Smtp-Source: AA6agR5EhoEdL3wTXSKIyFkxnB0yf1A3IiFPSgp3UVP+46dGr3Bqs26/+krvVjJZp2e7YeBny71c X-Received: by 2002:a17:90a:17e6:b0:1fb:2936:83bd with SMTP id q93-20020a17090a17e600b001fb293683bdmr2841291pja.132.1661252880678; Tue, 23 Aug 2022 04:08:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661252880; cv=none; d=google.com; s=arc-20160816; b=xKCGDz/9QhMFwRjOqcTmAyyqb8aA3AZIcXNv2LF5l9HySaF4mPMXI/PsUr24yvmTin +8/8KJEr6aIWnkTp9gt5HXE6DclqQq0akYVr2lU9pYar9n10P5bdoZnymyTI4j1z1HD8 B64wt6zU/gcsg5acHj+XmgTWEX08CrUBReYglQwJzLEFCpDTwBW6LjoUZSU+RdHZFxW0 dmapg2p8cJpb+l8+jkIMNyYihj6rK+ROaqrsRtKdSTLGQWLGzKcOdGsAM3THuNUqfi4R SExzztobJPYP5B1Kw1KYStkjCGWoWuaD9otnLfEu9f1/IGTz5li31OKKl4BsYXqWyGx+ rU9w== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=AS8fKR5tb28EZvGlmV6nSpg7GC93JjkWP9v1YBijRgI=; b=KHPMZq+nKPvUi0xCme17vNFgTk0MA92LSjsDA2cwHZnidd0JF559wM4p/avnP+zt64 IBGuQLNkSaSt+/ZQzBrfzwvdHv2PPWT2oCWP5ehThKKd9JIWx+K0v0upfj7tkP6SiB1W Iu+057FiJum8QbZWbeLtMycvkYXdFpnr6/lzksQrxNJbkDZoOaBNqikukcJFpmaOQivA 7EH1QoExPFEnPdWIf6faevS/gG091Z+5Z8Ohw6+9dkLWJKOKf1Q11iR/7XqYTHhNIHfM RilIhzoEAm8u13t5UjaBJZ8obQ3A/Q4/bdJLvNZVx2wmeLyq60+OUGUbqex8du+x3Lps PUdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=rCqtvxHB; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e24-20020a637458000000b0042268f5eb68si15433956pgn.130.2022.08.23.04.07.49; Tue, 23 Aug 2022 04:08:00 -0700 (PDT) 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; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=rCqtvxHB; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349027AbiHWJRZ (ORCPT + 99 others); Tue, 23 Aug 2022 05:17:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48596 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349118AbiHWJOQ (ORCPT ); Tue, 23 Aug 2022 05:14:16 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7F0B686FFB; Tue, 23 Aug 2022 01:32:02 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id A559BB81BF8; Tue, 23 Aug 2022 08:31:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 59A11C433C1; Tue, 23 Aug 2022 08:31:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1661243502; bh=DDjUZxl2V2JdEZSkI5b5kOsibxbKLbbmvroI1QTDkPw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rCqtvxHBFQxpJdXtpvVlyfXjMHYVXuXJ8Uy+0PDS0z0790MwQR+Gddxhzot/gPFJO +Si1jxIIqoAjcmvPpOuBLTica8XmFW4TubTqDcQ0T3lX8AGhAGrl/2OjY0XvNQQzVv sQs26H3dkjsGBitxdlZTVVweTXW9/3qx4r6DHXyk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Huacai Chen , Bjorn Helgaas , Sasha Levin Subject: [PATCH 5.19 296/365] PCI/ACPI: Guard ARM64-specific mcfg_quirks Date: Tue, 23 Aug 2022 10:03:17 +0200 Message-Id: <20220823080130.574617110@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220823080118.128342613@linuxfoundation.org> References: <20220823080118.128342613@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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 From: Huacai Chen [ Upstream commit 40a6cc141b4b9580de140bcb3e893445708acc5d ] Guard ARM64-specific quirks with CONFIG_ARM64 to avoid build errors, since mcfg_quirks will be shared by more than one architectures. Link: https://lore.kernel.org/r/20220714124216.1489304-2-chenhuacai@loongson.cn Signed-off-by: Huacai Chen Signed-off-by: Bjorn Helgaas Signed-off-by: Sasha Levin --- drivers/acpi/pci_mcfg.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/acpi/pci_mcfg.c b/drivers/acpi/pci_mcfg.c index 53cab975f612..63b98eae5e75 100644 --- a/drivers/acpi/pci_mcfg.c +++ b/drivers/acpi/pci_mcfg.c @@ -41,6 +41,8 @@ struct mcfg_fixup { static struct mcfg_fixup mcfg_quirks[] = { /* { OEM_ID, OEM_TABLE_ID, REV, SEGMENT, BUS_RANGE, ops, cfgres }, */ +#ifdef CONFIG_ARM64 + #define AL_ECAM(table_id, rev, seg, ops) \ { "AMAZON", table_id, rev, seg, MCFG_BUS_ANY, ops } @@ -169,6 +171,7 @@ static struct mcfg_fixup mcfg_quirks[] = { ALTRA_ECAM_QUIRK(1, 13), ALTRA_ECAM_QUIRK(1, 14), ALTRA_ECAM_QUIRK(1, 15), +#endif /* ARM64 */ }; static char mcfg_oem_id[ACPI_OEM_ID_SIZE]; -- 2.35.1