GNSS fixes for v4.20-rc3 (take 2)
Johan Hovold
maintainerHi Greg,
Please ignore my previous pull request for GNSS fixes and consider this one instead.
I've now asked Stephen to include the GNSS tree in linux-next, and he immediately spotted the missing Sign-offs. I was too focused on how best to split the gnss and serdev patches and handle their dependency that I even forgot to post the GNSS patches to the list after setting up the new tree (hence the diff below).
Hopefully back in my usual routine after this.
Johan
The following changes since commit ccda4af0f4b92f7b4c308d3acc262f4a7e3affad:
Linux 4.20-rc2 (2018-11-11 17:12:31 -0600)
are available in the Git repository at:
https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git tags/gnss-4.20-rc3
for you to fetch changes up to 1decef370456870bf448a565be95db636428e106:
gnss: sirf: fix synchronous write timeout (2018-11-14 20:37:41 +0100)
----------------------------------------------------------------
GNSS fixes for v4.20-rc3
The two serdev drivers were using the wrong timeout argument when expecting the serdev_device_write() helper to wait indefinitely, something which could result in incomplete writes when the controller write buffer was getting full.
----------------------------------------------------------------
Johan Hovold (2):
gnss: serial: fix synchronous write timeout
gnss: sirf: fix synchronous write timeout
drivers/gnss/serial.c | 3 ++- drivers/gnss/sirf.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
drivers/gnss/serial.c +2 -1
@@ -13,6 +13,7 @@#include <linux/of.h> #include <linux/pm.h> #include <linux/pm_runtime.h> +#include <linux/sched.h> #include <linux/serdev.h> #include <linux/slab.h>
@@ -63,7 +64,7 @@ static int gnss_serial_write_raw(struct gnss_device *gdev,int ret;/* write is only buffered synchronously */ - ret =serdev_device_write (serdev, buf, count,0 ); + ret =serdev_device_write (serdev, buf, count,MAX_SCHEDULE_TIMEOUT );if (ret <0 )return ret;
drivers/gnss/sirf.c +2 -1
@@ -16,6 +16,7 @@#include <linux/pm.h> #include <linux/pm_runtime.h> #include <linux/regulator/consumer.h> +#include <linux/sched.h> #include <linux/serdev.h> #include <linux/slab.h> #include <linux/wait.h>
@@ -83,7 +84,7 @@ static int sirf_write_raw(struct gnss_device *gdev, const unsigned char *buf,int ret;/* write is only buffered synchronously */ - ret =serdev_device_write (serdev, buf, count,0 ); + ret =serdev_device_write (serdev, buf, count,MAX_SCHEDULE_TIMEOUT );if (ret <0 )return ret;
Quoted 16 lines · Johan Hovold
Hi Greg,
Please ignore my previous pull request for GNSS fixes and consider this one instead.
I've now asked Stephen to include the GNSS tree in linux-next, and he immediately spotted the missing Sign-offs. I was too focused on how best to split the gnss and serdev patches and handle their dependency that I even forgot to post the GNSS patches to the list after setting up the new tree (hence the diff below).
Hopefully back in my usual routine after this.
Johan
Quoted 7 lines
The following changes since commit
ccda4af0f4b92f7b4c308d3acc262f4a7e3affad:Linux 4.20-rc2 (2018-11-11 17:12:31 -0600)
are available in the Git repository at:
https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git tags/gnss-4.20-rc3
Now pulled. You will not get an automated email for this as I didn't want to email out all of the messages from -rc1 to -rc2 at the same time (problem on my side, not yours.)
thanks,
greg k-h