April 2021 - flashrom-gerrit - mail.coreboot.org

Change in flashrom[master]: layout: Add -i <region>[:<file>] support
by Edward O'Callaghan (Code Review) 18 Apr '21

18 Apr '21

Attention is currently required from: Sam McNally, Nico Huber, Nicola Corna, Jack Rosenthal, Paul Menzel, Stefan Reinauer, David Hendricks, Daniel Campello, Arthur Heymans, Carl-Daniel Hailfinger. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/23021 ) Change subject: layout: Add -i <region>[:<file>] support ...................................................................... Patch Set 33: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/23021 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ic5465659605d8431d931053967b40290195cfd99 Gerrit-Change-Number: 23021 Gerrit-PatchSet: 33 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Gerrit-Reviewer: Daniel Campello <campello(a)chromium.org> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Jack Rosenthal <jrosenth(a)chromium.org> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Nicola Corna <nicola(a)corna.info> Gerrit-Reviewer: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Reviewer: Sam McNally <sammc(a)google.com> Gerrit-Reviewer: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Sam McNally <sammc(a)google.com> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Nicola Corna <nicola(a)corna.info> Gerrit-Attention: Jack Rosenthal <jrosenth(a)chromium.org> Gerrit-Attention: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Attention: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Attention: Daniel Campello <campello(a)chromium.org> Gerrit-Attention: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Attention: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Gerrit-Comment-Date: Sun, 18 Apr 2021 12:19:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: manibuilder: Add more NetBSD targets
by Nico Huber (Code Review) 18 Apr '21

18 Apr '21

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/52485 ) Change subject: manibuilder: Add more NetBSD targets ...................................................................... manibuilder: Add more NetBSD targets Mirrors for 9.1-sparc64 currently have a broken pkgcache, so I had to install `pciutils` specifically: - pkg_add gmake git-base ccache pciutils libusb1 libusb-compat libftdi \ + pkg_add gmake git-base ccache libusb1 libusb-compat libftdi \ ${EXTRA_PKG} && \ + pkg_add http://cdn.netbsd.org/pub/pkgsrc/packages/NetBSD/sparc64/9.1/All/pciutils-3… && \ It worked fine before, so I assume this is just a temporary issue. But for now, let's keep it out of the DEFAULT_TAGS. Change-Id: Ic323ced43132921d9f6f2c0d5fcf9c581afec0c7 Signed-off-by: Nico Huber <nico.h(a)gmx.de> --- M util/manibuilder/Makefile.anita M util/manibuilder/Makefile.targets 2 files changed, 30 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/85/52485/1 diff --git a/util/manibuilder/Makefile.anita b/util/manibuilder/Makefile.anita index 21cad8c..ba8c82d 100644 --- a/util/manibuilder/Makefile.anita +++ b/util/manibuilder/Makefile.anita @@ -1,12 +1,36 @@ PKGSRC_MIRROR = http://cdn.netbsd.org/ NETBSD_MIRROR = http://ftp.de.netbsd.org/ +anita\:9.1-sparc64-build: PKGSRC_PATH=pub/pkgsrc/packages/NetBSD/sparc64/9.1/All +anita\:9.1-sparc64-build: NETBSD_IMAGE=pub/NetBSD/iso/9.1/NetBSD-9.1-sparc64.iso +anita\:9.1-sparc64-build: QEMU_DISK_SIZE=2G +anita\:9.1-sparc64-build: QEMU_INSTALL_MEM=192M +anita\:9.1-sparc64-build: QEMU_RUNTIME_MEM=512M + +anita\:9.1-amd64-build: PKGSRC_PATH=pub/pkgsrc/packages/NetBSD/amd64/9.1/All +anita\:9.1-amd64-build: NETBSD_IMAGE=pub/NetBSD/NetBSD-9.1/amd64/ +anita\:9.1-amd64-build: QEMU_DISK_SIZE=2G +anita\:9.1-amd64-build: QEMU_INSTALL_MEM=192M +anita\:9.1-amd64-build: QEMU_RUNTIME_MEM=512M + +anita\:9.1-i386-build: PKGSRC_PATH=pub/pkgsrc/packages/NetBSD/i386/9.1/All +anita\:9.1-i386-build: NETBSD_IMAGE=pub/NetBSD/NetBSD-9.1/i386/ +anita\:9.1-i386-build: QEMU_DISK_SIZE=2G +anita\:9.1-i386-build: QEMU_INSTALL_MEM=128M +anita\:9.1-i386-build: QEMU_RUNTIME_MEM=256M + anita\:8.2-amd64-build: PKGSRC_PATH=pub/pkgsrc/packages/NetBSD/amd64/8.2/All anita\:8.2-amd64-build: NETBSD_IMAGE=pub/NetBSD/NetBSD-8.2/amd64/ anita\:8.2-amd64-build: QEMU_DISK_SIZE=2G anita\:8.2-amd64-build: QEMU_INSTALL_MEM=192M anita\:8.2-amd64-build: QEMU_RUNTIME_MEM=512M +anita\:8.2-i386-build: PKGSRC_PATH=pub/pkgsrc/packages/NetBSD/i386/8.2/All +anita\:8.2-i386-build: NETBSD_IMAGE=pub/NetBSD/NetBSD-8.2/i386/ +anita\:8.2-i386-build: QEMU_DISK_SIZE=2G +anita\:8.2-i386-build: QEMU_INSTALL_MEM=128M +anita\:8.2-i386-build: QEMU_RUNTIME_MEM=256M + anita\:7.1-amd64-build: PKGSRC_PATH=pub/pkgsrc/packages/NetBSD/amd64/7.1/All anita\:7.1-amd64-build: NETBSD_IMAGE=pub/NetBSD/NetBSD-7.1/amd64/ anita\:7.1-amd64-build: QEMU_DISK_SIZE=1G diff --git a/util/manibuilder/Makefile.targets b/util/manibuilder/Makefile.targets index 0fe9026..37b530b 100644 --- a/util/manibuilder/Makefile.targets +++ b/util/manibuilder/Makefile.targets @@ -1,4 +1,7 @@ -ANITA_TAGS := anita\:8.2-amd64 anita\:7.1-amd64 anita\:7.1-i386 +ANITA_TAGS := \ + anita\:9.1-amd64 anita\:9.1-i386 anita\:9.1-sparc64 \ + anita\:8.2-amd64 anita\:8.2-i386 \ + anita\:7.1-amd64 anita\:7.1-i386 \ MULTIARCH_TAGS := \ centos\:7.6-armhfp-clean centos\:7.6-amd64-clean \ @@ -43,6 +46,8 @@ # rather arbitrary selection of images that seem to work (focus on amd64) DEFAULT_TAGS := \ + anita\:9.1-amd64 \ + anita\:9.1-i386 \ anita\:8.2-amd64 \ djgpp\:6.1.0 \ fedora\:30-aarch64 \ -- To view, visit https://review.coreboot.org/c/flashrom/+/52485 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ic323ced43132921d9f6f2c0d5fcf9c581afec0c7 Gerrit-Change-Number: 52485 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: manibuilder/anita: Always provide reasonable --memory-size
by Nico Huber (Code Review) 18 Apr '21

