| Message ID | 20220617074330.12605-2-chenhuacai@loongson.cn (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | PCI: Loongson pci improvements and quirks | expand |
On Fri, Jun 17, 2022 at 03:43:24PM +0800, Huacai Chen wrote: > Guard ARM64-specific quirks with CONFIG_ARM64 to avoid build errors, > since mcfg_quirks will be shared by more than one architectures. > > Signed-off-by: Huacai Chen <chenhuacai@loongson.cn> pci_mcfg.o is only built when CONFIG_ACPI_MCFG=y. Where's the patch that sets CONFIG_ACPI_MCFG=y for loongson? I see that "PCI: loongson: Add ACPI init support" adds the #ifdef CONFIG_LOONGARCH here, but AFAICS we still won't build it. > --- > drivers/acpi/pci_mcfg.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/acpi/pci_mcfg.c b/drivers/acpi/pci_mcfg.c > index 53cab975f612..63b98eae5e75 100644 > --- a/drivers/acpi/pci_mcfg.c > +++ b/drivers/acpi/pci_mcfg.c > @@ -41,6 +41,8 @@ struct mcfg_fixup { > static struct mcfg_fixup mcfg_quirks[] = { > /* { OEM_ID, OEM_TABLE_ID, REV, SEGMENT, BUS_RANGE, ops, cfgres }, */ > > +#ifdef CONFIG_ARM64 > + > #define AL_ECAM(table_id, rev, seg, ops) \ > { "AMAZON", table_id, rev, seg, MCFG_BUS_ANY, ops } > > @@ -169,6 +171,7 @@ static struct mcfg_fixup mcfg_quirks[] = { > ALTRA_ECAM_QUIRK(1, 13), > ALTRA_ECAM_QUIRK(1, 14), > ALTRA_ECAM_QUIRK(1, 15), > +#endif /* ARM64 */ > }; > > static char mcfg_oem_id[ACPI_OEM_ID_SIZE]; > -- > 2.27.0 >
Hi, Bjorn, On Tue, Jun 28, 2022 at 5:53 AM Bjorn Helgaas <helgaas@kernel.org> wrote: > > On Fri, Jun 17, 2022 at 03:43:24PM +0800, Huacai Chen wrote: > > Guard ARM64-specific quirks with CONFIG_ARM64 to avoid build errors, > > since mcfg_quirks will be shared by more than one architectures. > > > > Signed-off-by: Huacai Chen <chenhuacai@loongson.cn> > > pci_mcfg.o is only built when CONFIG_ACPI_MCFG=y. Where's the patch > that sets CONFIG_ACPI_MCFG=y for loongson? > > I see that "PCI: loongson: Add ACPI init support" adds the #ifdef > CONFIG_LOONGARCH here, but AFAICS we still won't build it. MCFG is enabled by the arch-dependent patch "LoongArch: Add PCI controller support". That one was in the arch series for 5.19, but in the 5.19 merge window the PCI series was still under review so it was dropped. When this PCI series is good enough, that one will be added to 5.20 from the arch tree, I think. Huacai > > > --- > > drivers/acpi/pci_mcfg.c | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/drivers/acpi/pci_mcfg.c b/drivers/acpi/pci_mcfg.c > > index 53cab975f612..63b98eae5e75 100644 > > --- a/drivers/acpi/pci_mcfg.c > > +++ b/drivers/acpi/pci_mcfg.c > > @@ -41,6 +41,8 @@ struct mcfg_fixup { > > static struct mcfg_fixup mcfg_quirks[] = { > > /* { OEM_ID, OEM_TABLE_ID, REV, SEGMENT, BUS_RANGE, ops, cfgres }, */ > > > > +#ifdef CONFIG_ARM64 > > + > > #define AL_ECAM(table_id, rev, seg, ops) \ > > { "AMAZON", table_id, rev, seg, MCFG_BUS_ANY, ops } > > > > @@ -169,6 +171,7 @@ static struct mcfg_fixup mcfg_quirks[] = { > > ALTRA_ECAM_QUIRK(1, 13), > > ALTRA_ECAM_QUIRK(1, 14), > > ALTRA_ECAM_QUIRK(1, 15), > > +#endif /* ARM64 */ > > }; > > > > static char mcfg_oem_id[ACPI_OEM_ID_SIZE]; > > -- > > 2.27.0 > >
diff --git a/drivers/acpi/pci_mcfg.c b/drivers/acpi/pci_mcfg.c index 53cab975f612..63b98eae5e75 100644 --- a/drivers/acpi/pci_mcfg.c +++ b/drivers/acpi/pci_mcfg.c @@ -41,6 +41,8 @@ struct mcfg_fixup { static struct mcfg_fixup mcfg_quirks[] = { /* { OEM_ID, OEM_TABLE_ID, REV, SEGMENT, BUS_RANGE, ops, cfgres }, */ +#ifdef CONFIG_ARM64 + #define AL_ECAM(table_id, rev, seg, ops) \ { "AMAZON", table_id, rev, seg, MCFG_BUS_ANY, ops } @@ -169,6 +171,7 @@ static struct mcfg_fixup mcfg_quirks[] = { ALTRA_ECAM_QUIRK(1, 13), ALTRA_ECAM_QUIRK(1, 14), ALTRA_ECAM_QUIRK(1, 15), +#endif /* ARM64 */ }; static char mcfg_oem_id[ACPI_OEM_ID_SIZE];
Guard ARM64-specific quirks with CONFIG_ARM64 to avoid build errors, since mcfg_quirks will be shared by more than one architectures. Signed-off-by: Huacai Chen <chenhuacai@loongson.cn> --- drivers/acpi/pci_mcfg.c | 3 +++ 1 file changed, 3 insertions(+)