github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-06 05:27:07 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ACPI: PMIC: Fix intel_pmic_regs_handler() read accesses

Browse Source 
[ Upstream commit 009a789443 ]

The handling of PMIC register reads through writing 0 to address 4
of the OpRegion is wrong. Instead of returning the read value
through the value64, which is a no-op for function == ACPI_WRITE calls,
store the value and then on a subsequent function == ACPI_READ with
address == 3 (the address for the value field of the OpRegion)
return the stored value.

This has been tested on a Xiaomi Mi Pad 2 and makes the ACPI battery dev
there mostly functional (unfortunately there are still other issues).

Here are the SET() / GET() functions of the PMIC ACPI device,
which use this OpRegion, which clearly show the new behavior to
be correct:

OperationRegion (REGS, 0x8F, Zero, 0x50)
Field (REGS, ByteAcc, NoLock, Preserve)
{
    CLNT,   8,
    SA,     8,
    OFF,    8,
    VAL,    8,
    RWM,    8
}

Method (GET, 3, Serialized)
{
    If ((AVBE == One))
    {
        CLNT = Arg0
        SA = Arg1
        OFF = Arg2
        RWM = Zero
        If ((AVBG == One))
        {
            GPRW = Zero
        }
    }

    Return (VAL) /* \_SB_.PCI0.I2C7.PMI5.VAL_ */
}

Method (SET, 4, Serialized)
{
    If ((AVBE == One))
    {
        CLNT = Arg0
        SA = Arg1
        OFF = Arg2
        VAL = Arg3
        RWM = One
        If ((AVBG == One))
        {
            GPRW = One
        }
    }
}

Fixes: 0afa877a56 ("ACPI / PMIC: intel: add REGS operation region support")
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Hans de Goede 2021-10-31 16:31:35 +01:00 committed by Greg Kroah-Hartman
parent d83832d4a8
commit ee8a3ae48a
1 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
drivers/acpi/pmic/intel_pmic.c
View File

@ -211,31 +211,36 @@ static acpi_status intel_pmic_regs_handler(u32 function,
void *handler_context, void *region_context) void *handler_context, void *region_context)
{ {
struct intel_pmic_opregion *opregion = region_context; struct intel_pmic_opregion *opregion = region_context;
int result = 0; int result = -EINVAL;
switch (address) { if (function == ACPI_WRITE) {
case 0: switch (address) {
return AE_OK; case 0:
case 1: return AE_OK;
opregion->ctx.addr |= (*value64 & 0xff) << 8; case 1:
return AE_OK; opregion->ctx.addr |= (*value64 & 0xff) << 8;
case 2: return AE_OK;
opregion->ctx.addr |= *value64 & 0xff; case 2:
return AE_OK; opregion->ctx.addr |= *value64 & 0xff;
case 3: return AE_OK;
opregion->ctx.val = *value64 & 0xff; case 3:
return AE_OK; opregion->ctx.val = *value64 & 0xff;
case 4: return AE_OK;
if (*value64) { case 4:
result = regmap_write(opregion->regmap, opregion->ctx.addr, if (*value64) {
opregion->ctx.val); result = regmap_write(opregion->regmap, opregion->ctx.addr,
} else { opregion->ctx.val);
result = regmap_read(opregion->regmap, opregion->ctx.addr, } else {
&opregion->ctx.val); result = regmap_read(opregion->regmap, opregion->ctx.addr,
if (result == 0) &opregion->ctx.val);
*value64 = opregion->ctx.val; }
opregion->ctx.addr = 0;
} }
memset(&opregion->ctx, 0x00, sizeof(opregion->ctx)); }
if (function == ACPI_READ && address == 3) {
*value64 = opregion->ctx.val;
return AE_OK;
} }
if (result < 0) { if (result < 0) {