February 2016 - flashrom - mail.coreboot.org

[PATCH] Allow global disable of all drivers requiring libusb* or libpci
by Carl-Daniel Hailfinger Feb. 20, 2016

Feb. 20, 2016

Usage: CONFIG_DISABLE_LIBUSB0_PROGRAMMERS=yes CONFIG_DISABLE_LIBUSB1_PROGRAMMERS=yes CONFIG_DISABLE_LIBPCI_PROGRAMMERS=yes Side note: This patch includes the patch to separate out raw access requirements from libpci requirements. If acked, I will commit separately. See [PATCH] Do not require PCI code for RayeR SPI driver for a changelog of that feature. Caveat: The following command line explodes based on moon phase and I have no idea why: make -j CONFIG_EVERYTHING=yes CONFIG_DISABLE_LIBUSB0_PROGRAMMERS=yes CONFIG_DISABLE_LIBUSB1_PROGRAMMERS=yes CONFIG_DISABLE_LIBPCI_PROGRAMMERS=yes Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-libpci_libusb_global_disable/Makefile =================================================================== --- flashrom-libpci_libusb_global_disable/Makefile (Revision 1926) +++ flashrom-libpci_libusb_global_disable/Makefile (Arbeitskopie) @@ -528,6 +528,34 @@ $(eval $(var)=yes))) endif +# Disable feature groups +ifeq ($(CONFIG_DISABLE_LIBUSB0_PROGRAMMERS), yes) +override CONFIG_PICKIT2_SPI = no +override CONFIG_DEDIPROG = no +endif +ifeq ($(CONFIG_DISABLE_LIBUSB1_PROGRAMMERS), yes) +override CONFIG_CH341A_SPI = no +override CONFIG_DEDIPROG = no +endif +ifeq ($(CONFIG_DISABLE_LIBPCI_PROGRAMMERS), yes) +override CONFIG_INTERNAL = no +override CONFIG_NIC3COM = no +override CONFIG_GFXNVIDIA = no +override CONFIG_SATASII = no +override CONFIG_ATAHPT = no +override CONFIG_ATAVIA = no +override CONFIG_ATAPROMISE = no +override CONFIG_IT8212 = no +override CONFIG_DRKAISER = no +override CONFIG_NICREALTEK = no +override CONFIG_NICNATSEMI = no +override CONFIG_NICINTEL = no +override CONFIG_NICINTEL_SPI = no +override CONFIG_NICINTEL_EEPROM = no +override CONFIG_OGP_SPI = no +override CONFIG_SATAMV = no +endif + # Bitbanging SPI infrastructure, default off unless needed. ifeq ($(CONFIG_RAYER_SPI), yes) override CONFIG_BITBANG_SPI = yes @@ -599,8 +627,7 @@ ifeq ($(CONFIG_RAYER_SPI), yes) FEATURE_CFLAGS += -D'CONFIG_RAYER_SPI=1' PROGRAMMER_OBJS += rayer_spi.o -# Actually, NEED_LIBPCI is wrong. NEED_IOPORT_ACCESS would be more correct. -NEED_LIBPCI += CONFIG_RAYER_SPI +NEED_RAW_ACCESS += CONFIG_RAYER_SPI endif ifeq ($(CONFIG_PONY_SPI), yes) @@ -782,10 +809,14 @@ 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'") -PROGRAMMER_OBJS += pcidev.o physmap.o hwaccess.o +PROGRAMMER_OBJS += pcidev.o ifeq ($(TARGET_OS), NetBSD) # The libpci we want is called libpciutils on NetBSD and needs NetBSD libpci. PCILIBS += -lpciutils -lpci @@ -807,6 +838,11 @@ endif endif +ifneq ($(NEED_RAW_ACCESS), ) +FEATURE_CFLAGS += -D'NEED_RAW_ACCESS=1' +PROGRAMMER_OBJS += physmap.o hwaccess.o +endif + ifneq ($(NEED_LIBUSB0), ) CHECK_LIBUSB0 = yes FEATURE_CFLAGS += -D'NEED_LIBUSB0=1' @@ -992,7 +1028,8 @@ @{ { { { { $(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."; \ + echo "Please install libpci headers or disable all features"; \ + echo "mentioned above by specifying make CONFIG_DISABLE_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) @@ -1010,7 +1047,8 @@ $(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."; \ + echo "Please install libpci (package pciutils) and/or libz or disable all features"; \ + echo "mentioned above by specifying make CONFIG_DISABLE_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) @@ -1022,7 +1060,8 @@ @{ { { { { $(CC) -c $(CPPFLAGS) $(CFLAGS) .test.c -o .test.o >&2 && \ echo "found." || { echo "not found."; echo; \ echo "The following features require libusb-0.1/libusb-compat: $(NEED_LIBUSB0)."; \ - echo "Please install libusb-0.1 headers or libusb-compat headers."; \ + echo "Please install libusb-0.1 headers or libusb-compat headers or disable all features"; \ + echo "mentioned above by specifying make CONFIG_DISABLE_LIBUSB0_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 if libusb-0.1 is usable... " | tee -a $(BUILD_DETAILS_FILE) @@ -1030,7 +1069,8 @@ @{ { { { { $(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(USBLIBS) >&2 && \ echo "yes." || { echo "no."; \ echo "The following features require libusb-0.1/libusb-compat: $(NEED_LIBUSB0)."; \ - echo "Please install libusb-0.1 or libusb-compat."; \ + echo "Please install libusb-0.1 or libusb-compat or disable all features"; \ + echo "mentioned above by specifying make CONFIG_DISABLE_LIBUSB0_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) @@ -1042,7 +1082,8 @@ @{ { { { { $(CC) -c $(CPPFLAGS) $(CFLAGS) .test.c -o .test.o >&2 && \ echo "found." || { echo "not found."; echo; \ echo "The following features require libusb-1.0: $(NEED_LIBUSB1)."; \ - echo "Please install libusb-1.0 headers."; \ + echo "Please install libusb-1.0 headers or disable all features"; \ + echo "mentioned above by specifying make CONFIG_DISABLE_LIBUSB1_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 if libusb-1.0 is usable... " | tee -a $(BUILD_DETAILS_FILE) @@ -1050,7 +1091,8 @@ @{ { { { { $(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(USB1LIBS) >&2 && \ echo "yes." || { echo "no."; \ echo "The following features require libusb-1.0: $(NEED_LIBUSB1)."; \ - echo "Please install libusb-1.0."; \ + echo "Please install libusb-1.0 or disable all features"; \ + echo "mentioned above by specifying make CONFIG_DISABLE_LIBUSB1_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) Index: flashrom-libpci_libusb_global_disable/hwaccess.h =================================================================== --- flashrom-libpci_libusb_global_disable/hwaccess.h (Revision 1926) +++ flashrom-libpci_libusb_global_disable/hwaccess.h (Arbeitskopie) @@ -196,7 +196,7 @@ #define le_to_cpu32 cpu_to_le32 #define le_to_cpu64 cpu_to_le64 -#if NEED_PCI == 1 +#if NEED_RAW_ACCESS == 1 #if IS_X86 /* sys/io.h provides iopl(2) and x86 I/O port access functions (inb, outb etc). @@ -376,6 +376,6 @@ #error Unknown architecture, please check if it supports PCI port IO. #endif /* IS_* */ -#endif /* NEED_PCI == 1 */ +#endif /* NEED_RAW_ACCESS == 1 */ #endif /* !__HWACCESS_H__ */

