* Toshiba laptop bluetooth power control patch
@ 2008-06-26 11:51 Phillip Killewald
2008-06-26 15:45 ` Randy Dunlap
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Phillip Killewald @ 2008-06-26 11:51 UTC (permalink / raw)
To: linux-kernel
Greetings,
This is my first post to the kernel mailing list. I have found many
people having the same problem with Toshiba laptops and their bluetooth
devices. Namely, the bluetooth device starts in a powered-off state,
but the current toshiba_acpi module does not easily offer the option of
modifying that state. To rectify this, I have modified a version of a
patch to toshiba_acpi.c found at
http://www.sfires.net/toshiba/index.html, and have been using it
successfully on my Toshiba M400 with all of the kernel versions since
2.6.21. The patch creates an entry /proc/acpi/toshiba/bluetooth, which
you can use to power-up and attach the bluetooth device with the
commands cat 'power: 1' >> /proc/acpi/toshiba/bluetooth and 'attach: 1'
>> /proc/acpi/toshiba/bluetooth.
Is there any way these changes can be incorporated into the kernel so I
do not have to continually patch my system at every upgrade? The text
of the patch is below.
----------
--- /usr/src/linux/drivers/acpi/toshiba_acpi.c.orig 2007-05-30
03:03:09.000000000 -0400
+++ drivers/acpi/toshiba_acpi.c 2007-05-30 10:24:35.000000000 -0400
@@ -33,7 +33,7 @@
*
*/
-#define TOSHIBA_ACPI_VERSION "0.18"
+#define TOSHIBA_ACPI_VERSION "0.18-p2"
#define PROC_INTERFACE_VERSION 1
#include <linux/kernel.h>
@@ -210,6 +210,26 @@
*result = (status == AE_OK) ? out[0] : HCI_FAILURE;
return status;
}
+static acpi_status hci_write2(u32 reg, u32 in1, u32 in2, u32* result)
+{
+ u32 in[HCI_WORDS] = { HCI_SET, reg, in1, in2, 0, 0 };
+ u32 out[HCI_WORDS];
+ acpi_status status = hci_raw(in, out);
+ *result = (status == AE_OK) ? out[0] : HCI_FAILURE;
+ return status;
+}
+
+static acpi_status hci_read2(u32 reg, u32* out1, u32* out2, u32* result)
+{
+ u32 in[HCI_WORDS] = { HCI_GET, reg, *out1, *out2, 0, 0 };
+ u32 out[HCI_WORDS];
+ acpi_status status = hci_raw(in, out);
+ *out1 = out[2];
+ *out2 = out[3];
+ *result = (status == AE_OK) ? out[0] : HCI_FAILURE;
+ return status;
+}
+
static struct proc_dir_entry *toshiba_proc_dir /*= 0*/ ;
static struct backlight_device *toshiba_backlight_device;
@@ -482,6 +502,161 @@
return count;
}
+static char* read_wk(char* p)
+{
+ u32 hci_result;
+ u32 value, value2;
+ value = 0;
+ value2 = 0x0001;
+ hci_read2(0x0056, &value, &value2, &hci_result);
+ if (hci_result == HCI_SUCCESS) {
+ p += sprintf(p,"wireless key: %d\n", value );
+ } else {
+ p += sprintf(p, "ERROR\n");
+ }
+
+ return p;
+}
+
+static char* read_bt(char* p)
+{
+ u32 hci_result;
+ u32 value, value2;
+ value = 0;
+ value2 = 0;
+ hci_read2(0x0056, &value, &value2, &hci_result);
+ if (hci_result == HCI_SUCCESS) {
+/* p += sprintf(p,"present: %d\n", value);*/
+ p += sprintf(p,"present: %d\n", (value &
0x0f)?1:0);
+ } else {
+ p += sprintf(p, "ERROR\n");
+ }
+ value = 0;
+ value2 = 0x0001;
+ hci_read2(0x0056, &value, &value2, &hci_result);
+ if (hci_result == HCI_SUCCESS) {
+ p += sprintf(p,"power: %d\n", (value & 128)
>> 7);
+ p += sprintf(p,"attach: %d\n", (value & 64)
>> 6);
+ p += sprintf(p,"wireless: %d\n", (value & 512)
>> 9);
+ } else {
+ p += sprintf(p, "ERROR\n");
+ }
+
+ return p;
+}
+
+static unsigned long write_bt(const char* buffer, unsigned long count)
+{
+ int value, value2;
+ u32 hci_result;
+ value2 = 0x0080;
+
+ if (sscanf(buffer, " power : %i", &value) == 1 &&
+ value >= 0 && value <= 1) {
+ hci_write2(0x0056, value, value2, &hci_result);
+ if (hci_result != HCI_SUCCESS)
+ return -EFAULT;
+ } else if (sscanf(buffer, " attach : %i", &value) == 1 &&
+ value >= 0 && value <= 1) {
+ value2 = 0x0040;
+ hci_write2(0x0056, value, value2, &hci_result);
+ if (hci_result != HCI_SUCCESS)
+ return -EFAULT;
+ } else if (sscanf(buffer, " orinoco : %i", &value) == 1 &&
+ value >= 0 && value <= 1) {
+ value2 = 0x0200;
+ hci_write2(0x0056, value, value2, &hci_result);
+ if (hci_result != HCI_SUCCESS)
+ return -EFAULT;
+ } else {
+ return -EINVAL;
+ }
+
+ return count;
+}
+/*
+static char* read_arb(char* p)
+{
+ u32 hci_result;
+ u32 value, value2;
+ value = 0;
+ value2 = arbitrary2;
+
+ p += sprintf(p,"arg1 : %d\n", value );
+ p += sprintf(p,"arg2 : %d\n", value2 );
+
+ hci_read2(arbitrary, &value, &value2, &hci_result);
+ if (hci_result == HCI_SUCCESS) {
+ p += sprintf(p,"arbitrary call: %d\n", arbitrary);
+ p += sprintf(p,"return1: %x\n", value);
+ p += sprintf(p,"return2: %x\n",value2);
+ } else
+ p += sprintf(p, "ERROR\n");
+
+ return p;
+}
+
+static unsigned long write_arb(const char* buffer, unsigned long count)
+{
+ int value, value2, i;
+ value2 = 0x0080;
+
+ sscanf(buffer, " arb : %i", &value) ;
+ arbitrary=value;
+ i=0;
+ while(buffer[i]!=';')i++;
+ if (sscanf(buffer+i+1, " arb2 : %i", &value) == 1 )
+ arbitrary2=value;
+ else
+ return -EINVAL;
+
+ return count;
+}
+
+
+static char* read_arb_c(char* p)
+{
+ u32 hci_result;
+ u32 value, value2;
+
+ value = arbitrary1;
+ value2 = arbitrary2;
+ p += sprintf(p,"arg1 : %d\n", value );
+ p += sprintf(p,"arg2 : %d\n", value2 );
+
+ hci_write2(arbitrary, value, value2, &hci_result);
+ if (hci_result == HCI_SUCCESS) {
+ p += sprintf(p,"arbitrary call: %d\n", arbitrary);
+ p += sprintf(p,"return1: %d\n", value);
+ p += sprintf(p,"return2: %d\n",value2);
+ } else
+ p += sprintf(p, "ERROR\n");
+
+ return p;
+}
+
+static unsigned long write_arb_c(const char* buffer, unsigned long count)
+{
+ int value, value2, i;
+ value2 = 0x0080;
+
+ sscanf(buffer, " arb : %i", &value) ;
+ arbitrary=value;
+ i=0;
+ while(buffer[i]!=';')i++;
+ sscanf(buffer+i+1, " arb2 : %i", &value);
+ arbitrary2=value;
+ i++;
+ while(buffer[i]!=';')i++;
+ if (sscanf(buffer+i+1, " arb1 : %i", &value) == 1 )
+ arbitrary1=value;
+ else
+ return -EINVAL;
+
+ return count;
+}
+*/
+
static char *read_version(char *p)
{
p += sprintf(p, "driver: %s\n", TOSHIBA_ACPI_VERSION);
@@ -501,6 +676,8 @@
{"fan", read_fan, write_fan},
{"keys", read_keys, write_keys},
{"version", read_version, NULL},
+ {"wireless_key",read_wk,0},
+ {"bluetooth",read_bt,write_bt},
{NULL}
};
----------
--
/**********************************/
// Phillip Killewald
// CMS Graduate Research Assistant
// The Ohio State University
// [paste@mps.ohio-state.edu]
// [killewald.1@osu.edu]
// [paste@cern.ch]
/************No Comment************/
printk(" Speed now 1x"); /* Pull my finger! */
linux-2.6.6/drivers/cdrom/mcd.c
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: Toshiba laptop bluetooth power control patch
2008-06-26 11:51 Toshiba laptop bluetooth power control patch Phillip Killewald
@ 2008-06-26 15:45 ` Randy Dunlap
2008-06-26 18:15 ` Renato S. Yamane
2008-06-26 18:19 ` Matthew Garrett
2 siblings, 0 replies; 4+ messages in thread
From: Randy Dunlap @ 2008-06-26 15:45 UTC (permalink / raw)
To: Phillip Killewald; +Cc: linux-kernel
On Thu, 26 Jun 2008 13:51:51 +0200 Phillip Killewald wrote:
> Greetings,
>
> This is my first post to the kernel mailing list. I have found many
> people having the same problem with Toshiba laptops and their bluetooth
> devices. Namely, the bluetooth device starts in a powered-off state,
> but the current toshiba_acpi module does not easily offer the option of
> modifying that state. To rectify this, I have modified a version of a
> patch to toshiba_acpi.c found at
> http://www.sfires.net/toshiba/index.html, and have been using it
> successfully on my Toshiba M400 with all of the kernel versions since
> 2.6.21. The patch creates an entry /proc/acpi/toshiba/bluetooth, which
> you can use to power-up and attach the bluetooth device with the
> commands cat 'power: 1' >> /proc/acpi/toshiba/bluetooth and 'attach: 1'
> >> /proc/acpi/toshiba/bluetooth.
>
> Is there any way these changes can be incorporated into the kernel so I
> do not have to continually patch my system at every upgrade? The text
> of the patch is below.
Hi Phillip,
a. You should cc: the toshiba_acpi maintainer (from the MAINTAINERS file):
TOSHIBA ACPI EXTRAS DRIVER
P: John Belmonte
M: toshiba_acpi@memebeam.org
W: http://memebeam.org/toys/ToshibaAcpiDriver
S: Maintained
b. It looks like thunderbird wrapped a few lines of your patch where they
should not have been split/broken. See http://lkml.org/lkml/2008/6/26/228
for how it appears. You can check if Documentation/email-clients.txt has
any useful help in it for Thunderbird.
c. Look over Documentation/CodingStyle. The patch has some unusual
style (lack of whitespace, etc.) in it that should be fixed. I can go into
more detail on that if needed.
> ----------
> --- /usr/src/linux/drivers/acpi/toshiba_acpi.c.orig 2007-05-30
> 03:03:09.000000000 -0400
> +++ drivers/acpi/toshiba_acpi.c 2007-05-30 10:24:35.000000000 -0400
> @@ -33,7 +33,7 @@
> *
> */
>
> -#define TOSHIBA_ACPI_VERSION "0.18"
> +#define TOSHIBA_ACPI_VERSION "0.18-p2"
> #define PROC_INTERFACE_VERSION 1
>
> #include <linux/kernel.h>
> @@ -210,6 +210,26 @@
> *result = (status == AE_OK) ? out[0] : HCI_FAILURE;
> return status;
> }
> +static acpi_status hci_write2(u32 reg, u32 in1, u32 in2, u32* result)
> +{
> + u32 in[HCI_WORDS] = { HCI_SET, reg, in1, in2, 0, 0 };
> + u32 out[HCI_WORDS];
> + acpi_status status = hci_raw(in, out);
> + *result = (status == AE_OK) ? out[0] : HCI_FAILURE;
> + return status;
> +}
> +
> +static acpi_status hci_read2(u32 reg, u32* out1, u32* out2, u32* result)
> +{
> + u32 in[HCI_WORDS] = { HCI_GET, reg, *out1, *out2, 0, 0 };
> + u32 out[HCI_WORDS];
> + acpi_status status = hci_raw(in, out);
> + *out1 = out[2];
> + *out2 = out[3];
> + *result = (status == AE_OK) ? out[0] : HCI_FAILURE;
> + return status;
> +}
> +
>
> static struct proc_dir_entry *toshiba_proc_dir /*= 0*/ ;
> static struct backlight_device *toshiba_backlight_device;
> @@ -482,6 +502,161 @@
> return count;
> }
>
> +static char* read_wk(char* p)
> +{
> + u32 hci_result;
> + u32 value, value2;
> + value = 0;
> + value2 = 0x0001;
> + hci_read2(0x0056, &value, &value2, &hci_result);
> + if (hci_result == HCI_SUCCESS) {
> + p += sprintf(p,"wireless key: %d\n", value );
> + } else {
> + p += sprintf(p, "ERROR\n");
> + }
> +
> + return p;
> +}
> +
> +static char* read_bt(char* p)
> +{
> + u32 hci_result;
> + u32 value, value2;
> + value = 0;
> + value2 = 0;
> + hci_read2(0x0056, &value, &value2, &hci_result);
> + if (hci_result == HCI_SUCCESS) {
> +/* p += sprintf(p,"present: %d\n", value);*/
> + p += sprintf(p,"present: %d\n", (value &
> 0x0f)?1:0);
> + } else {
> + p += sprintf(p, "ERROR\n");
> + }
> + value = 0;
> + value2 = 0x0001;
> + hci_read2(0x0056, &value, &value2, &hci_result);
> + if (hci_result == HCI_SUCCESS) {
> + p += sprintf(p,"power: %d\n", (value & 128)
> >> 7);
> + p += sprintf(p,"attach: %d\n", (value & 64)
> >> 6);
> + p += sprintf(p,"wireless: %d\n", (value & 512)
> >> 9);
> + } else {
> + p += sprintf(p, "ERROR\n");
> + }
> +
> + return p;
> +}
> +
> +static unsigned long write_bt(const char* buffer, unsigned long count)
> +{
> + int value, value2;
> + u32 hci_result;
> + value2 = 0x0080;
> +
> + if (sscanf(buffer, " power : %i", &value) == 1 &&
> + value >= 0 && value <= 1) {
> + hci_write2(0x0056, value, value2, &hci_result);
> + if (hci_result != HCI_SUCCESS)
> + return -EFAULT;
> + } else if (sscanf(buffer, " attach : %i", &value) == 1 &&
> + value >= 0 && value <= 1) {
> + value2 = 0x0040;
> + hci_write2(0x0056, value, value2, &hci_result);
> + if (hci_result != HCI_SUCCESS)
> + return -EFAULT;
> + } else if (sscanf(buffer, " orinoco : %i", &value) == 1 &&
> + value >= 0 && value <= 1) {
> + value2 = 0x0200;
> + hci_write2(0x0056, value, value2, &hci_result);
> + if (hci_result != HCI_SUCCESS)
> + return -EFAULT;
> + } else {
> + return -EINVAL;
> + }
> +
> + return count;
> +}
> +/*
> +static char* read_arb(char* p)
> +{
> + u32 hci_result;
> + u32 value, value2;
> + value = 0;
> + value2 = arbitrary2;
> +
> + p += sprintf(p,"arg1 : %d\n", value );
> + p += sprintf(p,"arg2 : %d\n", value2 );
> +
> + hci_read2(arbitrary, &value, &value2, &hci_result);
> + if (hci_result == HCI_SUCCESS) {
> + p += sprintf(p,"arbitrary call: %d\n", arbitrary);
> + p += sprintf(p,"return1: %x\n", value);
> + p += sprintf(p,"return2: %x\n",value2);
> + } else
> + p += sprintf(p, "ERROR\n");
> +
> + return p;
> +}
> +
> +static unsigned long write_arb(const char* buffer, unsigned long count)
> +{
> + int value, value2, i;
> + value2 = 0x0080;
> +
> + sscanf(buffer, " arb : %i", &value) ;
> + arbitrary=value;
> + i=0;
> + while(buffer[i]!=';')i++;
> + if (sscanf(buffer+i+1, " arb2 : %i", &value) == 1 )
> + arbitrary2=value;
> + else
> + return -EINVAL;
> +
> + return count;
> +}
> +
> +
> +static char* read_arb_c(char* p)
> +{
> + u32 hci_result;
> + u32 value, value2;
> +
> + value = arbitrary1;
> + value2 = arbitrary2;
> + p += sprintf(p,"arg1 : %d\n", value );
> + p += sprintf(p,"arg2 : %d\n", value2 );
> +
> + hci_write2(arbitrary, value, value2, &hci_result);
> + if (hci_result == HCI_SUCCESS) {
> + p += sprintf(p,"arbitrary call: %d\n", arbitrary);
> + p += sprintf(p,"return1: %d\n", value);
> + p += sprintf(p,"return2: %d\n",value2);
> + } else
> + p += sprintf(p, "ERROR\n");
> +
> + return p;
> +}
> +
> +static unsigned long write_arb_c(const char* buffer, unsigned long count)
> +{
> + int value, value2, i;
> + value2 = 0x0080;
> +
> + sscanf(buffer, " arb : %i", &value) ;
> + arbitrary=value;
> + i=0;
> + while(buffer[i]!=';')i++;
> + sscanf(buffer+i+1, " arb2 : %i", &value);
> + arbitrary2=value;
> + i++;
> + while(buffer[i]!=';')i++;
> + if (sscanf(buffer+i+1, " arb1 : %i", &value) == 1 )
> + arbitrary1=value;
> + else
> + return -EINVAL;
> +
> + return count;
> +}
> +*/
> +
> static char *read_version(char *p)
> {
> p += sprintf(p, "driver: %s\n", TOSHIBA_ACPI_VERSION);
> @@ -501,6 +676,8 @@
> {"fan", read_fan, write_fan},
> {"keys", read_keys, write_keys},
> {"version", read_version, NULL},
> + {"wireless_key",read_wk,0},
> + {"bluetooth",read_bt,write_bt},
> {NULL}
> };
> ----------
---
~Randy
Linux Plumbers Conference, 17-19 September 2008, Portland, Oregon USA
http://linuxplumbersconf.org/
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: Toshiba laptop bluetooth power control patch
2008-06-26 11:51 Toshiba laptop bluetooth power control patch Phillip Killewald
2008-06-26 15:45 ` Randy Dunlap
@ 2008-06-26 18:15 ` Renato S. Yamane
2008-06-26 18:19 ` Matthew Garrett
2 siblings, 0 replies; 4+ messages in thread
From: Renato S. Yamane @ 2008-06-26 18:15 UTC (permalink / raw)
To: Phillip Killewald; +Cc: linux-kernel, linux-acpi, lenb, greg
Phillip Killewald wrote:
> This is my first post to the kernel mailing list. I have found many
> people having the same problem with Toshiba laptops and their bluetooth
> devices.
If you wanna, is possible find some documentation from Toshiba at:
<http://linux.toshiba-dme.co.jp/linux/eng/develop.htm>
Best regards,
Renato S. Yamane
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Toshiba laptop bluetooth power control patch
2008-06-26 11:51 Toshiba laptop bluetooth power control patch Phillip Killewald
2008-06-26 15:45 ` Randy Dunlap
2008-06-26 18:15 ` Renato S. Yamane
@ 2008-06-26 18:19 ` Matthew Garrett
2 siblings, 0 replies; 4+ messages in thread
From: Matthew Garrett @ 2008-06-26 18:19 UTC (permalink / raw)
To: Phillip Killewald; +Cc: linux-kernel
On Thu, Jun 26, 2008 at 01:51:51PM +0200, Phillip Killewald wrote:
> 2.6.21. The patch creates an entry /proc/acpi/toshiba/bluetooth, which
> you can use to power-up and attach the bluetooth device with the
> commands cat 'power: 1' >> /proc/acpi/toshiba/bluetooth and 'attach: 1'
> >> /proc/acpi/toshiba/bluetooth.
Please use rfkill instead. Adding new custom files to /proc ends up
making it harder to convert them all over later :)
--
Matthew Garrett | mjg59@srcf.ucam.org
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2008-06-26 18:20 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-26 11:51 Toshiba laptop bluetooth power control patch Phillip Killewald
2008-06-26 15:45 ` Randy Dunlap
2008-06-26 18:15 ` Renato S. Yamane
2008-06-26 18:19 ` Matthew Garrett
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox