[GIT PULL 2/6] stm class: sys-t: Fix the use of time_after()

[GIT PULL 2/6] stm class: sys-t: Fix the use of time_after()

[Alexander Shishkin]

The operands of time_after() are in a wrong order in both instances in
the sys-t driver. Fix that.

Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Fixes: 39f10239df75 ("stm class: p_sys-t: Add support for CLOCKSYNC packets")
Fixes: d69d5e83110f ("stm class: Add MIPI SyS-T protocol support")
Cc: stable@vger.kernel.org # v4.20+
---
 drivers/hwtracing/stm/p_sys-t.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/hwtracing/stm/p_sys-t.c b/drivers/hwtracing/stm/p_sys-t.c
index b178a5495b67..360b5c03df95 100644
--- a/drivers/hwtracing/stm/p_sys-t.c
+++ b/drivers/hwtracing/stm/p_sys-t.c
@@ -238,7 +238,7 @@ static struct configfs_attribute *sys_t_policy_attrs[] = {
 static inline bool sys_t_need_ts(struct sys_t_output *op)
 {
 	if (op->node.ts_interval &&
-	    time_after(op->ts_jiffies + op->node.ts_interval, jiffies)) {
+	    time_after(jiffies, op->ts_jiffies + op->node.ts_interval)) {
 		op->ts_jiffies = jiffies;
 
 		return true;
@@ -250,8 +250,8 @@ static inline bool sys_t_need_ts(struct sys_t_output *op)
 static bool sys_t_need_clock_sync(struct sys_t_output *op)
 {
 	if (op->node.clocksync_interval &&
-	    time_after(op->clocksync_jiffies + op->node.clocksync_interval,
-		       jiffies)) {
+	    time_after(jiffies,
+		       op->clocksync_jiffies + op->node.clocksync_interval)) {
 		op->clocksync_jiffies = jiffies;
 
 		return true;
-- 
2.25.1

[GIT PULL 4/6] intel_th: msu: Fix the unexpected state warning

[Alexander Shishkin]

The unexpected state warning should only warn on illegal state
transitions. Fix that.

Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Fixes: 615c164da0eb4 ("intel_th: msu: Introduce buffer interface")
Cc: stable@vger.kernel.org # v5.4+
---
 drivers/hwtracing/intel_th/msu.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/hwtracing/intel_th/msu.c b/drivers/hwtracing/intel_th/msu.c
index 45916b48bcf0..7ac7dd4d3b1c 100644
--- a/drivers/hwtracing/intel_th/msu.c
+++ b/drivers/hwtracing/intel_th/msu.c
@@ -722,9 +722,6 @@ static int msc_win_set_lockout(struct msc_window *win,
 
 	if (old != expect) {
 		ret = -EINVAL;
-		dev_warn_ratelimited(msc_dev(win->msc),
-				     "expected lockout state %d, got %d\n",
-				     expect, old);
 		goto unlock;
 	}
 
@@ -745,6 +742,10 @@ static int msc_win_set_lockout(struct msc_window *win,
 		/* from intel_th_msc_window_unlock(), don't warn if not locked */
 		if (expect == WIN_LOCKED && old == new)
 			return 0;
+
+		dev_warn_ratelimited(msc_dev(win->msc),
+				     "expected lockout state %d, got %d\n",
+				     expect, old);
 	}
 
 	return ret;
-- 
2.25.1

[GIT PULL 5/6] intel_th: Fix user-visible error codes

[Alexander Shishkin]

There are a few places in the driver that end up returning ENOTSUPP to
the user, replace those with EINVAL.

Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Fixes: ba82664c134ef ("intel_th: Add Memory Storage Unit driver")
Cc: stable@vger.kernel.org # v4.4+
---
 drivers/hwtracing/intel_th/msu.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/hwtracing/intel_th/msu.c b/drivers/hwtracing/intel_th/msu.c
index 7ac7dd4d3b1c..f08e9e883710 100644
--- a/drivers/hwtracing/intel_th/msu.c
+++ b/drivers/hwtracing/intel_th/msu.c
@@ -765,7 +765,7 @@ static int msc_configure(struct msc *msc)
 	lockdep_assert_held(&msc->buf_mutex);
 
 	if (msc->mode > MSC_MODE_MULTI)
-		return -ENOTSUPP;
+		return -EINVAL;
 
 	if (msc->mode == MSC_MODE_MULTI) {
 		if (msc_win_set_lockout(msc->cur_win, WIN_READY, WIN_INUSE))
@@ -1299,7 +1299,7 @@ static int msc_buffer_alloc(struct msc *msc, unsigned long *nr_pages,
 	} else if (msc->mode == MSC_MODE_MULTI) {
 		ret = msc_buffer_multi_alloc(msc, nr_pages, nr_wins);
 	} else {
-		ret = -ENOTSUPP;
+		ret = -EINVAL;
 	}
 
 	if (!ret) {
@@ -1535,7 +1535,7 @@ static ssize_t intel_th_msc_read(struct file *file, char __user *buf,
 		if (ret >= 0)
 			*ppos = iter->offset;
 	} else {
-		ret = -ENOTSUPP;
+		ret = -EINVAL;
 	}
 
 put_count:
-- 
2.25.1

[GIT PULL 6/6] intel_th: pci: Add Elkhart Lake CPU support

[Alexander Shishkin]

This adds support for the Trace Hub in Elkhart Lake CPU.

Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: stable@vger.kernel.org
---
 drivers/hwtracing/intel_th/pci.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/hwtracing/intel_th/pci.c b/drivers/hwtracing/intel_th/pci.c
index ad7e51ebe49e..7ccac74553a6 100644
--- a/drivers/hwtracing/intel_th/pci.c
+++ b/drivers/hwtracing/intel_th/pci.c
@@ -238,6 +238,11 @@ static const struct pci_device_id intel_th_pci_id_table[] = {
 		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x4da6),
 		.driver_data = (kernel_ulong_t)&intel_th_2x,
 	},
+	{
+		/* Elkhart Lake CPU */
+		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x4529),
+		.driver_data = (kernel_ulong_t)&intel_th_2x,
+	},
 	{
 		/* Elkhart Lake */
 		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x4b26),
-- 
2.25.1

Re: [GIT PULL 6/6] intel_th: pci: Add Elkhart Lake CPU support

[Sasha Levin]

Hi

[This is an automated email]

This commit has been processed because it contains a -stable tag.
The stable tag indicates that it's relevant for the following trees: all

The bot has tested the following trees: v5.5.9, v5.4.25, v4.19.109, v4.14.173, v4.9.216, v4.4.216.

v5.5.9: Build OK!
v5.4.25: Build OK!
v4.19.109: Build OK!
v4.14.173: Build OK!
v4.9.216: Failed to apply! Possible dependencies:
    4aa5aed2b6f2 ("intel_th: pci: Add Ice Lake NNPI support")
    59d08d00d43c ("intel_th: pci: Add Ice Lake PCH support")
    88385866bab8 ("intel_th: pci: Add Elkhart Lake SOC support")
    920ce7c33db2 ("intel_th: pci: Add Cedar Fork PCH support")
    9c78255fdde4 ("intel_th: pci: Add Tiger Lake support")
    9d55499d8da4 ("intel_th: pci: Add Jasper Lake PCH support")
    e60e9a4b231a ("intel_th: pci: Add Comet Lake support")

v4.4.216: Failed to apply! Possible dependencies:
    4aa5aed2b6f2 ("intel_th: pci: Add Ice Lake NNPI support")
    59d08d00d43c ("intel_th: pci: Add Ice Lake PCH support")
    88385866bab8 ("intel_th: pci: Add Elkhart Lake SOC support")
    920ce7c33db2 ("intel_th: pci: Add Cedar Fork PCH support")
    9c78255fdde4 ("intel_th: pci: Add Tiger Lake support")
    9d55499d8da4 ("intel_th: pci: Add Jasper Lake PCH support")
    e60e9a4b231a ("intel_th: pci: Add Comet Lake support")


NOTE: The patch will not be queued to stable trees until it is upstream.

How should we proceed with this patch?

-- 
Thanks
Sasha

Re: [GIT PULL 2/6] stm class: sys-t: Fix the use of time_after()

[Greg Kroah-Hartman]

On Tue, Mar 17, 2020 at 08:22:11AM +0200, Alexander Shishkin wrote:
> The operands of time_after() are in a wrong order in both instances in
> the sys-t driver. Fix that.
> 
> Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Fixes: 39f10239df75 ("stm class: p_sys-t: Add support for CLOCKSYNC packets")
> Fixes: d69d5e83110f ("stm class: Add MIPI SyS-T protocol support")
> Cc: stable@vger.kernel.org # v4.20+
> ---
>  drivers/hwtracing/stm/p_sys-t.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

This should go to 5.6-final, right?

Don't mix and match patches in a series if possible...

greg k-h

Re: [GIT PULL 4/6] intel_th: msu: Fix the unexpected state warning

[Greg Kroah-Hartman]

On Tue, Mar 17, 2020 at 08:22:13AM +0200, Alexander Shishkin wrote:
> The unexpected state warning should only warn on illegal state
> transitions. Fix that.
> 
> Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Fixes: 615c164da0eb4 ("intel_th: msu: Introduce buffer interface")
> Cc: stable@vger.kernel.org # v5.4+
> ---
>  drivers/hwtracing/intel_th/msu.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)

I'll add this to the 5.6-final pile...

Re: [GIT PULL 5/6] intel_th: Fix user-visible error codes

[Greg Kroah-Hartman]

On Tue, Mar 17, 2020 at 08:22:14AM +0200, Alexander Shishkin wrote:
> There are a few places in the driver that end up returning ENOTSUPP to
> the user, replace those with EINVAL.
> 
> Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Fixes: ba82664c134ef ("intel_th: Add Memory Storage Unit driver")
> Cc: stable@vger.kernel.org # v4.4+
> ---
>  drivers/hwtracing/intel_th/msu.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

Same here, for 5.6

Re: [GIT PULL 6/6] intel_th: pci: Add Elkhart Lake CPU support

[Greg Kroah-Hartman]

On Tue, Mar 17, 2020 at 08:22:15AM +0200, Alexander Shishkin wrote:
> This adds support for the Trace Hub in Elkhart Lake CPU.
> 
> Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Cc: stable@vger.kernel.org
> ---
>  drivers/hwtracing/intel_th/pci.c | 5 +++++
>  1 file changed, 5 insertions(+)

And again, for 5.6.

Wow this pull request was messed up.  Let's go back to just normal patch
series submissions please.  If I hadn't seen that build warning, this
would have been a mess.

greg k-h