openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

nvmem: core: fix regression in of_nvmem_cell_get() 

NVMEM DT support seems to be totally broken after
commit e888d445ac ("nvmem: resolve cells from DT at registration time")
Fix this!

Index used in of_nvmem_cell_get() to find cell is specific to
consumer, It can not be used for searching the cell in provider.
Use device_node instead of this to find the matching cell in device
tree case.

Fixes: e888d445ac ("nvmem: resolve cells from DT at registration time")
Reported-by: Niklas Cassel <niklas.cassel@linaro.org>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Tested-by: Niklas Cassel <niklas.cassel@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Srinivas Kandagatla 2018-11-06 15:41:41 +00:00 committed by Greg Kroah-Hartman
parent 7c97301285
commit 0749aa25af
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/nvmem/core.c
View File

@ -44,6 +44,7 @@ struct nvmem_cell {
int bytes; int bytes;
int bit_offset; int bit_offset;
int nbits; int nbits;
struct device_node *np;
struct nvmem_device *nvmem; struct nvmem_device *nvmem;
struct list_head node; struct list_head node;
}; };
@ -298,6 +299,7 @@ static void nvmem_cell_drop(struct nvmem_cell *cell)
mutex_lock(&nvmem_mutex); mutex_lock(&nvmem_mutex);
list_del(&cell->node); list_del(&cell->node);
mutex_unlock(&nvmem_mutex); mutex_unlock(&nvmem_mutex);
of_node_put(cell->np);
kfree(cell->name); kfree(cell->name);
kfree(cell); kfree(cell);
} }
@ -530,6 +532,7 @@ static int nvmem_add_cells_from_of(struct nvmem_device *nvmem)
return -ENOMEM; return -ENOMEM;
cell->nvmem = nvmem; cell->nvmem = nvmem;
cell->np = of_node_get(child);
cell->offset = be32_to_cpup(addr++); cell->offset = be32_to_cpup(addr++);
cell->bytes = be32_to_cpup(addr); cell->bytes = be32_to_cpup(addr);
cell->name = kasprintf(GFP_KERNEL, "%pOFn", child); cell->name = kasprintf(GFP_KERNEL, "%pOFn", child);
@ -960,14 +963,13 @@ nvmem_cell_get_from_lookup(struct device *dev, const char *con_id)
#if IS_ENABLED(CONFIG_OF) #if IS_ENABLED(CONFIG_OF)
static struct nvmem_cell * static struct nvmem_cell *
nvmem_find_cell_by_index(struct nvmem_device *nvmem, int index) nvmem_find_cell_by_node(struct nvmem_device *nvmem, struct device_node *np)
{ {
struct nvmem_cell *cell = NULL; struct nvmem_cell *cell = NULL;
int i = 0;
mutex_lock(&nvmem_mutex); mutex_lock(&nvmem_mutex);
list_for_each_entry(cell, &nvmem->cells, node) { list_for_each_entry(cell, &nvmem->cells, node) {
if (index == i++) if (np == cell->np)
break; break;
} }
mutex_unlock(&nvmem_mutex); mutex_unlock(&nvmem_mutex);
@ -1011,7 +1013,7 @@ struct nvmem_cell *of_nvmem_cell_get(struct device_node *np, const char *id)
if (IS_ERR(nvmem)) if (IS_ERR(nvmem))
return ERR_CAST(nvmem); return ERR_CAST(nvmem);
cell = nvmem_find_cell_by_index(nvmem, index); cell = nvmem_find_cell_by_node(nvmem, cell_np);
if (!cell) { if (!cell) {
__nvmem_device_put(nvmem); __nvmem_device_put(nvmem);
return ERR_PTR(-ENOENT); return ERR_PTR(-ENOENT);