18 Apr '21

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/52484 ) Change subject: manibuilder/anita: Always provide reasonable --memory-size ...................................................................... manibuilder/anita: Always provide reasonable --memory-size It turned out that the `--memory-size` given at install time is not persistent. All later anita runs use an arch-dependent default (32M for i386, so this might explain why it was never stable). Assuming most machines have >1GiB RAM per processor core available, we can also increase the runtime size further (better to waste some RAM than to wait very long because it starts swapping things out). We choose 512MiB for 64-bit targets and 256MiB for 32-bit ones. However, we don't need that much for the initial installation step and it also decides the size of the swap partition. So we use a smaller size initially that's just enough to get us through the installation quickly enough (192MiB & 128MiB). Change-Id: I255c41aeb92cda29ed23a236017472982e839530 Signed-off-by: Nico Huber <nico.h(a)gmx.de> --- M util/manibuilder/Dockerfile.anita M util/manibuilder/Makefile.anita M util/manibuilder/anita-wrapper.sh 3 files changed, 19 insertions(+), 11 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/84/52484/1 diff --git a/util/manibuilder/Dockerfile.anita b/util/manibuilder/Dockerfile.anita index dd6f4dd..f4b1309 100644 --- a/util/manibuilder/Dockerfile.anita +++ b/util/manibuilder/Dockerfile.anita @@ -3,7 +3,7 @@ ARG PKG_PATH=http://cdn.netbsd.org/pub/pkgsrc/packages/NetBSD/amd64/7.1/All ARG INST_IMG=http://ftp.de.netbsd.org/pub/NetBSD/NetBSD-7.1/amd64/ ARG DISK_SIZE=1G -ARG MEM_SIZE=128M +ARG INSTALL_MEM=128M ARG EXTRA_PKG="" RUN \ @@ -20,11 +20,12 @@ USER mani RUN cd && mkdir .ccache && chown mani:mani .ccache && \ anita --sets kern-GENERIC,modules,base,etc,comp \ - --disk-size ${DISK_SIZE} --memory-size=${MEM_SIZE} \ + --disk-size ${DISK_SIZE} --memory-size=${INSTALL_MEM} \ install ${INST_IMG} && \ rm -rf work-*/download -RUN cd && anita --persist --run \ +ARG RUNTIME_MEM=128M +RUN cd && anita --persist --memory-size=${RUNTIME_MEM} --run \ "echo 'dhcpcd' >init && \ echo 'export PKG_PATH=${PKG_PATH}' >>init && \ . ./init && \ @@ -35,7 +36,8 @@ boot ${INST_IMG} RUN cd && dd if=/dev/zero bs=1M count=64 of=cache.img && \ - anita --vmm-args '-hdb cache.img' --persist --run \ + anita --vmm-args '-hdb cache.img' --persist \ + --memory-size=${RUNTIME_MEM} --run \ "if [ \$(uname -m) = i386 -o \$(uname -m) = amd64 ]; then \ bdev=wd1d; \ else \ @@ -59,4 +61,5 @@ COPY anita-wrapper.sh /home/mani/mani-wrapper.sh ENV INST_IMG ${INST_IMG} +ENV MEM_SIZE ${RUNTIME_MEM} ENTRYPOINT ["/bin/sh", "/home/mani/mani-wrapper.sh"] diff --git a/util/manibuilder/Makefile.anita b/util/manibuilder/Makefile.anita index e795194..21cad8c 100644 --- a/util/manibuilder/Makefile.anita +++ b/util/manibuilder/Makefile.anita @@ -4,21 +4,25 @@ anita\:8.2-amd64-build: PKGSRC_PATH=pub/pkgsrc/packages/NetBSD/amd64/8.2/All anita\:8.2-amd64-build: NETBSD_IMAGE=pub/NetBSD/NetBSD-8.2/amd64/ anita\:8.2-amd64-build: QEMU_DISK_SIZE=2G -anita\:8.2-amd64-build: QEMU_MEM_SIZE=256M +anita\:8.2-amd64-build: QEMU_INSTALL_MEM=192M +anita\:8.2-amd64-build: QEMU_RUNTIME_MEM=512M anita\:7.1-amd64-build: PKGSRC_PATH=pub/pkgsrc/packages/NetBSD/amd64/7.1/All anita\:7.1-amd64-build: NETBSD_IMAGE=pub/NetBSD/NetBSD-7.1/amd64/ anita\:7.1-amd64-build: QEMU_DISK_SIZE=1G -anita\:7.1-amd64-build: QEMU_MEM_SIZE=128M +anita\:7.1-amd64-build: QEMU_INSTALL_MEM=192M +anita\:7.1-amd64-build: QEMU_RUNTIME_MEM=512M anita\:7.1-i386-build: PKGSRC_PATH=pub/pkgsrc/packages/NetBSD/i386/7.1/All anita\:7.1-i386-build: NETBSD_IMAGE=pub/NetBSD/NetBSD-7.1/i386/ anita\:7.1-i386-build: QEMU_DISK_SIZE=1G -anita\:7.1-i386-build: QEMU_MEM_SIZE=128M +anita\:7.1-i386-build: QEMU_INSTALL_MEM=128M +anita\:7.1-i386-build: QEMU_RUNTIME_MEM=256M $(addsuffix -build,$(ANITA_TAGS)): %-build: Dockerfile.anita anita-wrapper.sh $(QUIET_SETUP)docker build . -f $< -t mani/$* \ --build-arg PKG_PATH=$(PKGSRC_MIRROR)$(PKGSRC_PATH) \ --build-arg INST_IMG=$(NETBSD_MIRROR)$(NETBSD_IMAGE) \ --build-arg DISK_SIZE=$(QEMU_DISK_SIZE) \ - --build-arg MEM_SIZE=$(QEMU_MEM_SIZE) + --build-arg INSTALL_MEM=$(QEMU_INSTALL_MEM) \ + --build-arg RUNTIME_MEM=$(QEMU_RUNTIME_MEM) diff --git a/util/manibuilder/anita-wrapper.sh b/util/manibuilder/anita-wrapper.sh index 617e17f..3ff9ee1 100644 --- a/util/manibuilder/anita-wrapper.sh +++ b/util/manibuilder/anita-wrapper.sh @@ -9,9 +9,10 @@ [ -f ${CCACHE} ] || zcat cache.img.gz >${CCACHE} if [ $# -eq 0 ]; then - exec anita --vmm-args "-hdb ${CCACHE}" interact ${INST_IMG} + exec anita --vmm-args "-hdb ${CCACHE}" --memory-size=${MEM_SIZE} \ + interact ${INST_IMG} else - exec anita --vmm-args "-hdb ${CCACHE}" --persist \ - --run ". ./init && manitest \"$*\"" \ + exec anita --vmm-args "-hdb ${CCACHE}" --memory-size=${MEM_SIZE} \ + --persist --run ". ./init && manitest \"$*\"" \ boot ${INST_IMG} fi -- To view, visit https://review.coreboot.org/c/flashrom/+/52484 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I255c41aeb92cda29ed23a236017472982e839530 Gerrit-Change-Number: 52484 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: manibuilder/anita: Factor things out into Makefile.anita
by Nico Huber (Code Review) 18 Apr '21

