[PATCH 0/2] iio: imu: lsx6dsx: support SMO8B30 ACPI ID.

[PATCH 0/2] iio: imu: lsx6dsx: support SMO8B30 ACPI ID.

[Jonathan Cameron]

From: Jonathan Cameron <Jonathan.Cameron@huawei.com>

Darrell Kavanagh reported a failure to load the driver on his device
(for future reference, what was it?)

DSDT blob as follows.

  Scope (_SB.PCI0.I2C5)
    {
        Device (DEV)
        {
            Name (_HID, EisaId ("SMO8B30"))  // _HID: Hardware ID
            Name (_CID, EisaId ("SMO8B30"))  // _CID: Compatible ID
            Name (_UID, Zero)  // _UID: Unique ID
            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
            {
                Name (RBUF, ResourceTemplate ()
                {
                    I2cSerialBusV2 (0x006A, ControllerInitiated, 0x00061A80,
                        AddressingMode7Bit, "\\_SB.PCI0.I2C5",
                        0x00, ResourceConsumer, , Exclusive,
                        )
                })
                Return (RBUF) /* \_SB_.PCI0.I2C5.DEV_._CRS.RBUF */
            }

            Method (ROTM, 0, NotSerialized)
            {
                Name (RBUF, Package (0x03)
                {
                    "0 -1 0",
                    "1 0 0",
                    "0 0 1"
                })
                Return (RBUF) /* \_SB_.PCI0.I2C5.DEV_.ROTM.RBUF */
            }

            Method (PRIM, 0, NotSerialized)
            {
                Name (RBUF, Buffer (One)
                {
                     0x01                                             // .
                })
                Return (RBUF) /* \_SB_.PCI0.I2C5.DEV_.PRIM.RBUF */
            }

            Method (_STA, 0, NotSerialized)  // _STA: Status
            {
                If ((GAVT == 0x6A))
                {
                    Return (0x0F)
                }
                Else
                {
                    Return (Zero)
                }
            }

            Method (CALS, 1, NotSerialized)
            {
                Local0 = Arg0
                If (((Local0 == Zero) || (Local0 == Ones)))
                {
                    Local0 = BAC1 /* \BAC1 */
                    Return (Local0)
                }
                Else
                {
                    BAC1 = Local0
                    BACS = Local0
                    BSCA (0xB0)
                }
            }
        }
    }

Jonathan Cameron (2):
  iio: imu: lsm6dsx: Support SMO8B30 ACPI ID for LSM6DS3TR-C
  iio: imu: lsm6dsx: Add ACPI mount matrix retrieval

 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h      |  2 +-
 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 65 +++++++++++++++++++-
 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c  | 16 ++++-
 3 files changed, 77 insertions(+), 6 deletions(-)

-- 
2.39.1

[PATCH 1/2] iio: imu: lsm6dsx: Support SMO8B30 ACPI ID for LSM6DS3TR-C

[Jonathan Cameron]

From: Jonathan Cameron <Jonathan.Cameron@huawei.com>

ID seen in the wild and it is a valid ST micro ID.
An offset of 1 for the device ID enum is needed when adding support for
retrieving the ID from device_get_match_data() to allow detection of
NULL pointer and fallback to i2c_device_id table.

