state: backend: support phandle and of_path references
This patch improves the backend property, it can be either a phandle or a of_path. During probe() of the state driver the backend property is dereferenced and the resulting of_path is saved in the state context. In a later patch it will be used to generate a phandle reference to the backend during DT fixup. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
This commit is contained in:
parent
1c3c233a93
commit
4e26c8c6d9
|
@ -54,6 +54,7 @@ struct state_backend {
|
|||
int (*load)(struct state_backend *backend, struct state *state);
|
||||
int (*save)(struct state_backend *backend, struct state *state);
|
||||
const char *name;
|
||||
const char *of_path;
|
||||
const char *path;
|
||||
};
|
||||
|
||||
|
@ -900,7 +901,7 @@ out:
|
|||
* @state The state instance to work on
|
||||
* @path The path where the state will be stored to
|
||||
*/
|
||||
int state_backend_dtb_file(struct state *state, const char *path)
|
||||
int state_backend_dtb_file(struct state *state, const char *of_path, const char *path)
|
||||
{
|
||||
struct state_backend_dtb *backend_dtb;
|
||||
struct state_backend *backend;
|
||||
|
@ -915,6 +916,7 @@ int state_backend_dtb_file(struct state *state, const char *path)
|
|||
|
||||
backend->load = state_backend_dtb_load;
|
||||
backend->save = state_backend_dtb_save;
|
||||
backend->of_path = xstrdup(of_path);
|
||||
backend->path = xstrdup(path);
|
||||
backend->name = "dtb";
|
||||
|
||||
|
@ -1130,8 +1132,8 @@ out_free:
|
|||
* device @size may be 0. The two copies are spread to different
|
||||
* eraseblocks if approriate for this device.
|
||||
*/
|
||||
int state_backend_raw_file(struct state *state, const char *path, off_t offset,
|
||||
size_t size)
|
||||
int state_backend_raw_file(struct state *state, const char *of_path,
|
||||
const char *path, off_t offset, size_t size)
|
||||
{
|
||||
struct state_backend_raw *backend_raw;
|
||||
struct state_backend *backend;
|
||||
|
@ -1156,6 +1158,7 @@ int state_backend_raw_file(struct state *state, const char *path, off_t offset,
|
|||
|
||||
backend->load = state_backend_raw_load;
|
||||
backend->save = state_backend_raw_save;
|
||||
backend->of_path = xstrdup(of_path);
|
||||
backend->path = xstrdup(path);
|
||||
backend->name = "raw";
|
||||
|
||||
|
|
|
@ -24,10 +24,12 @@
|
|||
static int state_probe(struct device_d *dev)
|
||||
{
|
||||
struct device_node *np = dev->device_node;
|
||||
struct device_node *partition_node;
|
||||
struct state *state;
|
||||
const char *alias;
|
||||
const char *backend_type = NULL;
|
||||
int ret;
|
||||
const char *of_path;
|
||||
char *path;
|
||||
|
||||
if (!np)
|
||||
|
@ -41,28 +43,70 @@ static int state_probe(struct device_d *dev)
|
|||
if (IS_ERR(state))
|
||||
return PTR_ERR(state);
|
||||
|
||||
ret = of_find_path(np, "backend", &path);
|
||||
if (ret)
|
||||
return ret;
|
||||
of_path = of_get_property(np, "backend", NULL);
|
||||
if (!of_path) {
|
||||
ret = -ENODEV;
|
||||
goto out_release;
|
||||
}
|
||||
|
||||
dev_info(dev, "outpath: %s\n", path);
|
||||
/* guess if of_path is a path, not a phandle */
|
||||
if (of_path[0] == '/') {
|
||||
ret = of_find_path(np, "backend", &path);
|
||||
if (ret)
|
||||
goto out_release;
|
||||
} else {
|
||||
struct device_d *dev;
|
||||
struct cdev *cdev;
|
||||
|
||||
partition_node = of_parse_phandle(np, "backend", 0);
|
||||
if (!partition_node) {
|
||||
ret = -ENODEV;
|
||||
goto out_release;
|
||||
}
|
||||
|
||||
dev = of_find_device_by_node(partition_node);
|
||||
if (!list_is_singular(&dev->cdevs)) {
|
||||
ret = -ENODEV;
|
||||
goto out_release;
|
||||
}
|
||||
|
||||
cdev = list_first_entry(&dev->cdevs, struct cdev, devices_list);
|
||||
if (!cdev) {
|
||||
ret = -ENODEV;
|
||||
goto out_release;
|
||||
}
|
||||
|
||||
path = asprintf("/dev/%s", cdev->name);
|
||||
of_path = partition_node->full_name;
|
||||
}
|
||||
|
||||
ret = of_property_read_string(np, "backend-type", &backend_type);
|
||||
if (ret)
|
||||
return ret;
|
||||
else if (!strcmp(backend_type, "raw"))
|
||||
ret = state_backend_raw_file(state, path, 0, 0);
|
||||
else if (!strcmp(backend_type, "dtb"))
|
||||
ret = state_backend_dtb_file(state, path);
|
||||
else
|
||||
if (ret) {
|
||||
goto out_free;
|
||||
} else if (!strcmp(backend_type, "raw")) {
|
||||
ret = state_backend_raw_file(state, of_path, path, 0, 0);
|
||||
} else if (!strcmp(backend_type, "dtb")) {
|
||||
ret = state_backend_dtb_file(state, of_path, path);
|
||||
} else {
|
||||
dev_warn(dev, "invalid backend type: %s\n", backend_type);
|
||||
ret = -ENODEV;
|
||||
goto out_free;
|
||||
}
|
||||
|
||||
if (ret)
|
||||
return ret;
|
||||
goto out_free;
|
||||
|
||||
dev_info(dev, "backend: %s, path: %s, of_path: %s\n", backend_type, path, of_path);
|
||||
free(path);
|
||||
|
||||
state_load(state);
|
||||
|
||||
return 0;
|
||||
|
||||
out_free:
|
||||
free(path);
|
||||
out_release:
|
||||
state_release(state);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static __maybe_unused struct of_device_id state_ids[] = {
|
||||
|
|
|
@ -5,9 +5,10 @@
|
|||
|
||||
struct state;
|
||||
|
||||
int state_backend_dtb_file(struct state *state, const char *path);
|
||||
int state_backend_raw_file(struct state *state, const char *path,
|
||||
off_t offset, size_t size);
|
||||
int state_backend_dtb_file(struct state *state, const char *of_path,
|
||||
const char *path);
|
||||
int state_backend_raw_file(struct state *state, const char *of_path,
|
||||
const char *path, off_t offset, size_t size);
|
||||
|
||||
struct state *state_new_from_node(const char *name, struct device_node *node);
|
||||
void state_release(struct state *state);
|
||||
|
|
Loading…
Reference in New Issue