From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 213C9C4320A for ; Tue, 24 Aug 2021 21:39:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 02C4A613B1 for ; Tue, 24 Aug 2021 21:39:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234725AbhHXVkH (ORCPT ); Tue, 24 Aug 2021 17:40:07 -0400 Received: from foss.arm.com ([217.140.110.172]:41126 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234442AbhHXVkH (ORCPT ); Tue, 24 Aug 2021 17:40:07 -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 41BB0D6E; Tue, 24 Aug 2021 14:39:22 -0700 (PDT) Received: from [192.168.122.166] (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id A06533F5A1; Tue, 24 Aug 2021 14:39:21 -0700 (PDT) Subject: Re: [PATCH v2 3/4] PCI/ACPI: Add Broadcom bcm2711 MCFG quirk To: Florian Fainelli , 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, sdonthineni@nvidia.com, stefan.wahren@i2se.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 References: <20210819215655.84866-1-jeremy.linton@arm.com> <20210819215655.84866-4-jeremy.linton@arm.com> <9796674a-5870-135c-2fdc-fb0d5347d7c7@gmail.com> From: Jeremy Linton Message-ID: Date: Tue, 24 Aug 2021 16:39:20 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: <9796674a-5870-135c-2fdc-fb0d5347d7c7@gmail.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Hi, On 8/22/21 3:53 AM, Florian Fainelli wrote: > > > On 8/19/2021 11:56 PM, Jeremy Linton wrote: >> Now that there is a bcm2711 quirk, it needs to be enabled when the >> MCFG is missing. Use an ACPI namespace _DSD property >> "linux-ecam-quirk-id" as an alternative to the MCFG OEM. >> >> Signed-off-by: Jeremy Linton >> --- >>   drivers/acpi/pci_mcfg.c | 13 +++++++++++++ >>   1 file changed, 13 insertions(+) >> >> diff --git a/drivers/acpi/pci_mcfg.c b/drivers/acpi/pci_mcfg.c >> index 53cab975f612..4b991ee5c66c 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,18 @@ 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 may be a machine with a PCI/SMC conduit, which means it >> doesn't >> +     * have an MCFG. Use an ACPI namespace definition instead. >> +     */ >> +    if (!fwnode_property_read_string(acpi_fwnode_handle(root->device), >> +                     "linux-ecam-quirk-id", &soc)) { >> +        memcpy(mcfg_oem_id, soc, ACPI_OEM_ID_SIZE); > > Being super paranoid here, can we use one of the "safe" string copy > routines here just in case? Hmm, I went around with this a bit when I first wrote it, because the OEM fields in the ACPI tables are fixed len and don't have null termination. Maybe the right thing to do here is verify the string size is at least as long as the OEM_ID_SIZE and then continue to use the memcpy. > >> +    } >> + >>       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) >> >