Skip to contentSkip to conversation

platform/x86: x86-android-tablets: Add Bluetooth support for Vexia EDU ATLA 10

PATCH Superseded Hans de Goede 2 participants 11 messages Nov 9, 2024 – Nov 11, 2024

Subsystems (2)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

cover platform/x86: x86-android-tablets: Add Bluetooth support for Vexia EDU ATLA 10

Hi All,

Here is a patch-series for adding Bluetooth support for the Vexia EDU ATLA 10 tablet to x86-android-tablets.

Due to the LPSS UARTs being enumerated through PCI rather then through ACPI, this is somewhat involved. Just like how this special case needed some extra work for instantiating the various i2c-clients.

Regards,

Hans

Hans de Goede (5):
platform/x86: serdev_helpers: Add get_serdev_controller_from_parent()
helper
platform/x86: x86-android-tablets: Add missing __init to

    get_i2c_adap_by_*()
  platform/x86: x86-android-tablets: Change x86_instantiate_serdev()
    prototype
  platform/x86: x86-android-tablets: Add support for getting
    serdev-controller by PCI parent
  platform/x86: x86-android-tablets: Add Bluetooth support for Vexia EDU
    ATLA 10
 drivers/platform/x86/serdev_helpers.h         | 60 +++++++++++--------
 .../platform/x86/x86-android-tablets/core.c   | 31 +++++++---
 .../platform/x86/x86-android-tablets/other.c  | 12 +++-
 .../x86-android-tablets/x86-android-tablets.h |  6 +-
 4 files changed, 74 insertions(+), 35 deletions(-)
Signature · 1 line
2.47.0
#1 lore raw

PATCH 1/5 platform/x86: serdev_helpers: Add get_serdev_controller_from_parent() helper

The x86-android-tablets code needs to be able to get a serdev_controller device from a PCI parent, rather then by the ACPI HID+UID of the parent, because on some tablets the UARTs are enumerated as PCI devices instead of ACPI devices.

Split the code to walk the device hierarchy to find the serdev_controller from its parents out into a get_serdev_controller_from_parent() helper so that the x86-android-tablets code can re-use it.

---
 drivers/platform/x86/serdev_helpers.h | 60 +++++++++++++++------------
 1 file changed, 34 insertions(+), 26 deletions(-)
drivers/platform/x86/serdev_helpers.h +34 -26
index bcf3a0c356ea..b592b9ff6d93 100644
@@ -22,32 +22,14 @@
 #include <linux/string.h>
 
 static inline struct device *
