From: Alexander Shishkin <alexander.shishkin@linux.intel.com>
To: Greg KH <greg@kroah.com>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>,
Chunyan Zhang <zhang.chunyan@linaro.org>,
laurent.fert@intel.com, yann.fouassier@intel.com,
linux-kernel@vger.kernel.org,
Alexander Shishkin <alexander.shishkin@linux.intel.com>
Subject: [QUEUED v0 19/19] intel_th: Use real device index in the node names
Date: Fri, 5 Feb 2016 18:35:28 +0200 [thread overview]
Message-ID: <1454690128-21994-20-git-send-email-alexander.shishkin@linux.intel.com> (raw)
In-Reply-To: <1454690128-21994-1-git-send-email-alexander.shishkin@linux.intel.com>
Most of the intel_th core supports multiple co-existing TH devices,
except for output device nodes, where intel_th device id is hardcoded
to be zero.
Fix this by fetching the actual intel_th device id from the parent
device's drvdata.
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
---
drivers/hwtracing/intel_th/core.c | 23 ++++++++++++++++++++---
1 file changed, 20 insertions(+), 3 deletions(-)
diff --git a/drivers/hwtracing/intel_th/core.c b/drivers/hwtracing/intel_th/core.c
index 6df3cd9774..4272f2ce5f 100644
--- a/drivers/hwtracing/intel_th/core.c
+++ b/drivers/hwtracing/intel_th/core.c
@@ -124,17 +124,34 @@ static struct device_type intel_th_source_device_type = {
.release = intel_th_device_release,
};
+static struct intel_th *to_intel_th(struct intel_th_device *thdev)
+{
+ /*
+ * subdevice tree is flat: if this one is not a switch, its
+ * parent must be
+ */
+ if (thdev->type != INTEL_TH_SWITCH)
+ thdev = to_intel_th_hub(thdev);
+
+ if (WARN_ON_ONCE(!thdev || thdev->type != INTEL_TH_SWITCH))
+ return NULL;
+
+ return dev_get_drvdata(thdev->dev.parent);
+}
+
static char *intel_th_output_devnode(struct device *dev, umode_t *mode,
kuid_t *uid, kgid_t *gid)
{
struct intel_th_device *thdev = to_intel_th_device(dev);
+ struct intel_th *th = to_intel_th(thdev);
char *node;
if (thdev->id >= 0)
- node = kasprintf(GFP_KERNEL, "intel_th%d/%s%d", 0, thdev->name,
- thdev->id);
+ node = kasprintf(GFP_KERNEL, "intel_th%d/%s%d", th->id,
+ thdev->name, thdev->id);
else
- node = kasprintf(GFP_KERNEL, "intel_th%d/%s", 0, thdev->name);
+ node = kasprintf(GFP_KERNEL, "intel_th%d/%s", th->id,
+ thdev->name);
return node;
}
--
2.7.0
prev parent reply other threads:[~2016-02-05 16:45 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-05 16:35 [QUEUED v0 00/19] stm class/intel_th: Patches in my queue Alexander Shishkin
2016-02-05 16:35 ` [QUEUED v0 01/19] stm class: Hide STM-specific options if STM is disabled Alexander Shishkin
2016-02-05 16:35 ` [QUEUED v0 02/19] intel_th: INTEL_TH should depend on HAS_DMA Alexander Shishkin
2016-02-05 16:35 ` [QUEUED v0 03/19] stm class: Select CONFIG_SRCU Alexander Shishkin
2016-02-05 16:35 ` [QUEUED v0 04/19] stm class: Fix locking in unbinding policy path Alexander Shishkin
2016-02-05 16:35 ` [QUEUED v0 05/19] stm class: Fix link list locking Alexander Shishkin
2016-02-05 16:35 ` [QUEUED v0 06/19] stm class: Fix an off-by-one in master array allocation Alexander Shishkin
2016-02-05 16:35 ` [QUEUED v0 07/19] stm class: Prevent user-controllable allocations Alexander Shishkin
2016-02-05 16:35 ` [QUEUED v0 08/19] intel_th: pci: Add Apollo Lake SOC support Alexander Shishkin
2016-02-05 16:35 ` [QUEUED v0 09/19] intel_th: pci: Add Broxton " Alexander Shishkin
2016-02-05 16:35 ` [QUEUED v0 10/19] stm class: Use a signed return type for stm_find_master_chan Alexander Shishkin
2016-02-05 16:35 ` [QUEUED v0 11/19] intel_th: Depend on HAS_IOMEM Alexander Shishkin
2016-02-05 16:35 ` [QUEUED v0 12/19] intel_th: gth: Remove commented-out code Alexander Shishkin
2016-02-05 16:35 ` [QUEUED v0 13/19] intel_th: Update scratchpad bits according to enabled output activity Alexander Shishkin
2016-02-05 16:35 ` [QUEUED v0 14/19] stm class: Use driver's packet callback's return value Alexander Shishkin
2016-02-05 16:35 ` [QUEUED v0 15/19] intel_th: sth: Sanitize packet callback's return values Alexander Shishkin
2016-02-05 16:35 ` [QUEUED v0 16/19] stm class: Support devices with multiple instances Alexander Shishkin
2016-02-05 16:35 ` [QUEUED v0 17/19] stm class: dummy_stm: Create multiple devices Alexander Shishkin
2016-02-05 16:35 ` [QUEUED v0 18/19] intel_th: Set root device's drvdata early Alexander Shishkin
2016-02-05 16:35 ` Alexander Shishkin [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1454690128-21994-20-git-send-email-alexander.shishkin@linux.intel.com \
--to=alexander.shishkin@linux.intel.com \
--cc=greg@kroah.com \
--cc=laurent.fert@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mathieu.poirier@linaro.org \
--cc=yann.fouassier@intel.com \
--cc=zhang.chunyan@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®