January 2022 - flashrom-gerrit

Change in flashrom[master]: flashrom.c: Make {read,write}_buf_from_include_args() public
by Anastasia Klimchuk (Code Review) 20 Jan '22

20 Jan '22

Attention is currently required from: Edward O'Callaghan, Daniel Campello, Angel Pons. Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/60069 ) Change subject: flashrom.c: Make {read,write}_buf_from_include_args() public ...................................................................... Patch Set 3: (1 comment) File flash.h: https://review.coreboot.org/c/flashrom/+/60069/comment/6a178741_26f42847 PS3, Line 353: read_buf_from_include_args > It's a good idea in theory but read_buf_from_file() [sic. […] Then maybe libflashrom.h? It has a bunch of layout-specific functions, and even flashrom_layout itself (at the bottom, starting from line 108). -- To view, visit https://review.coreboot.org/c/flashrom/+/60069 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ia0abec655a682ca449d0e8ba620886a2d616b86d Gerrit-Change-Number: 60069 Gerrit-PatchSet: 3 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Daniel Campello <campello(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-CC: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Daniel Campello <campello(a)chromium.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Thu, 20 Jan 2022 23:16:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Edward O'Callaghan <quasisec(a)chromium.org> Comment-In-Reply-To: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: Makefile: remove obsolete distclean target
by Nico Huber (Code Review) 20 Jan '22

20 Jan '22

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/59233 ) Change subject: Makefile: remove obsolete distclean target ...................................................................... Makefile: remove obsolete distclean target distclean removes .libdeps which does not exist anymore Change-Id: I7d5717b99bf44a610a77177662c208da7f58c9e7 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/59233 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> --- M Makefile 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved diff --git a/Makefile b/Makefile index ec8956a..d4de2ff 100644 --- a/Makefile +++ b/Makefile @@ -987,9 +987,6 @@ rm -f $(PROGRAM) $(PROGRAM).exe libflashrom.a $(filter-out Makefile.d, $(wildcard *.d *.o)) $(PROGRAM).8 $(PROGRAM).8.html $(BUILD_DETAILS_FILE) @+$(MAKE) -C util/ich_descriptors_tool/ clean -distclean: clean - rm -f .libdeps - install: $(PROGRAM)$(EXEC_SUFFIX) $(PROGRAM).8 mkdir -p $(DESTDIR)$(PREFIX)/sbin mkdir -p $(DESTDIR)$(MANDIR)/man8 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://review.coreboot.org/c/flashrom/+/59233 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I7d5717b99bf44a610a77177662c208da7f58c9e7 Gerrit-Change-Number: 59233 Gerrit-PatchSet: 7 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: Makefile: rename FEATURE_CFLAGS to FEATURE_FLAGS
by Nico Huber (Code Review) 20 Jan '22

