From b8f364bece63ad8c8e0a015f4485ad59104b3209 Mon Sep 17 00:00:00 2001 From: Thomas Heijligen Date: Tue, 14 Dec 2021 17:52:30 +0100 Subject: [PATCH] physmap: rename to hwaccess_physmap, create own header Line up physmap with the other hwaccess related code. Change-Id: Ieba6f4e94cfc3e668fcb8b3c978de5908aed2592 Signed-off-by: Thomas Heijligen Reviewed-on: https://review.coreboot.org/c/flashrom/+/60113 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber --- Makefile | 2 +- atapromise.c | 1 + cbtable.c | 1 + chipset_enable.c | 1 + dmi.c | 1 + drkaiser.c | 1 + flashrom.c | 1 + gfxnvidia.c | 1 + physmap.c => hwaccess_physmap.c | 3 +-- hwaccess_physmap.h | 27 +++++++++++++++++++++++++++ ichspi.c | 1 + internal.c | 1 + it8212.c | 1 + it85spi.c | 1 + mcp6x_spi.c | 1 + meson.build | 2 +- nicintel.c | 1 + nicintel_eeprom.c | 1 + nicintel_spi.c | 1 + ogp_spi.c | 1 + programmer.h | 8 -------- satamv.c | 1 + satasii.c | 1 + sb600spi.c | 1 + 24 files changed, 49 insertions(+), 12 deletions(-) rename physmap.c => hwaccess_physmap.c (99%) create mode 100644 hwaccess_physmap.h diff --git a/Makefile b/Makefile index 04816fae0..c985ae020 100644 --- a/Makefile +++ b/Makefile @@ -802,7 +802,7 @@ endif ifneq ($(NEED_RAW_ACCESS), ) # Raw memory, MSR or PCI port I/O access. FEATURE_CFLAGS += -D'NEED_RAW_ACCESS=1' -PROGRAMMER_OBJS += physmap.o hwaccess.o +PROGRAMMER_OBJS += hwaccess.o hwaccess_physmap.o ifeq ($(ARCH), x86) FEATURE_CFLAGS += -D'__FLASHROM_HAVE_OUTB__=1' diff --git a/atapromise.c b/atapromise.c index 56abc26b4..fb3adcb0a 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 d50a0cfc5..2b339d533 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 22af6810a..e216722da 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 d2e149d26..df918f9ed 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 565a45ed6..0930c1fff 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 b62d38c30..73ebab57c 100644 --- a/flashrom.c +++ b/flashrom.c @@ -38,6 +38,7 @@ #include "flashchips.h" #include "programmer.h" #include "hwaccess.h" +#include "hwaccess_physmap.h" #include "chipdrivers.h" const char flashrom_version[] = FLASHROM_VERSION; diff --git a/gfxnvidia.c b/gfxnvidia.c index 0d3ef39e1..30c94b905 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 6f2896ff7..dcc6ed777 100644 --- a/physmap.c +++ b/hwaccess_physmap.c @@ -23,8 +23,7 @@ #include #include #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 000000000..eb3ddb8f5 --- /dev/null +++ b/hwaccess_physmap.h @@ -0,0 +1,27 @@ +/* + * This file is part of the flashrom project. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef __HWACCESS_PHYSMAP_H__ +#define __HWACCESS_PHYSMAP_H__ + +#include +#include + +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 290deaabb..0bb636024 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 7de1d6a8b..f2f1fb167 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 80da2b15a..6488b1543 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 574e03af8..51328a898 100644 --- a/it85spi.c +++ b/it85spi.c @@ -27,6 +27,7 @@ #include "spi.h" #include "programmer.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 242934658..2097cf4f8 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 2e7296b0d..b2e2d72ba 100644 --- a/meson.build +++ b/meson.build @@ -349,7 +349,7 @@ if need_raw_access 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 7f4eb24f1..21dfad2fb 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 fc2ef4084..7b92958bd 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 25a665165..852c042ea 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 4a4934ec0..d4218d143 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 c4af35ae0..4dd4cad80 100644 --- a/programmer.h +++ b/programmer.h @@ -231,14 +231,6 @@ int chipset_flash_enable(void); 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 8543f5309..e7c4305de 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 2f220d154..f9cb5daa8 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 92fcc8109..32a74203e 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"