December 2021 - flashrom-gerrit

Change in flashrom[master]: ichspi: Extract handling programmer param into a function
by Anastasia Klimchuk (Code Review) 23 Dec '21

23 Dec '21

Attention is currently required from: Edward O'Callaghan, Angel Pons, Anastasia Klimchuk, Nikolai Artemiev. Hello build bot (Jenkins), Nico Huber, Edward O'Callaghan, Angel Pons, Nikolai Artemiev, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/58736 to look at the new patch set (#4). Change subject: ichspi: Extract handling programmer param into a function ...................................................................... ichspi: Extract handling programmer param into a function Extract processing of ich_spi_mode into a separate function which is called from init_ich_default. This makes init_ich_default more readable and avoids one local variable. TEST ME ON ICH7 BUG=b:204488958 TEST=Check that the following scenarios still behave properly: 1) probe-read-verify-erase section-write-reboot on Intel octopus board with GD25LQ128C/GD25LQ128D/GD25LQ128E 2) probe and read on Panther Point (7 series PCH) Change-Id: I20e2379a6fd58c9346f0a2d6daf2b8decf1f6976 Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> Tested-by: Anastasia Klimchuk <aklm(a)chromium.org> Tested-by: Nico Huber <nico.h(a)gmx.de> --- M ichspi.c 1 file changed, 37 insertions(+), 27 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/36/58736/4 -- To view, visit https://review.coreboot.org/c/flashrom/+/58736 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I20e2379a6fd58c9346f0a2d6daf2b8decf1f6976 Gerrit-Change-Number: 58736 Gerrit-PatchSet: 4 Gerrit-Owner: 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: Felix Singer <felixsinger(a)posteo.net> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> 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-Attention: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: ichspi: Split very long init function into two
by Anastasia Klimchuk (Code Review) 23 Dec '21

23 Dec '21

Attention is currently required from: Felix Singer, Edward O'Callaghan, Angel Pons, Anastasia Klimchuk, Nikolai Artemiev. Hello build bot (Jenkins), Nico Huber, Edward O'Callaghan, Angel Pons, Nikolai Artemiev, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/58735 to look at the new patch set (#4). Change subject: ichspi: Split very long init function into two ...................................................................... ichspi: Split very long init function into two ich_init_spi is very long, but logically it can be split. Init function detects the chipset and then the rest of operations depends on the chipset. Init function is more readable now, it consists of only a switch. Initialisation of hwseq and swseq that used to happen in the beginning of init function now moved to init_ich_default, because hwseq and swseq are only used for chipsets served by init_ich_default. TEST ME ON ICH7 BUG=b:204488958 TEST=Check that the following scenarios still behave properly: 1) probe-read-verify-erase section-write-reboot on Intel octopus board with GD25LQ128C/GD25LQ128D/GD25LQ128E 2) probe and read on Panther Point (7 series PCH) Change-Id: I6789bc456a4878e6555831ae0b80ecbdbf62938b Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> Tested-by: Anastasia Klimchuk <aklm(a)chromium.org> Tested-by: Nico Huber <nico.h(a)gmx.de> --- M ichspi.c 1 file changed, 268 insertions(+), 255 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/35/58735/4 -- To view, visit https://review.coreboot.org/c/flashrom/+/58735 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I6789bc456a4878e6555831ae0b80ecbdbf62938b Gerrit-Change-Number: 58735 Gerrit-PatchSet: 4 Gerrit-Owner: 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: Felix Singer <felixsinger(a)posteo.net> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> 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-Attention: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: ichspi: Extract initialisation of swseq and hwseq into a function
by Nico Huber (Code Review) 22 Dec '21

22 Dec '21

Attention is currently required from: Felix Singer, Angel Pons, Anastasia Klimchuk, Nikolai Artemiev. Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/58737 ) Change subject: ichspi: Extract initialisation of swseq and hwseq into a function ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/58737 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I7d62b1b380e497b82dcae1284d752204cc541bd3 Gerrit-Change-Number: 58737 Gerrit-PatchSet: 3 Gerrit-Owner: 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: Felix Singer <felixsinger(a)posteo.net> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Attention: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Comment-Date: Wed, 22 Dec 2021 23:58:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: ichspi: Extract handling programmer param into a function
by Nico Huber (Code Review) 22 Dec '21

22 Dec '21

Attention is currently required from: Edward O'Callaghan, Angel Pons, Anastasia Klimchuk, Nikolai Artemiev. Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/58736 ) Change subject: ichspi: Extract handling programmer param into a function ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/58736 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I20e2379a6fd58c9346f0a2d6daf2b8decf1f6976 Gerrit-Change-Number: 58736 Gerrit-PatchSet: 3 Gerrit-Owner: 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: Felix Singer <felixsinger(a)posteo.net> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> 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-Attention: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Comment-Date: Wed, 22 Dec 2021 23:55:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: ichspi: Split very long init function into two
by Nico Huber (Code Review) 22 Dec '21

22 Dec '21

Attention is currently required from: Felix Singer, Edward O'Callaghan, Angel Pons, Anastasia Klimchuk, Nikolai Artemiev. Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/58735 ) Change subject: ichspi: Split very long init function into two ...................................................................... Patch Set 3: (3 comments) Commit Message: https://review.coreboot.org/c/flashrom/+/58735/comment/d678342d_572a1381 PS3, Line 20: TEST=1) probe-read-verify-erase section-write-reboot : on Intel octopus board with GD25LQ128C/GD25LQ128D/GD25LQ128E : 2) probe and read on Panther Point (7 series PCH) > If you still need a `TEST=` tag for some reason, you could do something like this: […] Generally it seems fine to me to add all the existing test info. About Tested-by: You are right to ask, IMHO, as it sets somebody else's name in stone, kind of (Git virtually never forgets). When somebody is CC'ed on Gerrit, I guess it doesn't matter much (people could at least object). But if not, better ask them personally. For active contributors I think we can imply their consent :) We don't have a rule for presence of Tested-by tags, AFAIK. Patchset: PS1: > To close the comment: I could not find devices with older chipsets, but Nico saved me and tested tho […] Sorry to disappoint. There seems to be a misunderstanding. PCHs inherited the generation numbers from MCHs, not ICHs. So ICH7 is something different, much older. We could ask in #flashrom and #coreboot channels for ICH7 testers. There are some famous machines, e.g. ThinkPad X60/T60, with it. Or let's try this: Angel, do you have any ICH7 board ready to boot? :) File ichspi.c: https://review.coreboot.org/c/flashrom/+/58735/comment/2b377824_4f881118 PS1, Line 1717: msg_pdbg("0x00: 0x%04x (SPIS)\n", : mmio_readw(spibar + 0)); : msg_pdbg("0x02: 0x%04x (SPIC)\n", : mmio_readw(spibar + 2)); : msg_pdbg("0x04: 0x%08x (SPIA)\n", : mmio_readl(spibar + 4)); : ichspi_bbar = mmio_readl(spibar + 0x50); : msg_pdbg("0x50: 0x%08x (BBAR)\n", : ichspi_bbar); : msg_pdbg("0x54: 0x%04x (PREOP)\n", : mmio_readw(spibar + 0x54)); : msg_pdbg("0x56: 0x%04x (OPTYPE)\n", : mmio_readw(spibar + 0x56)); : msg_pdbg("0x58: 0x%08x (OPMENU)\n", : mmio_readl(spibar + 0x58)); : msg_pdbg("0x5c: 0x%08x (OPMENU+4)\n", : mmio_readl(spibar + 0x5c)); > Done in CB:60272. […] Would have preferred it here, it seems wrong to change lines and then fix them up right away. No strong feelings, though. -- To view, visit https://review.coreboot.org/c/flashrom/+/58735 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I6789bc456a4878e6555831ae0b80ecbdbf62938b Gerrit-Change-Number: 58735 Gerrit-PatchSet: 3 Gerrit-Owner: 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: Felix Singer <felixsinger(a)posteo.net> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> 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-Attention: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Comment-Date: Wed, 22 Dec 2021 23:53:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Felix Singer <felixsinger(a)posteo.net> Comment-In-Reply-To: Nico Huber <nico.h(a)gmx.de> Comment-In-Reply-To: Angel Pons <th3fanbus(a)gmail.com> Comment-In-Reply-To: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: comment

