On Fri, 16 Feb 2024 15:09:20 +0000
Sean Rhodes <sean@starlabs.systems> wrote:
> Implement kxj_acpi_orientation to retrieve mount matrix
> from ACPI ROTM method
>
> Cc: Jonathan Cameron <jic23@xxxxxxxxxx>
> Cc: Lars-Peter Clausen <lars@xxxxxxxxxx>
> Cc: "Uwe Kleine-König" <u.kleine-koenig@xxxxxxxxxxxxxx>
> Signed-off-by: Sean Rhodes <sean@starlabs.systems>
Hi Sean, looks like your build tests aren't building this for some reason...
Also shows what my eyes will skip over on assumption it can't possibly
be a problem :(
> ---
> drivers/iio/accel/kxcjk-1013.c | 83 ++++++++++++++++++++++++++++++++--
> 1 file changed, 80 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/iio/accel/kxcjk-1013.c b/drivers/iio/accel/kxcjk-1013.c
> index 894709286b0c..d6b068cfa68a 100644
> --- a/drivers/iio/accel/kxcjk-1013.c
> +++ b/drivers/iio/accel/kxcjk-1013.c
> @@ -619,6 +619,80 @@ static int kxcjk1013_set_power_state(struct kxcjk1013_data *data, bool on)
> return 0;
> }
>
> +#ifdef CONFIG_ACPI
> +static bool kxj_acpi_orientation(struct device *dev,
> + struct iio_mount_matrix *orientation)
> +{
> + struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
> + struct acpi_device *adev = ACPI_COMPANION(dev);
> + acpi_status status;
> +
> + if (!acpi_has_method(adev->handle, "ROTM"))
> + return false;
> +
> + status = acpi_evaluate_object(adev->handle, "ROTM", NULL, &buffer);
> + if (ACPI_FAILURE(status)) {
> + dev_err(dev, "Failed to get ACPI mount matrix: %d\n", status);
> + return false; // Removed goto, no buffer to free on ACPI failure
Don't leave comment there. It doesn't provide helpful info to have in the source
code.
> + }
> +
> + obj = buffer.pointer;
Obj isn't declared.
> + if (obj->type != ACPI_TYPE_PACKAGE || obj->package.count != 3) {
> + dev_err(dev, "Unknown ACPI mount matrix package format\n");
> + goto out_free_buffer;
> + }
> +
> + elements = obj->package.elements;
elements also not declared.
> + for (i = 0; i < 3; i++) {
> + if (elements[i].type != ACPI_TYPE_STRING) {
> + dev_err(dev, "Unknown ACPI mount matrix element format\n");
> + goto out_free_buffer;
> + }
> +
> + str = elements[i].string.pointer;
> + if (sscanf(str, "%d %d %d", &val[0], &val[1], &val[2]) != 3) {
> + dev_err(dev, "Incorrect ACPI mount matrix string format\n");
> + goto out_free_buffer;
> + }
> +
> + for (j = 0; j < 3; j++) {
no such thing as j
> + switch (val[j]) {
> + case -1: str = "-1"; break;
> + case 0: str = "0"; break;
> + case 1: str = "1"; break;
> + default:
> + dev_err(dev, "Invalid value in ACPI mount matrix: %d\n", val[j]);
> + goto out_free_buffer;
> + }
> + orientation->rotation[i * 3 + j] = str;
> + }
> + }
> +
> + ret = true;
ret doesn't exist either.
> +
> +out_free_buffer:
> + kfree(buffer.pointer);
> + return ret;
> +}
> +
> +static bool kxj1009_apply_acpi_orientation(struct device *dev,
> + struct iio_mount_matrix *orientation)
> +{
> + struct acpi_device *adev = ACPI_COMPANION(dev);
> +
> + if (adev && acpi_dev_hid_uid_match(adev, "KIOX000A", NULL))
> + return kxj_acpi_orientation(dev, orientation);
> +
> + return false;
> +}
> +#else
> +static bool kxj1009_apply_acpi_orientation(struct device *dev,
> + struct iio_mount_matrix *orientation)
> +{
> + return false;
> +}
> +#endif
> +
> static int kxcjk1013_chip_update_thresholds(struct kxcjk1013_data *data)
> {
> int ret;
> @@ -1449,9 +1523,12 @@ static int kxcjk1013_probe(struct i2c_client *client)
> } else {
> data->active_high_intr = true; /* default polarity */
>
> - ret = iio_read_mount_matrix(&client->dev, &data->orientation);
> - if (ret)
> - return ret;
> + if (!kxj1009_apply_acpi_orientation(&client->dev, &data->orientation)) {
> + ret = iio_read_mount_matrix(&client->dev, &data->orientation);
> + if (ret)
> + return ret;
> + }
> +
> }
>
> ret = devm_regulator_bulk_get_enable(&client->dev,
