On Fri 10 Jan 13:18 PST 2020, Mathieu Poirier wrote:
> On Thu, Dec 26, 2019 at 09:32:09PM -0800, Bjorn Andersson wrote:
[..]
> > diff --git a/drivers/remoteproc/qcom_pil_info.c b/drivers/remoteproc/qcom_pil_info.c
> > new file mode 100644
> > index 000000000000..b0897ae9eae5
> > --- /dev/null
> > +++ b/drivers/remoteproc/qcom_pil_info.c
> > @@ -0,0 +1,150 @@
> > +// SPDX-License-Identifier: GPL-2.0-only
> > +/*
> > + * Copyright (c) 2019 Linaro Ltd.
> > + */
> > +#include <linux/module.h>
> > +#include <linux/kernel.h>
> > +#include <linux/of.h>
> > +#include <linux/platform_device.h>
> > +#include <linux/mutex.h>
> > +#include <linux/regmap.h>
> > +#include <linux/mfd/syscon.h>
> > +#include <linux/slab.h>
>
> These should be in alphabetical order if there is no depencencies
> between them, something checkpatch complains about.
>
Of course.
> > +
> > +struct pil_reloc_entry {
> > + char name[8];
>
> Please add a #define for the name length and reuse it in qcom_pil_info_store()
>
Ok
[..]
> > +void qcom_pil_info_store(const char *image, phys_addr_t base, size_t size)
> > +{
> > + struct pil_reloc_entry *entry;
> > + int idx = -1;
> > + int i;
> > +
> > + mutex_lock(&reloc_mutex);
> > + if (!_reloc)
>
> Since it is available, I would use function qcom_pil_info_available(). Also
> checkpatch complains about indentation problems related to the 'if' condition
> but I can't see what makes it angry.
>
Sure thing, and I'll double check the indentation.
> > + goto unlock;
> > +
> > + for (i = 0; i < PIL_INFO_ENTRIES; i++) {
> > + if (!_reloc->entries[i].name[0]) {
> > + if (idx == -1)
> > + idx = i;
> > + continue;
> > + }
> > +
> > + if (!strncmp(_reloc->entries[i].name, image, 8)) {
> > + idx = i;
> > + goto found;
> > + }
> > + }
> > +
> > + if (idx == -1) {
> > + dev_warn(_reloc->dev, "insufficient PIL info slots\n");
> > + goto unlock;
>
> Given how this function is used in the next patch I think an error should be
> reported to the caller.
>
Just to clarify, certain global errors will cause the entire device to
be reset and allow memory contents to be extracted for analysis in post
mortem tools. This patch ensures that this information contains
(structured) information about where each remote processor is loaded.
Afaict the purpose of propagating errors from this function would be for
the caller to abort the launching of a remote processor.
I think it's better to take the risk of having insufficient data for the
post mortem tools than to fail booting a remote processor for a reason
that won't affect normal operation.
> > + }
> > +
> > +found:
> > + entry = &_reloc->entries[idx];
> > + stracpy(entry->name, image);
>
> Function stracpy() isn't around in mainline.
>
Good catch, I'll spin this with a strscpy() to avoid build errors until
stracpy lands.
> > + entry->base = base;
> > + entry->size = size;
> > +
> > + regmap_bulk_write(_reloc->map, _reloc->offset + idx * sizeof(*entry),
> > + entry, sizeof(*entry) / _reloc->val_bytes);
>
> Same here - the error code should be handled and reported to the caller.
>
Will undo the "allocation" of _reloc->entries[idx] on failure, let me
know what you think about my reasoning above regarding propagating this
error (or in particular acting upon the propagated value).
> > +
> > +unlock:
> > + mutex_unlock(&reloc_mutex);
> > +}
> > +EXPORT_SYMBOL_GPL(qcom_pil_info_store);
[..]
> > +static int pil_reloc_probe(struct platform_device *pdev)
> > +{
> > + struct pil_reloc *reloc;
> > +
> > + reloc = devm_kzalloc(&pdev->dev, sizeof(*reloc), GFP_KERNEL);
> > + if (!reloc)
> > + return -ENOMEM;
> > +
> > + reloc->dev = &pdev->dev;
> > + reloc->map = syscon_node_to_regmap(pdev->dev.parent->of_node);
> > + if (IS_ERR(reloc->map))
> > + return PTR_ERR(reloc->map);
> > +
> > + if (of_property_read_u32(pdev->dev.of_node, "offset", &reloc->offset))
> > + return -EINVAL;
> > +
> > + reloc->val_bytes = regmap_get_val_bytes(reloc->map);
> > + if (reloc->val_bytes < 0)
> > + return -EINVAL;
> > +
> > + regmap_bulk_write(reloc->map, reloc->offset, reloc->entries,
> > + sizeof(reloc->entries) / reloc->val_bytes);
>
> Error code handling.
>
Yes, that makes sense.
Thanks for the review Mathieu!
Regards,
Bjorn
> Thanks,
> Mathieu
>
> > +
> > + mutex_lock(&reloc_mutex);
> > + _reloc = reloc;
> > + mutex_unlock(&reloc_mutex);
> > +
> > + return 0;
> > +}
> > +
> > +static int pil_reloc_remove(struct platform_device *pdev)
> > +{
> > + mutex_lock(&reloc_mutex);
> > + _reloc = NULL;
> > + mutex_unlock(&reloc_mutex);
> > +
> > + return 0;
> > +}
> > +
> > +static const struct of_device_id pil_reloc_of_match[] = {
> > + { .compatible = "qcom,pil-reloc-info" },
> > + {}
> > +};
> > +MODULE_DEVICE_TABLE(of, pil_reloc_of_match);
> > +
> > +static struct platform_driver pil_reloc_driver = {
> > + .probe = pil_reloc_probe,
> > + .remove = pil_reloc_remove,
> > + .driver = {
> > + .name = "qcom-pil-reloc-info",
> > + .of_match_table = pil_reloc_of_match,
> > + },
> > +};
> > +module_platform_driver(pil_reloc_driver);
> > +
> > +MODULE_DESCRIPTION("Qualcomm PIL relocation info");
> > +MODULE_LICENSE("GPL v2");
> > diff --git a/drivers/remoteproc/qcom_pil_info.h b/drivers/remoteproc/qcom_pil_info.h
> > new file mode 100644
> > index 000000000000..0372602fae1d
> > --- /dev/null
> > +++ b/drivers/remoteproc/qcom_pil_info.h
> > @@ -0,0 +1,8 @@
> > +/* SPDX-License-Identifier: GPL-2.0 */
> > +#ifndef __QCOM_PIL_INFO_H__
> > +#define __QCOM_PIL_INFO_H__
> > +
> > +void qcom_pil_info_store(const char *image, phys_addr_t base, size_t size);
> > +bool qcom_pil_info_available(void);
> > +
> > +#endif
> > --
> > 2.24.0
> >