-get_serdev_controller(const char *serial_ctrl_hid,
-		      const char *serial_ctrl_uid,
-		      int serial_ctrl_port,
-		      const char *serdev_ctrl_name)
+get_serdev_controller_from_parent(struct device *ctrl_dev,
+				  int serial_ctrl_port,
+				  const char *serdev_ctrl_name)
 {
-	struct device *ctrl_dev, *child;
-	struct acpi_device *ctrl_adev;
+	struct device *child;
 	char name[32];
 	int i;
 
-	ctrl_adev = acpi_dev_get_first_match_dev(serial_ctrl_hid, serial_ctrl_uid, -1);
-	if (!ctrl_adev) {
-		pr_err("error could not get %s/%s serial-ctrl adev\n",
-		       serial_ctrl_hid, serial_ctrl_uid);
-		return ERR_PTR(-ENODEV);
-	}
-
-	/* get_first_physical_node() returns a weak ref */
-	ctrl_dev = get_device(acpi_get_first_physical_node(ctrl_adev));
-	if (!ctrl_dev) {
-		pr_err("error could not get %s/%s serial-ctrl physical node\n",
-		       serial_ctrl_hid, serial_ctrl_uid);
-		ctrl_dev = ERR_PTR(-ENODEV);
-		goto put_ctrl_adev;
-	}
-
 	/* Walk host -> uart-ctrl -> port -> serdev-ctrl */
 	for (i = 0; i < 3; i++) {
 		switch (i) {
@@ -67,14 +49,40 @@ get_serdev_controller(const char *serial_ctrl_hid,
 		put_device(ctrl_dev);
 		if (!child) {
 			pr_err("error could not find '%s' device\n", name);
-			ctrl_dev = ERR_PTR(-ENODEV);
-			goto put_ctrl_adev;
+			return ERR_PTR(-ENODEV);
 		}
 
 		ctrl_dev = child;
 	}
 
-put_ctrl_adev:
-	acpi_dev_put(ctrl_adev);
 	return ctrl_dev;
 }
+
+static inline struct device *
+get_serdev_controller(const char *serial_ctrl_hid,
+		      const char *serial_ctrl_uid,
+		      int serial_ctrl_port,
+		      const char *serdev_ctrl_name)
+{
+	struct acpi_device *adev;
+	struct device *parent;
+
+	adev = acpi_dev_get_first_match_dev(serial_ctrl_hid, serial_ctrl_uid, -1);
+	if (!adev) {
+		pr_err("error could not get %s/%s serial-ctrl adev\n",
+		       serial_ctrl_hid, serial_ctrl_uid);
+		return ERR_PTR(-ENODEV);
+	}
+
+	/* get_first_physical_node() returns a weak ref */
+	parent = get_device(acpi_get_first_physical_node(adev));
+	acpi_dev_put(adev);
+	if (!parent) {
+		pr_err("error could not get %s/%s serial-ctrl physical node\n",
+		       serial_ctrl_hid, serial_ctrl_uid);
+		return ERR_PTR(-ENODEV);
+	}
+
+	/* This puts our reference on parent and returns a ref on the ctrl */
+	return get_serdev_controller_from_parent(parent, serial_ctrl_port, serdev_ctrl_name);
+}
Signature · 1 line
2.47.0
#2 lore raw

PATCH 2/5 platform/x86: x86-android-tablets: Add missing __init to get_i2c_adap_by_*()

In reply to Hans de Goede

get_i2c_adap_by_handle() and get_i2c_adap_by_pci_parent() both are only used by x86_instantiate_i2c_client() which is __init itself and in case of the latter it also uses match_parent() which is also __init.

Fixes 5b78e809f948 ("platform/x86: x86-android-tablets: Add support for getting i2c_adapter by PCI parent devname()")
---
 drivers/platform/x86/x86-android-tablets/core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/platform/x86/x86-android-tablets/core.c +2 -2
index e9f4d91496d5..affaffadd179 100644
@@ -157,7 +157,7 @@ static struct gpiod_lookup_table * const *gpiod_lookup_tables;
 static const struct software_node *bat_swnode;
 static void (*exit_handler)(void);
 
-static struct i2c_adapter *
+static __init struct i2c_adapter *
 get_i2c_adap_by_handle(const struct x86_i2c_client_info *client_info)
 {
 	acpi_handle handle;
@@ -177,7 +177,7 @@ static __init int match_parent(struct device *dev, const void *data)
 	return dev->parent == data;
 }
 
-static struct i2c_adapter *
+static __init struct i2c_adapter *
 get_i2c_adap_by_pci_parent(const struct x86_i2c_client_info *client_info)
 {
 	struct i2c_adapter *adap = NULL;
Signature · 1 line
2.47.0
#3 lore raw

PATCH 3/5 platform/x86: x86-android-tablets: Change x86_instantiate_serdev() prototype

In reply to Hans de Goede

Make x86_instantiate_serdev() take a "struct x86_dev_info *" + idx as arguments instead of a "struct x86_serdev_info *" + idx.

This makes the x86_instantiate_serdev() prototype match
the x86_instantiate_i2c_client() and x86_instantiate_spi_dev() prototypes.

---
 drivers/platform/x86/x86-android-tablets/core.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/platform/x86/x86-android-tablets/core.c +3 -2
index affaffadd179..800d6c84dced 100644
@@ -271,8 +271,9 @@ static __init int x86_instantiate_spi_dev(const struct x86_dev_info *dev_info, i
 	return 0;
 }
 
-static __init int x86_instantiate_serdev(const struct x86_serdev_info *info, int idx)
+static __init int x86_instantiate_serdev(const struct x86_dev_info *dev_info, int idx)
 {
+	const struct x86_serdev_info *info = &dev_info->serdev_info[idx];
 	struct acpi_device *serdev_adev;
 	struct serdev_device *serdev;
 	struct device *ctrl_dev;
@@ -446,7 +447,7 @@ static __init int x86_android_tablet_probe(struct platform_device *pdev)
 
 	serdev_count = dev_info->serdev_count;
 	for (i = 0; i < serdev_count; i++) {
-		ret = x86_instantiate_serdev(&dev_info->serdev_info[i], i);
+		ret = x86_instantiate_serdev(dev_info, i);
 		if (ret < 0) {
 			x86_android_tablet_remove(pdev);
 			return ret;
Signature · 1 line
2.47.0
#4 lore raw

PATCH 4/5 platform/x86: x86-android-tablets: Add support for getting serdev-controller by PCI parent

In reply to Hans de Goede

On the Vexia EDU ATLA 10 tablet, which ships with Android + a custom Linux (guadalinex) using the custom Android kernel the UART controllers are not enumerated as ACPI devices as they typically are.

Instead they are enumerated through PCI and getting the serdev-controller by ACPI HID + UID does not work.

Add support for getting the serdev-controller by the PCI devfn of its parent instead.

This also renames the use_pci_devname flag to use_pci since the former name now no longer is accurate.

---
 .../platform/x86/x86-android-tablets/core.c   | 22 ++++++++++++++++---
 .../platform/x86/x86-android-tablets/other.c  |  2 +-
 .../x86-android-tablets/x86-android-tablets.h |  6 ++++-
 3 files changed, 25 insertions(+), 5 deletions(-)
drivers/platform/x86/x86-android-tablets/core.c +19 -3
index 800d6c84dced..4633a9560bd2 100644
@@ -212,7 +212,7 @@ static __init int x86_instantiate_i2c_client(const struct x86_dev_info *dev_info
 	if (board_info.irq < 0)
 		return board_info.irq;
 
-	if (dev_info->use_pci_devname)
+	if (dev_info->use_pci)
 		adap = get_i2c_adap_by_pci_parent(client_info);
 	else
 		adap = get_i2c_adap_by_handle(client_info);
@@ -271,6 +271,19 @@ static __init int x86_instantiate_spi_dev(const struct x86_dev_info *dev_info, i
 	return 0;
 }
 
+static __init struct device *
+get_serdev_controller_by_pci_parent(const struct x86_serdev_info *info)
+{
+	struct pci_dev *pdev;
+
+	pdev = pci_get_domain_bus_and_slot(0, 0, info->ctrl_devfn);
+	if (!pdev)
+		return ERR_PTR(-EPROBE_DEFER);
+
+	/* This puts our reference on pdev and returns a ref on the ctrl */
+	return get_serdev_controller_from_parent(&pdev->dev, 0, info->ctrl_devname);
+}
+
 static __init int x86_instantiate_serdev(const struct x86_dev_info *dev_info, int idx)
 {
 	const struct x86_serdev_info *info = &dev_info->serdev_info[idx];
@@ -279,8 +292,11 @@ static __init int x86_instantiate_serdev(const struct x86_dev_info *dev_info, in
 	struct device *ctrl_dev;
 	int ret = -ENODEV;
 
-	ctrl_dev = get_serdev_controller(info->ctrl_hid, info->ctrl_uid, 0,
-					 info->ctrl_devname);
+	if (dev_info->use_pci)
+		ctrl_dev = get_serdev_controller_by_pci_parent(info);
+	else
+		ctrl_dev = get_serdev_controller(info->ctrl_hid, info->ctrl_uid, 0,
+						 info->ctrl_devname);
 	if (IS_ERR(ctrl_dev))
 		return PTR_ERR(ctrl_dev);
 
drivers/platform/x86/x86-android-tablets/other.c +1 -1
index 725948044da4..f5140d5ce61a 100644
@@ -757,7 +757,7 @@ const struct x86_dev_info vexia_edu_atla10_info __initconst = {
 	.i2c_client_count = ARRAY_SIZE(vexia_edu_atla10_i2c_clients),
 	.gpiod_lookup_tables = vexia_edu_atla10_gpios,
 	.init = vexia_edu_atla10_init,
-	.use_pci_devname = true,
+	.use_pci = true,
 };
 
 /*
drivers/platform/x86/x86-android-tablets/x86-android-tablets.h +5 -1
index 0fc7e8cff672..bab27fdcd873 100644
@@ -57,8 +57,12 @@ struct x86_spi_dev_info {
 };
 
 struct x86_serdev_info {
+	/* For ACPI enumerated controllers */
 	const char *ctrl_hid;
 	const char *ctrl_uid;
+	/* For PCI enumerated controllers */
+	unsigned int ctrl_devfn;
+	/* Typically "serial0" */
 	const char *ctrl_devname;
 	/*
 	 * ATM the serdev core only supports of or ACPI matching; and so far all
@@ -91,7 +95,7 @@ struct x86_dev_info {
 	int gpio_button_count;
 	int (*init)(struct device *dev);
 	void (*exit)(void);
-	bool use_pci_devname;
+	bool use_pci;
 };
 
 int x86_android_tablet_get_gpiod(const char *chip, int pin, const char *con_id,
Signature · 1 line
2.47.0
#5 lore raw

Re: [PATCH 4/5] platform/x86: x86-android-tablets: Add support for getting serdev-controller by PCI parent

Quoted 13 lines · Hans de Goede

On the Vexia EDU ATLA 10 tablet, which ships with Android + a custom Linux (guadalinex) using the custom Android kernel the UART controllers are not enumerated as ACPI devices as they typically are.

Instead they are enumerated through PCI and getting the serdev-controller by ACPI HID + UID does not work.

Add support for getting the serdev-controller by the PCI devfn of its parent instead.

This also renames the use_pci_devname flag to use_pci since the former name now no longer is accurate.

...

drivers/platform/x86/x86-android-tablets/core.c static __init int x86_instantiate_serdev(const struct x86_dev_info *dev_info, in · line 299

Quoted 5 lines
drivers/platform/x86/x86-android-tablets/core.c +5 -0
+       if (dev_info->use_pci)
+               ctrl_dev = get_serdev_controller_by_pci_parent(info);
+       else
+               ctrl_dev = get_serdev_controller(info->ctrl_hid, info->ctrl_uid, 0,
+                                                info->ctrl_devname);

I would expect that they both take info as an argument...

Quoted 2 lines
        if (IS_ERR(ctrl_dev))
                return PTR_ERR(ctrl_dev);

...

drivers/platform/x86/x86-android-tablets/x86-android-tablets.h struct x86_spi_dev_info { · line 66

Quoted 8 lines

struct x86_serdev_info {

drivers/platform/x86/x86-android-tablets/x86-android-tablets.h +4 -0
+       /* For ACPI enumerated controllers */
        const char *ctrl_hid;
        const char *ctrl_uid;
+       /* For PCI enumerated controllers */
+       unsigned int ctrl_devfn;
+       /* Typically "serial0" */
        const char *ctrl_devname;

Why not union as we have a type selector, i.e. use_pci ?

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#6 lore raw

Re: [PATCH 4/5] platform/x86: x86-android-tablets: Add support for getting serdev-controller by PCI parent

Hi,

Quoted 17 lines · Andy Shevchenko
Quoted 13 lines · Hans de Goede

On the Vexia EDU ATLA 10 tablet, which ships with Android + a custom Linux (guadalinex) using the custom Android kernel the UART controllers are not enumerated as ACPI devices as they typically are.

Instead they are enumerated through PCI and getting the serdev-controller by ACPI HID + UID does not work.

Add support for getting the serdev-controller by the PCI devfn of its parent instead.

This also renames the use_pci_devname flag to use_pci since the former name now no longer is accurate.

...

Quoted 7 lines

drivers/platform/x86/x86-android-tablets/core.c static __init int x86_instantiate_serdev(const struct x86_dev_info *dev_info, in · line 299

Quoted 5 lines
drivers/platform/x86/x86-android-tablets/core.c +5 -0
+       if (dev_info->use_pci)
+               ctrl_dev = get_serdev_controller_by_pci_parent(info);
+       else
+               ctrl_dev = get_serdev_controller(info->ctrl_hid, info->ctrl_uid, 0,
+                                                info->ctrl_devname);

I would expect that they both take info as an argument...

The "old" get_serdev_controller() helper for getting the controller by ACPI HID + UID is also used outside of the x86-android-tablets code and struct x86_serdev_info is x86-android-tablets specific.

Quoted 14 lines
Quoted 2 lines
        if (IS_ERR(ctrl_dev))
                return PTR_ERR(ctrl_dev);

...

drivers/platform/x86/x86-android-tablets/x86-android-tablets.h struct x86_spi_dev_info { · line 66

Quoted 8 lines

struct x86_serdev_info {

drivers/platform/x86/x86-android-tablets/x86-android-tablets.h +4 -0
+       /* For ACPI enumerated controllers */
        const char *ctrl_hid;
        const char *ctrl_uid;
+       /* For PCI enumerated controllers */
+       unsigned int ctrl_devfn;
+       /* Typically "serial0" */
        const char *ctrl_devname;
Quoted 1 line

Why not union as we have a type selector, i.e. use_pci ?

A union would be possible. I simply did not think of that.

Not sure if it is worth the trouble though, since it saves only 8 bytes on a struct which is currently used only 3 times in the driver.

Regards,

Hans

#7 lore raw

Re: [PATCH 4/5] platform/x86: x86-android-tablets: Add support for getting serdev-controller by PCI parent

Quoted 2 lines · Hans de Goede
Quoted 1 line · Andy Shevchenko

On Sun, Nov 10, 2024 at 12:05 AM Hans de Goede <[email protected]> wrote:

...

Quoted 11 lines
Quoted 7 lines

drivers/platform/x86/x86-android-tablets/core.c static __init int x86_instantiate_serdev(const struct x86_dev_info *dev_info, in · line 299

Quoted 5 lines
drivers/platform/x86/x86-android-tablets/core.c +5 -0
+       if (dev_info->use_pci)
+               ctrl_dev = get_serdev_controller_by_pci_parent(info);
+       else
+               ctrl_dev = get_serdev_controller(info->ctrl_hid, info->ctrl_uid, 0,
+                                                info->ctrl_devname);

I would expect that they both take info as an argument...

The "old" get_serdev_controller() helper for getting the controller by ACPI HID + UID is also used outside of the x86-android-tablets code and struct x86_serdev_info is x86-android-tablets specific.

I see, thanks for elaborating this.

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
        if (IS_ERR(ctrl_dev))
                return PTR_ERR(ctrl_dev);

...

Quoted 9 lines
Quoted 9 lines
Quoted 8 lines

struct x86_serdev_info {

drivers/platform/x86/x86-android-tablets/x86-android-tablets.h +4 -0
+       /* For ACPI enumerated controllers */
        const char *ctrl_hid;
        const char *ctrl_uid;
+       /* For PCI enumerated controllers */
+       unsigned int ctrl_devfn;
+       /* Typically "serial0" */
        const char *ctrl_devname;
Quoted 7 lines
Quoted 1 line

Why not union as we have a type selector, i.e. use_pci ?

A union would be possible. I simply did not think of that.

Not sure if it is worth the trouble though, since it saves only 8 bytes on a struct which is currently used only 3 times in the driver.

Saving bytes is not the main point, the main point is to make the code robust against writing both fields and make things confusing. Along with that, union gives a reader the clue that those fields are never used at the same time. So, can you consider using union?

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#8 lore raw

Re: [PATCH 4/5] platform/x86: x86-android-tablets: Add support for getting serdev-controller by PCI parent

Hi,

Quoted 38 lines · Andy Shevchenko
Quoted 2 lines · Hans de Goede
Quoted 1 line · Andy Shevchenko

On Sun, Nov 10, 2024 at 12:05 AM Hans de Goede <[email protected]> wrote:

...

Quoted 11 lines
Quoted 7 lines

drivers/platform/x86/x86-android-tablets/core.c static __init int x86_instantiate_serdev(const struct x86_dev_info *dev_info, in · line 299

Quoted 5 lines
drivers/platform/x86/x86-android-tablets/core.c +5 -0
+       if (dev_info->use_pci)
+               ctrl_dev = get_serdev_controller_by_pci_parent(info);
+       else
+               ctrl_dev = get_serdev_controller(info->ctrl_hid, info->ctrl_uid, 0,
+                                                info->ctrl_devname);

I would expect that they both take info as an argument...

The "old" get_serdev_controller() helper for getting the controller by ACPI HID + UID is also used outside of the x86-android-tablets code and struct x86_serdev_info is x86-android-tablets specific.

I see, thanks for elaborating this.

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
        if (IS_ERR(ctrl_dev))
                return PTR_ERR(ctrl_dev);

...

Quoted 13 lines
Quoted 10 lines

drivers/platform/x86/x86-android-tablets/x86-android-tablets.h struct x86_spi_dev_info { · line 66

Quoted 8 lines

struct x86_serdev_info {

drivers/platform/x86/x86-android-tablets/x86-android-tablets.h +4 -0
+       /* For ACPI enumerated controllers */
        const char *ctrl_hid;
        const char *ctrl_uid;
+       /* For PCI enumerated controllers */
+       unsigned int ctrl_devfn;
+       /* Typically "serial0" */
        const char *ctrl_devname;

Why not union as we have a type selector, i.e. use_pci ?

A union would be possible. I simply did not think of that.

Quoted 8 lines
Quoted 3 lines

Not sure if it is worth the trouble though, since it saves only 8 bytes on a struct which is currently used only 3 times in the driver.

Saving bytes is not the main point, the main point is to make the code robust against writing both fields and make things confusing. Along with that, union gives a reader the clue that those fields are never used at the same time. So, can you consider using union?

Ack, I will prepare a v2 using an union when I have some time to work on this.

Regards,

Hans

#9 lore raw

PATCH 5/5 platform/x86: x86-android-tablets: Add Bluetooth support for Vexia EDU ATLA 10

In reply to Hans de Goede

The UART used for the Bluetooth HCI on the Vexia EDU ATLA 10 is enumerated as a PCI device, but the ODBA7823 ACPI fwnode for the HCI expects it to use the more standard ACPI enumeration mode.

So Bluetooth does not work out of the box. Add x86_serdev_info to make the x86-android-tablets manually associate the fwnode with the UART.

---
 drivers/platform/x86/x86-android-tablets/other.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
drivers/platform/x86/x86-android-tablets/other.c +10 -0
index f5140d5ce61a..9b8353dec7b6 100644
@@ -715,6 +715,14 @@ static const struct x86_i2c_client_info vexia_edu_atla10_i2c_clients[] __initcon
 	}
 };
 
+static const struct x86_serdev_info vexia_edu_atla10_serdevs[] __initconst = {
+	{
+		.ctrl_devfn = PCI_DEVFN(0x1e, 3),
+		.ctrl_devname = "serial0",
+		.serdev_hid = "OBDA8723",
+	},
+};
+
 static struct gpiod_lookup_table vexia_edu_atla10_ft5416_gpios = {
 	.dev_id = "i2c-FTSC1000",
 	.table = {
@@ -755,6 +763,8 @@ static int __init vexia_edu_atla10_init(struct device *dev)
 const struct x86_dev_info vexia_edu_atla10_info __initconst = {
 	.i2c_client_info = vexia_edu_atla10_i2c_clients,
 	.i2c_client_count = ARRAY_SIZE(vexia_edu_atla10_i2c_clients),
+	.serdev_info = vexia_edu_atla10_serdevs,
+	.serdev_count = ARRAY_SIZE(vexia_edu_atla10_serdevs),
 	.gpiod_lookup_tables = vexia_edu_atla10_gpios,
 	.init = vexia_edu_atla10_init,
 	.use_pci = true,
Signature · 1 line
2.47.0
Reviewed-by on the v1 series
#10 lore raw
In reply to Hans de Goede
Quoted 7 lines · Hans de Goede

Hi All,

Here is a patch-series for adding Bluetooth support for the Vexia EDU ATLA 10 tablet to x86-android-tablets.

Due to the LPSS UARTs being enumerated through PCI rather then through

rather than

Quoted 2 lines

ACPI, this is somewhat involved. Just like how this special case needed some extra work for instantiating the various i2c-clients.

All seem reasonable to me

One patch got a few comments, and I still think it's better to move the rather long functions to the C file at some point.

Signature · 2 lines
With Best Regards,
Andy Shevchenko