[PATCH v2 0/2] modify the number of masters

[PATCH v2 0/2] modify the number of masters

[Chunyan Zhang]

sw_end represents the last software master, sw_start is index of the
first master, so the number of software masters should be
sw_end - sw_start + 1.

This patchset simply modified the similar issue in two modules.

Changes since V1:
* Split the only one patch of V1 into two separated patches according
  to Alex's comments

Chunyan Zhang (2):
  stm: the number of masters should be (sw_end - sw_start + 1)
  intel_th: the number of masters should be (sw_end - sw_start + 1)

 drivers/hwtracing/intel_th/sth.c | 2 +-
 drivers/hwtracing/stm/core.c     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

-- 
1.9.1

[PATCH v2 1/2] stm: the number of masters should be (sw_end - sw_start + 1)

[Chunyan Zhang]

sw_end represents the last software master, sw_start is index of the
first master, so the number of software masters should be
sw_end - sw_start + 1.

Signed-off-by: Chunyan Zhang <zhang.chunyan@linaro.org>
---
 drivers/hwtracing/stm/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/hwtracing/stm/core.c b/drivers/hwtracing/stm/core.c
index 7f7bdb3..cb676f2 100644
--- a/drivers/hwtracing/stm/core.c
+++ b/drivers/hwtracing/stm/core.c
@@ -632,7 +632,7 @@ int stm_register_device(struct device *parent, struct stm_data *stm_data,
 	if (!stm_data->packet || !stm_data->sw_nchannels)
 		return -EINVAL;
 
-	nmasters = stm_data->sw_end - stm_data->sw_start;
+	nmasters = stm_data->sw_end - stm_data->sw_start + 1;
 	stm = kzalloc(sizeof(*stm) + nmasters * sizeof(void *), GFP_KERNEL);
 	if (!stm)
 		return -ENOMEM;
-- 
1.9.1

[PATCH v2 2/2] intel_th: the number of masters should be (sw_end - sw_start + 1)

[Chunyan Zhang]

sw_end represents the last software master, sw_start is index of the
first master, so the number of software masters should be
sw_end - sw_start + 1.

Signed-off-by: Chunyan Zhang <zhang.chunyan@linaro.org>
---
 drivers/hwtracing/intel_th/sth.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/hwtracing/intel_th/sth.c b/drivers/hwtracing/intel_th/sth.c
index 56101c3..28917d7 100644
--- a/drivers/hwtracing/intel_th/sth.c
+++ b/drivers/hwtracing/intel_th/sth.c
@@ -173,7 +173,7 @@ static int intel_th_sw_init(struct sth_device *sth)
 	sth->stm.sw_start = reg & 0xffff;
 	sth->stm.sw_end = reg >> 16;
 
-	sth->sw_nmasters = sth->stm.sw_end - sth->stm.sw_start;
+	sth->sw_nmasters = sth->stm.sw_end - sth->stm.sw_start + 1;
 	dev_dbg(sth->dev, "sw_start: %x sw_end: %x masters: %x nchannels: %x\n",
 		sth->stm.sw_start, sth->stm.sw_end, sth->sw_nmasters,
 		sth->stm.sw_nchannels);
-- 
1.9.1

Re: [PATCH v2 2/2] intel_th: the number of masters should be (sw_end - sw_start + 1)

[Chunyan Zhang]

Hi Alex,

Is there any problem on this patch, I noticed that you lost this patch
when you sent a patchset to Greg for 4.4 merge.

Thanks,
Chunyan

On Fri, Dec 11, 2015 at 6:48 PM, Chunyan Zhang <zhang.chunyan@linaro.org> wrote:
> sw_end represents the last software master, sw_start is index of the
> first master, so the number of software masters should be
> sw_end - sw_start + 1.
>
> Signed-off-by: Chunyan Zhang <zhang.chunyan@linaro.org>
> ---
>  drivers/hwtracing/intel_th/sth.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/hwtracing/intel_th/sth.c b/drivers/hwtracing/intel_th/sth.c
> index 56101c3..28917d7 100644
> --- a/drivers/hwtracing/intel_th/sth.c
> +++ b/drivers/hwtracing/intel_th/sth.c
> @@ -173,7 +173,7 @@ static int intel_th_sw_init(struct sth_device *sth)
>         sth->stm.sw_start = reg & 0xffff;
>         sth->stm.sw_end = reg >> 16;
>
> -       sth->sw_nmasters = sth->stm.sw_end - sth->stm.sw_start;
> +       sth->sw_nmasters = sth->stm.sw_end - sth->stm.sw_start + 1;
>         dev_dbg(sth->dev, "sw_start: %x sw_end: %x masters: %x nchannels: %x\n",
>                 sth->stm.sw_start, sth->stm.sw_end, sth->sw_nmasters,
>                 sth->stm.sw_nchannels);
> --
> 1.9.1
>

Re: [PATCH v2 2/2] intel_th: the number of masters should be (sw_end - sw_start + 1)

[Alexander Shishkin]

Chunyan Zhang <zhang.chunyan@linaro.org> writes:

> Hi Alex,

Hi chunyan,

> Is there any problem on this patch, I noticed that you lost this patch
> when you sent a patchset to Greg for 4.4 merge.

No, there isn't, it just doesn't fix anything important to be sent
outside of merge window, but the other one does. I'll queue this one up
for the next merge window.

Well, actually, one thing, since you brought it up: can you fix the
commit message to be more in line with commit message guidelines? There
are many articles/blog posts on the internet that explain what and why
should be mentioned in a commit message.

Thanks,
--
Alex

Re: [PATCH v2 2/2] intel_th: the number of masters should be (sw_end - sw_start + 1)

[Chunyan Zhang]

On Thu, Jan 28, 2016 at 6:16 PM, Alexander Shishkin
<alexander.shishkin@linux.intel.com> wrote:
> Chunyan Zhang <zhang.chunyan@linaro.org> writes:
>
>> Hi Alex,
>
> Hi chunyan,
>
>> Is there any problem on this patch, I noticed that you lost this patch
>> when you sent a patchset to Greg for 4.4 merge.
>
> No, there isn't, it just doesn't fix anything important to be sent
> outside of merge window, but the other one does. I'll queue this one up
> for the next merge window.
>
> Well, actually, one thing, since you brought it up: can you fix the
> commit message to be more in line with commit message guidelines? There

Sure, I'll do.

Thanks,
Chunyan

> are many articles/blog posts on the internet that explain what and why
> should be mentioned in a commit message.
>
> Thanks,
> --
> Alex

[PATCH] intel_th: Show a correct number of masters in debug message

[Chunyan Zhang]

Since both sw_start and sw_end are master indices, the number of
software masters should be sw_end - sw_start + 1, which the current
code gets wrong, calculating one less than the actual value.

With this patch, the correct number of masters would be showed in the
debug message.

Signed-off-by: Chunyan Zhang <zhang.chunyan@linaro.org>
---
 drivers/hwtracing/intel_th/sth.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/hwtracing/intel_th/sth.c b/drivers/hwtracing/intel_th/sth.c
index 56101c3..28917d7 100644
--- a/drivers/hwtracing/intel_th/sth.c
+++ b/drivers/hwtracing/intel_th/sth.c
@@ -173,7 +173,7 @@ static int intel_th_sw_init(struct sth_device *sth)
 	sth->stm.sw_start = reg & 0xffff;
 	sth->stm.sw_end = reg >> 16;
 
-	sth->sw_nmasters = sth->stm.sw_end - sth->stm.sw_start;
+	sth->sw_nmasters = sth->stm.sw_end - sth->stm.sw_start + 1;
 	dev_dbg(sth->dev, "sw_start: %x sw_end: %x masters: %x nchannels: %x\n",
 		sth->stm.sw_start, sth->stm.sw_end, sth->sw_nmasters,
 		sth->stm.sw_nchannels);
-- 
1.9.1