Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 296971
b: refs/heads/master
c: 6f6ae06
h: refs/heads/master
i:
  296969: 1815c04
  296967: c1a6628
v: v3
  • Loading branch information
Corentin Chary authored and Matthew Garrett committed Mar 20, 2012
1 parent 246b704 commit 1431df5
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3be324a94df0c3f032178d04549dbfbf6cccb09a
refs/heads/master: 6f6ae06eb30d4710cd86a1782326702afa18a8f6
42 changes: 42 additions & 0 deletions trunk/drivers/platform/x86/samsung-laptop.c
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,7 @@ struct samsung_laptop_debug {

struct debugfs_blob_wrapper f0000_wrapper;
struct debugfs_blob_wrapper data_wrapper;
struct debugfs_blob_wrapper sdiag_wrapper;
};

struct samsung_laptop;
Expand Down Expand Up @@ -337,6 +338,8 @@ struct samsung_laptop {

bool handle_backlight;
bool has_stepping_quirk;

char sdiag[64];
};


Expand Down Expand Up @@ -1164,6 +1167,9 @@ static int samsung_debugfs_init(struct samsung_laptop *samsung)
samsung->debug.data_wrapper.data = &samsung->debug.data;
samsung->debug.data_wrapper.size = sizeof(samsung->debug.data);

samsung->debug.sdiag_wrapper.data = samsung->sdiag;
samsung->debug.sdiag_wrapper.size = strlen(samsung->sdiag);

dent = debugfs_create_u16("command", S_IRUGO | S_IWUSR,
samsung->debug.root, &samsung->debug.command);
if (!dent)
Expand Down Expand Up @@ -1207,6 +1213,12 @@ static int samsung_debugfs_init(struct samsung_laptop *samsung)
if (!dent)
goto error_debugfs;

dent = debugfs_create_blob("sdiag", S_IRUGO | S_IWUSR,
samsung->debug.root,
&samsung->debug.sdiag_wrapper);
if (!dent)
goto error_debugfs;

return 0;

error_debugfs:
Expand Down Expand Up @@ -1259,6 +1271,34 @@ static __init void samsung_sabi_infos(struct samsung_laptop *samsung, int loca,
printk(KERN_DEBUG " SABI pointer = 0x%08x\n", ifaceP);
}

static void __init samsung_sabi_diag(struct samsung_laptop *samsung)
{
int loca = find_signature(samsung->f0000_segment, "SDiaG@");
int i;

if (loca == 0xffff)
return ;

/* Example:
* Ident: @SDiaG@686XX-N90X3A/966-SEC-07HL-S90X3A
*
* Product name: 90X3A
* BIOS Version: 07HL
*/
loca += 1;
for (i = 0; loca < 0xffff && i < sizeof(samsung->sdiag) - 1; loca++) {
char temp = readb(samsung->f0000_segment + loca);

if (isalnum(temp) || temp == '/' || temp == '-')
samsung->sdiag[i++] = temp;
else
break ;
}

if (debug && samsung->sdiag[0])
pr_info("sdiag: %s", samsung->sdiag);
}

static int __init samsung_sabi_init(struct samsung_laptop *samsung)
{
const struct sabi_config *config = NULL;
Expand All @@ -1276,6 +1316,8 @@ static int __init samsung_sabi_init(struct samsung_laptop *samsung)
goto exit;
}

samsung_sabi_diag(samsung);

/* Try to find one of the signatures in memory to find the header */
for (i = 0; sabi_configs[i].test_string != 0; ++i) {
samsung->config = &sabi_configs[i];
Expand Down

0 comments on commit 1431df5

Please sign in to comment.