March 2022 - flashrom-gerrit - mail.coreboot.org

Change in flashrom[master]: hwaccess: replace macros by C code
by Nico Huber (Code Review) 17 Mar '22

17 Mar '22

Attention is currently required from: Thomas Heijligen, Edward O'Callaghan, Angel Pons, Nikolai Artemiev, Anastasia Klimchuk. Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/62898 ) Change subject: hwaccess: replace macros by C code ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: I started to review, then realized that I'm not fully convinced. What do other people think? We could do more in C for type safety. But that doesn't mean everything needs to be written out and in .c files. If I'd change something here it would likely be replacing the macros with inline functions. Except the code-generating macros. -- To view, visit https://review.coreboot.org/c/flashrom/+/62898 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I86d38d816b37c283279c485fac8027f8fb94364a Gerrit-Change-Number: 62898 Gerrit-PatchSet: 2 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: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Nikolai Artemiev <nartemiev(a)google.com> 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: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Thu, 17 Mar 2022 17:55:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in flashrom[master]: hwaccess_x86_msr: drop outdated comment
by Nico Huber (Code Review) 17 Mar '22

17 Mar '22

Attention is currently required from: Thomas Heijligen. Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/62897 ) Change subject: hwaccess_x86_msr: drop outdated comment ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/62897 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ia361f7f3392b4f58a33f3e2d3b5f8f4340c388b3 Gerrit-Change-Number: 62897 Gerrit-PatchSet: 2 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Comment-Date: Thu, 17 Mar 2022 17:40:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: hwaccess_x86_msr: rename rdmsr, wrmsr to read_cpu_msr, write_cpu_msr
by Nico Huber (Code Review) 17 Mar '22

17 Mar '22

Attention is currently required from: Thomas Heijligen, Angel Pons. Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/62851 ) Change subject: hwaccess_x86_msr: rename rdmsr, wrmsr to read_cpu_msr, write_cpu_msr ...................................................................... Patch Set 1: Code-Review+1 (2 comments) Patchset: PS1: I first thought, it's called rdmsr/wrmsr everywhere, so we might discourage from using these functions by renaming. However, after looking at the code, that might be a good thing :D Should be testable by comparing binaries. They shouldn't change, right? File hwaccess_x86_msr.c: https://review.coreboot.org/c/flashrom/+/62851/comment/d4c2fd82_0d66f05b PS1, Line 296: /* rdmsr() and wrmsr() are provided by DirectHW which needs neither setup nor cleanup. */ Do we have all necessary #include's in this file, though? -- To view, visit https://review.coreboot.org/c/flashrom/+/62851 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ie5ad54d198312578e0a1ee719eec67b37d2bf6a4 Gerrit-Change-Number: 62851 Gerrit-PatchSet: 1 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-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: Thu, 17 Mar 2022 17:37:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: hwaccess_x86_msr: drop outdated comment
by Paul Menzel (Code Review) 17 Mar '22

17 Mar '22

Attention is currently required from: Thomas Heijligen. Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/62897 ) Change subject: hwaccess_x86_msr: drop outdated comment ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://review.coreboot.org/c/flashrom/+/62897 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ia361f7f3392b4f58a33f3e2d3b5f8f4340c388b3 Gerrit-Change-Number: 62897 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Comment-Date: Thu, 17 Mar 2022 13:46:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: Endian conversion: move to platform.h and platform/endian*.c
by Thomas Heijligen (Code Review) 17 Mar '22

17 Mar '22