2 5

[commit] r1936 - trunk
by repository service Feb. 20, 2016

Feb. 20, 2016

Author: hailfinger Date: Sat Feb 20 23:28:16 2016 New Revision: 1936 URL: http://flashrom.org/trac/flashrom/changeset/1936 Log: Allow global disable of all drivers requiring libusb* or libpci This is especially helpful for compile tests with CONFIG_EVERYTHING=yes, but can also be used without CONFIG_EVERYTHING. Usage: make CONFIG_ENABLE_LIBUSB0_PROGRAMMERS=no CONFIG_ENABLE_LIBUSB1_PROGRAMMERS=no CONFIG_ENABLE_LIBPCI_PROGRAMMERS=no Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Sat Feb 20 23:04:39 2016 (r1935) +++ trunk/Makefile Sat Feb 20 23:28:16 2016 (r1936) @@ -542,6 +542,33 @@ $(eval $(var)=yes))) endif +# Disable feature groups +ifeq ($(CONFIG_ENABLE_LIBUSB0_PROGRAMMERS), no) +override CONFIG_PICKIT2_SPI = no +endif +ifeq ($(CONFIG_ENABLE_LIBUSB1_PROGRAMMERS), no) +override CONFIG_CH341A_SPI = no +override CONFIG_DEDIPROG = no +endif +ifeq ($(CONFIG_ENABLE_LIBPCI_PROGRAMMERS), no) +override CONFIG_INTERNAL = no +override CONFIG_NIC3COM = no +override CONFIG_GFXNVIDIA = no +override CONFIG_SATASII = no +override CONFIG_ATAHPT = no +override CONFIG_ATAVIA = no +override CONFIG_ATAPROMISE = no +override CONFIG_IT8212 = no +override CONFIG_DRKAISER = no +override CONFIG_NICREALTEK = no +override CONFIG_NICNATSEMI = no +override CONFIG_NICINTEL = no +override CONFIG_NICINTEL_SPI = no +override CONFIG_NICINTEL_EEPROM = no +override CONFIG_OGP_SPI = no +override CONFIG_SATAMV = no +endif + # Bitbanging SPI infrastructure, default off unless needed. ifeq ($(CONFIG_RAYER_SPI), yes) override CONFIG_BITBANG_SPI = yes @@ -1018,7 +1045,8 @@ @{ { { { { $(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."; \ + 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) @@ -1036,7 +1064,8 @@ $(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."; \ + 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) @@ -1048,7 +1077,8 @@ @{ { { { { $(CC) -c $(CPPFLAGS) $(CFLAGS) .test.c -o .test.o >&2 && \ echo "found." || { echo "not found."; echo; \ echo "The following features require libusb-0.1/libusb-compat: $(NEED_LIBUSB0)."; \ - echo "Please install libusb-0.1 headers or libusb-compat headers."; \ + echo "Please install libusb-0.1 headers or libusb-compat headers or disable all features"; \ + echo "mentioned above by specifying make CONFIG_ENABLE_LIBUSB0_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 if libusb-0.1 is usable... " | tee -a $(BUILD_DETAILS_FILE) @@ -1056,7 +1086,8 @@ @{ { { { { $(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(USBLIBS) >&2 && \ echo "yes." || { echo "no."; \ echo "The following features require libusb-0.1/libusb-compat: $(NEED_LIBUSB0)."; \ - echo "Please install libusb-0.1 or libusb-compat."; \ + echo "Please install libusb-0.1 or libusb-compat or disable all features"; \ + echo "mentioned above by specifying make CONFIG_ENABLE_LIBUSB0_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) @@ -1068,7 +1099,8 @@ @{ { { { { $(CC) -c $(CPPFLAGS) $(CFLAGS) .test.c -o .test.o >&2 && \ echo "found." || { echo "not found."; echo; \ echo "The following features require libusb-1.0: $(NEED_LIBUSB1)."; \ - echo "Please install libusb-1.0 headers."; \ + echo "Please install libusb-1.0 headers or disable all features"; \ + echo "mentioned above by specifying make CONFIG_ENABLE_LIBUSB1_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 if libusb-1.0 is usable... " | tee -a $(BUILD_DETAILS_FILE) @@ -1076,7 +1108,8 @@ @{ { { { { $(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(USB1LIBS) >&2 && \ echo "yes." || { echo "no."; \ echo "The following features require libusb-1.0: $(NEED_LIBUSB1)."; \ - echo "Please install libusb-1.0."; \ + echo "Please install libusb-1.0 or disable all features"; \ + echo "mentioned above by specifying make CONFIG_ENABLE_LIBUSB1_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)

