| Message ID | 1457418835-31417-2-git-send-email-zhang.chunyan@linaro.org |
|---|---|
| State | New |
| Headers | show |
On 31 March 2016 at 07:20, Alexander Shishkin <alexander.shishkin@linux.intel.com> wrote: > Mathieu Poirier <mathieu.poirier@linaro.org> writes: > >> On 21 March 2016 at 01:47, Alexander Shishkin >> <alexander.shishkin@linux.intel.com> wrote: >>> Chunyan Zhang <zhang.chunyan@linaro.org> writes: >>> >>>> From: Mathieu Poirier <mathieu.poirier@linaro.org> >>>> >>>> Some architecture like ARM assign masterIDs at the HW design >>>> phase. Those are therefore unreachable to users, making masterID >>>> management in the generic STM core irrelevant. >>>> >>>> In this kind of configuration channels are shared between masters >>>> rather than being allocated on a per master basis. >>>> >>>> This patch adds a new 'mshared' flag to struct stm_data that tells the >>>> core that this specific STM device doesn't need explicit masterID >>>> management. >>> >>> There are two kinds of 'masterIDs' that we're talking about here: the >>> ones that turn up in the STP stream and the ones that are accessible to >>> trace-side software (sw_start/sw_end). So in this case we want to >>> reflect the fact that there is no correlation between the two, because >>> hardware assigns STP channels dynamically based on the states of the >>> trace/execution environment. And although the trace side software can do >>> very little with this information, it does make sense to provide it. >>> >>> The sw_start==sw_end situation, on the other hand, is a side effect of >>> the above and, as I said in one of the previous threads, may not even be >>> the case, or at least I don't see why it has to. And when it is the >>> case, I don't see the point in handling it differently from >>> sw_start<sw_end situation. > > [snip] > >> Other than the above, is there anything you'd like to see modified in >> this patch, i.e how the mshared flag is used to modify the output in >> sysFS/configFS? > > Yes, the two paragraphs quoted above that had gone unnoticed. I've > been thinking some more about this and came up with the following. No > need to do any extra handling in the policy code or anywhere else. I read the above two paragraphs many times but simply couldn't find anything actionable in there. > > From 8be22a8e391b94ec13d428976e7b1410aa59991e Mon Sep 17 00:00:00 2001 > From: Alexander Shishkin <alexander.shishkin@linux.intel.com> > Date: Thu, 31 Mar 2016 15:51:29 +0300 > Subject: [PATCH] stm class: Support devices that override software assigned > masters > > Some STM devices adjust software assigned master numbers depending on > the trace source and its runtime state and whatnot. This patch adds > a sysfs attribute to inform the trace-side software that master numbers > assigned to software sources will not match those in the STP stream, > so that, for example, master/channel allocation policy can be adjusted > accordingly. > > Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com> > --- > Documentation/ABI/testing/sysfs-class-stm | 10 ++++++++++ > drivers/hwtracing/stm/core.c | 15 +++++++++++++++ > include/linux/stm.h | 3 +++ > 3 files changed, 28 insertions(+) > > diff --git a/Documentation/ABI/testing/sysfs-class-stm b/Documentation/ABI/testing/sysfs-class-stm > index c9aa4f3fc9..77ed3da0f6 100644 > --- a/Documentation/ABI/testing/sysfs-class-stm > +++ b/Documentation/ABI/testing/sysfs-class-stm > @@ -12,3 +12,13 @@ KernelVersion: 4.3 > Contact: Alexander Shishkin <alexander.shishkin@linux.intel.com> > Description: > Shows the number of channels per master on this STM device. > + > +What: /sys/class/stm/<stm>/hw_override > +Date: March 2016 > +KernelVersion: 4.7 > +Contact: Alexander Shishkin <alexander.shishkin@linux.intel.com> > +Description: > + Reads as 0 if master numbers in the STP stream produced by > + this stm device will match the master numbers assigned by > + the software or 1 if the stm hardware overrides software > + assigned masters. > diff --git a/drivers/hwtracing/stm/core.c b/drivers/hwtracing/stm/core.c > index 2591442e2c..ff31108b06 100644 > --- a/drivers/hwtracing/stm/core.c > +++ b/drivers/hwtracing/stm/core.c > @@ -67,9 +67,24 @@ static ssize_t channels_show(struct device *dev, > > static DEVICE_ATTR_RO(channels); > > +static ssize_t hw_override_show(struct device *dev, > + struct device_attribute *attr, > + char *buf) > +{ > + struct stm_device *stm = to_stm_device(dev); > + int ret; > + > + ret = sprintf(buf, "%u\n", stm->data->hw_override); > + > + return ret; > +} > + > +static DEVICE_ATTR_RO(hw_override); That's also a solution but it adds another entry to sysFS, something that could be avoided by tweaking the output we get from the current infrastructure. But I'm not strongly opinionated on that and I can go along with this suggestion - as long as users (that aren't familiar with the particulars of an STM) have a way of knowing what's going on. > + > static struct attribute *stm_attrs[] = { > &dev_attr_masters.attr, > &dev_attr_channels.attr, > + &dev_attr_hw_override.attr, > NULL, > }; > > diff --git a/include/linux/stm.h b/include/linux/stm.h > index 1a79ed8e43..8369d8a8ca 100644 > --- a/include/linux/stm.h > +++ b/include/linux/stm.h > @@ -50,6 +50,8 @@ struct stm_device; > * @sw_end: last STP master available to software > * @sw_nchannels: number of STP channels per master > * @sw_mmiosz: size of one channel's IO space, for mmap, optional > + * @hw_override: masters in the STP stream will not match the ones > + * assigned by software, but are up to the STM hardware > * @packet: callback that sends an STP packet > * @mmio_addr: mmap callback, optional > * @link: called when a new stm_source gets linked to us, optional > @@ -85,6 +87,7 @@ struct stm_data { > unsigned int sw_end; > unsigned int sw_nchannels; > unsigned int sw_mmiosz; > + unsigned int hw_override; > ssize_t (*packet)(struct stm_data *, unsigned int, > unsigned int, unsigned int, > unsigned int, unsigned int, > -- > 2.8.0.rc3 >
diff --git a/drivers/hwtracing/stm/core.c b/drivers/hwtracing/stm/core.c index 66cec56..0d7f1c5 100644 --- a/drivers/hwtracing/stm/core.c +++ b/drivers/hwtracing/stm/core.c @@ -44,9 +44,15 @@ static ssize_t masters_show(struct device *dev, char *buf) { struct stm_device *stm = to_stm_device(dev); - int ret; + int ret, sw_start, sw_end; + + sw_start = stm->data->sw_start; + sw_end = stm->data->sw_end; + + if (stm->data->mshared) + sw_start = sw_end = STM_SHARED_MASTERID; - ret = sprintf(buf, "%u %u\n", stm->data->sw_start, stm->data->sw_end); + ret = sprintf(buf, "%d %d\n", sw_start, sw_end); return ret; } @@ -618,6 +624,13 @@ int stm_register_device(struct device *parent, struct stm_data *stm_data, if (!stm_data->packet || !stm_data->sw_nchannels) return -EINVAL; + /* + * MasterIDs are assigned at HW design phase. As such the core is + * using a single master for interaction with this device. + */ + if (stm_data->mshared) + stm_data->sw_start = stm_data->sw_end = 1; + nmasters = stm_data->sw_end - stm_data->sw_start + 1; stm = kzalloc(sizeof(*stm) + nmasters * sizeof(void *), GFP_KERNEL); if (!stm) diff --git a/drivers/hwtracing/stm/policy.c b/drivers/hwtracing/stm/policy.c index 17a1416..19455db 100644 --- a/drivers/hwtracing/stm/policy.c +++ b/drivers/hwtracing/stm/policy.c @@ -80,10 +80,17 @@ static ssize_t stp_policy_node_masters_show(struct config_item *item, char *page) { struct stp_policy_node *policy_node = to_stp_policy_node(item); + struct stm_device *stm = policy_node->policy->stm; + int first_master, last_master; ssize_t count; - count = sprintf(page, "%u %u\n", policy_node->first_master, - policy_node->last_master); + first_master = policy_node->first_master; + last_master = policy_node->last_master; + + if (stm && stm->data->mshared) + first_master = last_master = STM_SHARED_MASTERID; + + count = sprintf(page, "%d %d\n", first_master, last_master); return count; } @@ -106,6 +113,13 @@ stp_policy_node_masters_store(struct config_item *item, const char *page, if (!stm) goto unlock; + /* + * masterIDs are allocated in HW, no point in trying to + * change their values. + */ + if (stm->data->mshared) + goto unlock; + /* must be within [sw_start..sw_end], which is an inclusive range */ if (first > INT_MAX || last > INT_MAX || first > last || first < stm->data->sw_start || diff --git a/include/linux/stm.h b/include/linux/stm.h index 9d0083d..6fac8b1 100644 --- a/include/linux/stm.h +++ b/include/linux/stm.h @@ -18,6 +18,11 @@ #include <linux/device.h> /** + * The masterIDs are set in hardware and can't be queried + */ +#define STM_SHARED_MASTERID -1 + +/** * enum stp_packet_type - STP packets that an STM driver sends */ enum stp_packet_type { @@ -46,6 +51,8 @@ struct stm_device; * struct stm_data - STM device description and callbacks * @name: device name * @stm: internal structure, only used by stm class code + * @mshared: true if masterIDs are assigned in HW. If so @sw_start + * and @sw_end are set to '1' by the core. * @sw_start: first STP master available to software * @sw_end: last STP master available to software * @sw_nchannels: number of STP channels per master @@ -71,6 +78,7 @@ struct stm_device; struct stm_data { const char *name; struct stm_device *stm; + bool mshared; unsigned int sw_start; unsigned int sw_end; unsigned int sw_nchannels;