Hello build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/62899 to look at the new patch set (#2). Change subject: Endian conversion: move to platform.h and platform/endian*.c ...................................................................... Endian conversion: move to platform.h and platform/endian*.c Starting to move the platform dependent code to platform/ and provide the abstraction through the platform.h header. Change-Id: I35640282d451960f2a329ae24339ec05dbae6d30 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> --- M Makefile M hwaccess_physmap.c M meson.build R platform.h R platform/endian.c R platform/endian_big.c R platform/endian_little.c 7 files changed, 16 insertions(+), 15 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/99/62899/2 -- To view, visit https://review.coreboot.org/c/flashrom/+/62899 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I35640282d451960f2a329ae24339ec05dbae6d30 Gerrit-Change-Number: 62899 Gerrit-PatchSet: 2 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: hwaccess: replace macros by C code
by Thomas Heijligen (Code Review) 17 Mar '22

17 Mar '22

Hello build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/62898 to look at the new patch set (#2). Change subject: hwaccess: replace macros by C code ...................................................................... hwaccess: replace macros by C code Split the code for endian convertion into a file for big and one for little endian. The buildsystem selects the right file for the used endian. Elaborate the macros into plain C code for better and easier understanding. Change-Id: I86d38d816b37c283279c485fac8027f8fb94364a Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> --- M Makefile A hwaccess.c M hwaccess.h A hwaccess_endian_big.c A hwaccess_endian_little.c M meson.build 6 files changed, 306 insertions(+), 79 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/98/62898/2 -- To view, visit https://review.coreboot.org/c/flashrom/+/62898 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I86d38d816b37c283279c485fac8027f8fb94364a Gerrit-Change-Number: 62898 Gerrit-PatchSet: 2 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: Endian conversion: move to platform.h and platform/endian*.c
by Thomas Heijligen (Code Review) 17 Mar '22

17 Mar '22

Thomas Heijligen has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/62899 ) Change subject: Endian conversion: move to platform.h and platform/endian*.c ...................................................................... Endian conversion: move to platform.h and platform/endian*.c Starting to move the platform dependent code to platform/ and provide the abstraction through the platform.h header. Change-Id: I35640282d451960f2a329ae24339ec05dbae6d30 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> --- M Makefile D hwaccess_endian_big.c M hwaccess_physmap.c M meson.build R platform.h R platform/endian.c R platform/endian_big.c C platform/endian_little.c 8 files changed, 32 insertions(+), 116 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/99/62899/1 diff --git a/Makefile b/Makefile index 08549eb..1321c11 100644 --- a/Makefile +++ b/Makefile @@ -371,14 +371,14 @@ # Library code. LIB_OBJS = libflashrom.o layout.o flashrom.o udelay.o programmer.o programmer_table.o \ - helpers.o ich_descriptors.o fmap.o hwaccess.o + helpers.o ich_descriptors.o fmap.o + +LIB_OBJS += platform/endian.o platform/endian_$(ENDIAN).o ifeq ($(ENDIAN), little) -LIB_OBJS += hwaccess_endian_little.o FEATURE_FLAGS += -D'__FLASHROM_LITTLE_ENDIAN__=1' endif ifeq ($(ENDIAN), big) -LIB_OBJS += hwaccess_endian_big.o FEATURE_FLAGS += -D'__FLASHROM_BIG_ENDIAN__=1' endif @@ -978,7 +978,8 @@ # This includes all frontends and libflashrom. # We don't use EXEC_SUFFIX here because we want to clean everything. clean: - rm -f $(PROGRAM) $(PROGRAM).exe libflashrom.a $(filter-out Makefile.d, $(wildcard *.d *.o)) $(PROGRAM).8 $(PROGRAM).8.html $(BUILD_DETAILS_FILE) + rm -f $(PROGRAM) $(PROGRAM).exe libflashrom.a $(filter-out Makefile.d, $(wildcard *.d *.o platform/*.d platform/*.o)) \ + $(PROGRAM).8 $(PROGRAM).8.html $(BUILD_DETAILS_FILE) @+$(MAKE) -C util/ich_descriptors_tool/ clean install: $(PROGRAM)$(EXEC_SUFFIX) $(PROGRAM).8 diff --git a/hwaccess_endian_big.c b/hwaccess_endian_big.c deleted file mode 100644 index fd122dc..0000000 --- a/hwaccess_endian_big.c +++ /dev/null @@ -1,85 +0,0 @@ -#include "hwaccess.h" - -/* convert cpu native endian to little endian */ -uint8_t cpu_to_le8 (const uint8_t value) -{ - return swap8(value); -} - -uint16_t cpu_to_le16(const uint16_t value) -{ - return swap16(value); -} - -uint32_t cpu_to_le32(const uint32_t value) -{ - return swap32(value); -} - -uint64_t cpu_to_le64(const uint64_t value) -{ - return swap64(value); -} - -/* convert cpu native endian to big endian */ -uint8_t cpu_to_be8 (const uint8_t value) -{ - return value; -} - -uint16_t cpu_to_be16(const uint16_t value) -{ - return value; -} - -uint32_t cpu_to_be32(const uint32_t value) -{ - return value; -} - -uint64_t cpu_to_be64(const uint64_t value) -{ - return value; -} - -/* convert little endian to cpu native endian */ -uint8_t le_to_cpu8 (const uint8_t value) -{ - return swap8(value); -} - -uint16_t le_to_cpu16(const uint16_t value) -{ - return swap16(value); -} - -uint32_t le_to_cpu32(const uint32_t value) -{ - return swap32(value); -} - -uint64_t le_to_cpu64(const uint64_t value) -{ - return swap64(value); -} - -/* convert big endian to cpu native endian */ -uint8_t be_to_cpu8 (const uint8_t value) -{ - return value; -} - -uint16_t be_to_cpu16(const uint16_t value) -{ - return value; -} - -uint32_t be_to_cpu32(const uint32_t value) -{ - return value; -} - -uint64_t be_to_cpu64(const uint64_t value) -{ - return value; -} diff --git a/hwaccess_physmap.c b/hwaccess_physmap.c index b1b9c64..428893d 100644 --- a/hwaccess_physmap.c +++ b/hwaccess_physmap.c @@ -24,7 +24,7 @@ #include <string.h> #include <errno.h> #include "flash.h" -#include "hwaccess.h" +#include "platform.h" #include "hwaccess_physmap.h" #if !defined(__DJGPP__) && !defined(__LIBPAYLOAD__) diff --git a/meson.build b/meson.build index 5275bd2..906a4ec 100644 --- a/meson.build +++ b/meson.build @@ -135,13 +135,13 @@ add_project_arguments('-DHAVE_UTSNAME=1', language : 'c') endif -srcs += 'hwaccess.c' +srcs += 'platform/endian.c' if host_machine.endian() == 'little' - srcs += 'hwaccess_endian_little.c' + srcs += 'platform/endian_little.c' add_project_arguments('-D__FLASHROM_LITTLE_ENDIAN__=1', language : 'c') endif if host_machine.endian() == 'big' - srcs += 'hwaccess_endian_big.c' + srcs += 'platform/endian_big.c' add_project_arguments('-D__FLASHROM_BIG_ENDIAN__=1', language : 'c') endif diff --git a/hwaccess.h b/platform.h similarity index 91% rename from hwaccess.h rename to platform.h index 4c330c4..6c26ff9 100644 --- a/hwaccess.h +++ b/platform.h @@ -16,11 +16,11 @@ */ /* - * Header file for hardware access and OS abstraction. Included from flash.h. + * Header file for platform abstraction. */ -#ifndef __HWACCESS_H__ -#define __HWACCESS_H__ 1 +#ifndef __PLATFORM_H__ +#define __PLATFORM_H__ 1 #include <stdint.h> @@ -54,4 +54,4 @@ uint32_t be_to_cpu32(const uint32_t value); uint64_t be_to_cpu64(const uint64_t value); -#endif /* !__HWACCESS_H__ */ +#endif /* !__PLATFORM_H__ */ diff --git a/hwaccess.c b/platform/endian.c similarity index 96% rename from hwaccess.c rename to platform/endian.c index 39f4133..8f38abb 100644 --- a/hwaccess.c +++ b/platform/endian.c @@ -1,4 +1,4 @@ -#include "hwaccess.h" +#include "../platform.h" uint8_t swap8 (const uint8_t value) { diff --git a/hwaccess_endian_little.c b/platform/endian_big.c similarity index 97% rename from hwaccess_endian_little.c rename to platform/endian_big.c index 4446ce2..28e6e0b 100644 --- a/hwaccess_endian_little.c +++ b/platform/endian_big.c @@ -1,85 +1,85 @@ -#include "hwaccess.h" +#include "../platform.h" /* convert cpu native endian to little endian */ uint8_t cpu_to_le8 (const uint8_t value) { - return value; + return swap8(value); } uint16_t cpu_to_le16(const uint16_t value) { - return value; + return swap16(value); } uint32_t cpu_to_le32(const uint32_t value) { - return value; + return swap32(value); } uint64_t cpu_to_le64(const uint64_t value) { - return value; + return swap64(value); } /* convert cpu native endian to big endian */ uint8_t cpu_to_be8 (const uint8_t value) { - return swap8(value); + return value; } uint16_t cpu_to_be16(const uint16_t value) { - return swap16(value); + return value; } uint32_t cpu_to_be32(const uint32_t value) { - return swap32(value); + return value; } uint64_t cpu_to_be64(const uint64_t value) { - return swap64(value); + return value; } /* convert little endian to cpu native endian */ uint8_t le_to_cpu8 (const uint8_t value) { - return value; + return swap8(value); } uint16_t le_to_cpu16(const uint16_t value) { - return value; + return swap16(value); } uint32_t le_to_cpu32(const uint32_t value) { - return value; + return swap32(value); } uint64_t le_to_cpu64(const uint64_t value) { - return value; + return swap64(value); } /* convert big endian to cpu native endian */ uint8_t be_to_cpu8 (const uint8_t value) { - return swap8(value); + return value; } uint16_t be_to_cpu16(const uint16_t value) { - return swap16(value); + return value; } uint32_t be_to_cpu32(const uint32_t value) { - return swap32(value); + return value; } uint64_t be_to_cpu64(const uint64_t value) { - return swap64(value); + return value; } diff --git a/hwaccess_endian_little.c b/platform/endian_little.c similarity index 97% copy from hwaccess_endian_little.c copy to platform/endian_little.c index 4446ce2..6331ee3 100644 --- a/hwaccess_endian_little.c +++ b/platform/endian_little.c @@ -1,4 +1,4 @@ -#include "hwaccess.h" +#include "../platform.h" /* convert cpu native endian to little endian */ uint8_t cpu_to_le8 (const uint8_t value) -- To view, visit https://review.coreboot.org/c/flashrom/+/62899 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I35640282d451960f2a329ae24339ec05dbae6d30 Gerrit-Change-Number: 62899 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: hwaccess: replace macros by C code
by Thomas Heijligen (Code Review) 17 Mar '22

17 Mar '22

Thomas Heijligen has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/62898 ) Change subject: hwaccess: replace macros by C code ...................................................................... hwaccess: replace macros by C code Split the code for endian convertion into a file for big and one for little endian. The buildsystem selects the right file for the used endian. Elaborate the macros into plain C code for better and easier understanding. Change-Id: I86d38d816b37c283279c485fac8027f8fb94364a Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> --- M Makefile A hwaccess.c M hwaccess.h A hwaccess_endian_big.c A hwaccess_endian_little.c M meson.build 6 files changed, 255 insertions(+), 79 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/98/62898/1 diff --git a/Makefile b/Makefile index f5ed409..08549eb 100644 --- a/Makefile +++ b/Makefile @@ -344,13 +344,6 @@ $(call mark_unsupported, $(DEPENDS_ON_SERIAL)) endif -ifeq ($(ENDIAN), little) -FEATURE_FLAGS += -D'__FLASHROM_LITTLE_ENDIAN__=1' -endif -ifeq ($(ENDIAN), big) -FEATURE_FLAGS += -D'__FLASHROM_BIG_ENDIAN__=1' -endif - # PCI port I/O support is unimplemented on PPC/MIPS/SPARC and unavailable on ARM. # Right now this means the drivers below only work on x86. ifneq ($(ARCH), x86) @@ -377,7 +370,17 @@ ############################################################################### # Library code. -LIB_OBJS = libflashrom.o layout.o flashrom.o udelay.o programmer.o programmer_table.o helpers.o ich_descriptors.o fmap.o +LIB_OBJS = libflashrom.o layout.o flashrom.o udelay.o programmer.o programmer_table.o \ + helpers.o ich_descriptors.o fmap.o hwaccess.o + +ifeq ($(ENDIAN), little) +LIB_OBJS += hwaccess_endian_little.o +FEATURE_FLAGS += -D'__FLASHROM_LITTLE_ENDIAN__=1' +endif +ifeq ($(ENDIAN), big) +LIB_OBJS += hwaccess_endian_big.o +FEATURE_FLAGS += -D'__FLASHROM_BIG_ENDIAN__=1' +endif ############################################################################### # Frontend related stuff. diff --git a/hwaccess.c b/hwaccess.c new file mode 100644 index 0000000..39f4133 --- /dev/null +++ b/hwaccess.c @@ -0,0 +1,36 @@ +#include "hwaccess.h" + +uint8_t swap8 (const uint8_t value) +{ + return (value & (uint8_t)0xffU); +} + +uint16_t swap16(const uint16_t value) +{ + return + ((value & (uint16_t)0x00ffU) << 8) | + ((value & (uint16_t)0xff00U) >> 8); + +} + +uint32_t swap32(const uint32_t value) +{ + return + ((value & (uint32_t)0x000000ffUL) << 24) | + ((value & (uint32_t)0x0000ff00UL) << 8) | + ((value & (uint32_t)0x00ff0000UL) >> 8) | + ((value & (uint32_t)0xff000000UL) >> 24); +} + +uint64_t swap64(const uint64_t value) +{ + return + ((value & (uint64_t)0x00000000000000ffULL) << 56) | + ((value & (uint64_t)0x000000000000ff00ULL) << 40) | + ((value & (uint64_t)0x0000000000ff0000ULL) << 24) | + ((value & (uint64_t)0x00000000ff000000ULL) << 8) | + ((value & (uint64_t)0x000000ff00000000ULL) >> 8) | + ((value & (uint64_t)0x0000ff0000000000ULL) >> 24) | + ((value & (uint64_t)0x00ff000000000000ULL) >> 40) | + ((value & (uint64_t)0xff00000000000000ULL) >> 56); +} diff --git a/hwaccess.h b/hwaccess.h index 98ca08e..4c330c4 100644 --- a/hwaccess.h +++ b/hwaccess.h @@ -2,6 +2,8 @@ * This file is part of the flashrom project. * * Copyright (C) 2009 Carl-Daniel Hailfinger + * Copyright (C) 2022 secunet Secure Networg AG + * (written by Thomas Heijligen <thomas.heijligen(a)secunet.com) * * 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 @@ -20,74 +22,36 @@ #ifndef __HWACCESS_H__ #define __HWACCESS_H__ 1 -#define ___constant_swab8(x) ((uint8_t) ( \ - (((uint8_t)(x) & (uint8_t)0xffU)))) +#include <stdint.h> -#define ___constant_swab16(x) ((uint16_t) ( \ - (((uint16_t)(x) & (uint16_t)0x00ffU) << 8) | \ - (((uint16_t)(x) & (uint16_t)0xff00U) >> 8))) +/* swap bytes */ +uint8_t swap8 (const uint8_t value); +uint16_t swap16(const uint16_t value); +uint32_t swap32(const uint32_t value); +uint64_t swap64(const uint64_t value); -#define ___constant_swab32(x) ((uint32_t) ( \ - (((uint32_t)(x) & (uint32_t)0x000000ffUL) << 24) | \ - (((uint32_t)(x) & (uint32_t)0x0000ff00UL) << 8) | \ - (((uint32_t)(x) & (uint32_t)0x00ff0000UL) >> 8) | \ - (((uint32_t)(x) & (uint32_t)0xff000000UL) >> 24))) +/* convert cpu native endian to little endian */ +uint8_t cpu_to_le8 (const uint8_t value); +uint16_t cpu_to_le16(const uint16_t value); +uint32_t cpu_to_le32(const uint32_t value); +uint64_t cpu_to_le64(const uint64_t value); -#define ___constant_swab64(x) ((uint64_t) ( \ - (((uint64_t)(x) & (uint64_t)0x00000000000000ffULL) << 56) | \ - (((uint64_t)(x) & (uint64_t)0x000000000000ff00ULL) << 40) | \ - (((uint64_t)(x) & (uint64_t)0x0000000000ff0000ULL) << 24) | \ - (((uint64_t)(x) & (uint64_t)0x00000000ff000000ULL) << 8) | \ - (((uint64_t)(x) & (uint64_t)0x000000ff00000000ULL) >> 8) | \ - (((uint64_t)(x) & (uint64_t)0x0000ff0000000000ULL) >> 24) | \ - (((uint64_t)(x) & (uint64_t)0x00ff000000000000ULL) >> 40) | \ - (((uint64_t)(x) & (uint64_t)0xff00000000000000ULL) >> 56))) +/* convert cpu native endian to big endian */ +uint8_t cpu_to_be8 (const uint8_t value); +uint16_t cpu_to_be16(const uint16_t value); +uint32_t cpu_to_be32(const uint32_t value); +uint64_t cpu_to_be64(const uint64_t value); -#if defined (__FLASHROM_BIG_ENDIAN__) +/* convert little endian to cpu native endian */ +uint8_t le_to_cpu8 (const uint8_t value); +uint16_t le_to_cpu16(const uint16_t value); +uint32_t le_to_cpu32(const uint32_t value); +uint64_t le_to_cpu64(const uint64_t value); -#define cpu_to_le(bits) \ -static inline uint##bits##_t cpu_to_le##bits(uint##bits##_t val) \ -{ \ - return ___constant_swab##bits(val); \ -} - -cpu_to_le(8) -cpu_to_le(16) -cpu_to_le(32) -cpu_to_le(64) - -#define cpu_to_be8 -#define cpu_to_be16 -#define cpu_to_be32 -#define cpu_to_be64 - -#elif defined (__FLASHROM_LITTLE_ENDIAN__) - -#define cpu_to_be(bits) \ -static inline uint##bits##_t cpu_to_be##bits(uint##bits##_t val) \ -{ \ - return ___constant_swab##bits(val); \ -} - -cpu_to_be(8) -cpu_to_be(16) -cpu_to_be(32) -cpu_to_be(64) - -#define cpu_to_le8 -#define cpu_to_le16 -#define cpu_to_le32 -#define cpu_to_le64 - -#endif /* __FLASHROM_BIG_ENDIAN__ / __FLASHROM_LITTLE_ENDIAN__ */ - -#define be_to_cpu8 cpu_to_be8 -#define be_to_cpu16 cpu_to_be16 -#define be_to_cpu32 cpu_to_be32 -#define be_to_cpu64 cpu_to_be64 -#define le_to_cpu8 cpu_to_le8 -#define le_to_cpu16 cpu_to_le16 -#define le_to_cpu32 cpu_to_le32 -#define le_to_cpu64 cpu_to_le64 +/* convert big endian to cpu native endian */ +uint8_t be_to_cpu8 (const uint8_t value); +uint16_t be_to_cpu16(const uint16_t value); +uint32_t be_to_cpu32(const uint32_t value); +uint64_t be_to_cpu64(const uint64_t value); #endif /* !__HWACCESS_H__ */ diff --git a/hwaccess_endian_big.c b/hwaccess_endian_big.c new file mode 100644 index 0000000..fd122dc --- /dev/null +++ b/hwaccess_endian_big.c @@ -0,0 +1,85 @@ +#include "hwaccess.h" + +/* convert cpu native endian to little endian */ +uint8_t cpu_to_le8 (const uint8_t value) +{ + return swap8(value); +} + +uint16_t cpu_to_le16(const uint16_t value) +{ + return swap16(value); +} + +uint32_t cpu_to_le32(const uint32_t value) +{ + return swap32(value); +} + +uint64_t cpu_to_le64(const uint64_t value) +{ + return swap64(value); +} + +/* convert cpu native endian to big endian */ +uint8_t cpu_to_be8 (const uint8_t value) +{ + return value; +} + +uint16_t cpu_to_be16(const uint16_t value) +{ + return value; +} + +uint32_t cpu_to_be32(const uint32_t value) +{ + return value; +} + +uint64_t cpu_to_be64(const uint64_t value) +{ + return value; +} + +/* convert little endian to cpu native endian */ +uint8_t le_to_cpu8 (const uint8_t value) +{ + return swap8(value); +} + +uint16_t le_to_cpu16(const uint16_t value) +{ + return swap16(value); +} + +uint32_t le_to_cpu32(const uint32_t value) +{ + return swap32(value); +} + +uint64_t le_to_cpu64(const uint64_t value) +{ + return swap64(value); +} + +/* convert big endian to cpu native endian */ +uint8_t be_to_cpu8 (const uint8_t value) +{ + return value; +} + +uint16_t be_to_cpu16(const uint16_t value) +{ + return value; +} + +uint32_t be_to_cpu32(const uint32_t value) +{ + return value; +} + +uint64_t be_to_cpu64(const uint64_t value) +{ + return value; +} diff --git a/hwaccess_endian_little.c b/hwaccess_endian_little.c new file mode 100644 index 0000000..4446ce2 --- /dev/null +++ b/hwaccess_endian_little.c @@ -0,0 +1,85 @@ +#include "hwaccess.h" + +/* convert cpu native endian to little endian */ +uint8_t cpu_to_le8 (const uint8_t value) +{ + return value; +} + +uint16_t cpu_to_le16(const uint16_t value) +{ + return value; +} + +uint32_t cpu_to_le32(const uint32_t value) +{ + return value; +} + +uint64_t cpu_to_le64(const uint64_t value) +{ + return value; +} + +/* convert cpu native endian to big endian */ +uint8_t cpu_to_be8 (const uint8_t value) +{ + return swap8(value); +} + +uint16_t cpu_to_be16(const uint16_t value) +{ + return swap16(value); +} + +uint32_t cpu_to_be32(const uint32_t value) +{ + return swap32(value); +} + +uint64_t cpu_to_be64(const uint64_t value) +{ + return swap64(value); +} + +/* convert little endian to cpu native endian */ +uint8_t le_to_cpu8 (const uint8_t value) +{ + return value; +} + +uint16_t le_to_cpu16(const uint16_t value) +{ + return value; +} + +uint32_t le_to_cpu32(const uint32_t value) +{ + return value; +} + +uint64_t le_to_cpu64(const uint64_t value) +{ + return value; +} + +/* convert big endian to cpu native endian */ +uint8_t be_to_cpu8 (const uint8_t value) +{ + return swap8(value); +} + +uint16_t be_to_cpu16(const uint16_t value) +{ + return swap16(value); +} + +uint32_t be_to_cpu32(const uint32_t value) +{ + return swap32(value); +} + +uint64_t be_to_cpu64(const uint64_t value) +{ + return swap64(value); +} diff --git a/meson.build b/meson.build index b7fc25f..5275bd2 100644 --- a/meson.build +++ b/meson.build @@ -29,13 +29,6 @@ add_project_arguments('-D_BSD_SOURCE', language : 'c') # required for glibc < v2.19 add_project_arguments('-DFLASHROM_VERSION="' + meson.project_version() + '"', language : 'c') -if host_machine.endian() == 'little' - add_project_arguments('-D__FLASHROM_LITTLE_ENDIAN__=1', language : 'c') -endif -if host_machine.endian() == 'big' - add_project_arguments('-D__FLASHROM_BIG_ENDIAN__=1', language : 'c') -endif - if host_machine.system() in ['cygwin', 'windows'] add_project_arguments('-DIS_WINDOWS=1', language : 'c') else @@ -142,6 +135,16 @@ add_project_arguments('-DHAVE_UTSNAME=1', language : 'c') endif +srcs += 'hwaccess.c' +if host_machine.endian() == 'little' + srcs += 'hwaccess_endian_little.c' + add_project_arguments('-D__FLASHROM_LITTLE_ENDIAN__=1', language : 'c') +endif +if host_machine.endian() == 'big' + srcs += 'hwaccess_endian_big.c' + add_project_arguments('-D__FLASHROM_BIG_ENDIAN__=1', language : 'c') +endif + # some programmers require libusb if get_option('usb') srcs += 'usbdev.c' -- To view, visit https://review.coreboot.org/c/flashrom/+/62898 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I86d38d816b37c283279c485fac8027f8fb94364a Gerrit-Change-Number: 62898 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: hwaccess_x86_msr: drop outdated comment
by Thomas Heijligen (Code Review) 17 Mar '22

