From: Bjorn Helgaas <helgaas@kernel.org>
To: Jeremy Linton <jeremy.linton@arm.com>
Cc: linux-pci@vger.kernel.org, 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
Subject: Re: [PATCH v3 3/4] PCI/ACPI: Add Broadcom bcm2711 MCFG quirk
Date: Tue, 5 Oct 2021 10:10:42 -0500 [thread overview]
Message-ID: <20211005151042.GA1083482@bhelgaas> (raw)
In-Reply-To: <20210826071557.29239-4-jeremy.linton@arm.com>
On Thu, Aug 26, 2021 at 02:15:56AM -0500, 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 <jeremy.linton@arm.com>
> Acked-by: Florian Fainelli <f.fainelli@gmail.com>
> Acked-by: Bjorn Helgaas <bhelgaas@google.com>
> ---
> drivers/acpi/pci_mcfg.c | 17 +++++++++++++++++
> 1 file changed, 17 insertions(+)
>
> diff --git a/drivers/acpi/pci_mcfg.c b/drivers/acpi/pci_mcfg.c
> index 53cab975f612..04c517418365 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),
> +
> + { "bc2711", "", 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,22 @@ 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)) {
> + if (strlen(soc) != ACPI_OEM_ID_SIZE)
From a reviewing perspective, it's not obvious why soc must be exactly
ACPI_OEM_ID_SIZE. Does that imply space-padding in the DT string or
something?
Is there any documentation for this DT property?
Also not obvious why strlen() is safe here. I mean, I looked a couple
levels deep in fwnode_property_read_string(), but whatever guarantees
null termination is buried pretty deep.
It seems a little weird to use an MCFG quirk mechanism when there's no
MCFG at all on this platform.
> + dev_err(&root->device->dev, "ECAM quirk should be %d characters\n",
> + ACPI_OEM_ID_SIZE);
> + else
> + 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)
> --
> 2.31.1
>
next prev parent reply other threads:[~2021-10-05 15:10 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-26 7:15 [PATCH v3 0/4] CM4 ACPI PCIe quirk Jeremy Linton
2021-08-26 7:15 ` [PATCH v3 1/4] PCI: brcmstb: Break register definitions into separate header Jeremy Linton
2021-08-30 8:37 ` nicolas saenz julienne
2021-08-26 7:15 ` [PATCH v3 2/4] PCI: brcmstb: Add ACPI config space quirk Jeremy Linton
2021-08-30 8:36 ` nicolas saenz julienne
2021-08-30 16:23 ` Jeremy Linton
2021-08-30 16:27 ` Florian Fainelli
2021-08-30 17:17 ` nicolas saenz julienne
2021-10-05 15:32 ` Bjorn Helgaas
2021-10-05 15:57 ` Jeremy Linton
2021-10-05 19:43 ` Pali Rohár
2021-10-05 22:25 ` Jeremy Linton
2021-10-06 2:07 ` Florian Fainelli
2021-10-22 17:04 ` Florian Fainelli
2021-10-22 17:17 ` Pali Rohár
2021-10-22 17:29 ` Florian Fainelli
2021-10-22 17:57 ` Pali Rohár
2021-08-26 7:15 ` [PATCH v3 3/4] PCI/ACPI: Add Broadcom bcm2711 MCFG quirk Jeremy Linton
2021-08-30 8:37 ` nicolas saenz julienne
2021-09-13 16:12 ` Rafael J. Wysocki
2021-10-05 15:10 ` Bjorn Helgaas [this message]
2021-10-05 15:43 ` Jeremy Linton
2021-10-05 22:31 ` Bjorn Helgaas
2021-10-05 23:32 ` Jeremy Linton
2021-10-05 20:02 ` Pali Rohár
2021-10-05 22:44 ` Jeremy Linton
2021-08-26 7:15 ` [PATCH v3 4/4] MAINTAINERS: Widen brcmstb PCIe file scope Jeremy Linton
2021-08-30 8:38 ` nicolas saenz julienne
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211005151042.GA1083482@bhelgaas \
--to=helgaas@kernel.org \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=bhelgaas@google.com \
--cc=f.fainelli@gmail.com \
--cc=jeremy.linton@arm.com \
--cc=kw@linux.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=nsaenz@kernel.org \
--cc=rjw@rjwysocki.net \
--cc=robh@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).