From 884483dbd51c9b08ee1d48874616d3b930680815 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Wed, 10 Dec 2014 21:24:11 +0000 Subject: bcm53xx: use bcma callback in SPROM driver to fill the SPROM MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is required because it has to be called at very precise moment. See comment in driver for details. Signed-off-by: Rafał Miłecki git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43611 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../bcm53xx/files/drivers/misc/bcm47xx-sprom.c | 32 +++++++++++++++------- 1 file changed, 22 insertions(+), 10 deletions(-) (limited to 'target/linux/bcm53xx/files/drivers/misc') diff --git a/target/linux/bcm53xx/files/drivers/misc/bcm47xx-sprom.c b/target/linux/bcm53xx/files/drivers/misc/bcm47xx-sprom.c index e36abc8a45..4970a5b460 100644 --- a/target/linux/bcm53xx/files/drivers/misc/bcm47xx-sprom.c +++ b/target/linux/bcm53xx/files/drivers/misc/bcm47xx-sprom.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -640,21 +641,26 @@ static int bcm47xx_sprom_getenv(const struct bcm47xx_sprom_fill *fill, return bcm47xx_nvram_getenv(name, val, val_len); }; -static int bcm47xx_sprom_probe(struct platform_device *pdev) +/* FIXME: This should not be static, but some callback argument */ +static struct platform_device *sprom_pdev = NULL; + +/* + * This function has to be called in a very precise moment. It has to be done: + * 1) After bcma registers flash cores, so we can read NVRAM. + * 2) Before any code needs SPROM content. + * + * This can be achieved only by using bcma callback. + */ +static int bcm47xx_sprom_init(struct bcma_bus *bus, struct ssb_sprom *out) { + struct platform_device *pdev = sprom_pdev; struct device *dev = &pdev->dev; struct device_node *np = dev->of_node; - struct ssb_sprom *sprom; const __be32 *handle; struct device_node *nvram_node; struct platform_device *nvram_dev; struct bcm47xx_sprom_fill fill; - /* Alloc */ - sprom = devm_kzalloc(dev, sizeof(*sprom), GFP_KERNEL); - if (!sprom) - return -ENOMEM; - handle = of_get_property(np, "nvram", NULL); if (!handle) return -ENOMEM; @@ -673,11 +679,17 @@ static int bcm47xx_sprom_probe(struct platform_device *pdev) fill.getenv = bcm47xx_sprom_getenv; fill.priv = nvram_dev; - bcm47xx_sprom_fill(sprom, &fill); - - platform_set_drvdata(pdev, sprom); + bcm47xx_sprom_fill(out, &fill); return 0; +}; + +static int bcm47xx_sprom_probe(struct platform_device *pdev) +{ + /* This is the only way to make pdev accessible to the callback */ + sprom_pdev = pdev; + + return bcma_arch_register_fallback_sprom(&bcm47xx_sprom_init); } static const struct of_device_id bcm47xx_sprom_of_match_table[] = { -- cgit v1.2.3