1 0

[PATCH] Automatically disable atapromise on non-x86
by Carl-Daniel Hailfinger Feb. 20, 2016

Feb. 20, 2016

We do not support PCI port I/O on non-x86 (yet). Atapromise needs PCI port I/O. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-atapromise_x86_only/Makefile =================================================================== --- flashrom-atapromise_x86_only/Makefile (Revision 1933) +++ flashrom-atapromise_x86_only/Makefile (Arbeitskopie) @@ -387,6 +387,11 @@ else override CONFIG_ATAHPT = no endif +ifeq ($(CONFIG_ATAPROMISE), yes) +UNSUPPORTED_FEATURES += CONFIG_ATAPROMISE=yes +else +override CONFIG_ATAPROMISE = no +endif ifeq ($(CONFIG_SATAMV), yes) UNSUPPORTED_FEATURES += CONFIG_SATAMV=yes else

2 2

[commit] r1935 - trunk
by repository service Feb. 20, 2016

Feb. 20, 2016

Author: hailfinger Date: Sat Feb 20 23:04:39 2016 New Revision: 1935 URL: http://flashrom.org/trac/flashrom/changeset/1935 Log: Automatically disable atapromise on non-x86 We do not support PCI port I/O on non-x86 (yet). Atapromise needs PCI port I/O. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Sat Feb 20 22:43:56 2016 (r1934) +++ trunk/Makefile Sat Feb 20 23:04:39 2016 (r1935) @@ -396,6 +396,11 @@ else override CONFIG_ATAHPT = no endif +ifeq ($(CONFIG_ATAPROMISE), yes) +UNSUPPORTED_FEATURES += CONFIG_ATAPROMISE=yes +else +override CONFIG_ATAPROMISE = no +endif ifeq ($(CONFIG_SATAMV), yes) UNSUPPORTED_FEATURES += CONFIG_SATAMV=yes else