18 Apr '21

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/52483 ) Change subject: manibuilder/anita: Factor things out into Makefile.anita ...................................................................... manibuilder/anita: Factor things out into Makefile.anita The anita-based NetBSD targets need noisy, per-target handling. Factor it out into another Makefile. Change-Id: I0a3ca751b42f1ca8c05d93eb9740bb0ee5cc6d09 Signed-off-by: Nico Huber <nico.h(a)gmx.de> --- M util/manibuilder/Makefile A util/manibuilder/Makefile.anita 2 files changed, 25 insertions(+), 24 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/83/52483/1 diff --git a/util/manibuilder/Makefile b/util/manibuilder/Makefile index c0d1eff..5b58b05 100644 --- a/util/manibuilder/Makefile +++ b/util/manibuilder/Makefile @@ -12,30 +12,7 @@ stem = $(word 1,$(subst :,$(spc),$(subst \:,$(spc),$(1)))) ident = $(subst :,_,$(subst \:,_,$(1))) -PKGSRC_MIRROR = http://cdn.netbsd.org/ -NETBSD_MIRROR = http://ftp.de.netbsd.org/ - -anita\:8.2-amd64-build: PKGSRC_PATH=pub/pkgsrc/packages/NetBSD/amd64/8.2/All -anita\:8.2-amd64-build: NETBSD_IMAGE=pub/NetBSD/NetBSD-8.2/amd64/ -anita\:8.2-amd64-build: QEMU_DISK_SIZE=2G -anita\:8.2-amd64-build: QEMU_MEM_SIZE=256M - -anita\:7.1-amd64-build: PKGSRC_PATH=pub/pkgsrc/packages/NetBSD/amd64/7.1/All -anita\:7.1-amd64-build: NETBSD_IMAGE=pub/NetBSD/NetBSD-7.1/amd64/ -anita\:7.1-amd64-build: QEMU_DISK_SIZE=1G -anita\:7.1-amd64-build: QEMU_MEM_SIZE=128M - -anita\:7.1-i386-build: PKGSRC_PATH=pub/pkgsrc/packages/NetBSD/i386/7.1/All -anita\:7.1-i386-build: NETBSD_IMAGE=pub/NetBSD/NetBSD-7.1/i386/ -anita\:7.1-i386-build: QEMU_DISK_SIZE=1G -anita\:7.1-i386-build: QEMU_MEM_SIZE=128M - -$(addsuffix -build,$(ANITA_TAGS)): %-build: Dockerfile.anita anita-wrapper.sh - $(QUIET_SETUP)docker build . -f $< -t mani/$* \ - --build-arg PKG_PATH=$(PKGSRC_MIRROR)$(PKGSRC_PATH) \ - --build-arg INST_IMG=$(NETBSD_MIRROR)$(NETBSD_IMAGE) \ - --build-arg DISK_SIZE=$(QEMU_DISK_SIZE) \ - --build-arg MEM_SIZE=$(QEMU_MEM_SIZE) +include Makefile.anita define build_template Dockerfile.$(call ident,$(1)): Dockerfile.$(call stem,$(1)) mani-wrapper.sh diff --git a/util/manibuilder/Makefile.anita b/util/manibuilder/Makefile.anita new file mode 100644 index 0000000..e795194 --- /dev/null +++ b/util/manibuilder/Makefile.anita @@ -0,0 +1,24 @@ +PKGSRC_MIRROR = http://cdn.netbsd.org/ +NETBSD_MIRROR = http://ftp.de.netbsd.org/ + +anita\:8.2-amd64-build: PKGSRC_PATH=pub/pkgsrc/packages/NetBSD/amd64/8.2/All +anita\:8.2-amd64-build: NETBSD_IMAGE=pub/NetBSD/NetBSD-8.2/amd64/ +anita\:8.2-amd64-build: QEMU_DISK_SIZE=2G +anita\:8.2-amd64-build: QEMU_MEM_SIZE=256M + +anita\:7.1-amd64-build: PKGSRC_PATH=pub/pkgsrc/packages/NetBSD/amd64/7.1/All +anita\:7.1-amd64-build: NETBSD_IMAGE=pub/NetBSD/NetBSD-7.1/amd64/ +anita\:7.1-amd64-build: QEMU_DISK_SIZE=1G +anita\:7.1-amd64-build: QEMU_MEM_SIZE=128M + +anita\:7.1-i386-build: PKGSRC_PATH=pub/pkgsrc/packages/NetBSD/i386/7.1/All +anita\:7.1-i386-build: NETBSD_IMAGE=pub/NetBSD/NetBSD-7.1/i386/ +anita\:7.1-i386-build: QEMU_DISK_SIZE=1G +anita\:7.1-i386-build: QEMU_MEM_SIZE=128M + +$(addsuffix -build,$(ANITA_TAGS)): %-build: Dockerfile.anita anita-wrapper.sh + $(QUIET_SETUP)docker build . -f $< -t mani/$* \ + --build-arg PKG_PATH=$(PKGSRC_MIRROR)$(PKGSRC_PATH) \ + --build-arg INST_IMG=$(NETBSD_MIRROR)$(NETBSD_IMAGE) \ + --build-arg DISK_SIZE=$(QEMU_DISK_SIZE) \ + --build-arg MEM_SIZE=$(QEMU_MEM_SIZE) -- To view, visit https://review.coreboot.org/c/flashrom/+/52483 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I0a3ca751b42f1ca8c05d93eb9740bb0ee5cc6d09 Gerrit-Change-Number: 52483 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: manibuilder/anita: Fix ccache image for non-x86
by Nico Huber (Code Review) 18 Apr '21