20 Jan '22

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/59231 ) Change subject: Makefile: rename FEATURE_CFLAGS to FEATURE_FLAGS ...................................................................... Makefile: rename FEATURE_CFLAGS to FEATURE_FLAGS Change-Id: I819f5d76e6f37a0e0ed6481a051ed85126622503 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/59231 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> --- M Makefile 1 file changed, 59 insertions(+), 59 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved diff --git a/Makefile b/Makefile index f26f701..ec8956a 100644 --- a/Makefile +++ b/Makefile @@ -268,9 +268,9 @@ endif ifeq ($(TARGET_OS), $(filter $(TARGET_OS), MinGW Cygwin)) -FEATURE_CFLAGS += -D'IS_WINDOWS=1' +FEATURE_FLAGS += -D'IS_WINDOWS=1' else -FEATURE_CFLAGS += -D'IS_WINDOWS=0' +FEATURE_FLAGS += -D'IS_WINDOWS=0' endif # FIXME: Should we check for Cygwin/MSVC as well? @@ -352,10 +352,10 @@ endif ifeq ($(ENDIAN), little) -FEATURE_CFLAGS += -D'__FLASHROM_LITTLE_ENDIAN__=1' +FEATURE_FLAGS += -D'__FLASHROM_LITTLE_ENDIAN__=1' endif ifeq ($(ENDIAN), big) -FEATURE_CFLAGS += -D'__FLASHROM_BIG_ENDIAN__=1' +FEATURE_FLAGS += -D'__FLASHROM_BIG_ENDIAN__=1' endif # PCI port I/O support is unimplemented on PPC/MIPS/SPARC and unavailable on ARM. @@ -373,21 +373,21 @@ endif ifeq ($(TARGET_OS), $(filter $(TARGET_OS), Linux Darwin NetBSD OpenBSD)) -FEATURE_CFLAGS += -D'USE_IOPL=1' +FEATURE_FLAGS += -D'USE_IOPL=1' else -FEATURE_CFLAGS += -D'USE_IOPL=0' +FEATURE_FLAGS += -D'USE_IOPL=0' endif ifeq ($(TARGET_OS), $(filter $(TARGET_OS), FreeBSD FreeBSD-glibc DragonFlyBSD)) -FEATURE_CFLAGS += -D'USE_DEV_IO=1' +FEATURE_FLAGS += -D'USE_DEV_IO=1' else -FEATURE_CFLAGS += -D'USE_DEV_IO=0' +FEATURE_FLAGS += -D'USE_DEV_IO=0' endif ifeq ($(TARGET_OS), $(filter $(TARGET_OS), Hurd)) -FEATURE_CFLAGS += -D'USE_IOPERM=1' +FEATURE_FLAGS += -D'USE_IOPERM=1' else -FEATURE_CFLAGS += -D'USE_IOPERM=0' +FEATURE_FLAGS += -D'USE_IOPERM=0' endif @@ -590,212 +590,212 @@ # Depending on the CONFIG_* variables set and verified above we set compiler flags and parameters below. ifdef CONFIG_DEFAULT_PROGRAMMER_NAME -FEATURE_CFLAGS += -D'CONFIG_DEFAULT_PROGRAMMER_NAME=&programmer_$(CONFIG_DEFAULT_PROGRAMMER_NAME)' +FEATURE_FLAGS += -D'CONFIG_DEFAULT_PROGRAMMER_NAME=&programmer_$(CONFIG_DEFAULT_PROGRAMMER_NAME)' else -FEATURE_CFLAGS += -D'CONFIG_DEFAULT_PROGRAMMER_NAME=NULL' +FEATURE_FLAGS += -D'CONFIG_DEFAULT_PROGRAMMER_NAME=NULL' endif -FEATURE_CFLAGS += -D'CONFIG_DEFAULT_PROGRAMMER_ARGS="$(CONFIG_DEFAULT_PROGRAMMER_ARGS)"' +FEATURE_FLAGS += -D'CONFIG_DEFAULT_PROGRAMMER_ARGS="$(CONFIG_DEFAULT_PROGRAMMER_ARGS)"' ifeq ($(CONFIG_INTERNAL), yes) -FEATURE_CFLAGS += -D'CONFIG_INTERNAL=1' +FEATURE_FLAGS += -D'CONFIG_INTERNAL=1' PROGRAMMER_OBJS += processor_enable.o chipset_enable.o board_enable.o cbtable.o internal.o ifeq ($(ARCH), x86) PROGRAMMER_OBJS += it87spi.o it85spi.o sb600spi.o amd_imc.o wbsio_spi.o mcp6x_spi.o PROGRAMMER_OBJS += ichspi.o dmi.o ifeq ($(CONFIG_INTERNAL_DMI), yes) -FEATURE_CFLAGS += -D'CONFIG_INTERNAL_DMI=1' +FEATURE_FLAGS += -D'CONFIG_INTERNAL_DMI=1' endif else endif endif ifeq ($(CONFIG_SERPROG), yes) -FEATURE_CFLAGS += -D'CONFIG_SERPROG=1' +FEATURE_FLAGS += -D'CONFIG_SERPROG=1' PROGRAMMER_OBJS += serprog.o NEED_SERIAL += CONFIG_SERPROG NEED_POSIX_SOCKETS += CONFIG_SERPROG endif ifeq ($(CONFIG_RAYER_SPI), yes) -FEATURE_CFLAGS += -D'CONFIG_RAYER_SPI=1' +FEATURE_FLAGS += -D'CONFIG_RAYER_SPI=1' PROGRAMMER_OBJS += rayer_spi.o endif ifeq ($(CONFIG_RAIDEN_DEBUG_SPI), yes) -FEATURE_CFLAGS += -D'CONFIG_RAIDEN_DEBUG_SPI=1' +FEATURE_FLAGS += -D'CONFIG_RAIDEN_DEBUG_SPI=1' PROGRAMMER_OBJS += raiden_debug_spi.o endif ifeq ($(CONFIG_PONY_SPI), yes) -FEATURE_CFLAGS += -D'CONFIG_PONY_SPI=1' +FEATURE_FLAGS += -D'CONFIG_PONY_SPI=1' PROGRAMMER_OBJS += pony_spi.o NEED_SERIAL += CONFIG_PONY_SPI endif ifeq ($(CONFIG_BITBANG_SPI), yes) -FEATURE_CFLAGS += -D'CONFIG_BITBANG_SPI=1' +FEATURE_FLAGS += -D'CONFIG_BITBANG_SPI=1' PROGRAMMER_OBJS += bitbang_spi.o endif ifeq ($(CONFIG_NIC3COM), yes) -FEATURE_CFLAGS += -D'CONFIG_NIC3COM=1' +FEATURE_FLAGS += -D'CONFIG_NIC3COM=1' PROGRAMMER_OBJS += nic3com.o endif ifeq ($(CONFIG_GFXNVIDIA), yes) -FEATURE_CFLAGS += -D'CONFIG_GFXNVIDIA=1' +FEATURE_FLAGS += -D'CONFIG_GFXNVIDIA=1' PROGRAMMER_OBJS += gfxnvidia.o endif ifeq ($(CONFIG_SATASII), yes) -FEATURE_CFLAGS += -D'CONFIG_SATASII=1' +FEATURE_FLAGS += -D'CONFIG_SATASII=1' PROGRAMMER_OBJS += satasii.o endif ifeq ($(CONFIG_ATAHPT), yes) -FEATURE_CFLAGS += -D'CONFIG_ATAHPT=1' +FEATURE_FLAGS += -D'CONFIG_ATAHPT=1' PROGRAMMER_OBJS += atahpt.o endif ifeq ($(CONFIG_ATAVIA), yes) -FEATURE_CFLAGS += -D'CONFIG_ATAVIA=1' +FEATURE_FLAGS += -D'CONFIG_ATAVIA=1' PROGRAMMER_OBJS += atavia.o endif ifeq ($(CONFIG_ATAPROMISE), yes) -FEATURE_CFLAGS += -D'CONFIG_ATAPROMISE=1' +FEATURE_FLAGS += -D'CONFIG_ATAPROMISE=1' PROGRAMMER_OBJS += atapromise.o endif ifeq ($(CONFIG_IT8212), yes) -FEATURE_CFLAGS += -D'CONFIG_IT8212=1' +FEATURE_FLAGS += -D'CONFIG_IT8212=1' PROGRAMMER_OBJS += it8212.o endif ifeq ($(CONFIG_FT2232_SPI), yes) -FEATURE_CFLAGS += -D'CONFIG_FT2232_SPI=1' +FEATURE_FLAGS += -D'CONFIG_FT2232_SPI=1' PROGRAMMER_OBJS += ft2232_spi.o endif ifeq ($(CONFIG_USBBLASTER_SPI), yes) -FEATURE_CFLAGS += -D'CONFIG_USBBLASTER_SPI=1' +FEATURE_FLAGS += -D'CONFIG_USBBLASTER_SPI=1' PROGRAMMER_OBJS += usbblaster_spi.o endif ifeq ($(CONFIG_PICKIT2_SPI), yes) -FEATURE_CFLAGS += -D'CONFIG_PICKIT2_SPI=1' +FEATURE_FLAGS += -D'CONFIG_PICKIT2_SPI=1' PROGRAMMER_OBJS += pickit2_spi.o endif ifeq ($(CONFIG_STLINKV3_SPI), yes) -FEATURE_CFLAGS += -D'CONFIG_STLINKV3_SPI=1' +FEATURE_FLAGS += -D'CONFIG_STLINKV3_SPI=1' PROGRAMMER_OBJS += stlinkv3_spi.o endif ifeq ($(CONFIG_LSPCON_I2C_SPI), yes) -FEATURE_CFLAGS += -D'CONFIG_LSPCON_I2C_SPI=1' +FEATURE_FLAGS += -D'CONFIG_LSPCON_I2C_SPI=1' PROGRAMMER_OBJS += lspcon_i2c_spi.o endif ifeq ($(CONFIG_REALTEK_MST_I2C_SPI), yes) -FEATURE_CFLAGS += -D'CONFIG_REALTEK_MST_I2C_SPI=1' +FEATURE_FLAGS += -D'CONFIG_REALTEK_MST_I2C_SPI=1' PROGRAMMER_OBJS += realtek_mst_i2c_spi.o endif ifeq ($(CONFIG_DUMMY), yes) -FEATURE_CFLAGS += -D'CONFIG_DUMMY=1' +FEATURE_FLAGS += -D'CONFIG_DUMMY=1' PROGRAMMER_OBJS += dummyflasher.o endif ifeq ($(CONFIG_DRKAISER), yes) -FEATURE_CFLAGS += -D'CONFIG_DRKAISER=1' +FEATURE_FLAGS += -D'CONFIG_DRKAISER=1' PROGRAMMER_OBJS += drkaiser.o endif ifeq ($(CONFIG_NICREALTEK), yes) -FEATURE_CFLAGS += -D'CONFIG_NICREALTEK=1' +FEATURE_FLAGS += -D'CONFIG_NICREALTEK=1' PROGRAMMER_OBJS += nicrealtek.o endif ifeq ($(CONFIG_NICNATSEMI), yes) -FEATURE_CFLAGS += -D'CONFIG_NICNATSEMI=1' +FEATURE_FLAGS += -D'CONFIG_NICNATSEMI=1' PROGRAMMER_OBJS += nicnatsemi.o endif ifeq ($(CONFIG_NICINTEL), yes) -FEATURE_CFLAGS += -D'CONFIG_NICINTEL=1' +FEATURE_FLAGS += -D'CONFIG_NICINTEL=1' PROGRAMMER_OBJS += nicintel.o endif ifeq ($(CONFIG_NICINTEL_SPI), yes) -FEATURE_CFLAGS += -D'CONFIG_NICINTEL_SPI=1' +FEATURE_FLAGS += -D'CONFIG_NICINTEL_SPI=1' PROGRAMMER_OBJS += nicintel_spi.o endif ifeq ($(CONFIG_NICINTEL_EEPROM), yes) -FEATURE_CFLAGS += -D'CONFIG_NICINTEL_EEPROM=1' +FEATURE_FLAGS += -D'CONFIG_NICINTEL_EEPROM=1' PROGRAMMER_OBJS += nicintel_eeprom.o endif ifeq ($(CONFIG_OGP_SPI), yes) -FEATURE_CFLAGS += -D'CONFIG_OGP_SPI=1' +FEATURE_FLAGS += -D'CONFIG_OGP_SPI=1' PROGRAMMER_OBJS += ogp_spi.o endif ifeq ($(CONFIG_BUSPIRATE_SPI), yes) -FEATURE_CFLAGS += -D'CONFIG_BUSPIRATE_SPI=1' +FEATURE_FLAGS += -D'CONFIG_BUSPIRATE_SPI=1' PROGRAMMER_OBJS += buspirate_spi.o NEED_SERIAL += CONFIG_BUSPIRATE_SPI endif ifeq ($(CONFIG_DEDIPROG), yes) -FEATURE_CFLAGS += -D'CONFIG_DEDIPROG=1' +FEATURE_FLAGS += -D'CONFIG_DEDIPROG=1' PROGRAMMER_OBJS += dediprog.o endif ifeq ($(CONFIG_DEVELOPERBOX_SPI), yes) -FEATURE_CFLAGS += -D'CONFIG_DEVELOPERBOX_SPI=1' +FEATURE_FLAGS += -D'CONFIG_DEVELOPERBOX_SPI=1' PROGRAMMER_OBJS += developerbox_spi.o endif ifeq ($(CONFIG_SATAMV), yes) -FEATURE_CFLAGS += -D'CONFIG_SATAMV=1' +FEATURE_FLAGS += -D'CONFIG_SATAMV=1' PROGRAMMER_OBJS += satamv.o endif ifeq ($(CONFIG_LINUX_MTD), yes) -FEATURE_CFLAGS += -D'CONFIG_LINUX_MTD=1' +FEATURE_FLAGS += -D'CONFIG_LINUX_MTD=1' PROGRAMMER_OBJS += linux_mtd.o endif ifeq ($(CONFIG_LINUX_SPI), yes) -FEATURE_CFLAGS += -D'CONFIG_LINUX_SPI=1' +FEATURE_FLAGS += -D'CONFIG_LINUX_SPI=1' PROGRAMMER_OBJS += linux_spi.o endif ifeq ($(CONFIG_MSTARDDC_SPI), yes) -FEATURE_CFLAGS += -D'CONFIG_MSTARDDC_SPI=1' +FEATURE_FLAGS += -D'CONFIG_MSTARDDC_SPI=1' PROGRAMMER_OBJS += mstarddc_spi.o endif ifeq ($(CONFIG_CH341A_SPI), yes) -FEATURE_CFLAGS += -D'CONFIG_CH341A_SPI=1' +FEATURE_FLAGS += -D'CONFIG_CH341A_SPI=1' PROGRAMMER_OBJS += ch341a_spi.o endif ifeq ($(CONFIG_DIGILENT_SPI), yes) -FEATURE_CFLAGS += -D'CONFIG_DIGILENT_SPI=1' +FEATURE_FLAGS += -D'CONFIG_DIGILENT_SPI=1' PROGRAMMER_OBJS += digilent_spi.o endif ifeq ($(CONFIG_JLINK_SPI), yes) -FEATURE_CFLAGS += -D'CONFIG_JLINK_SPI=1' +FEATURE_FLAGS += -D'CONFIG_JLINK_SPI=1' PROGRAMMER_OBJS += jlink_spi.o endif ifeq ($(CONFIG_NI845X_SPI), yes) -FEATURE_CFLAGS += -D'CONFIG_NI845X_SPI=1' +FEATURE_FLAGS += -D'CONFIG_NI845X_SPI=1' PROGRAMMER_OBJS += ni845x_spi.o endif @@ -825,7 +825,7 @@ USE_X86_PORT_IO := $(if $(call filter_deps,$(DEPENDS_ON_X86_PORT_IO)),yes,no) ifeq ($(USE_X86_PORT_IO), yes) -FEATURE_CFLAGS += -D'__FLASHROM_HAVE_OUTB__=1' +FEATURE_FLAGS += -D'__FLASHROM_HAVE_OUTB__=1' PROGRAMMER_OBJS += hwaccess_x86_io.o endif @@ -849,7 +849,7 @@ USE_LIBPCI := $(if $(call filter_deps,$(DEPENDS_ON_LIBPCI)),yes,no) ifeq ($(USE_LIBPCI), yes) PROGRAMMER_OBJS += pcidev.o -FEATURE_CFLAGS += -D'NEED_PCI=1' +FEATURE_FLAGS += -D'NEED_PCI=1' override CFLAGS += $(CONFIG_LIBPCI_CFLAGS) override LDFLAGS += $(CONFIG_LIBPCI_LDFLAGS) endif @@ -866,7 +866,7 @@ override CFLAGS += $(CONFIG_LIBFTDI1_CFLAGS) override LDFLAGS += $(CONFIG_LIBFTDI1_LDFLAGS) ifeq ($(HAS_FT232H), yes) -FEATURE_CFLAGS += -D'HAVE_FT232H=1' +FEATURE_FLAGS += -D'HAVE_FT232H=1' endif endif @@ -883,16 +883,16 @@ endif ifeq ($(CONFIG_PRINT_WIKI), yes) -FEATURE_CFLAGS += -D'CONFIG_PRINT_WIKI=1' +FEATURE_FLAGS += -D'CONFIG_PRINT_WIKI=1' CLI_OBJS += print_wiki.o endif ifeq ($(HAS_UTSNAME), yes) -FEATURE_CFLAGS += -D'HAVE_UTSNAME=1' +FEATURE_FLAGS += -D'HAVE_UTSNAME=1' endif ifeq ($(HAS_CLOCK_GETTIME), yes) -FEATURE_CFLAGS += -D'HAVE_CLOCK_GETTIME=1' +FEATURE_FLAGS += -D'HAVE_CLOCK_GETTIME=1' override LDFLAGS += -lrt endif @@ -961,7 +961,7 @@ fi %.o: %.c config - $(CC) -MMD $(CFLAGS) $(CPPFLAGS) $(FLASHROM_CFLAGS) $(FEATURE_CFLAGS) $(SCMDEF) -o $@ -c $< + $(CC) -MMD $(CFLAGS) $(CPPFLAGS) $(FLASHROM_CFLAGS) $(FEATURE_FLAGS) $(SCMDEF) -o $@ -c $< $(PROGRAM)$(EXEC_SUFFIX): $(OBJS) $(CC) -o $(PROGRAM)$(EXEC_SUFFIX) $(OBJS) $(LDFLAGS) 4 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://review.coreboot.org/c/flashrom/+/59231 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I819f5d76e6f37a0e0ed6481a051ed85126622503 Gerrit-Change-Number: 59231 Gerrit-PatchSet: 8 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: Makefile: merge compiler, hwlibs, features targets into config target
by Nico Huber (Code Review) 20 Jan '22

