December 2021 - flashrom-gerrit

Change in flashrom[master]: Makefile: list dependencies for RAW_MEM_ACCESS, X86_PORT_IO, X86_MSR
by Thomas Heijligen (Code Review) 22 Dec '21

22 Dec '21

Attention is currently required from: Thomas Heijligen, Angel Pons. Hello build bot (Jenkins), Nico Huber, Angel Pons, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/60114 to look at the new patch set (#6). Change subject: Makefile: list dependencies for RAW_MEM_ACCESS, X86_PORT_IO, X86_MSR ...................................................................... Makefile: list dependencies for RAW_MEM_ACCESS, X86_PORT_IO, X86_MSR List all programmers which depend on the respective hwaccess features. This is the base for a precise feature selecting in the build system. Change-Id: I588f698780b5acd65084346bcef781cbfd1203ea Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> --- M Makefile 1 file changed, 48 insertions(+), 9 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/14/60114/6 -- To view, visit https://review.coreboot.org/c/flashrom/+/60114 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I588f698780b5acd65084346bcef781cbfd1203ea Gerrit-Change-Number: 60114 Gerrit-PatchSet: 6 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: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: physmap: rename to hwaccess_physmap, create own header
by Thomas Heijligen (Code Review) 22 Dec '21

22 Dec '21

Attention is currently required from: Angel Pons. Hello build bot (Jenkins), Nico Huber, Angel Pons, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/60113 to look at the new patch set (#7). Change subject: physmap: rename to hwaccess_physmap, create own header ...................................................................... physmap: rename to hwaccess_physmap, create own header Line up physmap with the other hwaccess related code. Change-Id: Ieba6f4e94cfc3e668fcb8b3c978de5908aed2592 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> --- M Makefile M atapromise.c M cbtable.c M chipset_enable.c M dmi.c M drkaiser.c M flashrom.c M gfxnvidia.c R hwaccess_physmap.c A hwaccess_physmap.h M ichspi.c M internal.c M it8212.c M it85spi.c M mcp6x_spi.c M meson.build M nicintel.c M nicintel_eeprom.c M nicintel_spi.c M ogp_spi.c M programmer.h M satamv.c M satasii.c M sb600spi.c 24 files changed, 49 insertions(+), 12 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/13/60113/7 -- To view, visit https://review.coreboot.org/c/flashrom/+/60113 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ieba6f4e94cfc3e668fcb8b3c978de5908aed2592 Gerrit-Change-Number: 60113 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: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Felix Singer <felixsinger(a)posteo.net> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: Makefile: list dependencies for RAW_MEM_ACCESS, X86_PORT_IO, X86_MSR
by Nico Huber (Code Review) 22 Dec '21

22 Dec '21

Attention is currently required from: Thomas Heijligen, Angel Pons. Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/60114 ) Change subject: Makefile: list dependencies for RAW_MEM_ACCESS, X86_PORT_IO, X86_MSR ...................................................................... Patch Set 5: Code-Review+2 (1 comment) Patchset: PS5: Looks like this last one needs a manual rebase. -- To view, visit https://review.coreboot.org/c/flashrom/+/60114 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I588f698780b5acd65084346bcef781cbfd1203ea Gerrit-Change-Number: 60114 Gerrit-PatchSet: 5 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: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Wed, 22 Dec 2021 12:37:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: hwaccess physmap: move x86 msr related code into own files
by Nico Huber (Code Review) 22 Dec '21

22 Dec '21

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/60111 ) Change subject: hwaccess physmap: move x86 msr related code into own files ...................................................................... hwaccess physmap: move x86 msr related code into own files Allow x86 msr related code to be compiled independent from memory mapping functionality. This enables for a better selection of needed hardware access types. Change-Id: Idc9ce9df3ea1e291ad469de59467646b294119c4 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/60111 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> --- M Makefile M board_enable.c M chipset_enable.c M hwaccess.h A hwaccess_x86_msr.c A hwaccess_x86_msr.h M meson.build M physmap.c M programmer.h 9 files changed, 405 insertions(+), 359 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved diff --git a/Makefile b/Makefile index 8de6234..04816fa 100644 --- a/Makefile +++ b/Makefile @@ -806,7 +806,7 @@ ifeq ($(ARCH), x86) FEATURE_CFLAGS += -D'__FLASHROM_HAVE_OUTB__=1' -PROGRAMMER_OBJS += hwaccess_x86_io.o +PROGRAMMER_OBJS += hwaccess_x86_io.o hwaccess_x86_msr.o ifeq ($(TARGET_OS), NetBSD) PCILIBS += -l$(shell uname -p) diff --git a/board_enable.c b/board_enable.c index 4ca7101..445e354 100644 --- a/board_enable.c +++ b/board_enable.c @@ -27,6 +27,7 @@ #include "programmer.h" #include "hwaccess.h" #include "hwaccess_x86_io.h" +#include "hwaccess_x86_msr.h" #include "platform/pci.h" #if defined(__i386__) || defined(__x86_64__) diff --git a/chipset_enable.c b/chipset_enable.c index 517918e..22af681 100644 --- a/chipset_enable.c +++ b/chipset_enable.c @@ -35,6 +35,7 @@ #include "programmer.h" #include "hwaccess.h" #include "hwaccess_x86_io.h" +#include "hwaccess_x86_msr.h" #include "platform/pci.h" #define NOT_DONE_YET 1 diff --git a/hwaccess.h b/hwaccess.h index 5b7b079..d80e0e3 100644 --- a/hwaccess.h +++ b/hwaccess.h @@ -122,35 +122,4 @@ #define le_to_cpu32 cpu_to_le32 #define le_to_cpu64 cpu_to_le64 -#if NEED_RAW_ACCESS == 1 && (defined (__i386__) || defined (__x86_64__) || defined(__amd64__)) - -#if !(defined(__MACH__) && defined(__APPLE__)) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(__DragonFly__) && !defined(__LIBPAYLOAD__) -typedef struct { uint32_t hi, lo; } msr_t; -msr_t rdmsr(int addr); -int wrmsr(int addr, msr_t msr); -#endif -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) -/* FreeBSD already has conflicting definitions for wrmsr/rdmsr. */ -#undef rdmsr -#undef wrmsr -#define rdmsr freebsd_rdmsr -#define wrmsr freebsd_wrmsr -typedef struct { uint32_t hi, lo; } msr_t; -msr_t freebsd_rdmsr(int addr); -int freebsd_wrmsr(int addr, msr_t msr); -#endif -#if defined(__LIBPAYLOAD__) -#include <arch/io.h> -#include <arch/msr.h> -typedef struct { uint32_t hi, lo; } msr_t; -msr_t libpayload_rdmsr(int addr); -int libpayload_wrmsr(int addr, msr_t msr); -#undef rdmsr -#define rdmsr libpayload_rdmsr -#define wrmsr libpayload_wrmsr -#endif - - -#endif - #endif /* !__HWACCESS_H__ */ diff --git a/hwaccess_x86_msr.c b/hwaccess_x86_msr.c new file mode 100644 index 0000000..fa7df72 --- /dev/null +++ b/hwaccess_x86_msr.c @@ -0,0 +1,348 @@ +/* + * This file is part of the flashrom project. + * + * Copyright (C) 2009 Peter Stuge <peter(a)stuge.se> + * Copyright (C) 2009 coresystems GmbH + * Copyright (C) 2010 Carl-Daniel Hailfinger + * Copyright (C) 2010 Rudolf Marek <r.marek(a)assembler.cz> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +/* MSR abstraction implementations for Linux, OpenBSD, FreeBSD/Dragonfly, OSX, libpayload + * and a non-working default implementation on the bottom. See also hwaccess.h for some (re)declarations. + */ + +#include "hwaccess_x86_msr.h" +#include "flash.h" + +#ifdef __linux__ +/* + * Reading and writing to MSRs, however requires instructions rdmsr/wrmsr, + * which are ring0 privileged instructions so only the kernel can do the + * read/write. This function, therefore, requires that the msr kernel module + * be loaded to access these instructions from user space using device + * /dev/cpu/0/msr. + */ + +#include <stdint.h> +#include <stdlib.h> +#include <errno.h> +#include <fcntl.h> +#include <string.h> +#include <unistd.h> + +static int fd_msr = -1; + +msr_t rdmsr(int addr) +{ + uint32_t buf[2]; + msr_t msr = { 0xffffffff, 0xffffffff }; + + if (lseek(fd_msr, (off_t) addr, SEEK_SET) == -1) { + msg_perr("Could not lseek() MSR: %s\n", strerror(errno)); + close(fd_msr); + exit(1); + } + + if (read(fd_msr, buf, 8) == 8) { + msr.lo = buf[0]; + msr.hi = buf[1]; + return msr; + } + + if (errno != EIO) { + // A severe error. + msg_perr("Could not read() MSR: %s\n", strerror(errno)); + close(fd_msr); + exit(1); + } + + return msr; +} + +int wrmsr(int addr, msr_t msr) +{ + uint32_t buf[2]; + buf[0] = msr.lo; + buf[1] = msr.hi; + + if (lseek(fd_msr, (off_t) addr, SEEK_SET) == -1) { + msg_perr("Could not lseek() MSR: %s\n", strerror(errno)); + close(fd_msr); + exit(1); + } + + if (write(fd_msr, buf, 8) != 8 && errno != EIO) { + msg_perr("Could not write() MSR: %s\n", strerror(errno)); + close(fd_msr); + exit(1); + } + + /* Some MSRs must not be written. */ + if (errno == EIO) + return -1; + + return 0; +} + +int setup_cpu_msr(int cpu) +{ + char msrfilename[64] = { 0 }; + snprintf(msrfilename, sizeof(msrfilename), "/dev/cpu/%d/msr", cpu); + + if (fd_msr != -1) { + msg_pinfo("MSR was already initialized\n"); + return -1; + } + + fd_msr = open(msrfilename, O_RDWR); + + if (fd_msr < 0) { + msg_perr("Error while opening %s: %s\n", msrfilename, strerror(errno)); + msg_pinfo("Did you run 'modprobe msr'?\n"); + return -1; + } + + return 0; +} + +void cleanup_cpu_msr(void) +{ + if (fd_msr == -1) { + msg_pinfo("No MSR initialized.\n"); + return; + } + + close(fd_msr); + + /* Clear MSR file descriptor. */ + fd_msr = -1; +} +#elif defined(__OpenBSD__) && defined (__i386__) /* This does only work for certain AMD Geode LX systems see amdmsr(4). */ +#include <stdint.h> +#include <stdio.h> +#include <sys/ioctl.h> +#include <machine/amdmsr.h> + +static int fd_msr = -1; + +msr_t rdmsr(int addr) +{ + struct amdmsr_req args; + + msr_t msr = { 0xffffffff, 0xffffffff }; + + args.addr = (uint32_t)addr; + + if (ioctl(fd_msr, RDMSR, &args) < 0) { + msg_perr("Error while executing RDMSR ioctl: %s\n", strerror(errno)); + close(fd_msr); + exit(1); + } + + msr.lo = args.val & 0xffffffff; + msr.hi = args.val >> 32; + + return msr; +} + +int wrmsr(int addr, msr_t msr) +{ + struct amdmsr_req args; + + args.addr = addr; + args.val = (((uint64_t)msr.hi) << 32) | msr.lo; + + if (ioctl(fd_msr, WRMSR, &args) < 0) { + msg_perr("Error while executing WRMSR ioctl: %s\n", strerror(errno)); + close(fd_msr); + exit(1); + } + + return 0; +} + +int setup_cpu_msr(int cpu) +{ + char msrfilename[64] = { 0 }; + snprintf(msrfilename, sizeof(msrfilename), "/dev/amdmsr"); + + if (fd_msr != -1) { + msg_pinfo("MSR was already initialized\n"); + return -1; + } + + fd_msr = open(msrfilename, O_RDWR); + + if (fd_msr < 0) { + msg_perr("Error while opening %s: %s\n", msrfilename, strerror(errno)); + return -1; + } + + return 0; +} + +void cleanup_cpu_msr(void) +{ + if (fd_msr == -1) { + msg_pinfo("No MSR initialized.\n"); + return; + } + + close(fd_msr); + + /* Clear MSR file descriptor. */ + fd_msr = -1; +} + +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) +#include <sys/ioctl.h> + +typedef struct { + int msr; + uint64_t data; +} cpu_msr_args_t; +#define CPU_RDMSR _IOWR('c', 1, cpu_msr_args_t) +#define CPU_WRMSR _IOWR('c', 2, cpu_msr_args_t) + +static int fd_msr = -1; + +msr_t rdmsr(int addr) +{ + cpu_msr_args_t args; + + msr_t msr = { 0xffffffff, 0xffffffff }; + + args.msr = addr; + + if (ioctl(fd_msr, CPU_RDMSR, &args) < 0) { + msg_perr("Error while executing CPU_RDMSR ioctl: %s\n", strerror(errno)); + close(fd_msr); + exit(1); + } + + msr.lo = args.data & 0xffffffff; + msr.hi = args.data >> 32; + + return msr; +} + +int wrmsr(int addr, msr_t msr) +{ + cpu_msr_args_t args; + + args.msr = addr; + args.data = (((uint64_t)msr.hi) << 32) | msr.lo; + + if (ioctl(fd_msr, CPU_WRMSR, &args) < 0) { + msg_perr("Error while executing CPU_WRMSR ioctl: %s\n", strerror(errno)); + close(fd_msr); + exit(1); + } + + return 0; +} + +int setup_cpu_msr(int cpu) +{ + char msrfilename[64] = { 0 }; + snprintf(msrfilename, sizeof(msrfilename), "/dev/cpu%d", cpu); + + if (fd_msr != -1) { + msg_pinfo("MSR was already initialized\n"); + return -1; + } + + fd_msr = open(msrfilename, O_RDWR); + + if (fd_msr < 0) { + msg_perr("Error while opening %s: %s\n", msrfilename, strerror(errno)); + msg_pinfo("Did you install ports/sysutils/devcpu?\n"); + return -1; + } + + return 0; +} + +void cleanup_cpu_msr(void) +{ + if (fd_msr == -1) { + msg_pinfo("No MSR initialized.\n"); + return; + } + + close(fd_msr); + + /* Clear MSR file descriptor. */ + fd_msr = -1; +} + +#elif defined(__MACH__) && defined(__APPLE__) +/* rdmsr() and wrmsr() are provided by DirectHW which needs neither setup nor cleanup. */ +int setup_cpu_msr(int cpu) +{ + // Always succeed for now + return 0; +} + +void cleanup_cpu_msr(void) +{ + // Nothing, yet. +} +#elif defined(__LIBPAYLOAD__) +msr_t libpayload_rdmsr(int addr) +{ + msr_t msr; + unsigned long long val = _rdmsr(addr); + msr.lo = val & 0xffffffff; + msr.hi = val >> 32; + return msr; +} + +int libpayload_wrmsr(int addr, msr_t msr) +{ + _wrmsr(addr, msr.lo | ((unsigned long long)msr.hi << 32)); + return 0; +} + +int setup_cpu_msr(int cpu) +{ + return 0; +} + +void cleanup_cpu_msr(void) +{ +} +#else +/* default MSR implementation */ +msr_t rdmsr(int addr) +{ + msr_t ret = { 0xffffffff, 0xffffffff }; + + return ret; +} + +int wrmsr(int addr, msr_t msr) +{ + return -1; +} + +int setup_cpu_msr(int cpu) +{ + msg_pinfo("No MSR support for your OS yet.\n"); + return -1; +} + +void cleanup_cpu_msr(void) +{ + // Nothing, yet. +} +#endif // OS switches for MSR code diff --git a/hwaccess_x86_msr.h b/hwaccess_x86_msr.h new file mode 100644 index 0000000..4229b3b --- /dev/null +++ b/hwaccess_x86_msr.h @@ -0,0 +1,52 @@ +/* + * This file is part of the flashrom project. + * + * Copyright (C) 2009 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; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef __HWACCESS_X86_MSR_H__ +#define __HWACCESS_X86_MSR_H__ 1 + +#include <stdint.h> + +#if !(defined(__MACH__) && defined(__APPLE__)) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(__DragonFly__) && !defined(__LIBPAYLOAD__) +typedef struct { uint32_t hi, lo; } msr_t; +msr_t rdmsr(int addr); +int wrmsr(int addr, msr_t msr); +#endif + +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) +/* FreeBSD already has conflicting definitions for wrmsr/rdmsr. */ +#undef rdmsr +#undef wrmsr +#define rdmsr freebsd_rdmsr +#define wrmsr freebsd_wrmsr +typedef struct { uint32_t hi, lo; } msr_t; +msr_t freebsd_rdmsr(int addr); +int freebsd_wrmsr(int addr, msr_t msr); +#endif + +#if defined(__LIBPAYLOAD__) +#include <arch/io.h> +#include <arch/msr.h> +typedef struct { uint32_t hi, lo; } msr_t; +msr_t libpayload_rdmsr(int addr); +int libpayload_wrmsr(int addr, msr_t msr); +#undef rdmsr +#define rdmsr libpayload_rdmsr +#define wrmsr libpayload_wrmsr +#endif + +int setup_cpu_msr(int cpu); +void cleanup_cpu_msr(void); + +#endif /* __HWACCESS_X86_MSR_H__ */ \ No newline at end of file diff --git a/meson.build b/meson.build index 5cbcac2..2e7296b 100644 --- a/meson.build +++ b/meson.build @@ -348,6 +348,7 @@ if need_raw_access srcs += 'hwaccess.c' srcs += 'hwaccess_x86_io.c' + srcs += 'hwaccess_x86_msr.c' srcs += 'physmap.c' cargs += '-DNEED_RAW_ACCESS=1' cargs += '-D__FLASHROM_HAVE_OUTB__=1' diff --git a/physmap.c b/physmap.c index 796860c..6f2896f 100644 --- a/physmap.c +++ b/physmap.c @@ -362,327 +362,3 @@ { return physmap_common(descr, phys_addr, len, PHYSM_RO, PHYSM_NOCLEANUP, PHYSM_EXACT); } - -#if CONFIG_INTERNAL == 1 -/* MSR abstraction implementations for Linux, OpenBSD, FreeBSD/Dragonfly, OSX, libpayload - * and a non-working default implementation on the bottom. See also hwaccess.h for some (re)declarations. */ -#if defined(__i386__) || defined(__x86_64__) - -#ifdef __linux__ -/* - * Reading and writing to MSRs, however requires instructions rdmsr/wrmsr, - * which are ring0 privileged instructions so only the kernel can do the - * read/write. This function, therefore, requires that the msr kernel module - * be loaded to access these instructions from user space using device - * /dev/cpu/0/msr. - */ - -static int fd_msr = -1; - -msr_t rdmsr(int addr) -{ - uint32_t buf[2]; - msr_t msr = { 0xffffffff, 0xffffffff }; - - if (lseek(fd_msr, (off_t) addr, SEEK_SET) == -1) { - msg_perr("Could not lseek() MSR: %s\n", strerror(errno)); - close(fd_msr); - exit(1); - } - - if (read(fd_msr, buf, 8) == 8) { - msr.lo = buf[0]; - msr.hi = buf[1]; - return msr; - } - - if (errno != EIO) { - // A severe error. - msg_perr("Could not read() MSR: %s\n", strerror(errno)); - close(fd_msr); - exit(1); - } - - return msr; -} - -int wrmsr(int addr, msr_t msr) -{ - uint32_t buf[2]; - buf[0] = msr.lo; - buf[1] = msr.hi; - - if (lseek(fd_msr, (off_t) addr, SEEK_SET) == -1) { - msg_perr("Could not lseek() MSR: %s\n", strerror(errno)); - close(fd_msr); - exit(1); - } - - if (write(fd_msr, buf, 8) != 8 && errno != EIO) { - msg_perr("Could not write() MSR: %s\n", strerror(errno)); - close(fd_msr); - exit(1); - } - - /* Some MSRs must not be written. */ - if (errno == EIO) - return -1; - - return 0; -} - -int setup_cpu_msr(int cpu) -{ - char msrfilename[64] = { 0 }; - snprintf(msrfilename, sizeof(msrfilename), "/dev/cpu/%d/msr", cpu); - - if (fd_msr != -1) { - msg_pinfo("MSR was already initialized\n"); - return -1; - } - - fd_msr = open(msrfilename, O_RDWR); - - if (fd_msr < 0) { - msg_perr("Error while opening %s: %s\n", msrfilename, strerror(errno)); - msg_pinfo("Did you run 'modprobe msr'?\n"); - return -1; - } - - return 0; -} - -void cleanup_cpu_msr(void) -{ - if (fd_msr == -1) { - msg_pinfo("No MSR initialized.\n"); - return; - } - - close(fd_msr); - - /* Clear MSR file descriptor. */ - fd_msr = -1; -} -#elif defined(__OpenBSD__) && defined (__i386__) /* This does only work for certain AMD Geode LX systems see amdmsr(4). */ -#include <sys/ioctl.h> -#include <machine/amdmsr.h> - -static int fd_msr = -1; - -msr_t rdmsr(int addr) -{ - struct amdmsr_req args; - - msr_t msr = { 0xffffffff, 0xffffffff }; - - args.addr = (uint32_t)addr; - - if (ioctl(fd_msr, RDMSR, &args) < 0) { - msg_perr("Error while executing RDMSR ioctl: %s\n", strerror(errno)); - close(fd_msr); - exit(1); - } - - msr.lo = args.val & 0xffffffff; - msr.hi = args.val >> 32; - - return msr; -} - -int wrmsr(int addr, msr_t msr) -{ - struct amdmsr_req args; - - args.addr = addr; - args.val = (((uint64_t)msr.hi) << 32) | msr.lo; - - if (ioctl(fd_msr, WRMSR, &args) < 0) { - msg_perr("Error while executing WRMSR ioctl: %s\n", strerror(errno)); - close(fd_msr); - exit(1); - } - - return 0; -} - -int setup_cpu_msr(int cpu) -{ - char msrfilename[64] = { 0 }; - snprintf(msrfilename, sizeof(msrfilename), "/dev/amdmsr"); - - if (fd_msr != -1) { - msg_pinfo("MSR was already initialized\n"); - return -1; - } - - fd_msr = open(msrfilename, O_RDWR); - - if (fd_msr < 0) { - msg_perr("Error while opening %s: %s\n", msrfilename, strerror(errno)); - return -1; - } - - return 0; -} - -void cleanup_cpu_msr(void) -{ - if (fd_msr == -1) { - msg_pinfo("No MSR initialized.\n"); - return; - } - - close(fd_msr); - - /* Clear MSR file descriptor. */ - fd_msr = -1; -} - -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) -#include <sys/ioctl.h> - -typedef struct { - int msr; - uint64_t data; -} cpu_msr_args_t; -#define CPU_RDMSR _IOWR('c', 1, cpu_msr_args_t) -#define CPU_WRMSR _IOWR('c', 2, cpu_msr_args_t) - -static int fd_msr = -1; - -msr_t rdmsr(int addr) -{ - cpu_msr_args_t args; - - msr_t msr = { 0xffffffff, 0xffffffff }; - - args.msr = addr; - - if (ioctl(fd_msr, CPU_RDMSR, &args) < 0) { - msg_perr("Error while executing CPU_RDMSR ioctl: %s\n", strerror(errno)); - close(fd_msr); - exit(1); - } - - msr.lo = args.data & 0xffffffff; - msr.hi = args.data >> 32; - - return msr; -} - -int wrmsr(int addr, msr_t msr) -{ - cpu_msr_args_t args; - - args.msr = addr; - args.data = (((uint64_t)msr.hi) << 32) | msr.lo; - - if (ioctl(fd_msr, CPU_WRMSR, &args) < 0) { - msg_perr("Error while executing CPU_WRMSR ioctl: %s\n", strerror(errno)); - close(fd_msr); - exit(1); - } - - return 0; -} - -int setup_cpu_msr(int cpu) -{ - char msrfilename[64] = { 0 }; - snprintf(msrfilename, sizeof(msrfilename), "/dev/cpu%d", cpu); - - if (fd_msr != -1) { - msg_pinfo("MSR was already initialized\n"); - return -1; - } - - fd_msr = open(msrfilename, O_RDWR); - - if (fd_msr < 0) { - msg_perr("Error while opening %s: %s\n", msrfilename, strerror(errno)); - msg_pinfo("Did you install ports/sysutils/devcpu?\n"); - return -1; - } - - return 0; -} - -void cleanup_cpu_msr(void) -{ - if (fd_msr == -1) { - msg_pinfo("No MSR initialized.\n"); - return; - } - - close(fd_msr); - - /* Clear MSR file descriptor. */ - fd_msr = -1; -} - -#elif defined(__MACH__) && defined(__APPLE__) -/* rdmsr() and wrmsr() are provided by DirectHW which needs neither setup nor cleanup. */ -int setup_cpu_msr(int cpu) -{ - // Always succeed for now - return 0; -} - -void cleanup_cpu_msr(void) -{ - // Nothing, yet. -} -#elif defined(__LIBPAYLOAD__) -msr_t libpayload_rdmsr(int addr) -{ - msr_t msr; - unsigned long long val = _rdmsr(addr); - msr.lo = val & 0xffffffff; - msr.hi = val >> 32; - return msr; -} - -int libpayload_wrmsr(int addr, msr_t msr) -{ - _wrmsr(addr, msr.lo | ((unsigned long long)msr.hi << 32)); - return 0; -} - -int setup_cpu_msr(int cpu) -{ - return 0; -} - -void cleanup_cpu_msr(void) -{ -} -#else -/* default MSR implementation */ -msr_t rdmsr(int addr) -{ - msr_t ret = { 0xffffffff, 0xffffffff }; - - return ret; -} - -int wrmsr(int addr, msr_t msr) -{ - return -1; -} - -int setup_cpu_msr(int cpu) -{ - msg_pinfo("No MSR support for your OS yet.\n"); - return -1; -} - -void cleanup_cpu_msr(void) -{ - // Nothing, yet. -} -#endif // OS switches for MSR code -#else // x86 -/* Does MSR exist on non-x86 architectures? */ -#endif // arch switches for MSR code -#endif // CONFIG_INTERNAL == 1 diff --git a/programmer.h b/programmer.h index b8b5bbc..c4af35a 100644 --- a/programmer.h +++ b/programmer.h @@ -238,10 +238,8 @@ void *physmap_ro_unaligned(const char *descr, uintptr_t phys_addr, size_t len); void physunmap(void *virt_addr, size_t len); void physunmap_unaligned(void *virt_addr, size_t len); -#if CONFIG_INTERNAL == 1 -int setup_cpu_msr(int cpu); -void cleanup_cpu_msr(void); +#if CONFIG_INTERNAL == 1 /* cbtable.c */ int cb_parse_table(const char **vendor, const char **model); int cb_check_image(const uint8_t *bios, unsigned int size); 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/+/60111 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Idc9ce9df3ea1e291ad469de59467646b294119c4 Gerrit-Change-Number: 60111 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: 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]: hwaccess: move x86 port I/O related code into own files
by Nico Huber (Code Review) 22 Dec '21

