Skip to content

L
linux
Commit 7e960711 authored by Corentin Chary's avatar Corentin Chary Committed by Matthew Garrett
Browse files
Options

samsung-laptop: ehance SABI support 

* SABI command are on 16 bits, not 8
* SABI can read/write up to 11 byte of data
* There is not real difference between "get" and "set"
  commands, so refactorise the code of both functions
Signed-off-by: default avatarCorentin Chary <corentincj@iksaif.net>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarMatthew Garrett <mjg@redhat.com>
parent a66c1662
Show whitespace changes
Inline Side-by-side
Showing with 113 additions and 112 deletions
drivers/platform/x86/samsung-laptop.c
View file @ 7e960711
...@@ -42,9 +42,17 @@ ...@@ -42,9 +42,17 @@
#define SABI_IFACE_COMPLETE 0x04 #define SABI_IFACE_COMPLETE 0x04
#define SABI_IFACE_DATA 0x05 #define SABI_IFACE_DATA 0x05
/* Structure to get data back to the calling function */ /* Structure get/set data using sabi */
struct sabi_retval { struct sabi_data {
u8 retval[20]; union {
struct {
u32 d0;
u32 d1;
u16 d2;
u8 d3;
};
u8 data[11];
};
}; };
struct sabi_header_offsets { struct sabi_header_offsets {
...@@ -61,8 +69,8 @@ struct sabi_commands { ...@@ -61,8 +69,8 @@ struct sabi_commands {
* Brightness is 0 - 8, as described above. * Brightness is 0 - 8, as described above.
* Value 0 is for the BIOS to use * Value 0 is for the BIOS to use
*/ */
u8 get_brightness; u16 get_brightness;
u8 set_brightness; u16 set_brightness;
/* /*
* first byte: * first byte:
...@@ -73,37 +81,37 @@ struct sabi_commands { ...@@ -73,37 +81,37 @@ struct sabi_commands {
* 0x03 - 3G is on * 0x03 - 3G is on
* TODO, verify 3G is correct, that doesn't seem right... * TODO, verify 3G is correct, that doesn't seem right...
*/ */
u8 get_wireless_button; u16 get_wireless_button;
u8 set_wireless_button; u16 set_wireless_button;
/* 0 is off, 1 is on */ /* 0 is off, 1 is on */
u8 get_backlight; u16 get_backlight;
u8 set_backlight; u16 set_backlight;
/* /*
* 0x80 or 0x00 - no action * 0x80 or 0x00 - no action
* 0x81 - recovery key pressed * 0x81 - recovery key pressed
*/ */
u8 get_recovery_mode; u16 get_recovery_mode;
u8 set_recovery_mode; u16 set_recovery_mode;
/* /*
* on seclinux: 0 is low, 1 is high, * on seclinux: 0 is low, 1 is high,
* on swsmi: 0 is normal, 1 is silent, 2 is turbo * on swsmi: 0 is normal, 1 is silent, 2 is turbo
*/ */
u8 get_performance_level; u16 get_performance_level;
u8 set_performance_level; u16 set_performance_level;
/* /*
* Tell the BIOS that Linux is running on this machine. * Tell the BIOS that Linux is running on this machine.
* 81 is on, 80 is off * 81 is on, 80 is off
*/ */
u8 set_linux; u16 set_linux;
}; };
struct sabi_performance_level { struct sabi_performance_level {
const char *name; const char *name;
u8 value; u16 value;
}; };
struct sabi_config { struct sabi_config {
...@@ -246,16 +254,25 @@ static bool debug; ...@@ -246,16 +254,25 @@ static bool debug;
module_param(debug, bool, S_IRUGO | S_IWUSR); module_param(debug, bool, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(debug, "Debug enabled or not"); MODULE_PARM_DESC(debug, "Debug enabled or not");
static int sabi_get_command(struct samsung_laptop *samsung, static int sabi_command(struct samsung_laptop *samsung, u16 command,
u8 command, struct sabi_retval *sretval) struct sabi_data *in,
struct sabi_data *out)
{ {
const struct sabi_config *config = samsung->config; const struct sabi_config *config = samsung->config;
int retval = 0; int ret = 0;
u16 port = readw(samsung->sabi + config->header_offsets.port); u16 port = readw(samsung->sabi + config->header_offsets.port);
u8 complete, iface_data; u8 complete, iface_data;
mutex_lock(&samsung->sabi_mutex); mutex_lock(&samsung->sabi_mutex);
if (debug) {
if (in)
pr_info("SABI 0x%04x {0x%08x, 0x%08x, 0x%04x, 0x%02x}",
command, in->d0, in->d1, in->d2, in->d3);
else
pr_info("SABI 0x%04x", command);
}
/* enable memory to be able to write to it */ /* enable memory to be able to write to it */
outb(readb(samsung->sabi + config->header_offsets.en_mem), port); outb(readb(samsung->sabi + config->header_offsets.en_mem), port);
...@@ -263,6 +280,12 @@ static int sabi_get_command(struct samsung_laptop *samsung, ...@@ -263,6 +280,12 @@ static int sabi_get_command(struct samsung_laptop *samsung,
writew(config->main_function, samsung->sabi_iface + SABI_IFACE_MAIN); writew(config->main_function, samsung->sabi_iface + SABI_IFACE_MAIN);
writew(command, samsung->sabi_iface + SABI_IFACE_SUB); writew(command, samsung->sabi_iface + SABI_IFACE_SUB);
writeb(0, samsung->sabi_iface + SABI_IFACE_COMPLETE); writeb(0, samsung->sabi_iface + SABI_IFACE_COMPLETE);
if (in) {
writel(in->d0, samsung->sabi_iface + SABI_IFACE_DATA);
writel(in->d1, samsung->sabi_iface + SABI_IFACE_DATA + 4);
writew(in->d2, samsung->sabi_iface + SABI_IFACE_DATA + 8);
writeb(in->d3, samsung->sabi_iface + SABI_IFACE_DATA + 10);
}
outb(readb(samsung->sabi + config->header_offsets.iface_func), port); outb(readb(samsung->sabi + config->header_offsets.iface_func), port);
/* write protect memory to make it safe */ /* write protect memory to make it safe */
...@@ -272,127 +295,105 @@ static int sabi_get_command(struct samsung_laptop *samsung, ...@@ -272,127 +295,105 @@ static int sabi_get_command(struct samsung_laptop *samsung,
complete = readb(samsung->sabi_iface + SABI_IFACE_COMPLETE); complete = readb(samsung->sabi_iface + SABI_IFACE_COMPLETE);
iface_data = readb(samsung->sabi_iface + SABI_IFACE_DATA); iface_data = readb(samsung->sabi_iface + SABI_IFACE_DATA);
if (complete != 0xaa || iface_data == 0xff) { if (complete != 0xaa || iface_data == 0xff) {
pr_warn("SABI get command 0x%02x failed with completion flag 0x%02x and data 0x%02x\n", pr_warn("SABI command 0x%04x failed with"
" completion flag 0x%02x and interface data 0x%02x",
command, complete, iface_data); command, complete, iface_data);
retval = -EINVAL; ret = -EINVAL;
goto exit; goto exit;
} }
/*
* Save off the data into a structure so the caller use it. if (out) {
* Right now we only want the first 4 bytes, out->d0 = readl(samsung->sabi_iface + SABI_IFACE_DATA);
* There are commands that need more, but not for the ones we out->d1 = readl(samsung->sabi_iface + SABI_IFACE_DATA + 4);
* currently care about. out->d2 = readw(samsung->sabi_iface + SABI_IFACE_DATA + 2);
*/ out->d3 = readb(samsung->sabi_iface + SABI_IFACE_DATA + 1);
sretval->retval[0] = readb(samsung->sabi_iface + SABI_IFACE_DATA); }
sretval->retval[1] = readb(samsung->sabi_iface + SABI_IFACE_DATA + 1);
sretval->retval[2] = readb(samsung->sabi_iface + SABI_IFACE_DATA + 2); if (debug && out) {
sretval->retval[3] = readb(samsung->sabi_iface + SABI_IFACE_DATA + 3); pr_info("SABI {0x%08x, 0x%08x, 0x%04x, 0x%02x}",
out->d0, out->d1, out->d2, out->d3);
}
exit: exit:
mutex_unlock(&samsung->sabi_mutex); mutex_unlock(&samsung->sabi_mutex);
return retval; return ret;
} }
static int sabi_set_command(struct samsung_laptop *samsung, /* simple wrappers usable with most commands */
u8 command, u8 data) static int sabi_set_commandb(struct samsung_laptop *samsung,
u16 command, u8 data)
{ {
const struct sabi_config *config = samsung->config; struct sabi_data in = { .d0 = 0, .d1 = 0, .d2 = 0, .d3 = 0 };
int retval = 0;
u16 port = readw(samsung->sabi + config->header_offsets.port);
u8 complete, iface_data;
mutex_lock(&samsung->sabi_mutex);
/* enable memory to be able to write to it */
outb(readb(samsung->sabi + config->header_offsets.en_mem), port);
/* write out the command */ in.data[0] = data;
writew(config->main_function, samsung->sabi_iface + SABI_IFACE_MAIN); return sabi_command(samsung, command, &in, NULL);
writew(command, samsung->sabi_iface + SABI_IFACE_SUB);
writeb(0, samsung->sabi_iface + SABI_IFACE_COMPLETE);
writeb(data, samsung->sabi_iface + SABI_IFACE_DATA);
outb(readb(samsung->sabi + config->header_offsets.iface_func), port);
/* write protect memory to make it safe */
outb(readb(samsung->sabi + config->header_offsets.re_mem), port);
/* see if the command actually succeeded */
complete = readb(samsung->sabi_iface + SABI_IFACE_COMPLETE);
iface_data = readb(samsung->sabi_iface + SABI_IFACE_DATA);
if (complete != 0xaa || iface_data == 0xff) {
pr_warn("SABI set command 0x%02x failed with completion flag 0x%02x and data 0x%02x\n",
command, complete, iface_data);
retval = -EINVAL;
}
mutex_unlock(&samsung->sabi_mutex);
return retval;
} }
static void test_backlight(struct samsung_laptop *samsung) static void test_backlight(struct samsung_laptop *samsung)
{ {
const struct sabi_commands *commands = &samsung->config->commands; const struct sabi_commands *commands = &samsung->config->commands;
struct sabi_retval sretval; struct sabi_data sretval;
sabi_get_command(samsung, commands->get_backlight, &sretval); sabi_command(samsung, commands->get_backlight, NULL, &sretval);
printk(KERN_DEBUG "backlight = 0x%02x\n", sretval.retval[0]); printk(KERN_DEBUG "backlight = 0x%02x\n", sretval.data[0]);
sabi_set_command(samsung, commands->set_backlight, 0); sabi_set_commandb(samsung, commands->set_backlight, 0);
printk(KERN_DEBUG "backlight should be off\n"); printk(KERN_DEBUG "backlight should be off\n");
sabi_get_command(samsung, commands->get_backlight, &sretval); sabi_command(samsung, commands->get_backlight, NULL, &sretval);
printk(KERN_DEBUG "backlight = 0x%02x\n", sretval.retval[0]); printk(KERN_DEBUG "backlight = 0x%02x\n", sretval.data[0]);
msleep(1000); msleep(1000);
sabi_set_command(samsung, commands->set_backlight, 1); sabi_set_commandb(samsung, commands->set_backlight, 1);
printk(KERN_DEBUG "backlight should be on\n"); printk(KERN_DEBUG "backlight should be on\n");
sabi_get_command(samsung, commands->get_backlight, &sretval); sabi_command(samsung, commands->get_backlight, NULL, &sretval);
printk(KERN_DEBUG "backlight = 0x%02x\n", sretval.retval[0]); printk(KERN_DEBUG "backlight = 0x%02x\n", sretval.data[0]);
} }
static void test_wireless(struct samsung_laptop *samsung) static void test_wireless(struct samsung_laptop *samsung)
{ {
const struct sabi_commands *commands = &samsung->config->commands; const struct sabi_commands *commands = &samsung->config->commands;
struct sabi_retval sretval; struct sabi_data sretval;
sabi_get_command(samsung, commands->get_wireless_button, &sretval); sabi_command(samsung, commands->get_wireless_button, NULL, &sretval);
printk(KERN_DEBUG "wireless led = 0x%02x\n", sretval.retval[0]); printk(KERN_DEBUG "wireless led = 0x%02x\n", sretval.data[0]);
sabi_set_command(samsung, commands->set_wireless_button, 0); sabi_set_commandb(samsung, commands->set_wireless_button, 0);
printk(KERN_DEBUG "wireless led should be off\n"); printk(KERN_DEBUG "wireless led should be off\n");
sabi_get_command(samsung, commands->get_wireless_button, &sretval); sabi_command(samsung, commands->get_wireless_button, NULL, &sretval);
printk(KERN_DEBUG "wireless led = 0x%02x\n", sretval.retval[0]); printk(KERN_DEBUG "wireless led = 0x%02x\n", sretval.data[0]);
msleep(1000); msleep(1000);
sabi_set_command(samsung, commands->set_wireless_button, 1); sabi_set_commandb(samsung, commands->set_wireless_button, 1);
printk(KERN_DEBUG "wireless led should be on\n"); printk(KERN_DEBUG "wireless led should be on\n");
sabi_get_command(samsung, commands->get_wireless_button, &sretval); sabi_command(samsung, commands->get_wireless_button, NULL, &sretval);
printk(KERN_DEBUG "wireless led = 0x%02x\n", sretval.retval[0]); printk(KERN_DEBUG "wireless led = 0x%02x\n", sretval.data[0]);
} }
static int read_brightness(struct samsung_laptop *samsung) static int read_brightness(struct samsung_laptop *samsung)
{ {
const struct sabi_config *config = samsung->config; const struct sabi_config *config = samsung->config;
const struct sabi_commands *commands = &samsung->config->commands; const struct sabi_commands *commands = &samsung->config->commands;
struct sabi_retval sretval; struct sabi_data sretval;
int user_brightness = 0; int user_brightness = 0;
int retval; int retval;
retval = sabi_get_command(samsung, commands->get_brightness, retval = sabi_command(samsung, commands->get_brightness,
&sretval); NULL, &sretval);
if (!retval) { if (retval)
user_brightness = sretval.retval[0]; return retval;
user_brightness = sretval.data[0];
if (user_brightness > config->min_brightness) if (user_brightness > config->min_brightness)
user_brightness -= config->min_brightness; user_brightness -= config->min_brightness;
else else
user_brightness = 0; user_brightness = 0;
}
return user_brightness; return user_brightness;
} }
...@@ -410,10 +411,10 @@ static void set_brightness(struct samsung_laptop *samsung, u8 user_brightness) ...@@ -410,10 +411,10 @@ static void set_brightness(struct samsung_laptop *samsung, u8 user_brightness)
if (user_brightness == read_brightness(samsung)) if (user_brightness == read_brightness(samsung))
return; return;
sabi_set_command(samsung, commands->set_brightness, 0); sabi_set_commandb(samsung, commands->set_brightness, 0);
} }
sabi_set_command(samsung, commands->set_brightness, user_level); sabi_set_commandb(samsung, commands->set_brightness, user_level);
} }
static int get_brightness(struct backlight_device *bd) static int get_brightness(struct backlight_device *bd)
...@@ -465,9 +466,9 @@ static int update_status(struct backlight_device *bd) ...@@ -465,9 +466,9 @@ static int update_status(struct backlight_device *bd)
set_brightness(samsung, bd->props.brightness); set_brightness(samsung, bd->props.brightness);
if (bd->props.power == FB_BLANK_UNBLANK) if (bd->props.power == FB_BLANK_UNBLANK)
sabi_set_command(samsung, commands->set_backlight, 1); sabi_set_commandb(samsung, commands->set_backlight, 1);
else else
sabi_set_command(samsung, commands->set_backlight, 0); sabi_set_commandb(samsung, commands->set_backlight, 0);
return 0; return 0;
} }
...@@ -488,9 +489,9 @@ static int rfkill_set(void *data, bool blocked) ...@@ -488,9 +489,9 @@ static int rfkill_set(void *data, bool blocked)
* blocked == true is off * blocked == true is off
*/ */
if (blocked) if (blocked)
sabi_set_command(samsung, commands->set_wireless_button, 0); sabi_set_commandb(samsung, commands->set_wireless_button, 0);
else else
sabi_set_command(samsung, commands->set_wireless_button, 1); sabi_set_commandb(samsung, commands->set_wireless_button, 1);
return 0; return 0;
} }
...@@ -505,19 +506,19 @@ static ssize_t get_performance_level(struct device *dev, ...@@ -505,19 +506,19 @@ static ssize_t get_performance_level(struct device *dev,
struct samsung_laptop *samsung = dev_get_drvdata(dev); struct samsung_laptop *samsung = dev_get_drvdata(dev);
const struct sabi_config *config = samsung->config; const struct sabi_config *config = samsung->config;
const struct sabi_commands *commands = &config->commands; const struct sabi_commands *commands = &config->commands;
struct sabi_retval sretval; struct sabi_data sretval;
int retval; int retval;
int i; int i;
/* Read the state */ /* Read the state */
retval = sabi_get_command(samsung, commands->get_performance_level, retval = sabi_command(samsung, commands->get_performance_level,
&sretval); NULL, &sretval);
if (retval) if (retval)
return retval; return retval;
/* The logic is backwards, yeah, lots of fun... */ /* The logic is backwards, yeah, lots of fun... */
for (i = 0; config->performance_levels[i].name; ++i) { for (i = 0; config->performance_levels[i].name; ++i) {
if (sretval.retval[0] == config->performance_levels[i].value) if (sretval.data[0] == config->performance_levels[i].value)
return sprintf(buf, "%s\n", config->performance_levels[i].name); return sprintf(buf, "%s\n", config->performance_levels[i].name);
} }
return sprintf(buf, "%s\n", "unknown"); return sprintf(buf, "%s\n", "unknown");
...@@ -539,7 +540,7 @@ static ssize_t set_performance_level(struct device *dev, ...@@ -539,7 +540,7 @@ static ssize_t set_performance_level(struct device *dev,
const struct sabi_performance_level *level = const struct sabi_performance_level *level =
&config->performance_levels[i]; &config->performance_levels[i];
if (!strncasecmp(level->name, buf, strlen(level->name))) { if (!strncasecmp(level->name, buf, strlen(level->name))) {
sabi_set_command(samsung, sabi_set_commandb(samsung,
commands->set_performance_level, commands->set_performance_level,
level->value); level->value);
break; break;
...@@ -685,7 +686,7 @@ static void samsung_sabi_exit(struct samsung_laptop *samsung) ...@@ -685,7 +686,7 @@ static void samsung_sabi_exit(struct samsung_laptop *samsung)
/* Turn off "Linux" mode in the BIOS */ /* Turn off "Linux" mode in the BIOS */
if (config && config->commands.set_linux != 0xff) if (config && config->commands.set_linux != 0xff)
sabi_set_command(samsung, config->commands.set_linux, 0x80); sabi_set_commandb(samsung, config->commands.set_linux, 0x80);
if (samsung->sabi_iface) { if (samsung->sabi_iface) {
iounmap(samsung->sabi_iface); iounmap(samsung->sabi_iface);
...@@ -724,7 +725,7 @@ static void __init samsung_sabi_selftest(struct samsung_laptop *samsung, ...@@ -724,7 +725,7 @@ static void __init samsung_sabi_selftest(struct samsung_laptop *samsung,
unsigned int ifaceP) unsigned int ifaceP)
{ {
const struct sabi_config *config = samsung->config; const struct sabi_config *config = samsung->config;
struct sabi_retval sretval; struct sabi_data sretval;
printk(KERN_DEBUG "ifaceP = 0x%08x\n", ifaceP); printk(KERN_DEBUG "ifaceP = 0x%08x\n", ifaceP);
printk(KERN_DEBUG "sabi_iface = %p\n", samsung->sabi_iface); printk(KERN_DEBUG "sabi_iface = %p\n", samsung->sabi_iface);
...@@ -733,8 +734,8 @@ static void __init samsung_sabi_selftest(struct samsung_laptop *samsung, ...@@ -733,8 +734,8 @@ static void __init samsung_sabi_selftest(struct samsung_laptop *samsung,
test_backlight(samsung); test_backlight(samsung);
test_wireless(samsung); test_wireless(samsung);
sabi_get_command(samsung, config->commands.get_brightness, &sretval); sabi_command(samsung, config->commands.get_brightness, NULL, &sretval);
printk(KERN_DEBUG "brightness = 0x%02x\n", sretval.retval[0]); printk(KERN_DEBUG "brightness = 0x%02x\n", sretval.data[0]);
} }
static int __init samsung_sabi_init(struct samsung_laptop *samsung) static int __init samsung_sabi_init(struct samsung_laptop *samsung)
...@@ -793,7 +794,7 @@ static int __init samsung_sabi_init(struct samsung_laptop *samsung) ...@@ -793,7 +794,7 @@ static int __init samsung_sabi_init(struct samsung_laptop *samsung)
/* Turn on "Linux" mode in the BIOS */ /* Turn on "Linux" mode in the BIOS */
if (commands->set_linux != 0xff) { if (commands->set_linux != 0xff) {
int retval = sabi_set_command(samsung, int retval = sabi_set_commandb(samsung,
commands->set_linux, 0x81); commands->set_linux, 0x81);
if (retval) { if (retval) {
pr_warn("Linux mode was not set!\n"); pr_warn("Linux mode was not set!\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7