Joel Kitching has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37315 )
Change subject: vboot: update VbExNvStorageWrite function ......................................................................
vboot: update VbExNvStorageWrite function
Going forwards, vb2ex_commit_data will be used to flush both nvdata and secdata.
BUG=b:124141368, chromium:1006689 TEST=make clean && make test-abuild BRANCH=none
Change-Id: Ia2612da0df101cd3c46151dbce728633a39fada1 Signed-off-by: Joel Kitching kitching@google.com --- M src/security/vboot/ec_sync.c 1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/15/37315/1
diff --git a/src/security/vboot/ec_sync.c b/src/security/vboot/ec_sync.c index c2a6b25..8a3ba71 100644 --- a/src/security/vboot/ec_sync.c +++ b/src/security/vboot/ec_sync.c @@ -399,9 +399,9 @@ /* * Write opaque data into NV storage region. */ -vb2_error_t VbExNvStorageWrite(const uint8_t *buf) +vb2_error_t vb2ex_commit_data(struct vb2_context *ctx) { - save_vbnv(buf); + save_vbnv(ctx->nvdata); return VB2_SUCCESS; }
Aaron Durbin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37315 )
Change subject: vboot: update VbExNvStorageWrite function ......................................................................
Patch Set 1:
Needs a vboot rev bump?
Julius Werner has uploaded a new patch set (#2) to the change originally created by Joel Kitching. ( https://review.coreboot.org/c/coreboot/+/37315 )
Change subject: vboot: update VbExNvStorageWrite function ......................................................................
vboot: update VbExNvStorageWrite function
Going forwards, vb2ex_commit_data will be used to flush both nvdata and secdata.
BUG=b:124141368, chromium:1006689 TEST=make clean && make test-abuild BRANCH=none
Change-Id: Ia2612da0df101cd3c46151dbce728633a39fada1 Signed-off-by: Joel Kitching kitching@google.com --- M 3rdparty/vboot M src/security/vboot/ec_sync.c 2 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/15/37315/2
Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37315 )
Change subject: vboot: update VbExNvStorageWrite function ......................................................................
Patch Set 2:
Not sure where Joel is, but this is annoying me right now, so...
Aaron Durbin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37315 )
Change subject: vboot: update VbExNvStorageWrite function ......................................................................
Patch Set 2:
Patch Set 2:
Not sure where Joel is, but this is annoying me right now, so...
Should the parent be squashed into this one? I'm confused why this and the parent both bump th revision.
Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37315 )
Change subject: vboot: update VbExNvStorageWrite function ......................................................................
Patch Set 2:
Should the parent be squashed into this one? I'm confused why this and the parent both bump th revision.
I think the model recent patches have been going with is one plain revbump patch that uprevs to right in front of the dependent patch, and then only pull in the one extra patch that it's actually dependent on in the coreboot-changing patch. So that's what I went with there.
Aaron Durbin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37315 )
Change subject: vboot: update VbExNvStorageWrite function ......................................................................
Patch Set 2: Code-Review+2
Patch Set 2:
Should the parent be squashed into this one? I'm confused why this and the parent both bump th revision.
I think the model recent patches have been going with is one plain revbump patch that uprevs to right in front of the dependent patch, and then only pull in the one extra patch that it's actually dependent on in the coreboot-changing patch. So that's what I went with there.
I see. News to me.
Joel Kitching has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37315 )
Change subject: vboot: update VbExNvStorageWrite function ......................................................................
Patch Set 3: Code-Review+2
I think the model recent patches have been going with is one plain revbump patch that uprevs to right in front of the dependent patch, and then only pull in the one extra patch that it's actually dependent on in the coreboot-changing patch. So that's what I went with there.
Yes, this is the way I've been doing it so far. If people don't care we can also just group the other submodule uprevs into the same patch, but I think that would make the uprevving more confusing and less explicit.
Julius Werner has uploaded a new patch set (#4) to the change originally created by Joel Kitching. ( https://review.coreboot.org/c/coreboot/+/37315 )
Change subject: vboot: update VbExNvStorageWrite function ......................................................................
vboot: update VbExNvStorageWrite function
Going forwards, vb2ex_commit_data will be used to flush both nvdata and secdata.
The patch that is circularly dependent on this lies between a patch that makes vboot no longer build and the patch that fixes that, so we have to pull the whole thing in at once to sort out the mess.
Updating from commit id 1c4dbaa0: 2019-11-18 Julius Werner Makefile: Fix typo for MOCK_TPM
to commit id 695c56dc: 2019-12-04 Julius Werner Makefile: Make loop unrolling fully controllable by the caller
BUG=b:124141368, chromium:1006689 TEST=make clean && make test-abuild BRANCH=none
Change-Id: Ia2612da0df101cd3c46151dbce728633a39fada1 Signed-off-by: Joel Kitching kitching@google.com Signed-off-by: Julius Werner jwerner@chromium.org --- M 3rdparty/vboot M src/security/vboot/ec_sync.c 2 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/15/37315/4
Aaron Durbin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37315 )
Change subject: vboot: update VbExNvStorageWrite function ......................................................................
Patch Set 4: Code-Review+2
Julius Werner has submitted this change. ( https://review.coreboot.org/c/coreboot/+/37315 )
Change subject: vboot: update VbExNvStorageWrite function ......................................................................
vboot: update VbExNvStorageWrite function
Going forwards, vb2ex_commit_data will be used to flush both nvdata and secdata.
The patch that is circularly dependent on this lies between a patch that makes vboot no longer build and the patch that fixes that, so we have to pull the whole thing in at once to sort out the mess.
Updating from commit id 1c4dbaa0: 2019-11-18 Julius Werner Makefile: Fix typo for MOCK_TPM
to commit id 695c56dc: 2019-12-04 Julius Werner Makefile: Make loop unrolling fully controllable by the caller
BUG=b:124141368, chromium:1006689 TEST=make clean && make test-abuild BRANCH=none
Change-Id: Ia2612da0df101cd3c46151dbce728633a39fada1 Signed-off-by: Joel Kitching kitching@google.com Signed-off-by: Julius Werner jwerner@chromium.org Reviewed-on: https://review.coreboot.org/c/coreboot/+/37315 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Aaron Durbin adurbin@chromium.org --- M 3rdparty/vboot M src/security/vboot/ec_sync.c 2 files changed, 3 insertions(+), 3 deletions(-)
Approvals: build bot (Jenkins): Verified Aaron Durbin: Looks good to me, approved
diff --git a/3rdparty/vboot b/3rdparty/vboot index 1c4dbaa..695c56d 160000 --- a/3rdparty/vboot +++ b/3rdparty/vboot @@ -1 +1 @@ -Subproject commit 1c4dbaa08419e13366db32ed20244f63c34388a0 +Subproject commit 695c56dc50a59e5c9098c94f41b3d86b8f99baf1 diff --git a/src/security/vboot/ec_sync.c b/src/security/vboot/ec_sync.c index c2a6b25..8a3ba71 100644 --- a/src/security/vboot/ec_sync.c +++ b/src/security/vboot/ec_sync.c @@ -399,9 +399,9 @@ /* * Write opaque data into NV storage region. */ -vb2_error_t VbExNvStorageWrite(const uint8_t *buf) +vb2_error_t vb2ex_commit_data(struct vb2_context *ctx) { - save_vbnv(buf); + save_vbnv(ctx->nvdata); return VB2_SUCCESS; }
-
Aaron Durbin (Code Review) -
Joel Kitching (Code Review)
-
Julius Werner (Code Review)