22 Dec '21

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/60110 ) Change subject: hwaccess: move x86 port I/O related code into own files ...................................................................... hwaccess: move x86 port I/O related code into own files Allow port I/O related code to be compiled independent from memory mapping functionality. This enables for a better selection of needed hardware access types. Change-Id: I372b4a409f036da766c42bc406b596bc41b0f75a Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/60110 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> --- M Makefile M amd_imc.c M atahpt.c M atapromise.c M atavia.c M board_enable.c M chipset_enable.c M drkaiser.c M gfxnvidia.c M hwaccess.c M hwaccess.h A hwaccess_x86_io.c M hwaccess_x86_io.h M internal.c M it8212.c M it85spi.c M it87spi.c M meson.build M nic3com.c M nicintel.c M nicintel_eeprom.c M nicintel_spi.c M nicnatsemi.c M nicrealtek.c M ogp_spi.c M programmer.h M rayer_spi.c M satamv.c M satasii.c M tests/hwaccess_x86_io_unittest.h M wbsio_spi.c 31 files changed, 122 insertions(+), 82 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved diff --git a/Makefile b/Makefile index 9bc9bf8..8de6234 100644 --- a/Makefile +++ b/Makefile @@ -804,24 +804,23 @@ FEATURE_CFLAGS += -D'NEED_RAW_ACCESS=1' PROGRAMMER_OBJS += physmap.o hwaccess.o -ifeq ($(TARGET_OS), NetBSD) ifeq ($(ARCH), x86) +FEATURE_CFLAGS += -D'__FLASHROM_HAVE_OUTB__=1' +PROGRAMMER_OBJS += hwaccess_x86_io.o + +ifeq ($(TARGET_OS), NetBSD) PCILIBS += -l$(shell uname -p) endif -else ifeq ($(TARGET_OS), OpenBSD) -ifeq ($(ARCH), x86) PCILIBS += -l$(shell uname -m) endif -else +endif + ifeq ($(TARGET_OS), Darwin) # DirectHW framework can be found in the DirectHW library. PCILIBS += -framework IOKit -framework DirectHW endif endif -endif - -endif USE_LIBUSB1 := $(if $(call filter_deps,$(DEPENDS_ON_LIBUSB1)),yes,no) ifeq ($(USE_LIBUSB1), yes) diff --git a/amd_imc.c b/amd_imc.c index f2f0972..4d3715e 100644 --- a/amd_imc.c +++ b/amd_imc.c @@ -17,7 +17,7 @@ #include "flash.h" #include "programmer.h" -#include "hwaccess.h" +#include "hwaccess_x86_io.h" #include "spi.h" #include "platform/pci.h" diff --git a/atahpt.c b/atahpt.c index d2712b8..15bcd61 100644 --- a/atahpt.c +++ b/atahpt.c @@ -18,7 +18,7 @@ #include <string.h> #include "flash.h" #include "programmer.h" -#include "hwaccess.h" +#include "hwaccess_x86_io.h" #include "platform/pci.h" #define BIOS_ROM_ADDR 0x90 diff --git a/atapromise.c b/atapromise.c index 92eba0c..56abc26 100644 --- a/atapromise.c +++ b/atapromise.c @@ -19,6 +19,7 @@ #include "flash.h" #include "programmer.h" #include "hwaccess.h" +#include "hwaccess_x86_io.h" #include "platform/pci.h" #define MAX_ROM_DECODE (32 * 1024) diff --git a/atavia.c b/atavia.c index 6370d91..8109768 100644 --- a/atavia.c +++ b/atavia.c @@ -20,7 +20,7 @@ #include <string.h> #include "flash.h" #include "programmer.h" -#include "hwaccess.h" +#include "hwaccess_x86_io.h" #include "platform/pci.h" #define PCI_VENDOR_ID_VIA 0x1106 diff --git a/board_enable.c b/board_enable.c index 339408a..4ca7101 100644 --- a/board_enable.c +++ b/board_enable.c @@ -26,6 +26,7 @@ #include "flash.h" #include "programmer.h" #include "hwaccess.h" +#include "hwaccess_x86_io.h" #include "platform/pci.h" #if defined(__i386__) || defined(__x86_64__) diff --git a/chipset_enable.c b/chipset_enable.c index 8588443..517918e 100644 --- a/chipset_enable.c +++ b/chipset_enable.c @@ -34,6 +34,7 @@ #include "flash.h" #include "programmer.h" #include "hwaccess.h" +#include "hwaccess_x86_io.h" #include "platform/pci.h" #define NOT_DONE_YET 1 diff --git a/drkaiser.c b/drkaiser.c index 34b204e..565a45e 100644 --- a/drkaiser.c +++ b/drkaiser.c @@ -18,6 +18,7 @@ #include "flash.h" #include "programmer.h" #include "hwaccess.h" +#include "hwaccess_x86_io.h" #include "platform/pci.h" #define PCI_VENDOR_ID_DRKAISER 0x1803 diff --git a/gfxnvidia.c b/gfxnvidia.c index e85ce68..0d3ef39 100644 --- a/gfxnvidia.c +++ b/gfxnvidia.c @@ -19,6 +19,7 @@ #include "flash.h" #include "programmer.h" #include "hwaccess.h" +#include "hwaccess_x86_io.h" #include "platform/pci.h" #define PCI_VENDOR_ID_NVIDIA 0x10de diff --git a/hwaccess.c b/hwaccess.c index 9bfd8ea..4e8a274 100644 --- a/hwaccess.c +++ b/hwaccess.c @@ -25,17 +25,8 @@ #include <fcntl.h> #endif #include "flash.h" -#include "programmer.h" #include "hwaccess.h" -#if USE_IOPERM -#include <sys/io.h> -#endif - -#if (defined (__i386__) || defined (__x86_64__) || defined(__amd64__)) && USE_DEV_IO -int io_fd; -#endif - /* 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. */ @@ -70,59 +61,6 @@ #endif } -#if (defined (__i386__) || defined (__x86_64__) || defined(__amd64__)) && !(defined(__DJGPP__) || defined(__LIBPAYLOAD__)) -static int release_io_perms(void *p) -{ -#if defined (__sun) - sysi86(SI86V86, V86SC_IOPL, 0); -#elif USE_DEV_IO - close(io_fd); -#elif USE_IOPERM - ioperm(0, 65536, 0); -#elif USE_IOPL - iopl(0); -#endif - return 0; -} - -/* Get I/O permissions with automatic permission release on shutdown. */ -int rget_io_perms(void) -{ - #if defined (__sun) - if (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) != 0) { -#elif USE_DEV_IO - if ((io_fd = open("/dev/io", O_RDWR)) < 0) { -#elif USE_IOPERM - if (ioperm(0, 65536, 1) != 0) { -#elif USE_IOPL - if (iopl(3) != 0) { -#endif - msg_perr("ERROR: Could not get I/O privileges (%s).\n", strerror(errno)); - msg_perr("You need to be root.\n"); -#if defined (__OpenBSD__) - msg_perr("If you are root already please set securelevel=-1 in /etc/rc.securelevel and\n" - "reboot, or reboot into single user mode.\n"); -#elif defined(__NetBSD__) - msg_perr("If you are root already please reboot into single user mode or make sure\n" - "that your kernel configuration has the option INSECURE enabled.\n"); -#endif - return 1; - } else { - register_shutdown(release_io_perms, NULL); - } - return 0; -} - -#else - -/* DJGPP and libpayload environments have full PCI port I/O permissions by default. */ -/* PCI port I/O support is unimplemented on PPC/MIPS and unavailable on ARM. */ -int rget_io_perms(void) -{ - return 0; -} -#endif - void mmio_writeb(uint8_t val, void *addr) { *(volatile uint8_t *) addr = val; diff --git a/hwaccess.h b/hwaccess.h index e5edcfa..5b7b079 100644 --- a/hwaccess.h +++ b/hwaccess.h @@ -124,8 +124,6 @@ #if NEED_RAW_ACCESS == 1 && (defined (__i386__) || defined (__x86_64__) || defined(__amd64__)) -#include "hwaccess_x86_io.h" - #if !(defined(__MACH__) && defined(__APPLE__)) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(__DragonFly__) && !defined(__LIBPAYLOAD__) typedef struct { uint32_t hi, lo; } msr_t; msr_t rdmsr(int addr); diff --git a/hwaccess_x86_io.c b/hwaccess_x86_io.c new file mode 100644 index 0000000..3152bfe --- /dev/null +++ b/hwaccess_x86_io.c @@ -0,0 +1,87 @@ +/* + * 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 <errno.h> +#include <string.h> +#if !defined (__DJGPP__) && !defined(__LIBPAYLOAD__) +/* No file access needed/possible to get hardware access permissions. */ +#include <unistd.h> +#include <fcntl.h> +#endif + +#include "hwaccess_x86_io.h" +#include "flash.h" + +#if USE_IOPERM +#include <sys/io.h> +#endif + +#if USE_DEV_IO +int io_fd; +#endif + +#if !(defined(__DJGPP__) || defined(__LIBPAYLOAD__)) +static int release_io_perms(void *p) +{ +#if defined (__sun) + sysi86(SI86V86, V86SC_IOPL, 0); +#elif USE_DEV_IO + close(io_fd); +#elif USE_IOPERM + ioperm(0, 65536, 0); +#elif USE_IOPL + iopl(0); +#endif + return 0; +} + +/* Get I/O permissions with automatic permission release on shutdown. */ +int rget_io_perms(void) +{ + #if defined (__sun) + if (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) != 0) { +#elif USE_DEV_IO + if ((io_fd = open("/dev/io", O_RDWR)) < 0) { +#elif USE_IOPERM + if (ioperm(0, 65536, 1) != 0) { +#elif USE_IOPL + if (iopl(3) != 0) { +#endif + msg_perr("ERROR: Could not get I/O privileges (%s).\n", strerror(errno)); + msg_perr("You need to be root.\n"); +#if defined (__OpenBSD__) + msg_perr("If you are root already please set securelevel=-1 in /etc/rc.securelevel and\n" + "reboot, or reboot into single user mode.\n"); +#elif defined(__NetBSD__) + msg_perr("If you are root already please reboot into single user mode or make sure\n" + "that your kernel configuration has the option INSECURE enabled.\n"); +#endif + return 1; + } else { + register_shutdown(release_io_perms, NULL); + } + return 0; +} + +#else + +/* DJGPP and libpayload environments have full PCI port I/O permissions by default. */ +/* PCI port I/O support is unimplemented on PPC/MIPS and unavailable on ARM. */ +int rget_io_perms(void) +{ + return 0; +} +#endif diff --git a/hwaccess_x86_io.h b/hwaccess_x86_io.h index 63692b8..0d16fdd 100644 --- a/hwaccess_x86_io.h +++ b/hwaccess_x86_io.h @@ -29,8 +29,6 @@ #include <sys/io.h> #endif -#define __FLASHROM_HAVE_OUTB__ 1 - /* for iopl and outb under Solaris */ #if defined (__sun) #include <sys/sysi86.h> @@ -38,6 +36,8 @@ #include <asm/sunddi.h> #endif +int rget_io_perms(void); + /* Clarification about OUTB/OUTW/OUTL argument order: * OUT[BWL](val, port) */ diff --git a/internal.c b/internal.c index 4a8e27b..7de1d6a 100644 --- a/internal.c +++ b/internal.c @@ -20,6 +20,7 @@ #include "flash.h" #include "programmer.h" #include "hwaccess.h" +#include "hwaccess_x86_io.h" #include "platform/pci.h" int is_laptop = 0; diff --git a/it8212.c b/it8212.c index 60997f7..80da2b1 100644 --- a/it8212.c +++ b/it8212.c @@ -18,6 +18,7 @@ #include "flash.h" #include "programmer.h" #include "hwaccess.h" +#include "hwaccess_x86_io.h" #include "platform/pci.h" static uint8_t *it8212_bar = NULL; diff --git a/it85spi.c b/it85spi.c index 17e4e10..574e03a 100644 --- a/it85spi.c +++ b/it85spi.c @@ -26,7 +26,7 @@ #include "flash.h" #include "spi.h" #include "programmer.h" -#include "hwaccess.h" +#include "hwaccess_x86_io.h" #define MAX_TIMEOUT 100000 #define MAX_TRY 5 diff --git a/it87spi.c b/it87spi.c index 5f6fb65..0944915 100644 --- a/it87spi.c +++ b/it87spi.c @@ -26,6 +26,7 @@ #include "chipdrivers.h" #include "programmer.h" #include "hwaccess.h" +#include "hwaccess_x86_io.h" #include "spi.h" #define ITE_SUPERIO_PORT1 0x2e diff --git a/meson.build b/meson.build index 85f40ba..5cbcac2 100644 --- a/meson.build +++ b/meson.build @@ -347,8 +347,10 @@ # raw memory, MSR or PCI port I/O access if need_raw_access srcs += 'hwaccess.c' + srcs += 'hwaccess_x86_io.c' srcs += 'physmap.c' cargs += '-DNEED_RAW_ACCESS=1' + cargs += '-D__FLASHROM_HAVE_OUTB__=1' endif # raw serial IO diff --git a/nic3com.c b/nic3com.c index f7d2a97..3ef607d 100644 --- a/nic3com.c +++ b/nic3com.c @@ -17,7 +17,7 @@ #include <stdlib.h> #include "flash.h" #include "programmer.h" -#include "hwaccess.h" +#include "hwaccess_x86_io.h" #include "platform/pci.h" #define BIOS_ROM_ADDR 0x04 diff --git a/nicintel.c b/nicintel.c index 1730ca4..7f4eb24 100644 --- a/nicintel.c +++ b/nicintel.c @@ -19,6 +19,7 @@ #include "flash.h" #include "programmer.h" #include "hwaccess.h" +#include "hwaccess_x86_io.h" #include "platform/pci.h" static uint8_t *nicintel_bar; diff --git a/nicintel_eeprom.c b/nicintel_eeprom.c index ab75343..fc2ef40 100644 --- a/nicintel_eeprom.c +++ b/nicintel_eeprom.c @@ -35,6 +35,7 @@ #include "spi.h" #include "programmer.h" #include "hwaccess.h" +#include "hwaccess_x86_io.h" #include "platform/pci.h" #define PCI_VENDOR_ID_INTEL 0x8086 diff --git a/nicintel_spi.c b/nicintel_spi.c index f1ed129..25a6651 100644 --- a/nicintel_spi.c +++ b/nicintel_spi.c @@ -35,6 +35,7 @@ #include "flash.h" #include "programmer.h" #include "hwaccess.h" +#include "hwaccess_x86_io.h" #include "platform/pci.h" #define PCI_VENDOR_ID_INTEL 0x8086 diff --git a/nicnatsemi.c b/nicnatsemi.c index 9dd3915..bac6502 100644 --- a/nicnatsemi.c +++ b/nicnatsemi.c @@ -17,7 +17,7 @@ #include <stdlib.h> #include "flash.h" #include "programmer.h" -#include "hwaccess.h" +#include "hwaccess_x86_io.h" #include "platform/pci.h" #define PCI_VENDOR_ID_NATSEMI 0x100b diff --git a/nicrealtek.c b/nicrealtek.c index 0bf60fd..71f9aaf 100644 --- a/nicrealtek.c +++ b/nicrealtek.c @@ -17,7 +17,7 @@ #include <stdlib.h> #include "flash.h" #include "programmer.h" -#include "hwaccess.h" +#include "hwaccess_x86_io.h" #include "platform/pci.h" #define PCI_VENDOR_ID_REALTEK 0x10ec diff --git a/ogp_spi.c b/ogp_spi.c index 105f468..4a4934e 100644 --- a/ogp_spi.c +++ b/ogp_spi.c @@ -19,6 +19,7 @@ #include "flash.h" #include "programmer.h" #include "hwaccess.h" +#include "hwaccess_x86_io.h" #include "platform/pci.h" #define PCI_VENDOR_ID_OGP 0x1227 diff --git a/programmer.h b/programmer.h index b4f04e7..b8b5bbc 100644 --- a/programmer.h +++ b/programmer.h @@ -271,7 +271,6 @@ struct pci_dev *pci_card_find(uint16_t vendor, uint16_t device, uint16_t card_vendor, uint16_t card_device); #endif -int rget_io_perms(void); #if CONFIG_INTERNAL == 1 extern int is_laptop; extern int laptop_ok; diff --git a/rayer_spi.c b/rayer_spi.c index e65eb78..6cf918a 100644 --- a/rayer_spi.c +++ b/rayer_spi.c @@ -28,7 +28,7 @@ #include <string.h> #include "flash.h" #include "programmer.h" -#include "hwaccess.h" +#include "hwaccess_x86_io.h" /* We have two sets of pins, out and in. The numbers for both sets are * independent and are bitshift values, not real pin numbers. diff --git a/satamv.c b/satamv.c index b69350f..8543f53 100644 --- a/satamv.c +++ b/satamv.c @@ -20,6 +20,7 @@ #include "flash.h" #include "programmer.h" #include "hwaccess.h" +#include "hwaccess_x86_io.h" #include "platform/pci.h" static uint8_t *mv_bar; diff --git a/satasii.c b/satasii.c index d015f7f..2f220d1 100644 --- a/satasii.c +++ b/satasii.c @@ -18,6 +18,7 @@ #include "programmer.h" #include "hwaccess.h" +#include "hwaccess_x86_io.h" #include "platform/pci.h" #define PCI_VENDOR_ID_SII 0x1095 diff --git a/tests/hwaccess_x86_io_unittest.h b/tests/hwaccess_x86_io_unittest.h index 2a4cd5f..14f3caa 100644 --- a/tests/hwaccess_x86_io_unittest.h +++ b/tests/hwaccess_x86_io_unittest.h @@ -39,6 +39,8 @@ #include <stdint.h> +int rget_io_perms(void); + /* * Dummy implementation of iopl from sys/io.h. * sys/io.h by itself is platform-specific, so instead of including diff --git a/wbsio_spi.c b/wbsio_spi.c index 60b725f..805abf7 100644 --- a/wbsio_spi.c +++ b/wbsio_spi.c @@ -20,6 +20,7 @@ #include "chipdrivers.h" #include "programmer.h" #include "hwaccess.h" +#include "hwaccess_x86_io.h" #include "spi.h" #define WBSIO_PORT1 0x2e 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/+/60110 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I372b4a409f036da766c42bc406b596bc41b0f75a Gerrit-Change-Number: 60110 Gerrit-PatchSet: 8 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> 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]: pci.h: move include into own wrapper
by Nico Huber (Code Review) 22 Dec '21

