linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* Applied "regulator: core: add enable_count for consumers to debug fs" to the regulator tree
@ 2018-11-20 16:28 Mark Brown
  2018-11-20 16:37 ` Doug Anderson
  0 siblings, 1 reply; 6+ messages in thread
From: Mark Brown @ 2018-11-20 16:28 UTC (permalink / raw)
  To: Douglas Anderson; +Cc: Mark Brown, linux-kernel

The patch

   regulator: core: add enable_count for consumers to debug fs

has been applied to the regulator tree at

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git 

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.  

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

From f556213bad39e3e28fe62a8126eb04c0d64e0b5b Mon Sep 17 00:00:00 2001
From: Douglas Anderson <dianders@chromium.org>
Date: Mon, 19 Nov 2018 16:26:52 -0800
Subject: [PATCH] regulator: core: add enable_count for consumers to debug fs

Now that consumers all keep track of their own enable count, let's add
it into the regulator_summary.

Signed-off-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 drivers/regulator/core.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index ff5ca185bb8f..76ae6c0d734d 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -5225,8 +5225,11 @@ static void regulator_summary_show_subtree(struct seq_file *s,
 
 		switch (rdev->desc->type) {
 		case REGULATOR_VOLTAGE:
-			seq_printf(s, "%37dmA %5dmV %5dmV",
+			seq_printf(s, "%3d %33dmA%c%5dmV %5dmV",
+				   consumer->enable_count,
 				   consumer->uA_load / 1000,
+				   consumer->uA_load && !consumer->enable_count ?
+				   '*' : ' ',
 				   consumer->voltage[PM_SUSPEND_ON].min_uV / 1000,
 				   consumer->voltage[PM_SUSPEND_ON].max_uV / 1000);
 			break;
-- 
2.19.0.rc2


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: Applied "regulator: core: add enable_count for consumers to debug fs" to the regulator tree
  2018-11-20 16:28 Applied "regulator: core: add enable_count for consumers to debug fs" to the regulator tree Mark Brown
@ 2018-11-20 16:37 ` Doug Anderson
  2018-11-20 16:41   ` Mark Brown
  0 siblings, 1 reply; 6+ messages in thread
From: Doug Anderson @ 2018-11-20 16:37 UTC (permalink / raw)
  To: Mark Brown; +Cc: LKML

Hi,

On Tue, Nov 20, 2018 at 8:28 AM Mark Brown <broonie@kernel.org> wrote:
>
> The patch
>
>    regulator: core: add enable_count for consumers to debug fs
>
> has been applied to the regulator tree at
>
>    https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git
>
> All being well this means that it will be integrated into the linux-next
> tree (usually sometime in the next 24 hours) and sent to Linus during
> the next merge window (or sooner if it is a bug fix), however if
> problems are discovered then the patch may be dropped or reverted.
>
> You may get further e-mails resulting from automated or manual testing
> and review of the tree, please engage with people reporting problems and
> send followup patches addressing any issues that are reported if needed.
>
> If any updates are required or you are submitting further changes they
> should be sent as incremental updates against current git, existing
> patches will not be replaced.
>
> Please add any relevant lists and maintainers to the CCs when replying
> to this mail.
>
> Thanks,
> Mark
>
> From f556213bad39e3e28fe62a8126eb04c0d64e0b5b Mon Sep 17 00:00:00 2001
> From: Douglas Anderson <dianders@chromium.org>
> Date: Mon, 19 Nov 2018 16:26:52 -0800
> Subject: [PATCH] regulator: core: add enable_count for consumers to debug fs
>
> Now that consumers all keep track of their own enable count, let's add
> it into the regulator_summary.
>
> Signed-off-by: Douglas Anderson <dianders@chromium.org>
> Signed-off-by: Mark Brown <broonie@kernel.org>
> ---
>  drivers/regulator/core.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
> index ff5ca185bb8f..76ae6c0d734d 100644
> --- a/drivers/regulator/core.c
> +++ b/drivers/regulator/core.c
> @@ -5225,8 +5225,11 @@ static void regulator_summary_show_subtree(struct seq_file *s,
>
>                 switch (rdev->desc->type) {
>                 case REGULATOR_VOLTAGE:
> -                       seq_printf(s, "%37dmA %5dmV %5dmV",
> +                       seq_printf(s, "%3d %33dmA%c%5dmV %5dmV",
> +                                  consumer->enable_count,
>                                    consumer->uA_load / 1000,
> +                                  consumer->uA_load && !consumer->enable_count ?
> +                                  '*' : ' ',

Hold up!  How does this compile for you?  It looks as if you landed it
before ("regulator: core: Only count load for enabled consumers")
which is the patch that adds "enable_count" to the consumer structure.

I'm just working on my replies to you about the dependencies on these
patches but they're definitely not separate...

-Doug

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: Applied "regulator: core: add enable_count for consumers to debug fs" to the regulator tree
  2018-11-20 16:37 ` Doug Anderson
@ 2018-11-20 16:41   ` Mark Brown
  2018-11-20 16:44     ` Doug Anderson
  2018-11-20 16:47     ` Mark Brown
  0 siblings, 2 replies; 6+ messages in thread
From: Mark Brown @ 2018-11-20 16:41 UTC (permalink / raw)
  To: Doug Anderson; +Cc: LKML

[-- Attachment #1: Type: text/plain, Size: 548 bytes --]

On Tue, Nov 20, 2018 at 08:37:04AM -0800, Doug Anderson wrote:

> Hold up!  How does this compile for you?  It looks as if you landed it
> before ("regulator: core: Only count load for enabled consumers")
> which is the patch that adds "enable_count" to the consumer structure.

> I'm just working on my replies to you about the dependencies on these
> patches but they're definitely not separate...

Dunno, but my script for applying things does a build after each patch
and didn't complain so...  are you sure it's not e-mails getting
reordered?

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: Applied "regulator: core: add enable_count for consumers to debug fs" to the regulator tree
  2018-11-20 16:41   ` Mark Brown
