ibm-acpi Linux driver development

Henrique de Moraes Holschuh | 1 Jul 2008 20:27

Picon

[PATCH 6/7] ACPI: thinkpad-acpi: bump up version to 0.21

rfkill support deserves a new version checkpoint...

Signed-off-by: Henrique de Moraes Holschuh <hmh@...>
---
 Documentation/laptops/thinkpad-acpi.txt |    4 ++--
 drivers/misc/thinkpad_acpi.c            |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Documentation/laptops/thinkpad-acpi.txt b/Documentation/laptops/thinkpad-acpi.txt
index 1c1c021..02dc748 100644
--- a/Documentation/laptops/thinkpad-acpi.txt
+++ b/Documentation/laptops/thinkpad-acpi.txt
 <at>  <at>  -1,7 +1,7  <at>  <at> 
 		     ThinkPad ACPI Extras Driver

-                            Version 0.20
-                          April 09th, 2008
+                            Version 0.21
+                           May 29th, 2008

                Borislav Deianov <borislav@...>
              Henrique de Moraes Holschuh <hmh@...>
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
index dc8d00a..3eb01af 100644
--- a/drivers/misc/thinkpad_acpi.c
+++ b/drivers/misc/thinkpad_acpi.c
 <at>  <at>  -21,7 +21,7  <at>  <at> 
  *  02110-1301, USA.
  */

(Continue reading)

Henrique de Moraes Holschuh | 1 Jul 2008 20:27

Picon

[PATCH 5/7] ACPI: thinkpad-acpi: add bluetooth and WWAN rfkill support

Add a read/write rfkill interface to the bluetooth radio switch on the
bluetooth submodule, and one for the wireless wan radio switch to the wan
submodule.

Since rfkill does care for when a switch changes state, use WLSW
notifications to also check if the WWAN or Bluetooth switches did not
change state (due to them being slaves of WLSW in firmware/hardware, but
that reality not being always properly exported by the thinkpad firmware).

Signed-off-by: Henrique de Moraes Holschuh <hmh@...>
Cc: Ivo van Doorn <IvDoorn@...>
Cc: John W. Linville <linville@...>
---
 Documentation/laptops/thinkpad-acpi.txt |   22 +++-
 drivers/misc/Kconfig                    |    2 +
 drivers/misc/thinkpad_acpi.c            |  208 +++++++++++++++++++++++++++----
 3 files changed, 200 insertions(+), 32 deletions(-)

diff --git a/Documentation/laptops/thinkpad-acpi.txt b/Documentation/laptops/thinkpad-acpi.txt
index 64b3f14..1c1c021 100644
--- a/Documentation/laptops/thinkpad-acpi.txt
+++ b/Documentation/laptops/thinkpad-acpi.txt
 <at>  <at>  -621,7 +621,8  <at>  <at>  Bluetooth
 ---------

 procfs: /proc/acpi/ibm/bluetooth
-sysfs device attribute: bluetooth_enable
+sysfs device attribute: bluetooth_enable (deprecated)
+sysfs rfkill class: switch "tpacpi_bluetooth_sw"

(Continue reading)

Henrique de Moraes Holschuh | 1 Jul 2008 20:27

Picon

[GIT PATCH] thinkpad-acpi changes for 2.6.27 merge window


Andi,

Here a patchset with the thinkpad-acpi changes scheduled for 2.6.27.

It depends on the rfkill changes in net-next-2.6 (already in
linux-next).  Usually, I provide a git tree for pulling and also send
the patches.  Due to the linux-next dependency, this one is going out
just as patches.

Please stage these patches for merging during the 2.6.27 merge window or
on early -rc1, AFTER the rfkill changes land in mainline.

Shortlog:

Henrique de Moraes Holschuh (7):
      ACPI: thinkpad-acpi: minor refactor on radio switch init
      ACPI: thinkpad-acpi: consolidate wlsw notification function
      ACPI: thinkpad-acpi: prepare for bluetooth and wwan rfkill support
      ACPI: thinkpad-acpi: WLSW overrides other rfkill switches
      ACPI: thinkpad-acpi: add bluetooth and WWAN rfkill support
      ACPI: thinkpad-acpi: bump up version to 0.21
      ACPI: thinkpad-acpi: don't misdetect in get_thinkpad_model_data() on -ENOMEM

Thank you.

--