20 Jan '22

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/60107 ) Change subject: Makefile: merge compiler, hwlibs, features targets into config target ...................................................................... Makefile: merge compiler, hwlibs, features targets into config target These targets are all called together. No need to have them individual. Change-Id: Ic76f923bca2beb6f95b8ea0cced4569b07e9b9ba Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/60107 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> --- M Makefile 1 file changed, 12 insertions(+), 25 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved diff --git a/Makefile b/Makefile index 72d94c8..f26f701 100644 --- a/Makefile +++ b/Makefile @@ -899,15 +899,12 @@ LIBFLASHROM_OBJS = $(CHIP_OBJS) $(PROGRAMMER_OBJS) $(LIB_OBJS) OBJS = $(CLI_OBJS) $(LIBFLASHROM_OBJS) -all: hwlibs features $(PROGRAM)$(EXEC_SUFFIX) $(PROGRAM).8 +all: config $(PROGRAM)$(EXEC_SUFFIX) $(PROGRAM).8 ifeq ($(ARCH), x86) @+$(MAKE) -C util/ich_descriptors_tool/ HOST_OS=$(HOST_OS) TARGET_OS=$(TARGET_OS) endif -# to define test programs we use verbatim variables, which get exported -# to environment variables and are referenced with $$<varname> later - -compiler: featuresavailable +config: @echo -n "C compiler found: " @if [ $(CC_WORKING) = yes ]; \ then $(CC) --version 2>/dev/null | head -1; \ @@ -921,8 +918,6 @@ echo " This might work but usually does not, please beware."; fi @echo "Target endian: $(ENDIAN)" @if [ $(ENDIAN) = unknown ]; then echo Aborting.; exit 1; fi - -hwlibs: compiler @echo Dependency libpci found: $(HAS_LIBPCI) @if [ $(HAS_LIBPCI) = yes ]; then \ echo " Checking for old \"pci_get_dev()\": $(HAS_PCI_OLD_GET_DEV)";\ @@ -950,30 +945,22 @@ echo " CFLAGS: $(CONFIG_LIBFTDI1_CFLAGS)"; \ echo " LDFLAGS: $(CONFIG_LIBFTDI1_LDFLAGS)"; \ fi - -features: hwlibs @echo "Checking for header \"mtd/mtd-user.h\": $(HAS_LINUX_MTD)" @echo "Checking for header \"linux/spi/spidev.h\": $(HAS_LINUX_SPI)" @echo "Checking for header \"linux/i2c-dev.h\": $(HAS_LINUX_I2C)" @echo "Checking for header \"linux/i2c.h\": $(HAS_LINUX_I2C)" @echo "Checking for header \"sys/utsname.h\": $(HAS_UTSNAME)" @echo "Checking for function \"clock_gettime\": $(HAS_CLOCK_GETTIME)" + @if ! [ "$(PROGRAMMER_OBJS)" ]; then \ + echo "You have to enable at least one programmer driver!"; \ + exit 1; \ + fi + @if [ "$(UNSUPPORTED_FEATURES)" ]; then \ + echo "The following features are unavailable on your machine: $(UNSUPPORTED_FEATURES)" \ + exit 1; \ + fi -# If a user does not explicitly request a non-working feature, we should -# silently disable it. However, if a non-working (does not compile) feature -# is explicitly requested, we should bail out with a descriptive error message. -# We also have to check that at least one programmer driver is enabled. -featuresavailable: -ifeq ($(PROGRAMMER_OBJS),) - @echo "You have to enable at least one programmer driver!" - @false -endif -ifneq ($(UNSUPPORTED_FEATURES), ) - @echo "The following features are unavailable on your machine: $(UNSUPPORTED_FEATURES)" - @false -endif - -%.o: %.c features +%.o: %.c config $(CC) -MMD $(CFLAGS) $(CPPFLAGS) $(FLASHROM_CFLAGS) $(FEATURE_CFLAGS) $(SCMDEF) -o $@ -c $< $(PROGRAM)$(EXEC_SUFFIX): $(OBJS) @@ -1053,7 +1040,7 @@ libpayload: clean make CC="CC=i386-elf-gcc lpgcc" AR=i386-elf-ar RANLIB=i386-elf-ranlib -.PHONY: all install clean distclean compiler hwlibs features _export export tarball featuresavailable libpayload +.PHONY: all install clean distclean config _export export tarball libpayload # Disable implicit suffixes and built-in rules (for performance and profit) .SUFFIXES: 10 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://review.coreboot.org/c/flashrom/+/60107 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ic76f923bca2beb6f95b8ea0cced4569b07e9b9ba Gerrit-Change-Number: 60107 Gerrit-PatchSet: 14 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: Makefile: reorder make targets
by Nico Huber (Code Review) 20 Jan '22

20 Jan '22

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/60836 ) Change subject: Makefile: reorder make targets ...................................................................... Makefile: reorder make targets Use the order in which the targets get executed. Change-Id: Ic45c2fc98c679ac7be4ee2860d72b517b8b67a17 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/60836 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> --- M Makefile 1 file changed, 36 insertions(+), 35 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved diff --git a/Makefile b/Makefile index 40b3eac..72d94c8 100644 --- a/Makefile +++ b/Makefile @@ -904,34 +904,6 @@ @+$(MAKE) -C util/ich_descriptors_tool/ HOST_OS=$(HOST_OS) TARGET_OS=$(TARGET_OS) endif -$(PROGRAM)$(EXEC_SUFFIX): $(OBJS) - $(CC) -o $(PROGRAM)$(EXEC_SUFFIX) $(OBJS) $(LDFLAGS) - -libflashrom.a: $(LIBFLASHROM_OBJS) - $(AR) rcs $@ $^ - $(RANLIB) $@ - -# TAROPTIONS reduces information leakage from the packager's system. -# If other tar programs support command line arguments for setting uid/gid of -# stored files, they can be handled here as well. -TAROPTIONS = $(shell LC_ALL=C tar --version|grep -q GNU && echo "--owner=root --group=root") - -%.o: %.c features - $(CC) -MMD $(CFLAGS) $(CPPFLAGS) $(FLASHROM_CFLAGS) $(FEATURE_CFLAGS) $(SCMDEF) -o $@ -c $< - -# Make sure to add all names of generated binaries here. -# This includes all frontends and libflashrom. -# We don't use EXEC_SUFFIX here because we want to clean everything. -clean: - rm -f $(PROGRAM) $(PROGRAM).exe libflashrom.a $(filter-out Makefile.d, $(wildcard *.d *.o)) $(PROGRAM).8 $(PROGRAM).8.html $(BUILD_DETAILS_FILE) - @+$(MAKE) -C util/ich_descriptors_tool/ clean - -distclean: clean - rm -f .libdeps - -strip: $(PROGRAM)$(EXEC_SUFFIX) - $(STRIP) $(STRIP_ARGS) $(PROGRAM)$(EXEC_SUFFIX) - # to define test programs we use verbatim variables, which get exported # to environment variables and are referenced with $$<varname> later @@ -979,6 +951,14 @@ echo " LDFLAGS: $(CONFIG_LIBFTDI1_LDFLAGS)"; \ fi +features: hwlibs + @echo "Checking for header \"mtd/mtd-user.h\": $(HAS_LINUX_MTD)" + @echo "Checking for header \"linux/spi/spidev.h\": $(HAS_LINUX_SPI)" + @echo "Checking for header \"linux/i2c-dev.h\": $(HAS_LINUX_I2C)" + @echo "Checking for header \"linux/i2c.h\": $(HAS_LINUX_I2C)" + @echo "Checking for header \"sys/utsname.h\": $(HAS_UTSNAME)" + @echo "Checking for function \"clock_gettime\": $(HAS_CLOCK_GETTIME)" + # If a user does not explicitly request a non-working feature, we should # silently disable it. However, if a non-working (does not compile) feature # is explicitly requested, we should bail out with a descriptive error message. @@ -993,13 +973,15 @@ @false endif -features: hwlibs - @echo "Checking for header \"mtd/mtd-user.h\": $(HAS_LINUX_MTD)" - @echo "Checking for header \"linux/spi/spidev.h\": $(HAS_LINUX_SPI)" - @echo "Checking for header \"linux/i2c-dev.h\": $(HAS_LINUX_I2C)" - @echo "Checking for header \"linux/i2c.h\": $(HAS_LINUX_I2C)" - @echo "Checking for header \"sys/utsname.h\": $(HAS_UTSNAME)" - @echo "Checking for function \"clock_gettime\": $(HAS_CLOCK_GETTIME)" +%.o: %.c features + $(CC) -MMD $(CFLAGS) $(CPPFLAGS) $(FLASHROM_CFLAGS) $(FEATURE_CFLAGS) $(SCMDEF) -o $@ -c $< + +$(PROGRAM)$(EXEC_SUFFIX): $(OBJS) + $(CC) -o $(PROGRAM)$(EXEC_SUFFIX) $(OBJS) $(LDFLAGS) + +libflashrom.a: $(LIBFLASHROM_OBJS) + $(AR) rcs $@ $^ + $(RANLIB) $@ $(PROGRAM).8.html: $(PROGRAM).8 @groff -mandoc -Thtml $< >$@ @@ -1008,6 +990,19 @@ @# Add the man page change date and version to the man page @sed -e 's#.TH FLASHROM 8 .*#.TH FLASHROM 8 "$(MAN_DATE)" "$(VERSION)" "$(MAN_DATE)"#' <$< >$@ +strip: $(PROGRAM)$(EXEC_SUFFIX) + $(STRIP) $(STRIP_ARGS) $(PROGRAM)$(EXEC_SUFFIX) + +# Make sure to add all names of generated binaries here. +# This includes all frontends and libflashrom. +# We don't use EXEC_SUFFIX here because we want to clean everything. +clean: + rm -f $(PROGRAM) $(PROGRAM).exe libflashrom.a $(filter-out Makefile.d, $(wildcard *.d *.o)) $(PROGRAM).8 $(PROGRAM).8.html $(BUILD_DETAILS_FILE) + @+$(MAKE) -C util/ich_descriptors_tool/ clean + +distclean: clean + rm -f .libdeps + install: $(PROGRAM)$(EXEC_SUFFIX) $(PROGRAM).8 mkdir -p $(DESTDIR)$(PREFIX)/sbin mkdir -p $(DESTDIR)$(MANDIR)/man8 @@ -1042,6 +1037,12 @@ export: _export @echo "Exported $(EXPORTDIR)/flashrom-$(RELEASENAME)/" + +# TAROPTIONS reduces information leakage from the packager's system. +# If other tar programs support command line arguments for setting uid/gid of +# stored files, they can be handled here as well. +TAROPTIONS = $(shell LC_ALL=C tar --version|grep -q GNU && echo "--owner=root --group=root") + tarball: _export @tar -cj --format=ustar -f "$(EXPORTDIR)/flashrom-$(RELEASENAME).tar.bz2" -C $(EXPORTDIR)/ \ $(TAROPTIONS) "flashrom-$(RELEASENAME)/" 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://review.coreboot.org/c/flashrom/+/60836 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ic45c2fc98c679ac7be4ee2860d72b517b8b67a17 Gerrit-Change-Number: 60836 Gerrit-PatchSet: 7 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: Makefile: clean up variables
by Nico Huber (Code Review) 20 Jan '22

