if (strlen(b->var)) \
strcpy(a->var, b->var);
-int add_config_dev(struct config_device *new_dev)
-{
- struct list_head *tmp;
- struct config_device *tmp_dev;
-
- /* update the values if we already have the device */
- list_for_each(tmp, &config_device_list) {
- struct config_device *dev = list_entry(tmp, struct config_device, node);
- if (strcmp_pattern(new_dev->name, dev->name))
- continue;
- if (strncmp(dev->bus, new_dev->bus, sizeof(dev->name)))
- continue;
- copy_var(dev, new_dev, type);
- copy_string(dev, new_dev, bus);
- copy_string(dev, new_dev, sysfs_file);
- copy_string(dev, new_dev, sysfs_value);
- copy_string(dev, new_dev, id);
- copy_string(dev, new_dev, place);
- copy_string(dev, new_dev, kernel_name);
- copy_string(dev, new_dev, exec_program);
- copy_string(dev, new_dev, symlink);
- return 0;
- }
-
- /* not found, add new structure to the device list */
- tmp_dev = malloc(sizeof(*tmp_dev));
- if (!tmp_dev)
- return -ENOMEM;
- memcpy(tmp_dev, new_dev, sizeof(*tmp_dev));
- list_add_tail(&tmp_dev->node, &config_device_list);
- //dump_config_dev(tmp_dev);
- return 0;
-}
-
int add_perm_dev(struct perm_device *new_dev)
{
struct list_head *tmp;
} bus_files[] = {
{ .bus = "scsi", .file = "vendor" },
{ .bus = "usb", .file = "idVendor" },
+ { .bus = "pci", .file = "vendor" },
{}
};
if (dev->type != CALLOUT)
continue;
- if (sysfs_device) {
+ if (dev->bus[0] != '\0') {
+ /* as the user specified a bus, we must match it up */
+ if (!sysfs_device)
+ continue;
dbg("dev->bus='%s' sysfs_device->bus='%s'", dev->bus, sysfs_device->bus);
if (strcasecmp(dev->bus, sysfs_device->bus) != 0)
continue;
return -ENODEV;
}
-static int do_label(struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
+static int match_pair(struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device, struct sysfs_pair *pair)
{
struct sysfs_attribute *tmpattr = NULL;
+ char *c;
+
+ if ((pair == NULL) || (pair->file[0] == '\0') || (pair->value == '\0'))
+ return -ENODEV;
+
+ dbg("look for device attribute '%s'", pair->file);
+ /* try to find the attribute in the class device directory */
+ tmpattr = sysfs_get_classdev_attr(class_dev, pair->file);
+ if (tmpattr)
+ goto label_found;
+
+ /* look in the class device directory if present */
+ if (sysfs_device) {
+ tmpattr = sysfs_get_device_attr(sysfs_device, pair->file);
+ if (tmpattr)
+ goto label_found;
+ }
+
+ return -ENODEV;
+
+label_found:
+ c = tmpattr->value + strlen(tmpattr->value)-1;
+ if (*c == '\n')
+ *c = 0x00;
+ dbg("compare attribute '%s' value '%s' with '%s'",
+ pair->file, tmpattr->value, pair->value);
+ if (strcmp_pattern(pair->value, tmpattr->value) != 0)
+ return -ENODEV;
+
+ dbg("found matching attribute '%s' with value '%s'",
+ pair->file, pair->value);
+ return 0;
+}
+
+static int do_label(struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
+{
+ struct sysfs_pair *pair;
struct config_device *dev;
struct list_head *tmp;
- char *c;
+ int i;
+ int match;
list_for_each(tmp, &config_device_list) {
dev = list_entry(tmp, struct config_device, node);
if (dev->type != LABEL)
continue;
- if (sysfs_device) {
+ if (dev->bus[0] != '\0') {
+ /* as the user specified a bus, we must match it up */
+ if (!sysfs_device)
+ continue;
dbg("dev->bus='%s' sysfs_device->bus='%s'", dev->bus, sysfs_device->bus);
if (strcasecmp(dev->bus, sysfs_device->bus) != 0)
continue;
}
- dbg("look for device attribute '%s'", dev->sysfs_file);
- /* try to find the attribute in the class device directory */
- tmpattr = sysfs_get_classdev_attr(class_dev, dev->sysfs_file);
- if (tmpattr)
- goto label_found;
-
- /* look in the class device directory if present */
- if (sysfs_device) {
- tmpattr = sysfs_get_device_attr(sysfs_device, dev->sysfs_file);
- if (tmpattr)
- goto label_found;
+ match = 1;
+ for (i = 0; i < MAX_SYSFS_PAIRS; ++i) {
+ pair = &dev->sysfs_pair[i];
+ if ((pair->file[0] == '\0') || (pair->value[0] == '\0'))
+ break;
+ if (match_pair(class_dev, sysfs_device, pair) != 0) {
+ match = 0;
+ break;
+ }
}
-
- continue;
-
-label_found:
- c = tmpattr->value + strlen(tmpattr->value)-1;
- if (*c == '\n')
- *c = 0x00;
- dbg("compare attribute '%s' value '%s' with '%s'",
- dev->sysfs_file, tmpattr->value, dev->sysfs_value);
- if (strcmp_pattern(dev->sysfs_value, tmpattr->value) != 0)
+ if (match == 0)
continue;
+ /* found match */
strfieldcpy(udev->name, dev->name);
strfieldcpy(udev->symlink, dev->symlink);
- dbg("found matching attribute '%s', '%s' becomes '%s' ",
- dev->sysfs_file, class_dev->name, udev->name);
+ dbg("found matching attribute, '%s' becomes '%s' ",
+ class_dev->name, udev->name);
return 0;
}
struct sysfs_device *sysfs_device;
struct sysfs_class_device *class_dev_parent;
int loop;
-
- /* FIXME!!! */
- /* This is needed here as we can easily out-race the placement of the
- * device symlink by the kernel. The call to sleep(1); will be removed
- * once libsysfs can be queried for sysfs_get_classdev_device()
- * multiple times and have it return the proper information when the
- * class device really shows up. For now, we live with the time
- * delay...
+ char filename[SYSFS_PATH_MAX + 6];
+ int retval;
+ char *temp;
+ int partition = 0;
+
+ /* Figure out where the device symlink is at. For char devices this will
+ * always be in the class_dev->path. But for block devices, it's different.
+ * The main block device will have the device symlink in it's path, but
+ * all partitions have the symlink in its parent directory.
+ * But we need to watch out for block devices that do not have parents, yet
+ * look like a partition (fd0, loop0, etc.) They all do not have a device
+ * symlink yet. We do sit and spin on waiting for them right now, we should
+ * possibly have a whitelist for these devices here...
*/
- sleep(1);
+ strcpy(filename, class_dev->path);
+ dbg("filename = %s", filename);
+ if (strcmp(class_dev->classname, SYSFS_BLOCK_NAME) == 0) {
+ if (isdigit(class_dev->path[strlen(class_dev->path)-1])) {
+ temp = strrchr(filename, '/');
+ if (temp) {
+ partition = 1;
+ *temp = 0x00;
+ char *temp2 = strrchr(filename, '/');
+ dbg("temp2 = %s", temp2);
+ if (temp2 && (strcmp(temp2, "/block") == 0)) {
+ /* oops, we have no parent block device, so go back to original directory */
+ strcpy(filename, class_dev->path);
+ partition = 0;
+ }
+ }
+ }
+ }
+ strcat(filename, "/device");
-#if 0 /* FIXME
- Something like this could also work, but for some reason doesn't,
- I also tried just stat() on the device symlink, but that still
- has nasty races, I'm probably doing something stupid... :( */
- loop = 10;
+ loop = 2;
while (loop--) {
struct stat buf;
- int retval;
- char filename[SYSFS_PATH_MAX + 6];
-
- strcpy(filename, class_dev->path);
- strcat(filename, "/device");
dbg("looking for '%s'", filename);
retval = stat(filename, &buf);
if (!retval)
break;
-
- /* bah, let's go backwards up a level to see if the device is there,
- * as block partitions don't point to the physical device. Need to fix that
- * up in the kernel...
- */
- if (strcmp(class_dev->classname, SYSFS_BLOCK_NAME) == 0) {
- if (isdigit(class_dev->path[strlen(class_dev->path)-1])) {
- class_dev_parent = sysfs_get_classdev_parent(class_dev);
- if (class_dev_parent == NULL) {
- dbg("sysfs_get_classdev_parent for class device '%s' failed", class_dev->name);
- } else {
- strcpy(filename, class_dev_parent->path);
- strcat(filename, "/device");
- dbg("looking for '%s'", filename);
- retval = stat(filename, &buf);
- if (!retval)
- break;
- }
- }
- }
/* sleep to give the kernel a chance to create the device file */
sleep(1);
}
-#endif
+
loop = 1; /* FIXME put a real value in here for when everything is fixed... */
while (loop--) {
/* find the sysfs_device for this class device */
if (sysfs_device != NULL)
goto exit;
- /* bah, let's go backwards up a level to see if the device is there,
- * as block partitions don't point to the physical device. Need to fix that
- * up in the kernel...
- */
- if (strcmp(class_dev->classname, SYSFS_BLOCK_NAME) == 0) {
- dbg("looking at block device");
- if (isdigit(class_dev->path[strlen(class_dev->path)-1])) {
- dbg("really is a partition");
- class_dev_parent = sysfs_get_classdev_parent(class_dev);
- if (class_dev_parent == NULL) {
- dbg("sysfs_get_classdev_parent for class device '%s' failed", class_dev->name);
- } else {
- dbg("class_dev_parent->name='%s'", class_dev_parent->name);
- sysfs_device = sysfs_get_classdev_device(class_dev_parent);
- if (sysfs_device != NULL)
- goto exit;
- }
+ /* if it's a partition, we need to get the parent device */
+ if (partition) {
+ /* FIXME HACK HACK HACK HACK
+ * for some reason partitions need this extra sleep here, in order
+ * to wait for the device properly. Once the libsysfs code is
+ * fixed properly, this sleep should go away, and we can just loop above.
+ */
+ sleep(1);
+ dbg("really is a partition");
+ class_dev_parent = sysfs_get_classdev_parent(class_dev);
+ if (class_dev_parent == NULL) {
+ dbg("sysfs_get_classdev_parent for class device '%s' failed", class_dev->name);
+ } else {
+ dbg("class_dev_parent->name='%s'", class_dev_parent->name);
+ sysfs_device = sysfs_get_classdev_device(class_dev_parent);
+ if (sysfs_device != NULL)
+ goto exit;
}
}
/* sleep to give the kernel a chance to create the link */
- sleep(1);
-
+ /* FIXME remove comment...
+ sleep(1); */
}
dbg("Timed out waiting for device symlink, continuing on anyway...");
exit:
int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *udev)
{
struct sysfs_device *sysfs_device = NULL;
- struct sysfs_class_device *class_dev_parent = NULL;
int retval = 0;
struct perm_device *perm;
char *pos;
~ianmdlvl / elogind.git / blobdiff