1 0

[PATCH] Do not require PCI code for RayeR SPI driver
by Carl-Daniel Hailfinger Feb. 20, 2016

Feb. 20, 2016

This patch depends on Re: [flashrom] [PATCH] List affected features for missing libraries CONFIG_RAYER_SPI only needs raw hardware access, but not libpci. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> diff -ur flashrom-libpci_libusb_report_requirements/hwaccess.h flashrom-rayer_do_not_require_libpci/hwaccess.h --- flashrom-libpci_libusb_report_requirements/hwaccess.h 2016-02-17 00:26:07.221475948 +0100 +++ flashrom-rayer_do_not_require_libpci/hwaccess.h 2016-02-17 01:09:53.270497512 +0100 @@ -196,7 +196,7 @@ #define le_to_cpu32 cpu_to_le32 #define le_to_cpu64 cpu_to_le64 -#if NEED_PCI == 1 +#if NEED_RAW_ACCESS == 1 #if IS_X86 /* sys/io.h provides iopl(2) and x86 I/O port access functions (inb, outb etc). @@ -376,6 +376,6 @@ #error Unknown architecture, please check if it supports PCI port IO. #endif /* IS_* */ -#endif /* NEED_PCI == 1 */ +#endif /* NEED_RAW_ACCESS == 1 */ #endif /* !__HWACCESS_H__ */ diff -ur flashrom-libpci_libusb_report_requirements/Makefile flashrom-rayer_do_not_require_libpci/Makefile --- flashrom-libpci_libusb_report_requirements/Makefile 2016-02-17 00:26:37.497626067 +0100 +++ flashrom-rayer_do_not_require_libpci/Makefile 2016-02-17 00:52:46.457405821 +0100 @@ -599,8 +599,7 @@ ifeq ($(CONFIG_RAYER_SPI), yes) FEATURE_CFLAGS += -D'CONFIG_RAYER_SPI=1' PROGRAMMER_OBJS += rayer_spi.o -# Actually, NEED_LIBPCI is wrong. NEED_IOPORT_ACCESS would be more correct. -NEED_LIBPCI += CONFIG_RAYER_SPI +NEED_RAW_ACCESS += CONFIG_RAYER_SPI endif ifeq ($(CONFIG_PONY_SPI), yes) @@ -782,10 +781,14 @@ 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'") -PROGRAMMER_OBJS += pcidev.o physmap.o hwaccess.o +PROGRAMMER_OBJS += pcidev.o ifeq ($(TARGET_OS), NetBSD) # The libpci we want is called libpciutils on NetBSD and needs NetBSD libpci. PCILIBS += -lpciutils -lpci @@ -807,6 +810,11 @@ endif endif +ifneq ($(NEED_RAW_ACCESS), ) +FEATURE_CFLAGS += -D'NEED_RAW_ACCESS=1' +PROGRAMMER_OBJS += physmap.o hwaccess.o +endif + ifneq ($(NEED_LIBUSB0), ) CHECK_LIBUSB0 = yes FEATURE_CFLAGS += -D'NEED_LIBUSB0=1'

