Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1303573 > unrolled thread
| Started by | Tomas Winkler <tomas.winkler@intel.com> |
|---|---|
| First post | 2016-01-07 14:00 +0100 |
| Last post | 2016-01-09 06:30 +0100 |
| Articles | 11 — 4 participants |
Back to article view | Back to linux.kernel
[char-misc-next RESEND 0/6] mei updates Tomas Winkler <tomas.winkler@intel.com> - 2016-01-07 14:00 +0100
[char-misc-next 3/6 RESEND] mei: prevent queuing new flow control credit. Tomas Winkler <tomas.winkler@intel.com> - 2016-01-07 14:00 +0100
[char-misc-next 1/6 RESEND] mei: bus: remove redundant uuid string in debug messages Tomas Winkler <tomas.winkler@intel.com> - 2016-01-07 14:00 +0100
Re: [char-misc-next RESEND 0/6] mei updates Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-01-07 18:40 +0100
RE: [char-misc-next RESEND 0/6] mei updates "Winkler, Tomas" <tomas.winkler@intel.com> - 2016-01-08 00:00 +0100
Re: [char-misc-next RESEND 0/6] mei updates Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-01-08 00:10 +0100
RE: [char-misc-next RESEND 0/6] mei updates "Winkler, Tomas" <tomas.winkler@intel.com> - 2016-01-08 00:40 +0100
Re: [char-misc-next RESEND 0/6] mei updates Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-01-08 02:10 +0100
Re: [char-misc-next RESEND 0/6] mei updates Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2016-01-09 06:10 +0100
Re: [char-misc-next RESEND 0/6] mei updates Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-01-09 06:20 +0100
Re: [char-misc-next RESEND 0/6] mei updates Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2016-01-09 06:30 +0100
| From | Tomas Winkler <tomas.winkler@intel.com> |
|---|---|
| Date | 2016-01-07 14:00 +0100 |
| Subject | [char-misc-next RESEND 0/6] mei updates |
| Message-ID | <qOiaR-8bd-15@gated-at.bofh.it> |
I've sent those patches ~ two months ago but were probably dropped from the queue so resending them again. Alexander Usyskin (2): mei: prevent queuing new flow control credit. mei: always copy the read buffer if data is ready Tomas Winkler (4): mei: bus: remove redundant uuid string in debug messages mei: trace pci configuration space io mei: fix fasync return value on error mei: drop nfc leftovers from the mei driver drivers/misc/mei/bus-fixup.c | 10 ++++------ drivers/misc/mei/client.c | 21 ++++++++++++++++++++- drivers/misc/mei/hw-me.c | 10 ++++++++-- drivers/misc/mei/hw-txe.c | 10 ++++++++-- drivers/misc/mei/main.c | 38 ++++++++++++++++++-------------------- drivers/misc/mei/mei-trace.c | 2 ++ drivers/misc/mei/mei-trace.h | 38 ++++++++++++++++++++++++++++++++++++++ drivers/misc/mei/mei_dev.h | 11 ----------- 8 files changed, 98 insertions(+), 42 deletions(-) -- 2.4.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | Tomas Winkler <tomas.winkler@intel.com> |
|---|---|
| Date | 2016-01-07 14:00 +0100 |
| Subject | [char-misc-next 3/6 RESEND] mei: prevent queuing new flow control credit. |
| Message-ID | <qOikz-8ew-25@gated-at.bofh.it> |
| In reply to | #1303573 |
From: Alexander Usyskin <alexander.usyskin@intel.com>
The MEI FW can receive only one flow control for read.
Currently the driver only checks if a flow control credit was already
sent and read is pending in the rd_pending queue, but it also has to
check if flow control credit already queued in the write control queue
to prevent sending more than one flow control credits.
Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
---
drivers/misc/mei/client.c | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/drivers/misc/mei/client.c b/drivers/misc/mei/client.c
index a6c87c713193..72e32615acd9 100644
--- a/drivers/misc/mei/client.c
+++ b/drivers/misc/mei/client.c
@@ -1422,6 +1422,25 @@ out:
}
/**
+ * mei_cl_is_read_fc_cb - check if read cb is waiting for flow control
+ * for given host client
+ *
+ * @cl: host client
+ *
+ * Return: true, if found at least one cb.
+ */
+static bool mei_cl_is_read_fc_cb(struct mei_cl *cl)
+{
+ struct mei_device *dev = cl->dev;
+ struct mei_cl_cb *cb;
+
+ list_for_each_entry(cb, &dev->ctrl_wr_list.list, list)
+ if (cb->fop_type == MEI_FOP_READ && cb->cl == cl)
+ return true;
+ return false;
+}
+
+/**
* mei_cl_read_start - the start read client message function.
*
* @cl: host client
@@ -1445,7 +1464,7 @@ int mei_cl_read_start(struct mei_cl *cl, size_t length, struct file *fp)
return -ENODEV;
/* HW currently supports only one pending read */
- if (!list_empty(&cl->rd_pending))
+ if (!list_empty(&cl->rd_pending) || mei_cl_is_read_fc_cb(cl))
return -EBUSY;
if (!mei_me_cl_is_active(cl->me_cl)) {
--
2.4.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Tomas Winkler <tomas.winkler@intel.com> |
|---|---|
| Date | 2016-01-07 14:00 +0100 |
| Subject | [char-misc-next 1/6 RESEND] mei: bus: remove redundant uuid string in debug messages |
| Message-ID | <qOikz-8ew-31@gated-at.bofh.it> |
| In reply to | #1303573 |
Remove uuid from the debug messages in bus-fixup.c
as this is already part of the device name.
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
---
drivers/misc/mei/bus-fixup.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/misc/mei/bus-fixup.c b/drivers/misc/mei/bus-fixup.c
index 020de5919c21..b2d2a6ea576c 100644
--- a/drivers/misc/mei/bus-fixup.c
+++ b/drivers/misc/mei/bus-fixup.c
@@ -48,8 +48,7 @@ static const uuid_le mei_nfc_info_guid = MEI_UUID_NFC_INFO;
*/
static void number_of_connections(struct mei_cl_device *cldev)
{
- dev_dbg(&cldev->dev, "running hook %s on %pUl\n",
- __func__, mei_me_cl_uuid(cldev->me_cl));
+ dev_dbg(&cldev->dev, "running hook %s\n", __func__);
if (cldev->me_cl->props.max_number_of_connections > 1)
cldev->do_match = 0;
@@ -62,8 +61,8 @@ static void number_of_connections(struct mei_cl_device *cldev)
*/
static void blacklist(struct mei_cl_device *cldev)
{
- dev_dbg(&cldev->dev, "running hook %s on %pUl\n",
- __func__, mei_me_cl_uuid(cldev->me_cl));
+ dev_dbg(&cldev->dev, "running hook %s\n", __func__);
+
cldev->do_match = 0;
}
@@ -208,8 +207,7 @@ static void mei_nfc(struct mei_cl_device *cldev)
bus = cldev->bus;
- dev_dbg(bus->dev, "running hook %s: %pUl match=%d\n",
- __func__, mei_me_cl_uuid(cldev->me_cl), cldev->do_match);
+ dev_dbg(&cldev->dev, "running hook %s\n", __func__);
mutex_lock(&bus->device_lock);
/* we need to connect to INFO GUID */
--
2.4.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
|---|---|
| Date | 2016-01-07 18:40 +0100 |
| Message-ID | <qOmHv-2SG-3@gated-at.bofh.it> |
| In reply to | #1303573 |
On Thu, Jan 07, 2016 at 02:46:33PM +0200, Tomas Winkler wrote: > I've sent those patches ~ two months ago but were probably dropped from > the queue so resending them again. sorry, they are still in there, it's been a busy few months, I'll get to these for the next release, it's too late for this one, my fault. greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | "Winkler, Tomas" <tomas.winkler@intel.com> |
|---|---|
| Date | 2016-01-08 00:00 +0100 |
| Message-ID | <qOrHb-6bs-9@gated-at.bofh.it> |
| In reply to | #1303755 |
> On Thu, Jan 07, 2016 at 02:46:33PM +0200, Tomas Winkler wrote: > > I've sent those patches ~ two months ago but were probably dropped from > > the queue so resending them again. > > sorry, they are still in there, it's been a busy few months, I'll get to > these for the next release, it's too late for this one, my fault. Can you be specific what is next release, the merging window is still not open... I have tons of patches it is just blocked by the watchdog removal from the core driver, which I've just reposted as well on top of this series. Thanks Tomas
[toc] | [prev] | [next] | [standalone]
| From | Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
|---|---|
| Date | 2016-01-08 00:10 +0100 |
| Message-ID | <qOrQS-6ud-27@gated-at.bofh.it> |
| In reply to | #1303975 |
On Thu, Jan 07, 2016 at 10:56:34PM +0000, Winkler, Tomas wrote: > > > > On Thu, Jan 07, 2016 at 02:46:33PM +0200, Tomas Winkler wrote: > > > I've sent those patches ~ two months ago but were probably dropped from > > > the queue so resending them again. > > > > sorry, they are still in there, it's been a busy few months, I'll get to > > these for the next release, it's too late for this one, my fault. > > Can you be specific what is next release, the merging window is still not open... The "merge window" is for subsystem maintainers to merge to Linus, I have to have my tree "closed" for a week before that for linux-next to settle down. It's been this way for a very long time. > I have tons of patches it is just blocked by the watchdog removal from > the core driver, which I've just reposted as well on top of this > series. Sorry for the delay these past 2 months, should be caught up for the next release cycle. And your watchdog repost wouldn't have made it into this release anyway :) thanks, greg k-h
[toc] | [prev] | [next] | [standalone]
| From | "Winkler, Tomas" <tomas.winkler@intel.com> |
|---|---|
| Date | 2016-01-08 00:40 +0100 |
| Message-ID | <qOsjU-6Hv-17@gated-at.bofh.it> |
| In reply to | #1303990 |
> > On Thu, Jan 07, 2016 at 10:56:34PM +0000, Winkler, Tomas wrote: > > > > > > > On Thu, Jan 07, 2016 at 02:46:33PM +0200, Tomas Winkler wrote: > > > > I've sent those patches ~ two months ago but were probably dropped from > > > > the queue so resending them again. > > > > > > sorry, they are still in there, it's been a busy few months, I'll get to > > > these for the next release, it's too late for this one, my fault. > > > > Can you be specific what is next release, the merging window is still not open... > > The "merge window" is for subsystem maintainers to merge to Linus, I > have to have my tree "closed" for a week before that for linux-next to > settle down. It's been this way for a very long time. Understood, I've just paid attention that the parport patches was applied last few days so I've also tried my luck Anyhow please reconsider ' mei: fix fasync return value on error' which was originally indented for 4.4-rc5 and should go to the stable. > > > I have tons of patches it is just blocked by the watchdog removal from > > the core driver, which I've just reposted as well on top of this > > series. > > Sorry for the delay these past 2 months, should be caught up for the > next release cycle. And your watchdog repost wouldn't have made it into > this release anyway :) Okay, I would just ask you to do give some priority to review our patches after the merging window so I don't have to carry too long queue for months. Tomas Thanks
[toc] | [prev] | [next] | [standalone]
| From | Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
|---|---|
| Date | 2016-01-08 02:10 +0100 |
| Message-ID | <qOtJ0-7JL-13@gated-at.bofh.it> |
| In reply to | #1304002 |
On Thu, Jan 07, 2016 at 11:32:20PM +0000, Winkler, Tomas wrote: > > > > > On Thu, Jan 07, 2016 at 10:56:34PM +0000, Winkler, Tomas wrote: > > > > > > > > > > On Thu, Jan 07, 2016 at 02:46:33PM +0200, Tomas Winkler wrote: > > > > > I've sent those patches ~ two months ago but were probably dropped from > > > > > the queue so resending them again. > > > > > > > > sorry, they are still in there, it's been a busy few months, I'll get to > > > > these for the next release, it's too late for this one, my fault. > > > > > > Can you be specific what is next release, the merging window is still not open... > > > > The "merge window" is for subsystem maintainers to merge to Linus, I > > have to have my tree "closed" for a week before that for linux-next to > > settle down. It's been this way for a very long time. > > Understood, I've just paid attention that the parport patches was > applied last few days so I've also tried my luck Anyhow please > reconsider ' mei: fix fasync return value on error' which was > originally indented for 4.4-rc5 and should go to the stable. the parport ones were tiny code style issues. I'll go look at this fasync patch now... thanks, greg k-h
[toc] | [prev] | [next] | [standalone]
| From | Sudip Mukherjee <sudipm.mukherjee@gmail.com> |
|---|---|
| Date | 2016-01-09 06:10 +0100 |
| Message-ID | <qOTWN-KP-1@gated-at.bofh.it> |
| In reply to | #1304084 |
On Thu, Jan 07, 2016 at 05:02:00PM -0800, Greg Kroah-Hartman wrote: > On Thu, Jan 07, 2016 at 11:32:20PM +0000, Winkler, Tomas wrote: > > > > > > > > On Thu, Jan 07, 2016 at 10:56:34PM +0000, Winkler, Tomas wrote: > > > > > > > > > > > > > On Thu, Jan 07, 2016 at 02:46:33PM +0200, Tomas Winkler wrote: > > > > > > I've sent those patches ~ two months ago but were probably dropped from > > > > > > the queue so resending them again. > > > > > > > > > > sorry, they are still in there, it's been a busy few months, I'll get to > > > > > these for the next release, it's too late for this one, my fault. > > > > > > > > Can you be specific what is next release, the merging window is still not open... > > > > > > The "merge window" is for subsystem maintainers to merge to Linus, I > > > have to have my tree "closed" for a week before that for linux-next to > > > settle down. It's been this way for a very long time. > > > > Understood, I've just paid attention that the parport patches was > > applied last few days so I've also tried my luck Anyhow please > > reconsider ' mei: fix fasync return value on error' which was > > originally indented for 4.4-rc5 and should go to the stable. > > the parport ones were tiny code style issues. I'll go look at this > fasync patch now... Thanks for the parport. I didn't expect you will apply that at this time. Can you please also have a look at: [PATCH] drivers/tty/serial: delete unused MODULE_DEVICE_TABLE from atmel_serial.c by Paul Gortmaker <paul.gortmaker@windriver.com> rc1 allmodconfig build will fail in some arch without this. But no hurries, since it is a fix it can go for rc2 also. :) regards sudip
[toc] | [prev] | [next] | [standalone]
| From | Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
|---|---|
| Date | 2016-01-09 06:20 +0100 |
| Message-ID | <qOU6t-Oz-1@gated-at.bofh.it> |
| In reply to | #1305174 |
On Sat, Jan 09, 2016 at 10:29:52AM +0530, Sudip Mukherjee wrote: > On Thu, Jan 07, 2016 at 05:02:00PM -0800, Greg Kroah-Hartman wrote: > > On Thu, Jan 07, 2016 at 11:32:20PM +0000, Winkler, Tomas wrote: > > > > > > > > > > > On Thu, Jan 07, 2016 at 10:56:34PM +0000, Winkler, Tomas wrote: > > > > > > > > > > > > > > > > On Thu, Jan 07, 2016 at 02:46:33PM +0200, Tomas Winkler wrote: > > > > > > > I've sent those patches ~ two months ago but were probably dropped from > > > > > > > the queue so resending them again. > > > > > > > > > > > > sorry, they are still in there, it's been a busy few months, I'll get to > > > > > > these for the next release, it's too late for this one, my fault. > > > > > > > > > > Can you be specific what is next release, the merging window is still not open... > > > > > > > > The "merge window" is for subsystem maintainers to merge to Linus, I > > > > have to have my tree "closed" for a week before that for linux-next to > > > > settle down. It's been this way for a very long time. > > > > > > Understood, I've just paid attention that the parport patches was > > > applied last few days so I've also tried my luck Anyhow please > > > reconsider ' mei: fix fasync return value on error' which was > > > originally indented for 4.4-rc5 and should go to the stable. > > > > the parport ones were tiny code style issues. I'll go look at this > > fasync patch now... > > Thanks for the parport. I didn't expect you will apply that at this > time. > Can you please also have a look at: > [PATCH] drivers/tty/serial: delete unused MODULE_DEVICE_TABLE from atmel_serial.c > by Paul Gortmaker <paul.gortmaker@windriver.com> > > rc1 allmodconfig build will fail in some arch without this. But no hurries, > since it is a fix it can go for rc2 also. :) Ah crap, I though I had picked up the needed tty/serial fixes, but I missed that one, thanks, will go get to it now... Is there anything else that you happened to notice that I should get into 4.5-rc1 that I missed? thanks, greg k-h
[toc] | [prev] | [next] | [standalone]
| From | Sudip Mukherjee <sudipm.mukherjee@gmail.com> |
|---|---|
| Date | 2016-01-09 06:30 +0100 |
| Message-ID | <qOUg9-X6-1@gated-at.bofh.it> |
| In reply to | #1305175 |
On Fri, Jan 08, 2016 at 09:10:11PM -0800, Greg Kroah-Hartman wrote: > On Sat, Jan 09, 2016 at 10:29:52AM +0530, Sudip Mukherjee wrote: > > On Thu, Jan 07, 2016 at 05:02:00PM -0800, Greg Kroah-Hartman wrote: > > > On Thu, Jan 07, 2016 at 11:32:20PM +0000, Winkler, Tomas wrote: > > > > > > > > > > > > > > On Thu, Jan 07, 2016 at 10:56:34PM +0000, Winkler, Tomas wrote: > > > > > > > > > > > > > > > > > > > On Thu, Jan 07, 2016 at 02:46:33PM +0200, Tomas Winkler wrote: > > > > > > > > I've sent those patches ~ two months ago but were probably dropped from > > > > > > > > the queue so resending them again. > > > > > > > > > > > > > > sorry, they are still in there, it's been a busy few months, I'll get to > > > > > > > these for the next release, it's too late for this one, my fault. > > > > > > > > > > > > Can you be specific what is next release, the merging window is still not open... > > > > > > > > > > The "merge window" is for subsystem maintainers to merge to Linus, I > > > > > have to have my tree "closed" for a week before that for linux-next to > > > > > settle down. It's been this way for a very long time. > > > > > > > > Understood, I've just paid attention that the parport patches was > > > > applied last few days so I've also tried my luck Anyhow please > > > > reconsider ' mei: fix fasync return value on error' which was > > > > originally indented for 4.4-rc5 and should go to the stable. > > > > > > the parport ones were tiny code style issues. I'll go look at this > > > fasync patch now... > > > > Thanks for the parport. I didn't expect you will apply that at this > > time. > > Can you please also have a look at: > > [PATCH] drivers/tty/serial: delete unused MODULE_DEVICE_TABLE from atmel_serial.c > > by Paul Gortmaker <paul.gortmaker@windriver.com> > > > > rc1 allmodconfig build will fail in some arch without this. But no hurries, > > since it is a fix it can go for rc2 also. :) > > Ah crap, I though I had picked up the needed tty/serial fixes, but I > missed that one, thanks, will go get to it now... Thanks. > > Is there anything else that you happened to notice that I should get > into 4.5-rc1 that I missed? Nothing else from your side I guess, atleast not related to any build failure that i monitor. There will be build failure related to some other patches, one in drm and one in media. They are not yet in linux-next so I don't have any idea if they will be included for rc1 or not. regards sudip
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web