From patchwork Thu Aug 5 21:12:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Linton X-Patchwork-Id: 492276 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:396:0:0:0:0 with SMTP id y22csp664654jap; Thu, 5 Aug 2021 14:12:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwDWwFeNH+O7vtFR9cUU9WOr9IHPTsAddlMJTzqsWyzXmVJmeVwPpB42Zs8xEulrSGIGo3P X-Received: by 2002:a17:906:4b56:: with SMTP id j22mr6839069ejv.551.1628197937104; Thu, 05 Aug 2021 14:12:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628197937; cv=none; d=google.com; s=arc-20160816; b=tTG0/pjbEmUvnXP1qPAPmvUJ9j912/doQ5TqspJ7+KdALGG16vlB+5zRBLSF2HZ0un VkXu5SxYj+GULNgQZFZkPKiZ9fgC2iOc6N3QogtVmdbvuY8ynpWvmrsz3OkL93TTELvg RKQXyzvAgwhwJTZjLZMhnCtxZOQuwhBGuwsBoHOP8htvHNd190S1CtEFd6ywif/fEzM7 1Y8/aYj7/auSWowkXriXFPF3OdvHu5eAHHK52lSg7thQHbwWVpXWs9/TBZbcURU64TOH AQ7I9oUJDZ8bVn8mtgOaxsulzhEk6Vn82uDg76xZbNtfgGFjvhVR5sGLShFj0Ve56TbJ 0/vw== 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; bh=vMTOoIh2k2fVmO6WSVZSdmmQDn9aY5x3TMn3rOnsNMc=; b=MoU63hyaUhsIYjOWAUGAYP7NabZugT30uYP1iZ4VObH0Hhd4GvwbYlSaP2Q66k9GMA DWwFsDHUocPL+ewLg+f8ulYESYPWMQQdpTtpKXdKfdYFjghP8mdqtI3d8NuvazH36Du/ YOmUn8TPDhiSmMWBOOz2nz0o5UOVloqvrj+iQdJRf4Ki60Sk9icUuGfYTUMj0P97q0uX b1Bby60+PGMTUp+hQvnyCJkRig4NGwHq7YYDl1ZUu4ugDjMU1AgDM2KnO09HK3Qg+1mb iqdIFBrkKjt2knSrObybG15Wog2/Bw7BHYIGtHvJBivEXfEF8A2f0XOnvyd3YMKcgoqV IsEQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-acpi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-acpi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ee27si7087336edb.168.2021.08.05.14.12.16; Thu, 05 Aug 2021 14:12:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-acpi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-acpi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-acpi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241942AbhHEVM1 (ORCPT + 4 others); Thu, 5 Aug 2021 17:12:27 -0400 Received: from foss.arm.com ([217.140.110.172]:52430 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241884AbhHEVMY (ORCPT ); Thu, 5 Aug 2021 17:12:24 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id C262813D5; Thu, 5 Aug 2021 14:12:09 -0700 (PDT) Received: from u200856.usa.arm.com (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 225F83F719; Thu, 5 Aug 2021 14:12:09 -0700 (PDT) From: Jeremy Linton To: linux-pci@vger.kernel.org Cc: lorenzo.pieralisi@arm.com, nsaenz@kernel.org, bhelgaas@google.com, rjw@rjwysocki.net, lenb@kernel.org, robh@kernel.org, kw@linux.com, f.fainelli@gmail.com, bcm-kernel-feedback-list@broadcom.com, linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rpi-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Jeremy Linton Subject: [PATCH 3/3] PCI/ACPI: Add new quirk detection, enable bcm2711 Date: Thu, 5 Aug 2021 16:12:00 -0500 Message-Id: <20210805211200.491275-4-jeremy.linton@arm.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210805211200.491275-1-jeremy.linton@arm.com> References: <20210805211200.491275-1-jeremy.linton@arm.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Now that we have a bcm2711 quirk, we need to be able to detect it when the MCFG is missing. Use a namespace property as an alternative to the MCFG OEM. Signed-off-by: Jeremy Linton --- drivers/acpi/pci_mcfg.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) -- 2.31.1 diff --git a/drivers/acpi/pci_mcfg.c b/drivers/acpi/pci_mcfg.c index 53cab975f612..7d77fc72c2a4 100644 --- a/drivers/acpi/pci_mcfg.c +++ b/drivers/acpi/pci_mcfg.c @@ -169,6 +169,9 @@ static struct mcfg_fixup mcfg_quirks[] = { ALTRA_ECAM_QUIRK(1, 13), ALTRA_ECAM_QUIRK(1, 14), ALTRA_ECAM_QUIRK(1, 15), + + { "bcm2711", "", 0, 0, MCFG_BUS_ANY, &bcm2711_pcie_ops, + DEFINE_RES_MEM(0xFD500000, 0xA000) }, }; static char mcfg_oem_id[ACPI_OEM_ID_SIZE]; @@ -198,8 +201,19 @@ static void pci_mcfg_apply_quirks(struct acpi_pci_root *root, u16 segment = root->segment; struct resource *bus_range = &root->secondary; struct mcfg_fixup *f; + const char *soc; int i; + /* + * This could be a machine with a PCI/SMC conduit, + * which means it doens't have MCFG. Get the machineid from + * the namespace definition instead. + */ + if (!fwnode_property_read_string(acpi_fwnode_handle(root->device), + "linux,pcie-quirk", &soc)) { + memcpy(mcfg_oem_id, soc, ACPI_OEM_ID_SIZE); + } + for (i = 0, f = mcfg_quirks; i < ARRAY_SIZE(mcfg_quirks); i++, f++) { if (pci_mcfg_quirk_matches(f, segment, bus_range)) { if (f->cfgres.start)