September 2024 - flashrom-gerrit

[XS] Change in flashrom[main]: ichspi: Change the opcode position for reprogramming on the fly 2->4
by Anastasia Klimchuk (Code Review) 28 Sep '24

28 Sep '24

Attention is currently required from: Bill XIE, Nikolai Artemiev. Hello Bill XIE, Nikolai Artemiev, build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/84567?usp=email to look at the new patch set (#2). Change subject: ichspi: Change the opcode position for reprogramming on the fly 2->4 ...................................................................... ichspi: Change the opcode position for reprogramming on the fly 2->4 The function for reprogramming on the fly was using the default configuration O_ST_M25P as a base and the position 2 as the position to reprogram. Position 2 corresponds to JEDEC_SE which is often useful for chip erase (when less than whole chip needs to be erased). This patch changes the default position to reprogram to 4, which corresponds to JEDEC_REMS. It is used less often, but if it needs to be used, it will be discovered missing and reprogrammed back. For erase opcodes, there is usually several of them available. So if one is missing, erase still can be performed with the remaining ones. However, this hides the fact that one of available erase opcodes is missing (it won't be reprogrammed back), and also it gives non-optimal erase layout. Context: https://ticket.coreboot.org/issues/556 Change-Id: I6bc855daedf0af2e8de191f23a3512de3ebc3fef Signed-off-by: Anastasia Klimchuk <aklm(a)flashrom.org> --- M ichspi.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/67/84567/2 -- To view, visit https://review.coreboot.org/c/flashrom/+/84567?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: flashrom Gerrit-Branch: main Gerrit-Change-Id: I6bc855daedf0af2e8de191f23a3512de3ebc3fef Gerrit-Change-Number: 84567 Gerrit-PatchSet: 2 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Bill XIE <persmule(a)hardenedlinux.org> Gerrit-Reviewer: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Bill XIE <persmule(a)hardenedlinux.org> Gerrit-Attention: Nikolai Artemiev <nartemiev(a)google.com>

1 0

[S] Change in flashrom[main]: ichspi: Restore Sector erase opcode after send command
by Anastasia Klimchuk (Code Review) 27 Sep '24

27 Sep '24

Attention is currently required from: Bill XIE, Nikolai Artemiev, Peter Marheine. Anastasia Klimchuk has posted comments on this change by Bill XIE. ( https://review.coreboot.org/c/flashrom/+/84253?usp=email ) Change subject: ichspi: Restore Sector erase opcode after send command ...................................................................... Patch Set 1: (2 comments) File ichspi.c: https://review.coreboot.org/c/flashrom/+/84253/comment/28a8b295_4d4dbfde?us… : PS1, Line 664: int oppos = 2; // use original JEDEC_BE_D8 offset I made a separate patch CB:84567 in case it end up being useful. > It's worth noting that newer CPUs don't support this code path (they use hwseq) Oh, maybe that partially explains why the issue was not noticed before... https://review.coreboot.org/c/flashrom/+/84253/comment/739b62fa_a396c952?us… : PS1, Line 1843: : static bool ich_spi_probe_opcode(const struct flashctx *flash, uint8_t opcode) : { : return find_opcode(curopcodes, opcode) >= 0; > Rather than restoring JEDEC_SE after every ich_spi_send_command() call, we could add a check here to […] Oh this is really clever solution :) Thank you! If we go that way, we can treat other erase opcodes in the same way? Specifically, in the POSSIBLE_OPCODES there are: JEDEC_SE JEDEC_BE_52 JEDEC_BE_D8 JEDEC_CE_C7 Maybe we can add the check here for all those? Bill, would you agree to change your patch, and test the different solution? As a plan B I can upload new version of the patch, but asking you first because you are the author (and you did all the debugging). Also, in any case, original author of the patch stays (even if someone uploads new version) -- To view, visit https://review.coreboot.org/c/flashrom/+/84253?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: flashrom Gerrit-Branch: main Gerrit-Change-Id: I3fc831fc072e2af9265835cb2f71bf8c222c6a64 Gerrit-Change-Number: 84253 Gerrit-PatchSet: 1 Gerrit-Owner: Bill XIE <persmule(a)hardenedlinux.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Bill XIE <persmule(a)hardenedlinux.org> Gerrit-Attention: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Comment-Date: Fri, 27 Sep 2024 09:57:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Nikolai Artemiev <nartemiev(a)google.com> Comment-In-Reply-To: Anastasia Klimchuk <aklm(a)chromium.org>

1 0

[XS] Change in flashrom[main]: ichspi: Change the opcode position for reprogramming on the fly 2->4
by Anastasia Klimchuk (Code Review) 27 Sep '24

27 Sep '24

Anastasia Klimchuk has posted comments on this change by Anastasia Klimchuk. ( https://review.coreboot.org/c/flashrom/+/84567?usp=email ) Change subject: ichspi: Change the opcode position for reprogramming on the fly 2->4 ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: Needs to be tested -- To view, visit https://review.coreboot.org/c/flashrom/+/84567?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: flashrom Gerrit-Branch: main Gerrit-Change-Id: I6bc855daedf0af2e8de191f23a3512de3ebc3fef Gerrit-Change-Number: 84567 Gerrit-PatchSet: 1 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Fri, 27 Sep 2024 08:54:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[XS] Change in flashrom[main]: ichspi: Change the opcode position for reprogramming on the fly 2->4
by Anastasia Klimchuk (Code Review) 27 Sep '24

27 Sep '24

Anastasia Klimchuk has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/84567?usp=email ) Change subject: ichspi: Change the opcode position for reprogramming on the fly 2->4 ...................................................................... ichspi: Change the opcode position for reprogramming on the fly 2->4 The function for reprogramming on the fly was using the default configuration O_ST_M25P as a base and the position 2 as the position to reprogram. Position 2 corresponds to JEDEC_SE which is often useful for chip erase (when less than whole chip needs to be erased). This patch changes the default position to reprogram to 4, which corresponds to JEDEC_REMS. It is used less often, but if it needs to be used, it will be discovered missing and reprogrammed back. For erase opcodes, there is usually several of them available. So if one is missing, erase still can be performed with the remaining ones. However, this hides the fact that one of available erase opcodes is missing (it won't be reprogrammed back), and also it gives non-optimal erase layout. Change-Id: I6bc855daedf0af2e8de191f23a3512de3ebc3fef Signed-off-by: Anastasia Klimchuk <aklm(a)flashrom.org> --- M ichspi.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/67/84567/1 diff --git a/ichspi.c b/ichspi.c index d01f2f3..358d9f4 100644 --- a/ichspi.c +++ b/ichspi.c @@ -661,7 +661,7 @@ else // we have an invalid case return SPI_INVALID_LENGTH; } - int oppos = 2; // use original JEDEC_BE_D8 offset + int oppos = 4; // use the original position of JEDEC_REMS curopcodes->opcode[oppos].opcode = opcode; curopcodes->opcode[oppos].spi_type = spi_type; program_opcodes(curopcodes, 0, ich_generation); -- To view, visit https://review.coreboot.org/c/flashrom/+/84567?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: flashrom Gerrit-Branch: main Gerrit-Change-Id: I6bc855daedf0af2e8de191f23a3512de3ebc3fef Gerrit-Change-Number: 84567 Gerrit-PatchSet: 1 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org>

1 0

[L] Change in flashrom[main]: build: never install cmocka
by Peter Marheine (Code Review) 27 Sep '24

27 Sep '24

Peter Marheine has posted comments on this change by Peter Marheine. ( https://review.coreboot.org/c/flashrom/+/84557?usp=email ) Change subject: build: never install cmocka ...................................................................... Patch Set 3: (1 comment) Patchset: PS2: > This is great, thank you! […] Rebased onto main~1, which ought to be enough. -- To view, visit https://review.coreboot.org/c/flashrom/+/84557?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: flashrom Gerrit-Branch: main Gerrit-Change-Id: I15f549175e2d5d52979814d7f7530da868871ce8 Gerrit-Change-Number: 84557 Gerrit-PatchSet: 3 Gerrit-Owner: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Fri, 27 Sep 2024 03:33:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Anastasia Klimchuk <aklm(a)chromium.org>

1 0

[L] Change in flashrom[main]: Fwd: Software info for Willem/EZOflash
by Anastasia Klimchuk (Code Review) 27 Sep '24

27 Sep '24

Attention is currently required from: Balázs Vinarz, Keith Hui. Anastasia Klimchuk has posted comments on this change by Nico Huber. ( https://review.coreboot.org/c/flashrom/+/23053?usp=email ) Change subject: Fwd: Software info for Willem/EZOflash ...................................................................... Patch Set 1: (2 comments) Patchset: PS1: > I have a homemade PCB3B variant that was later modified to (apparently proprietary) PCB45 specs, fol […] Keith, hello! Thank you :) Stay with us, maybe there will be something to test soon. PS1: > Sounds great, thank you! […] Forgot to say: you can push the patch even if it's "work in progress", maybe you want to ask questions, then other people can help! -- To view, visit https://review.coreboot.org/c/flashrom/+/23053?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: flashrom Gerrit-Branch: main Gerrit-Change-Id: Idc4d98593076c80fd1d6ac4596940d1d7977343c Gerrit-Change-Number: 23053 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Gerrit-Reviewer: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-CC: Balázs Vinarz <vinibali1(a)gmail.com> Gerrit-CC: Keith Hui <buurin(a)gmail.com> Gerrit-CC: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Attention: Balázs Vinarz <vinibali1(a)gmail.com> Gerrit-Attention: Keith Hui <buurin(a)gmail.com> Gerrit-Comment-Date: Fri, 27 Sep 2024 01:32:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Balázs Vinarz <vinibali1(a)gmail.com> Comment-In-Reply-To: Anastasia Klimchuk <aklm(a)chromium.org> Comment-In-Reply-To: Keith Hui <buurin(a)gmail.com>

1 0

[L] Change in flashrom[main]: build: never install cmocka
by Anastasia Klimchuk (Code Review) 27 Sep '24

27 Sep '24

Attention is currently required from: Peter Marheine. Anastasia Klimchuk has posted comments on this change by Peter Marheine. ( https://review.coreboot.org/c/flashrom/+/84557?usp=email ) Change subject: build: never install cmocka ...................................................................... Patch Set 2: Code-Review+2 (1 comment) Patchset: PS2: This is great, thank you! I will look if it's possible to re-run Jenkins, the plan B I will do some small and useful commit, and after submitting this one can be rebased :) I don't want to "force +1", it's better to make CI re-run -- To view, visit https://review.coreboot.org/c/flashrom/+/84557?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: flashrom Gerrit-Branch: main Gerrit-Change-Id: I15f549175e2d5d52979814d7f7530da868871ce8 Gerrit-Change-Number: 84557 Gerrit-PatchSet: 2 Gerrit-Owner: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Comment-Date: Fri, 27 Sep 2024 00:23:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[L] Change in flashrom[main]: build: never install cmocka
by Peter Marheine (Code Review) 26 Sep '24

26 Sep '24

Attention is currently required from: Anastasia Klimchuk, Peter Marheine. Hello Anastasia Klimchuk, build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/84557?usp=email to look at the new patch set (#2). Change subject: build: never install cmocka ...................................................................... build: never install cmocka meson's default behavior is to install subprojects, so because we use a wrap to get cmocka if needed and the cmocka wrap sets install=true unless cross-compiling, cmocka headers and libraries will be installed by `meson install`. This isn't useful (because cmocka is used only for tests which don't get installed), and can cause install errors in some configurations. meson can be told to never install subprojects with `meson install --skip-subprojects` which solves this, but is inconvenient because that option must be specified on the command line and there is little hope of meson's default behavior changing [1]. To fix this, I've replaced `patch_url` for the wrap with an included `patch_directory` instead, which was created by unpacking the original archive pointed to by `patch_url` and setting `install : false` in src/meson.build. A more concise option to make the same change would be to make the change to the `install` option in a new patch specified via `diff_files` (which works because patches from `diff_files` are applied after applying the `patch_*` archive), but `diff_files` is not supported by Meson before version 0.63.0 which would require increasing flashrom's minimum meson version from the current 0.56.0. This seems too new, since meson 0.56 was released in October 2020 while meson 0.63 was released in July 2022. [1]: https://github.com/mesonbuild/meson/issues/10561#issuecomment-1444059473 BUG=https://ticket.coreboot.org/issues/561 Change-Id: I15f549175e2d5d52979814d7f7530da868871ce8 Signed-off-by: Peter Marheine <pmarheine(a)chromium.org> --- M subprojects/cmocka.wrap A subprojects/packagefiles/cmocka-1.1.5/LICENSE.build A subprojects/packagefiles/cmocka-1.1.5/meson.build A subprojects/packagefiles/cmocka-1.1.5/private/meson.build A subprojects/packagefiles/cmocka-1.1.5/private_native/meson.build A subprojects/packagefiles/cmocka-1.1.5/src/meson.build 6 files changed, 325 insertions(+), 3 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/57/84557/2 -- To view, visit https://review.coreboot.org/c/flashrom/+/84557?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: flashrom Gerrit-Branch: main Gerrit-Change-Id: I15f549175e2d5d52979814d7f7530da868871ce8 Gerrit-Change-Number: 84557 Gerrit-PatchSet: 2 Gerrit-Owner: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org>

1 0

[L] Change in flashrom[main]: build: never install cmocka
by Peter Marheine (Code Review) 26 Sep '24

26 Sep '24

Peter Marheine has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/84557?usp=email ) Change subject: build: never install cmocka ...................................................................... build: never install cmocka meson's default behavior is to install subprojects, so because we use a wrap to get cmocka if needed and the cmocka wrap sets install=true unless cross-compiling, cmocka headers and libraries will be installed by `meson install`. This isn't useful (because cmocka is used only for tests which don't get installed), and can cause install errors in some configurations. meson can be told to never install subprojects with `meson install --skip-subprojects` which solves this, but is inconvenient because that option must be specified on the command line and there is little hope of meson's default behavior changing [1]. To fix this, I've replaced `patch_url` for the wrap with an included `patch_directory` instead, which was created by unpacking the original archive pointed to by `patch_url` and setting `install : false` in src/meson.build. A more concise option to make the same change would be to make the change to the `install` option in a new patch specified via `diff_files` (which works because patches from `diff_files` are applied after applying the `patch_*` archive), but `diff_files` is not supported by Meson before version 0.63.0 which would require increasing flashrom's minimum meson version from the current 0.56.0. This seems too new, since meson 0.56 was released in October 2020 while meson 0.63 was released in July 2022. [1]: https://github.com/mesonbuild/meson/issues/10561#issuecomment-1444059473 BUG=https://ticket.coreboot.org/issues/561 Change-Id: I15f549175e2d5d52979814d7f7530da868871ce8 --- M subprojects/cmocka.wrap A subprojects/packagefiles/cmocka-1.1.5/LICENSE.build A subprojects/packagefiles/cmocka-1.1.5/meson.build A subprojects/packagefiles/cmocka-1.1.5/private/meson.build A subprojects/packagefiles/cmocka-1.1.5/private_native/meson.build A subprojects/packagefiles/cmocka-1.1.5/src/meson.build 6 files changed, 325 insertions(+), 3 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/57/84557/1 diff --git a/subprojects/cmocka.wrap b/subprojects/cmocka.wrap index 21e84f9..4d1cf27 100644 --- a/subprojects/cmocka.wrap +++ b/subprojects/cmocka.wrap @@ -5,6 +5,4 @@ source_filename = cmocka-1.1.5.tar.xz source_hash = f0ccd8242d55e2fd74b16ba518359151f6f8383ff8aef4976e48393f77bba8b6 -patch_url = https://wrapdb.mesonbuild.com/v1/projects/cmocka/1.1.5/3/get_zip -patch_filename = cmocka-1.1.5-3-wrap.zip -patch_hash = 81ce48613680d3c3a0b396ac570c852b290adcd18202fb16aaf703a9493f4348 +patch_directory = cmocka-1.1.5 diff --git a/subprojects/packagefiles/cmocka-1.1.5/LICENSE.build b/subprojects/packagefiles/cmocka-1.1.5/LICENSE.build new file mode 100644 index 0000000..ec28804 --- /dev/null +++ b/subprojects/packagefiles/cmocka-1.1.5/LICENSE.build @@ -0,0 +1,19 @@ +Copyright (c) 2018 The Meson development team + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/subprojects/packagefiles/cmocka-1.1.5/meson.build b/subprojects/packagefiles/cmocka-1.1.5/meson.build new file mode 100644 index 0000000..16245d1 --- /dev/null +++ b/subprojects/packagefiles/cmocka-1.1.5/meson.build @@ -0,0 +1,213 @@ +# Copyright © 2018 Intel Corporation +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +project( + 'cmocka', + ['c'], + version : '1.1.5', + license : 'APLv2', + meson_version : '>= 0.48.0', + default_options : ['c_std=c99', 'buildtype=debugoptimized'], +) + +lib_version = '0.5.0' + +# TODO: pkg-config +# TODO: cmake-config + +inc_include = include_directories('include') + +##################### +# Config Generation # +##################### + +cc_dict = { + 'compiler': meson.get_compiler('c'), + 'machine': host_machine, + 'config_h_subdir': 'private', + 'native': false +} + +cc_native_dict = { + 'compiler': meson.get_compiler('c', native: true), + 'machine': build_machine, + 'config_h_subdir': 'private_native', + 'native': true +} + +configurations = [cc_dict, cc_native_dict] + +foreach entry : configurations + compiler = entry.get('compiler') + is_native = entry.get('native') + machine = entry.get('machine') + + config = configuration_data() + + if ['gcc', 'clang'].contains(compiler.get_id()) + add_project_arguments( + # I've explicitly skipped the duplicated -W versions when they also test + # for the -Werror version + compiler.get_supported_arguments( + '-Wshadow', + '-Wmissing-prototypes', + '-Wcast-align', + '-Werror=address', + '-Werror=strict-prototypes', + '-Werror=write-strings', + '-Werror=implicit-function-declaration', + '-Werror=pointer-arith', + '-Werror=declaration-after-statement', + '-Werror=return-type', + '-Werror=uninitialized', + '-Wimplicit-fallthrough', + '-Werror=strict-overflow', + '-Wstrict-overflow=2', + '-Wno-format-zero-length', + '-Wformat', + '-Werror=format-security', + '-Wno-gnu-zero-variadic-macro-arguments', + '-fno-common', + ), + language : ['c'], + native: is_native + ) + # We can't test the build type, so we can' add -D_FORTIFY_SOURCE=2 here + if machine.system() == 'darwin' + if compiler.has_argument('-Wno-deprecated-declarations') + add_project_arguments('-Wno-deprecated-declarations', language : ['c'], native: is_native) + endif + endif + elif compiler.get_id() == 'msvc' + add_project_arguments( + '/D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1', + '/D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1', + '/D_CRT_NONSTDC_NO_WARNINGS=1', + '/D_CRT_SECURE_NO_WARNINGS=1', + language : ['c'], + native: is_native + ) + endif + + # TODO: solaris extensions + + foreach h : ['assert.h', 'inttypes.h', 'io.h', 'malloc.h', 'memory.h', + 'setjmp.h', 'signal.h', 'stdarg.h', 'stddef.h', 'stdint.h', + 'stdio.h', 'stdlib.h', 'string.h', 'strings.h', 'sys/stat.h', + 'sys/types.h', 'time.h', 'unistd.h'] + if compiler.check_header(h) + config.set('HAVE_@0@'.format(h.underscorify().to_upper()), 1) + endif + endforeach + + if config.get('HAVE_TIME_H', 0) == 1 + if compiler.has_member('struct timespec', 'tv_sec', prefix : '#include <time.h>') + config.set('HAVE_STRUCT_TIMESPEC', 1) + endif + endif + + foreach f : ['calloc', 'exit', 'fprintf', 'free', 'longjmp', 'siglongjmp', + 'malloc', 'memcpy', 'memset', 'printf', 'setjmp', 'signal', + 'strsignal', 'strcmp', 'clock_gettime'] + if compiler.has_function(f) + config.set('HAVE_@0@'.format(f.underscorify().to_upper()), 1) + endif + endforeach + + if machine.system() == 'windows' + foreach f : ['_vsnprintf_s', '_vsnprtinf', '_snprintf_s', '_snprintf'] + if compiler.has_function(f) + config.set('HAVE_@0@'.format(f.underscorify().to_upper()), 1) + endif + endforeach + foreach f : ['snprintf', 'vsnprintf'] + if compiler.has_header_symbol('stdio.h', f) + config.set('HAVE_@0@'.format(f.underscorify().to_upper()), 1) + endif + endforeach +else + foreach f : ['snprintf', 'vsnprintf'] + if compiler.has_function(f) + config.set('HAVE_@0@'.format(f.underscorify().to_upper()), 1) + endif + endforeach +endif + + if machine.system() == 'windows' + if compiler.compiles(''' + __declspec(thread) int tls; + + int main(void) { + return 0; + }''', + name : 'Thread Local Storage') + config.set('HAVE_MSVC_THREAD_LOCAL_STORAGE', 1) + endif + else + if compiler.compiles(''' + __thread int tls; + + int main(void) { + return 0; + }''', + name : 'Thread Local Storage') + config.set('HAVE_GCC_THREAD_LOCAL_STORAGE', 1) + endif + endif + + if (config.get('HAVE_TIME_H', 0) == 1 and + config.get('HAVE_STRUCT_TIMESPEC', 0) == 1 and + config.get('HAVE_CLOCK_GETTIME', 0) == 1) + if compiler.has_header_symbol('time.h', 'CLOCK_REALTIME') + config.set('HAVE_CLOCK_REALTIME', 1) + endif + endif + + config.set('WORDS_SIZEOF_VOID_P', compiler.sizeof('void *')) + if machine.endian() == 'big' + config.set('WORDS_BIGENDIAN', 1) + endif + + # Execute subdir to create config.h for this pass + # This requires the use of the variable named "config" for configuration_data(), + # as this variable is used in each configuration header subdirectory. + subdir(entry.get('config_h_subdir')) + +endforeach + +########################### +# Subdirectory Processing # +########################### + +subdir('src') + +###################### +# Dependency Targets # +###################### + +# TODO: doc, include, tests, example +# Since we're using this as a wrap, and it's a unit test framework we're not +# going to install it. + +cmocka_dep = declare_dependency( + link_with : libcmocka, + include_directories : inc_include, + version : meson.project_version(), +) + +cmocka_native_dep = declare_dependency( + link_with : libcmocka_native, + include_directories : inc_include, + version : meson.project_version(), +) diff --git a/subprojects/packagefiles/cmocka-1.1.5/private/meson.build b/subprojects/packagefiles/cmocka-1.1.5/private/meson.build new file mode 100644 index 0000000..ca5bf09 --- /dev/null +++ b/subprojects/packagefiles/cmocka-1.1.5/private/meson.build @@ -0,0 +1,23 @@ +# Copyright © 2018 Intel Corporation +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + + +## This file sets the config.h header for standard builds (e.g., not native: true) + +config_h = configure_file( + configuration : config, + output : 'config.h', +) + +inc_private = include_directories('.') diff --git a/subprojects/packagefiles/cmocka-1.1.5/private_native/meson.build b/subprojects/packagefiles/cmocka-1.1.5/private_native/meson.build new file mode 100644 index 0000000..81b923c --- /dev/null +++ b/subprojects/packagefiles/cmocka-1.1.5/private_native/meson.build @@ -0,0 +1,23 @@ +# Copyright © 2018 Intel Corporation +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + + +## This file sets the config.h header for standard builds (e.g., not native: true) + +config_h_native = configure_file( + configuration : config, + output : 'config.h', +) + +inc_private_native = include_directories('.') diff --git a/subprojects/packagefiles/cmocka-1.1.5/src/meson.build b/subprojects/packagefiles/cmocka-1.1.5/src/meson.build new file mode 100644 index 0000000..e469049 --- /dev/null +++ b/subprojects/packagefiles/cmocka-1.1.5/src/meson.build @@ -0,0 +1,46 @@ +# Copyright © 2018 Intel Corporation +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# cmocka rather annoyingly uses different standards for different platforms. +_overrides = [] +if host_machine.system() != 'windows' + _overrides += 'c_std=gnu99' +endif + +libcmocka = library( + 'cmocka', + ['cmocka.c'], + c_args : '-DHAVE_CONFIG_H=1', + include_directories : [inc_include, inc_private], + vs_module_defs : 'cmocka.def', + soversion : host_machine.system() != 'windows' ? lib_version.split('.')[0] : '', + version : lib_version, + install : false, + override_options : _overrides, + build_by_default: false, +) + +libcmocka_native = library( + 'cmocka_native', + ['cmocka.c'], + c_args : '-DHAVE_CONFIG_H=1', + include_directories : [inc_include, inc_private_native], + vs_module_defs : 'cmocka.def', + soversion : build_machine.system() != 'windows' ? lib_version.split('.')[0] : '', + version : lib_version, + install : false, # Cannot install native targets in cross builds + override_options : _overrides, + native: true, + build_by_default: false, +) -- To view, visit https://review.coreboot.org/c/flashrom/+/84557?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: flashrom Gerrit-Branch: main Gerrit-Change-Id: I15f549175e2d5d52979814d7f7530da868871ce8 Gerrit-Change-Number: 84557 Gerrit-PatchSet: 1 Gerrit-Owner: Peter Marheine <pmarheine(a)chromium.org>

1 0

[S] Change in flashrom[main]: tests: Add header stdlib.h to allow scan-build to do analysis
by Anastasia Klimchuk (Code Review) 25 Sep '24

25 Sep '24

Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/84455?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: tests: Add header stdlib.h to allow scan-build to do analysis ...................................................................... tests: Add header stdlib.h to allow scan-build to do analysis Without the header being explicitly included, scan-build run on CI was returning errors for these files, such as: include the header <stdlib.h> or explicitly provide a declaration for 'calloc' The functions in question were calloc, free, etc. Change-Id: I4b79c5f86c074c456533296c309293e4064abe3f Signed-off-by: Anastasia Klimchuk <aklm(a)flashrom.org> Reviewed-on: https://review.coreboot.org/c/flashrom/+/84455 Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M tests/ch341a_spi.c M tests/chip_wp.c M tests/erase_func_algo.c M tests/flashrom.c M tests/helpers.c M tests/linux_mtd.c M tests/raiden_debug_spi.c M tests/tests.c 8 files changed, 12 insertions(+), 1 deletion(-) Approvals: build bot (Jenkins): Verified Stefan Reinauer: Looks good to me, approved diff --git a/tests/ch341a_spi.c b/tests/ch341a_spi.c index 1cb2652..50b3d11 100644 --- a/tests/ch341a_spi.c +++ b/tests/ch341a_spi.c @@ -13,6 +13,8 @@ * GNU General Public License for more details. */ +#include <stdlib.h> + #include "lifecycle.h" #if CONFIG_CH341A_SPI == 1 diff --git a/tests/chip_wp.c b/tests/chip_wp.c index 1fa6bb9..4f0162d 100644 --- a/tests/chip_wp.c +++ b/tests/chip_wp.c @@ -16,6 +16,7 @@ #include <include/test.h> #include <stdio.h> +#include <stdlib.h> #include <string.h> #include "chipdrivers.h" diff --git a/tests/erase_func_algo.c b/tests/erase_func_algo.c index b2a09dc..d947eb9 100644 --- a/tests/erase_func_algo.c +++ b/tests/erase_func_algo.c @@ -13,6 +13,7 @@ #include <include/test.h> #include <stdio.h> +#include <stdlib.h> #include <string.h> #include "tests.h" diff --git a/tests/flashrom.c b/tests/flashrom.c index cc88831..52cc9c8 100644 --- a/tests/flashrom.c +++ b/tests/flashrom.c @@ -13,9 +13,10 @@ * GNU General Public License for more details. */ +#include <stdlib.h> + #include <include/test.h> #include "tests.h" - #include "programmer.h" #define assert_equal_and_free(text, expected) \ diff --git a/tests/helpers.c b/tests/helpers.c index 271fb48..95a1619 100644 --- a/tests/helpers.c +++ b/tests/helpers.c @@ -19,6 +19,7 @@ #include "flash.h" #include <stdint.h> +#include <stdlib.h> void address_to_bits_test_success(void **state) { diff --git a/tests/linux_mtd.c b/tests/linux_mtd.c index 3aaa5ab..0cee785 100644 --- a/tests/linux_mtd.c +++ b/tests/linux_mtd.c @@ -13,6 +13,8 @@ * GNU General Public License for more details. */ +#include <stdlib.h> + #include "lifecycle.h" #if CONFIG_LINUX_MTD == 1 diff --git a/tests/raiden_debug_spi.c b/tests/raiden_debug_spi.c index 4f0bdd3..8ec0617 100644 --- a/tests/raiden_debug_spi.c +++ b/tests/raiden_debug_spi.c @@ -13,6 +13,8 @@ * GNU General Public License for more details. */ +#include <stdlib.h> + #include "lifecycle.h" #if CONFIG_RAIDEN_DEBUG_SPI == 1 diff --git a/tests/tests.c b/tests/tests.c index 8a9dc6b..3fee056 100644 --- a/tests/tests.c +++ b/tests/tests.c @@ -20,6 +20,7 @@ #include "io_real.h" #include <stdio.h> +#include <stdlib.h> #include <string.h> #include <stdint.h> #include <pthread.h> -- To view, visit https://review.coreboot.org/c/flashrom/+/84455?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: flashrom Gerrit-Branch: main Gerrit-Change-Id: I4b79c5f86c074c456533296c309293e4064abe3f Gerrit-Change-Number: 84455 Gerrit-PatchSet: 3 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit September 2024