2 7

[commit] r1934 - trunk
by repository service Feb. 20, 2016

Feb. 20, 2016

Author: hailfinger Date: Sat Feb 20 22:43:56 2016 New Revision: 1934 URL: http://flashrom.org/trac/flashrom/changeset/1934 Log: Do not require PCI code for RayeR SPI driver CONFIG_RAYER_SPI only needs raw hardware access, but not libpci. Disable CONFIG_RAYER_SPI on Android because of missing inb/outb. Introduce NEED_RAW_ACCESS for raw memory access, PCI port I/O and MSR access. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Modified: trunk/Makefile trunk/hwaccess.h Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Sat Feb 20 21:53:46 2016 (r1933) +++ trunk/Makefile Sat Feb 20 22:43:56 2016 (r1934) @@ -349,6 +349,15 @@ endif endif +ifeq ($(TARGET_OS), Android) +# Android on x86 (currently) does not provide raw PCI port I/O operations +ifeq ($(CONFIG_RAYER_SPI), yes) +UNSUPPORTED_FEATURES += CONFIG_RAYER_SPI=yes +else +override CONFIG_RAYER_SPI = no +endif +endif + ############################################################################### # General architecture-specific settings. # Like above for the OS, below we verify user-supplied options depending on the target architecture. @@ -599,8 +608,7 @@ ifeq ($(CONFIG_RAYER_SPI), yes) FEATURE_CFLAGS += -D'CONFIG_RAYER_SPI=1' PROGRAMMER_OBJS += rayer_spi.o -# Actually, NEED_LIBPCI is wrong. NEED_IOPORT_ACCESS would be more correct. -NEED_LIBPCI += CONFIG_RAYER_SPI +NEED_RAW_ACCESS += CONFIG_RAYER_SPI endif ifeq ($(CONFIG_PONY_SPI), yes) @@ -782,19 +790,31 @@ 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'") -PROGRAMMER_OBJS += pcidev.o physmap.o hwaccess.o +PROGRAMMER_OBJS += pcidev.o ifeq ($(TARGET_OS), NetBSD) # The libpci we want is called libpciutils on NetBSD and needs NetBSD libpci. PCILIBS += -lpciutils -lpci -# For (i386|x86_64)_iopl(2). -PCILIBS += -l$(shell uname -p) else - PCILIBS += -lpci +endif +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 + +ifeq ($(TARGET_OS), NetBSD) +# For (i386|x86_64)_iopl(2). +PCILIBS += -l$(shell uname -p) +else ifeq ($(TARGET_OS), OpenBSD) # For (i386|amd64)_iopl(2). PCILIBS += -l$(shell uname -m) @@ -805,6 +825,7 @@ endif endif endif + endif ifneq ($(NEED_LIBUSB0), ) Modified: trunk/hwaccess.h ============================================================================== --- trunk/hwaccess.h Sat Feb 20 21:53:46 2016 (r1933) +++ trunk/hwaccess.h Sat Feb 20 22:43:56 2016 (r1934) @@ -196,7 +196,7 @@ #define le_to_cpu32 cpu_to_le32 #define le_to_cpu64 cpu_to_le64 -#if NEED_PCI == 1 +#if NEED_RAW_ACCESS == 1 #if IS_X86 /* sys/io.h provides iopl(2) and x86 I/O port access functions (inb, outb etc). @@ -230,6 +230,7 @@ * out[bwl] definitions in machine/cpufunc.h and sys/io.h at least in some * versions. Use machine/cpufunc.h only for plain FreeBSD/DragonFlyBSD. */ + #include <sys/types.h> #include <machine/cpufunc.h> #define OUTB(x, y) do { u_int outb_tmp = (y); outb(outb_tmp, (x)); } while (0) #define OUTW(x, y) do { u_int outw_tmp = (y); outw(outw_tmp, (x)); } while (0) @@ -382,6 +383,6 @@ #error Unknown architecture, please check if it supports PCI port IO. #endif /* IS_* */ -#endif /* NEED_PCI == 1 */ +#endif /* NEED_RAW_ACCESS == 1 */ #endif /* !__HWACCESS_H__ */

