<p>Patrick Rudolph has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/25720">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pci: Move inline function to device/pci.h<br><br>Move inline function where they belong to.<br>Fixes compilation on non x86.<br><br>Change-Id: Ia05391c43b8d501bd68df5654bcfb587f8786f71<br>Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com><br>---<br>M src/arch/x86/include/arch/io.h<br>M src/include/device/pci.h<br>2 files changed, 54 insertions(+), 59 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/20/25720/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/arch/x86/include/arch/io.h b/src/arch/x86/include/arch/io.h</span><br><span>index d35e964..37b2e95 100644</span><br><span>--- a/src/arch/x86/include/arch/io.h</span><br><span>+++ b/src/arch/x86/include/arch/io.h</span><br><span>@@ -427,63 +427,4 @@</span><br><span> }</span><br><span> </span><br><span> #endif /* __SIMPLE_DEVICE__ */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#ifndef __SIMPLE_DEVICE__</span><br><span style="color: hsl(0, 100%, 40%);">-#include <device/pci_ops.h></span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static inline __attribute__((always_inline))</span><br><span style="color: hsl(0, 100%, 40%);">-void pci_or_config8(device_t dev, unsigned int where, u8 ormask)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- u8 value = pci_read_config8(dev, where);</span><br><span style="color: hsl(0, 100%, 40%);">- pci_write_config8(dev, where, value | ormask);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static inline __attribute__((always_inline))</span><br><span style="color: hsl(0, 100%, 40%);">-void pci_or_config16(device_t dev, unsigned int where, u16 ormask)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- u16 value = pci_read_config16(dev, where);</span><br><span style="color: hsl(0, 100%, 40%);">- pci_write_config16(dev, where, value | ormask);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static inline __attribute__((always_inline))</span><br><span style="color: hsl(0, 100%, 40%);">-void pci_or_config32(device_t dev, unsigned int where, u32 ormask)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- u32 value = pci_read_config32(dev, where);</span><br><span style="color: hsl(0, 100%, 40%);">- pci_write_config32(dev, where, value | ormask);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static inline __attribute__((always_inline))</span><br><span style="color: hsl(0, 100%, 40%);">-void pci_update_config8(device_t dev, int reg, u8 mask, u8 or)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- u8 reg8;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- reg8 = pci_read_config8(dev, reg);</span><br><span style="color: hsl(0, 100%, 40%);">- reg8 &= mask;</span><br><span style="color: hsl(0, 100%, 40%);">- reg8 |= or;</span><br><span style="color: hsl(0, 100%, 40%);">- pci_write_config8(dev, reg, reg8);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static inline __attribute__((always_inline))</span><br><span style="color: hsl(0, 100%, 40%);">-void pci_update_config16(device_t dev, int reg, u16 mask, u16 or)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- u16 reg16;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- reg16 = pci_read_config16(dev, reg);</span><br><span style="color: hsl(0, 100%, 40%);">- reg16 &= mask;</span><br><span style="color: hsl(0, 100%, 40%);">- reg16 |= or;</span><br><span style="color: hsl(0, 100%, 40%);">- pci_write_config16(dev, reg, reg16);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static inline __attribute__((always_inline))</span><br><span style="color: hsl(0, 100%, 40%);">-void pci_update_config32(device_t dev, int reg, u32 mask, u32 or)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- u32 reg32;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- reg32 = pci_read_config32(dev, reg);</span><br><span style="color: hsl(0, 100%, 40%);">- reg32 &= mask;</span><br><span style="color: hsl(0, 100%, 40%);">- reg32 |= or;</span><br><span style="color: hsl(0, 100%, 40%);">- pci_write_config32(dev, reg, reg32);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> #endif</span><br><span>diff --git a/src/include/device/pci.h b/src/include/device/pci.h</span><br><span>index 5eb6a4a..284ad69 100644</span><br><span>--- a/src/include/device/pci.h</span><br><span>+++ b/src/include/device/pci.h</span><br><span>@@ -136,6 +136,60 @@</span><br><span> }</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static inline __attribute__((always_inline))</span><br><span style="color: hsl(120, 100%, 40%);">+void pci_or_config8(device_t dev, unsigned int where, u8 ormask)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ u8 value = pci_read_config8(dev, where);</span><br><span style="color: hsl(120, 100%, 40%);">+ pci_write_config8(dev, where, value | ormask);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static inline __attribute__((always_inline))</span><br><span style="color: hsl(120, 100%, 40%);">+void pci_or_config16(device_t dev, unsigned int where, u16 ormask)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ u16 value = pci_read_config16(dev, where);</span><br><span style="color: hsl(120, 100%, 40%);">+ pci_write_config16(dev, where, value | ormask);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static inline __attribute__((always_inline))</span><br><span style="color: hsl(120, 100%, 40%);">+void pci_or_config32(device_t dev, unsigned int where, u32 ormask)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ u32 value = pci_read_config32(dev, where);</span><br><span style="color: hsl(120, 100%, 40%);">+ pci_write_config32(dev, where, value | ormask);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static inline __attribute__((always_inline))</span><br><span style="color: hsl(120, 100%, 40%);">+void pci_update_config8(device_t dev, int reg, u8 mask, u8 or)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ u8 reg8;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ reg8 = pci_read_config8(dev, reg);</span><br><span style="color: hsl(120, 100%, 40%);">+ reg8 &= mask;</span><br><span style="color: hsl(120, 100%, 40%);">+ reg8 |= or;</span><br><span style="color: hsl(120, 100%, 40%);">+ pci_write_config8(dev, reg, reg8);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static inline __attribute__((always_inline))</span><br><span style="color: hsl(120, 100%, 40%);">+void pci_update_config16(device_t dev, int reg, u16 mask, u16 or)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ u16 reg16;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ reg16 = pci_read_config16(dev, reg);</span><br><span style="color: hsl(120, 100%, 40%);">+ reg16 &= mask;</span><br><span style="color: hsl(120, 100%, 40%);">+ reg16 |= or;</span><br><span style="color: hsl(120, 100%, 40%);">+ pci_write_config16(dev, reg, reg16);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static inline __attribute__((always_inline))</span><br><span style="color: hsl(120, 100%, 40%);">+void pci_update_config32(device_t dev, int reg, u32 mask, u32 or)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ u32 reg32;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ reg32 = pci_read_config32(dev, reg);</span><br><span style="color: hsl(120, 100%, 40%);">+ reg32 &= mask;</span><br><span style="color: hsl(120, 100%, 40%);">+ reg32 |= or;</span><br><span style="color: hsl(120, 100%, 40%);">+ pci_write_config32(dev, reg, reg32);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #endif /* CONFIG_PCI */</span><br><span> </span><br><span> #endif /* PCI_H */</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/25720">change 25720</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/25720"/><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: Ia05391c43b8d501bd68df5654bcfb587f8786f71 </div>
<div style="display:none"> Gerrit-Change-Number: 25720 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Patrick Rudolph <patrick.rudolph@9elements.com> </div>