lbmk.git/util/nvmutil, branch x270wip

util/nvmutil: general code cleanup

2026-02-19T12:23:57+00:00

Signed-off-by: Leah Rowe

util/nvmutil: use x, not ?, for random characters

2025-05-03T05:23:10+00:00

A user reported that '?' causes an error on zsh. See:

https://codeberg.org/libreboot/lbmk/issues/261

For example:

./mk inject libreboot-XXXXXX.tar.xz setmac ??:??:??:??:??:??

The user got:

 zsh: no matches found: ??:??:??:??:??:??

The mitigation here is to double-quote, e.g.:

./mk inject libreboot-XXXXXX.tar.xz setmac "??:??:??:??:??:??"

However, a lot of people won't do that. Therefore, I will
retain the current behaviour but support x/X for randomness.

Now lbmk uses x by default, instead. I will now update the
documentation, accordingly.

Signed-off-by: Leah Rowe

util/nvmutil: remove excessive comments

2025-02-25T13:29:16+00:00

Signed-off-by: Leah Rowe

util/nvmutil: Fix bad error messages on R/W

2025-02-10T20:27:48+00:00

The messages didn't really make sense.

Signed-off-by: Leah Rowe

util/nvmutil: hardened pledge on help output

2025-02-07T12:31:46+00:00

Signed-off-by: Leah Rowe

util/nvmutil: only set mac_updated at the end

2025-01-29T04:45:57+00:00

after setting the checksum too

this is functionally no different, but setting it
at the start didn't sit right with me.

it's more logically correct to set it at the end,
in case any error did not result in an exit.

Signed-off-by: Leah Rowe

util/nvmutil: Fix bad comparison

2025-01-29T04:10:52+00:00

We're checking if errno is ENOTDIR, not setting it;
the previous code would always return true, and then
set errno 0, which in the context of this code was
actually OK, so this patch makes no functional difference
in practise.

However, I'm a stickler for technical correctness. I caught
this when trying to compile with clang, because clang is
quite pedantic about checking for exactly this type of bug.

Signed-off-by: Leah Rowe

util/nvmutil: allow ./nvm gbe MAC

2025-01-29T04:07:54+00:00

previously, if the user ran:

./nvm GBE [MAC address]

it would error, treating the MAC as a command

now if only 3 arguments are provided, and the
3rd argument ins't a valid command, it's treated
as a MAC address and validated accordingly.

this should make nvmutil easier to use, because
I imagine a lot of users forget to use setmac

there's no reason we should be so pedantic. we
should allow it to be used flexibly like this

Signed-off-by: Leah Rowe

util/nvmutil: move "e" to swap()

2025-01-29T03:47:20+00:00

we only use it there, so we should only define it
there. it's used to detect host CPU endianness.

Signed-off-by: Leah Rowe

util/nvmutil: Only read up to 4KB on larger gbe

2025-01-29T03:41:55+00:00

On the 16KB and 128KB files, we still only need to
operate on 4KB at the start of each block, where the
block size is larger than 4KB.

The reason we deal with the entire 4KB block is because
the nvm words (in the 128 byte section) can define an
extended nvm area anywhere after 128 bytes, within the
128 byte block.

We could systematically read where that is being handled,
and handle it; we could then allocate less memory, and
read/write fewer bytes, but many block devices like SSDs
and flash drives have at least a 4KB erase block anyway,
so it's kinda pointless. saving memory would be nice, but
I don't really want to bloat the code.

This is a nice easy optimisation, to avoid wasting an
additional 8KB of memory when handling 16KB files, and
additional 120KB if handling 128KB files, since nf is
what determines how much memory will be allocated.

the alternative would be to use an mmap, and then we
could reasonably handle the idea above for only writing,
surgically, what we need: nvm words and extended nvm
words.

Signed-off-by: Leah Rowe