<p>Patrick Rudolph has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/25723">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pci: Fixes to remove remaining simple device functions<br><br>* Move function prototypes<br>* Guard function with preprocessor directives<br>* Only build pci_early on x86<br><br>Fixes build on non x86.<br><br>Change-Id: I71d6f82367e907732944ac5dfaabfa77181c5f20<br>Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com><br>---<br>M src/device/Makefile.inc<br>M src/device/pci_device.c<br>M src/include/device/pci.h<br>3 files changed, 9 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/23/25723/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/device/Makefile.inc b/src/device/Makefile.inc</span><br><span>index af5e7a9..7d2286a 100644</span><br><span>--- a/src/device/Makefile.inc</span><br><span>+++ b/src/device/Makefile.inc</span><br><span>@@ -12,8 +12,11 @@</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(0, 100%, 40%);">-ramstage-$(CONFIG_PCI) += pci_early.c</span><br><span> ramstage-$(CONFIG_PCI) += pci_rom.c</span><br><span style="color: hsl(120, 100%, 40%);">+#ifeq ($(CONFIG_PCI),y)</span><br><span style="color: hsl(120, 100%, 40%);">+ramstage-$(CONFIG_ARCH_X86) += pci_early.c</span><br><span style="color: hsl(120, 100%, 40%);">+romstage-$(CONFIG_ARCH_X86) += pci_early.c</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> ramstage-y += smbus_ops.c</span><br><span> </span><br><span> ifeq ($(CONFIG_AZALIA_PLUGIN_SUPPORT),y)</span><br><span>@@ -25,7 +28,6 @@</span><br><span> smm-y += device_simple.c</span><br><span> verstage-y += device_simple.c</span><br><span> romstage-y += device_simple.c</span><br><span style="color: hsl(0, 100%, 40%);">-romstage-$(CONFIG_PCI) += pci_early.c</span><br><span> </span><br><span> subdirs-y += oprom dram</span><br><span> </span><br><span>diff --git a/src/device/pci_device.c b/src/device/pci_device.c</span><br><span>index 539c2a3..9ccdea3 100644</span><br><span>--- a/src/device/pci_device.c</span><br><span>+++ b/src/device/pci_device.c</span><br><span>@@ -1088,6 +1088,7 @@</span><br><span>         return dev;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#if IS_ENABLED(CONFIG_ARCH_X86)</span><br><span> /**</span><br><span>  * Test for match between romstage and ramstage device instance.</span><br><span>  *</span><br><span>@@ -1100,6 +1101,7 @@</span><br><span>       return dev->bus->secondary == PCI_DEV2SEGBUS(sdev) &&</span><br><span>                  dev->path.pci.devfn == PCI_DEV2DEVFN(sdev);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> </span><br><span> /**</span><br><span>  * Scan a PCI bus.</span><br><span>diff --git a/src/include/device/pci.h b/src/include/device/pci.h</span><br><span>index 284ad69..8c27c70 100644</span><br><span>--- a/src/include/device/pci.h</span><br><span>+++ b/src/include/device/pci.h</span><br><span>@@ -80,7 +80,7 @@</span><br><span> struct device *pci_probe_dev(struct device *dev, struct bus *bus,</span><br><span>                           unsigned int devfn);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void do_pci_scan_bridge(device_t bus,</span><br><span style="color: hsl(120, 100%, 40%);">+void do_pci_scan_bridge(struct device *dev,</span><br><span>   void (*do_scan_bus)(struct bus *bus,</span><br><span>                 unsigned int min_devfn, unsigned int max_devfn));</span><br><span> </span><br><span>@@ -95,7 +95,6 @@</span><br><span> void pci_dev_set_subsystem(struct device *dev, unsigned int vendor,</span><br><span>     unsigned int device);</span><br><span> void pci_dev_init(struct device *dev);</span><br><span style="color: hsl(0, 100%, 40%);">-unsigned int pci_match_simple_dev(struct device *dev, pci_devfn_t sdev);</span><br><span> </span><br><span> const char *pin_to_str(int pin);</span><br><span> int get_pci_irq_pins(struct device *dev, struct device **parent_bdg);</span><br><span>@@ -117,6 +116,8 @@</span><br><span> }</span><br><span> </span><br><span> #ifdef __SIMPLE_DEVICE__</span><br><span style="color: hsl(120, 100%, 40%);">+unsigned int pci_match_simple_dev(struct device *dev, pci_devfn_t sdev);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> unsigned int pci_find_next_capability(pci_devfn_t dev, unsigned int cap,</span><br><span>  unsigned int last);</span><br><span> unsigned int pci_find_capability(pci_devfn_t dev, unsigned int cap);</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/25723">change 25723</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/25723"/><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: I71d6f82367e907732944ac5dfaabfa77181c5f20 </div>
<div style="display:none"> Gerrit-Change-Number: 25723 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Patrick Rudolph <patrick.rudolph@9elements.com> </div>