Re: [PATCH] virtio-mmio: Fix irq parsing in command line parameter
Lee Jones writes: >> > Resorted to poaching now have we Pawel? > >> I hope you were joking! > > Yes, of course. I thought that was clearly indicated by the jovial winking > smiley. :) > > I realise it wasn't obvious soley by this exchange, but Pawel and I are > actually ol' friends. > >> Doing your work for you isn't poaching. > > This isn't related to my work, as I have no professional interest in > virtio. In this particular instance I was trying to help out by fixing bugs > uncovered by the use of randconfig, which I'm doing in my own time, as a > hobby. I guess the use my work address clouds this fact, so I apologise for > that. > > Sorry for any confusion or offence caused though Rusty. :) > > Kind regards, > Lee No offence for me. I just don't want bystanders to believe that there is some etiquette other than "best patch wins". Thanks for the clarification! Rusty. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] virtio-mmio: Fix irq parsing in command line parameter
Lee Jones writes: > On Mon, 05 Nov 2012, Pawel Moll wrote: > >> On 64-bit machines resource_size_t is a 64-bit value, while >> sscanf() format for this argument was defined as "%u". Fixed >> by using an intermediate local value of a known length. >> >> Also added cleaned up the resource creation and adde extra >> comments to make the parameters parsing easier to follow. >> >> Reported-by: Lee Jones >> Signed-off-by: Pawel Moll >> --- >> drivers/virtio/virtio_mmio.c | 26 ++ >> 1 file changed, 18 insertions(+), 8 deletions(-) > > Resorted to poaching now have we Pawel? ;) I hope you were joking! Doing your work for you isn't poaching. Your correct response was "thanks" followed by 'Tested-by:'. Cheers, Rusty. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] virtio-mmio: Fix irq parsing in command line parameter
On Mon, 05 Nov 2012, Pawel Moll wrote: > On Mon, 2012-11-05 at 13:44 +, Lee Jones wrote: > > On Mon, 05 Nov 2012, Pawel Moll wrote: > > > > > On 64-bit machines resource_size_t is a 64-bit value, while > > > sscanf() format for this argument was defined as "%u". Fixed > > > by using an intermediate local value of a known length. > > > > > > Also added cleaned up the resource creation and adde extra > > > comments to make the parameters parsing easier to follow. > > > > > > Reported-by: Lee Jones > > > Signed-off-by: Pawel Moll > > > --- > > > drivers/virtio/virtio_mmio.c | 26 ++ > > > 1 file changed, 18 insertions(+), 8 deletions(-) > > > > Resorted to poaching now have we Pawel? ;) > > Sure thing - the poached eggs are my firm favourite :-P ;-) > > But seriously speaking - it's an old patch (all the comments and > resources creation, the IRQ stuff is a new thing :-), but never had > enough motivation to push it out... I believe you, many would not. ;) -- Lee Jones Linaro ST-Ericsson Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] virtio-mmio: Fix irq parsing in command line parameter
On Mon, 2012-11-05 at 13:44 +, Lee Jones wrote: > On Mon, 05 Nov 2012, Pawel Moll wrote: > > > On 64-bit machines resource_size_t is a 64-bit value, while > > sscanf() format for this argument was defined as "%u". Fixed > > by using an intermediate local value of a known length. > > > > Also added cleaned up the resource creation and adde extra > > comments to make the parameters parsing easier to follow. > > > > Reported-by: Lee Jones > > Signed-off-by: Pawel Moll > > --- > > drivers/virtio/virtio_mmio.c | 26 ++ > > 1 file changed, 18 insertions(+), 8 deletions(-) > > Resorted to poaching now have we Pawel? ;) Sure thing - the poached eggs are my firm favourite :-P ;-) But seriously speaking - it's an old patch (all the comments and resources creation, the IRQ stuff is a new thing :-), but never had enough motivation to push it out... Cheers! Paweł -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] virtio-mmio: Fix irq parsing in command line parameter
On Mon, 05 Nov 2012, Pawel Moll wrote: > On 64-bit machines resource_size_t is a 64-bit value, while > sscanf() format for this argument was defined as "%u". Fixed > by using an intermediate local value of a known length. > > Also added cleaned up the resource creation and adde extra > comments to make the parameters parsing easier to follow. > > Reported-by: Lee Jones > Signed-off-by: Pawel Moll > --- > drivers/virtio/virtio_mmio.c | 26 ++ > 1 file changed, 18 insertions(+), 8 deletions(-) Resorted to poaching now have we Pawel? ;) -- Lee Jones Linaro ST-Ericsson Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH] virtio-mmio: Fix irq parsing in command line parameter
On 64-bit machines resource_size_t is a 64-bit value, while
sscanf() format for this argument was defined as "%u". Fixed
by using an intermediate local value of a known length.
Also added cleaned up the resource creation and adde extra
comments to make the parameters parsing easier to follow.
Reported-by: Lee Jones
Signed-off-by: Pawel Moll
---
drivers/virtio/virtio_mmio.c | 26 ++
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c
index 6b1b7e1..0d08843 100644
--- a/drivers/virtio/virtio_mmio.c
+++ b/drivers/virtio/virtio_mmio.c
@@ -521,25 +521,35 @@ static int vm_cmdline_set(const char *device,
int err;
struct resource resources[2] = {};
char *str;
- long long int base;
+ long long int base, size;
+ unsigned int irq;
int processed, consumed = 0;
struct platform_device *pdev;
- resources[0].flags = IORESOURCE_MEM;
- resources[1].flags = IORESOURCE_IRQ;
-
- resources[0].end = memparse(device, &str) - 1;
+ /* Get "size" part of the command line parameter */
+ size = memparse(device, &str) - 1;
+ /* Get "@:[:]" chunks */
processed = sscanf(str, "@%lli:%u%n:%d%n",
- &base, &resources[1].start, &consumed,
+ &base, &irq, &consumed,
&vm_cmdline_id, &consumed);
+ /*
+* sscanf() processes 3 chunks if "" is given, 2 if not;
+* also there must be no extra characters after the last
+* chunk, so str[consumed] should be '\0'
+*/
if (processed < 2 || processed > 3 || str[consumed])
return -EINVAL;
+ /* Memory resource */
+ resources[0].flags = IORESOURCE_MEM;
resources[0].start = base;
- resources[0].end += base;
- resources[1].end = resources[1].start;
+ resources[0].end = base + size;
+
+ /* Interrupt resource */
+ resources[1].flags = IORESOURCE_IRQ;
+ resources[1].start = resources[1].end = irq;
if (!vm_cmdline_parent_registered) {
err = device_register(&vm_cmdline_parent);
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