22 Dec '21

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/58883 ) Change subject: pci.h: move include into own wrapper ...................................................................... pci.h: move include into own wrapper Split the include of hwaccess and libpci. There is no need to have pci.h included in hwaccess. Change-Id: Ibf00356f0ef5cc92e0ec99f8fe5cdda56f47b166 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/58883 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> --- M amd_imc.c M atahpt.c M atapromise.c M atavia.c M board_enable.c M chipset_enable.c M drkaiser.c M gfxnvidia.c M hwaccess.h M internal.c M it8212.c M mcp6x_spi.c M nic3com.c M nicintel.c M nicintel_eeprom.c M nicintel_spi.c M nicnatsemi.c M nicrealtek.c M ogp_spi.c M pcidev.c A platform/pci.h M satamv.c M satasii.c M sb600spi.c 24 files changed, 47 insertions(+), 18 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved diff --git a/amd_imc.c b/amd_imc.c index a3959e6..f2f0972 100644 --- a/amd_imc.c +++ b/amd_imc.c @@ -19,6 +19,7 @@ #include "programmer.h" #include "hwaccess.h" #include "spi.h" +#include "platform/pci.h" /* same as serverengines */ static void enter_conf_mode_ec(uint16_t port) diff --git a/atahpt.c b/atahpt.c index d9b56bc..d2712b8 100644 --- a/atahpt.c +++ b/atahpt.c @@ -19,6 +19,7 @@ #include "flash.h" #include "programmer.h" #include "hwaccess.h" +#include "platform/pci.h" #define BIOS_ROM_ADDR 0x90 #define BIOS_ROM_DATA 0x94 diff --git a/atapromise.c b/atapromise.c index 0c187e3..92eba0c 100644 --- a/atapromise.c +++ b/atapromise.c @@ -19,6 +19,7 @@ #include "flash.h" #include "programmer.h" #include "hwaccess.h" +#include "platform/pci.h" #define MAX_ROM_DECODE (32 * 1024) #define ADDR_MASK (MAX_ROM_DECODE - 1) diff --git a/atavia.c b/atavia.c index b110d54..6370d91 100644 --- a/atavia.c +++ b/atavia.c @@ -21,6 +21,7 @@ #include "flash.h" #include "programmer.h" #include "hwaccess.h" +#include "platform/pci.h" #define PCI_VENDOR_ID_VIA 0x1106 diff --git a/board_enable.c b/board_enable.c index 9cf0103..339408a 100644 --- a/board_enable.c +++ b/board_enable.c @@ -26,6 +26,7 @@ #include "flash.h" #include "programmer.h" #include "hwaccess.h" +#include "platform/pci.h" #if defined(__i386__) || defined(__x86_64__) /* diff --git a/chipset_enable.c b/chipset_enable.c index 2e4bb1e..8588443 100644 --- a/chipset_enable.c +++ b/chipset_enable.c @@ -34,6 +34,7 @@ #include "flash.h" #include "programmer.h" #include "hwaccess.h" +#include "platform/pci.h" #define NOT_DONE_YET 1 diff --git a/drkaiser.c b/drkaiser.c index 27c15fb..34b204e 100644 --- a/drkaiser.c +++ b/drkaiser.c @@ -18,6 +18,7 @@ #include "flash.h" #include "programmer.h" #include "hwaccess.h" +#include "platform/pci.h" #define PCI_VENDOR_ID_DRKAISER 0x1803 diff --git a/gfxnvidia.c b/gfxnvidia.c index 048471d..e85ce68 100644 --- a/gfxnvidia.c +++ b/gfxnvidia.c @@ -19,6 +19,7 @@ #include "flash.h" #include "programmer.h" #include "hwaccess.h" +#include "platform/pci.h" #define PCI_VENDOR_ID_NVIDIA 0x10de diff --git a/hwaccess.h b/hwaccess.h index 46335f3..e5edcfa 100644 --- a/hwaccess.h +++ b/hwaccess.h @@ -20,23 +20,6 @@ #ifndef __HWACCESS_H__ #define __HWACCESS_H__ 1 -#if NEED_PCI == 1 -/* - * libpci headers use the variable name "index" which triggers shadowing - * warnings on systems which have the index() function in a default #include - * or as builtin. - */ -#define index shadow_workaround_index - -#if !defined (__NetBSD__) -#include <pci/pci.h> -#else -#include <pciutils/pci.h> -#endif - -#undef index -#endif /* NEED_PCI == 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); diff --git a/internal.c b/internal.c index 43bed9e..4a8e27b 100644 --- a/internal.c +++ b/internal.c @@ -20,6 +20,7 @@ #include "flash.h" #include "programmer.h" #include "hwaccess.h" +#include "platform/pci.h" int is_laptop = 0; int laptop_ok = 0; diff --git a/it8212.c b/it8212.c index e47f6f8..60997f7 100644 --- a/it8212.c +++ b/it8212.c @@ -18,6 +18,7 @@ #include "flash.h" #include "programmer.h" #include "hwaccess.h" +#include "platform/pci.h" static uint8_t *it8212_bar = NULL; diff --git a/mcp6x_spi.c b/mcp6x_spi.c index 29d2663..2429346 100644 --- a/mcp6x_spi.c +++ b/mcp6x_spi.c @@ -24,6 +24,7 @@ #include "flash.h" #include "programmer.h" #include "hwaccess.h" +#include "platform/pci.h" /* Bit positions for each pin. */ diff --git a/nic3com.c b/nic3com.c index 79964ac..f7d2a97 100644 --- a/nic3com.c +++ b/nic3com.c @@ -18,6 +18,7 @@ #include "flash.h" #include "programmer.h" #include "hwaccess.h" +#include "platform/pci.h" #define BIOS_ROM_ADDR 0x04 #define BIOS_ROM_DATA 0x08 diff --git a/nicintel.c b/nicintel.c index c5b9012..1730ca4 100644 --- a/nicintel.c +++ b/nicintel.c @@ -19,6 +19,7 @@ #include "flash.h" #include "programmer.h" #include "hwaccess.h" +#include "platform/pci.h" static uint8_t *nicintel_bar; static uint8_t *nicintel_control_bar; diff --git a/nicintel_eeprom.c b/nicintel_eeprom.c index 5887073..ab75343 100644 --- a/nicintel_eeprom.c +++ b/nicintel_eeprom.c @@ -35,6 +35,7 @@ #include "spi.h" #include "programmer.h" #include "hwaccess.h" +#include "platform/pci.h" #define PCI_VENDOR_ID_INTEL 0x8086 #define MEMMAP_SIZE 0x1c /* Only EEC, EERD and EEWR are needed. */ diff --git a/nicintel_spi.c b/nicintel_spi.c index 5dcdf7d..f1ed129 100644 --- a/nicintel_spi.c +++ b/nicintel_spi.c @@ -35,6 +35,7 @@ #include "flash.h" #include "programmer.h" #include "hwaccess.h" +#include "platform/pci.h" #define PCI_VENDOR_ID_INTEL 0x8086 #define MEMMAP_SIZE getpagesize() diff --git a/nicnatsemi.c b/nicnatsemi.c index 6216728..9dd3915 100644 --- a/nicnatsemi.c +++ b/nicnatsemi.c @@ -18,6 +18,7 @@ #include "flash.h" #include "programmer.h" #include "hwaccess.h" +#include "platform/pci.h" #define PCI_VENDOR_ID_NATSEMI 0x100b diff --git a/nicrealtek.c b/nicrealtek.c index 70daeec..0bf60fd 100644 --- a/nicrealtek.c +++ b/nicrealtek.c @@ -18,6 +18,7 @@ #include "flash.h" #include "programmer.h" #include "hwaccess.h" +#include "platform/pci.h" #define PCI_VENDOR_ID_REALTEK 0x10ec #define PCI_VENDOR_ID_SMC1211 0x1113 diff --git a/ogp_spi.c b/ogp_spi.c index 2e5e274..105f468 100644 --- a/ogp_spi.c +++ b/ogp_spi.c @@ -19,6 +19,7 @@ #include "flash.h" #include "programmer.h" #include "hwaccess.h" +#include "platform/pci.h" #define PCI_VENDOR_ID_OGP 0x1227 diff --git a/pcidev.c b/pcidev.c index 9ffe05c..bd558ed 100644 --- a/pcidev.c +++ b/pcidev.c @@ -19,7 +19,7 @@ #include <string.h> #include "flash.h" #include "programmer.h" -#include "hwaccess.h" +#include "platform/pci.h" struct pci_access *pacc; diff --git a/platform/pci.h b/platform/pci.h new file mode 100644 index 0000000..f63529b --- /dev/null +++ b/platform/pci.h @@ -0,0 +1,25 @@ +/* + * This is a wrapper for libpci. + * ... + */ + + +#ifndef __PLATFORM_PCI_H__ +#define __PLATFORM_PCI_H__ + +/* + * An old libpci version seems to use the variable name "index" which triggers + * shadowing warnings on systems which have the index() function in a default + * #include or as builtin. + */ +#define index shadow_workaround_index + +#if defined (__NetBSD__) +#include <pciutils/pci.h> +#else +#include <pci/pci.h> +#endif + +#undef index + +#endif /* __PLATFORM_PCI_H__ */ \ No newline at end of file diff --git a/satamv.c b/satamv.c index cdd2f27..b69350f 100644 --- a/satamv.c +++ b/satamv.c @@ -20,6 +20,7 @@ #include "flash.h" #include "programmer.h" #include "hwaccess.h" +#include "platform/pci.h" static uint8_t *mv_bar; static uint16_t mv_iobar; diff --git a/satasii.c b/satasii.c index 321ef7f..d015f7f 100644 --- a/satasii.c +++ b/satasii.c @@ -18,6 +18,7 @@ #include "programmer.h" #include "hwaccess.h" +#include "platform/pci.h" #define PCI_VENDOR_ID_SII 0x1095 diff --git a/sb600spi.c b/sb600spi.c index d5e228c..92fcc81 100644 --- a/sb600spi.c +++ b/sb600spi.c @@ -24,6 +24,7 @@ #include "programmer.h" #include "hwaccess.h" #include "spi.h" +#include "platform/pci.h" /* This struct is unused, but helps visualize the SB600 SPI BAR layout. *struct sb600_spi_controller { 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/+/58883 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ibf00356f0ef5cc92e0ec99f8fe5cdda56f47b166 Gerrit-Change-Number: 58883 Gerrit-PatchSet: 6 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: 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: Make pkg-config mandatory to find libpci
by Nico Huber (Code Review) 22 Dec '21

