On Fri, Dec 21, 2018 at 1:21 AM <thor.thayer@xxxxxxxxxxxxxxx> wrote:
>
> From: Thor Thayer <thor.thayer@xxxxxxxxxxxxxxx>
>
> The SOCFPGA System Manager register block aggregates different
> peripheral functions into one area.
> On 32 bit ARM parts, handle in the same way as syscon.
> On 64 bit ARM parts, the System Manager can only be accessed by
> EL3 secure mode. Since a SMC call to EL3 is required, this new
> driver uses regmaps similar to syscon to handle the SMC call.
>
> Since regmaps abstract out the underlying register access, the
> changes to drivers accessing the System Manager are minimal.
>
> Signed-off-by: Thor Thayer <thor.thayer@xxxxxxxxxxxxxxx>
> ---
> v2 Implement Arnd's changes.
> 1. Change socfpga_is_s10() to check compatible string.
> Add new compatible string for Stratix10 in bindings
> and add proper detection method.
> 2. Replace base cast with resource_size_t member.
> 3. Change s10_sysmgr_regmap_cfg to altr_sysmgr_regmap_cfg to
> be generic.
> 4. Always use 4 byte width.
> 5. Initialize the .reg_read and .reg_write in S10 case only.
> 6. Remove call to syscon in 32bit ARM case and handle both
> ARM32 and ARM64 in of_sysmgr_register().
> 7. Replace IS_ERR_OR_NULL() with IS_ERR().
> 8. Remove compatible check functions except phandle function.
These all look good, thanks for the good updates!
> +struct regmap *altr_sysmgr_node_to_regmap(struct device_node *np)
> +{
> + struct altr_sysmgr *sysmgr = NULL;
> +
> + if (!p_sysmgr)
> + sysmgr = of_sysmgr_register(np);
> + else
> + sysmgr = p_sysmgr;
> +
> + if (IS_ERR(sysmgr))
> + return ERR_CAST(sysmgr);
> +
> + return sysmgr->regmap;
> +}
> +EXPORT_SYMBOL_GPL(altr_sysmgr_node_to_regmap);
> +
> +struct regmap *altr_sysmgr_regmap_lookup_by_phandle(struct device_node *np,
> + const char *property)
> +{
> + struct device_node *sysmgr_np;
> + struct regmap *regmap;
> +
> + if (property)
> + sysmgr_np = of_parse_phandle(np, property, 0);
> + else
> + sysmgr_np = np;
> +
> + if (!sysmgr_np)
> + return ERR_PTR(-ENODEV);
> +
> + regmap = altr_sysmgr_node_to_regmap(sysmgr_np);
> + of_node_put(sysmgr_np);
> +
> + return regmap;
> +}
> +EXPORT_SYMBOL_GPL(altr_sysmgr_regmap_lookup_by_phandle);
> +
> +static int sysmgr_probe(struct platform_device *pdev)
> +{
> + struct device *dev = &pdev->dev;
> + struct altr_sysmgr *sysmgr;
> + struct resource *res;
> +
> + /* Skip Initialization if already created */
> + if (p_sysmgr)
> + goto finish;
> +
> + sysmgr = of_sysmgr_register(pdev->dev.of_node);
> + if (IS_ERR(sysmgr)) {
> + dev_err(dev, "regmap init failed\n");
> + return -ENODEV;
> + }
It seems odd to still have these two ways of registering the sysmgr,
from either the probe function or the lookup.
Since the sysmgr should always get probed before its users, you could
try to change it like this:
- let only the probe() function register it and create the regmap, then
set the regmap as the private data of the device.
- In lookup_by_phandle(), use driver_find_device() to look up the
'struct device' based on its of_node(), by comparing dev->of_node
to of_parse_phandle(np, property).
- return the private data of the device.
That will also let you remove the global variable and make it (theoretically)
work with multiple sysmgr devices, which is generally the preferred way to
write a driver.
> +#ifdef CONFIG_MFD_ALTERA_SYSMGR
> +struct regmap *altr_sysmgr_node_to_regmap(struct device_node *np);
> +struct regmap *altr_sysmgr_regmap_lookup_by_compatible(const char *s);
> +struct regmap *altr_sysmgr_regmap_lookup_by_pdevname(const char *s);
> +struct regmap *altr_sysmgr_regmap_lookup_by_phandle(struct device_node *np,
> + const char *property);
> +
You seem to have some dead declarations from before the cleanup that
should be removed now. Please go through the header file one more time
to see what is actually still used.
Arnd