20 Jan '22

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/59230 ) Change subject: Makefile: clean up variables ...................................................................... Makefile: clean up variables - replace $(LIBS) by $(LDFLAGS) - use override to handle CPPFLAGS, CFLAGS, LDFLAGS This allows to append flags to the users input. - remove unused $(DIFF) Change-Id: I1c9e869377677d624469af1ee9ece9a28fc3b559 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/59230 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> Reviewed-by: Paul Menzel <paulepanter(a)mailbox.org> --- M Makefile 1 file changed, 4 insertions(+), 5 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved Paul Menzel: Looks good to me, but someone else must approve diff --git a/Makefile b/Makefile index 4ed52e3..40b3eac 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,6 @@ STRIP ?= strip STRIP_ARGS = -s INSTALL = install -DIFF = diff PREFIX ?= /usr/local MANDIR ?= $(PREFIX)/share/man CFLAGS ?= -Os -Wall -Wextra -Wno-unused-parameter -Wshadow -Wmissing-prototypes -Wwrite-strings @@ -263,7 +262,7 @@ EXEC_SUFFIX := .exe # DJGPP has odd uint*_t definitions which cause lots of format string warnings. override CFLAGS += -Wno-format -LIBS += -lgetopt +override LDFLAGS += -lgetopt # Missing serial support. $(call mark_unsupported,$(DEPENDS_ON_SERIAL)) endif @@ -815,7 +814,7 @@ ifneq ($(NEED_POSIX_SOCKETS), ) ifeq ($(TARGET_OS), SunOS) -LIBS += -lsocket -lnsl +override LDFLAGS += -lsocket -lnsl endif endif @@ -894,7 +893,7 @@ ifeq ($(HAS_CLOCK_GETTIME), yes) FEATURE_CFLAGS += -D'HAVE_CLOCK_GETTIME=1' -FEATURE_LIBS += -lrt +override LDFLAGS += -lrt endif LIBFLASHROM_OBJS = $(CHIP_OBJS) $(PROGRAMMER_OBJS) $(LIB_OBJS) @@ -906,7 +905,7 @@ endif $(PROGRAM)$(EXEC_SUFFIX): $(OBJS) - $(CC) -o $(PROGRAM)$(EXEC_SUFFIX) $(OBJS) $(LDFLAGS) $(LIBS) $(FEATURE_LIBS) + $(CC) -o $(PROGRAM)$(EXEC_SUFFIX) $(OBJS) $(LDFLAGS) libflashrom.a: $(LIBFLASHROM_OBJS) $(AR) rcs $@ $^ 6 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://review.coreboot.org/c/flashrom/+/59230 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I1c9e869377677d624469af1ee9ece9a28fc3b559 Gerrit-Change-Number: 59230 Gerrit-PatchSet: 15 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: Makefile: Make pkg-config mandatory to find libpci
by Nico Huber (Code Review) 20 Jan '22

