Skip to content

Commit 996e337

Browse files
committed
Merge branch 'pci/ecam'
- Reserve ECAM if BIOS didn't include it in PNP0C02 _CRS (Bjorn Helgaas) - Add MMCONFIG/ECAM debug logging (Bjorn Helgaas) - Rename 'MMCONFIG' to 'ECAM' to match spec usage (Bjorn Helgaas) * pci/ecam: x86/pci: Reorder pci_mmcfg_arch_map() definition before calls x86/pci: Return pci_mmconfig_add() failure early x86/pci: Comment pci_mmconfig_insert() obscure MCFG dependency x86/pci: Rename pci_mmcfg_check_reserved() to pci_mmcfg_reserved() x86/pci: Rename acpi_mcfg_check_entry() to acpi_mcfg_valid_entry() x86/pci: Rename 'MMCONFIG' to 'ECAM', use pr_fmt x86/pci: Add MCFG debug logging x86/pci: Reword ECAM EfiMemoryMappedIO logging to avoid 'reserved' x86/pci: Reserve ECAM if BIOS didn't include it in PNP0C02 _CRS
2 parents f04e528 + 1dfc86a commit 996e337

File tree

4 files changed

+121
-106
lines changed

4 files changed

+121
-106
lines changed

arch/x86/pci/acpi.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,9 @@ static int setup_mcfg_map(struct acpi_pci_root_info *ci)
283283
info->mcfg_added = false;
284284
seg = info->sd.domain;
285285

286+
dev_dbg(dev, "%s(%04x %pR ECAM %pa)\n", __func__, seg,
287+
&root->secondary, &root->mcfg_addr);
288+
286289
/* return success if MMCFG is not in use */
287290
if (raw_pci_ext_ops && raw_pci_ext_ops != &pci_mmcfg)
288291
return 0;

0 commit comments

Comments
 (0)