1 0

Re: [flashrom] [PATCH] dediprog: tremendously improve performance on SF600 by ignoring the spec.
by Stefan Tauner Feb. 20, 2016

Feb. 20, 2016

On Sat, 20 Feb 2016 01:02:57 +0100 Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> wrote: > The solution was discovered in a collaborative bug hunt with testing done by > David Hendricks. The actual culprit was found by Urja Rannikko by comparing > my patch for vanilla flashrom with David's version in chromiumos. > > Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Essentially this was tested already yesternight by David therefore I self-acked and committed it in r1933. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

[commit] r1933 - trunk
by repository service Feb. 20, 2016

Feb. 20, 2016

Author: stefanct Date: Sat Feb 20 21:53:46 2016 New Revision: 1933 URL: http://flashrom.org/trac/flashrom/changeset/1933 Log: dediprog: tremendously improve performance on SF600 by ignoring the spec. The solution was discovered in a collaborative bug hunt with testing done by David Hendricks. The actual culprit was found by Urja Rannikko by comparing vanilla flashrom with David's version in chromiumos. Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Tested-by: David Hendricks <dhendrix(a)chromium.org> Acked-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Modified: trunk/dediprog.c Modified: trunk/dediprog.c ============================================================================== --- trunk/dediprog.c Sat Feb 20 21:21:58 2016 (r1932) +++ trunk/dediprog.c Sat Feb 20 21:53:46 2016 (r1933) @@ -694,6 +694,14 @@ if (readcnt == 0) // If we don't require a response, we are done here return 0; + /* The specifications do state the possibility to set a timeout for transceive transactions. + * Apparently the "timeout" is a delay, and you can use long delays to accelerate writing - in case you + * can predict the time needed by the previous command or so (untested). In any case, using this + * "feature" to set sane-looking timouts for the read below will completely trash performance with + * SF600 and/or firmwares >= 6.0 while they seem to be benign on SF100 with firmwares <= 5.5.2. *shrug* + * + * The specification also uses only 0 in its examples, so the lesson to learn here: + * "Never trust the description of an interface in the documentation but use the example code and pray." const uint8_t read_timeout = 10 + readcnt/512; if (is_new_prot()) { idx = 0; @@ -703,6 +711,8 @@ value = min(read_timeout, 0xFF); // Possibly two bytes but we play safe here } ret = dediprog_read(CMD_TRANSCEIVE, value, idx, readarr, readcnt); + */ + ret = dediprog_read(CMD_TRANSCEIVE, 0, 0, readarr, readcnt); if (ret != readcnt) { msg_perr("Receive SPI failed, expected %i, got %i %s!\n", readcnt, ret, libusb_error_name(ret)); return 1;