1 0

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

22 Dec '21

Attention is currently required from: Thomas Heijligen, Paul Menzel, Angel Pons. Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/59230 ) Change subject: Makefile: clean up variables ...................................................................... Patch Set 6: Code-Review+2 (1 comment) Commit Message: https://review.coreboot.org/c/flashrom/+/59230/comment/40fa9c4a_48a42337 PS6, Line 12: unusd unus*e*d -- To view, visit https://review.coreboot.org/c/flashrom/+/59230 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I1c9e869377677d624469af1ee9ece9a28fc3b559 Gerrit-Change-Number: 59230 Gerrit-PatchSet: 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: 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-Attention: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Wed, 22 Dec 2021 23:24:16 +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 15: Code-Review+1 (2 comments) File Makefile: https://review.coreboot.org/c/flashrom/+/59050/comment/740bae06_48f34f9e PS15, Line 866: USE_X86_MSR := $(if $(call filter_deps,$(DEPENDS_ON_X86_MSR)),yes,no) Is this split done intentionally in this patch? or did it sneak into the rebase? Risking to state the obvious: I'd prefer a separate patch ;) If it needs to be in this patch, the commit message should cover it. There is also an important message: we don't imply anymore that libpci requires raw access (AFAICS). https://review.coreboot.org/c/flashrom/+/59050/comment/d6b5c72e_baebba42 PS15, Line 882: $(filter yes, $(USE_X86_MSR) $(USE_X86_PORT_IO) $(USE_RAW_MEM_ACCESS))) `$(filter )` picks words from the second argument, kind of the haystack. So this could result in multiple `yes` and then the `ifeq` wouldn't match anymore. You can turn the arguments around: $(filter $(USE_X86_MSR) $(USE_X86_PORT_IO) $(USE_RAW_MEM_ACCESS), yes) This can only return one `yes` because there is only one in the haystack to find. -- 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: 15 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: 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 23:22:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

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

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/60114 ) 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> Reviewed-on: https://review.coreboot.org/c/flashrom/+/60114 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> --- M Makefile 1 file changed, 48 insertions(+), 9 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved diff --git a/Makefile b/Makefile index c985ae0..9a6d7b0 100644 --- a/Makefile +++ b/Makefile @@ -107,6 +107,40 @@ CONFIG_PONY_SPI \ CONFIG_RAYER_SPI \ +DEPENDS_ON_RAW_MEM_ACCESS := \ + CONFIG_ATAPROMISE \ + CONFIG_DRKAISER \ + CONFIG_GFXNVIDIA \ + CONFIG_INTERNAL \ + CONFIG_IT8212 \ + CONFIG_NICINTEL \ + CONFIG_NICINTEL_EEPROM \ + CONFIG_NICINTEL_SPI \ + CONFIG_OGP_SPI \ + CONFIG_SATAMV \ + CONFIG_SATASII \ + +DEPENDS_ON_X86_MSR := \ + CONFIG_INTERNAL \ + +DEPENDS_ON_X86_PORT_IO := \ + CONFIG_ATAHPT \ + CONFIG_ATAPROMISE \ + CONFIG_ATAVIA \ + CONFIG_DRKAISER \ + CONFIG_GFXNVIDIA \ + CONFIG_INTERNAL \ + CONFIG_NIC3COM \ + CONFIG_NICINTEL \ + CONFIG_NICINTEL_EEPROM \ + CONFIG_NICINTEL_SPI \ + CONFIG_NICNATSEMI \ + CONFIG_NICREALTEK \ + CONFIG_OGP_SPI \ + CONFIG_RAYER_SPI \ + CONFIG_SATAMV \ + CONFIG_SATASII \ + DEPENDS_ON_LIBPCI := \ CONFIG_ATAHPT \ CONFIG_ATAPROMISE \ @@ -255,7 +289,13 @@ # For now we disable all PCI-based programmers on Windows/MinGW (no libpci). $(call mark_unsupported,$(DEPENDS_ON_LIBPCI)) # And programmers that need raw access. -$(call mark_unsupported,CONFIG_RAYER_SPI) +$(call mark_unsupported,$(DEPENDS_ON_RAW_MEM_ACCESS)) + +else # No MinGW + +# NI USB-845x only supported on Windows at the moment +$(call mark_unsupported,CONFIG_NI845X_SPI) + endif ifeq ($(TARGET_OS), libpayload) @@ -268,7 +308,9 @@ # libpayload does not provide the romsize field in struct pci_dev that the atapromise code requires. $(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) +$(call mark_unsupported,$(DEPENDS_ON_SERIAL)) +# Dediprog, Developerbox, USB-Blaster, PICkit2, CH341A and FT2232 are not supported with libpayload (missing libusb support). +$(call mark_unsupported,$(DEPENDS_ON_LIBUSB1) $(DEPENDS_ON_LIBFTDI) $(DEPENDS_ON_LIBJAYLINK)) endif ifeq ($(HAS_LINUX_MTD), no) @@ -285,7 +327,7 @@ ifeq ($(TARGET_OS), Android) # Android on x86 (currently) does not provide raw PCI port I/O operations. -$(call mark_unsupported,CONFIG_RAYER_SPI) +$(call mark_unsupported,$(DEPENDS_ON_X86_PORT_IO)) endif # Disable the internal programmer on unsupported architectures (everything but x86 and mipsel) @@ -319,18 +361,15 @@ # 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) -$(call mark_unsupported,CONFIG_NIC3COM CONFIG_NICREALTEK CONFIG_NICNATSEMI) -$(call mark_unsupported,CONFIG_RAYER_SPI CONFIG_ATAHPT CONFIG_ATAPROMISE) -$(call mark_unsupported,CONFIG_SATAMV) +$(call mark_unsupported,$(DEPENDS_ON_X86_MSR)) +$(call mark_unsupported,$(DEPENDS_ON_X86_PORT_IO)) endif # Additionally disable all drivers needing raw access (memory, PCI, port I/O) # on architectures with unknown raw access properties. # Right now those architectures are alpha hppa m68k sh s390 ifneq ($(ARCH), $(filter $(ARCH), x86 mips ppc arm sparc arc)) -$(call mark_unsupported,CONFIG_GFXNVIDIA CONFIG_SATASII CONFIG_ATAVIA) -$(call mark_unsupported,CONFIG_DRKAISER CONFIG_NICINTEL CONFIG_NICINTEL_SPI) -$(call mark_unsupported,CONFIG_NICINTEL_EEPROM CONFIG_OGP_SPI CONFIG_IT8212) +$(call mark_unsupported,$(DEPENDS_ON_RAW_MEM_ACCESS)) endif ifeq ($(TARGET_OS), $(filter $(TARGET_OS), Linux Darwin NetBSD OpenBSD)) -- 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: 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]: 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 6: Code-Review+2 -- 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-Comment-Date: Wed, 22 Dec 2021 22:54:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

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

