ARM amba: optional PrimeCell core voltage switch
PATCH 1/1 ARM amba: optional PrimeCell core voltage switch
On some contemporary sub-micron SoCs, peripherals on the chip have power domain switches, i.e. the voltage to the core may be turned off to conserve power. In the Ux500 we have this for out PrimeCell derivates.
This patch makes it possible to specify an (optional) regulator to handle the voltage domain switch on AMBA PrimeCells, modeled very similar to how block clocks are handled.
Additional amba_vcore_[enable|disable] calls are supplied to make it possible introduce optional powering off of the core voltage. Using this will require code to spool/unspool any core HW state.
--- drivers/amba/bus.c | 39 +++++++++++++++++++++++++++++++++++++++ include/linux/amba/bus.h | 8 ++++++++ 2 files changed, 47 insertions(+), 0 deletions(-)
drivers/amba/bus.c +39 -0
@@ -147,6 +147,39 @@ static void amba_put_disable_pclk(struct amba_device *pcdev)clk_put (pclk); } +static int amba_get_enable_vcore (struct amba_device *pcdev) +{ +struct regulator *vcore =regulator_get (&pcdev->dev,"vcore" ); +int ret; + + pcdev->vcore = vcore; + +if (IS_ERR (vcore)) { +/* It is OK not to supply a vcore regulator */ +if (PTR_ERR (vcore) == -ENODEV ) +return 0 ; +return PTR_ERR (vcore); + } + + ret =regulator_enable (vcore); +if (ret) { +regulator_put (vcore); + pcdev->vcore =ERR_PTR (-ENODEV ); + } + +return ret; +} + +static void amba_put_disable_vcore (struct amba_device *pcdev) +{ +struct regulator *vcore = pcdev->vcore; + +if (!IS_ERR (vcore)) { +regulator_disable (vcore); +regulator_put (vcore); + } +} +/* * These are the device model conversion veneers; they convert the * device model structures to our more specific structures.
@@ -159,6 +192,10 @@ static int amba_probe(struct device *dev)int ret; do { + ret = amba_get_enable_vcore(pcdev); + if (ret) + break; + ret = amba_get_enable_pclk(pcdev); if (ret) break;
@@ -168,6 +205,7 @@ static int amba_probe(struct device *dev)break ;amba_put_disable_pclk (pcdev); +amba_put_disable_vcore (pcdev); }while (0 );return ret;
@@ -180,6 +218,7 @@ static int amba_remove(struct device *dev)int ret = drv->remove (pcdev);amba_put_disable_pclk (pcdev); +amba_put_disable_vcore (pcdev);return ret; }
include/linux/amba/bus.h +8 -0
@@ -18,6 +18,7 @@#include <linux/device.h> #include <linux/err.h> #include <linux/resource.h> +#include <linux/regulator/consumer.h> #define AMBA_NR_IRQS 2#define AMBA_CID 0xb105f00d
@@ -28,6 +29,7 @@ struct amba_device {struct device dev;struct resource res;struct clk *pclk; +struct regulator *vcore;u64 dma_mask;unsigned int periphid;unsigned int irq[AMBA_NR_IRQS ];
@@ -71,6 +73,12 @@ void amba_release_regions(struct amba_device *);#define amba_pclk_disable (d) \ do { if (!IS_ERR((d)->pclk)) clk_disable((d)->pclk); } while (0) +#define amba_vcore_enable (d) \ + (IS_ERR((d)->vcore) ? 0 : regulator_enable((d)->vcore)) + +#define amba_vcore_disable (d) \ + do { if (!IS_ERR((d)->vcore)) regulator_disable((d)->vcore); } while (0) +/* Some drivers don't use the struct amba_device */ #define AMBA_CONFIG_BITS (a) (((a) >> 24) & 0xff)#define AMBA_REV_BITS (a) (((a) >> 20) & 0x0f)
Signature · 1 line
1.7.2.3
PATCH 1/1 ARM amba: optional PrimeCell core voltage switch
Quoted 4 lines · Linus Walleij
(quoted diff) +3
-0+static int amba_get_enable_vcore(struct amba_device *pcdev) +{ + ? ? ? struct regulator *vcore = regulator_get(&pcdev->dev, "vcore");
Review
Quoted 10 lines
(quoted diff) +10
-0+ ? ? ? int ret; + + ? ? ? pcdev->vcore = vcore; + + ? ? ? if (IS_ERR(vcore)) { + ? ? ? ? ? ? ? /* It is OK not to supply a vcore regulator */ + ? ? ? ? ? ? ? if (PTR_ERR(vcore) == -ENODEV) + ? ? ? ? ? ? ? ? ? ? ? return 0; + ? ? ? ? ? ? ? return PTR_ERR(vcore); + ? ? ? }
If i am right, you corrupt the pcdev->vcore even in an error case.
Cheers!
PATCH 1/1 ARM amba: optional PrimeCell core voltage switch
Quoted 17 lines · Sundar
drivers/amba/bus.c static void amba_put_disable_pclk(struct amba_device *pcdev) · line 162
Quoted 13 lines · Linus Walleij
drivers/amba/bus.c +13
-0+static int amba_get_enable_vcore (struct amba_device *pcdev) +{ +struct regulator *vcore =regulator_get (&pcdev->dev,"vcore" ); +int ret; + + pcdev->vcore = vcore; + +if (IS_ERR (vcore)) { +/* It is OK not to supply a vcore regulator */ +if (PTR_ERR (vcore) == -ENODEV ) +return 0 ; +return PTR_ERR (vcore); + }If i am right, you corrupt the
pcdev->vcoreeven in an error case.
Yeah that's the intention. It's modeled on the clock code that does the same thing, then in the disable_put function and helper macros in bus.h we account for the error case.
I would have set it to NULL instead, but I wanted it to be as close to the clock code as possible.
Thanks!
Linus Walleij
PATCH 1/1 ARM amba: optional PrimeCell core voltage switch
In reply to SundarQuoted 18 lines · Sundar
Quoted 4 lines · Linus Walleij
(quoted diff) +3
-0+static int amba_get_enable_vcore(struct amba_device *pcdev) +{ + ? ? ? struct regulator *vcore = regulator_get(&pcdev->dev, "vcore");Review
Quoted 10 lines
(quoted diff) +10
-0+ ? ? ? int ret; + + ? ? ? pcdev->vcore = vcore; + + ? ? ? if (IS_ERR(vcore)) { + ? ? ? ? ? ? ? /* It is OK not to supply a vcore regulator */ + ? ? ? ? ? ? ? if (PTR_ERR(vcore) == -ENODEV) + ? ? ? ? ? ? ? ? ? ? ? return 0; + ? ? ? ? ? ? ? return PTR_ERR(vcore); + ? ? ? }If i am right, you corrupt the
pcdev->vcoreeven in an error case.
So? It's previous value is meaningless, and on failure the amba device is not registered, and so this value won't be used.