18 Apr '21

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/52482 ) Change subject: manibuilder/anita: Fix ccache image for non-x86 ...................................................................... manibuilder/anita: Fix ccache image for non-x86 There is no disk label `a` on non-x86 (at least not on Spark64). Instead, we use the whole disk which is `d` on x86 and `c` else- where. `newfs` and `fsck` needs a little help in this scenario. Change-Id: Ib298d9cbf5d49ff38a898f4ce3ad54bb6af98d86 Signed-off-by: Nico Huber <nico.h(a)gmx.de> --- M util/manibuilder/Dockerfile.anita 1 file changed, 9 insertions(+), 5 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/82/52482/1 diff --git a/util/manibuilder/Dockerfile.anita b/util/manibuilder/Dockerfile.anita index 5fba6cc..dd6f4dd 100644 --- a/util/manibuilder/Dockerfile.anita +++ b/util/manibuilder/Dockerfile.anita @@ -36,15 +36,19 @@ RUN cd && dd if=/dev/zero bs=1M count=64 of=cache.img && \ anita --vmm-args '-hdb cache.img' --persist --run \ -"echo fdisk -0 -s 169/63/131009 -f -u wd1 && \ - newfs wd1a && \ +"if [ \$(uname -m) = i386 -o \$(uname -m) = amd64 ]; then \ + bdev=wd1d; \ + else \ + bdev=wd1c; \ + fi; \ + newfs -I \${bdev} && \ mkdir .ccache && \ - mount /dev/wd1a .ccache && \ + mount /dev/\${bdev} .ccache && \ ccache -M 60M && \ umount .ccache && \ echo 'manitest() {' >>init && \ - echo ' fsck -y /dev/wd1a' >>init && \ - echo ' mount /dev/wd1a ~/.ccache' >>init && \ + echo ' fsck -y -t ffs /dev/'\${bdev} >>init && \ + echo ' mount /dev/'\${bdev}' ~/.ccache' >>init && \ echo ' (cd ~/flashrom && eval \" \$*\")' >>init && \ echo ' ret=\$?' >>init && \ echo ' umount ~/.ccache' >>init && \ -- To view, visit https://review.coreboot.org/c/flashrom/+/52482 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ib298d9cbf5d49ff38a898f4ce3ad54bb6af98d86 Gerrit-Change-Number: 52482 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: linux_spi.c: Refactor singleton states into reentrant pattern
by Edward O'Callaghan (Code Review) 18 Apr '21

