[+cc scsi, powerpc folks]
On Fri, Dec 01, 2023 at 02:44:47PM -0600, Bjorn Helgaas wrote:
> On Fri, Nov 24, 2023 at 11:09:13AM +0200, Ilpo Järvinen wrote:
> > Replace 0x7f and 0x80 literals with PCI_HEADER_TYPE_* defines.
> >
> > Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxxxxxx>
>
> Applied entire series on the PCI "enumeration" branch for v6.8,
> thanks!
>
> If anybody wants to take pieces separately, let me know and I'll drop
> from PCI.
OK, b4 picked up the entire series but I was only cc'd on this first
patch, so I missed the responses about EDAC, xtensa, bcma already
being applied elsewhere.
So I kept these in the PCI tree:
420ac76610d7 ("scsi: lpfc: Use PCI_HEADER_TYPE_MFD instead of literal")
3773343dd890 ("powerpc/fsl-pci: Use PCI_HEADER_TYPE_MASK instead of literal")
197e0da1f1a3 ("x86/pci: Use PCI_HEADER_TYPE_* instead of literals")
and dropped the others.
x86, SCSI, powerpc folks, if you want to take these instead, let me
know and I'll drop them.
> > ---
> > arch/x86/kernel/aperture_64.c | 3 +--
> > arch/x86/kernel/early-quirks.c | 4 ++--
> > 2 files changed, 3 insertions(+), 4 deletions(-)
> >
> > diff --git a/arch/x86/kernel/aperture_64.c b/arch/x86/kernel/aperture_64.c
> > index 4feaa670d578..89c0c8a3fc7e 100644
> > --- a/arch/x86/kernel/aperture_64.c
> > +++ b/arch/x86/kernel/aperture_64.c
> > @@ -259,10 +259,9 @@ static u32 __init search_agp_bridge(u32 *order, int *valid_agp)
> > order);
> > }
> >
> > - /* No multi-function device? */
> > type = read_pci_config_byte(bus, slot, func,
> > PCI_HEADER_TYPE);
> > - if (!(type & 0x80))
> > + if (!(type & PCI_HEADER_TYPE_MFD))
> > break;
> > }
> > }
> > diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
> > index a6c1867fc7aa..59f4aefc6bc1 100644
> > --- a/arch/x86/kernel/early-quirks.c
> > +++ b/arch/x86/kernel/early-quirks.c
> > @@ -779,13 +779,13 @@ static int __init check_dev_quirk(int num, int slot, int func)
> > type = read_pci_config_byte(num, slot, func,
> > PCI_HEADER_TYPE);
> >
> > - if ((type & 0x7f) == PCI_HEADER_TYPE_BRIDGE) {
> > + if ((type & PCI_HEADER_TYPE_MASK) == PCI_HEADER_TYPE_BRIDGE) {
> > sec = read_pci_config_byte(num, slot, func, PCI_SECONDARY_BUS);
> > if (sec > num)
> > early_pci_scan_bus(sec);
> > }
> >
> > - if (!(type & 0x80))
> > + if (!(type & PCI_HEADER_TYPE_MFD))
> > return -1;
> >
> > return 0;
> > --
> > 2.30.2
> >
