leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dm: core: Add a new flag to track platform data

Browse Source 
We want to avoid allocating platform data twice. This could happen if
device_probe() is called after device_ofdata_to_platdata() for the same
device.

Add a flag to track whether device_ofdata_to_platdata() has been called on
a device. Check the flag to make sure it doesn't happen twice, and clear
the flag when the data is freed.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2019-12-29 21:19:21 -07:00
parent bcd90cb692
commit 153851ddfa
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/core/device-remove.c
View File

@ -140,6 +140,7 @@ void device_free(struct udevice *dev)
dev->parent_priv = NULL;
}
}
dev->flags &= ~DM_FLAG_PLATDATA_VALID;
devres_release_probe(dev);
}

4
drivers/core/device.c
View File

@ -320,7 +320,7 @@ int device_ofdata_to_platdata(struct udevice *dev)
if (!dev)
return -EINVAL;
if (dev->flags & DM_FLAG_ACTIVATED)
if (dev->flags & DM_FLAG_PLATDATA_VALID)
return 0;
drv = dev->driver;
@ -368,6 +368,8 @@ int device_ofdata_to_platdata(struct udevice *dev)
goto fail;
}
dev->flags |= DM_FLAG_PLATDATA_VALID;
return 0;
fail:
device_free(dev);

3
include/dm/device.h
View File

@ -65,6 +65,9 @@ struct driver_info;
/* DM does not enable/disable the power domains corresponding to this device */
#define DM_FLAG_DEFAULT_PD_CTRL_OFF (1 << 11)
/* Driver platdata has been read. Cleared when the device is removed */
#define DM_FLAG_PLATDATA_VALID (1 << 12)
/*
* One or multiple of these flags are passed to device_remove() so that
* a selective device removal as specified by the remove-stage and the