X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fparisc%2Fpdc_stable.c;fp=drivers%2Fparisc%2Fpdc_stable.c;h=a28e17898fbd2d2ee78480e67270312316b7e81c;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=ea1b7a63598e1c4fc87ee001a66293cb2fe92b37;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git diff --git a/drivers/parisc/pdc_stable.c b/drivers/parisc/pdc_stable.c index ea1b7a635..a28e17898 100644 --- a/drivers/parisc/pdc_stable.c +++ b/drivers/parisc/pdc_stable.c @@ -4,8 +4,9 @@ * Copyright (C) 2005-2006 Thibaut VARENE * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -28,15 +29,8 @@ * following code can deal with just 96 bytes of Stable Storage, and all * sizes between 96 and 192 bytes (provided they are multiple of struct * device_path size, eg: 128, 160 and 192) to provide full information. - * One last word: there's one path we can always count on: the primary path. - * Anything above 224 bytes is used for 'osdep2' OS-dependent storage area. - * - * The first OS-dependent area should always be available. Obviously, this is - * not true for the other one. Also bear in mind that reading/writing from/to - * osdep2 is much more expensive than from/to osdep1. - * NOTE: We do not handle the 2 bytes OS-dep area at 0x5D, nor the first - * 2 bytes of storage available right after OSID. That's a total of 4 bytes - * sacrificed: -ETOOLAZY :P + * The code makes no use of data above 192 bytes. One last word: there's one + * path we can always count on: the primary path. * * The current policy wrt file permissions is: * - write: root only @@ -71,18 +65,15 @@ #include #include -#define PDCS_VERSION "0.30" +#define PDCS_VERSION "0.22" #define PDCS_PREFIX "PDC Stable Storage" #define PDCS_ADDR_PPRI 0x00 #define PDCS_ADDR_OSID 0x40 -#define PDCS_ADDR_OSD1 0x48 -#define PDCS_ADDR_DIAG 0x58 #define PDCS_ADDR_FSIZ 0x5C #define PDCS_ADDR_PCON 0x60 #define PDCS_ADDR_PALT 0x80 #define PDCS_ADDR_PKBD 0xA0 -#define PDCS_ADDR_OSD2 0xE0 MODULE_AUTHOR("Thibaut VARENE "); MODULE_DESCRIPTION("sysfs interface to HP PDC Stable Storage data"); @@ -92,9 +83,6 @@ MODULE_VERSION(PDCS_VERSION); /* holds Stable Storage size. Initialized once and for all, no lock needed */ static unsigned long pdcs_size __read_mostly; -/* holds OS ID. Initialized once and for all, hopefully to 0x0006 */ -static u16 pdcs_osid __read_mostly; - /* This struct defines what we need to deal with a parisc pdc path entry */ struct pdcspath_entry { rwlock_t rw_lock; /* to protect path entry access */ @@ -548,7 +536,7 @@ pdcs_auto_read(struct subsystem *entry, char *buf, int knob) { char *out = buf; struct pdcspath_entry *pathentry; - + if (!entry || !buf) return -EINVAL; @@ -622,64 +610,27 @@ static ssize_t pdcs_osid_read(struct subsystem *entry, char *buf) { char *out = buf; + __u32 result; + char *tmpstr = NULL; if (!entry || !buf) return -EINVAL; - out += sprintf(out, "%s dependent data (0x%.4x)\n", - os_id_to_string(pdcs_osid), pdcs_osid); - - return out - buf; -} - -/** - * pdcs_osdep1_read - Stable Storage OS-Dependent data area 1 output. - * @entry: An allocated and populated subsytem struct. We don't use it tho. - * @buf: The output buffer to write to. - * - * This can hold 16 bytes of OS-Dependent data. - */ -static ssize_t -pdcs_osdep1_read(struct subsystem *entry, char *buf) -{ - char *out = buf; - u32 result[4]; - - if (!entry || !buf) - return -EINVAL; - - if (pdc_stable_read(PDCS_ADDR_OSD1, &result, sizeof(result)) != PDC_OK) - return -EIO; - - out += sprintf(out, "0x%.8x\n", result[0]); - out += sprintf(out, "0x%.8x\n", result[1]); - out += sprintf(out, "0x%.8x\n", result[2]); - out += sprintf(out, "0x%.8x\n", result[3]); - - return out - buf; -} - -/** - * pdcs_diagnostic_read - Stable Storage Diagnostic register output. - * @entry: An allocated and populated subsytem struct. We don't use it tho. - * @buf: The output buffer to write to. - * - * I have NFC how to interpret the content of that register ;-). - */ -static ssize_t -pdcs_diagnostic_read(struct subsystem *entry, char *buf) -{ - char *out = buf; - u32 result; - - if (!entry || !buf) - return -EINVAL; - - /* get diagnostic */ - if (pdc_stable_read(PDCS_ADDR_DIAG, &result, sizeof(result)) != PDC_OK) + /* get OSID */ + if (pdc_stable_read(PDCS_ADDR_OSID, &result, sizeof(result)) != PDC_OK) return -EIO; - out += sprintf(out, "0x%.4x\n", (result >> 16)); + /* the actual result is 16 bits away */ + switch (result >> 16) { + case 0x0000: tmpstr = "No OS-dependent data"; break; + case 0x0001: tmpstr = "HP-UX dependent data"; break; + case 0x0002: tmpstr = "MPE-iX dependent data"; break; + case 0x0003: tmpstr = "OSF dependent data"; break; + case 0x0004: tmpstr = "HP-RT dependent data"; break; + case 0x0005: tmpstr = "Novell Netware dependent data"; break; + default: tmpstr = "Unknown"; break; + } + out += sprintf(out, "%s (0x%.4x)\n", tmpstr, (result >> 16)); return out - buf; } @@ -695,7 +646,7 @@ static ssize_t pdcs_fastsize_read(struct subsystem *entry, char *buf) { char *out = buf; - u32 result; + __u32 result; if (!entry || !buf) return -EINVAL; @@ -713,39 +664,6 @@ pdcs_fastsize_read(struct subsystem *entry, char *buf) return out - buf; } -/** - * pdcs_osdep2_read - Stable Storage OS-Dependent data area 2 output. - * @entry: An allocated and populated subsytem struct. We don't use it tho. - * @buf: The output buffer to write to. - * - * This can hold pdcs_size - 224 bytes of OS-Dependent data, when available. - */ -static ssize_t -pdcs_osdep2_read(struct subsystem *entry, char *buf) -{ - char *out = buf; - unsigned long size; - unsigned short i; - u32 result; - - if (unlikely(pdcs_size <= 224)) - return -ENODATA; - - size = pdcs_size - 224; - - if (!entry || !buf) - return -EINVAL; - - for (i=0; i 16) - return -EMSGSIZE; - - /* We'll use a local copy of buf */ - memset(in, 0, 16); - memcpy(in, buf, count); - - if (pdc_stable_write(PDCS_ADDR_OSD1, &in, sizeof(in)) != PDC_OK) - return -EIO; - - return count; -} - -/** - * pdcs_osdep2_write - Stable Storage OS-Dependent data area 2 input. - * @entry: An allocated and populated subsytem struct. We don't use it tho. - * @buf: The input buffer to read from. - * @count: The number of bytes to be read. - * - * This can store pdcs_size - 224 bytes of OS-Dependent data. We use a - * byte-by-byte write approach. It's up to userspace to deal with it when - * constructing its input buffer. - */ -static ssize_t -pdcs_osdep2_write(struct subsystem *entry, const char *buf, size_t count) -{ - unsigned long size; - unsigned short i; - u8 in[4]; - - if (!capable(CAP_SYS_ADMIN)) - return -EACCES; - - if (!entry || !buf || !count) - return -EINVAL; - - if (unlikely(pdcs_size <= 224)) - return -ENOSYS; - - if (unlikely(pdcs_osid != OS_ID_LINUX)) - return -EPERM; - - size = pdcs_size - 224; - - if (count > size) - return -EMSGSIZE; - - /* We'll use a local copy of buf */ - - for (i=0; i> 16); - /* For now we'll register the stable subsys within this driver */ if ((rc = firmware_register(&stable_subsys))) goto fail_firmreg; @@ -1068,7 +888,7 @@ pdc_stable_init(void) /* register the paths subsys as a subsystem of stable subsys */ kset_set_kset_s(&paths_subsys, stable_subsys); - if ((rc = subsystem_register(&paths_subsys))) + if ((rc= subsystem_register(&paths_subsys))) goto fail_subsysreg; /* now we create all "files" for the paths subsys */