2015-12-11 10:49:01

by Chunyan Zhang

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

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

2015-12-11 10:49:07

by Chunyan Zhang

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

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 <[email protected]>
---
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

2015-12-11 10:49:13

by Chunyan Zhang

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

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 <[email protected]>
---
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