-- 
  "One disk to rule them all, One disk to find them. One disk to bring
  them all and in the darkness grind them. In the Land of Redmond
  where the shadows lie." -- The Silicon Valley Tarot

(Continue reading)

Henrique de Moraes Holschuh | 1 Jul 2008 20:27

Picon

[PATCH 4/7] ACPI: thinkpad-acpi: WLSW overrides other rfkill switches

On ThinkPads where the WLSW switch exists, the firmware or the hardware
ANDs the WLSW state with the device-specific switches (WWAN, Bluetooth).
It is downright impossible to enable WWAN or Bluetooth when WLSW is
blocking the radios.

This reality does not necessarily carry over to the WWAN and Bluetooth
firmware interfaces, though... so the state thinkpad-acpi was reporting
could be incorrect.

Tie the three switches in the driver so that we keep their state sane.
When WLSL is off, force the other switches to off as well.

Signed-off-by: Henrique de Moraes Holschuh <hmh@...>
---
 drivers/misc/thinkpad_acpi.c |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
index 743a4d6..202d63e 100644
--- a/drivers/misc/thinkpad_acpi.c
+++ b/drivers/misc/thinkpad_acpi.c
 <at>  <at>  -2588,6 +2588,10  <at>  <at>  static int bluetooth_get_radiosw(void)
 	if (!tp_features.bluetooth)
 		return -ENODEV;

+	/* WLSW overrides bluetooth in firmware/hardware, reflect that */
+	if (tp_features.hotkey_wlsw && !hotkey_get_wlsw(&status) && !status)
+		return 0;
+
 	if (!acpi_evalf(hkey_handle, &status, "GBDC", "d"))

(Continue reading)

Henrique de Moraes Holschuh | 1 Jul 2008 20:27

Picon

[PATCH 1/7] ACPI: thinkpad-acpi: minor refactor on radio switch init

Change the code of hotkey_init, wan_init and bluetooth_init a bit to make it
much easier to add some Kconfig-selected debugging code later.

Signed-off-by: Henrique de Moraes Holschuh <hmh@...>
---
 drivers/misc/thinkpad_acpi.c |   49 ++++++++++++++++++++++-------------------
 1 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
index b596929..c800855 100644
--- a/drivers/misc/thinkpad_acpi.c
+++ b/drivers/misc/thinkpad_acpi.c
 <at>  <at>  -2167,9 +2167,10  <at>  <at>  static int __init hotkey_init(struct ibm_init_struct *iibm)
 		printk(TPACPI_INFO
 			"radio switch found; radios are %s\n",
 			enabled(status, 0));
+	}
+	if (tp_features.hotkey_wlsw)
 		res = add_to_attr_set(hotkey_dev_attributes,
 				&dev_attr_hotkey_radio_sw.attr);
-	}

 	/* For X41t, X60t, X61t Tablets... */
 	if (!res && acpi_evalf(hkey_handle, &status, "MHKG", "qd")) {
 <at>  <at>  -2646,18 +2647,19  <at>  <at>  static int __init bluetooth_init(struct ibm_init_struct *iibm)
 		str_supported(tp_features.bluetooth),
 		status);

+	if (tp_features.bluetooth &&
+	    !(status & TP_ACPI_BLUETOOTH_HWPRESENT)) {

(Continue reading)

Henrique de Moraes Holschuh | 1 Jul 2008 20:27

Picon

[PATCH 2/7] ACPI: thinkpad-acpi: consolidate wlsw notification function

Rename tpacpi_input_send_radiosw() to tpacpi_send_radiosw_update(), and
make it a central point to issue "radio switch changed state" notifications
by consolidating also the poll() notification in the same function.

Signed-off-by: Henrique de Moraes Holschuh <hmh@...>
---
 drivers/misc/thinkpad_acpi.c |   39 +++++++++++++++++++--------------------
 1 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
index c800855..9179f23 100644
--- a/drivers/misc/thinkpad_acpi.c
+++ b/drivers/misc/thinkpad_acpi.c
 <at>  <at>  -1285,21 +1285,6  <at>  <at>  static int hotkey_status_set(int status)
 	return 0;
 }

