Received-SPF: pass (google.com: domain of linux-kernel+bounces-91359-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: Armin Wolf <W_Armin@gmx.de>
To: hdegoede@redhat.com,
	ilpo.jarvinen@linux.intel.com
Cc: platform-driver-x86@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH 1/2] platform/x86: wmi: Support reading/writing 16 bit EC values
Date: Mon,  4 Mar 2024 23:17:31 +0100
Message-Id: <20240304221732.39272-1-W_Armin@gmx.de>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
UI-OutboundReport: notjunk:1;M01:P0:Dwn4bMpLiuM=;owKiHwRliBJnz2ulk7Icj0E2Mq3
 yK7cI/GxTALIIsJc72AM+ISjGPvWxxbHqD33EMXYz7LgrFN9jRNcFTG4oB/H88wdGv35edB8l
 STrZu45GeyJxR8ruxS+q0BygUIhryjJOpwCDFesX5BcCcwvLIMQrHnkyqoX7r5ZH3aCTY4eq+
 E6eYB2iUTkeTv9+nAq5bnheLhmeaWJBdXkI3c8ncGKy4fASDG06a7/XBCpxG3MPTCX6wIR92J
 jq/GM1sZBar9fBsZIZ5HVY94oCCgKXY/lmcStkony/xXqEjz+z255OKR4khUhJHc4vxtvXvqf
 DX2vxHlqMHJP83razOBLj3J0+BGrKLxj3OfrnHbEvB1TjfJ5dpf610FxuQdkynS4bgJZv1yRu
 1hy7jQAb9axTBjZQrGzWQKhuuFLBEyVmLNTokkgU6jkpXszu09F9wSyTSnbUkP+FAp8KrX1pr
 vXx35dTQNkqnB6dOLZiu9hr8n1bRx8wtOkSDG7/uFFIImX4QSEuvEqAYaP8mZQbIrGYCqTmBA
 eV2wCxv4mNytAfqQesdT3tHF/llXbNY5k+bXkIgcg8ft4ZVjVLGjxNnWXK+IVj5FKSgKBHRzR
 PAquodzbWHlEHXFJsOO4YSkRaTsbtxggC0PGcUv8OWMnHFA8QLCS+Aj2AfDuSN/sL1oIk7LFh
 7o6eh98/llduwKOjiag0Nw2QmJBs/aRycTx6BrFJz4KnZUedI10w4YVF9sTvS4NW1gZZj94Ve
 YIqS7LZ+AgDnraFJ6Nj7r/5Ny0bntNefeRM56G5N9couJxcb0J2rIrYsuIZB2lUsCopdjQw+L
 dKucIy6Rf50vDOFKycz5d3q92uolBZsKHF78SmrcGdVkk=

The ACPI EC address space handler currently only supports
reading/writing 8 bit values. Some firmware implementations however
want to access for example 16 bit values, which is prefectly legal
according to the ACPI spec.

Add support for reading/writing such values.

Tested on a Dell Inspiron 3505 and a Asus Prime B650-Plus.

Signed-off-by: Armin Wolf <W_Armin@gmx.de>
=2D--
 drivers/platform/x86/wmi.c | 44 +++++++++++++++++++++++++++++---------
 1 file changed, 34 insertions(+), 10 deletions(-)

diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
index 1920e115da89..900e0e52a5fa 100644
=2D-- a/drivers/platform/x86/wmi.c
+++ b/drivers/platform/x86/wmi.c
@@ -1153,6 +1153,32 @@ static int parse_wdg(struct device *wmi_bus_dev, st=
ruct platform_device *pdev)
 	return 0;
 }

+static int ec_read_multiple(u8 address, u8 *buffer, size_t bytes)
+{
+	int i, ret;
+
+	for (i =3D 0; i < bytes; i++) {
+		ret =3D ec_read(address + i, &buffer[i]);
+		if (ret < 0)
+			return ret;
+	}
+
+	return 0;
+}
+
+static int ec_write_multiple(u8 address, u8 *buffer, size_t bytes)
+{
+	int i, ret;
+
+	for (i =3D 0; i < bytes; i++) {
+		ret =3D ec_write(address + i, buffer[i]);
+		if (ret < 0)
+			return ret;
+	}
+
+	return 0;
+}
+
 /*
  * WMI can have EmbeddedControl access regions. In which case, we just wa=
nt to
  * hand these off to the EC driver.
@@ -1162,27 +1188,25 @@ acpi_wmi_ec_space_handler(u32 function, acpi_physi=
cal_address address,
 			  u32 bits, u64 *value,
 			  void *handler_context, void *region_context)
 {
-	int result =3D 0;
-	u8 temp =3D 0;
+	int bytes =3D bits / 8;
+	int ret;

-	if ((address > 0xFF) || !value)
+	if (address > 0xFF || !value)
 		return AE_BAD_PARAMETER;

-	if (function !=3D ACPI_READ && function !=3D ACPI_WRITE)
+	if (bytes > sizeof(*value))
 		return AE_BAD_PARAMETER;

-	if (bits !=3D 8)
+	if (function !=3D ACPI_READ && function !=3D ACPI_WRITE)
 		return AE_BAD_PARAMETER;

 	if (function =3D=3D ACPI_READ) {
-		result =3D ec_read(address, &temp);
-		*value =3D temp;
+		ret =3D ec_read_multiple(address, (u8 *)value, bytes);
 	} else {
-		temp =3D 0xff & *value;
-		result =3D ec_write(address, temp);
+		ret =3D ec_write_multiple(address, (u8 *)value, bytes);
 	}

-	switch (result) {
+	switch (ret) {
 	case -EINVAL:
 		return AE_BAD_PARAMETER;
 	case -ENODEV:
=2D-
2.39.2