20 Jan '22

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/59050 ) Change subject: Makefile: Make pkg-config mandatory to find libpci ...................................................................... Makefile: Make pkg-config mandatory to find libpci Use `make HAS_LIBPCI=yes/no` to override the pkg-config detection and `CONFIG_LIBPCI_CFLAGS` and `CONFIG_LIBPCI_LDFLAGS` to set cflags and ldflags manually. The optional dependency of libpci libz, is automatically handled by pkg-config. Change-Id: I21b4a261b34b7e688635fc6e20b7beebfa64c7ed Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/59050 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> Reviewed-by: Paul Menzel <paulepanter(a)mailbox.org> --- M Makefile A Makefile.d/pci_old_get_dev_test.c M Makefile.include 3 files changed, 54 insertions(+), 105 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved Paul Menzel: Looks good to me, but someone else must approve diff --git a/Makefile b/Makefile index 3325aa6..4ed52e3 100644 --- a/Makefile +++ b/Makefile @@ -218,26 +218,31 @@ CONFIG_LIBUSB1_CFLAGS := $(call dependency_cflags, libusb-1.0) CONFIG_LIBUSB1_LDFLAGS := $(call dependency_ldflags, libusb-1.0) +CONFIG_LIBPCI_CFLAGS := $(call dependency_cflags, libpci) +CONFIG_LIBPCI_LDFLAGS := $(call dependency_ldflags, libpci) + # Determine the destination OS, architecture and endian # IMPORTANT: The following lines must be placed before TARGET_OS, ARCH or ENDIAN # is ever used (of course), but should come after any lines setting CC because # the lines below use CC itself. -override TARGET_OS := $(call c_macro_test, Makefile.d/os_test.h) -override ARCH := $(call c_macro_test, Makefile.d/arch_test.h) -override ENDIAN := $(call c_macro_test, Makefile.d/endian_test.h) +override TARGET_OS := $(call c_macro_test, Makefile.d/os_test.h) +override ARCH := $(call c_macro_test, Makefile.d/arch_test.h) +override ENDIAN := $(call c_macro_test, Makefile.d/endian_test.h) -HAS_LIBFTDI1 := $(call find_dependency, libftdi1) -HAS_LIB_NI845X := no -HAS_LIBJAYLINK := $(call find_dependency, libjaylink) -HAS_LIBUSB1 := $(call find_dependency, libusb-1.0) +HAS_LIBFTDI1 := $(call find_dependency, libftdi1) +HAS_LIB_NI845X := no +HAS_LIBJAYLINK := $(call find_dependency, libjaylink) +HAS_LIBUSB1 := $(call find_dependency, libusb-1.0) +HAS_LIBPCI := $(call find_dependency, libpci) -HAS_FT232H := $(call c_compile_test, Makefile.d/ft232h_test.c, $(CONFIG_LIBFTDI1_CFLAGS)) -HAS_UTSNAME := $(call c_compile_test, Makefile.d/utsname_test.c) -HAS_CLOCK_GETTIME := $(call c_compile_test, Makefile.d/clock_gettime_test.c) -HAS_LINUX_MTD := $(call c_compile_test, Makefile.d/linux_mtd_test.c) -HAS_LINUX_SPI := $(call c_compile_test, Makefile.d/linux_spi_test.c) -HAS_LINUX_I2C := $(call c_compile_test, Makefile.d/linux_i2c_test.c) +HAS_PCI_OLD_GET_DEV := $(call c_compile_test, Makefile.d/pci_old_get_dev_test.c, $(CONFIG_LIBPCI_CFLAGS)) +HAS_FT232H := $(call c_compile_test, Makefile.d/ft232h_test.c, $(CONFIG_LIBFTDI1_CFLAGS)) +HAS_UTSNAME := $(call c_compile_test, Makefile.d/utsname_test.c) +HAS_CLOCK_GETTIME := $(call c_compile_test, Makefile.d/clock_gettime_test.c) +HAS_LINUX_MTD := $(call c_compile_test, Makefile.d/linux_mtd_test.c) +HAS_LINUX_SPI := $(call c_compile_test, Makefile.d/linux_spi_test.c) +HAS_LINUX_I2C := $(call c_compile_test, Makefile.d/linux_i2c_test.c) ifeq ($(TARGET_OS), $(filter $(TARGET_OS), FreeBSD OpenBSD DragonFlyBSD)) override CPPFLAGS += -I/usr/local/include @@ -327,6 +332,10 @@ $(call mark_unsupported,CONFIG_INTERNAL) endif +ifeq ($(HAS_LIBPCI), no) +$(call mark_unsupported,$(DEPENDS_ON_LIBPCI)) +endif + ifeq ($(HAS_LIBFTDI1), no) $(call mark_unsupported,$(DEPENDS_ON_LIBFTDI1)) endif @@ -810,21 +819,6 @@ endif endif -NEED_LIBPCI := $(call filter_deps,$(DEPENDS_ON_LIBPCI)) -ifneq ($(NEED_LIBPCI), ) -CHECK_LIBPCI = yes -FEATURE_CFLAGS += -D'NEED_PCI=1' -FEATURE_CFLAGS += $(call debug_shell,grep -q "OLD_PCI_GET_DEV := yes" .libdeps && printf "%s" "-D'OLD_PCI_GET_DEV=1'") - -PROGRAMMER_OBJS += pcidev.o -ifeq ($(TARGET_OS), NetBSD) -# The libpci we want is called libpciutils on NetBSD and needs NetBSD libpci. -PCILIBS += -lpciutils -lpci -else -PCILIBS += -lpci -endif -endif - USE_X86_MSR := $(if $(call filter_deps,$(DEPENDS_ON_X86_MSR)),yes,no) ifeq ($(USE_X86_MSR), yes) PROGRAMMER_OBJS += hwaccess_x86_msr.o @@ -853,6 +847,14 @@ override LDFLAGS += -l$(shell uname -m) endif +USE_LIBPCI := $(if $(call filter_deps,$(DEPENDS_ON_LIBPCI)),yes,no) +ifeq ($(USE_LIBPCI), yes) +PROGRAMMER_OBJS += pcidev.o +FEATURE_CFLAGS += -D'NEED_PCI=1' +override CFLAGS += $(CONFIG_LIBPCI_CFLAGS) +override LDFLAGS += $(CONFIG_LIBPCI_LDFLAGS) +endif + USE_LIBUSB1 := $(if $(call filter_deps,$(DEPENDS_ON_LIBUSB1)),yes,no) ifeq ($(USE_LIBUSB1), yes) override CFLAGS += $(CONFIG_LIBUSB1_CFLAGS) @@ -886,9 +888,6 @@ CLI_OBJS += print_wiki.o endif -# We could use PULLED_IN_LIBS, but that would be ugly. -FEATURE_LIBS += $(call debug_shell,grep -q "NEEDLIBZ := yes" .libdeps && printf "%s" "-lz") - ifeq ($(HAS_UTSNAME), yes) FEATURE_CFLAGS += -D'HAVE_UTSNAME=1' endif @@ -907,7 +906,7 @@ endif $(PROGRAM)$(EXEC_SUFFIX): $(OBJS) - $(CC) -o $(PROGRAM)$(EXEC_SUFFIX) $(OBJS) $(LDFLAGS) $(LIBS) $(PCILIBS) $(FEATURE_LIBS) + $(CC) -o $(PROGRAM)$(EXEC_SUFFIX) $(OBJS) $(LDFLAGS) $(LIBS) $(FEATURE_LIBS) libflashrom.a: $(LIBFLASHROM_OBJS) $(AR) rcs $@ $^ @@ -953,39 +952,12 @@ @if [ $(ENDIAN) = unknown ]; then echo Aborting.; exit 1; fi hwlibs: compiler - @printf "" > .libdeps -ifeq ($(CHECK_LIBPCI), yes) - @printf "Checking for libpci headers... " | tee -a $(BUILD_DETAILS_FILE) - @echo "$$LIBPCI_TEST" > .test.c - @printf "\nexec: %s\n" "$(CC) -c $(CPPFLAGS) $(CFLAGS) .test.c -o .test.o" >>$(BUILD_DETAILS_FILE) - @{ { { { { $(CC) -c $(CPPFLAGS) $(CFLAGS) .test.c -o .test.o >&2 && \ - echo "found." || { echo "not found."; echo; \ - echo "The following features require libpci: $(NEED_LIBPCI)."; \ - echo "Please install libpci headers or disable all features"; \ - echo "mentioned above by specifying make CONFIG_ENABLE_LIBPCI_PROGRAMMERS=no"; \ - echo "See README for more information."; echo; \ - rm -f .test.c .test.o; exit 1; }; } 2>>$(BUILD_DETAILS_FILE); echo $? >&3 ; } | tee -a $(BUILD_DETAILS_FILE) >&4; } 3>&1;} | { read rc ; exit ${rc}; } } 4>&1 - @printf "Checking version of pci_get_dev... " | tee -a $(BUILD_DETAILS_FILE) - @echo "$$PCI_GET_DEV_TEST" > .test.c - @printf "\nexec: %s\n" "$(CC) -c $(CPPFLAGS) $(CFLAGS) .test.c -o .test.o" >>$(BUILD_DETAILS_FILE) - @ { $(CC) -c $(CPPFLAGS) $(CFLAGS) .test.c -o .test.o >&2 && \ - ( echo "new version (including PCI domain parameter)."; echo "OLD_PCI_GET_DEV := no" >> .libdeps ) || \ - ( echo "old version (without PCI domain parameter)."; echo "OLD_PCI_GET_DEV := yes" >> .libdeps ) } 2>>$(BUILD_DETAILS_FILE) | tee -a $(BUILD_DETAILS_FILE) - @printf "Checking if libpci is present and sufficient... " | tee -a $(BUILD_DETAILS_FILE) - @printf "\nexec: %s\n" "$(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(PCILIBS)" >>$(BUILD_DETAILS_FILE) - @{ { { { $(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(PCILIBS) 2>>$(BUILD_DETAILS_FILE) >&2 && \ - echo "yes." || { echo "no."; \ - printf "Checking if libz+libpci are present and sufficient..." ; \ - { printf "\nexec: %s\n" "$(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(PCILIBS) -lz" >>$(BUILD_DETAILS_FILE) ; \ - $(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(PCILIBS) -lz >&2 && \ - echo "yes." && echo "NEEDLIBZ := yes" > .libdeps } || { echo "no."; echo; \ - echo "The following features require libpci: $(NEED_LIBPCI)."; \ - echo "Please install libpci (package pciutils) and/or libz or disable all features"; \ - echo "mentioned above by specifying make CONFIG_ENABLE_LIBPCI_PROGRAMMERS=no"; \ - echo "See README for more information."; echo; \ - rm -f .test.c .test.o .test$(EXEC_SUFFIX); exit 1; }; }; } 2>>$(BUILD_DETAILS_FILE); echo $? >&3 ; } | tee -a $(BUILD_DETAILS_FILE) >&4; } 3>&1;} | { read rc ; exit ${rc}; } } 4>&1 - @rm -f .test.c .test.o .test$(EXEC_SUFFIX) -endif + @echo Dependency libpci found: $(HAS_LIBPCI) + @if [ $(HAS_LIBPCI) = yes ]; then \ + echo " Checking for old \"pci_get_dev()\": $(HAS_PCI_OLD_GET_DEV)";\ + echo " CFLAGS: $(CONFIG_LIBPCI_CFLAGS)"; \ + echo " LDFLAGS: $(CONFIG_LIBPCI_LDFLAGS)"; \ + fi @echo Dependency libusb1 found: $(HAS_LIBUSB1) @if [ $(HAS_LIBUSB1) = yes ]; then \ echo " CFLAGS: $(CONFIG_LIBUSB1_CFLAGS)"; \ diff --git a/Makefile.d/pci_old_get_dev_test.c b/Makefile.d/pci_old_get_dev_test.c new file mode 100644 index 0000000..3223651 --- /dev/null +++ b/Makefile.d/pci_old_get_dev_test.c @@ -0,0 +1,17 @@ +/* Avoid a failing test due to libpci header symbol shadowing breakage */ +#define index shadow_workaround_index +#if !defined __NetBSD__ +#include <pci/pci.h> +#else +#include <pciutils/pci.h> +#endif +struct pci_access *pacc; +struct pci_dev *dev = {0}; +int main(int argc, char **argv) +{ + (void) argc; + (void) argv; + pacc = pci_alloc(); + dev = pci_get_dev(pacc, dev->bus, dev->dev, 1); + return 0; +} diff --git a/Makefile.include b/Makefile.include index 67eec52..a3abcad 100644 --- a/Makefile.include +++ b/Makefile.include @@ -51,43 +51,3 @@ define dependency_ldflags $(call debug_shell, $(if $(PKG_CONFIG_LIBDIR),PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR),) $(PKG_CONFIG) --libs $1 2>/dev/null) endef - -define LIBPCI_TEST -/* Avoid a failing test due to libpci header symbol shadowing breakage */ -#define index shadow_workaround_index -#if !defined __NetBSD__ -#include <pci/pci.h> -#else -#include <pciutils/pci.h> -#endif -struct pci_access *pacc; -int main(int argc, char **argv) -{ - (void) argc; - (void) argv; - pacc = pci_alloc(); - return 0; -} -endef -export LIBPCI_TEST - -define PCI_GET_DEV_TEST -/* Avoid a failing test due to libpci header symbol shadowing breakage */ -#define index shadow_workaround_index -#if !defined __NetBSD__ -#include <pci/pci.h> -#else -#include <pciutils/pci.h> -#endif -struct pci_access *pacc; -struct pci_dev *dev = {0}; -int main(int argc, char **argv) -{ - (void) argc; - (void) argv; - pacc = pci_alloc(); - dev = pci_get_dev(pacc, dev->domain, dev->bus, dev->dev, 1); - return 0; -} -endef -export PCI_GET_DEV_TEST 19 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://review.coreboot.org/c/flashrom/+/59050 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I21b4a261b34b7e688635fc6e20b7beebfa64c7ed Gerrit-Change-Number: 59050 Gerrit-PatchSet: 23 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: Makefile: replace RAW_ACCESS with RAW_MEM_ACCESS X86_MSR X86_PORT_IO
by Nico Huber (Code Review) 20 Jan '22