17 Mar '22

Thomas Heijligen has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/62897 ) Change subject: hwaccess_x86_msr: drop outdated comment ...................................................................... hwaccess_x86_msr: drop outdated comment Change-Id: Ia361f7f3392b4f58a33f3e2d3b5f8f4340c388b3 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> --- M hwaccess_x86_msr.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/97/62897/1 diff --git a/hwaccess_x86_msr.c b/hwaccess_x86_msr.c index 79cf2f8..3728061 100644 --- a/hwaccess_x86_msr.c +++ b/hwaccess_x86_msr.c @@ -17,7 +17,7 @@ */ /* 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. + * and a non-working default implementation on the bottom. */ #include "hwaccess_x86_msr.h" -- To view, visit https://review.coreboot.org/c/flashrom/+/62897 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ia361f7f3392b4f58a33f3e2d3b5f8f4340c388b3 Gerrit-Change-Number: 62897 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: ichspi: Add support for 64KB SPI erase operation
by Subrata Banik (Code Review) 17 Mar '22

17 Mar '22

Attention is currently required from: Nico Huber, Subrata Banik, Edward O'Callaghan, Angel Pons, Anastasia Klimchuk. Hello build bot (Jenkins), Nico Huber, Edward O'Callaghan, Angel Pons, Anastasia Klimchuk, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/62870 to look at the new patch set (#6). Change subject: ichspi: Add support for 64KB SPI erase operation ...................................................................... ichspi: Add support for 64KB SPI erase operation This patch add support for SPI HW sequencing 64KB erase operation based on erase_block size and `only_4k` flag is not set. BUG=b:223630977 TEST=Able to perform SPI erase operation on brya. Signed-off-by: Subrata Banik <subratabanik(a)google.com> Change-Id: I534471dc8eeeed66e5cbc44baadcd2448d21d34d --- M ichspi.c 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/70/62870/6 -- To view, visit https://review.coreboot.org/c/flashrom/+/62870 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I534471dc8eeeed66e5cbc44baadcd2448d21d34d Gerrit-Change-Number: 62870 Gerrit-PatchSet: 6 Gerrit-Owner: Subrata Banik <subratabanik(a)google.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> 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: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Subrata Banik <subratabanik(a)google.com> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newpatchset

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit March 2022