Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp1645511rwb; Sun, 14 Aug 2022 08:37:47 -0700 (PDT) X-Google-Smtp-Source: AA6agR47015BLZIpFAIwlg0eMn2SjvigDSCB3prUehz1h/KUQSk4XCaDUTjErWHmutlCDN2kIoAL X-Received: by 2002:a17:906:58c9:b0:730:bc01:fd5f with SMTP id e9-20020a17090658c900b00730bc01fd5fmr7735750ejs.504.1660491466985; Sun, 14 Aug 2022 08:37:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660491466; cv=none; d=google.com; s=arc-20160816; b=Y80ySnKUXbYoOx1x9DSpT6n0YRc7bdRqcMT9zNGD6YeS2YINa+dsATrDQKSwCdomQO vSk8FSx+xbaHNu3CAtMw7JrhufRcBjv2ferXNq3tgdm0uBDo0UA9LIqcxgwhj6ihbuyg U+LQMWLIjzh/UhRkkMqwaFgzkQCrMpjZaxrvM2xD+Bui4ZTHwUN35zwaaA6oSmvlwY05 xq1QuTflTPho2v58XjzxFDfsDmD4uaaJLfS1DWCxCyrIRx5yh5AQWYUsfRB04vGOBrxR cxjP/KT0Rg7ODZdIwnLeU1fKWsV2O3Kf88QBz7cPchHfhTkhkIPwkTUf4C7LvjjhklIj o1OQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=AS8fKR5tb28EZvGlmV6nSpg7GC93JjkWP9v1YBijRgI=; b=zr5/KUS/FDkfDB5zs+InE5zTb1tFxsUxwLF9H7DJYN4OMoOzYs793XqJ5ITD4GQUCM X+lUuusZ978GQ3MchhKZIKP/6hjM5GvBFgIR5lsqy1PQMMEG+C7Z24KG1LSWlVo2w9Xt XMj+Zv3m7UhwhHz9Nnj81FC6CeenCoA6hjEXkRX15umQAIYD2+vYuHFjSFwKnSzR8NsB /p9sie0BjmdwVQA1iMUbYzJMJ7hywIU7s58r5/E7LJ5HLU3gMzxDH1vwOfyVt9XexPgs cRkRfEDRDQb4ENB3JO4gzTzUjoCKNVaf+7v31kWtMpKTMm+ZRhDVHXyTgvhoj9LDg4ep 8fUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=vGRStyQ1; 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=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z21-20020a05640240d500b0043d9c8dbfd9si7467723edb.31.2022.08.14.08.37.19; Sun, 14 Aug 2022 08:37:46 -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=@kernel.org header.s=k20201202 header.b=vGRStyQ1; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240574AbiHNPbv (ORCPT + 99 others); Sun, 14 Aug 2022 11:31:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39662 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231669AbiHNPbB (ORCPT ); Sun, 14 Aug 2022 11:31:01 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2D9A0BE13; Sun, 14 Aug 2022 08:29:38 -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 B9C00B80B77; Sun, 14 Aug 2022 15:29:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BCBB6C433D6; Sun, 14 Aug 2022 15:29:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660490975; bh=DDjUZxl2V2JdEZSkI5b5kOsibxbKLbbmvroI1QTDkPw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vGRStyQ1KCFA4tQD0fgBWn+y8drlREG0XcM9W4oahX73QQqwPkfXJYsMIQgpqwRSf TCIVnsXbutPdmenj0Ef0pK/3cazgOlxuc0mp9CNwxRT1v0uRrPfdzoWEHf35nr5P8P l5u/UMNqJoLUXHIcoDYQnrobYV8lP1D5LJK3NLckHC2y6Vhxq6cBzGrIvT1keVwdW1 vC4NdIhbAQAWi1UXqonZo/mrF8sw9SAcqr8r2MQ6we69F7aGt1ccxumt7BXn++ew4o z/IDRtXqpO0u3Xy+YjBFCoDoz3D8cT+SLVsTmQSBaF3fcdKGJQlNFFcTLcKyC+QXZC d72tZV18PbZkQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Huacai Chen , Bjorn Helgaas , Sasha Levin , rafael@kernel.org, linux-pci@vger.kernel.org, linux-acpi@vger.kernel.org Subject: [PATCH AUTOSEL 5.19 41/64] PCI/ACPI: Guard ARM64-specific mcfg_quirks Date: Sun, 14 Aug 2022 11:24:14 -0400 Message-Id: <20220814152437.2374207-41-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220814152437.2374207-1-sashal@kernel.org> References: <20220814152437.2374207-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.2 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