Skip to contentSkip to conversation

Add lspnp support for sysfs

RFC In review Bjorn Helgaas 7 participants 11 messages Jan 13, 2006 – Feb 1, 2006 2 messages not in the archive ACPI

lore
Share & tools
lore
#0 lore raw

RFC 1/1 Add lspnp support for sysfs

Add lspnp support for sysfs. This makes it work with generic PNP (including PNPACPI, PNPBIOS, ISAPNP) instead of just with PNPBIOS. I'm particularly interested in ia64, which never has PNPBIOS, but may have PNPACPI.

Note that PNPBIOS exposes raw resources in /proc/bus/pnp/<device>, while for generic PNP, the kernel exposes already-decoded resources in /sys/bus/pnp/devices/<device>/{resources,options}, so the output looks a little different.

For example, old output (based on /proc/bus/pnp):

    00 PNP0c02 Motherboard resources
	flags: [no disable] [no config] [static]
	allocated resources:
	    io 0x0080-0x0080 [16-bit decode]
	    io 0xffbf-0xffbf [16-bit decode]
	    mem 0xfff80000-0xffffffff [8 bit] [r/o]

new output (from /sys/bus/pnp/devices/):

    00:00 PNP0c02 Motherboard resources
	state = active
	allocated resources:
	    io 0x80-0x80
	    io 0xffbf-0xffbf
	    mem 0xfff80000-0xffffffff

Feedback welcome.

debug-tools/lspnp.c +163 -17
diff -u -ur pcmcia-cs-3.2.9.orig/debug-tools/lspnp.c pcmcia-cs-3.2.9/debug-tools/lspnp.c
@@ -38,6 +38,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <dirent.h>
 #include <fcntl.h>
 #include <string.h>
 #include <endian.h>
@@ -501,13 +502,13 @@
     return (u_char *)p;
 }
 
-static void dump_resources(int num)
+static void dump_resources(char *name)
 {
     char fn[40];
     u_char buf[4096], *p;
     int fd, nr;
     
-    sprintf(fn, "/proc/bus/pnp/%s%02x", (boot ? "boot/" : ""), num);
+    sprintf(fn, "/proc/bus/pnp/%s%s", (boot ? "boot/" : ""), name);
     fd = open(fn, O_RDONLY);
     nr = read(fd, buf, sizeof(buf));
     close(fd);
@@ -528,24 +529,173 @@
     }
 }
 