DSDT chunk cropped for relevant parts.

   Scope (_SB.PCI0.I2C5)
    {
        Device (DEV)
        {
            Name (_HID, EisaId ("SMO8B30"))  // _HID: Hardware ID
            Name (_CID, EisaId ("SMO8B30"))  // _CID: Compatible ID
            Name (_UID, Zero)  // _UID: Unique ID
            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
            {
                Name (RBUF, ResourceTemplate ()
                {
                    I2cSerialBusV2 (0x006A, ControllerInitiated, 0x00061A80,
                        AddressingMode7Bit, "\\_SB.PCI0.I2C5",
                        0x00, ResourceConsumer, , Exclusive,
                        )
                })
                Return (RBUF) /* \_SB_.PCI0.I2C5.DEV_._CRS.RBUF */
            }

            Method (ROTM, 0, NotSerialized)
            {
                Name (RBUF, Package (0x03)
                {
                    "0 -1 0",
                    "1 0 0",
                    "0 0 1"
                })
                Return (RBUF) /* \_SB_.PCI0.I2C5.DEV_.ROTM.RBUF */
            }
...

Link: https://lore.kernel.org/all/20230129182441.082f29d0@jic23-huawei/
Reported-by: Darrell Kavanagh <darrell.kavanagh@gmail.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
---

Since initial posting in thread added missing {} to terminate the
list of IDs and MODULE_DEVICE_TABLE() so that autoloading of the
driver works (thanks Darrell!)

 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h     |  2 +-
 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
index 499fcf8875b4..2617ce236ddc 100644
--- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
+++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
@@ -39,7 +39,7 @@
 #define ST_ISM330IS_DEV_NAME	"ism330is"
 
 enum st_lsm6dsx_hw_id {
-	ST_LSM6DS3_ID,
+	ST_LSM6DS3_ID = 1,
 	ST_LSM6DS3H_ID,
 	ST_LSM6DSL_ID,
 	ST_LSM6DSM_ID,
diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c
index df5f60925260..8ae5a485ce7d 100644
--- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c
+++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c
@@ -23,10 +23,15 @@ static const struct regmap_config st_lsm6dsx_i2c_regmap_config = {
 
 static int st_lsm6dsx_i2c_probe(struct i2c_client *client)
 {
-	const struct i2c_device_id *id = i2c_client_get_device_id(client);
-	int hw_id = id->driver_data;
+	int hw_id;
 	struct regmap *regmap;
 
+	hw_id = (kernel_ulong_t)device_get_match_data(&client->dev);
+	if (!hw_id)
+		hw_id = i2c_client_get_device_id(client)->driver_data;
+	if (!hw_id)
+		return -EINVAL;
+
 	regmap = devm_regmap_init_i2c(client, &st_lsm6dsx_i2c_regmap_config);
 	if (IS_ERR(regmap)) {
 		dev_err(&client->dev, "Failed to register i2c regmap %ld\n", PTR_ERR(regmap));
@@ -129,6 +134,12 @@ static const struct of_device_id st_lsm6dsx_i2c_of_match[] = {
 };
 MODULE_DEVICE_TABLE(of, st_lsm6dsx_i2c_of_match);
 
+static const struct acpi_device_id st_lsm6dsx_i2c_acpi_match[] = {
+	{ "SMO8B30", ST_LSM6DS3TRC_ID, },
+	{}
+};
+MODULE_DEVICE_TABLE(acpi, st_lsm6dsx_i2c_acpi_match);
+
 static const struct i2c_device_id st_lsm6dsx_i2c_id_table[] = {
 	{ ST_LSM6DS3_DEV_NAME, ST_LSM6DS3_ID },
 	{ ST_LSM6DS3H_DEV_NAME, ST_LSM6DS3H_ID },
@@ -161,6 +172,7 @@ static struct i2c_driver st_lsm6dsx_driver = {
 		.name = "st_lsm6dsx_i2c",
 		.pm = pm_sleep_ptr(&st_lsm6dsx_pm_ops),
 		.of_match_table = st_lsm6dsx_i2c_of_match,
+		.acpi_match_table = st_lsm6dsx_i2c_acpi_match,
 	},
 	.probe_new = st_lsm6dsx_i2c_probe,
 	.id_table = st_lsm6dsx_i2c_id_table,
-- 
2.39.1

Re: [PATCH 1/2] iio: imu: lsm6dsx: Support SMO8B30 ACPI ID for LSM6DS3TR-C

[Jonathan Cameron]

On Mon, 30 Jan 2023 20:10:17 +0000
Jonathan Cameron <jic23@kernel.org> wrote:

> From: Jonathan Cameron <Jonathan.Cameron@huawei.com>
> 
> ID seen in the wild and it is a valid ST micro ID.
> An offset of 1 for the device ID enum is needed when adding support for
> retrieving the ID from device_get_match_data() to allow detection of
> NULL pointer and fallback to i2c_device_id table.
> 
> DSDT chunk cropped for relevant parts.
> 
>    Scope (_SB.PCI0.I2C5)
>     {
>         Device (DEV)
>         {
>             Name (_HID, EisaId ("SMO8B30"))  // _HID: Hardware ID
>             Name (_CID, EisaId ("SMO8B30"))  // _CID: Compatible ID
>             Name (_UID, Zero)  // _UID: Unique ID
>             Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
>             {
>                 Name (RBUF, ResourceTemplate ()
>                 {
>                     I2cSerialBusV2 (0x006A, ControllerInitiated, 0x00061A80,
>                         AddressingMode7Bit, "\\_SB.PCI0.I2C5",
>                         0x00, ResourceConsumer, , Exclusive,
>                         )
>                 })
>                 Return (RBUF) /* \_SB_.PCI0.I2C5.DEV_._CRS.RBUF */
>             }
> 
>             Method (ROTM, 0, NotSerialized)
>             {
>                 Name (RBUF, Package (0x03)
>                 {
>                     "0 -1 0",
>                     "1 0 0",
>                     "0 0 1"
>                 })
>                 Return (RBUF) /* \_SB_.PCI0.I2C5.DEV_.ROTM.RBUF */
>             }
> ...
> 
> Link: https://lore.kernel.org/all/20230129182441.082f29d0@jic23-huawei/
> Reported-by: Darrell Kavanagh <darrell.kavanagh@gmail.com>
> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

I'd forgotten about these.  Still I have another few
patches waiting on dependency unwinding so will need to do a second
pull request later this week (first one will probably be tomorrow).

I've applied this pair and pushed out as testing for 0-day to take
an initial look at them.

Note I will definitely be rebasing though as need the tree to move
forwards for the palmas series.

Thanks

Jonathan

> ---
> 
> Since initial posting in thread added missing {} to terminate the
> list of IDs and MODULE_DEVICE_TABLE() so that autoloading of the
> driver works (thanks Darrell!)
> 
>  drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h     |  2 +-
>  drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c | 16 ++++++++++++++--
>  2 files changed, 15 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
> index 499fcf8875b4..2617ce236ddc 100644
> --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
> +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
> @@ -39,7 +39,7 @@
>  #define ST_ISM330IS_DEV_NAME	"ism330is"
>  
>  enum st_lsm6dsx_hw_id {
> -	ST_LSM6DS3_ID,
> +	ST_LSM6DS3_ID = 1,
>  	ST_LSM6DS3H_ID,
>  	ST_LSM6DSL_ID,
>  	ST_LSM6DSM_ID,
> diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c
> index df5f60925260..8ae5a485ce7d 100644
> --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c
> +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c
> @@ -23,10 +23,15 @@ static const struct regmap_config st_lsm6dsx_i2c_regmap_config = {
>  
>  static int st_lsm6dsx_i2c_probe(struct i2c_client *client)
>  {
> -	const struct i2c_device_id *id = i2c_client_get_device_id(client);
> -	int hw_id = id->driver_data;
> +	int hw_id;
>  	struct regmap *regmap;
>  
> +	hw_id = (kernel_ulong_t)device_get_match_data(&client->dev);
> +	if (!hw_id)
> +		hw_id = i2c_client_get_device_id(client)->driver_data;
> +	if (!hw_id)
> +		return -EINVAL;
> +
>  	regmap = devm_regmap_init_i2c(client, &st_lsm6dsx_i2c_regmap_config);
>  	if (IS_ERR(regmap)) {
>  		dev_err(&client->dev, "Failed to register i2c regmap %ld\n", PTR_ERR(regmap));
> @@ -129,6 +134,12 @@ static const struct of_device_id st_lsm6dsx_i2c_of_match[] = {
>  };
>  MODULE_DEVICE_TABLE(of, st_lsm6dsx_i2c_of_match);
>  
> +static const struct acpi_device_id st_lsm6dsx_i2c_acpi_match[] = {
> +	{ "SMO8B30", ST_LSM6DS3TRC_ID, },
> +	{}
> +};
> +MODULE_DEVICE_TABLE(acpi, st_lsm6dsx_i2c_acpi_match);
> +
>  static const struct i2c_device_id st_lsm6dsx_i2c_id_table[] = {
>  	{ ST_LSM6DS3_DEV_NAME, ST_LSM6DS3_ID },
>  	{ ST_LSM6DS3H_DEV_NAME, ST_LSM6DS3H_ID },
> @@ -161,6 +172,7 @@ static struct i2c_driver st_lsm6dsx_driver = {
>  		.name = "st_lsm6dsx_i2c",
>  		.pm = pm_sleep_ptr(&st_lsm6dsx_pm_ops),
>  		.of_match_table = st_lsm6dsx_i2c_of_match,
> +		.acpi_match_table = st_lsm6dsx_i2c_acpi_match,
>  	},
>  	.probe_new = st_lsm6dsx_i2c_probe,
>  	.id_table = st_lsm6dsx_i2c_id_table,

[PATCH 2/2] iio: imu: lsm6dsx: Add ACPI mount matrix retrieval

[Jonathan Cameron]

From: Jonathan Cameron <Jonathan.Cameron@huawei.com>

DSDT ROTM method seen in the wild with SMO8B30 _HID.
Making assumption it is similar to that used for bmc150 plus
information from Darrell that the rotation is out by 90 degrees at boot.

Method (ROTM, 0, NotSerialized)
{
    Name (RBUF, Package (0x03)
    {
        "0 -1 0",
        "1 0 0",
        "0 0 1"
    })
    Return (RBUF) /* \_SB_.PCI0.I2C5.DEV_.ROTM.RBUF */
}

Reported-by: Darrell Kavanagh <darrell.kavanagh@gmail.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

---
Untested.  Fingers crossed.

We could factor this out if it keeps turning up.  The bmc150 varient
is more complex as multiple method IDs exist depending on the configuration.

---
 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 65 +++++++++++++++++++-
 1 file changed, 62 insertions(+), 3 deletions(-)

diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
index 3f6060c64f32..3c2d67f8d9b7 100644
--- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
+++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
@@ -56,6 +56,7 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/acpi.h>
 #include <linux/delay.h>
 #include <linux/iio/events.h>
 #include <linux/iio/iio.h>
@@ -2602,6 +2603,61 @@ static int st_lsm6dsx_init_regulators(struct device *dev)
 	return 0;
 }
 
+static bool lsm6dsx_get_acpi_mount_matrix(struct device *dev,
+					  struct iio_mount_matrix *orientation)
+{
+	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+	struct acpi_device *adev = ACPI_COMPANION(dev);
+	union acpi_object *obj, *elements;
+	acpi_status status;
+	int i, j, val[3];
+	char *str;
+
+	if (!has_acpi_companion(dev))
+		return -EINVAL;
+
+	if (!acpi_has_method(adev->handle, "ROTM"))
+		return -EINVAL;
+
+	status = acpi_evaluate_object(adev->handle, "ROTM", NULL, &buffer);
+	if (ACPI_FAILURE(status)) {
+		dev_warn(dev, "Failed to get ACPI mount matrix: %d\n", status);
+		return -EINVAL;
+	}
+
+	obj = buffer.pointer;
+	if (obj->type != ACPI_TYPE_PACKAGE || obj->package.count != 3)
+		goto unknown_format;
+
+	elements = obj->package.elements;
+	for (i = 0; i < 3; i++) {
+		if (elements[i].type != ACPI_TYPE_STRING)
+			goto unknown_format;
+
+		str = elements[i].string.pointer;
+		if (sscanf(str, "%d %d %d", &val[0], &val[1], &val[2]) != 3)
+			goto unknown_format;
+
+		for (j = 0; j < 3; j++) {
+			switch (val[j]) {
+			case -1: str = "-1"; break;
+			case 0:  str = "0";  break;
+			case 1:  str = "1";  break;
+			default: goto unknown_format;
+			}
+			orientation->rotation[i * 3 + j] = str;
+		}
+	}
+
+	kfree(buffer.pointer);
+	return 0;
+
+unknown_format:
+	dev_warn(dev, "Unknown ACPI mount matrix format, ignoring\n");
+	kfree(buffer.pointer);
+	return -EINVAL;
+}
+
 int st_lsm6dsx_probe(struct device *dev, int irq, int hw_id,
 		     struct regmap *regmap)
 {
@@ -2676,9 +2732,12 @@ int st_lsm6dsx_probe(struct device *dev, int irq, int hw_id,
 			return err;
 	}
 
-	err = iio_read_mount_matrix(hw->dev, &hw->orientation);
-	if (err)
-		return err;
+	err = lsm6dsx_get_acpi_mount_matrix(hw->dev, &hw->orientation);
+	if (err) {
+		err = iio_read_mount_matrix(hw->dev, &hw->orientation);
+		if (err)
+			return err;
+	}
 
 	for (i = 0; i < ST_LSM6DSX_ID_MAX; i++) {
 		if (!hw->iio_devs[i])
-- 
2.39.1

Re: [PATCH 2/2] iio: imu: lsm6dsx: Add ACPI mount matrix retrieval

[Darrell Kavanagh]

Here's the device info:

** Model information
sys_vendor: LENOVO
product_name: 82AT
product_version: IdeaPad Duet 3 10IGL5
chassis_vendor: LENOVO
chassis_version: IdeaPad Duet 3 10IGL5
bios_vendor: LENOVO
bios_version: EQCN35WW
board_vendor: LENOVO
board_name: LNVNB161216
board_version: SDK0R32802 WIN

I'll try to adapt the full patches to my Debian 6.1 source for
testing, and report back to you.

Darrell

On Mon, 30 Jan 2023 at 19:56, Jonathan Cameron <jic23@kernel.org> wrote:
>
> From: Jonathan Cameron <Jonathan.Cameron@huawei.com>
>
> DSDT ROTM method seen in the wild with SMO8B30 _HID.
> Making assumption it is similar to that used for bmc150 plus
> information from Darrell that the rotation is out by 90 degrees at boot.
>
> Method (ROTM, 0, NotSerialized)
> {
>     Name (RBUF, Package (0x03)
>     {
>         "0 -1 0",
>         "1 0 0",
>         "0 0 1"
>     })
>     Return (RBUF) /* \_SB_.PCI0.I2C5.DEV_.ROTM.RBUF */
> }
>
> Reported-by: Darrell Kavanagh <darrell.kavanagh@gmail.com>
> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
>
> ---
> Untested.  Fingers crossed.
>
> We could factor this out if it keeps turning up.  The bmc150 varient
> is more complex as multiple method IDs exist depending on the configuration.
>
> ---
>  drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 65 +++++++++++++++++++-
>  1 file changed, 62 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> index 3f6060c64f32..3c2d67f8d9b7 100644
> --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> @@ -56,6 +56,7 @@
>
>  #include <linux/kernel.h>
>  #include <linux/module.h>
> +#include <linux/acpi.h>
>  #include <linux/delay.h>
>  #include <linux/iio/events.h>
>  #include <linux/iio/iio.h>
> @@ -2602,6 +2603,61 @@ static int st_lsm6dsx_init_regulators(struct device *dev)
>         return 0;
>  }
>
> +static bool lsm6dsx_get_acpi_mount_matrix(struct device *dev,
> +                                         struct iio_mount_matrix *orientation)
> +{
> +       struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
> +       struct acpi_device *adev = ACPI_COMPANION(dev);
> +       union acpi_object *obj, *elements;
> +       acpi_status status;
> +       int i, j, val[3];
> +       char *str;
> +
> +       if (!has_acpi_companion(dev))
> +               return -EINVAL;
> +
> +       if (!acpi_has_method(adev->handle, "ROTM"))
> +               return -EINVAL;
> +
> +       status = acpi_evaluate_object(adev->handle, "ROTM", NULL, &buffer);
> +       if (ACPI_FAILURE(status)) {
> +               dev_warn(dev, "Failed to get ACPI mount matrix: %d\n", status);
> +               return -EINVAL;
> +       }
> +
> +       obj = buffer.pointer;
> +       if (obj->type != ACPI_TYPE_PACKAGE || obj->package.count != 3)
> +               goto unknown_format;
> +
> +       elements = obj->package.elements;
> +       for (i = 0; i < 3; i++) {
> +               if (elements[i].type != ACPI_TYPE_STRING)
> +                       goto unknown_format;
> +
> +               str = elements[i].string.pointer;
> +               if (sscanf(str, "%d %d %d", &val[0], &val[1], &val[2]) != 3)
> +                       goto unknown_format;
> +
> +               for (j = 0; j < 3; j++) {
> +                       switch (val[j]) {
> +                       case -1: str = "-1"; break;
> +                       case 0:  str = "0";  break;
> +                       case 1:  str = "1";  break;
> +                       default: goto unknown_format;
> +                       }
> +                       orientation->rotation[i * 3 + j] = str;
> +               }
> +       }
> +
> +       kfree(buffer.pointer);
> +       return 0;
> +
> +unknown_format:
> +       dev_warn(dev, "Unknown ACPI mount matrix format, ignoring\n");
> +       kfree(buffer.pointer);
> +       return -EINVAL;
> +}
> +
>  int st_lsm6dsx_probe(struct device *dev, int irq, int hw_id,
>                      struct regmap *regmap)
>  {
> @@ -2676,9 +2732,12 @@ int st_lsm6dsx_probe(struct device *dev, int irq, int hw_id,
>                         return err;
>         }
>
> -       err = iio_read_mount_matrix(hw->dev, &hw->orientation);
> -       if (err)
> -               return err;
> +       err = lsm6dsx_get_acpi_mount_matrix(hw->dev, &hw->orientation);
> +       if (err) {
> +               err = iio_read_mount_matrix(hw->dev, &hw->orientation);
> +               if (err)
> +                       return err;
> +       }
>
>         for (i = 0; i < ST_LSM6DSX_ID_MAX; i++) {
>                 if (!hw->iio_devs[i])
> --
> 2.39.1
>

Re: [PATCH 2/2] iio: imu: lsm6dsx: Add ACPI mount matrix retrieval

[Jonathan Cameron]

On Mon, 30 Jan 2023 20:11:07 +0000
Darrell Kavanagh <darrell.kavanagh@gmail.com> wrote:

> Here's the device info:
> 
> ** Model information
> sys_vendor: LENOVO
> product_name: 82AT
> product_version: IdeaPad Duet 3 10IGL5
> chassis_vendor: LENOVO
> chassis_version: IdeaPad Duet 3 10IGL5
> bios_vendor: LENOVO
> bios_version: EQCN35WW
> board_vendor: LENOVO
> board_name: LNVNB161216
> board_version: SDK0R32802 WIN
> 
> I'll try to adapt the full patches to my Debian 6.1 source for
> testing, and report back to you.
> 
> Darrell

Hi Darrel, 

Once the other thread has reached a conclusion, if you could give
a Tested-by tag or reply here with what is wrong, that would be great.

Due to bad timing this may well have to wait for next cycle now, but it
would be good to at least get it queued up for mainline.

Jonathan

> 
> On Mon, 30 Jan 2023 at 19:56, Jonathan Cameron <jic23@kernel.org> wrote:
> >
> > From: Jonathan Cameron <Jonathan.Cameron@huawei.com>
> >
> > DSDT ROTM method seen in the wild with SMO8B30 _HID.
> > Making assumption it is similar to that used for bmc150 plus
> > information from Darrell that the rotation is out by 90 degrees at boot.
> >
> > Method (ROTM, 0, NotSerialized)
> > {
> >     Name (RBUF, Package (0x03)
> >     {
> >         "0 -1 0",
> >         "1 0 0",
> >         "0 0 1"
> >     })
> >     Return (RBUF) /* \_SB_.PCI0.I2C5.DEV_.ROTM.RBUF */
> > }
> >
> > Reported-by: Darrell Kavanagh <darrell.kavanagh@gmail.com>
> > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
> >
> > ---
> > Untested.  Fingers crossed.
> >
> > We could factor this out if it keeps turning up.  The bmc150 varient
> > is more complex as multiple method IDs exist depending on the configuration.
> >
> > ---
> >  drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 65 +++++++++++++++++++-
> >  1 file changed, 62 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> > index 3f6060c64f32..3c2d67f8d9b7 100644
> > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> > @@ -56,6 +56,7 @@
> >
> >  #include <linux/kernel.h>
> >  #include <linux/module.h>
> > +#include <linux/acpi.h>
> >  #include <linux/delay.h>
> >  #include <linux/iio/events.h>
> >  #include <linux/iio/iio.h>
> > @@ -2602,6 +2603,61 @@ static int st_lsm6dsx_init_regulators(struct device *dev)
> >         return 0;
> >  }
> >
> > +static bool lsm6dsx_get_acpi_mount_matrix(struct device *dev,
> > +                                         struct iio_mount_matrix *orientation)
> > +{
> > +       struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
> > +       struct acpi_device *adev = ACPI_COMPANION(dev);
> > +       union acpi_object *obj, *elements;
> > +       acpi_status status;
> > +       int i, j, val[3];
> > +       char *str;
> > +
> > +       if (!has_acpi_companion(dev))
> > +               return -EINVAL;
> > +
> > +       if (!acpi_has_method(adev->handle, "ROTM"))
> > +               return -EINVAL;
> > +
> > +       status = acpi_evaluate_object(adev->handle, "ROTM", NULL, &buffer);
> > +       if (ACPI_FAILURE(status)) {
> > +               dev_warn(dev, "Failed to get ACPI mount matrix: %d\n", status);
> > +               return -EINVAL;
> > +       }
> > +
> > +       obj = buffer.pointer;
> > +       if (obj->type != ACPI_TYPE_PACKAGE || obj->package.count != 3)
> > +               goto unknown_format;
> > +
> > +       elements = obj->package.elements;
> > +       for (i = 0; i < 3; i++) {
> > +               if (elements[i].type != ACPI_TYPE_STRING)
> > +                       goto unknown_format;
> > +
> > +               str = elements[i].string.pointer;
> > +               if (sscanf(str, "%d %d %d", &val[0], &val[1], &val[2]) != 3)
> > +                       goto unknown_format;
> > +
> > +               for (j = 0; j < 3; j++) {
> > +                       switch (val[j]) {
> > +                       case -1: str = "-1"; break;
> > +                       case 0:  str = "0";  break;
> > +                       case 1:  str = "1";  break;
> > +                       default: goto unknown_format;
> > +                       }
> > +                       orientation->rotation[i * 3 + j] = str;
> > +               }
> > +       }
> > +
> > +       kfree(buffer.pointer);
> > +       return 0;
> > +
> > +unknown_format:
> > +       dev_warn(dev, "Unknown ACPI mount matrix format, ignoring\n");
> > +       kfree(buffer.pointer);
> > +       return -EINVAL;
> > +}
> > +
> >  int st_lsm6dsx_probe(struct device *dev, int irq, int hw_id,
> >                      struct regmap *regmap)
> >  {
> > @@ -2676,9 +2732,12 @@ int st_lsm6dsx_probe(struct device *dev, int irq, int hw_id,
> >                         return err;
> >         }
> >
> > -       err = iio_read_mount_matrix(hw->dev, &hw->orientation);
> > -       if (err)
> > -               return err;
> > +       err = lsm6dsx_get_acpi_mount_matrix(hw->dev, &hw->orientation);
> > +       if (err) {
> > +               err = iio_read_mount_matrix(hw->dev, &hw->orientation);
> > +               if (err)
> > +                       return err;
> > +       }
> >
> >         for (i = 0; i < ST_LSM6DSX_ID_MAX; i++) {
> >                 if (!hw->iio_devs[i])
> > --
> > 2.39.1
> >  

Re: [PATCH 2/2] iio: imu: lsm6dsx: Add ACPI mount matrix retrieval

[Darrell Kavanagh]

On Sun, 5 Feb 2023 at 14:09, Jonathan Cameron <jic23@kernel.org> wrote:
>
> Hi Darrel,
>
> Once the other thread has reached a conclusion, if you could give
> a Tested-by tag or reply here with what is wrong, that would be great.
>
> Due to bad timing this may well have to wait for next cycle now, but it
> would be good to at least get it queued up for mainline.
>
> Jonathan
>

Hi Jonathan,

I confirm that the patches work as expected, both on kernel 6.2.0-rc6
and backported to 6.1.0-2.

Tested-by: Darrell Kavanagh <darrell.kavanagh@gmail.org>

Darrell

Re: [PATCH 2/2] iio: imu: lsm6dsx: Add ACPI mount matrix retrieval

[Jonathan Cameron]

On Mon, 6 Feb 2023 00:49:24 +0000
Darrell Kavanagh <darrell.kavanagh@gmail.com> wrote:

> On Sun, 5 Feb 2023 at 14:09, Jonathan Cameron <jic23@kernel.org> wrote:
> >
> > Hi Darrel,
> >
> > Once the other thread has reached a conclusion, if you could give
> > a Tested-by tag or reply here with what is wrong, that would be great.
> >
> > Due to bad timing this may well have to wait for next cycle now, but it
> > would be good to at least get it queued up for mainline.
> >
> > Jonathan
> >  
> 
> Hi Jonathan,
> 
> I confirm that the patches work as expected, both on kernel 6.2.0-rc6
> and backported to 6.1.0-2.
> 
> Tested-by: Darrell Kavanagh <darrell.kavanagh@gmail.org>
> 

Thanks.  I'm holding off on applying these to give Lorenzo a chance to
take a look.  They are too late for this cycle anyway so we have lots of
time.

Jonathan


> Darrell

Re: [PATCH 2/2] iio: imu: lsm6dsx: Add ACPI mount matrix retrieval

[Jonathan Cameron]

On Mon, 30 Jan 2023 20:10:18 +0000
Jonathan Cameron <jic23@kernel.org> wrote:

> From: Jonathan Cameron <Jonathan.Cameron@huawei.com>
> 
> DSDT ROTM method seen in the wild with SMO8B30 _HID.
> Making assumption it is similar to that used for bmc150 plus
> information from Darrell that the rotation is out by 90 degrees at boot.
> 
> Method (ROTM, 0, NotSerialized)
> {
>     Name (RBUF, Package (0x03)
>     {
>         "0 -1 0",
>         "1 0 0",
>         "0 0 1"
>     })
>     Return (RBUF) /* \_SB_.PCI0.I2C5.DEV_.ROTM.RBUF */
> }
> 
> Reported-by: Darrell Kavanagh <darrell.kavanagh@gmail.com>
> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

Not my best work. 0-day pointed out a few things.

> 
> ---
> Untested.  Fingers crossed.
> 
> We could factor this out if it keeps turning up.  The bmc150 varient
> is more complex as multiple method IDs exist depending on the configuration.
> 
> ---
>  drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 65 +++++++++++++++++++-
>  1 file changed, 62 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> index 3f6060c64f32..3c2d67f8d9b7 100644
> --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> @@ -56,6 +56,7 @@
>  
>  #include <linux/kernel.h>
>  #include <linux/module.h>
> +#include <linux/acpi.h>
>  #include <linux/delay.h>
>  #include <linux/iio/events.h>
>  #include <linux/iio/iio.h>
> @@ -2602,6 +2603,61 @@ static int st_lsm6dsx_init_regulators(struct device *dev)
>  	return 0;
>  }
>  
> +static bool lsm6dsx_get_acpi_mount_matrix(struct device *dev,
int not bool.

Also needs ifdef CONFIG_ACPI protections as some of the acpi functions are not stubbed out.

I've tweaked those two things and pushed out again.
If there is anything else I'll probably drop this patch and come back to it
next cycle.



> +					  struct iio_mount_matrix *orientation)
> +{
> +	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
> +	struct acpi_device *adev = ACPI_COMPANION(dev);
> +	union acpi_object *obj, *elements;
> +	acpi_status status;
> +	int i, j, val[3];
> +	char *str;
> +
> +	if (!has_acpi_companion(dev))
> +		return -EINVAL;
> +
> +	if (!acpi_has_method(adev->handle, "ROTM"))
> +		return -EINVAL;
> +
> +	status = acpi_evaluate_object(adev->handle, "ROTM", NULL, &buffer);
> +	if (ACPI_FAILURE(status)) {
> +		dev_warn(dev, "Failed to get ACPI mount matrix: %d\n", status);
> +		return -EINVAL;
> +	}
> +
> +	obj = buffer.pointer;
> +	if (obj->type != ACPI_TYPE_PACKAGE || obj->package.count != 3)
> +		goto unknown_format;
> +
> +	elements = obj->package.elements;
> +	for (i = 0; i < 3; i++) {
> +		if (elements[i].type != ACPI_TYPE_STRING)
> +			goto unknown_format;
> +
> +		str = elements[i].string.pointer;
> +		if (sscanf(str, "%d %d %d", &val[0], &val[1], &val[2]) != 3)
> +			goto unknown_format;
> +
> +		for (j = 0; j < 3; j++) {
> +			switch (val[j]) {
> +			case -1: str = "-1"; break;
> +			case 0:  str = "0";  break;
> +			case 1:  str = "1";  break;
> +			default: goto unknown_format;
> +			}
> +			orientation->rotation[i * 3 + j] = str;
> +		}
> +	}
> +
> +	kfree(buffer.pointer);
> +	return 0;
> +
> +unknown_format:
> +	dev_warn(dev, "Unknown ACPI mount matrix format, ignoring\n");
> +	kfree(buffer.pointer);
> +	return -EINVAL;
> +}
> +
>  int st_lsm6dsx_probe(struct device *dev, int irq, int hw_id,
>  		     struct regmap *regmap)
>  {
> @@ -2676,9 +2732,12 @@ int st_lsm6dsx_probe(struct device *dev, int irq, int hw_id,
>  			return err;
>  	}
>  
> -	err = iio_read_mount_matrix(hw->dev, &hw->orientation);
> -	if (err)
> -		return err;
> +	err = lsm6dsx_get_acpi_mount_matrix(hw->dev, &hw->orientation);
> +	if (err) {
> +		err = iio_read_mount_matrix(hw->dev, &hw->orientation);
> +		if (err)
> +			return err;
> +	}
>  
>  	for (i = 0; i < ST_LSM6DSX_ID_MAX; i++) {
>  		if (!hw->iio_devs[i])