iio: accel: Share ACPI ROTM parsing between drivers and add it to mxc4005
v2 cover iio: accel: Share ACPI ROTM parsing between drivers and add it to mxc4005
Hi All,
Here is v2 of the patch series to refactor the ACPI ROTM orientation matrix handling in kxcjk-1013 + bmc150-accel to share the code instead of having 2 copies and then also use the shared implementation in the mxc4005 driver since some MXC6655 ACPI firmware nodes also include this.
Changes in v2:
- Add comment about the Microsoft specification for the "ROTM" ACPI method
Regards,
Hans
Hans de Goede (4):
iio: accel: kxcjk-1013: Simplify ACPI ROTM mount matrix retreival
iio: accel: kxcjk-1013: Move ACPI ROTM parsing to new acpi-helpers.h
iio: bmc150-accel-core: Use acpi_read_mount_matrix() helper
iio: accel: mxc4005: Read orientation matrix from ACPI ROTM method
drivers/iio/accel/acpi-helpers.h | 83 +++++++++++++++++++++++++++ drivers/iio/accel/bmc150-accel-core.c | 45 +-------------- drivers/iio/accel/kxcjk-1013.c | 82 +------------------------- drivers/iio/accel/mxc4005.c | 24 ++++++++ 4 files changed, 113 insertions(+), 121 deletions(-) create mode 100644 drivers/iio/accel/acpi-helpers.h
Signature · 1 line
2.44.0
PATCH v2 1/4 iio: accel: kxcjk-1013: Simplify ACPI ROTM mount matrix retreival
There is no reason to limit the parsing of the ROTM mount matrix to only ACPI devices with an ACPI HID (Hardware-ID) of "KIOX000A". If kxcjk-1013 ACPI devices with another HID have a ROTM method that should still be parsed and if the method is not there then the:
if (!adev || !acpi_has_method(adev->handle, "ROTM")) return false;
check will skip checking the ROTM method silently.
Move the check to see if there is an ACPI companion at all into kxj_acpi_orientation() and drop the wrapper checking the HID.
--- drivers/iio/accel/kxcjk-1013.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-)
drivers/iio/accel/kxcjk-1013.c +3 -14
@@ -637,8 +637,8 @@ static int kxcjk1013_set_power_state(struct kxcjk1013_data *data, bool on) }#ifdef CONFIG_ACPI -static bool kxj_acpi_orientation (struct device *dev, -struct iio_mount_matrix *orientation) +static bool kxj1009_apply_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);
@@ -648,7 +648,7 @@ static bool kxj_acpi_orientation(struct device *dev,int i, j, val[3 ];bool ret = false; -if (!acpi_has_method (adev->handle,"ROTM" )) +if (!adev || !acpi_has_method (adev->handle,"ROTM" ))return false; status =acpi_evaluate_object (adev->handle,"ROTM" ,NULL , &buffer);
@@ -695,17 +695,6 @@ static bool kxj_acpi_orientation(struct device *dev,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)
Signature · 1 line
2.44.0
PATCH v2 2/4 iio: accel: kxcjk-1013: Move ACPI ROTM parsing to new acpi-helpers.h
In reply to Hans de GoedeThe ACPI "ROTM" rotation matrix parsing code atm is already duplicated between bmc150-accel-core.c and kxcjk-1013.c and a third user of this is coming.
Move the ROTM parsing from kxcjk-1013.c, which has slightly better error logging (and otherwise is 100% identical), into a new acpi-helpers.h file so that it can be shared.
Other then moving the code the only 2 other changes are:
1. Rename the function to acpi_read_mount_matrix() to make clear this is a generic ACPI mount matrix read function.
2. Add a "char *acpi_method" parameter since some bmc150 dual-accel setups (360° hinges with 1 accel in kbd/base + 1 in display half) declare both accels in a single ACPI device with 2 different method names for the 2 matrices.
---
Changes in v2:
- Add comment about the Microsoft specification for the "ROTM" ACPI method
--- drivers/iio/accel/acpi-helpers.h | 83 ++++++++++++++++++++++++++++++++ drivers/iio/accel/kxcjk-1013.c | 71 ++------------------------- 2 files changed, 86 insertions(+), 68 deletions(-) create mode 100644 drivers/iio/accel/acpi-helpers.h
drivers/iio/accel/acpi-helpers.h new file +83 -0
@@ -0,0 +1,83 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* ACPI helper functions for parsing ACPI rotation matrices */ + +#include <linux/acpi.h> +#include <linux/dev_printk.h> +#include <linux/iio/iio.h> +#include <linux/sprintf.h> + +#ifdef CONFIG_ACPI +/* +* Parse mount matrices defined in the ACPI "ROTM" format from: +* https://learn.microsoft.com/en-us/windows-hardware/drivers/sensors/sensors-acpi-entries +* This is a Microsoft extension and not part of the official ACPI spec. +* The method name is configurable because some dual-accel setups define 2 mount +* matrices in a single ACPI device using separate "ROMK" and "ROMS" methods. +*/ +static inline bool acpi_read_mount_matrix (struct device *dev, +struct iio_mount_matrix *orientation, +char *acpi_method) +{ +struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER ,NULL }; +struct acpi_device *adev =ACPI_COMPANION (dev); +char *str; +union acpi_object *obj, *elements; +acpi_status status; +int i, j, val[3 ]; +bool ret = false; + +if (!adev || !acpi_has_method (adev->handle, acpi_method)) +return false; + + status =acpi_evaluate_object (adev->handle, acpi_method,NULL , &buffer); +if (ACPI_FAILURE (status)) { +dev_err (dev,"Failed to get ACPI mount matrix: %d\n" , status); +return false; + } + + obj = buffer.pointer; +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; +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++) { +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; + +out_free_buffer: +kfree (buffer.pointer); +return ret; +} +#else +static inline bool acpi_read_mount_matrix (struct device *dev, +struct iio_mount_matrix *orientation, +char *acpi_method) +{ +return false; +} +#endif
drivers/iio/accel/kxcjk-1013.c +3 -68
89 lines not on this page · raw message
Signature · 1 line
2.44.0
PATCH v2 3/4 iio: bmc150-accel-core: Use acpi_read_mount_matrix() helper
In reply to Hans de GoedeReplace the duplicate ACPI "ROTM" data parsing code with the new shared acpi_read_mount_matrix() helper.
--- drivers/iio/accel/bmc150-accel-core.c | 45 ++------------------------- 1 file changed, 3 insertions(+), 42 deletions(-)
drivers/iio/accel/bmc150-accel-core.c +3 -42
@@ -23,6 +23,7 @@#include <linux/regmap.h> #include <linux/regulator/consumer.h> +#include "acpi-helpers.h" #include "bmc150-accel.h" #define BMC150_ACCEL_DRV_NAME "bmc150_accel"
@@ -386,13 +387,9 @@ static int bmc150_accel_set_power_state(struct bmc150_accel_data *data, bool on)static bool bmc150_apply_bosc0200_acpi_orientation (struct device *dev,struct iio_mount_matrix *orientation) { -struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER ,NULL };struct iio_dev *indio_dev =dev_get_drvdata (dev);struct acpi_device *adev =ACPI_COMPANION (dev); -char *name, *alt_name, *label, *str; -union acpi_object *obj, *elements; -acpi_status status; -int i, j, val[3 ]; +char *name, *alt_name, *label;if (strcmp (dev_name (dev),"i2c-BOSC0200:base" ) ==0 ) { alt_name ="ROMK" ;
@@ -411,43 +408,7 @@ static bool bmc150_apply_bosc0200_acpi_orientation(struct device *dev,return false; } - status =acpi_evaluate_object (adev->handle, name,NULL , &buffer); -if (ACPI_FAILURE (status)) { -dev_warn (dev,"Failed to get ACPI mount matrix: %d\n" , status); -return false; - } - - 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 true; - -unknown_format: -dev_warn (dev,"Unknown ACPI mount matrix format, ignoring\n" ); -kfree (buffer.pointer); -return false; +return acpi_read_mount_matrix (dev, orientation, name); } static bool bmc150_apply_dual250e_acpi_orientation(struct device *dev,
Signature · 1 line
2.44.0
PATCH v2 4/4 iio: accel: mxc4005: Read orientation matrix from ACPI ROTM method
In reply to Hans de GoedeSome devices use the semi-standard ACPI "ROTM" method to store the accelerometers orientation matrix.
Add support for this using the new acpi_read_mount_matrix() helper, if the helper fails to read the matrix fall back to iio_read_mount_matrix() which will try to get it from device-properties (devicetree) and if that fails it will fill the matrix with the identity matrix.
--- drivers/iio/accel/mxc4005.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
drivers/iio/accel/mxc4005.c +24 -0
@@ -17,6 +17,8 @@#include <linux/iio/triggered_buffer.h> #include <linux/iio/trigger_consumer.h> +#include "acpi-helpers.h" +#define MXC4005_DRV_NAME "mxc4005"#define MXC4005_IRQ_NAME "mxc4005_event"#define MXC4005_REGMAP_NAME "mxc4005_regmap"
@@ -65,6 +67,7 @@ struct mxc4005_data {struct mutex mutex;struct regmap *regmap;struct iio_trigger *dready_trig; +struct iio_mount_matrix orientation;/* Ensure timestamp is naturally aligned */ struct {__be16 chans[3 ];
@@ -272,6 +275,20 @@ static int mxc4005_write_raw(struct iio_dev *indio_dev, } } +static const struct iio_mount_matrix * +mxc4005_get_mount_matrix (const struct iio_dev *indio_dev, +const struct iio_chan_spec *chan) +{ +struct mxc4005_data *data =iio_priv (indio_dev); + +return &data->orientation; +} + +static const struct iio_chan_spec_ext_info mxc4005_ext_info[] = { +IIO_MOUNT_MATRIX (IIO_SHARED_BY_TYPE , mxc4005_get_mount_matrix), + { } +}; +static const struct iio_info mxc4005_info = { .read_raw = mxc4005_read_raw, .write_raw = mxc4005_write_raw,
@@ -298,6 +315,7 @@ static const unsigned long mxc4005_scan_masks[] = { .shift = 4, \ .endianness = IIO_BE, \ }, \ + .ext_info = mxc4005_ext_info, \ } static const struct iio_chan_spec mxc4005_channels[] = {
@@ -440,6 +458,12 @@ static int mxc4005_probe(struct i2c_client *client)mutex_init (&data->mutex); +if (!acpi_read_mount_matrix (&client->dev, &data->orientation,"ROTM" )) { + ret =iio_read_mount_matrix (&client->dev, &data->orientation); +if (ret) +return ret; + } + indio_dev->channels = mxc4005_channels; indio_dev->num_channels =ARRAY_SIZE (mxc4005_channels); indio_dev->available_scan_masks = mxc4005_scan_masks;
Signature · 1 line
2.44.0
Hi Hans,
Quoted 22 lines · Hans de Goede
Hi All,
Here is v2 of the patch series to refactor the ACPI ROTM orientation matrix handling in kxcjk-1013 + bmc150-accel to share the code instead of having 2 copies and then also use the shared implementation in the mxc4005 driver since some MXC6655 ACPI firmware nodes also include this.
Changes in v2:
- Add comment about the Microsoft specification for the "ROTM" ACPI methodRegards,
Hans
Hans de Goede (4):
iio: accel: kxcjk-1013: Simplify ACPI ROTM mount matrix retreival
iio: accel: kxcjk-1013: Move ACPI ROTM parsing to newacpi-helpers.h
iio: bmc150-accel-core: Useacpi_read_mount_matrix()helper
iio: accel: mxc4005: Read orientation matrix from ACPI ROTM method
Quoted 8 lines
drivers/iio/accel/acpi-helpers.h | 83 +++++++++++++++++++++++++++ drivers/iio/accel/bmc150-accel-core.c | 45 +-------------- drivers/iio/accel/kxcjk-1013.c | 82 +------------------------- drivers/iio/accel/mxc4005.c | 24 ++++++++ 4 files changed, 113 insertions(+), 121 deletions(-) create mode 100644 drivers/iio/accel/acpi-helpers.h--
The series LGTM, so please feel free to add
to it.
Thanks!