[PATCH] Sony laptop: Some Sony Vaia laptops do not enable wwan power by default.

[PATCH] Sony laptop: Some Sony Vaia laptops do not enable wwan power by default.

[Tim Gardner]

[-- Attachment #1: Type: text/plain, Size: 242 bytes --]

Ubuntu has been carrying this patch for a couple of years because I keep 
forgetting to upstream it. Does anyone think it still makes sense, or 
should setting WWAN power be done in user space ?

rtg
-- 
Tim Gardner tim.gardner@canonical.com

[-- Attachment #2: 0001-UBUNTU-Sony-laptop-Some-Sony-Vaia-laptops-do-not-ena.patch --]
[-- Type: text/x-patch, Size: 2284 bytes --]

From 87db59448467783076b7468a8f8ae3650d08d3a0 Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner@canonical.com>
Date: Tue, 21 Apr 2009 11:09:10 -0600
Subject: [PATCH] Sony laptop: Some Sony Vaia laptops do not enable wwan power by default.

Bug: https://bugs.launchpad.net/bugs/364678

Added quirk to enable wwan power based on DMI information already present in the module.
It appears that Vaio's do not enable power to wwan from a cold boot.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
 drivers/platform/x86/sony-laptop.c |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index bbd182e..02265fd 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -1879,6 +1879,10 @@ struct sonypi_eventtypes {
 	struct sonypi_event	*events;
 };
 
+struct sony_pic_quirk_entry {
+	u8				set_wwan_power;
+};
+
 struct sony_pic_dev {
 	struct acpi_device		*acpi_dev;
 	struct sony_pic_irq		*cur_irq;
@@ -1889,6 +1893,7 @@ struct sony_pic_dev {
 	struct sonypi_eventtypes	*event_types;
 	int                             (*handle_irq)(const u8, const u8);
 	int				model;
+	struct sony_pic_quirk_entry	*quirks;
 	u16				evport_offset;
 	u8				camera_power;
 	u8				bluetooth_power;
@@ -3315,6 +3320,12 @@ static int sony_pic_add(struct acpi_device *device)
 	if (result)
 		goto err_remove_pf;
 
+	if (spic_dev.quirks && spic_dev.quirks->set_wwan_power) {
+		/*
+		 * Power isn't enabled by default.
+		 */
+		__sony_pic_set_wwanpower(1);
+	}
 	return 0;
 
 err_remove_pf:
@@ -3385,6 +3396,16 @@ static struct acpi_driver sony_pic_driver = {
 		},
 };
 
+static struct sony_pic_quirk_entry sony_pic_vaio_vgn = {
+	.set_wwan_power = 1,
+};
+
+static int dmi_matched(const struct dmi_system_id *dmi)
+{
+	spic_dev.quirks = dmi->driver_data;
+	return 0;
+}
+
 static struct dmi_system_id __initdata sonypi_dmi_table[] = {
 	{
 		.ident = "Sony Vaio",
@@ -3399,6 +3420,8 @@ static struct dmi_system_id __initdata sonypi_dmi_table[] = {
 			DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
 			DMI_MATCH(DMI_PRODUCT_NAME, "VGN-"),
 		},
+		.callback = dmi_matched,
+		.driver_data = &sony_pic_vaio_vgn,
 	},
 	{ }
 };
-- 
1.7.0.4

Re: [PATCH] Sony laptop: Some Sony Vaia laptops do not enable wwan power by default.

[Matthew Garrett]

On Tue, Jul 12, 2011 at 09:55:38AM -0600, Tim Gardner wrote:
> Ubuntu has been carrying this patch for a couple of years because I
> keep forgetting to upstream it. Does anyone think it still makes
> sense, or should setting WWAN power be done in user space ?

Userspace, but also somebody needs to figure out how to identify whether 
old-style Vaios support each of these features and expose them as proper 
rfkill devices.

-- 
Matthew Garrett | mjg59@srcf.ucam.org

Re: [PATCH] Sony laptop: Some Sony Vaia laptops do not enable wwan power by default.

[Mattia Dongili]

On Tue, Jul 12, 2011 at 05:01:56PM +0100, Matthew Garrett wrote:
> On Tue, Jul 12, 2011 at 09:55:38AM -0600, Tim Gardner wrote:
> > Ubuntu has been carrying this patch for a couple of years because I
> > keep forgetting to upstream it. Does anyone think it still makes
> > sense, or should setting WWAN power be done in user space ?
> 
> Userspace, but also somebody needs to figure out how to identify whether 
> old-style Vaios support each of these features and expose them as proper 
> rfkill devices.

the problem with that has always been that we don't know how to probe
the SPIC device. We also don't know how to read the state of the rfkill
switch. I imagine we could guess but I'm not sure how useful that is.

-- 
mattia
:wq!