Thank you very much for everyone's comments and guidance.
On Fri, 7 Mar 2025 11:32:45 -0600
Bjorn Helgaas <helgaas@xxxxxxxxxx> wrote:
> On Fri, Mar 07, 2025 at 01:35:29PM +0800, Zhiyuan Dai wrote:
> > PCI Express Base Spec r6.0 defines BAR size up to 8 EB (2^63 bytes),
> > but supporting anything bigger than 128TB requires changes to
> > pci_rebar_get_possible_sizes() to read the additional Capability
> > bits from the Control register.
> >
> > If 8EB support is required, callers will need to be updated to
> > handle u64 instead of u32. For now, support is limited to 128TB,
> > and support for sizes greater than 128TB can be deferred to a later
> > time.
> >
> > Expand the alignment array of `pbus_size_mem` to support up to
> > 128TB.
> >
> > Signed-off-by: Zhiyuan Dai <daizhiyuan@xxxxxxxxxxxxxx>
> > Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxxxxxx>
> > Reviewed-by: Christian König <christian.koenig@xxxxxxx>
> > Reviewed-by: Niklas Cassel <cassel@xxxxxxxxxx>
>
> Replaced the v3 patch that was already applied with this v4 patch,
> thanks.
>
> Please:
>
> - Include a changelog below the "---" marker to tell me what changed
> between v3 and v4.
>
> - Don't include Reviewed-by from people who haven't explicitly
> replied with that tag. In this case, arguably you could retain
> those from Christian and Niklas, because they did give that tag
> for v3, and you only added the pbus_size_mem() change.
>
> But Ilpo only gave you a comment on v3, and did *not* supply his
> Reviewed-by. You should never create a Reviewed-by tag in that
> event.
>
> I dropped all the Reviewed-by tags for now; happy to add them
> if/when the reviewers actually supply them.
>
> > ---
> > drivers/pci/pci.c | 4 ++--
> > drivers/pci/setup-bus.c | 2 +-
> > include/uapi/linux/pci_regs.h | 2 +-
> > 3 files changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
> > index 661f98c6c63a..77b9ceefb4e1 100644
> > --- a/drivers/pci/pci.c
> > +++ b/drivers/pci/pci.c
> > @@ -3752,7 +3752,7 @@ static int pci_rebar_find_pos(struct pci_dev
> > *pdev, int bar)
> > * @bar: BAR to query
> > *
> > * Get the possible sizes of a resizable BAR as bitmask defined in
> > the spec
> > - * (bit 0=1MB, bit 19=512GB). Returns 0 if BAR isn't resizable.
> > + * (bit 0=1MB, bit 31=128TB). Returns 0 if BAR isn't resizable.
> > */
> > u32 pci_rebar_get_possible_sizes(struct pci_dev *pdev, int bar)
> > {
> > @@ -3800,7 +3800,7 @@ int pci_rebar_get_current_size(struct pci_dev
> > *pdev, int bar)
> > * pci_rebar_set_size - set a new size for a BAR
> > * @pdev: PCI device
> > * @bar: BAR to set size to
> > - * @size: new size as defined in the spec (0=1MB, 19=512GB)
> > + * @size: new size as defined in the spec (0=1MB, 31=128TB)
> > *
> > * Set the new size of a BAR as defined in the spec.
> > * Returns zero if resizing was successful, error code otherwise.
> > diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
> > index 5e00cecf1f1a..edb64a6b5585 100644
> > --- a/drivers/pci/setup-bus.c
> > +++ b/drivers/pci/setup-bus.c
> > @@ -1059,7 +1059,7 @@ static int pbus_size_mem(struct pci_bus *bus,
> > unsigned long mask, {
> > struct pci_dev *dev;
> > resource_size_t min_align, win_align, align, size, size0,
> > size1;
> > - resource_size_t aligns[24]; /* Alignments from 1MB to 8TB
> > */
> > + resource_size_t aligns[28]; /* Alignments from 1MB to
> > 128TB */ int order, max_order;
> > struct resource *b_res = find_bus_resource_of_type(bus,
> > mask |
> > IORESOURCE_PREFETCH, type); diff --git
> > a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.h
> > index 1601c7ed5fab..ce99d4f34ce5 100644 ---
> > a/include/uapi/linux/pci_regs.h +++ b/include/uapi/linux/pci_regs.h
> > @@ -1013,7 +1013,7 @@
> >
> > /* Resizable BARs */
> > #define PCI_REBAR_CAP 4 /* capability
> > register */ -#define PCI_REBAR_CAP_SIZES 0x00FFFFF0
> > /* supported BAR sizes */ +#define PCI_REBAR_CAP_SIZES
> > 0xFFFFFFF0 /* supported BAR sizes */ #define
> > PCI_REBAR_CTRL 8 /* control register */
> > #define PCI_REBAR_CTRL_BAR_IDX 0x00000007 /* BAR
> > index */ #define PCI_REBAR_CTRL_NBAR_MASK 0x000000E0 /* #
> > of resizable BARs */ -- 2.43.0
> >
