* [PATCH] mei, make modules.alias UUID information easier to read
@ 2015-08-14 13:05 Prarit Bhargava
2015-08-28 11:50 ` Prarit Bhargava
2015-09-21 2:25 ` Greg Kroah-Hartman
0 siblings, 2 replies; 10+ messages in thread
From: Prarit Bhargava @ 2015-08-14 13:05 UTC (permalink / raw)
To: linux-kernel
Cc: Prarit Bhargava, Tomas Winkler, Greg Kroah-Hartman, Joe Perches,
David S. Miller, Jiri Kosina, Sharon Dvir, Suthikulpanit,
Suravee, Heikki Krogerus, James Hogan, Daniel Thompson,
Michael Opdenacker, David Cohen, Felipe Balbi, Ralf Baechle
2nd try on this ...
P.
---8<---
scripts/mod/file2alias.c:add_uuid() munges a UUID into a single string
which does not conform to the standard little endian UUID. This patch
changes add_uuid() to use the UUID correctly so that future drivers which
use UUID matches can simply use the %pUL format, and modifies the mei
driver with those changes.
Cc: Tomas Winkler <tomas.winkler@intel.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Joe Perches <joe@perches.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Sharon Dvir <sharon.dvir1@mail.huji.ac.il>
Cc: "Suthikulpanit, Suravee" <Suravee.Suthikulpanit@amd.com>
Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: Daniel Thompson <daniel.thompson@linaro.org>
Cc: Michael Opdenacker <michael.opdenacker@free-electrons.com>
Cc: David Cohen <david.a.cohen@linux.intel.com>
Cc: Felipe Balbi <balbi@ti.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Prarit Bhargava <prarit@redhat.com>
---
drivers/misc/mei/bus.c | 6 ++----
include/linux/mod_devicetable.h | 4 ----
scripts/mod/file2alias.c | 9 ++++++---
3 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/drivers/misc/mei/bus.c b/drivers/misc/mei/bus.c
index 458aa5a..457e132 100644
--- a/drivers/misc/mei/bus.c
+++ b/drivers/misc/mei/bus.c
@@ -141,8 +141,7 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *a,
const uuid_le *uuid = mei_me_cl_uuid(device->me_cl);
size_t len;
- len = snprintf(buf, PAGE_SIZE, "mei:%s:" MEI_CL_UUID_FMT ":",
- device->name, MEI_CL_UUID_ARGS(uuid->b));
+ len = snprintf(buf, PAGE_SIZE, "mei:%s:%pUl:", device->name, uuid);
return (len >= PAGE_SIZE) ? (PAGE_SIZE - 1) : len;
}
@@ -167,8 +166,7 @@ static int mei_cl_uevent(struct device *dev, struct kobj_uevent_env *env)
if (add_uevent_var(env, "MEI_CL_NAME=%s", device->name))
return -ENOMEM;
- if (add_uevent_var(env, "MODALIAS=mei:%s:" MEI_CL_UUID_FMT ":",
- device->name, MEI_CL_UUID_ARGS(uuid->b)))
+ if (add_uevent_var(env, "MODALIAS=mei:%s:%pUl:", device->name, uuid))
return -ENOMEM;
return 0;
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index 34f25b7..becda6f 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -601,10 +601,6 @@ struct ipack_device_id {
#define MEI_CL_MODULE_PREFIX "mei:"
#define MEI_CL_NAME_SIZE 32
-#define MEI_CL_UUID_FMT "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x"
-#define MEI_CL_UUID_ARGS(_u) \
- _u[0], _u[1], _u[2], _u[3], _u[4], _u[5], _u[6], _u[7], \
- _u[8], _u[9], _u[10], _u[11], _u[12], _u[13], _u[14], _u[15]
/**
* struct mei_cl_device_id - MEI client device identifier
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 5f20882..8a46c60 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -137,10 +137,13 @@ static inline void add_wildcard(char *str)
static inline void add_uuid(char *str, uuid_le uuid)
{
int len = strlen(str);
- int i;
- for (i = 0; i < 16; i++)
- sprintf(str + len + (i << 1), "%02x", uuid.b[i]);
+ sprintf(str + len,
+ "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+ uuid.b[3], uuid.b[2], uuid.b[1], uuid.b[0],
+ uuid.b[5], uuid.b[4], uuid.b[7], uuid.b[6],
+ uuid.b[8], uuid.b[9], uuid.b[10], uuid.b[11],
+ uuid.b[12], uuid.b[13], uuid.b[14], uuid.b[15]);
}
/**
--
1.7.9.3
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH] mei, make modules.alias UUID information easier to read
2015-08-14 13:05 [PATCH] mei, make modules.alias UUID information easier to read Prarit Bhargava
@ 2015-08-28 11:50 ` Prarit Bhargava
2015-08-28 12:46 ` Heikki Krogerus
2015-09-21 2:25 ` Greg Kroah-Hartman
1 sibling, 1 reply; 10+ messages in thread
From: Prarit Bhargava @ 2015-08-28 11:50 UTC (permalink / raw)
To: Heikki Krogerus, Winkler, Tomas, Linux Kernel
Heikki, Tomas?
P.
On 08/14/2015 09:05 AM, Prarit Bhargava wrote:
> 2nd try on this ...
>
> P.
>
> ---8<---
>
> scripts/mod/file2alias.c:add_uuid() munges a UUID into a single string
> which does not conform to the standard little endian UUID. This patch
> changes add_uuid() to use the UUID correctly so that future drivers which
> use UUID matches can simply use the %pUL format, and modifies the mei
> driver with those changes.
>
> Cc: Tomas Winkler <tomas.winkler@intel.com>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Joe Perches <joe@perches.com>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Jiri Kosina <jkosina@suse.cz>
> Cc: Sharon Dvir <sharon.dvir1@mail.huji.ac.il>
> Cc: "Suthikulpanit, Suravee" <Suravee.Suthikulpanit@amd.com>
> Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> Cc: James Hogan <james.hogan@imgtec.com>
> Cc: Daniel Thompson <daniel.thompson@linaro.org>
> Cc: Michael Opdenacker <michael.opdenacker@free-electrons.com>
> Cc: David Cohen <david.a.cohen@linux.intel.com>
> Cc: Felipe Balbi <balbi@ti.com>
> Cc: Ralf Baechle <ralf@linux-mips.org>
>
> Signed-off-by: Prarit Bhargava <prarit@redhat.com>
> ---
> drivers/misc/mei/bus.c | 6 ++----
> include/linux/mod_devicetable.h | 4 ----
> scripts/mod/file2alias.c | 9 ++++++---
> 3 files changed, 8 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/misc/mei/bus.c b/drivers/misc/mei/bus.c
> index 458aa5a..457e132 100644
> --- a/drivers/misc/mei/bus.c
> +++ b/drivers/misc/mei/bus.c
> @@ -141,8 +141,7 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *a,
> const uuid_le *uuid = mei_me_cl_uuid(device->me_cl);
> size_t len;
>
> - len = snprintf(buf, PAGE_SIZE, "mei:%s:" MEI_CL_UUID_FMT ":",
> - device->name, MEI_CL_UUID_ARGS(uuid->b));
> + len = snprintf(buf, PAGE_SIZE, "mei:%s:%pUl:", device->name, uuid);
>
> return (len >= PAGE_SIZE) ? (PAGE_SIZE - 1) : len;
> }
> @@ -167,8 +166,7 @@ static int mei_cl_uevent(struct device *dev, struct kobj_uevent_env *env)
> if (add_uevent_var(env, "MEI_CL_NAME=%s", device->name))
> return -ENOMEM;
>
> - if (add_uevent_var(env, "MODALIAS=mei:%s:" MEI_CL_UUID_FMT ":",
> - device->name, MEI_CL_UUID_ARGS(uuid->b)))
> + if (add_uevent_var(env, "MODALIAS=mei:%s:%pUl:", device->name, uuid))
> return -ENOMEM;
>
> return 0;
> diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
> index 34f25b7..becda6f 100644
> --- a/include/linux/mod_devicetable.h
> +++ b/include/linux/mod_devicetable.h
> @@ -601,10 +601,6 @@ struct ipack_device_id {
>
> #define MEI_CL_MODULE_PREFIX "mei:"
> #define MEI_CL_NAME_SIZE 32
> -#define MEI_CL_UUID_FMT "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x"
> -#define MEI_CL_UUID_ARGS(_u) \
> - _u[0], _u[1], _u[2], _u[3], _u[4], _u[5], _u[6], _u[7], \
> - _u[8], _u[9], _u[10], _u[11], _u[12], _u[13], _u[14], _u[15]
>
> /**
> * struct mei_cl_device_id - MEI client device identifier
> diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
> index 5f20882..8a46c60 100644
> --- a/scripts/mod/file2alias.c
> +++ b/scripts/mod/file2alias.c
> @@ -137,10 +137,13 @@ static inline void add_wildcard(char *str)
> static inline void add_uuid(char *str, uuid_le uuid)
> {
> int len = strlen(str);
> - int i;
>
> - for (i = 0; i < 16; i++)
> - sprintf(str + len + (i << 1), "%02x", uuid.b[i]);
> + sprintf(str + len,
> + "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
> + uuid.b[3], uuid.b[2], uuid.b[1], uuid.b[0],
> + uuid.b[5], uuid.b[4], uuid.b[7], uuid.b[6],
> + uuid.b[8], uuid.b[9], uuid.b[10], uuid.b[11],
> + uuid.b[12], uuid.b[13], uuid.b[14], uuid.b[15]);
> }
>
> /**
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] mei, make modules.alias UUID information easier to read
2015-08-28 11:50 ` Prarit Bhargava
@ 2015-08-28 12:46 ` Heikki Krogerus
2015-08-29 21:21 ` Winkler, Tomas
0 siblings, 1 reply; 10+ messages in thread
From: Heikki Krogerus @ 2015-08-28 12:46 UTC (permalink / raw)
To: Prarit Bhargava; +Cc: Winkler, Tomas, Linux Kernel, Samuel Ortiz
Hi Prarit,
On Fri, Aug 28, 2015 at 07:50:52AM -0400, Prarit Bhargava wrote:
> Heikki, Tomas?
I'm afraid I don't know much about Intel's Management Engine
Interface. Looks like the driver is from Samuel (CC'd) so I'm guessing
he is the person you wanted comments from and not me.
cheers,
> On 08/14/2015 09:05 AM, Prarit Bhargava wrote:
> > 2nd try on this ...
> >
> > P.
> >
> > ---8<---
> >
> > scripts/mod/file2alias.c:add_uuid() munges a UUID into a single string
> > which does not conform to the standard little endian UUID. This patch
> > changes add_uuid() to use the UUID correctly so that future drivers which
> > use UUID matches can simply use the %pUL format, and modifies the mei
> > driver with those changes.
> >
> > Cc: Tomas Winkler <tomas.winkler@intel.com>
> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > Cc: Joe Perches <joe@perches.com>
> > Cc: "David S. Miller" <davem@davemloft.net>
> > Cc: Jiri Kosina <jkosina@suse.cz>
> > Cc: Sharon Dvir <sharon.dvir1@mail.huji.ac.il>
> > Cc: "Suthikulpanit, Suravee" <Suravee.Suthikulpanit@amd.com>
> > Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> > Cc: James Hogan <james.hogan@imgtec.com>
> > Cc: Daniel Thompson <daniel.thompson@linaro.org>
> > Cc: Michael Opdenacker <michael.opdenacker@free-electrons.com>
> > Cc: David Cohen <david.a.cohen@linux.intel.com>
> > Cc: Felipe Balbi <balbi@ti.com>
> > Cc: Ralf Baechle <ralf@linux-mips.org>
> >
> > Signed-off-by: Prarit Bhargava <prarit@redhat.com>
> > ---
> > drivers/misc/mei/bus.c | 6 ++----
> > include/linux/mod_devicetable.h | 4 ----
> > scripts/mod/file2alias.c | 9 ++++++---
> > 3 files changed, 8 insertions(+), 11 deletions(-)
> >
> > diff --git a/drivers/misc/mei/bus.c b/drivers/misc/mei/bus.c
> > index 458aa5a..457e132 100644
> > --- a/drivers/misc/mei/bus.c
> > +++ b/drivers/misc/mei/bus.c
> > @@ -141,8 +141,7 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *a,
> > const uuid_le *uuid = mei_me_cl_uuid(device->me_cl);
> > size_t len;
> >
> > - len = snprintf(buf, PAGE_SIZE, "mei:%s:" MEI_CL_UUID_FMT ":",
> > - device->name, MEI_CL_UUID_ARGS(uuid->b));
> > + len = snprintf(buf, PAGE_SIZE, "mei:%s:%pUl:", device->name, uuid);
> >
> > return (len >= PAGE_SIZE) ? (PAGE_SIZE - 1) : len;
> > }
> > @@ -167,8 +166,7 @@ static int mei_cl_uevent(struct device *dev, struct kobj_uevent_env *env)
> > if (add_uevent_var(env, "MEI_CL_NAME=%s", device->name))
> > return -ENOMEM;
> >
> > - if (add_uevent_var(env, "MODALIAS=mei:%s:" MEI_CL_UUID_FMT ":",
> > - device->name, MEI_CL_UUID_ARGS(uuid->b)))
> > + if (add_uevent_var(env, "MODALIAS=mei:%s:%pUl:", device->name, uuid))
> > return -ENOMEM;
> >
> > return 0;
> > diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
> > index 34f25b7..becda6f 100644
> > --- a/include/linux/mod_devicetable.h
> > +++ b/include/linux/mod_devicetable.h
> > @@ -601,10 +601,6 @@ struct ipack_device_id {
> >
> > #define MEI_CL_MODULE_PREFIX "mei:"
> > #define MEI_CL_NAME_SIZE 32
> > -#define MEI_CL_UUID_FMT "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x"
> > -#define MEI_CL_UUID_ARGS(_u) \
> > - _u[0], _u[1], _u[2], _u[3], _u[4], _u[5], _u[6], _u[7], \
> > - _u[8], _u[9], _u[10], _u[11], _u[12], _u[13], _u[14], _u[15]
> >
> > /**
> > * struct mei_cl_device_id - MEI client device identifier
> > diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
> > index 5f20882..8a46c60 100644
> > --- a/scripts/mod/file2alias.c
> > +++ b/scripts/mod/file2alias.c
> > @@ -137,10 +137,13 @@ static inline void add_wildcard(char *str)
> > static inline void add_uuid(char *str, uuid_le uuid)
> > {
> > int len = strlen(str);
> > - int i;
> >
> > - for (i = 0; i < 16; i++)
> > - sprintf(str + len + (i << 1), "%02x", uuid.b[i]);
> > + sprintf(str + len,
> > + "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
> > + uuid.b[3], uuid.b[2], uuid.b[1], uuid.b[0],
> > + uuid.b[5], uuid.b[4], uuid.b[7], uuid.b[6],
> > + uuid.b[8], uuid.b[9], uuid.b[10], uuid.b[11],
> > + uuid.b[12], uuid.b[13], uuid.b[14], uuid.b[15]);
> > }
> >
> > /**
--
heikki
^ permalink raw reply [flat|nested] 10+ messages in thread
* RE: [PATCH] mei, make modules.alias UUID information easier to read
2015-08-28 12:46 ` Heikki Krogerus
@ 2015-08-29 21:21 ` Winkler, Tomas
2015-08-30 17:36 ` Prarit Bhargava
2015-09-01 0:09 ` Prarit Bhargava
0 siblings, 2 replies; 10+ messages in thread
From: Winkler, Tomas @ 2015-08-29 21:21 UTC (permalink / raw)
To: Prarit Bhargava, Heikki Krogerus; +Cc: Linux Kernel, Samuel Ortiz
>
> Hi Prarit,
>
> On Fri, Aug 28, 2015 at 07:50:52AM -0400, Prarit Bhargava wrote:
> > Heikki, Tomas?
>
> I'm afraid I don't know much about Intel's Management Engine
> Interface. Looks like the driver is from Samuel (CC'd) so I'm guessing
> he is the person you wanted comments from and not me.
>
The patch was done against the master branch instead of char-misc-next so it doesn't apply. Anyhow I've rebased it already and I'm testing it.
I will probably re-post it, with your permission with my other mei bus fixes.
BTW, I took the inspiration from vmbus in regards to uuid representation so it if the uuid sting hurts you, you may fix vmbus as well. I don't have any vmbus setup and I try not to fix things I cannot check.
Thanks
Tomas
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] mei, make modules.alias UUID information easier to read
2015-08-29 21:21 ` Winkler, Tomas
@ 2015-08-30 17:36 ` Prarit Bhargava
2015-08-31 7:17 ` Winkler, Tomas
2015-09-01 0:09 ` Prarit Bhargava
1 sibling, 1 reply; 10+ messages in thread
From: Prarit Bhargava @ 2015-08-30 17:36 UTC (permalink / raw)
To: Winkler, Tomas, Heikki Krogerus; +Cc: Linux Kernel, Samuel Ortiz
On 08/29/2015 05:21 PM, Winkler, Tomas wrote:
>>
>> Hi Prarit,
>>
>> On Fri, Aug 28, 2015 at 07:50:52AM -0400, Prarit Bhargava wrote:
>>> Heikki, Tomas?
>>
>> I'm afraid I don't know much about Intel's Management Engine
>> Interface. Looks like the driver is from Samuel (CC'd) so I'm guessing
>> he is the person you wanted comments from and not me.
>>
>
> The patch was done against the master branch instead of char-misc-next so it doesn't apply. Anyhow I've rebased it already and I'm testing it.
> I will probably re-post it, with your permission with my other mei bus fixes.
Tomas, can you send me a link to your tree?
>
> BTW, I took the inspiration from vmbus in regards to uuid representation so it if the uuid sting hurts you, you may fix vmbus as well. I don't have any vmbus setup and I try not to fix things I cannot check.
>
I'll find a system that I can test vmbus on.
P.
> Thanks
> Tomas
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* RE: [PATCH] mei, make modules.alias UUID information easier to read
2015-08-30 17:36 ` Prarit Bhargava
@ 2015-08-31 7:17 ` Winkler, Tomas
0 siblings, 0 replies; 10+ messages in thread
From: Winkler, Tomas @ 2015-08-31 7:17 UTC (permalink / raw)
To: Prarit Bhargava, Heikki Krogerus; +Cc: Linux Kernel, Samuel Ortiz
> On 08/29/2015 05:21 PM, Winkler, Tomas wrote:
> >>
> >> Hi Prarit,
> >>
> >> On Fri, Aug 28, 2015 at 07:50:52AM -0400, Prarit Bhargava wrote:
> >>> Heikki, Tomas?
> >>
> >> I'm afraid I don't know much about Intel's Management Engine
> >> Interface. Looks like the driver is from Samuel (CC'd) so I'm guessing
> >> he is the person you wanted comments from and not me.
> >>
> >
> > The patch was done against the master branch instead of char-misc-next so it
> doesn't apply. Anyhow I've rebased it already and I'm testing it.
> > I will probably re-post it, with your permission with my other mei bus fixes.
>
> Tomas, can you send me a link to your tree?
Sorry, it is not public. But it is very close to what is on git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc-next branch
I will send new patches soon ... after 4.3-rc1 is out.
Thanks
Tomas
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] mei, make modules.alias UUID information easier to read
2015-08-29 21:21 ` Winkler, Tomas
2015-08-30 17:36 ` Prarit Bhargava
@ 2015-09-01 0:09 ` Prarit Bhargava
1 sibling, 0 replies; 10+ messages in thread
From: Prarit Bhargava @ 2015-09-01 0:09 UTC (permalink / raw)
To: Winkler, Tomas, Heikki Krogerus
Cc: Linux Kernel, Samuel Ortiz, Kershner, David A, Ben Romer
On 08/29/2015 05:21 PM, Winkler, Tomas wrote:
>>
>> Hi Prarit,
>>
>> On Fri, Aug 28, 2015 at 07:50:52AM -0400, Prarit Bhargava wrote:
>>> Heikki, Tomas?
>>
>> I'm afraid I don't know much about Intel's Management Engine
>> Interface. Looks like the driver is from Samuel (CC'd) so I'm guessing
>> he is the person you wanted comments from and not me.
>>
>
> The patch was done against the master branch instead of char-misc-next so it doesn't apply. Anyhow I've rebased it already and I'm testing it.
> I will probably re-post it, with your permission with my other mei bus fixes.
>
Yep, only requires some minor adjustments in order to apply to char-misc-next.
Please repost when you can. FYI: this is needed to bring drivers/staging/unisys
out of the staging directory.
> BTW, I took the inspiration from vmbus in regards to uuid representation so it if the uuid sting hurts you, you may fix vmbus as well. I don't have any vmbus setup and I try not to fix things I cannot check.
>
I didn't recall other users of add_uuid() but took a look anway.
do_vmbus_entry() doesn't call add_uuid() like do_mei_entry() does. However,
the vmbus code should also just simply use add_uuid(). I can do that after
this patch gets into the kernel, as it isn't absolutely necessary to fix like
do_mei_entry(). It should be a trivial drivers/hv patch to fix all
that up.
P.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] mei, make modules.alias UUID information easier to read
2015-08-14 13:05 [PATCH] mei, make modules.alias UUID information easier to read Prarit Bhargava
2015-08-28 11:50 ` Prarit Bhargava
@ 2015-09-21 2:25 ` Greg Kroah-Hartman
2015-09-21 8:13 ` Winkler, Tomas
1 sibling, 1 reply; 10+ messages in thread
From: Greg Kroah-Hartman @ 2015-09-21 2:25 UTC (permalink / raw)
To: Prarit Bhargava
Cc: linux-kernel, Tomas Winkler, Joe Perches, David S. Miller,
Jiri Kosina, Sharon Dvir, Suthikulpanit, Suravee,
Heikki Krogerus, James Hogan, Daniel Thompson,
Michael Opdenacker, David Cohen, Felipe Balbi, Ralf Baechle
On Fri, Aug 14, 2015 at 09:05:40AM -0400, Prarit Bhargava wrote:
> 2nd try on this ...
What changed from the first patch? I need some "version information" to
figure out what is going on.
Can you resend it with that information?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 10+ messages in thread
* RE: [PATCH] mei, make modules.alias UUID information easier to read
2015-09-21 2:25 ` Greg Kroah-Hartman
@ 2015-09-21 8:13 ` Winkler, Tomas
0 siblings, 0 replies; 10+ messages in thread
From: Winkler, Tomas @ 2015-09-21 8:13 UTC (permalink / raw)
To: Greg Kroah-Hartman, Prarit Bhargava
Cc: linux-kernel, Joe Perches, David S. Miller, Jiri Kosina,
Sharon Dvir, Suthikulpanit, Suravee, Heikki Krogerus,
James Hogan, Daniel Thompson, Michael Opdenacker, David Cohen,
Felipe Balbi, Ralf Baechle
> -----Original Message-----
> From: Greg Kroah-Hartman [mailto:gregkh@linuxfoundation.org]
> Sent: Monday, September 21, 2015 05:25
> To: Prarit Bhargava
> Cc: linux-kernel@vger.kernel.org; Winkler, Tomas; Joe Perches; David S. Miller; Jiri
> Kosina; Sharon Dvir; Suthikulpanit, Suravee; Heikki Krogerus; James Hogan; Daniel
> Thompson; Michael Opdenacker; David Cohen; Felipe Balbi; Ralf Baechle
> Subject: Re: [PATCH] mei, make modules.alias UUID information easier to read
>
> On Fri, Aug 14, 2015 at 09:05:40AM -0400, Prarit Bhargava wrote:
> > 2nd try on this ...
>
> What changed from the first patch? I need some "version information" to
> figure out what is going on.
>
> Can you resend it with that information?
>
> thanks,
I saw you've already merged it to the testing branch so I'm not resending,
Anyhow the original patch was done over Linus' master branch instead of char-misc-next so it needed a rebase.
Thanks.
Tomas
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH] mei, make modules.alias UUID information easier to read
@ 2015-08-07 14:06 Prarit Bhargava
0 siblings, 0 replies; 10+ messages in thread
From: Prarit Bhargava @ 2015-08-07 14:06 UTC (permalink / raw)
To: linux-kernel; +Cc: Prarit Bhargava, Tomas Winkler, Greg Kroah-Hartman
scripts/mod/file2alias.c:add_uuid() munges a UUID into a single string
which does not conform to the standard little endian UUID. This patch
changes add_uuid() to use the UUID correctly so that future drivers which
use UUID matches can simply use the %pUL format, and modifies the mei
driver with those changes.
Cc: Tomas Winkler <tomas.winkler@intel.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Prarit Bhargava <prarit@redhat.com>
---
drivers/misc/mei/bus.c | 6 ++----
include/linux/mod_devicetable.h | 4 ----
scripts/mod/file2alias.c | 9 ++++++---
3 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/drivers/misc/mei/bus.c b/drivers/misc/mei/bus.c
index 458aa5a..457e132 100644
--- a/drivers/misc/mei/bus.c
+++ b/drivers/misc/mei/bus.c
@@ -141,8 +141,7 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *a,
const uuid_le *uuid = mei_me_cl_uuid(device->me_cl);
size_t len;
- len = snprintf(buf, PAGE_SIZE, "mei:%s:" MEI_CL_UUID_FMT ":",
- device->name, MEI_CL_UUID_ARGS(uuid->b));
+ len = snprintf(buf, PAGE_SIZE, "mei:%s:%pUl:", device->name, uuid);
return (len >= PAGE_SIZE) ? (PAGE_SIZE - 1) : len;
}
@@ -167,8 +166,7 @@ static int mei_cl_uevent(struct device *dev, struct kobj_uevent_env *env)
if (add_uevent_var(env, "MEI_CL_NAME=%s", device->name))
return -ENOMEM;
- if (add_uevent_var(env, "MODALIAS=mei:%s:" MEI_CL_UUID_FMT ":",
- device->name, MEI_CL_UUID_ARGS(uuid->b)))
+ if (add_uevent_var(env, "MODALIAS=mei:%s:%pUl:", device->name, uuid))
return -ENOMEM;
return 0;
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index 34f25b7..becda6f 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -601,10 +601,6 @@ struct ipack_device_id {
#define MEI_CL_MODULE_PREFIX "mei:"
#define MEI_CL_NAME_SIZE 32
-#define MEI_CL_UUID_FMT "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x"
-#define MEI_CL_UUID_ARGS(_u) \
- _u[0], _u[1], _u[2], _u[3], _u[4], _u[5], _u[6], _u[7], \
- _u[8], _u[9], _u[10], _u[11], _u[12], _u[13], _u[14], _u[15]
/**
* struct mei_cl_device_id - MEI client device identifier
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 5f20882..8a46c60 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -137,10 +137,13 @@ static inline void add_wildcard(char *str)
static inline void add_uuid(char *str, uuid_le uuid)
{
int len = strlen(str);
- int i;
- for (i = 0; i < 16; i++)
- sprintf(str + len + (i << 1), "%02x", uuid.b[i]);
+ sprintf(str + len,
+ "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+ uuid.b[3], uuid.b[2], uuid.b[1], uuid.b[0],
+ uuid.b[5], uuid.b[4], uuid.b[7], uuid.b[6],
+ uuid.b[8], uuid.b[9], uuid.b[10], uuid.b[11],
+ uuid.b[12], uuid.b[13], uuid.b[14], uuid.b[15]);
}
/**
--
1.7.9.3
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2015-09-21 8:13 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-08-14 13:05 [PATCH] mei, make modules.alias UUID information easier to read Prarit Bhargava
2015-08-28 11:50 ` Prarit Bhargava
2015-08-28 12:46 ` Heikki Krogerus
2015-08-29 21:21 ` Winkler, Tomas
2015-08-30 17:36 ` Prarit Bhargava
2015-08-31 7:17 ` Winkler, Tomas
2015-09-01 0:09 ` Prarit Bhargava
2015-09-21 2:25 ` Greg Kroah-Hartman
2015-09-21 8:13 ` Winkler, Tomas
-- strict thread matches above, loose matches on Subject: below --
2015-08-07 14:06 Prarit Bhargava
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).