1 0

Re: [flashrom] [PATCH] Include sys/glibc-syscalls.h instead of inexistent sys/io.h on Android.
by Carl-Daniel Hailfinger Feb. 20, 2016

Feb. 20, 2016

On 20.02.2016 11:23, Stefan Tauner wrote: > This won't make raw I/O work magically but at least it would provide iopl() > if some driver requires it and there is no better alternative currently. > > Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> > --- > hwaccess.h | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/hwaccess.h b/hwaccess.h > index 29a29b0..f1ad807 100644 > --- a/hwaccess.h > +++ b/hwaccess.h > @@ -203,8 +203,14 @@ cpu_to_be(64) > > /* sys/io.h provides iopl(2) and x86 I/O port access functions (inb, outb etc). > * It is included in glibc (thus available also on debian/kFreeBSD) but also in other libcs that mimic glibc, > - * e.g. musl and uclibc. */ > -#if defined(__linux__) || defined(__GLIBC__) > + * e.g. musl and uclibc. Because we cannot detect the clib or existence of the header or of the instructions Please use "libc" instead of "clib". > + * themselves safely in here we need some heuristic below: > + * On Android we don't have the header and no way for I/O port access at all. However, sys/glibc-syscalls.h > + * refers to an iopl implementation and we therefore include at least that one for now. On non-Android we assume > + * that a Linux system's libc has a suitable sys/io.h or we depend on glibc to offer it. */ > +#if defined(__ANDROID__) > +#include <sys/glibc-syscalls.h> > +#elif defined(__linux__) || defined(__GLIBC__) > #include <sys/io.h> > #endif > Apart from the comment above, this is Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Regards, Carl-Daniel

2 1

[commit] r1932 - trunk
by repository service Feb. 20, 2016

Feb. 20, 2016

Author: stefanct Date: Sat Feb 20 21:21:58 2016 New Revision: 1932 URL: http://flashrom.org/trac/flashrom/changeset/1932 Log: Include sys/glibc-syscalls.h instead of inexistent sys/io.h on Android. This won't make raw I/O work magically but at least it would provide iopl() if some driver requires it and there is no better alternative currently. Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/hwaccess.h Modified: trunk/hwaccess.h ============================================================================== --- trunk/hwaccess.h Fri Feb 19 09:17:24 2016 (r1931) +++ trunk/hwaccess.h Sat Feb 20 21:21:58 2016 (r1932) @@ -201,8 +201,14 @@ /* sys/io.h provides iopl(2) and x86 I/O port access functions (inb, outb etc). * It is included in glibc (thus available also on debian/kFreeBSD) but also in other libcs that mimic glibc, - * e.g. musl and uclibc. */ -#if defined(__linux__) || defined(__GLIBC__) + * e.g. musl and uclibc. Because we cannot detect the libc or existence of the header or of the instructions + * themselves safely in here we use some heuristic below: + * On Android we don't have the header file and no way for I/O port access at all. However, sys/glibc-syscalls.h + * refers to an iopl implementation and we therefore include at least that one for now. On non-Android we assume + * that a Linux system's libc has a suitable sys/io.h or (on non-Linux) we depend on glibc to offer it. */ +#if defined(__ANDROID__) +#include <sys/glibc-syscalls.h> +#elif defined(__linux__) || defined(__GLIBC__) #include <sys/io.h> #endif

1 0