<p>Nico Huber has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26062">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Move `pci_ops_mmconf` from arch/x86/ to device/<br><br>MMConf is not architecture specific. We also always provide a<br>pci_bus_default_ops() now if MMCONF_SUPPORT is selected.<br><br>Change-Id: I3f9b403da29d3fa81914cc1519710ba7d1bf2bb5<br>Signed-off-by: Nico Huber <nico.huber@secunet.com><br>---<br>M src/arch/x86/Makefile.inc<br>M src/arch/x86/include/arch/pci_ops.h<br>M src/arch/x86/pci_ops.c<br>M src/device/Makefile.inc<br>R src/device/pci_ops_mmconf.c<br>M src/include/device/pci_ops.h<br>6 files changed, 11 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/62/26062/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc</span><br><span>index df054f8..f94e547 100644</span><br><span>--- a/src/arch/x86/Makefile.inc</span><br><span>+++ b/src/arch/x86/Makefile.inc</span><br><span>@@ -346,8 +346,7 @@</span><br><span> ramstage-$(CONFIG_X86_TOP4G_BOOTMEDIA_MAP) += mmap_boot.c</span><br><span> ramstage-$(CONFIG_GENERATE_MP_TABLE) += mpspec.c</span><br><span> ramstage-y += pci_ops_conf1.c</span><br><span style="color: hsl(0, 100%, 40%);">-ramstage-y += pci_ops.c</span><br><span style="color: hsl(0, 100%, 40%);">-ramstage-$(CONFIG_MMCONF_SUPPORT) += pci_ops_mmconf.c</span><br><span style="color: hsl(120, 100%, 40%);">+ramstage-$(CONFIG_NO_MMCONF_SUPPORT) += pci_ops.c</span><br><span> ramstage-$(CONFIG_GENERATE_PIRQ_TABLE) += pirq_routing.c</span><br><span> ramstage-y += rdrand.c</span><br><span> ramstage-$(CONFIG_GENERATE_SMBIOS_TABLES) += smbios.c</span><br><span>diff --git a/src/arch/x86/include/arch/pci_ops.h b/src/arch/x86/include/arch/pci_ops.h</span><br><span>index 678edbb..3f1515e 100644</span><br><span>--- a/src/arch/x86/include/arch/pci_ops.h</span><br><span>+++ b/src/arch/x86/include/arch/pci_ops.h</span><br><span>@@ -17,7 +17,6 @@</span><br><span> #ifndef __SIMPLE_DEVICE__</span><br><span> </span><br><span> extern const struct pci_bus_operations pci_cf8_conf1;</span><br><span style="color: hsl(0, 100%, 40%);">-extern const struct pci_bus_operations pci_ops_mmconf;</span><br><span> </span><br><span> #endif</span><br><span> </span><br><span>diff --git a/src/arch/x86/pci_ops.c b/src/arch/x86/pci_ops.c</span><br><span>index 4fd916c..82f9fd2 100644</span><br><span>--- a/src/arch/x86/pci_ops.c</span><br><span>+++ b/src/arch/x86/pci_ops.c</span><br><span>@@ -18,8 +18,5 @@</span><br><span> </span><br><span> const struct pci_bus_operations *pci_bus_default_ops(struct device *dev)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-     if (IS_ENABLED(CONFIG_NO_MMCONF_SUPPORT))</span><br><span style="color: hsl(0, 100%, 40%);">-               return &pci_cf8_conf1;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-      return &pci_ops_mmconf;</span><br><span style="color: hsl(120, 100%, 40%);">+   return &pci_cf8_conf1;</span><br><span> }</span><br><span>diff --git a/src/device/Makefile.inc b/src/device/Makefile.inc</span><br><span>index af5e7a9..82d4b36 100644</span><br><span>--- a/src/device/Makefile.inc</span><br><span>+++ b/src/device/Makefile.inc</span><br><span>@@ -12,6 +12,7 @@</span><br><span> ramstage-$(CONFIG_ARCH_RAMSTAGE_X86_32) += pnp_device.c</span><br><span> ramstage-$(CONFIG_ARCH_RAMSTAGE_X86_64) += pnp_device.c</span><br><span> ramstage-$(CONFIG_PCI) += pci_ops.c</span><br><span style="color: hsl(120, 100%, 40%);">+ramstage-$(CONFIG_MMCONF_SUPPORT) += pci_ops_mmconf.c</span><br><span> ramstage-$(CONFIG_PCI) += pci_early.c</span><br><span> ramstage-$(CONFIG_PCI) += pci_rom.c</span><br><span> ramstage-y += smbus_ops.c</span><br><span>diff --git a/src/arch/x86/pci_ops_mmconf.c b/src/device/pci_ops_mmconf.c</span><br><span>similarity index 95%</span><br><span>rename from src/arch/x86/pci_ops_mmconf.c</span><br><span>rename to src/device/pci_ops_mmconf.c</span><br><span>index cf08e17..8a013dd 100644</span><br><span>--- a/src/arch/x86/pci_ops_mmconf.c</span><br><span>+++ b/src/device/pci_ops_mmconf.c</span><br><span>@@ -71,3 +71,8 @@</span><br><span>    .write16 = pci_mmconf_write_config16,</span><br><span>        .write32 = pci_mmconf_write_config32,</span><br><span> };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+const struct pci_bus_operations *pci_bus_default_ops(struct device *dev)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+    return &pci_ops_mmconf;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/include/device/pci_ops.h b/src/include/device/pci_ops.h</span><br><span>index 2518f20..b79dbe5 100644</span><br><span>--- a/src/include/device/pci_ops.h</span><br><span>+++ b/src/include/device/pci_ops.h</span><br><span>@@ -6,6 +6,9 @@</span><br><span> #include <arch/pci_ops.h></span><br><span> </span><br><span> #ifndef __SIMPLE_DEVICE__</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct pci_bus_operations pci_ops_mmconf;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> u8 pci_read_config8(struct device *dev, unsigned int where);</span><br><span> u16 pci_read_config16(struct device *dev, unsigned int where);</span><br><span> u32 pci_read_config32(struct device *dev, unsigned int where);</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26062">change 26062</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/26062"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I3f9b403da29d3fa81914cc1519710ba7d1bf2bb5 </div>
<div style="display:none"> Gerrit-Change-Number: 26062 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Nico Huber <nico.h@gmx.de> </div>