22 Dec '21

Attention is currently required from: Thomas Heijligen. Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/59050 ) Change subject: Makefile: Make pkg-config mandatory to find libpci ...................................................................... Patch Set 13: Code-Review+1 (1 comment) Patchset: PS13: Sorry, misclicked :-/ -- 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: 13 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: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Comment-Date: Wed, 22 Dec 2021 12:32:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

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

22 Dec '21

Attention is currently required from: Thomas Heijligen. Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/59050 ) Change subject: Makefile: Make pkg-config mandatory to find libpci ...................................................................... Patch Set 13: Code-Review+2 -- 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: 13 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: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Comment-Date: Wed, 22 Dec 2021 12:31:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

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

22 Dec '21

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/59049 ) Change subject: Makefile: Make pkg-config mandatory to find libusb1 ...................................................................... Makefile: Make pkg-config mandatory to find libusb1 Use `make HAS_LIBUSB1=yes/no` to override the pkg-config detection and `CONFIG_LIBUSB1_CFLAGS` and `CONFIG_LIBUSB1_LDFLAGS` to set cflags and ldflags manually. Change-Id: I4f24be647d25dde24c41514f8964b7134205867c Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/59049 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> --- M Makefile M Makefile.include 2 files changed, 19 insertions(+), 56 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved diff --git a/Makefile b/Makefile index faf5d2b..9bc9bf8 100644 --- a/Makefile +++ b/Makefile @@ -189,6 +189,9 @@ CONFIG_LIBJAYLINK_CFLAGS := $(call dependency_cflags, libjaylink) CONFIG_LIBJAYLINK_LDFLAGS := $(call dependency_ldflags, libjaylink) +CONFIG_LIBUSB1_CFLAGS := $(call dependency_cflags, libusb-1.0) +CONFIG_LIBUSB1_LDFLAGS := $(call dependency_ldflags, libusb-1.0) + # 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 @@ -201,6 +204,7 @@ 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_FT232H := $(call c_compile_test, Makefile.d/ft232h_test.c, $(CONFIG_LIBFTDI1_CFLAGS)) HAS_UTSNAME := $(call c_compile_test, Makefile.d/utsname_test.c) @@ -231,8 +235,6 @@ LIBS += -lgetopt # Missing serial support. $(call mark_unsupported,$(DEPENDS_ON_SERIAL)) -# Libraries not available for DOS -$(call mark_unsupported,$(DEPENDS_ON_LIBUSB1)) endif ifeq ($(TARGET_OS), $(filter $(TARGET_OS), MinGW Cygwin)) @@ -267,8 +269,6 @@ $(call mark_unsupported,CONFIG_ATAPROMISE) # Bus Pirate, Serprog and PonyProg are not supported with libpayload (missing serial support). $(call mark_unsupported,CONFIG_BUSPIRATE_SPI CONFIG_SERPROG CONFIG_PONY_SPI) -# Dediprog, Developerbox, USB-Blaster, PICkit2, CH341A and FT2232 are not supported with libpayload (missing libusb support). -$(call mark_unsupported,$(DEPENDS_ON_LIBUSB1)) endif ifeq ($(HAS_LINUX_MTD), no) @@ -305,6 +305,10 @@ $(call mark_unsupported,$(DEPENDS_ON_LIBJAYLINK)) endif +ifeq ($(HAS_LIBUSB1), no) +$(call mark_unsupported,$(DEPENDS_ON_LIBUSB1)) +endif + ifeq ($(ENDIAN), little) FEATURE_CFLAGS += -D'__FLASHROM_LITTLE_ENDIAN__=1' endif @@ -819,22 +823,11 @@ endif -NEED_LIBUSB1 := $(call filter_deps,$(DEPENDS_ON_LIBUSB1)) -ifneq ($(NEED_LIBUSB1), ) -CHECK_LIBUSB1 = yes -PROGRAMMER_OBJS += usbdev.o usb_device.o -# FreeBSD and DragonflyBSD use a reimplementation of libusb-1.0 that is simply called libusb -ifeq ($(TARGET_OS), $(filter $(TARGET_OS), FreeBSD DragonFlyBSD)) -USB1LIBS += -lusb -else -ifeq ($(TARGET_OS),NetBSD) -override CPPFLAGS += -I/usr/pkg/include/libusb-1.0 -USB1LIBS += -lusb-1.0 -else -USB1LIBS += $(call debug_shell,[ -n "$(PKG_CONFIG_LIBDIR)" ] && export PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)"; $(PKG_CONFIG) --libs libusb-1.0 || printf "%s" "-lusb-1.0") -override CPPFLAGS += $(call debug_shell,[ -n "$(PKG_CONFIG_LIBDIR)" ] && export PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)"; $(PKG_CONFIG) --cflags-only-I libusb-1.0 || printf "%s" "-I/usr/include/libusb-1.0") -endif -endif +USE_LIBUSB1 := $(if $(call filter_deps,$(DEPENDS_ON_LIBUSB1)),yes,no) +ifeq ($(USE_LIBUSB1), yes) +override CFLAGS += $(CONFIG_LIBUSB1_CFLAGS) +override LDFLAGS += $(CONFIG_LIBUSB1_LDFLAGS) +PROGRAMMER_OBJS +=usbdev.o usb_device.o endif USE_LIBFTDI1 := $(if $(call filter_deps,$(DEPENDS_ON_LIBFTDI1)),yes,no) @@ -884,7 +877,7 @@ endif $(PROGRAM)$(EXEC_SUFFIX): $(OBJS) - $(CC) -o $(PROGRAM)$(EXEC_SUFFIX) $(OBJS) $(LDFLAGS) $(LIBS) $(PCILIBS) $(FEATURE_LIBS) $(USBLIBS) $(USB1LIBS) + $(CC) -o $(PROGRAM)$(EXEC_SUFFIX) $(OBJS) $(LDFLAGS) $(LIBS) $(PCILIBS) $(FEATURE_LIBS) libflashrom.a: $(LIBFLASHROM_OBJS) $(AR) rcs $@ $^ @@ -963,28 +956,11 @@ 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 -ifeq ($(CHECK_LIBUSB1), yes) - @printf "Checking for libusb-1.0 headers... " | tee -a $(BUILD_DETAILS_FILE) - @echo "$$LIBUSB1_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 libusb-1.0: $(NEED_LIBUSB1)."; \ - 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) - @printf "\nexec: %s\n" "$(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(USB1LIBS)" >>$(BUILD_DETAILS_FILE) - @{ { { { { $(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 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) -endif + @echo Dependency libusb1 found: $(HAS_LIBUSB1) + @if [ $(HAS_LIBUSB1) = yes ]; then \ + echo " CFLAGS: $(CONFIG_LIBUSB1_CFLAGS)"; \ + echo " LDFLAGS: $(CONFIG_LIBUSB1_LDFLAGS)"; \ + fi @echo Dependency libjaylink found: $(HAS_LIBJAYLINK) @if [ $(HAS_LIBJAYLINK) = yes ]; then \ echo " CFLAGS: $(CONFIG_LIBJAYLINK_CFLAGS)"; \ diff --git a/Makefile.include b/Makefile.include index b81762a..67eec52 100644 --- a/Makefile.include +++ b/Makefile.include @@ -91,16 +91,3 @@ } endef export PCI_GET_DEV_TEST - -define LIBUSB1_TEST -#include <stddef.h> -#include <libusb.h> -int main(int argc, char **argv) -{ - (void)argc; - (void)argv; - libusb_init(NULL); - return 0; -} -endef -export LIBUSB1_TEST 11 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/+/59049 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I4f24be647d25dde24c41514f8964b7134205867c Gerrit-Change-Number: 59049 Gerrit-PatchSet: 13 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: 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: Make pkg-config mandatory to find libjaylink
by Nico Huber (Code Review) 22 Dec '21