20 Jan '22

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/60325 ) Change subject: Makefile: replace RAW_ACCESS with RAW_MEM_ACCESS X86_MSR X86_PORT_IO ...................................................................... Makefile: replace RAW_ACCESS with RAW_MEM_ACCESS X86_MSR X86_PORT_IO Let programmer only depend on the kind of hardware access method they really need. Libpci no longer depends on all hardware access types since each programmer handles this individually. Change-Id: I5bdafaa3c5023ad6c4a695493eeddf11bc148085 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/60325 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> --- M Makefile M meson.build 2 files changed, 21 insertions(+), 22 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved diff --git a/Makefile b/Makefile index 6e2e33f..3325aa6 100644 --- a/Makefile +++ b/Makefile @@ -612,7 +612,6 @@ ifeq ($(CONFIG_RAYER_SPI), yes) FEATURE_CFLAGS += -D'CONFIG_RAYER_SPI=1' PROGRAMMER_OBJS += rayer_spi.o -NEED_RAW_ACCESS += CONFIG_RAYER_SPI endif ifeq ($(CONFIG_RAIDEN_DEBUG_SPI), yes) @@ -814,10 +813,6 @@ NEED_LIBPCI := $(call filter_deps,$(DEPENDS_ON_LIBPCI)) ifneq ($(NEED_LIBPCI), ) CHECK_LIBPCI = yes -# This is a dirty hack, but it saves us from checking all PCI drivers and all platforms manually. -# libpci may need raw memory, MSR or PCI port I/O on some platforms. -# Individual drivers might have the same needs as well. -NEED_RAW_ACCESS += $(NEED_LIBPCI) FEATURE_CFLAGS += -D'NEED_PCI=1' FEATURE_CFLAGS += $(call debug_shell,grep -q "OLD_PCI_GET_DEV := yes" .libdeps && printf "%s" "-D'OLD_PCI_GET_DEV=1'") @@ -830,27 +825,32 @@ endif endif -ifneq ($(NEED_RAW_ACCESS), ) -# Raw memory, MSR or PCI port I/O access. -FEATURE_CFLAGS += -D'NEED_RAW_ACCESS=1' -PROGRAMMER_OBJS += hwaccess_physmap.o +USE_X86_MSR := $(if $(call filter_deps,$(DEPENDS_ON_X86_MSR)),yes,no) +ifeq ($(USE_X86_MSR), yes) +PROGRAMMER_OBJS += hwaccess_x86_msr.o +endif -ifeq ($(ARCH), x86) +USE_X86_PORT_IO := $(if $(call filter_deps,$(DEPENDS_ON_X86_PORT_IO)),yes,no) +ifeq ($(USE_X86_PORT_IO), yes) FEATURE_CFLAGS += -D'__FLASHROM_HAVE_OUTB__=1' -PROGRAMMER_OBJS += hwaccess_x86_io.o hwaccess_x86_msr.o - -ifeq ($(TARGET_OS), NetBSD) -PCILIBS += -l$(shell uname -p) -endif -ifeq ($(TARGET_OS), OpenBSD) -PCILIBS += -l$(shell uname -m) -endif +PROGRAMMER_OBJS += hwaccess_x86_io.o endif -ifeq ($(TARGET_OS), Darwin) -# DirectHW framework can be found in the DirectHW library. -PCILIBS += -framework IOKit -framework DirectHW +USE_RAW_MEM_ACCESS := $(if $(call filter_deps,$(DEPENDS_ON_RAW_MEM_ACCESS)),yes,no) +ifeq ($(USE_RAW_MEM_ACCESS), yes) +PROGRAMMER_OBJS += hwaccess_physmap.o endif + +ifeq (Darwin yes, $(TARGET_OS) $(filter $(USE_X86_MSR) $(USE_X86_PORT_IO) $(USE_RAW_MEM_ACCESS), yes)) +override LDFLAGS += -framework IOKit -framework DirectHW +endif + +ifeq (NetBSD yes, $(TARGET_OS) $(filter $(USE_X86_MSR) $(USE_X86_PORT_IO), yes)) +override LDFLAGS += -l$(shell uname -p) +endif + +ifeq (OpenBSD yes, $(TARGET_OS) $(filter $(USE_X86_MSR) $(USE_X86_PORT_IO), yes)) +override LDFLAGS += -l$(shell uname -m) endif USE_LIBUSB1 := $(if $(call filter_deps,$(DEPENDS_ON_LIBUSB1)),yes,no) diff --git a/meson.build b/meson.build index 403a33e..4c33bf5 100644 --- a/meson.build +++ b/meson.build @@ -349,7 +349,6 @@ srcs += 'hwaccess_x86_io.c' srcs += 'hwaccess_x86_msr.c' srcs += 'hwaccess_physmap.c' - cargs += '-DNEED_RAW_ACCESS=1' cargs += '-D__FLASHROM_HAVE_OUTB__=1' endif 5 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://review.coreboot.org/c/flashrom/+/60325 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I5bdafaa3c5023ad6c4a695493eeddf11bc148085 Gerrit-Change-Number: 60325 Gerrit-PatchSet: 7 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: hwaccess: move mmio functions into hwaccess_physmap
by Nico Huber (Code Review) 20 Jan '22