22 Dec '21

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/60113 ) 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> Reviewed-on: https://review.coreboot.org/c/flashrom/+/60113 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> --- M Makefile M atapromise.c M 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(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved diff --git a/Makefile b/Makefile index 04816fa..c985ae0 100644 --- a/Makefile +++ b/Makefile @@ -802,7 +802,7 @@ ifneq ($(NEED_RAW_ACCESS), ) # Raw memory, MSR or PCI port I/O access. FEATURE_CFLAGS += -D'NEED_RAW_ACCESS=1' -PROGRAMMER_OBJS += physmap.o hwaccess.o +PROGRAMMER_OBJS += hwaccess.o hwaccess_physmap.o ifeq ($(ARCH), x86) FEATURE_CFLAGS += -D'__FLASHROM_HAVE_OUTB__=1' diff --git a/atapromise.c b/atapromise.c index 56abc26..fb3adcb 100644 --- a/atapromise.c +++ b/atapromise.c @@ -20,6 +20,7 @@ #include "programmer.h" #include "hwaccess.h" #include "hwaccess_x86_io.h" +#include "hwaccess_physmap.h" #include "platform/pci.h" #define MAX_ROM_DECODE (32 * 1024) diff --git a/cbtable.c b/cbtable.c index d50a0cf..2b339d5 100644 --- a/cbtable.c +++ b/cbtable.c @@ -26,6 +26,7 @@ #include "flash.h" #include "programmer.h" #include "coreboot_tables.h" +#include "hwaccess_physmap.h" static char *cb_vendor = NULL, *cb_model = NULL; diff --git a/chipset_enable.c b/chipset_enable.c index 22af681..e216722 100644 --- a/chipset_enable.c +++ b/chipset_enable.c @@ -36,6 +36,7 @@ #include "hwaccess.h" #include "hwaccess_x86_io.h" #include "hwaccess_x86_msr.h" +#include "hwaccess_physmap.h" #include "platform/pci.h" #define NOT_DONE_YET 1 diff --git a/dmi.c b/dmi.c index d2e149d..df918f9 100644 --- a/dmi.c +++ b/dmi.c @@ -32,6 +32,7 @@ #include "flash.h" #include "hwaccess.h" +#include "hwaccess_physmap.h" #include "programmer.h" /* Enable SMBIOS decoding. Currently legacy DMI decoding is enough. */ diff --git a/drkaiser.c b/drkaiser.c index 565a45e..0930c1f 100644 --- a/drkaiser.c +++ b/drkaiser.c @@ -19,6 +19,7 @@ #include "programmer.h" #include "hwaccess.h" #include "hwaccess_x86_io.h" +#include "hwaccess_physmap.h" #include "platform/pci.h" #define PCI_VENDOR_ID_DRKAISER 0x1803 diff --git a/flashrom.c b/flashrom.c index b62d38c..73ebab5 100644 --- a/flashrom.c +++ b/flashrom.c @@ -38,6 +38,7 @@ #include "flashchips.h" #include "programmer.h" #include "hwaccess.h" +#include "hwaccess_physmap.h" #include "chipdrivers.h" const char flashrom_version[] = FLASHROM_VERSION; diff --git a/gfxnvidia.c b/gfxnvidia.c index 0d3ef39..30c94b9 100644 --- a/gfxnvidia.c +++ b/gfxnvidia.c @@ -20,6 +20,7 @@ #include "programmer.h" #include "hwaccess.h" #include "hwaccess_x86_io.h" +#include "hwaccess_physmap.h" #include "platform/pci.h" #define PCI_VENDOR_ID_NVIDIA 0x10de diff --git a/physmap.c b/hwaccess_physmap.c similarity index 99% rename from physmap.c rename to hwaccess_physmap.c index 6f2896f..dcc6ed7 100644 --- a/physmap.c +++ b/hwaccess_physmap.c @@ -23,8 +23,7 @@ #include <string.h> #include <errno.h> #include "flash.h" -#include "programmer.h" -#include "hwaccess.h" +#include "hwaccess_physmap.h" #if !defined(__DJGPP__) && !defined(__LIBPAYLOAD__) /* No file access needed/possible to get mmap access permissions or access MSR. */ diff --git a/hwaccess_physmap.h b/hwaccess_physmap.h new file mode 100644 index 0000000..eb3ddb8 --- /dev/null +++ b/hwaccess_physmap.h @@ -0,0 +1,27 @@ +/* + * This file is part of the flashrom project. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef __HWACCESS_PHYSMAP_H__ +#define __HWACCESS_PHYSMAP_H__ + +#include <stddef.h> +#include <stdint.h> + +void *physmap(const char *descr, uintptr_t phys_addr, size_t len); +void *rphysmap(const char *descr, uintptr_t phys_addr, size_t len); +void *physmap_ro(const char *descr, uintptr_t phys_addr, size_t len); +void *physmap_ro_unaligned(const char *descr, uintptr_t phys_addr, size_t len); +void physunmap(void *virt_addr, size_t len); +void physunmap_unaligned(void *virt_addr, size_t len); + +#endif /* __HWACCESS_PHYSMAP_H__ */ \ No newline at end of file diff --git a/ichspi.c b/ichspi.c index 290deaa..0bb6360 100644 --- a/ichspi.c +++ b/ichspi.c @@ -24,6 +24,7 @@ #include "flash.h" #include "programmer.h" #include "hwaccess.h" +#include "hwaccess_physmap.h" #include "spi.h" #include "ich_descriptors.h" diff --git a/internal.c b/internal.c index 7de1d6a..f2f1fb1 100644 --- a/internal.c +++ b/internal.c @@ -21,6 +21,7 @@ #include "programmer.h" #include "hwaccess.h" #include "hwaccess_x86_io.h" +#include "hwaccess_physmap.h" #include "platform/pci.h" int is_laptop = 0; diff --git a/it8212.c b/it8212.c index 80da2b1..6488b15 100644 --- a/it8212.c +++ b/it8212.c @@ -19,6 +19,7 @@ #include "programmer.h" #include "hwaccess.h" #include "hwaccess_x86_io.h" +#include "hwaccess_physmap.h" #include "platform/pci.h" static uint8_t *it8212_bar = NULL; diff --git a/it85spi.c b/it85spi.c index 574e03a..51328a8 100644 --- a/it85spi.c +++ b/it85spi.c @@ -27,6 +27,7 @@ #include "spi.h" #include "programmer.h" #include "hwaccess_x86_io.h" +#include "hwaccess_physmap.h" #define MAX_TIMEOUT 100000 #define MAX_TRY 5 diff --git a/mcp6x_spi.c b/mcp6x_spi.c index 2429346..2097cf4 100644 --- a/mcp6x_spi.c +++ b/mcp6x_spi.c @@ -24,6 +24,7 @@ #include "flash.h" #include "programmer.h" #include "hwaccess.h" +#include "hwaccess_physmap.h" #include "platform/pci.h" /* Bit positions for each pin. */ diff --git a/meson.build b/meson.build index 2e7296b..b2e2d72 100644 --- a/meson.build +++ b/meson.build @@ -349,7 +349,7 @@ srcs += 'hwaccess.c' srcs += 'hwaccess_x86_io.c' srcs += 'hwaccess_x86_msr.c' - srcs += 'physmap.c' + srcs += 'hwaccess_physmap.c' cargs += '-DNEED_RAW_ACCESS=1' cargs += '-D__FLASHROM_HAVE_OUTB__=1' endif diff --git a/nicintel.c b/nicintel.c index 7f4eb24..21dfad2 100644 --- a/nicintel.c +++ b/nicintel.c @@ -20,6 +20,7 @@ #include "programmer.h" #include "hwaccess.h" #include "hwaccess_x86_io.h" +#include "hwaccess_physmap.h" #include "platform/pci.h" static uint8_t *nicintel_bar; diff --git a/nicintel_eeprom.c b/nicintel_eeprom.c index fc2ef40..7b92958 100644 --- a/nicintel_eeprom.c +++ b/nicintel_eeprom.c @@ -36,6 +36,7 @@ #include "programmer.h" #include "hwaccess.h" #include "hwaccess_x86_io.h" +#include "hwaccess_physmap.h" #include "platform/pci.h" #define PCI_VENDOR_ID_INTEL 0x8086 diff --git a/nicintel_spi.c b/nicintel_spi.c index 25a6651..852c042 100644 --- a/nicintel_spi.c +++ b/nicintel_spi.c @@ -36,6 +36,7 @@ #include "programmer.h" #include "hwaccess.h" #include "hwaccess_x86_io.h" +#include "hwaccess_physmap.h" #include "platform/pci.h" #define PCI_VENDOR_ID_INTEL 0x8086 diff --git a/ogp_spi.c b/ogp_spi.c index 4a4934e..d4218d1 100644 --- a/ogp_spi.c +++ b/ogp_spi.c @@ -20,6 +20,7 @@ #include "programmer.h" #include "hwaccess.h" #include "hwaccess_x86_io.h" +#include "hwaccess_physmap.h" #include "platform/pci.h" #define PCI_VENDOR_ID_OGP 0x1227 diff --git a/programmer.h b/programmer.h index c4af35a..4dd4cad 100644 --- a/programmer.h +++ b/programmer.h @@ -231,14 +231,6 @@ int processor_flash_enable(void); #endif -/* physmap.c */ -void *physmap(const char *descr, uintptr_t phys_addr, size_t len); -void *rphysmap(const char *descr, uintptr_t phys_addr, size_t len); -void *physmap_ro(const char *descr, uintptr_t phys_addr, size_t len); -void *physmap_ro_unaligned(const char *descr, uintptr_t phys_addr, size_t len); -void physunmap(void *virt_addr, size_t len); -void physunmap_unaligned(void *virt_addr, size_t len); - #if CONFIG_INTERNAL == 1 /* cbtable.c */ int cb_parse_table(const char **vendor, const char **model); diff --git a/satamv.c b/satamv.c index 8543f53..e7c4305 100644 --- a/satamv.c +++ b/satamv.c @@ -21,6 +21,7 @@ #include "programmer.h" #include "hwaccess.h" #include "hwaccess_x86_io.h" +#include "hwaccess_physmap.h" #include "platform/pci.h" static uint8_t *mv_bar; diff --git a/satasii.c b/satasii.c index 2f220d1..f9cb5da 100644 --- a/satasii.c +++ b/satasii.c @@ -19,6 +19,7 @@ #include "programmer.h" #include "hwaccess.h" #include "hwaccess_x86_io.h" +#include "hwaccess_physmap.h" #include "platform/pci.h" #define PCI_VENDOR_ID_SII 0x1095 diff --git a/sb600spi.c b/sb600spi.c index 92fcc81..32a7420 100644 --- a/sb600spi.c +++ b/sb600spi.c @@ -23,6 +23,7 @@ #include "flash.h" #include "programmer.h" #include "hwaccess.h" +#include "hwaccess_physmap.h" #include "spi.h" #include "platform/pci.h" 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/+/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: 8 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-MessageType: merged

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit December 2021