@ 2018-11-20 16:44     ` Doug Anderson
  2018-11-20 16:47     ` Mark Brown
  1 sibling, 0 replies; 6+ messages in thread
From: Doug Anderson @ 2018-11-20 16:44 UTC (permalink / raw)
  To: Mark Brown; +Cc: LKML

Hi,

On Tue, Nov 20, 2018 at 8:41 AM Mark Brown <broonie@kernel.org> wrote:
>
> On Tue, Nov 20, 2018 at 08:37:04AM -0800, Doug Anderson wrote:
>
> > Hold up!  How does this compile for you?  It looks as if you landed it
> > before ("regulator: core: Only count load for enabled consumers")
> > which is the patch that adds "enable_count" to the consumer structure.
>
> > I'm just working on my replies to you about the dependencies on these
> > patches but they're definitely not separate...
>
> Dunno, but my script for applying things does a build after each patch
> and didn't complain so...  are you sure it's not e-mails getting
> reordered?

The first thing I did was to fetch linuxregulator/for-next and confirm
that it had this patch but not the patch it depends on.

Now I just tried checking out this git hash:

f556213bad39 ("regulator: core: add enable_count for consumers to debug fs")

When I build I get:

drivers/regulator/core.c: In function 'regulator_summary_show_subtree':
drivers/regulator/core.c:5229:16: error: 'struct regulator' has no
member named 'enable_count'
        consumer->enable_count,
                ^
drivers/regulator/core.c:5231:38: error: 'struct regulator' has no
member named 'enable_count'
        consumer->uA_load && !consumer->enable_count ?
                                      ^

...which is consistent with what I would expect.

-Doug

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: Applied "regulator: core: add enable_count for consumers to debug fs" to the regulator tree
  2018-11-20 16:41   ` Mark Brown
  2018-11-20 16:44     ` Doug Anderson
@ 2018-11-20 16:47     ` Mark Brown
  2018-11-20 16:49       ` Doug Anderson
  1 sibling, 1 reply; 6+ messages in thread
From: Mark Brown @ 2018-11-20 16:47 UTC (permalink / raw)
  To: Doug Anderson; +Cc: LKML

[-- Attachment #1: Type: text/plain, Size: 953 bytes --]

On Tue, Nov 20, 2018 at 04:41:25PM +0000, Mark Brown wrote:
> On Tue, Nov 20, 2018 at 08:37:04AM -0800, Doug Anderson wrote:
> 
> > Hold up!  How does this compile for you?  It looks as if you landed it
> > before ("regulator: core: Only count load for enabled consumers")
> > which is the patch that adds "enable_count" to the consumer structure.
> 
> > I'm just working on my replies to you about the dependencies on these
> > patches but they're definitely not separate...
> 
> Dunno, but my script for applying things does a build after each patch
> and didn't complain so...  are you sure it's not e-mails getting
> reordered?

Wait, no - I didn't apply that but my tree does compile at the minute
because my test config doesn't have debugfs enabled.  If I turn that on
then the relevant code gets built and I see an error.  I'll drop this.

This does, however, beg the question why this is a separate patch in the
first place?

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: Applied "regulator: core: add enable_count for consumers to debug fs" to the regulator tree
  2018-11-20 16:47     ` Mark Brown
@ 2018-11-20 16:49       ` Doug Anderson
  0 siblings, 0 replies; 6+ messages in thread
From: Doug Anderson @ 2018-11-20 16:49 UTC (permalink / raw)
  To: Mark Brown; +Cc: LKML

Hi,

On Tue, Nov 20, 2018 at 8:47 AM Mark Brown <broonie@kernel.org> wrote:
>
> On Tue, Nov 20, 2018 at 04:41:25PM +0000, Mark Brown wrote:
> > On Tue, Nov 20, 2018 at 08:37:04AM -0800, Doug Anderson wrote:
> >
> > > Hold up!  How does this compile for you?  It looks as if you landed it
> > > before ("regulator: core: Only count load for enabled consumers")
> > > which is the patch that adds "enable_count" to the consumer structure.
> >
> > > I'm just working on my replies to you about the dependencies on these
> > > patches but they're definitely not separate...
> >
> > Dunno, but my script for applying things does a build after each patch
> > and didn't complain so...  are you sure it's not e-mails getting
> > reordered?
>
> Wait, no - I didn't apply that but my tree does compile at the minute
> because my test config doesn't have debugfs enabled.  If I turn that on
> then the relevant code gets built and I see an error.  I'll drop this.
>
> This does, however, beg the question why this is a separate patch in the
> first place?

I'll squash the two together for v2.  I felt it might be controversial
to add this to debugfs but I guess not.

-Doug

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2018-11-20 16:50 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-20 16:28 Applied "regulator: core: add enable_count for consumers to debug fs" to the regulator tree Mark Brown
2018-11-20 16:37 ` Doug Anderson
2018-11-20 16:41   ` Mark Brown
2018-11-20 16:44     ` Doug Anderson
2018-11-20 16:47     ` Mark Brown
2018-11-20 16:49       ` Doug Anderson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).