* [PATCH 1/4] staging: vchiq_core: Use printk messages for devices
2024-04-20 11:53 [PATCH 0/4] staging: vchiq_core: Minor clean-ups Stefan Wahren
@ 2024-04-20 11:53 ` Stefan Wahren
2024-04-21 8:53 ` Umang Jain
2024-04-20 11:53 ` [PATCH 2/4] staging: vchiq_core: Add parentheses to VCHIQ_MSG_SRCPORT Stefan Wahren
` (2 subsequent siblings)
3 siblings, 1 reply; 9+ messages in thread
From: Stefan Wahren @ 2024-04-20 11:53 UTC (permalink / raw)
To: Greg Kroah-Hartman, Florian Fainelli
Cc: Umang Jain, Laurent Pinchart, linux-staging, linux-arm-kernel,
Stefan Wahren
Now that struct vchiq_state has a device reference, we can convert
the remaining printk message helpers.
Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
---
.../vc04_services/interface/vchiq_arm/vchiq_core.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
index 3397365e551e..129d73fec2bf 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
@@ -697,7 +697,8 @@ reserve_space(struct vchiq_state *state, size_t space, int is_blocking)
if (tx_pos == (state->slot_queue_available * VCHIQ_SLOT_SIZE)) {
complete(&state->slot_available_event);
- pr_warn("%s: invalid tx_pos: %d\n", __func__, tx_pos);
+ dev_warn(state->dev, "%s: invalid tx_pos: %d\n",
+ __func__, tx_pos);
return NULL;
}
@@ -1732,10 +1733,9 @@ parse_message(struct vchiq_state *state, struct vchiq_header *header)
break;
}
if (queue->process != queue->remote_insert) {
- pr_err("%s: p %x != ri %x\n",
- __func__,
- queue->process,
- queue->remote_insert);
+ dev_err(state->dev, "%s: p %x != ri %x\n",
+ __func__, queue->process,
+ queue->remote_insert);
mutex_unlock(&service->bulk_mutex);
goto bail_not_ready;
}
--
2.34.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 1/4] staging: vchiq_core: Use printk messages for devices
2024-04-20 11:53 ` [PATCH 1/4] staging: vchiq_core: Use printk messages for devices Stefan Wahren
@ 2024-04-21 8:53 ` Umang Jain
0 siblings, 0 replies; 9+ messages in thread
From: Umang Jain @ 2024-04-21 8:53 UTC (permalink / raw)
To: Stefan Wahren, Greg Kroah-Hartman, Florian Fainelli
Cc: Laurent Pinchart, linux-staging, linux-arm-kernel
Hi Stefan,
Thank you for the patch
On 20/04/24 5:23 pm, Stefan Wahren wrote:
> Now that struct vchiq_state has a device reference, we can convert
> the remaining printk message helpers.
>
> Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>
> ---
> .../vc04_services/interface/vchiq_arm/vchiq_core.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
> index 3397365e551e..129d73fec2bf 100644
> --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
> +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
> @@ -697,7 +697,8 @@ reserve_space(struct vchiq_state *state, size_t space, int is_blocking)
>
> if (tx_pos == (state->slot_queue_available * VCHIQ_SLOT_SIZE)) {
> complete(&state->slot_available_event);
> - pr_warn("%s: invalid tx_pos: %d\n", __func__, tx_pos);
> + dev_warn(state->dev, "%s: invalid tx_pos: %d\n",
> + __func__, tx_pos);
> return NULL;
> }
>
> @@ -1732,10 +1733,9 @@ parse_message(struct vchiq_state *state, struct vchiq_header *header)
> break;
> }
> if (queue->process != queue->remote_insert) {
> - pr_err("%s: p %x != ri %x\n",
> - __func__,
> - queue->process,
> - queue->remote_insert);
> + dev_err(state->dev, "%s: p %x != ri %x\n",
> + __func__, queue->process,
> + queue->remote_insert);
> mutex_unlock(&service->bulk_mutex);
> goto bail_not_ready;
> }
> --
> 2.34.1
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 2/4] staging: vchiq_core: Add parentheses to VCHIQ_MSG_SRCPORT
2024-04-20 11:53 [PATCH 0/4] staging: vchiq_core: Minor clean-ups Stefan Wahren
2024-04-20 11:53 ` [PATCH 1/4] staging: vchiq_core: Use printk messages for devices Stefan Wahren
@ 2024-04-20 11:53 ` Stefan Wahren
2024-04-21 8:54 ` Umang Jain
2024-04-20 11:53 ` [PATCH 3/4] staging: vchiq_core: Drop unnecessary blank lines Stefan Wahren
2024-04-20 11:53 ` [PATCH 4/4] staging: vchiq_core: Add missing " Stefan Wahren
3 siblings, 1 reply; 9+ messages in thread
From: Stefan Wahren @ 2024-04-20 11:53 UTC (permalink / raw)
To: Greg Kroah-Hartman, Florian Fainelli
Cc: Umang Jain, Laurent Pinchart, linux-staging, linux-arm-kernel,
Stefan Wahren
checkpatch.pl complains
ERROR: Macros with complex values should be enclosed in parentheses
+#define VCHIQ_MSG_SRCPORT(msgid) \
+ (unsigned short)(((unsigned int)(msgid) >> 12) & 0xfff)
Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
---
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
index 129d73fec2bf..58451ee08abc 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
@@ -43,7 +43,7 @@
(((type) << TYPE_SHIFT) | ((srcport) << 12) | ((dstport) << 0))
#define VCHIQ_MSG_TYPE(msgid) ((unsigned int)(msgid) >> TYPE_SHIFT)
#define VCHIQ_MSG_SRCPORT(msgid) \
- (unsigned short)(((unsigned int)(msgid) >> 12) & 0xfff)
+ ((unsigned short)(((unsigned int)(msgid) >> 12) & 0xfff))
#define VCHIQ_MSG_DSTPORT(msgid) \
((unsigned short)(msgid) & 0xfff)
--
2.34.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 2/4] staging: vchiq_core: Add parentheses to VCHIQ_MSG_SRCPORT
2024-04-20 11:53 ` [PATCH 2/4] staging: vchiq_core: Add parentheses to VCHIQ_MSG_SRCPORT Stefan Wahren
@ 2024-04-21 8:54 ` Umang Jain
0 siblings, 0 replies; 9+ messages in thread
From: Umang Jain @ 2024-04-21 8:54 UTC (permalink / raw)
To: Stefan Wahren, Greg Kroah-Hartman, Florian Fainelli
Cc: Laurent Pinchart, linux-staging, linux-arm-kernel
Hi Stefan
On 20/04/24 5:23 pm, Stefan Wahren wrote:
> checkpatch.pl complains
>
> ERROR: Macros with complex values should be enclosed in parentheses
> +#define VCHIQ_MSG_SRCPORT(msgid) \
> + (unsigned short)(((unsigned int)(msgid) >> 12) & 0xfff)
>
> Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>
> ---
> drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
> index 129d73fec2bf..58451ee08abc 100644
> --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
> +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
> @@ -43,7 +43,7 @@
> (((type) << TYPE_SHIFT) | ((srcport) << 12) | ((dstport) << 0))
> #define VCHIQ_MSG_TYPE(msgid) ((unsigned int)(msgid) >> TYPE_SHIFT)
> #define VCHIQ_MSG_SRCPORT(msgid) \
> - (unsigned short)(((unsigned int)(msgid) >> 12) & 0xfff)
> + ((unsigned short)(((unsigned int)(msgid) >> 12) & 0xfff))
> #define VCHIQ_MSG_DSTPORT(msgid) \
> ((unsigned short)(msgid) & 0xfff)
>
> --
> 2.34.1
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 3/4] staging: vchiq_core: Drop unnecessary blank lines
2024-04-20 11:53 [PATCH 0/4] staging: vchiq_core: Minor clean-ups Stefan Wahren
2024-04-20 11:53 ` [PATCH 1/4] staging: vchiq_core: Use printk messages for devices Stefan Wahren
2024-04-20 11:53 ` [PATCH 2/4] staging: vchiq_core: Add parentheses to VCHIQ_MSG_SRCPORT Stefan Wahren
@ 2024-04-20 11:53 ` Stefan Wahren
2024-04-21 8:55 ` Umang Jain
2024-04-20 11:53 ` [PATCH 4/4] staging: vchiq_core: Add missing " Stefan Wahren
3 siblings, 1 reply; 9+ messages in thread
From: Stefan Wahren @ 2024-04-20 11:53 UTC (permalink / raw)
To: Greg Kroah-Hartman, Florian Fainelli
Cc: Umang Jain, Laurent Pinchart, linux-staging, linux-arm-kernel,
Stefan Wahren
chechpatch.pl noticed
CHECK: Please don't use multiple blank lines
So drop them.
Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
---
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
index 58451ee08abc..ca32902afe06 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
@@ -1190,7 +1190,6 @@ queue_message_sync(struct vchiq_state *state, struct vchiq_service *service,
header->size = size;
header->msgid = msgid;
-
svc_fourcc = service ? service->base.fourcc
: VCHIQ_MAKE_FOURCC('?', '?', '?', '?');
@@ -1616,7 +1615,6 @@ parse_message(struct vchiq_state *state, struct vchiq_header *header)
break;
}
-
svc_fourcc = service ? service->base.fourcc
: VCHIQ_MAKE_FOURCC('?', '?', '?', '?');
--
2.34.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 3/4] staging: vchiq_core: Drop unnecessary blank lines
2024-04-20 11:53 ` [PATCH 3/4] staging: vchiq_core: Drop unnecessary blank lines Stefan Wahren
@ 2024-04-21 8:55 ` Umang Jain
0 siblings, 0 replies; 9+ messages in thread
From: Umang Jain @ 2024-04-21 8:55 UTC (permalink / raw)
To: Stefan Wahren, Greg Kroah-Hartman, Florian Fainelli
Cc: Laurent Pinchart, linux-staging, linux-arm-kernel
Hi Stefan,
Thank you for the patch
On 20/04/24 5:23 pm, Stefan Wahren wrote:
> chechpatch.pl noticed
s/chechpatch.pl/checkpatch.pl
>
> CHECK: Please don't use multiple blank lines
>
> So drop them.
>
> Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>
> ---
> drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
> index 58451ee08abc..ca32902afe06 100644
> --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
> +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
> @@ -1190,7 +1190,6 @@ queue_message_sync(struct vchiq_state *state, struct vchiq_service *service,
> header->size = size;
> header->msgid = msgid;
>
> -
> svc_fourcc = service ? service->base.fourcc
> : VCHIQ_MAKE_FOURCC('?', '?', '?', '?');
>
> @@ -1616,7 +1615,6 @@ parse_message(struct vchiq_state *state, struct vchiq_header *header)
> break;
> }
>
> -
> svc_fourcc = service ? service->base.fourcc
> : VCHIQ_MAKE_FOURCC('?', '?', '?', '?');
>
> --
> 2.34.1
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 4/4] staging: vchiq_core: Add missing blank lines
2024-04-20 11:53 [PATCH 0/4] staging: vchiq_core: Minor clean-ups Stefan Wahren
` (2 preceding siblings ...)
2024-04-20 11:53 ` [PATCH 3/4] staging: vchiq_core: Drop unnecessary blank lines Stefan Wahren
@ 2024-04-20 11:53 ` Stefan Wahren
2024-04-21 8:55 ` Umang Jain
3 siblings, 1 reply; 9+ messages in thread
From: Stefan Wahren @ 2024-04-20 11:53 UTC (permalink / raw)
To: Greg Kroah-Hartman, Florian Fainelli
Cc: Umang Jain, Laurent Pinchart, linux-staging, linux-arm-kernel,
Stefan Wahren
checkpatch.pl noticed about missing blank line after 2 declarations.
So add them for better readability.
Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
---
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
index ca32902afe06..df3af821f218 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
@@ -227,6 +227,7 @@ struct vchiq_service *handle_to_service(struct vchiq_instance *instance, unsigne
return rcu_dereference(instance->state->services[idx]);
}
+
struct vchiq_service *
find_service_by_handle(struct vchiq_instance *instance, unsigned int handle)
{
@@ -2176,6 +2177,7 @@ vchiq_init_state(struct vchiq_state *state, struct vchiq_slot_zero *slot_zero, s
for (i = 0; i < VCHIQ_MAX_SERVICES; i++) {
struct vchiq_service_quota *quota = &state->service_quotas[i];
+
init_completion("a->quota_event);
}
--
2.34.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 4/4] staging: vchiq_core: Add missing blank lines
2024-04-20 11:53 ` [PATCH 4/4] staging: vchiq_core: Add missing " Stefan Wahren
@ 2024-04-21 8:55 ` Umang Jain
0 siblings, 0 replies; 9+ messages in thread
From: Umang Jain @ 2024-04-21 8:55 UTC (permalink / raw)
To: Stefan Wahren, Greg Kroah-Hartman, Florian Fainelli
Cc: Laurent Pinchart, linux-staging, linux-arm-kernel
Hi Stefan,
Thank you for the patch
On 20/04/24 5:23 pm, Stefan Wahren wrote:
> checkpatch.pl noticed about missing blank line after 2 declarations.
> So add them for better readability.
>
> Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>
> ---
> drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
> index ca32902afe06..df3af821f218 100644
> --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
> +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
> @@ -227,6 +227,7 @@ struct vchiq_service *handle_to_service(struct vchiq_instance *instance, unsigne
>
> return rcu_dereference(instance->state->services[idx]);
> }
> +
> struct vchiq_service *
> find_service_by_handle(struct vchiq_instance *instance, unsigned int handle)
> {
> @@ -2176,6 +2177,7 @@ vchiq_init_state(struct vchiq_state *state, struct vchiq_slot_zero *slot_zero, s
>
> for (i = 0; i < VCHIQ_MAX_SERVICES; i++) {
> struct vchiq_service_quota *quota = &state->service_quotas[i];
> +
> init_completion("a->quota_event);
> }
>
> --
> 2.34.1
>
^ permalink raw reply [flat|nested] 9+ messages in thread