22 Dec '21

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/59048 ) Change subject: Makefile: Make pkg-config mandatory to find libjaylink ...................................................................... Makefile: Make pkg-config mandatory to find libjaylink Use `make HAS_LIBJAYLINK=yes/no` to override the pkg-config detection and `CONFIG_LIBJAYLINK_CFLAGS` and `CONFIG_LIBJAYLINK_LDFLAGS` to set cflags and ldflags manually. Change-Id: I99df547046bb9820ab502f89f6d4452c1bc0cfd4 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/59048 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> --- M Makefile M Makefile.include 2 files changed, 20 insertions(+), 48 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved diff --git a/Makefile b/Makefile index f5a8f39..faf5d2b 100644 --- a/Makefile +++ b/Makefile @@ -186,6 +186,9 @@ CONFIG_LIB_NI845X_CFLAGS := -I$(CONFIG_NI845X_LIBRARY_PATH) $(if NI854_X86_LIBRARY_PATH, -I${NI854_X86_LIBRARY_PATH}) CONFIG_LIB_NI845X_LDFLAGS := -L$(CONFIG_NI845X_LIBRARY_PATH) $(if NI854_X86_LIBRARY_PATH, -L${NI854_X86_LIBRARY_PATH}) -lni845x +CONFIG_LIBJAYLINK_CFLAGS := $(call dependency_cflags, libjaylink) +CONFIG_LIBJAYLINK_LDFLAGS := $(call dependency_ldflags, libjaylink) + # 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 @@ -197,6 +200,7 @@ HAS_LIBFTDI1 := $(call find_dependency, libftdi1) HAS_LIB_NI845X := no +HAS_LIBJAYLINK := $(call find_dependency, libjaylink) 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) @@ -228,7 +232,7 @@ # Missing serial support. $(call mark_unsupported,$(DEPENDS_ON_SERIAL)) # Libraries not available for DOS -$(call mark_unsupported,$(DEPENDS_ON_LIBUSB1) $(DEPENDS_ON_LIBJAYLINK)) +$(call mark_unsupported,$(DEPENDS_ON_LIBUSB1)) endif ifeq ($(TARGET_OS), $(filter $(TARGET_OS), MinGW Cygwin)) @@ -264,7 +268,7 @@ # Bus Pirate, Serprog and PonyProg are not supported with libpayload (missing serial support). $(call mark_unsupported,CONFIG_BUSPIRATE_SPI CONFIG_SERPROG CONFIG_PONY_SPI) # Dediprog, Developerbox, USB-Blaster, PICkit2, CH341A and FT2232 are not supported with libpayload (missing libusb support). -$(call mark_unsupported,$(DEPENDS_ON_LIBUSB1) $(DEPENDS_ON_LIBJAYLINK)) +$(call mark_unsupported,$(DEPENDS_ON_LIBUSB1)) endif ifeq ($(HAS_LINUX_MTD), no) @@ -297,6 +301,10 @@ $(call mark_unsupported,$(DEPENDS_ON_LIB_NI845X)) endif +ifeq ($(HAS_LIBJAYLINK), no) +$(call mark_unsupported,$(DEPENDS_ON_LIBJAYLINK)) +endif + ifeq ($(ENDIAN), little) FEATURE_CFLAGS += -D'__FLASHROM_LITTLE_ENDIAN__=1' endif @@ -844,11 +852,10 @@ override LDFLAGS += $(CONFIG_LIB_NI845X_LDFLAGS) endif -NEED_LIBJAYLINK := $(call filter_deps,$(DEPENDS_ON_LIBJAYLINK)) -ifneq ($(NEED_LIBJAYLINK), ) -CHECK_LIBJAYLINK = yes -JAYLINKLIBS += $(call debug_shell,[ -n "$(PKG_CONFIG_LIBDIR)" ] && export PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)"; $(PKG_CONFIG) --libs libjaylink) -override CPPFLAGS += $(call debug_shell,[ -n "$(PKG_CONFIG_LIBDIR)" ] && export PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)"; $(PKG_CONFIG) --cflags-only-I libjaylink) +USE_LIBJAYLINK := $(if $(call filter_deps,$(DEPENDS_ON_LIBJAYLINK)),yes,no) +ifeq ($(USE_LIBJAYLINK), yes) +override CFLAGS += $(CONFIG_LIBJAYLINK_CFLAGS) +override LDFLAGS += $(CONFIG_LIBJAYLINK_LDFLAGS) endif ifeq ($(CONFIG_PRINT_WIKI), yes) @@ -877,7 +884,7 @@ endif $(PROGRAM)$(EXEC_SUFFIX): $(OBJS) - $(CC) -o $(PROGRAM)$(EXEC_SUFFIX) $(OBJS) $(LDFLAGS) $(LIBS) $(PCILIBS) $(FEATURE_LIBS) $(USBLIBS) $(USB1LIBS) $(JAYLINKLIBS) + $(CC) -o $(PROGRAM)$(EXEC_SUFFIX) $(OBJS) $(LDFLAGS) $(LIBS) $(PCILIBS) $(FEATURE_LIBS) $(USBLIBS) $(USB1LIBS) libflashrom.a: $(LIBFLASHROM_OBJS) $(AR) rcs $@ $^ @@ -978,28 +985,11 @@ 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 -ifeq ($(CHECK_LIBJAYLINK), yes) - @printf "Checking for libjaylink headers... " | tee -a $(BUILD_DETAILS_FILE) - @echo "$$LIBJAYLINK_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 feature requires libjaylink: $(NEED_LIBJAYLINK)."; \ - echo "Please install libjaylink headers or disable the feature"; \ - echo "mentioned above by specifying make CONFIG_JLINK_SPI=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 libjaylink is usable... " | tee -a $(BUILD_DETAILS_FILE) - @printf "\nexec: %s\n" "$(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(JAYLINKLIBS)" >>$(BUILD_DETAILS_FILE) - @{ { { { { $(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(JAYLINKLIBS) >&2 && \ - echo "yes." || { echo "no."; \ - echo "The following feature requires libjaylink: $(NEED_LIBJAYLINK)."; \ - echo "Please install libjaylink or disable the feature"; \ - echo "mentioned above by specifying make CONFIG_JLINK_SPI=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 libjaylink found: $(HAS_LIBJAYLINK) + @if [ $(HAS_LIBJAYLINK) = yes ]; then \ + echo " CFLAGS: $(CONFIG_LIBJAYLINK_CFLAGS)"; \ + echo " LDFLAGS: $(CONFIG_LIBJAYLINK_LDFLAGS)"; \ + fi @echo Dependency NI-845x found: $(HAS_LIB_NI845X) @if [ $(HAS_LIB_NI845X) = yes ]; then \ echo " CFLAGS: $(CONFIG_LIB_NI845X_CFLAGS)"; \ diff --git a/Makefile.include b/Makefile.include index cc76dd8..b81762a 100644 --- a/Makefile.include +++ b/Makefile.include @@ -104,21 +104,3 @@ } endef export LIBUSB1_TEST - -define LIBJAYLINK_TEST -#include <stddef.h> -#include <libjaylink/libjaylink.h> -int main(int argc, char **argv) -{ - struct jaylink_context *ctx; - - (void)argc; - (void)argv; - - jaylink_init(&ctx); - jaylink_exit(ctx); - - return 0; -} -endef -export LIBJAYLINK_TEST 11 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/+/59048 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I99df547046bb9820ab502f89f6d4452c1bc0cfd4 Gerrit-Change-Number: 59048 Gerrit-PatchSet: 13 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: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit December 2021