libflash/ipmi-hiomap: Respect daemon presence and flash control

Fix the fix of ORing in the BMC state - we only want to retain state
covered by the ack mask as this is something we still need to handle.
Critically, we must not retain state not covered by the ack mask as this
may lead to host firmware attempting to communicate with a dead daemon
or attempting to access the PNOR whilst the daemon is not in control of
the flash.

Further, add unit tests to capture the desired (and now implemented)
behaviour.

Fixes: 34cffed2ccf3 ("libflash/ipmi-hiomap: Improve event handling")
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Stewart Smith <stewart@linux.ibm.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/libflash/ipmi-hiomap.c b/libflash/ipmi-hiomap.c
index 88e9edac..e2b64fe9 100644
--- a/libflash/ipmi-hiomap.c
+++ b/libflash/ipmi-hiomap.c
@@ -446,7 +446,7 @@ static void hiomap_event(uint8_t events, void *context)
 	prlog(PR_DEBUG, "Received events: 0x%x\n", events);
 
 	lock(&ctx->lock);
-	ctx->bmc_state |= events;
+	ctx->bmc_state = events | (ctx->bmc_state & HIOMAP_E_ACK_MASK);
 	ctx->update = true;
 	unlock(&ctx->lock);
 }