From: Caleb James DeLisle <cjd@cjdns.fr>
To: Bjorn Helgaas <helgaas@kernel.org>
Cc: linux-pci@vger.kernel.org, linux-mips@vger.kernel.org,
naseefkm@gmail.com, ryder.lee@mediatek.com, bhelgaas@google.com,
lpieralisi@kernel.org, kwilczynski@kernel.org, mani@kernel.org,
robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org,
matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com,
ansuelsmth@gmail.com, linux-mediatek@lists.infradead.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 3/3] PCI: Skip bridge window reads when window is not supported
Date: Wed, 18 Mar 2026 23:18:20 +0100 [thread overview]
Message-ID: <e154155d-b525-4abc-a8f3-41ac0ead1875@cjdns.fr> (raw)
In-Reply-To: <20260318215832.GA476412@bhelgaas>
On 18/03/2026 22:58, Bjorn Helgaas wrote:
> On Mon, Mar 16, 2026 at 03:51:57PM +0000, Caleb James DeLisle wrote:
>> pci_read_bridge_io() and pci_read_bridge_mmio_pref() read bridge window
>> registers unconditionally. If the registers are hardwired to zero
>> (not implemented), both base and limit will be 0. Since (0 <= 0) is
>> true, a bogus window [mem 0x00000000-0x000fffff] or [io 0x0000-0x0fff]
>> gets created.
>>
>> pci_read_bridge_windows() already detects unsupported windows by
>> testing register writability and sets io_window/pref_window flags
>> accordingly. Check these flags at the start of pci_read_bridge_io()
>> and pci_read_bridge_mmio_pref() to skip reading registers when the
>> window is not supported.
>>
>> Suggested-by: Bjorn Helgaas <helgaas@kernel.org>
>> Link: https://lore.kernel.org/all/20260113210259.GA715789@bhelgaas/
>> Signed-off-by: Ahmed Naseef <naseefkm@gmail.com>
>> Signed-off-by: Caleb James DeLisle <cjd@cjdns.fr>
> I applied this to pci/resource for v7.1 with the following commit log:
>
> PCI: Prevent assignment to unsupported bridge windows
>
> Previously, pci_read_bridge_io() and pci_read_bridge_mmio_pref()
> unconditionally set resource type flags (IORESOURCE_IO or IORESOURCE_MEM |
> IORESOURCE_PREFETCH) when reading bridge window registers. For windows that
> are not implemented in hardware, this may cause the allocator to assign
> space for a window that doesn't exist.
>
> For example, the EcoNET EN7528 SoC Root Port doesn't support the
> prefetchable window, but since a downstream device had a prefetchable BAR,
> the allocator mistakenly assigned a prefetchable window:
>
> pci 0001:00:01.0: [14c3:0811] type 01 class 0x060400 PCIe Root Port
> pci 0001:00:01.0: PCI bridge to [bus 01-ff]
> pci 0001:00:01.0: bridge window [mem 0x28000000-0x280fffff]: assigned
> pci 0001:00:01.0: bridge window [mem 0x28100000-0x282fffff pref]: assigned
> pci 0001:01:00.0: BAR 0 [mem 0x28100000-0x281fffff 64bit pref]: assigned
>
> pci_read_bridge_windows() already detects unsupported windows by testing
> register writability and sets dev->io_window/pref_window accordingly.
>
> Check dev->io_window/pref_window so we don't set the resource flags for
> unsupported windows, which prevents the allocator from assigning space to
> them.
>
> After this commit, the prefetchable BAR is correctly allocated from the
> non-prefetchable window:
>
> pci 0001:00:01.0: bridge window [mem 0x28000000-0x281fffff]: assigned
> pci 0001:01:00.0: BAR 0 [mem 0x28000000-0x280fffff 64bit pref]: assigned
>
> I also set the author to "Ahmed Naseef <naseefkm@gmail.com>" per
> https://lore.kernel.org/all/abRQYM1If/6Vv/tI@DESKTOP-TIT0J8O.localdomain
>
> You can make this work correctly next time by including a
> "From: Ahmed Naseef <naseefkm@gmail.com>" line as the very first line
> in the message body; see
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?id=v6.19#n723
Thank you very much. I wasn't quite sure how to submit this so thanks
and I will keep that in mind.
Thanks,
Caleb
>> ---
>> drivers/pci/probe.c | 6 ++++++
>> 1 file changed, 6 insertions(+)
>>
>> diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
>> index bccc7a4bdd79..4eacb741b4ec 100644
>> --- a/drivers/pci/probe.c
>> +++ b/drivers/pci/probe.c
>> @@ -395,6 +395,9 @@ static void pci_read_bridge_io(struct pci_dev *dev, struct resource *res,
>> unsigned long io_mask, io_granularity, base, limit;
>> struct pci_bus_region region;
>>
>> + if (!dev->io_window)
>> + return;
>> +
>> io_mask = PCI_IO_RANGE_MASK;
>> io_granularity = 0x1000;
>> if (dev->io_window_1k) {
>> @@ -465,6 +468,9 @@ static void pci_read_bridge_mmio_pref(struct pci_dev *dev, struct resource *res,
>> pci_bus_addr_t base, limit;
>> struct pci_bus_region region;
>>
>> + if (!dev->pref_window)
>> + return;
>> +
>> pci_read_config_word(dev, PCI_PREF_MEMORY_BASE, &mem_base_lo);
>> pci_read_config_word(dev, PCI_PREF_MEMORY_LIMIT, &mem_limit_lo);
>> base64 = (mem_base_lo & PCI_PREF_RANGE_MASK) << 16;
>> --
>> 2.39.5
>>
prev parent reply other threads:[~2026-03-18 22:18 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-16 15:51 [PATCH v2 0/3] PCI: mediatek: Add support for EcoNet SoCs Caleb James DeLisle
2026-03-16 15:51 ` [PATCH v2 1/3] dt-bindings: PCI: mediatek: Add support for EcoNet EN7528 Caleb James DeLisle
2026-03-17 7:26 ` Krzysztof Kozlowski
2026-03-18 20:42 ` Caleb James DeLisle
2026-03-16 15:51 ` [PATCH v2 2/3] PCI: mediatek: Add support for EcoNet EN7528 SoC Caleb James DeLisle
2026-03-16 15:51 ` [PATCH v2 3/3] PCI: Skip bridge window reads when window is not supported Caleb James DeLisle
2026-03-17 21:29 ` Bjorn Helgaas
2026-03-18 6:26 ` Ahmed Naseef
2026-03-18 12:04 ` Ilpo Järvinen
2026-03-18 12:18 ` Ilpo Järvinen
2026-03-18 13:12 ` Ahmed Naseef
2026-03-18 21:58 ` Bjorn Helgaas
2026-03-18 22:18 ` Caleb James DeLisle [this message]
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=e154155d-b525-4abc-a8f3-41ac0ead1875@cjdns.fr \
--to=cjd@cjdns.fr \
--cc=angelogioacchino.delregno@collabora.com \
--cc=ansuelsmth@gmail.com \
--cc=bhelgaas@google.com \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=helgaas@kernel.org \
--cc=krzk+dt@kernel.org \
--cc=kwilczynski@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lpieralisi@kernel.org \
--cc=mani@kernel.org \
--cc=matthias.bgg@gmail.com \
--cc=naseefkm@gmail.com \
--cc=robh@kernel.org \
--cc=ryder.lee@mediatek.com \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).