-static int dump_basic(int match)
+static int match_device(char *name, char *match)
 {
-    int id, num, t1, t2, t3, flags;
+    char *dev;
+
+    if (name[0] == '.')
+	return 0;
+
+    /* no filter or exact match */
+    if (!match || !strcmp(name, match))
+	return 1;
+
+    /* let "01" match "xx:01" or "01" */
+    dev = strrchr(name, ':');
+    if (dev)
+	dev++;
+    else
+	dev = name;
+    if (!strcmp(dev, match))
+	return 1;
+
+    /* let "1" match "xx:01" or "01" */
+    while (*dev == '0')
+	dev++;
+    if (*dev == '\0')	/* saw "00", back up to "0" */
+	dev--;
+    if (!strcmp(dev, match))
+	return 1;
+
+    return 0;
+}
+
+#define SYSFS_PATH "/sys/bus/pnp/devices"
+
+static void sysfs_dump_resources(char *name)
+{
+    FILE *file;
+    char buf[256], *nl;
+    int first;
+    struct eisa_id *eid;
+
+    sprintf(buf, "%s/%s/resources", SYSFS_PATH, name);
+    file = fopen(buf, "r");
+    if (!file)
+	return;
+    first = 1;
+    fgets(buf, sizeof(buf), file);
+    printf("    %s", buf);	/* "state =" */
+    while (fgets(buf, sizeof(buf), file)) {
+	if (first && verbose > 1) {
+	    printf("    allocated resources:\n");
+	    first = 0;
+	}
+	printf("\t%s", buf);
+    }
+    fclose(file);
+
+    if (verbose < 2)
+	return;
+
+    sprintf(buf, "%s/%s/options", SYSFS_PATH, name);
+    file = fopen(buf, "r");
+    if (!file)
+	return;
+    first = 1;
+    while (fgets(buf, sizeof(buf), file)) {
+	if (first) {
+	    printf("    possible resources:\n");
+	    first = 0;
+	}
+	printf("\t%s", buf);
+    }
+    fclose(file);
+
+    sprintf(buf, "%s/%s/id", SYSFS_PATH, name);
+    file = fopen(buf, "r");
+    if (!file)
+	return;
+    first = 1;
+    fgets(buf, sizeof(buf), file);	/* skip first one */
+    while (fgets(buf, sizeof(buf), file)) {
+	if (first) {
+	    printf("    compatible devices:\n");
+	    first = 0;
+	}
+	nl = strchr(buf, '\n');
+	if (nl)
+	    *nl = '\0';
+	for (eid = eisa_id; eid; eid = eid->next)
+	    if (strcmp(buf, eid->id) == 0) break;
+	printf("\t%s %s\n", buf, eid ? eid->name : "(unknown)");
+    }
+    fclose(file);
+}
+
+static char *sysfs_get_string(char *name, char *object)
+{
+    int fd, len;
+    char *buf, *nl;
+
+    buf = malloc(256);
+    if (!buf)
+	return 0;
+    sprintf(buf, "%s/%s/%s", SYSFS_PATH, name, object);
+    fd = open(buf, O_RDONLY);
+    if (fd < 0)
+	return 0;
+    len = read(fd, buf, 256);
+    close(fd);
+    nl = strchr(buf, '\n');
+    if (nl)
+	*nl = '\0';
+    return buf;
+}
+
+static int sysfs_dump_basic(char *match)
+{
+    struct dirent **namelist;
+    char *name, *eis;
+    struct eisa_id *eid;
+    int i, n;
+
+    n = scandir(SYSFS_PATH, &namelist, 0, alphasort);
+    if (n < 0)
+	return -1;
+
+    for (i = 0; i < n; i++) {
+	name = namelist[i]->d_name;
+	if (match_device(name, match)) {
+	    eis = sysfs_get_string(name, "id");
+	    for (eid = eisa_id; eid; eid = eid->next)
+		if (strcmp(eis, eid->id) == 0) break;
+	    printf("%s %s %s\n", name, eis, eid ? eid->name : "(unknown)");
+	    if (verbose) {
+		sysfs_dump_resources(name);
+		if (!match) printf("\n");
+	    }
+	    free(eis);
+	}
+
+	free(namelist[i]);
+    }
+    free(namelist);
+    return 0;
+}
+
+static int dump_basic(char *match)
+{
+    int id, t1, t2, t3, flags;
     struct eisa_id *eid;
-    char *eis, buf[64];
+    char name[4], *eis, buf[64];
     FILE *f;
 
+    if (sysfs_dump_basic(match) == 0)
+	return 0;
+
     f = fopen("/proc/bus/pnp/devices", "r");
     if (f == NULL) {
-	fprintf(stderr, "lspnp: /proc/bus/pnp not available\n");
+	fprintf(stderr, "lspnp: neither %s nor /proc/bus/pnp is available\n",
+		SYSFS_PATH);
 	return -1;
     }
     while (fgets(buf, 63, f) != NULL) {
-	sscanf(buf, "%x %x %x:%x:%x %x", &num, &id, &t1, &t2, &t3, &flags);
-	if ((match >= 0) && (match != num))
+	sscanf(buf, "%2s %x %x:%x:%x %x", name, &id, &t1, &t2, &t3, &flags);
+	if (!match_device(name, match))
 	    continue;
 	eis = eisa_str(id);
-	printf("%02x %7s ", num, eis);
+	printf("%s %7s ", name, eis);
 	for (eid = eisa_id; eid; eid = eid->next)
 	    if (strcmp(eis, eid->id) == 0) break;
 	if (eid)
@@ -556,8 +706,8 @@
 	if (verbose > 1)
 	    dump_flags(flags);
 	if (verbose) {
-	    dump_resources(num);
-	    if (match < 0) printf("\n");
+	    dump_resources(name);
+	    if (!match) printf("\n");
 	}
     }
     fclose(f);
@@ -575,7 +725,6 @@
 int main(int argc, char *argv[])
 {
     int optch, errflg = 0;
-    char *s;
     
     while ((optch = getopt(argc, argv, "bv")) != -1) {
 	switch (optch) {
@@ -592,14 +741,11 @@
     load_ids();
     if (optind < argc) {
 	while (optind < argc) {
-	    int i = strtoul(argv[optind], &s, 16);
-	    if ((argv[optind] == '\0') || (*s != '\0'))
-		usage(argv[0]);
-	    if (dump_basic(i) != 0)
+	    if (dump_basic(argv[optind]) != 0)
 		return EXIT_FAILURE;
 	    optind++;
 	}
 	return EXIT_SUCCESS;
     }
-    return dump_basic(-1);
+    return dump_basic(NULL);
 }
man/lspnp.8 +12 -4
diff -u -ur pcmcia-cs-3.2.9.orig/man/lspnp.8 pcmcia-cs-3.2.9/man/lspnp.8
@@ -11,9 +11,11 @@
 .RI [ "device ..." ]
 .SH DESCRIPTION
 This utility presents a formatted interpretation of the contents of the
+.I /sys/bus/pnp/devices
+or
 .I /proc/bus/pnp
 tree.  Its default output is a list of Plug and Play device node
-numbers, product identifiers, and descriptions.  Verbose output
+names, product identifiers, and descriptions.  Verbose output
 .RB ( -v )
 includes resource allocations (IO ports, memory, interrupts, and DMA 
 channels) for each device.  Very verbose output
@@ -22,7 +24,7 @@
 product identifiers for compatible devices.
 .PP
 The output can be limited to one or more specific device nodes by
-specifying their two-digit hex node numbers on the command line.  By
+specifying their node names on the command line.  By
 default, current (dynamic) device configuration information is
 displayed; with the
 .B -b
@@ -31,7 +33,10 @@
 .TP
 .B \-b
 Boot mode: read device resource information that will be used at next
-boot (as opposed to current resource info).
+boot (as opposed to current resource info).  This is supported only on
+kernels that provide the old
+.I /proc/bus/pnp
+interface.
 .TP
 .B \-v
 Selects more verbose output.  Can be used more than once.
@@ -40,8 +45,11 @@
 /usr/share/pnp.ids
 A database of known Plug and Play device ID's.
 .TP
-/proc/bus/pnp/...
+/sys/bus/pnp/devices/...
 The kernel interface for Plug and Play BIOS device services.
+.TP
+/proc/bus/pnp/...
+The old kernel interface for Plug and Play BIOS device services.
 .SH AUTHORS
 David Hinds \- [email protected]
 .SH "SEE ALSO"

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

A message that is not in the archive (sent off-list or not yet received): [email protected]

#2 lore raw

Hi,

Quoted 10 lines · Bjorn Helgaas

new output (from /sys/bus/pnp/devices/):

    00:00 PNP0c02 Motherboard resources
	state = active
	allocated resources:
	    io 0x80-0x80
	    io 0xffbf-0xffbf
	    mem 0xfff80000-0xffffffff

Feedback welcome.

Sysfs favours a one-value-per-file (or one array per file) approach. Wouldn't this work for PNP as well?

Dominik
-
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): [email protected]

#4 lore raw
Quoted 2 lines · Dominik Brodowski

Sysfs favours a one-value-per-file (or one array per file) approach. Wouldn't this work for PNP as well?

It probably would. But this patch doesn't change anything in sysfs; it only changes lspnp to work with the current kernel implementation. -
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

#5 lore raw
In reply to Bjorn Helgaas
Quoted 4 lines · Bjorn Helgaas

Add lspnp support for sysfs. This makes it work with generic PNP (including PNPACPI, PNPBIOS, ISAPNP) instead of just with PNPBIOS. I'm particularly interested in ia64, which never has PNPBIOS, but may have PNPACPI.

Any more feedback on this? I'd like to see lspnp work again on modern systems, because it's so much easier to tell a user to run lspnp than it is to tell him how to grub around in /sys/bus/pnp/devices.

#6 lore raw
Quoted 10 lines · Bjorn Helgaas
Quoted 4 lines · Bjorn Helgaas

Add lspnp support for sysfs. This makes it work with generic PNP (including PNPACPI, PNPBIOS, ISAPNP) instead of just with PNPBIOS. I'm particularly interested in ia64, which never has PNPBIOS, but may have PNPACPI.

Any more feedback on this? I'd like to see lspnp work again on modern systems, because it's so much easier to tell a user to run lspnp than it is to tell him how to grub around in /sys/bus/pnp/devices.

Personally, I think this would be really useful, and I agree asking users to poke around sysfs can be difficult. I'd like to see it as a seperate utility from the original lspnp included in pcmcia-cs (which should actually be called "lspnpbios") as it can be handy for a different sort of testing.

Thanks,
Adam

#7 lore raw

Hello,

I want 'check_pnp_irq' api in the kernel pnp layer. to avoid irq conflict between 16bit-pcmcia card and on-board pnp-devices.

for example,
int check_pnp_irq(int irq)
return 0 (unused)

         -1 (used)
         -2 (reserved)

Below is a known problems and limitations
in the pcmcia-cs README-2.4

Quoted 3 lines

The kernel PCMCIA package cannot be configured to use PnP BIOS calls for resource management. Recent kernels do have PnP BIOS support but the "glue" hasn't been written.

Best Regards
Komuro

#8 lore raw
Quoted 5 lines · Komuro

I want 'check_pnp_irq' api in the kernel pnp layer. to avoid irq conflict between 16bit-pcmcia card and on-board pnp-devices.

Quoted 12 lines

for example,
int check_pnp_irq(int irq)
return 0 (unused)

         -1 (used)
         -2 (reserved)

Below is a known problems and limitations
in the pcmcia-cs README-2.4

Quoted 3 lines

The kernel PCMCIA package cannot be configured to use PnP BIOS calls for resource management. Recent kernels do have PnP BIOS support but the "glue" hasn't been written.

The correct way to fix this would be to have the PnP layer reserve all resources defined by the PnP BIOS.

-- Dave

#9 lore raw
In reply to Bjorn Helgaas
Quoted 4 lines · Bjorn Helgaas

Add lspnp support for sysfs. This makes it work with generic PNP (including PNPACPI, PNPBIOS, ISAPNP) instead of just with PNPBIOS. I'm particularly interested in ia64, which never has PNPBIOS, but may have PNPACPI.

Ping. I think we have two votes in favor of this, at least in concept (mine and Adam's). We had a couple tangential questions. Nobody seemed really opposed.

What can I do to either advance this or come to the conclusion that it's not worth the effort? David, are you the pcmcia-cs maintainer? Are you interested in this at all?

Bjorn

#10 lore raw

Hi everybody,

Quoted 11 lines · Bjorn Helgaas
Quoted 4 lines · Bjorn Helgaas

Add lspnp support for sysfs. This makes it work with generic PNP (including PNPACPI, PNPBIOS, ISAPNP) instead of just with PNPBIOS. I'm particularly interested in ia64, which never has PNPBIOS, but may have PNPACPI.

Ping. I think we have two votes in favor of this, at least in concept (mine and Adam's). We had a couple tangential questions. Nobody seemed really opposed.

I also think it is a good idea.

Matthieu

#11 lore raw
In reply to Bjorn Helgaas
Quoted 6 lines · Bjorn Helgaas
Quoted 4 lines · Bjorn Helgaas

Add lspnp support for sysfs. This makes it work with generic PNP (including PNPACPI, PNPBIOS, ISAPNP) instead of just with PNPBIOS. I'm particularly interested in ia64, which never has PNPBIOS, but may have PNPACPI.

Quoted 7 lines

Ping. I think we have two votes in favor of this, at least in concept (mine and Adam's). We had a couple tangential questions. Nobody seemed really opposed.

What can I do to either advance this or come to the conclusion that it's not worth the effort? David, are you the pcmcia-cs maintainer? Are you interested in this at all?

I think it would be good for lspnp to live somewhere other than pcmcia-cs. It really doesn't belong there, and now that pcmcia-cs is essentially deprecated, it makes even less sense.

-- Dave

#12 lore raw
Quoted 3 lines · David Hinds

I think it would be good for lspnp to live somewhere other than pcmcia-cs. It really doesn't belong there, and now that pcmcia-cs is essentially deprecated, it makes even less sense.

I agree with that. Is anybody interested in maintaining a "pnputils" package?