20 Jan '22

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/61160 ) Change subject: hwaccess: move mmio functions into hwaccess_physmap ...................................................................... hwaccess: move mmio functions into hwaccess_physmap The mmio_le/be_read/writex functions are used for raw memory access. Bundle them with the physmap functions. Change-Id: I313062b078e89630c703038866ac93c651f0f49a Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/61160 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> --- M Makefile M atapromise.c M board_enable.c M chipset_enable.c M dmi.c M drkaiser.c M flashrom.c M gfxnvidia.c D hwaccess.c M hwaccess.h M hwaccess_physmap.c M hwaccess_physmap.h M ich_descriptors.c M ichspi.c M internal.c M it8212.c M it87spi.c M libflashrom.c M mcp6x_spi.c M meson.build M nicintel.c M nicintel_eeprom.c M nicintel_spi.c M ogp_spi.c M satamv.c M satasii.c M sb600spi.c M wbsio_spi.c 28 files changed, 249 insertions(+), 293 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved diff --git a/Makefile b/Makefile index b8287a9..6e2e33f 100644 --- a/Makefile +++ b/Makefile @@ -833,7 +833,7 @@ ifneq ($(NEED_RAW_ACCESS), ) # Raw memory, MSR or PCI port I/O access. FEATURE_CFLAGS += -D'NEED_RAW_ACCESS=1' -PROGRAMMER_OBJS += hwaccess.o hwaccess_physmap.o +PROGRAMMER_OBJS += hwaccess_physmap.o ifeq ($(ARCH), x86) FEATURE_CFLAGS += -D'__FLASHROM_HAVE_OUTB__=1' diff --git a/atapromise.c b/atapromise.c index fb3adcb..d781190 100644 --- a/atapromise.c +++ b/atapromise.c @@ -18,7 +18,6 @@ #include <stdlib.h> #include "flash.h" #include "programmer.h" -#include "hwaccess.h" #include "hwaccess_x86_io.h" #include "hwaccess_physmap.h" #include "platform/pci.h" diff --git a/board_enable.c b/board_enable.c index 445e354..c23e257 100644 --- a/board_enable.c +++ b/board_enable.c @@ -25,7 +25,6 @@ #include <stdlib.h> #include "flash.h" #include "programmer.h" -#include "hwaccess.h" #include "hwaccess_x86_io.h" #include "hwaccess_x86_msr.h" #include "platform/pci.h" diff --git a/chipset_enable.c b/chipset_enable.c index 02a93a8..d72300e 100644 --- a/chipset_enable.c +++ b/chipset_enable.c @@ -33,7 +33,6 @@ #include <errno.h> #include "flash.h" #include "programmer.h" -#include "hwaccess.h" #include "hwaccess_x86_io.h" #include "hwaccess_x86_msr.h" #include "hwaccess_physmap.h" diff --git a/dmi.c b/dmi.c index df918f9..16d350d 100644 --- a/dmi.c +++ b/dmi.c @@ -31,7 +31,6 @@ #include <stdlib.h> #include "flash.h" -#include "hwaccess.h" #include "hwaccess_physmap.h" #include "programmer.h" diff --git a/drkaiser.c b/drkaiser.c index 3738930..0849109 100644 --- a/drkaiser.c +++ b/drkaiser.c @@ -17,7 +17,6 @@ #include <stdlib.h> #include "flash.h" #include "programmer.h" -#include "hwaccess.h" #include "hwaccess_physmap.h" #include "platform/pci.h" diff --git a/flashrom.c b/flashrom.c index 73ebab5..bd34676 100644 --- a/flashrom.c +++ b/flashrom.c @@ -37,7 +37,6 @@ #include "flash.h" #include "flashchips.h" #include "programmer.h" -#include "hwaccess.h" #include "hwaccess_physmap.h" #include "chipdrivers.h" diff --git a/gfxnvidia.c b/gfxnvidia.c index 535467e..e5c07dd 100644 --- a/gfxnvidia.c +++ b/gfxnvidia.c @@ -18,7 +18,6 @@ #include <string.h> #include "flash.h" #include "programmer.h" -#include "hwaccess.h" #include "hwaccess_physmap.h" #include "platform/pci.h" diff --git a/hwaccess.c b/hwaccess.c deleted file mode 100644 index 4e8a274..0000000 --- a/hwaccess.c +++ /dev/null @@ -1,237 +0,0 @@ -/* - * This file is part of the flashrom project. - * - * Copyright (C) 2009,2010 Carl-Daniel Hailfinger - * - * 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; either version 2 of the License, or - * (at your option) any later version. - * - * 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. - */ - -#include <stdint.h> -#include <string.h> -#include <stdlib.h> -#include <errno.h> -#include <sys/types.h> -#if !defined (__DJGPP__) && !defined(__LIBPAYLOAD__) -/* No file access needed/possible to get hardware access permissions. */ -#include <unistd.h> -#include <fcntl.h> -#endif -#include "flash.h" -#include "hwaccess.h" - -/* Prevent reordering and/or merging of reads/writes to hardware. - * Such reordering and/or merging would break device accesses which depend on the exact access order. - */ -static inline void sync_primitive(void) -{ -/* This is not needed for... - * - x86: uses uncached accesses which have a strongly ordered memory model. - * - MIPS: uses uncached accesses in mode 2 on /dev/mem which has also a strongly ordered memory model. - * - ARM: uses a strongly ordered memory model for device memories. - * - * See also https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Docume… - */ -// cf. http://lxr.free-electrons.com/source/arch/powerpc/include/asm/barrier.h -#if defined(__powerpc) || defined(__powerpc__) || defined(__powerpc64__) || defined(__POWERPC__) || \ - defined(__ppc__) || defined(__ppc64__) || defined(_M_PPC) || defined(_ARCH_PPC) || \ - defined(_ARCH_PPC64) || defined(__ppc) - asm("eieio" : : : "memory"); -#elif (__sparc__) || defined (__sparc) -#if defined(__sparc_v9__) || defined(__sparcv9) - /* Sparc V9 CPUs support three different memory orderings that range from x86-like TSO to PowerPC-like - * RMO. The modes can be switched at runtime thus to make sure we maintain the right order of access we - * use the strongest hardware memory barriers that exist on Sparc V9. */ - asm volatile ("membar #Sync" ::: "memory"); -#elif defined(__sparc_v8__) || defined(__sparcv8) - /* On SPARC V8 there is no RMO just PSO and that does not apply to I/O accesses... but if V8 code is run - * on V9 CPUs it might apply... or not... we issue a write barrier anyway. That's the most suitable - * operation in the V8 instruction set anyway. If you know better then please tell us. */ - asm volatile ("stbar"); -#else - #error Unknown and/or unsupported SPARC instruction set version detected. -#endif -#endif -} - -void mmio_writeb(uint8_t val, void *addr) -{ - *(volatile uint8_t *) addr = val; - sync_primitive(); -} - -void mmio_writew(uint16_t val, void *addr) -{ - *(volatile uint16_t *) addr = val; - sync_primitive(); -} - -void mmio_writel(uint32_t val, void *addr) -{ - *(volatile uint32_t *) addr = val; - sync_primitive(); -} - -uint8_t mmio_readb(const void *addr) -{ - return *(volatile const uint8_t *) addr; -} - -uint16_t mmio_readw(const void *addr) -{ - return *(volatile const uint16_t *) addr; -} - -uint32_t mmio_readl(const void *addr) -{ - return *(volatile const uint32_t *) addr; -} - -void mmio_readn(const void *addr, uint8_t *buf, size_t len) -{ - memcpy(buf, addr, len); - return; -} - -void mmio_le_writeb(uint8_t val, void *addr) -{ - mmio_writeb(cpu_to_le8(val), addr); -} - -void mmio_le_writew(uint16_t val, void *addr) -{ - mmio_writew(cpu_to_le16(val), addr); -} - -void mmio_le_writel(uint32_t val, void *addr) -{ - mmio_writel(cpu_to_le32(val), addr); -} - -uint8_t mmio_le_readb(const void *addr) -{ - return le_to_cpu8(mmio_readb(addr)); -} - -uint16_t mmio_le_readw(const void *addr) -{ - return le_to_cpu16(mmio_readw(addr)); -} - -uint32_t mmio_le_readl(const void *addr) -{ - return le_to_cpu32(mmio_readl(addr)); -} - -enum mmio_write_type { - mmio_write_type_b, - mmio_write_type_w, - mmio_write_type_l, -}; - -struct undo_mmio_write_data { - void *addr; - int reg; - enum mmio_write_type type; - union { - uint8_t bdata; - uint16_t wdata; - uint32_t ldata; - }; -}; - -static int undo_mmio_write(void *p) -{ - struct undo_mmio_write_data *data = p; - msg_pdbg("Restoring MMIO space at %p\n", data->addr); - switch (data->type) { - case mmio_write_type_b: - mmio_writeb(data->bdata, data->addr); - break; - case mmio_write_type_w: - mmio_writew(data->wdata, data->addr); - break; - case mmio_write_type_l: - mmio_writel(data->ldata, data->addr); - break; - } - /* p was allocated in register_undo_mmio_write. */ - free(p); - return 0; -} - -#define register_undo_mmio_write(a, c) \ -{ \ - struct undo_mmio_write_data *undo_mmio_write_data; \ - undo_mmio_write_data = malloc(sizeof(*undo_mmio_write_data)); \ - if (!undo_mmio_write_data) { \ - msg_gerr("Out of memory!\n"); \ - exit(1); \ - } \ - undo_mmio_write_data->addr = a; \ - undo_mmio_write_data->type = mmio_write_type_##c; \ - undo_mmio_write_data->c##data = mmio_read##c(a); \ - register_shutdown(undo_mmio_write, undo_mmio_write_data); \ -} - -#define register_undo_mmio_writeb(a) register_undo_mmio_write(a, b) -#define register_undo_mmio_writew(a) register_undo_mmio_write(a, w) -#define register_undo_mmio_writel(a) register_undo_mmio_write(a, l) - -void rmmio_writeb(uint8_t val, void *addr) -{ - register_undo_mmio_writeb(addr); - mmio_writeb(val, addr); -} - -void rmmio_writew(uint16_t val, void *addr) -{ - register_undo_mmio_writew(addr); - mmio_writew(val, addr); -} - -void rmmio_writel(uint32_t val, void *addr) -{ - register_undo_mmio_writel(addr); - mmio_writel(val, addr); -} - -void rmmio_le_writeb(uint8_t val, void *addr) -{ - register_undo_mmio_writeb(addr); - mmio_le_writeb(val, addr); -} - -void rmmio_le_writew(uint16_t val, void *addr) -{ - register_undo_mmio_writew(addr); - mmio_le_writew(val, addr); -} - -void rmmio_le_writel(uint32_t val, void *addr) -{ - register_undo_mmio_writel(addr); - mmio_le_writel(val, addr); -} - -void rmmio_valb(void *addr) -{ - register_undo_mmio_writeb(addr); -} - -void rmmio_valw(void *addr) -{ - register_undo_mmio_writew(addr); -} - -void rmmio_vall(void *addr) -{ - register_undo_mmio_writel(addr); -} diff --git a/hwaccess.h b/hwaccess.h index d80e0e3..98ca08e 100644 --- a/hwaccess.h +++ b/hwaccess.h @@ -20,38 +20,6 @@ #ifndef __HWACCESS_H__ #define __HWACCESS_H__ 1 -void mmio_writeb(uint8_t val, void *addr); -void mmio_writew(uint16_t val, void *addr); -void mmio_writel(uint32_t val, void *addr); -uint8_t mmio_readb(const void *addr); -uint16_t mmio_readw(const void *addr); -uint32_t mmio_readl(const void *addr); -void mmio_readn(const void *addr, uint8_t *buf, size_t len); -void mmio_le_writeb(uint8_t val, void *addr); -void mmio_le_writew(uint16_t val, void *addr); -void mmio_le_writel(uint32_t val, void *addr); -uint8_t mmio_le_readb(const void *addr); -uint16_t mmio_le_readw(const void *addr); -uint32_t mmio_le_readl(const void *addr); -#define pci_mmio_writeb mmio_le_writeb -#define pci_mmio_writew mmio_le_writew -#define pci_mmio_writel mmio_le_writel -#define pci_mmio_readb mmio_le_readb -#define pci_mmio_readw mmio_le_readw -#define pci_mmio_readl mmio_le_readl -void rmmio_writeb(uint8_t val, void *addr); -void rmmio_writew(uint16_t val, void *addr); -void rmmio_writel(uint32_t val, void *addr); -void rmmio_le_writeb(uint8_t val, void *addr); -void rmmio_le_writew(uint16_t val, void *addr); -void rmmio_le_writel(uint32_t val, void *addr); -#define pci_rmmio_writeb rmmio_le_writeb -#define pci_rmmio_writew rmmio_le_writew -#define pci_rmmio_writel rmmio_le_writel -void rmmio_valb(void *addr); -void rmmio_valw(void *addr); -void rmmio_vall(void *addr); - #define ___constant_swab8(x) ((uint8_t) ( \ (((uint8_t)(x) & (uint8_t)0xffU)))) diff --git a/hwaccess_physmap.c b/hwaccess_physmap.c index dcc6ed7..b1b9c64 100644 --- a/hwaccess_physmap.c +++ b/hwaccess_physmap.c @@ -18,16 +18,20 @@ #include <unistd.h> #include <stdbool.h> +#include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <errno.h> #include "flash.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. */ +#include <unistd.h> #include <sys/stat.h> +#include <sys/types.h> #include <fcntl.h> #endif @@ -361,3 +365,212 @@ { return physmap_common(descr, phys_addr, len, PHYSM_RO, PHYSM_NOCLEANUP, PHYSM_EXACT); } + +/* Prevent reordering and/or merging of reads/writes to hardware. + * Such reordering and/or merging would break device accesses which depend on the exact access order. + */ +static inline void sync_primitive(void) +{ +/* This is not needed for... + * - x86: uses uncached accesses which have a strongly ordered memory model. + * - MIPS: uses uncached accesses in mode 2 on /dev/mem which has also a strongly ordered memory model. + * - ARM: uses a strongly ordered memory model for device memories. + * + * See also https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Docume… + */ +// cf. http://lxr.free-electrons.com/source/arch/powerpc/include/asm/barrier.h +#if defined(__powerpc) || defined(__powerpc__) || defined(__powerpc64__) || defined(__POWERPC__) || \ + defined(__ppc__) || defined(__ppc64__) || defined(_M_PPC) || defined(_ARCH_PPC) || \ + defined(_ARCH_PPC64) || defined(__ppc) + asm("eieio" : : : "memory"); +#elif (__sparc__) || defined (__sparc) +#if defined(__sparc_v9__) || defined(__sparcv9) + /* Sparc V9 CPUs support three different memory orderings that range from x86-like TSO to PowerPC-like + * RMO. The modes can be switched at runtime thus to make sure we maintain the right order of access we + * use the strongest hardware memory barriers that exist on Sparc V9. */ + asm volatile ("membar #Sync" ::: "memory"); +#elif defined(__sparc_v8__) || defined(__sparcv8) + /* On SPARC V8 there is no RMO just PSO and that does not apply to I/O accesses... but if V8 code is run + * on V9 CPUs it might apply... or not... we issue a write barrier anyway. That's the most suitable + * operation in the V8 instruction set anyway. If you know better then please tell us. */ + asm volatile ("stbar"); +#else + #error Unknown and/or unsupported SPARC instruction set version detected. +#endif +#endif +} + +void mmio_writeb(uint8_t val, void *addr) +{ + *(volatile uint8_t *) addr = val; + sync_primitive(); +} + +void mmio_writew(uint16_t val, void *addr) +{ + *(volatile uint16_t *) addr = val; + sync_primitive(); +} + +void mmio_writel(uint32_t val, void *addr) +{ + *(volatile uint32_t *) addr = val; + sync_primitive(); +} + +uint8_t mmio_readb(const void *addr) +{ + return *(volatile const uint8_t *) addr; +} + +uint16_t mmio_readw(const void *addr) +{ + return *(volatile const uint16_t *) addr; +} + +uint32_t mmio_readl(const void *addr) +{ + return *(volatile const uint32_t *) addr; +} + +void mmio_readn(const void *addr, uint8_t *buf, size_t len) +{ + memcpy(buf, addr, len); + return; +} + +void mmio_le_writeb(uint8_t val, void *addr) +{ + mmio_writeb(cpu_to_le8(val), addr); +} + +void mmio_le_writew(uint16_t val, void *addr) +{ + mmio_writew(cpu_to_le16(val), addr); +} + +void mmio_le_writel(uint32_t val, void *addr) +{ + mmio_writel(cpu_to_le32(val), addr); +} + +uint8_t mmio_le_readb(const void *addr) +{ + return le_to_cpu8(mmio_readb(addr)); +} + +uint16_t mmio_le_readw(const void *addr) +{ + return le_to_cpu16(mmio_readw(addr)); +} + +uint32_t mmio_le_readl(const void *addr) +{ + return le_to_cpu32(mmio_readl(addr)); +} + +enum mmio_write_type { + mmio_write_type_b, + mmio_write_type_w, + mmio_write_type_l, +}; + +struct undo_mmio_write_data { + void *addr; + int reg; + enum mmio_write_type type; + union { + uint8_t bdata; + uint16_t wdata; + uint32_t ldata; + }; +}; + +static int undo_mmio_write(void *p) +{ + struct undo_mmio_write_data *data = p; + msg_pdbg("Restoring MMIO space at %p\n", data->addr); + switch (data->type) { + case mmio_write_type_b: + mmio_writeb(data->bdata, data->addr); + break; + case mmio_write_type_w: + mmio_writew(data->wdata, data->addr); + break; + case mmio_write_type_l: + mmio_writel(data->ldata, data->addr); + break; + } + /* p was allocated in register_undo_mmio_write. */ + free(p); + return 0; +} + +#define register_undo_mmio_write(a, c) \ +{ \ + struct undo_mmio_write_data *undo_mmio_write_data; \ + undo_mmio_write_data = malloc(sizeof(*undo_mmio_write_data)); \ + if (!undo_mmio_write_data) { \ + msg_gerr("Out of memory!\n"); \ + exit(1); \ + } \ + undo_mmio_write_data->addr = a; \ + undo_mmio_write_data->type = mmio_write_type_##c; \ + undo_mmio_write_data->c##data = mmio_read##c(a); \ + register_shutdown(undo_mmio_write, undo_mmio_write_data); \ +} + +#define register_undo_mmio_writeb(a) register_undo_mmio_write(a, b) +#define register_undo_mmio_writew(a) register_undo_mmio_write(a, w) +#define register_undo_mmio_writel(a) register_undo_mmio_write(a, l) + +void rmmio_writeb(uint8_t val, void *addr) +{ + register_undo_mmio_writeb(addr); + mmio_writeb(val, addr); +} + +void rmmio_writew(uint16_t val, void *addr) +{ + register_undo_mmio_writew(addr); + mmio_writew(val, addr); +} + +void rmmio_writel(uint32_t val, void *addr) +{ + register_undo_mmio_writel(addr); + mmio_writel(val, addr); +} + +void rmmio_le_writeb(uint8_t val, void *addr) +{ + register_undo_mmio_writeb(addr); + mmio_le_writeb(val, addr); +} + +void rmmio_le_writew(uint16_t val, void *addr) +{ + register_undo_mmio_writew(addr); + mmio_le_writew(val, addr); +} + +void rmmio_le_writel(uint32_t val, void *addr) +{ + register_undo_mmio_writel(addr); + mmio_le_writel(val, addr); +} + +void rmmio_valb(void *addr) +{ + register_undo_mmio_writeb(addr); +} + +void rmmio_valw(void *addr) +{ + register_undo_mmio_writew(addr); +} + +void rmmio_vall(void *addr) +{ + register_undo_mmio_writel(addr); +} diff --git a/hwaccess_physmap.h b/hwaccess_physmap.h index eb3ddb8..a0a7e74 100644 --- a/hwaccess_physmap.h +++ b/hwaccess_physmap.h @@ -24,4 +24,36 @@ void physunmap(void *virt_addr, size_t len); void physunmap_unaligned(void *virt_addr, size_t len); +void mmio_writeb(uint8_t val, void *addr); +void mmio_writew(uint16_t val, void *addr); +void mmio_writel(uint32_t val, void *addr); +uint8_t mmio_readb(const void *addr); +uint16_t mmio_readw(const void *addr); +uint32_t mmio_readl(const void *addr); +void mmio_readn(const void *addr, uint8_t *buf, size_t len); +void mmio_le_writeb(uint8_t val, void *addr); +void mmio_le_writew(uint16_t val, void *addr); +void mmio_le_writel(uint32_t val, void *addr); +uint8_t mmio_le_readb(const void *addr); +uint16_t mmio_le_readw(const void *addr); +uint32_t mmio_le_readl(const void *addr); +#define pci_mmio_writeb mmio_le_writeb +#define pci_mmio_writew mmio_le_writew +#define pci_mmio_writel mmio_le_writel +#define pci_mmio_readb mmio_le_readb +#define pci_mmio_readw mmio_le_readw +#define pci_mmio_readl mmio_le_readl +void rmmio_writeb(uint8_t val, void *addr); +void rmmio_writew(uint16_t val, void *addr); +void rmmio_writel(uint32_t val, void *addr); +void rmmio_le_writeb(uint8_t val, void *addr); +void rmmio_le_writew(uint16_t val, void *addr); +void rmmio_le_writel(uint32_t val, void *addr); +#define pci_rmmio_writeb rmmio_le_writeb +#define pci_rmmio_writew rmmio_le_writew +#define pci_rmmio_writel rmmio_le_writel +void rmmio_valb(void *addr); +void rmmio_valw(void *addr); +void rmmio_vall(void *addr); + #endif /* __HWACCESS_PHYSMAP_H__ */ \ No newline at end of file diff --git a/ich_descriptors.c b/ich_descriptors.c index 56a3c67..2bff341 100644 --- a/ich_descriptors.c +++ b/ich_descriptors.c @@ -15,8 +15,8 @@ * GNU General Public License for more details. */ +#include "hwaccess_physmap.h" #include "ich_descriptors.h" -#include "hwaccess.h" #ifdef ICH_DESCRIPTORS_FROM_DUMP_ONLY #include <stdio.h> diff --git a/ichspi.c b/ichspi.c index 0bb6360..47b23eb 100644 --- a/ichspi.c +++ b/ichspi.c @@ -23,7 +23,6 @@ #include <stdlib.h> #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 f2f1fb1..bb606ca 100644 --- a/internal.c +++ b/internal.c @@ -19,7 +19,6 @@ #include <stdlib.h> #include "flash.h" #include "programmer.h" -#include "hwaccess.h" #include "hwaccess_x86_io.h" #include "hwaccess_physmap.h" #include "platform/pci.h" diff --git a/it8212.c b/it8212.c index ca82d9c..e57397a 100644 --- a/it8212.c +++ b/it8212.c @@ -17,7 +17,6 @@ #include <stdlib.h> #include "flash.h" #include "programmer.h" -#include "hwaccess.h" #include "hwaccess_physmap.h" #include "platform/pci.h" diff --git a/it87spi.c b/it87spi.c index 0944915..728ec70 100644 --- a/it87spi.c +++ b/it87spi.c @@ -25,7 +25,7 @@ #include "flash.h" #include "chipdrivers.h" #include "programmer.h" -#include "hwaccess.h" +#include "hwaccess_physmap.h" #include "hwaccess_x86_io.h" #include "spi.h" diff --git a/libflashrom.c b/libflashrom.c index 1ecf650..fb70934 100644 --- a/libflashrom.c +++ b/libflashrom.c @@ -29,7 +29,6 @@ #include "fmap.h" #include "programmer.h" #include "layout.h" -#include "hwaccess.h" #include "ich_descriptors.h" #include "libflashrom.h" diff --git a/mcp6x_spi.c b/mcp6x_spi.c index 2097cf4..81ef1b5 100644 --- a/mcp6x_spi.c +++ b/mcp6x_spi.c @@ -23,7 +23,6 @@ #include <ctype.h> #include "flash.h" #include "programmer.h" -#include "hwaccess.h" #include "hwaccess_physmap.h" #include "platform/pci.h" diff --git a/meson.build b/meson.build index b2e2d72..403a33e 100644 --- a/meson.build +++ b/meson.build @@ -346,7 +346,6 @@ # raw memory, MSR or PCI port I/O access if need_raw_access - srcs += 'hwaccess.c' srcs += 'hwaccess_x86_io.c' srcs += 'hwaccess_x86_msr.c' srcs += 'hwaccess_physmap.c' diff --git a/nicintel.c b/nicintel.c index c8a8789..fdc4eba 100644 --- a/nicintel.c +++ b/nicintel.c @@ -18,7 +18,6 @@ #include <stdlib.h> #include "flash.h" #include "programmer.h" -#include "hwaccess.h" #include "hwaccess_physmap.h" #include "platform/pci.h" diff --git a/nicintel_eeprom.c b/nicintel_eeprom.c index ea0e768..af5fa21 100644 --- a/nicintel_eeprom.c +++ b/nicintel_eeprom.c @@ -34,7 +34,6 @@ #include "flash.h" #include "spi.h" #include "programmer.h" -#include "hwaccess.h" #include "hwaccess_physmap.h" #include "platform/pci.h" diff --git a/nicintel_spi.c b/nicintel_spi.c index 004af66..1f1dcff 100644 --- a/nicintel_spi.c +++ b/nicintel_spi.c @@ -34,7 +34,6 @@ #include <unistd.h> #include "flash.h" #include "programmer.h" -#include "hwaccess.h" #include "hwaccess_physmap.h" #include "platform/pci.h" diff --git a/ogp_spi.c b/ogp_spi.c index 830cfe7..bc0d739 100644 --- a/ogp_spi.c +++ b/ogp_spi.c @@ -18,7 +18,6 @@ #include <string.h> #include "flash.h" #include "programmer.h" -#include "hwaccess.h" #include "hwaccess_physmap.h" #include "platform/pci.h" diff --git a/satamv.c b/satamv.c index e7c4305..445b2c8 100644 --- a/satamv.c +++ b/satamv.c @@ -19,7 +19,6 @@ #include <stdlib.h> #include "flash.h" #include "programmer.h" -#include "hwaccess.h" #include "hwaccess_x86_io.h" #include "hwaccess_physmap.h" #include "platform/pci.h" diff --git a/satasii.c b/satasii.c index a27fc29..3ee5556 100644 --- a/satasii.c +++ b/satasii.c @@ -17,7 +17,6 @@ /* Datasheets can be found on http://www.siliconimage.com. Great thanks! */ #include "programmer.h" -#include "hwaccess.h" #include "hwaccess_physmap.h" #include "platform/pci.h" diff --git a/sb600spi.c b/sb600spi.c index 32a7420..eb54028 100644 --- a/sb600spi.c +++ b/sb600spi.c @@ -22,7 +22,6 @@ #include <stdlib.h> #include "flash.h" #include "programmer.h" -#include "hwaccess.h" #include "hwaccess_physmap.h" #include "spi.h" #include "platform/pci.h" diff --git a/wbsio_spi.c b/wbsio_spi.c index 805abf7..2794491 100644 --- a/wbsio_spi.c +++ b/wbsio_spi.c @@ -19,7 +19,7 @@ #include "flash.h" #include "chipdrivers.h" #include "programmer.h" -#include "hwaccess.h" +#include "hwaccess_physmap.h" #include "hwaccess_x86_io.h" #include "spi.h" -- To view, visit https://review.coreboot.org/c/flashrom/+/61160 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I313062b078e89630c703038866ac93c651f0f49a Gerrit-Change-Number: 61160 Gerrit-PatchSet: 2 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: meson: replace target_machine by host_machine
by Felix Singer (Code Review) 20 Jan '22

20 Jan '22

Attention is currently required from: Thomas Heijligen. Felix Singer has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/61197 ) Change subject: meson: replace target_machine by host_machine ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/61197 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I4a32c73052c3707607738c72256fb4366a2bf8ce Gerrit-Change-Number: 61197 Gerrit-PatchSet: 2 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Comment-Date: Thu, 20 Jan 2022 15:35:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit January 2022