Add directive __SIMPLE_DEVICE__
The tests for __PRE_RAM__ or __SMM__ were repeatedly used
for detection if dev->ops in the devicetree are not available
and simple device model functions need be used.
If a source file build for ramstage had __PRE_RAM__ inserted
at the beginning, the struct device would no longer match the
allocation the object had taken. This problem is fixed by
replacing such cases with explicit __SIMPLE_DEVICE__.
Change-Id: Ib74c9b2d8753e6e37e1a23fcfaa2f3657790d4c0
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/3555
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@google.com>
diff --git a/src/include/device/device.h b/src/include/device/device.h
index 1eff4a2..797e717 100644
--- a/src/include/device/device.h
+++ b/src/include/device/device.h
@@ -1,14 +1,15 @@
#ifndef DEVICE_H
#define DEVICE_H
-#ifndef __SMM__
#include <stdint.h>
#include <stddef.h>
+#include <arch/rules.h>
#include <device/resource.h>
#include <device/path.h>
struct device;
-#ifndef __PRE_RAM__
+
+#ifndef __SIMPLE_DEVICE__
typedef struct device * device_t;
struct pci_operations;
struct pci_bus_operations;
@@ -45,7 +46,7 @@
const struct pci_bus_operations * (*ops_pci_bus)(device_t dev);
const struct pnp_mode_ops *ops_pnp_mode;
};
-#endif
+#endif /* ! __SIMPLE_DEVICE__ */
struct bus {
@@ -116,9 +117,10 @@
* static.c file and is generated by the config tool at compile time.
*/
extern ROMSTAGE_CONST struct device dev_root;
-#ifndef __PRE_RAM__
-extern struct device *all_devices; /* list of all devices */
+#ifndef __SIMPLE_DEVICE__
+
+extern struct device *all_devices; /* list of all devices */
extern struct resource *free_resources;
extern struct bus *free_links;
@@ -222,13 +224,14 @@
void tolm_test(void *gp, struct device *dev, struct resource *new);
u32 find_pci_tolm(struct bus *bus);
-#else
+
+#else /* vv __SIMPLE_DEVICE__ vv */
+
ROMSTAGE_CONST struct device * dev_find_slot (unsigned int bus,
unsigned int devfn);
ROMSTAGE_CONST struct device * dev_find_slot_on_smbus (unsigned int bus,
unsigned int addr);
+
#endif
-#else /* __SMM__ */
-#include <arch/io.h>
-#endif /* __SMM__ */
+
#endif /* DEVICE_H */
diff --git a/src/include/device/pci.h b/src/include/device/pci.h
index 2dea1cf..be91ed3 100644
--- a/src/include/device/pci.h
+++ b/src/include/device/pci.h
@@ -17,13 +17,15 @@
#include <stdint.h>
#include <stddef.h>
+#include <arch/rules.h>
#include <device/pci_def.h>
#include <device/resource.h>
#include <device/device.h>
-#if !defined(__PRE_RAM__) && !defined(__SMM__)
#include <device/pci_ops.h>
#include <device/pci_rom.h>
+#ifndef __SIMPLE_DEVICE__
+
/* Common pci operations without a standard interface */
struct pci_operations {
/* set the Subsystem IDs for the PCI device */
@@ -94,5 +96,5 @@
return pops;
}
-#endif
+#endif /* ! __SIMPLE_DEVICE__ */
#endif /* PCI_H */
diff --git a/src/include/device/pci_ops.h b/src/include/device/pci_ops.h
index 20fbb99..ae58a01 100644
--- a/src/include/device/pci_ops.h
+++ b/src/include/device/pci_ops.h
@@ -1,11 +1,11 @@
#ifndef PCI_OPS_H
#define PCI_OPS_H
-#ifndef __SMM__
#include <stdint.h>
#include <device/device.h>
#include <arch/pci_ops.h>
+#ifndef __SIMPLE_DEVICE__
u8 pci_read_config8(device_t dev, unsigned int where);
u16 pci_read_config16(device_t dev, unsigned int where);
u32 pci_read_config32(device_t dev, unsigned int where);
diff --git a/src/include/device/pnp.h b/src/include/device/pnp.h
index 434f0a4..a229edb 100644
--- a/src/include/device/pnp.h
+++ b/src/include/device/pnp.h
@@ -2,10 +2,12 @@
#define DEVICE_PNP_H
#include <stdint.h>
+#include <arch/rules.h>
#include <device/device.h>
#include <device/pnp_def.h>
-#if !defined(__PRE_RAM__) && !defined(__SMM__)
+#ifndef __SIMPLE_DEVICE__
+
/* Primitive PNP resource manipulation */
void pnp_write_config(device_t dev, u8 reg, u8 value);
u8 pnp_read_config(device_t dev, u8 reg);
@@ -59,5 +61,5 @@
void pnp_enter_conf_mode(device_t dev);
void pnp_exit_conf_mode(device_t dev);
-#endif
+#endif /* ! __SIMPLE_DEVICE__ */
#endif /* DEVICE_PNP_H */