-static void tpacpi_input_send_radiosw(void)
-{
-	int wlsw;
-
-	if (tp_features.hotkey_wlsw && !hotkey_get_wlsw(&wlsw)) {
-		mutex_lock(&tpacpi_inputdev_send_mutex);
-
-		input_report_switch(tpacpi_inputdev,
-				    SW_RFKILL_ALL, !!wlsw);
-		input_sync(tpacpi_inputdev);
-
-		mutex_unlock(&tpacpi_inputdev_send_mutex);
-	}

(Continue reading)

Henrique de Moraes Holschuh | 1 Jul 2008 20:27

Picon

[PATCH 7/7] ACPI: thinkpad-acpi: don't misdetect in get_thinkpad_model_data() on -ENOMEM

Explicitly check for memory allocation failures, and return status to
indicate that we could not collect data due to errors.

This lets the driver have a far more predictable failure mode on ENOMEM in
that codepath: it will refuse to load.  This is far better than trying to
proceed with missing data which is used to detect quirks, etc.

Signed-off-by: Henrique de Moraes Holschuh <hmh@...>
---
 drivers/misc/thinkpad_acpi.c |   47 +++++++++++++++++++++++++++++------------
 1 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
index 3eb01af..d3eb790 100644
--- a/drivers/misc/thinkpad_acpi.c
+++ b/drivers/misc/thinkpad_acpi.c
 <at>  <at>  -6340,13 +6340,18  <at>  <at>  err_out:

 /* Probing */

-static void __init get_thinkpad_model_data(struct thinkpad_id_data *tp)
+/* returns 0 - probe ok, or < 0 - probe error.
+ * Probe ok doesn't mean thinkpad found.
+ * On error, kfree() cleanup on tp->* is not performed, caller must do it */
+static int __must_check __init get_thinkpad_model_data(
+						struct thinkpad_id_data *tp)
 {
 	const struct dmi_device *dev = NULL;
 	char ec_fw_string[18];
+	char const *s;

(Continue reading)

Henrique de Moraes Holschuh | 1 Jul 2008 20:27

Picon

[PATCH 3/7] ACPI: thinkpad-acpi: prepare for bluetooth and wwan rfkill support

Get rid of some forward definitions by moving code around, this will make
the rfkill conversion of wwan and bluetooth a bit cleaner.

Signed-off-by: Henrique de Moraes Holschuh <hmh@...>
---
 drivers/misc/thinkpad_acpi.c |  154 ++++++++++++++++++++----------------------
 1 files changed, 74 insertions(+), 80 deletions(-)

diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
index 9179f23..743a4d6 100644
--- a/drivers/misc/thinkpad_acpi.c
+++ b/drivers/misc/thinkpad_acpi.c
 <at>  <at>  -2581,8 +2581,37  <at>  <at>  enum {
 	TP_ACPI_BLUETOOTH_UNK		= 0x04,	/* unknown function */
 };

-static int bluetooth_get_radiosw(void);
-static int bluetooth_set_radiosw(int radio_on);
+static int bluetooth_get_radiosw(void)
+{
+	int status;
+
+	if (!tp_features.bluetooth)
+		return -ENODEV;
+
+	if (!acpi_evalf(hkey_handle, &status, "GBDC", "d"))
+		return -EIO;
+
+	return (status & TP_ACPI_BLUETOOTH_RADIOSSW) != 0;
+}

(Continue reading)

Andi Kleen | 1 Jul 2008 20:44

Re: [PATCH 1/7] ACPI: thinkpad-acpi: minor refactor on radio switch init

Henrique de Moraes Holschuh wrote:
> Change the code of hotkey_init, wan_init and bluetooth_init a bit to make it
> much easier to add some Kconfig-selected debugging code later.

The later seems to be wrong, the debugging code is already included?

Description seems to be incomplete.

-Andi
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo <at> vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Henrique de Moraes Holschuh | 1 Jul 2008 20:59

Picon

Re: [PATCH 1/7] ACPI: thinkpad-acpi: minor refactor on radio switch init

On Tue, 01 Jul 2008, Andi Kleen wrote:
> Henrique de Moraes Holschuh wrote:
> > Change the code of hotkey_init, wan_init and bluetooth_init a bit to make it
> > much easier to add some Kconfig-selected debugging code later.
> 
> The later seems to be wrong, the debugging code is already included?

No, that patch just moves some code around and changes the way some
conditionals were written so it would be easier to add the debugging
code later.  It is supposed to change nothing as far as functionality
goes.

I do have that debugging code, but I didn't see a reason to submit it
for mainline yet.  But it helps me a whole deal if it is easy to just
patch it in when I needed it, so patch 1/7 is something I'd like merged.

The debugging code itself is a harness to simulate the thinkpad rfkill
firmware, as my T43 doesn't have bluetooth, WWAN or the WLSW rfkill
switch and I needed a way to test those codepaths.  As I said, it is a
separate patch I didn't submit yet (and might decide not to submit at
all, unless someone asks for it or I find out it would be helpful to
track some sort of bug).

I.e. the patch does exactly what the description says 

But I have nothing against changing that description, I just don't know
what to put in there that would be better...

--

-- 
  "One disk to rule them all, One disk to find them. One disk to bring

(Continue reading)

Group

gmane.linux.acpi.ibm-acpi.devel.

Advertisement

Project Web Page

ibm-acpi Linux driver development

Search Archive

Page

1 | 2 | 3 | 4 | 5

Articles in period: 48

July 2008

Language

Change language

Options

Current view: Threads only / Showing only 20 lines / Not hiding cited text.
Change to All messages, whole messages, or hide cited text.

Post a message
NNTP Newsgroup
Classic Gmane web interface
XML

XML

RSS Feed
List Information

About Gmane

Recent entries

regulate backlight on X230 and T430 works incorrectly (29 Apr 2013)
Suspend failure on Thinkpad X1 Carbon (18 Mar 2013)
thinkpad_acpi: unhandled HKEY event 0x6040 (31 Mar 2013)
unhandled HKEY event (28 Mar 2013)
unhandled HKEY event (24 Mar 2013)
W520 LCD Screen (27 Mar 2013)
thinkpad_acpi: unknown possible thermal alarm or keyboard event receiv (30 Mar 2013)
thinkpad_acpi: unhandled HKEY event 0x6050 on Thinkpad E420s (14 Mar 2013)
Update Submission (7 Mar 2013)
thinkpad_acpi: unknown possible thermal alarm or keyboard event receiv (18 Mar 2013)
reporting conditions (23 Mar 2013)
[PATCH] Remove nested functions from the Thinkpad ACPI (14 Feb 2013)
unknown acpi event on lenovo edge e130g (6 Feb 2013)
T420 chanegd ACPI event code for power (19 Feb 2013)
thinkpad_acpi doesn't load after alsa update, thinkfan (21 Feb 2013)
ThinkPad X230 fail on Linux (22 Feb 2013)
thinkpad_acpi unhandled HKEY events (15 Feb 2013)
thinkpad_acpi: unknown possible thermal alarm or keyboard event receiv (8 Feb 2013)
thinkpad_acpi: unhandled HKEY event 0x6040 (13 Feb 2013)
Bug report (3 Jan 2013)
unknown event (5 Jan 2013)

Archives

1	June 2013
3	April 2013
15	March 2013
12	February 2013
10	January 2013
20	December 2012
5	November 2012
5	October 2012
2	September 2012
11	August 2012
22	July 2012
21	June 2012
8	May 2012
3	April 2012
15	March 2012
10	February 2012
11	January 2012
9	December 2011
23	November 2011
13	October 2011
7	September 2011
18	August 2011
5	July 2011
29	June 2011
23	May 2011
9	April 2011
18	March 2011
14	February 2011
38	January 2011
8	December 2010
8	November 2010
9	October 2010
16	September 2010
7	August 2010
10	July 2010
13	June 2010
24	May 2010
27	April 2010
28	March 2010
30	February 2010
39	January 2010
47	December 2009
48	November 2009
20	October 2009
49	September 2009
25	August 2009
15	July 2009
41	June 2009
21	May 2009
42	April 2009
15	March 2009
12	February 2009
45	January 2009
14	December 2008
54	November 2008
65	October 2008
20	September 2008
27	August 2008
48	July 2008
19	June 2008
25	May 2008
56	April 2008
21	March 2008
84	February 2008
100	January 2008
38	December 2007
48	November 2007
136	October 2007
77	September 2007
70	August 2007
245	July 2007
39	June 2007
118	May 2007
71	April 2007
123	March 2007
78	February 2007
15	January 2007
25	December 2006
71	November 2006

Design

Zawodny | Right Menu | Left Menu

Your Own Design

Paste the URL of your CSS below. Download CSS template