Thomas Heijligen has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/60113 )
Change subject: physmap: move to hwaccess_physmap, create own header ......................................................................
physmap: move to hwaccess_physmap, create own header
Change-Id: Ieba6f4e94cfc3e668fcb8b3c978de5908aed2592 Signed-off-by: Thomas Heijligen thomas.heijligen@secunet.com --- M Makefile M atapromise.c M cbtable.c M chipset_enable.c M dmi.c M drkaiser.c M flashrom.c M gfxnvidia.c R hwaccess_physmap.c A hwaccess_physmap.h M ichspi.c M internal.c M it8212.c M it85spi.c M mcp6x_spi.c M meson.build M nicintel.c M nicintel_eeprom.c M nicintel_spi.c M ogp_spi.c M programmer.h M satamv.c M satasii.c M sb600spi.c 24 files changed, 41 insertions(+), 12 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/13/60113/1
diff --git a/Makefile b/Makefile index 72146ce..fa728c6 100644 --- a/Makefile +++ b/Makefile @@ -783,7 +783,7 @@ ifneq ($(NEED_RAW_ACCESS), ) # Raw memory, MSR or PCI port I/O access. FEATURE_CFLAGS += -D'NEED_RAW_ACCESS=1' -D'__FLASHROM_HAVE_OUTB__=1' -PROGRAMMER_OBJS += physmap.o hwaccess.o hwaccess_x86_io.o hwaccess_x86_msr.o +PROGRAMMER_OBJS += hwaccess.o hwaccess_physmap.o hwaccess_x86_io.o hwaccess_x86_msr.o
ifeq ($(TARGET_OS), NetBSD) ifeq ($(ARCH), x86) diff --git a/atapromise.c b/atapromise.c index 56abc26..fb3adcb 100644 --- a/atapromise.c +++ b/atapromise.c @@ -20,6 +20,7 @@ #include "programmer.h" #include "hwaccess.h" #include "hwaccess_x86_io.h" +#include "hwaccess_physmap.h" #include "platform/pci.h"
#define MAX_ROM_DECODE (32 * 1024) diff --git a/cbtable.c b/cbtable.c index d50a0cf..2b339d5 100644 --- a/cbtable.c +++ b/cbtable.c @@ -26,6 +26,7 @@ #include "flash.h" #include "programmer.h" #include "coreboot_tables.h" +#include "hwaccess_physmap.h"
static char *cb_vendor = NULL, *cb_model = NULL;
diff --git a/chipset_enable.c b/chipset_enable.c index 22af681..e216722 100644 --- a/chipset_enable.c +++ b/chipset_enable.c @@ -36,6 +36,7 @@ #include "hwaccess.h" #include "hwaccess_x86_io.h" #include "hwaccess_x86_msr.h" +#include "hwaccess_physmap.h" #include "platform/pci.h"
#define NOT_DONE_YET 1 diff --git a/dmi.c b/dmi.c index d2e149d..df918f9 100644 --- a/dmi.c +++ b/dmi.c @@ -32,6 +32,7 @@
#include "flash.h" #include "hwaccess.h" +#include "hwaccess_physmap.h" #include "programmer.h"
/* Enable SMBIOS decoding. Currently legacy DMI decoding is enough. */ diff --git a/drkaiser.c b/drkaiser.c index 565a45e..0930c1f 100644 --- a/drkaiser.c +++ b/drkaiser.c @@ -19,6 +19,7 @@ #include "programmer.h" #include "hwaccess.h" #include "hwaccess_x86_io.h" +#include "hwaccess_physmap.h" #include "platform/pci.h"
#define PCI_VENDOR_ID_DRKAISER 0x1803 diff --git a/flashrom.c b/flashrom.c index 48d953b..85cdf87 100644 --- a/flashrom.c +++ b/flashrom.c @@ -38,6 +38,9 @@ #include "flashchips.h" #include "programmer.h" #include "hwaccess.h" +#if CONFIG_INTERNAL == 1 +#include "hwaccess_physmap.h" +#endif #include "chipdrivers.h"
const char flashrom_version[] = FLASHROM_VERSION; diff --git a/gfxnvidia.c b/gfxnvidia.c index 0d3ef39..30c94b9 100644 --- a/gfxnvidia.c +++ b/gfxnvidia.c @@ -20,6 +20,7 @@ #include "programmer.h" #include "hwaccess.h" #include "hwaccess_x86_io.h" +#include "hwaccess_physmap.h" #include "platform/pci.h"
#define PCI_VENDOR_ID_NVIDIA 0x10de diff --git a/physmap.c b/hwaccess_physmap.c similarity index 99% rename from physmap.c rename to hwaccess_physmap.c index 6f2896f..dcc6ed7 100644 --- a/physmap.c +++ b/hwaccess_physmap.c @@ -23,8 +23,7 @@ #include <string.h> #include <errno.h> #include "flash.h" -#include "programmer.h" -#include "hwaccess.h" +#include "hwaccess_physmap.h"
#if !defined(__DJGPP__) && !defined(__LIBPAYLOAD__) /* No file access needed/possible to get mmap access permissions or access MSR. */ diff --git a/hwaccess_physmap.h b/hwaccess_physmap.h new file mode 100644 index 0000000..eccf32d --- /dev/null +++ b/hwaccess_physmap.h @@ -0,0 +1,17 @@ +/* licence + */ + +#ifndef __HWACCESS_PHYSMAP_H__ +#define __HWACCESS_PHYSMAP_H__ + +#include <stddef.h> +#include <stdint.h> + +void *physmap(const char *descr, uintptr_t phys_addr, size_t len); +void *rphysmap(const char *descr, uintptr_t phys_addr, size_t len); +void *physmap_ro(const char *descr, uintptr_t phys_addr, size_t len); +void *physmap_ro_unaligned(const char *descr, uintptr_t phys_addr, size_t len); +void physunmap(void *virt_addr, size_t len); +void physunmap_unaligned(void *virt_addr, size_t len); + +#endif /* __HWACCESS_PHYSMAP_H__ */ \ No newline at end of file diff --git a/ichspi.c b/ichspi.c index 290deaa..0bb6360 100644 --- a/ichspi.c +++ b/ichspi.c @@ -24,6 +24,7 @@ #include "flash.h" #include "programmer.h" #include "hwaccess.h" +#include "hwaccess_physmap.h" #include "spi.h" #include "ich_descriptors.h"
diff --git a/internal.c b/internal.c index 7de1d6a..f2f1fb1 100644 --- a/internal.c +++ b/internal.c @@ -21,6 +21,7 @@ #include "programmer.h" #include "hwaccess.h" #include "hwaccess_x86_io.h" +#include "hwaccess_physmap.h" #include "platform/pci.h"
int is_laptop = 0; diff --git a/it8212.c b/it8212.c index 80da2b1..6488b15 100644 --- a/it8212.c +++ b/it8212.c @@ -19,6 +19,7 @@ #include "programmer.h" #include "hwaccess.h" #include "hwaccess_x86_io.h" +#include "hwaccess_physmap.h" #include "platform/pci.h"
static uint8_t *it8212_bar = NULL; diff --git a/it85spi.c b/it85spi.c index b1074d1..17d3b57 100644 --- a/it85spi.c +++ b/it85spi.c @@ -28,6 +28,7 @@ #include "programmer.h" #include "hwaccess.h" #include "hwaccess_x86_io.h" +#include "hwaccess_physmap.h"
#define MAX_TIMEOUT 100000 #define MAX_TRY 5 diff --git a/mcp6x_spi.c b/mcp6x_spi.c index 2429346..2097cf4 100644 --- a/mcp6x_spi.c +++ b/mcp6x_spi.c @@ -24,6 +24,7 @@ #include "flash.h" #include "programmer.h" #include "hwaccess.h" +#include "hwaccess_physmap.h" #include "platform/pci.h"
/* Bit positions for each pin. */ diff --git a/meson.build b/meson.build index 2e7296b..b2e2d72 100644 --- a/meson.build +++ b/meson.build @@ -349,7 +349,7 @@ srcs += 'hwaccess.c' srcs += 'hwaccess_x86_io.c' srcs += 'hwaccess_x86_msr.c' - srcs += 'physmap.c' + srcs += 'hwaccess_physmap.c' cargs += '-DNEED_RAW_ACCESS=1' cargs += '-D__FLASHROM_HAVE_OUTB__=1' endif diff --git a/nicintel.c b/nicintel.c index 7f4eb24..21dfad2 100644 --- a/nicintel.c +++ b/nicintel.c @@ -20,6 +20,7 @@ #include "programmer.h" #include "hwaccess.h" #include "hwaccess_x86_io.h" +#include "hwaccess_physmap.h" #include "platform/pci.h"
static uint8_t *nicintel_bar; diff --git a/nicintel_eeprom.c b/nicintel_eeprom.c index fc2ef40..7b92958 100644 --- a/nicintel_eeprom.c +++ b/nicintel_eeprom.c @@ -36,6 +36,7 @@ #include "programmer.h" #include "hwaccess.h" #include "hwaccess_x86_io.h" +#include "hwaccess_physmap.h" #include "platform/pci.h"
#define PCI_VENDOR_ID_INTEL 0x8086 diff --git a/nicintel_spi.c b/nicintel_spi.c index 25a6651..852c042 100644 --- a/nicintel_spi.c +++ b/nicintel_spi.c @@ -36,6 +36,7 @@ #include "programmer.h" #include "hwaccess.h" #include "hwaccess_x86_io.h" +#include "hwaccess_physmap.h" #include "platform/pci.h"
#define PCI_VENDOR_ID_INTEL 0x8086 diff --git a/ogp_spi.c b/ogp_spi.c index 4a4934e..d4218d1 100644 --- a/ogp_spi.c +++ b/ogp_spi.c @@ -20,6 +20,7 @@ #include "programmer.h" #include "hwaccess.h" #include "hwaccess_x86_io.h" +#include "hwaccess_physmap.h" #include "platform/pci.h"
#define PCI_VENDOR_ID_OGP 0x1227 diff --git a/programmer.h b/programmer.h index c4af35a..4dd4cad 100644 --- a/programmer.h +++ b/programmer.h @@ -231,14 +231,6 @@ int processor_flash_enable(void); #endif
-/* physmap.c */ -void *physmap(const char *descr, uintptr_t phys_addr, size_t len); -void *rphysmap(const char *descr, uintptr_t phys_addr, size_t len); -void *physmap_ro(const char *descr, uintptr_t phys_addr, size_t len); -void *physmap_ro_unaligned(const char *descr, uintptr_t phys_addr, size_t len); -void physunmap(void *virt_addr, size_t len); -void physunmap_unaligned(void *virt_addr, size_t len); - #if CONFIG_INTERNAL == 1 /* cbtable.c */ int cb_parse_table(const char **vendor, const char **model); diff --git a/satamv.c b/satamv.c index 8543f53..e7c4305 100644 --- a/satamv.c +++ b/satamv.c @@ -21,6 +21,7 @@ #include "programmer.h" #include "hwaccess.h" #include "hwaccess_x86_io.h" +#include "hwaccess_physmap.h" #include "platform/pci.h"
static uint8_t *mv_bar; diff --git a/satasii.c b/satasii.c index 2f220d1..f9cb5da 100644 --- a/satasii.c +++ b/satasii.c @@ -19,6 +19,7 @@ #include "programmer.h" #include "hwaccess.h" #include "hwaccess_x86_io.h" +#include "hwaccess_physmap.h" #include "platform/pci.h"
#define PCI_VENDOR_ID_SII 0x1095 diff --git a/sb600spi.c b/sb600spi.c index 92fcc81..32a7420 100644 --- a/sb600spi.c +++ b/sb600spi.c @@ -23,6 +23,7 @@ #include "flash.h" #include "programmer.h" #include "hwaccess.h" +#include "hwaccess_physmap.h" #include "spi.h" #include "platform/pci.h"
-
Thomas Heijligen (Code Review)