From 2a3c59b06f9a1e4060484f4d38607e000dab28b2 Mon Sep 17 00:00:00 2001 From: Christoffer Sandberg Date: Mon, 13 Feb 2023 11:57:54 +0100 Subject: [PATCH] uniwill_wmi: Add missing BFLG impl. according to original wmi methods --- src/uniwill_wmi.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/src/uniwill_wmi.c b/src/uniwill_wmi.c index 40dbc38..e7ea578 100644 --- a/src/uniwill_wmi.c +++ b/src/uniwill_wmi.c @@ -127,10 +127,21 @@ static u32 uw_ec_read_addr_direct(u8 addr_low, u8 addr_high, union uw_ec_read_re mutex_lock(&uniwill_ec_lock); + ec_read(UNIWILL_EC_REG_FLAGS, &flags); + if ((flags & (1 << UNIWILL_EC_BIT_BFLG)) > 0) { + output->dword = 0xfefefefe; + mutex_unlock(&uniwill_ec_lock); + return -EBUSY; + } + + flags |= (1 << UNIWILL_EC_BIT_BFLG); + ec_write(UNIWILL_EC_REG_FLAGS, flags); + ec_write(UNIWILL_EC_REG_LDAT, addr_low); ec_write(UNIWILL_EC_REG_HDAT, addr_high); - flags = (0 << UNIWILL_EC_BIT_DRDY) | (1 << UNIWILL_EC_BIT_RFLG); + flags &= ~(1 << UNIWILL_EC_BIT_DRDY); + flags |= (1 << UNIWILL_EC_BIT_RFLG); ec_write(UNIWILL_EC_REG_FLAGS, flags); // Wait for ready flag @@ -170,12 +181,23 @@ static u32 uw_ec_write_addr_direct(u8 addr_low, u8 addr_high, u8 data_low, u8 da mutex_lock(&uniwill_ec_lock); + ec_read(UNIWILL_EC_REG_FLAGS, &flags); + if ((flags & (1 << UNIWILL_EC_BIT_BFLG)) > 0) { + output->dword = 0xfefefefe; + mutex_unlock(&uniwill_ec_lock); + return -EBUSY; + } + + flags |= (1 << UNIWILL_EC_BIT_BFLG); + ec_write(UNIWILL_EC_REG_FLAGS, flags); + ec_write(UNIWILL_EC_REG_LDAT, addr_low); ec_write(UNIWILL_EC_REG_HDAT, addr_high); ec_write(UNIWILL_EC_REG_CMDL, data_low); ec_write(UNIWILL_EC_REG_CMDH, data_high); - flags = (0 << UNIWILL_EC_BIT_DRDY) | (1 << UNIWILL_EC_BIT_WFLG); + flags &= ~(1 << UNIWILL_EC_BIT_DRDY); + flags |= (1 << UNIWILL_EC_BIT_WFLG); ec_write(UNIWILL_EC_REG_FLAGS, flags); // Wait for ready flag