drivers/efi/efivars.c: Fix variable state management

Fix changing the variables state when efi_fv_set_option API is used.
When variables are being deleted, the VAR_DELETED or
VAR_IN_DELETED_TRANSITION are masks, not values to assign to the
variable header state. This caused the EDK2 variable driver to ignore
entries added or changed by efi_fv_set_option API in coreboot.

Upstream-Status: Pending
Signed-off-by: Michał Żygowski <michal.zygowski@3mdeb.com>

Author: miczyg1

src/drivers/efi/efivars.c

@@ -615,7 +615,7 @@ enum cb_err efi_fv_set_option(struct region_device *rdev,
 		rdev_old = store_rdev;
 
 		/* Mark as to be deleted */
-		hdr.State = VAR_IN_DELETED_TRANSITION;
+		hdr.State &= VAR_IN_DELETED_TRANSITION;
 		if (rdev_writeat(&store_rdev, &hdr.State, offsetof(VARIABLE_HEADER, State),
 			sizeof(hdr.State)) != sizeof(hdr.State))
 			return CB_EFI_ACCESS_ERROR;
@@ -642,7 +642,7 @@ enum cb_err efi_fv_set_option(struct region_device *rdev,
 
 	if (found_existing) {
 		/* Mark old variable as deleted */
-		hdr.State = VAR_DELETED;
+		hdr.State &= VAR_DELETED;
 		if (rdev_writeat(&rdev_old, &hdr.State, offsetof(VARIABLE_HEADER, State),
 			sizeof(hdr.State)) != sizeof(hdr.State))
 			return CB_EFI_ACCESS_ERROR;