18 Apr '21

Edward O'Callaghan has submitted this change. ( https://review.coreboot.org/c/flashrom/+/52285 ) Change subject: linux_spi.c: Refactor singleton states into reentrant pattern ...................................................................... linux_spi.c: Refactor singleton states into reentrant pattern Move global singleton states into a struct and store within the spi_master data field for the life-time of the driver. This is one of the steps on the way to move spi_master data memory management behind the initialisation API, for more context see other patches under the same topic "register_master_api". TEST=builds BUG=b:140394053 Change-Id: I93408c2ca846fca6a1c7eda7180862c51bd48078 Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> Reviewed-on: https://review.coreboot.org/c/flashrom/+/52285 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Edward O'Callaghan <quasisec(a)chromium.org> --- M linux_spi.c 1 file changed, 33 insertions(+), 12 deletions(-) Approvals: build bot (Jenkins): Verified Edward O'Callaghan: Looks good to me, approved diff --git a/linux_spi.c b/linux_spi.c index ae5c318..541ca65 100644 --- a/linux_spi.c +++ b/linux_spi.c @@ -44,29 +44,35 @@ * HummingBoard */ -static int fd = -1; #define BUF_SIZE_FROM_SYSFS "/sys/module/spidev/parameters/bufsiz" -static size_t max_kernel_buf_size; + +struct linux_spi_data { + int fd; + size_t max_kernel_buf_size; +}; static int linux_spi_read(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len) { + struct linux_spi_data *spi_data = flash->mst->spi.data; /* Older kernels use a single buffer for combined input and output data. So account for longest possible command + address, too. */ - return spi_read_chunked(flash, buf, start, len, max_kernel_buf_size - 5); + return spi_read_chunked(flash, buf, start, len, spi_data->max_kernel_buf_size - 5); } static int linux_spi_write_256(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len) { + struct linux_spi_data *spi_data = flash->mst->spi.data; /* 5 bytes must be reserved for longest possible command + address. */ - return spi_write_chunked(flash, buf, start, len, max_kernel_buf_size - 5); + return spi_write_chunked(flash, buf, start, len, spi_data->max_kernel_buf_size - 5); } static int linux_spi_shutdown(void *data) { - if (fd != -1) { - close(fd); - fd = -1; - } + struct linux_spi_data *spi_data = (struct linux_spi_data *) data; + if (spi_data->fd != -1) + close(spi_data->fd); + + free(spi_data); return 0; } @@ -75,6 +81,7 @@ const unsigned char *txbuf, unsigned char *rxbuf) { + struct linux_spi_data *spi_data = flash->mst->spi.data; int iocontrol_code; struct spi_ioc_transfer msg[2] = { { @@ -87,7 +94,7 @@ }, }; - if (fd == -1) + if (spi_data->fd == -1) return -1; /* The implementation currently does not support requests that don't start with sending a command. */ @@ -101,14 +108,14 @@ else iocontrol_code = SPI_IOC_MESSAGE(2); - if (ioctl(fd, iocontrol_code, msg) == -1) { + if (ioctl(spi_data->fd, iocontrol_code, msg) == -1) { msg_cerr("%s: ioctl: %s\n", __func__, strerror(errno)); return -1; } return 0; } -static const struct spi_master spi_master_linux = { +static struct spi_master spi_master_linux = { .features = SPI_MASTER_4BA, .max_data_read = MAX_DATA_UNSPECIFIED, /* TODO? */ .max_data_write = MAX_DATA_UNSPECIFIED, /* TODO? */ @@ -167,6 +174,9 @@ /* SPI mode 0 (beware this also includes: MSB first, CS active low and others */ const uint8_t mode = SPI_MODE_0; const uint8_t bits = 8; + int fd = -1; + size_t max_kernel_buf_size; + struct linux_spi_data *spi_data; int ret = 0; p = extract_programmer_param("spispeed"); @@ -226,7 +236,18 @@ max_kernel_buf_size = get_max_kernel_buf_size(); msg_pdbg("%s: max_kernel_buf_size: %zu\n", __func__, max_kernel_buf_size); - if (register_shutdown(linux_spi_shutdown, NULL)) { + spi_data = calloc(1, sizeof(*spi_data)); + if (!spi_data) { + msg_perr("Unable to allocated space for SPI master data\n"); + ret = SPI_GENERIC_ERROR; + goto init_err; + } + spi_data->fd = fd; + spi_data->max_kernel_buf_size = max_kernel_buf_size; + spi_master_linux.data = spi_data; + + if (register_shutdown(linux_spi_shutdown, spi_data)) { + free(spi_data); ret = 1; goto init_err; } -- To view, visit https://review.coreboot.org/c/flashrom/+/52285 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I93408c2ca846fca6a1c7eda7180862c51bd48078 Gerrit-Change-Number: 52285 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: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Nico Huber <nico.h(a)gmx.de> Gerrit-CC: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-CC: Sam McNally <sammc(a)google.com> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: linux_spi.c: Refactor singleton states into reentrant pattern
by Edward O'Callaghan (Code Review) 18 Apr '21

18 Apr '21

Attention is currently required from: Angel Pons, Anastasia Klimchuk. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/52285 ) Change subject: linux_spi.c: Refactor singleton states into reentrant pattern ...................................................................... Patch Set 2: (1 comment) File linux_spi.c: https://review.coreboot.org/c/flashrom/+/52285/comment/77b5af0a_8ab5b548 PS2, Line 178: size_t max_kernel_buf_size; > I introduced this line here, because I remove global state in this patch, and in previous patches ma […] Ack, it was my mistake thanks for checking though! -- To view, visit https://review.coreboot.org/c/flashrom/+/52285 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I93408c2ca846fca6a1c7eda7180862c51bd48078 Gerrit-Change-Number: 52285 Gerrit-PatchSet: 2 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: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Nico Huber <nico.h(a)gmx.de> Gerrit-CC: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-CC: Sam McNally <sammc(a)google.com> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Sun, 18 Apr 2021 12:16:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Edward O'Callaghan <quasisec(a)chromium.org> Comment-In-Reply-To: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: linux_spi.c: Separate shutdown from failed init cleanup
by Edward O'Callaghan (Code Review) 18 Apr '21

18 Apr '21

Edward O'Callaghan has submitted this change. ( https://review.coreboot.org/c/flashrom/+/52284 ) Change subject: linux_spi.c: Separate shutdown from failed init cleanup ...................................................................... linux_spi.c: Separate shutdown from failed init cleanup Shutdown function was covering two different jobs here: 1) the actual shutdown which is run at the end of the driver's lifecycle and 2) cleanup in cases when initialisation failed. Now, shutdown is only doing its main job (#1), and the driver itself is doing cleanup when init fails (#2). The good thing is that now resources are released/closed immediately in cases when init fails (vs shutdown function which was run at some point later), and the driver leaves clean space after itself if init fails. And very importantly this unlocks API change which plans to move register_shutdown inside register master API, see this https://review.coreboot.org/c/flashrom/+/51761 TEST=builds BUG=b:140394053 Change-Id: I1c8da2878cd0e85a1e43ba9b4b8e6f3d9f38ae5c Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> Reviewed-on: https://review.coreboot.org/c/flashrom/+/52284 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Edward O'Callaghan <quasisec(a)chromium.org> --- M linux_spi.c 1 file changed, 18 insertions(+), 7 deletions(-) Approvals: build bot (Jenkins): Verified Edward O'Callaghan: Looks good to me, approved diff --git a/linux_spi.c b/linux_spi.c index b3cbf97..ae5c318 100644 --- a/linux_spi.c +++ b/linux_spi.c @@ -167,6 +167,7 @@ /* SPI mode 0 (beware this also includes: MSB first, CS active low and others */ const uint8_t mode = SPI_MODE_0; const uint8_t bits = 8; + int ret = 0; p = extract_programmer_param("spispeed"); if (p && strlen(p)) { @@ -200,34 +201,44 @@ } free(dev); - if (register_shutdown(linux_spi_shutdown, NULL)) - return 1; - /* We rely on the shutdown function for cleanup from here on. */ - if (ioctl(fd, SPI_IOC_WR_MAX_SPEED_HZ, &speed_hz) == -1) { msg_perr("%s: failed to set speed to %"PRIu32"Hz: %s\n", __func__, speed_hz, strerror(errno)); - return 1; + ret = 1; + goto init_err; } msg_pdbg("Using %"PRIu32"kHz clock\n", speed_hz / 1000); if (ioctl(fd, SPI_IOC_WR_MODE, &mode) == -1) { msg_perr("%s: failed to set SPI mode to 0x%02x: %s\n", __func__, mode, strerror(errno)); - return 1; + ret = 1; + goto init_err; } if (ioctl(fd, SPI_IOC_WR_BITS_PER_WORD, &bits) == -1) { msg_perr("%s: failed to set the number of bits per SPI word to %u: %s\n", __func__, bits == 0 ? 8 : bits, strerror(errno)); - return 1; + ret = 1; + goto init_err; } max_kernel_buf_size = get_max_kernel_buf_size(); msg_pdbg("%s: max_kernel_buf_size: %zu\n", __func__, max_kernel_buf_size); + if (register_shutdown(linux_spi_shutdown, NULL)) { + ret = 1; + goto init_err; + } register_spi_master(&spi_master_linux); return 0; + +init_err: + if (fd != -1) { + close(fd); + fd = -1; + } + return ret; } #endif // CONFIG_LINUX_SPI == 1 -- To view, visit https://review.coreboot.org/c/flashrom/+/52284 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I1c8da2878cd0e85a1e43ba9b4b8e6f3d9f38ae5c Gerrit-Change-Number: 52284 Gerrit-PatchSet: 2 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: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Nico Huber <nico.h(a)gmx.de> Gerrit-CC: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-CC: Sam McNally <sammc(a)google.com> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: linux_spi.c: Extract get_max_kernel_buf_size() as a function
by Edward O'Callaghan (Code Review) 18 Apr '21

18 Apr '21

Edward O'Callaghan has submitted this change. ( https://review.coreboot.org/c/flashrom/+/52283 ) Change subject: linux_spi.c: Extract get_max_kernel_buf_size() as a function ...................................................................... linux_spi.c: Extract get_max_kernel_buf_size() as a function To get max_kernel_buf_size is a piece of logic on its own, it opens resources and closes resources, also has some local variables only for this task. Extracting get_max_kernel_buf_size() as a separate function simplifies init flow and allows to remove global state from linux_spi (see next patches in this chain). TEST=builds BUG=b:140394053 Change-Id: I4b8c5775fb8f4b0dff702fcc0fb258221254c659 Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> Reviewed-on: https://review.coreboot.org/c/flashrom/+/52283 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Edward O'Callaghan <quasisec(a)chromium.org> --- M linux_spi.c 1 file changed, 42 insertions(+), 36 deletions(-) Approvals: build bot (Jenkins): Verified Edward O'Callaghan: Looks good to me, approved diff --git a/linux_spi.c b/linux_spi.c index bbd45f3..b3cbf97 100644 --- a/linux_spi.c +++ b/linux_spi.c @@ -119,6 +119,46 @@ .write_aai = default_spi_write_aai, }; +/* Read max buffer size from sysfs, or use page size as fallback. */ +static size_t get_max_kernel_buf_size() { + size_t result = 0; + FILE *fp; + fp = fopen(BUF_SIZE_FROM_SYSFS, "r"); + if (!fp) { + msg_pwarn("Cannot open %s: %s.\n", BUF_SIZE_FROM_SYSFS, strerror(errno)); + goto out; + } + + char buf[10]; + if (!fgets(buf, sizeof(buf), fp)) { + if (feof(fp)) + msg_pwarn("Cannot read %s: file is empty.\n", BUF_SIZE_FROM_SYSFS); + else + msg_pwarn("Cannot read %s: %s.\n", BUF_SIZE_FROM_SYSFS, strerror(errno)); + goto out; + } + + long int tmp; + errno = 0; + tmp = strtol(buf, NULL, 0); + if ((tmp < 0) || errno) { + msg_pwarn("Buffer size %ld from %s seems wrong.\n", tmp, BUF_SIZE_FROM_SYSFS); + } else { + msg_pdbg("%s: Using value from %s as max buffer size.\n", __func__, BUF_SIZE_FROM_SYSFS); + result = (size_t)tmp; + } + +out: + if (fp) + fclose(fp); + + if (!result) { + msg_pdbg("%s: Using page size as max buffer size.\n", __func__); + result = (size_t)getpagesize(); + } + return result; +} + int linux_spi_init(void) { char *p, *endp, *dev; @@ -183,43 +223,9 @@ return 1; } - /* Read max buffer size from sysfs, or use page size as fallback. */ - FILE *fp; - fp = fopen(BUF_SIZE_FROM_SYSFS, "r"); - if (!fp) { - msg_pwarn("Cannot open %s: %s.\n", BUF_SIZE_FROM_SYSFS, strerror(errno)); - goto out; - } - - char buf[10]; - if (!fgets(buf, sizeof(buf), fp)) { - if (feof(fp)) - msg_pwarn("Cannot read %s: file is empty.\n", BUF_SIZE_FROM_SYSFS); - else - msg_pwarn("Cannot read %s: %s.\n", BUF_SIZE_FROM_SYSFS, strerror(errno)); - goto out; - } - - long int tmp; - errno = 0; - tmp = strtol(buf, NULL, 0); - if ((tmp < 0) || errno) { - msg_pwarn("Buffer size %ld from %s seems wrong.\n", tmp, BUF_SIZE_FROM_SYSFS); - } else { - msg_pdbg("%s: Using value from %s as max buffer size.\n", __func__, BUF_SIZE_FROM_SYSFS); - max_kernel_buf_size = (size_t)tmp; - } - -out: - if (fp) - fclose(fp); - - if (!max_kernel_buf_size) { - msg_pdbg("%s: Using page size as max buffer size.\n", __func__); - max_kernel_buf_size = (size_t)getpagesize(); - } - + max_kernel_buf_size = get_max_kernel_buf_size(); msg_pdbg("%s: max_kernel_buf_size: %zu\n", __func__, max_kernel_buf_size); + register_spi_master(&spi_master_linux); return 0; } -- To view, visit https://review.coreboot.org/c/flashrom/+/52283 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I4b8c5775fb8f4b0dff702fcc0fb258221254c659 Gerrit-Change-Number: 52283 Gerrit-PatchSet: 2 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: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Nico Huber <nico.h(a)gmx.de> Gerrit-CC: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-CC: Sam McNally <sammc(a)google.com> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: linux_spi.c: Extract get_max_kernel_buf_size() as a function
by Edward O'Callaghan (Code Review) 18 Apr '21

18 Apr '21

Attention is currently required from: Angel Pons, Anastasia Klimchuk. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/52283 ) Change subject: linux_spi.c: Extract get_max_kernel_buf_size() as a function ...................................................................... Patch Set 1: (1 comment) File linux_spi.c: https://review.coreboot.org/c/flashrom/+/52283/comment/10259c38_b3f69c12 PS1, Line 169: const uint8_t bits = 8; > Oh, I can explain why this line is not here. […] Ack, my mistake thanks for pointing it out. -- To view, visit https://review.coreboot.org/c/flashrom/+/52283 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I4b8c5775fb8f4b0dff702fcc0fb258221254c659 Gerrit-Change-Number: 52283 Gerrit-PatchSet: 1 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: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Nico Huber <nico.h(a)gmx.de> Gerrit-CC: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-CC: Sam McNally <sammc(a)google.com> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Sun, 18 Apr 2021 12:14:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Edward O'Callaghan <quasisec(a)chromium.org> Comment-In-Reply-To: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: comment

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit April 2021