Skip to content

L
linux
Commit df044ebf authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

staging: vc04_services: don't print pointers directly 

kernel pointers should be printed with %pK and are not unsigned int big
on all architectures.  So fix this up to get rid of a bunch of warning
messages.

Note, there are other assumptions in this code that a pointer fits into
an int that need to be fixed up later.

Cc: Daniel Stone <daniels@collabora.com>
Cc: "Noralf Trønnes" <noralf@tronnes.org>
Cc: Pranith Kumar <bobby.prani@gmail.com>
Cc: popcornmix <popcornmix@gmail.com>
Cc: Eric Anholt <eric@anholt.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f51bb7a6
Show whitespace changes
Inline Side-by-side
Showing with 124 additions and 189 deletions
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
View file @ df044ebf
...@@ -171,8 +171,8 @@ int vchiq_platform_init(struct platform_device *pdev, VCHIQ_STATE_T *state) ...@@ -171,8 +171,8 @@ int vchiq_platform_init(struct platform_device *pdev, VCHIQ_STATE_T *state)
} }
vchiq_log_info(vchiq_arm_log_level, vchiq_log_info(vchiq_arm_log_level,
"vchiq_init - done (slots %x, phys %pad)", "vchiq_init - done (slots %pK, phys %pad)",
(unsigned int)vchiq_slot_zero, &slot_phys); vchiq_slot_zero, &slot_phys);
vchiq_call_connected_callbacks(); vchiq_call_connected_callbacks();
...@@ -386,8 +386,8 @@ create_pagelist(char __user *buf, size_t count, unsigned short type, ...@@ -386,8 +386,8 @@ create_pagelist(char __user *buf, size_t count, unsigned short type,
(num_pages * sizeof(pages[0])), (num_pages * sizeof(pages[0])),
GFP_KERNEL); GFP_KERNEL);
vchiq_log_trace(vchiq_arm_log_level, vchiq_log_trace(vchiq_arm_log_level, "create_pagelist - %pK",
"create_pagelist - %x", (unsigned int)pagelist); pagelist);
if (!pagelist) if (!pagelist)
return -ENOMEM; return -ENOMEM;
...@@ -511,8 +511,8 @@ free_pagelist(PAGELIST_T *pagelist, int actual) ...@@ -511,8 +511,8 @@ free_pagelist(PAGELIST_T *pagelist, int actual)
struct page **pages; struct page **pages;
unsigned int num_pages, i; unsigned int num_pages, i;
vchiq_log_trace(vchiq_arm_log_level, vchiq_log_trace(vchiq_arm_log_level, "free_pagelist - %pK, %d",
"free_pagelist - %x, %d", (unsigned int)pagelist, actual); pagelist, actual);
num_pages = num_pages =
(pagelist->length + pagelist->offset + PAGE_SIZE - 1) / (pagelist->length + pagelist->offset + PAGE_SIZE - 1) /
......
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
View file @ df044ebf
...@@ -418,8 +418,8 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg) ...@@ -418,8 +418,8 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
DEBUG_INITIALISE(g_state.local) DEBUG_INITIALISE(g_state.local)
vchiq_log_trace(vchiq_arm_log_level, vchiq_log_trace(vchiq_arm_log_level,
"vchiq_ioctl - instance %x, cmd %s, arg %lx", "vchiq_ioctl - instance %pK, cmd %s, arg %lx",
(unsigned int)instance, instance,
((_IOC_TYPE(cmd) == VCHIQ_IOC_MAGIC) && ((_IOC_TYPE(cmd) == VCHIQ_IOC_MAGIC) &&
(_IOC_NR(cmd) <= VCHIQ_IOC_MAX)) ? (_IOC_NR(cmd) <= VCHIQ_IOC_MAX)) ?
ioctl_names[_IOC_NR(cmd)] : "<invalid>", arg); ioctl_names[_IOC_NR(cmd)] : "<invalid>", arg);
...@@ -713,8 +713,8 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg) ...@@ -713,8 +713,8 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
break; break;
} }
vchiq_log_info(vchiq_arm_log_level, vchiq_log_info(vchiq_arm_log_level,
"found bulk_waiter %x for pid %d", "found bulk_waiter %pK for pid %d", waiter,
(unsigned int)waiter, current->pid); current->pid);
args.userdata = &waiter->bulk_waiter; args.userdata = &waiter->bulk_waiter;
} }
status = vchiq_bulk_transfer status = vchiq_bulk_transfer
...@@ -743,8 +743,8 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg) ...@@ -743,8 +743,8 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
list_add(&waiter->list, &instance->bulk_waiter_list); list_add(&waiter->list, &instance->bulk_waiter_list);
mutex_unlock(&instance->bulk_waiter_list_mutex); mutex_unlock(&instance->bulk_waiter_list_mutex);
vchiq_log_info(vchiq_arm_log_level, vchiq_log_info(vchiq_arm_log_level,
"saved bulk_waiter %x for pid %d", "saved bulk_waiter %pK for pid %d",
(unsigned int)waiter, current->pid); waiter, current->pid);
if (copy_to_user((void __user *) if (copy_to_user((void __user *)
&(((VCHIQ_QUEUE_BULK_TRANSFER_T __user *) &(((VCHIQ_QUEUE_BULK_TRANSFER_T __user *)
...@@ -826,10 +826,8 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg) ...@@ -826,10 +826,8 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
if (args.msgbufsize < msglen) { if (args.msgbufsize < msglen) {
vchiq_log_error( vchiq_log_error(
vchiq_arm_log_level, vchiq_arm_log_level,
"header %x: msgbufsize" "header %pK: msgbufsize %x < msglen %x",
" %x < msglen %x", header, args.msgbufsize,
(unsigned int)header,
args.msgbufsize,
msglen); msglen);
WARN(1, "invalid message " WARN(1, "invalid message "
"size\n"); "size\n");
...@@ -980,9 +978,8 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg) ...@@ -980,9 +978,8 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
ret = -EFAULT; ret = -EFAULT;
} else { } else {
vchiq_log_error(vchiq_arm_log_level, vchiq_log_error(vchiq_arm_log_level,
"header %x: bufsize %x < size %x", "header %pK: bufsize %x < size %x",
(unsigned int)header, args.bufsize, header, args.bufsize, header->size);
header->size);
WARN(1, "invalid size\n"); WARN(1, "invalid size\n");
ret = -EMSGSIZE; ret = -EMSGSIZE;
} }
...@@ -1284,9 +1281,8 @@ vchiq_release(struct inode *inode, struct file *file) ...@@ -1284,9 +1281,8 @@ vchiq_release(struct inode *inode, struct file *file)
list); list);
list_del(pos); list_del(pos);
vchiq_log_info(vchiq_arm_log_level, vchiq_log_info(vchiq_arm_log_level,
"bulk_waiter - cleaned up %x " "bulk_waiter - cleaned up %pK for pid %d",
"for pid %d", waiter, waiter->pid);
(unsigned int)waiter, waiter->pid);
kfree(waiter); kfree(waiter);
} }
} }
...@@ -1385,9 +1381,8 @@ vchiq_dump_platform_instances(void *dump_context) ...@@ -1385,9 +1381,8 @@ vchiq_dump_platform_instances(void *dump_context)
instance = service->instance; instance = service->instance;
if (instance && !instance->mark) { if (instance && !instance->mark) {
len = snprintf(buf, sizeof(buf), len = snprintf(buf, sizeof(buf),
"Instance %x: pid %d,%s completions " "Instance %pK: pid %d,%s completions %d/%d",
"%d/%d", instance, instance->pid,
(unsigned int)instance, instance->pid,
instance->connected ? " connected, " : instance->connected ? " connected, " :
"", "",
instance->completion_insert - instance->completion_insert -
...@@ -1415,8 +1410,7 @@ vchiq_dump_platform_service_state(void *dump_context, VCHIQ_SERVICE_T *service) ...@@ -1415,8 +1410,7 @@ vchiq_dump_platform_service_state(void *dump_context, VCHIQ_SERVICE_T *service)
char buf[80]; char buf[80];
int len; int len;
len = snprintf(buf, sizeof(buf), " instance %x", len = snprintf(buf, sizeof(buf), " instance %pK", service->instance);
(unsigned int)service->instance);
if ((service->base.callback == service_callback) && if ((service->base.callback == service_callback) &&
user_service->is_vchi) { user_service->is_vchi) {
......
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
View file @ df044ebf
...@@ -380,9 +380,9 @@ make_service_callback(VCHIQ_SERVICE_T *service, VCHIQ_REASON_T reason, ...@@ -380,9 +380,9 @@ make_service_callback(VCHIQ_SERVICE_T *service, VCHIQ_REASON_T reason,
VCHIQ_HEADER_T *header, void *bulk_userdata) VCHIQ_HEADER_T *header, void *bulk_userdata)
{ {
VCHIQ_STATUS_T status; VCHIQ_STATUS_T status;
vchiq_log_trace(vchiq_core_log_level, "%d: callback:%d (%s, %x, %x)", vchiq_log_trace(vchiq_core_log_level, "%d: callback:%d (%s, %pK, %pK)",
service->state->id, service->localport, reason_names[reason], service->state->id, service->localport, reason_names[reason],
(unsigned int)header, (unsigned int)bulk_userdata); header, bulk_userdata);
status = service->base.callback(reason, header, service->handle, status = service->base.callback(reason, header, service->handle,
bulk_userdata); bulk_userdata);
if (status == VCHIQ_ERROR) { if (status == VCHIQ_ERROR) {
...@@ -620,8 +620,8 @@ process_free_queue(VCHIQ_STATE_T *state) ...@@ -620,8 +620,8 @@ process_free_queue(VCHIQ_STATE_T *state)
char *data = (char *)SLOT_DATA_FROM_INDEX(state, slot_index); char *data = (char *)SLOT_DATA_FROM_INDEX(state, slot_index);
int data_found = 0; int data_found = 0;
vchiq_log_trace(vchiq_core_log_level, "%d: pfq %d=%x %x %x", vchiq_log_trace(vchiq_core_log_level, "%d: pfq %d=%pK %x %x",
state->id, slot_index, (unsigned int)data, state->id, slot_index, data,
local->slot_queue_recycle, slot_queue_available); local->slot_queue_recycle, slot_queue_available);
/* Initialise the bitmask for services which have used this /* Initialise the bitmask for services which have used this
...@@ -653,16 +653,10 @@ process_free_queue(VCHIQ_STATE_T *state) ...@@ -653,16 +653,10 @@ process_free_queue(VCHIQ_STATE_T *state)
up(&service_quota->quota_event); up(&service_quota->quota_event);
else if (count == 0) { else if (count == 0) {
vchiq_log_error(vchiq_core_log_level, vchiq_log_error(vchiq_core_log_level,
"service %d " "service %d message_use_count=%d (header %pK, msgid %x, header->msgid %x, header->size %x)",
"message_use_count=%d "
"(header %x, msgid %x, "
"header->msgid %x, "
"header->size %x)",
port, port,
service_quota-> service_quota->message_use_count,
message_use_count, header, msgid, header->msgid,
(unsigned int)header, msgid,
header->msgid,
header->size); header->size);
WARN(1, "invalid message use count\n"); WARN(1, "invalid message use count\n");
} }
...@@ -684,26 +678,16 @@ process_free_queue(VCHIQ_STATE_T *state) ...@@ -684,26 +678,16 @@ process_free_queue(VCHIQ_STATE_T *state)
up(&service_quota->quota_event); up(&service_quota->quota_event);
vchiq_log_trace( vchiq_log_trace(
vchiq_core_log_level, vchiq_core_log_level,
"%d: pfq:%d %x@%x - " "%d: pfq:%d %x@%pK - slot_use->%d",
"slot_use->%d",
state->id, port, state->id, port,
header->size, header->size, header,
(unsigned int)header,
count - 1); count - 1);
} else { } else {
vchiq_log_error( vchiq_log_error(
vchiq_core_log_level, vchiq_core_log_level,
"service %d " "service %d slot_use_count=%d (header %pK, msgid %x, header->msgid %x, header->size %x)",
"slot_use_count" port, count, header,
"=%d (header %x" msgid, header->msgid,
", msgid %x, "
"header->msgid"
" %x, header->"
"size %x)",
port, count,
(unsigned int)header,
msgid,
header->msgid,
header->size); header->size);
WARN(1, "bad slot use count\n"); WARN(1, "bad slot use count\n");
} }
...@@ -715,10 +699,9 @@ process_free_queue(VCHIQ_STATE_T *state) ...@@ -715,10 +699,9 @@ process_free_queue(VCHIQ_STATE_T *state)
pos += calc_stride(header->size); pos += calc_stride(header->size);
if (pos > VCHIQ_SLOT_SIZE) { if (pos > VCHIQ_SLOT_SIZE) {
vchiq_log_error(vchiq_core_log_level, vchiq_log_error(vchiq_core_log_level,
"pfq - pos %x: header %x, msgid %x, " "pfq - pos %x: header %pK, msgid %x, header->msgid %x, header->size %x",
"header->msgid %x, header->size %x", pos, header, msgid, header->msgid,
pos, (unsigned int)header, msgid, header->size);
header->msgid, header->size);
WARN(1, "invalid slot position\n"); WARN(1, "invalid slot position\n");
} }
} }
...@@ -862,11 +845,9 @@ queue_message(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service, ...@@ -862,11 +845,9 @@ queue_message(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service,
int slot_use_count; int slot_use_count;
vchiq_log_info(vchiq_core_log_level, vchiq_log_info(vchiq_core_log_level,
"%d: qm %s@%x,%x (%d->%d)", "%d: qm %s@%pK,%x (%d->%d)",
state->id, state->id, msg_type_str(VCHIQ_MSG_TYPE(msgid)),
msg_type_str(VCHIQ_MSG_TYPE(msgid)), header, size, VCHIQ_MSG_SRCPORT(msgid),
(unsigned int)header, size,
VCHIQ_MSG_SRCPORT(msgid),
VCHIQ_MSG_DSTPORT(msgid)); VCHIQ_MSG_DSTPORT(msgid));
BUG_ON(!service); BUG_ON(!service);
...@@ -930,10 +911,9 @@ queue_message(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service, ...@@ -930,10 +911,9 @@ queue_message(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service,
VCHIQ_SERVICE_STATS_ADD(service, ctrl_tx_bytes, size); VCHIQ_SERVICE_STATS_ADD(service, ctrl_tx_bytes, size);
} else { } else {
vchiq_log_info(vchiq_core_log_level, vchiq_log_info(vchiq_core_log_level,
"%d: qm %s@%x,%x (%d->%d)", state->id, "%d: qm %s@%pK,%x (%d->%d)", state->id,
msg_type_str(VCHIQ_MSG_TYPE(msgid)), msg_type_str(VCHIQ_MSG_TYPE(msgid)),
(unsigned int)header, size, header, size, VCHIQ_MSG_SRCPORT(msgid),
VCHIQ_MSG_SRCPORT(msgid),
VCHIQ_MSG_DSTPORT(msgid)); VCHIQ_MSG_DSTPORT(msgid));
if (size != 0) { if (size != 0) {
WARN_ON(!((count == 1) && (size == elements[0].size))); WARN_ON(!((count == 1) && (size == elements[0].size)));
...@@ -1015,10 +995,9 @@ queue_message_sync(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service, ...@@ -1015,10 +995,9 @@ queue_message_sync(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service,
int i, pos; int i, pos;
vchiq_log_info(vchiq_sync_log_level, vchiq_log_info(vchiq_sync_log_level,
"%d: qms %s@%x,%x (%d->%d)", state->id, "%d: qms %s@%pK,%x (%d->%d)", state->id,
msg_type_str(VCHIQ_MSG_TYPE(msgid)), msg_type_str(VCHIQ_MSG_TYPE(msgid)),
(unsigned int)header, size, header, size, VCHIQ_MSG_SRCPORT(msgid),
VCHIQ_MSG_SRCPORT(msgid),
VCHIQ_MSG_DSTPORT(msgid)); VCHIQ_MSG_DSTPORT(msgid));
for (i = 0, pos = 0; i < (unsigned int)count; for (i = 0, pos = 0; i < (unsigned int)count;
...@@ -1047,10 +1026,9 @@ queue_message_sync(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service, ...@@ -1047,10 +1026,9 @@ queue_message_sync(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service,
VCHIQ_SERVICE_STATS_ADD(service, ctrl_tx_bytes, size); VCHIQ_SERVICE_STATS_ADD(service, ctrl_tx_bytes, size);
} else { } else {
vchiq_log_info(vchiq_sync_log_level, vchiq_log_info(vchiq_sync_log_level,
"%d: qms %s@%x,%x (%d->%d)", state->id, "%d: qms %s@%pK,%x (%d->%d)", state->id,
msg_type_str(VCHIQ_MSG_TYPE(msgid)), msg_type_str(VCHIQ_MSG_TYPE(msgid)),
(unsigned int)header, size, header, size, VCHIQ_MSG_SRCPORT(msgid),
VCHIQ_MSG_SRCPORT(msgid),
VCHIQ_MSG_DSTPORT(msgid)); VCHIQ_MSG_DSTPORT(msgid));
if (size != 0) { if (size != 0) {
WARN_ON(!((count == 1) && (size == elements[0].size))); WARN_ON(!((count == 1) && (size == elements[0].size)));
...@@ -1350,26 +1328,22 @@ resolve_bulks(VCHIQ_SERVICE_T *service, VCHIQ_BULK_QUEUE_T *queue) ...@@ -1350,26 +1328,22 @@ resolve_bulks(VCHIQ_SERVICE_T *service, VCHIQ_BULK_QUEUE_T *queue)
"Send Bulk to" : "Recv Bulk from"; "Send Bulk to" : "Recv Bulk from";
if (bulk->actual != VCHIQ_BULK_ACTUAL_ABORTED) if (bulk->actual != VCHIQ_BULK_ACTUAL_ABORTED)
vchiq_log_info(SRVTRACE_LEVEL(service), vchiq_log_info(SRVTRACE_LEVEL(service),
"%s %c%c%c%c d:%d len:%d %x<->%x", "%s %c%c%c%c d:%d len:%d %pK<->%pK",
header, header,
VCHIQ_FOURCC_AS_4CHARS( VCHIQ_FOURCC_AS_4CHARS(
service->base.fourcc), service->base.fourcc),
service->remoteport, service->remoteport, bulk->size,
bulk->size, bulk->data, bulk->remote_data);
(unsigned int)bulk->data,
(unsigned int)bulk->remote_data);
else else
vchiq_log_info(SRVTRACE_LEVEL(service), vchiq_log_info(SRVTRACE_LEVEL(service),
"%s %c%c%c%c d:%d ABORTED - tx len:%d," "%s %c%c%c%c d:%d ABORTED - tx len:%d,"
" rx len:%d %x<->%x", " rx len:%d %pK<->%pK",
header, header,
VCHIQ_FOURCC_AS_4CHARS( VCHIQ_FOURCC_AS_4CHARS(
service->base.fourcc), service->base.fourcc),
service->remoteport, service->remoteport,
bulk->size, bulk->size, bulk->remote_size,
bulk->remote_size, bulk->data, bulk->remote_data);
(unsigned int)bulk->data,
(unsigned int)bulk->remote_data);
} }
vchiq_complete_bulk(bulk); vchiq_complete_bulk(bulk);
...@@ -1505,9 +1479,8 @@ parse_open(VCHIQ_STATE_T *state, VCHIQ_HEADER_T *header) ...@@ -1505,9 +1479,8 @@ parse_open(VCHIQ_STATE_T *state, VCHIQ_HEADER_T *header)
fourcc = payload->fourcc; fourcc = payload->fourcc;
vchiq_log_info(vchiq_core_log_level, vchiq_log_info(vchiq_core_log_level,
"%d: prs OPEN@%x (%d->'%c%c%c%c')", "%d: prs OPEN@%pK (%d->'%c%c%c%c')",
state->id, (unsigned int)header, state->id, header, localport,
localport,
VCHIQ_FOURCC_AS_4CHARS(fourcc)); VCHIQ_FOURCC_AS_4CHARS(fourcc));
service = get_listening_service(state, fourcc); service = get_listening_service(state, fourcc);
...@@ -1678,21 +1651,18 @@ parse_rx_slots(VCHIQ_STATE_T *state) ...@@ -1678,21 +1651,18 @@ parse_rx_slots(VCHIQ_STATE_T *state)
remoteport); remoteport);
if (service) if (service)
vchiq_log_warning(vchiq_core_log_level, vchiq_log_warning(vchiq_core_log_level,
"%d: prs %s@%x (%d->%d) - " "%d: prs %s@%pK (%d->%d) - found connected service %d",
"found connected service %d",
state->id, msg_type_str(type), state->id, msg_type_str(type),
(unsigned int)header, header, remoteport, localport,
remoteport, localport,
service->localport); service->localport);
} }
if (!service) { if (!service) {
vchiq_log_error(vchiq_core_log_level, vchiq_log_error(vchiq_core_log_level,
"%d: prs %s@%x (%d->%d) - " "%d: prs %s@%pK (%d->%d) - invalid/closed service %d",
"invalid/closed service %d",
state->id, msg_type_str(type), state->id, msg_type_str(type),
(unsigned int)header, header, remoteport, localport,
remoteport, localport, localport); localport);
goto skip_message; goto skip_message;
} }
break; break;
...@@ -1720,9 +1690,8 @@ parse_rx_slots(VCHIQ_STATE_T *state) ...@@ -1720,9 +1690,8 @@ parse_rx_slots(VCHIQ_STATE_T *state)
if (((unsigned int)header & VCHIQ_SLOT_MASK) + calc_stride(size) if (((unsigned int)header & VCHIQ_SLOT_MASK) + calc_stride(size)
> VCHIQ_SLOT_SIZE) { > VCHIQ_SLOT_SIZE) {
vchiq_log_error(vchiq_core_log_level, vchiq_log_error(vchiq_core_log_level,
"header %x (msgid %x) - size %x too big for " "header %pK (msgid %x) - size %x too big for slot",
"slot", header, (unsigned int)msgid,
(unsigned int)header, (unsigned int)msgid,
(unsigned int)size); (unsigned int)size);
WARN(1, "oversized for slot\n"); WARN(1, "oversized for slot\n");
} }
...@@ -1741,9 +1710,9 @@ parse_rx_slots(VCHIQ_STATE_T *state) ...@@ -1741,9 +1710,9 @@ parse_rx_slots(VCHIQ_STATE_T *state)
service->peer_version = payload->version; service->peer_version = payload->version;
} }
vchiq_log_info(vchiq_core_log_level, vchiq_log_info(vchiq_core_log_level,
"%d: prs OPENACK@%x,%x (%d->%d) v:%d", "%d: prs OPENACK@%pK,%x (%d->%d) v:%d",
state->id, (unsigned int)header, size, state->id, header, size, remoteport, localport,
remoteport, localport, service->peer_version); service->peer_version);
if (service->srvstate == if (service->srvstate ==
VCHIQ_SRVSTATE_OPENING) { VCHIQ_SRVSTATE_OPENING) {
service->remoteport = remoteport; service->remoteport = remoteport;
...@@ -1759,9 +1728,8 @@ parse_rx_slots(VCHIQ_STATE_T *state) ...@@ -1759,9 +1728,8 @@ parse_rx_slots(VCHIQ_STATE_T *state)
WARN_ON(size != 0); /* There should be no data */ WARN_ON(size != 0); /* There should be no data */
vchiq_log_info(vchiq_core_log_level, vchiq_log_info(vchiq_core_log_level,
"%d: prs CLOSE@%x (%d->%d)", "%d: prs CLOSE@%pK (%d->%d)",
state->id, (unsigned int)header, state->id, header, remoteport, localport);
remoteport, localport);
mark_service_closing_internal(service, 1); mark_service_closing_internal(service, 1);
...@@ -1777,9 +1745,8 @@ parse_rx_slots(VCHIQ_STATE_T *state) ...@@ -1777,9 +1745,8 @@ parse_rx_slots(VCHIQ_STATE_T *state)
break; break;
case VCHIQ_MSG_DATA: case VCHIQ_MSG_DATA:
vchiq_log_info(vchiq_core_log_level, vchiq_log_info(vchiq_core_log_level,
"%d: prs DATA@%x,%x (%d->%d)", "%d: prs DATA@%pK,%x (%d->%d)",
state->id, (unsigned int)header, size, state->id, header, size, remoteport, localport);
remoteport, localport);
if ((service->remoteport == remoteport) if ((service->remoteport == remoteport)
&& (service->srvstate == && (service->srvstate ==
...@@ -1802,8 +1769,7 @@ parse_rx_slots(VCHIQ_STATE_T *state) ...@@ -1802,8 +1769,7 @@ parse_rx_slots(VCHIQ_STATE_T *state)
break; break;
case VCHIQ_MSG_CONNECT: case VCHIQ_MSG_CONNECT:
vchiq_log_info(vchiq_core_log_level, vchiq_log_info(vchiq_core_log_level,
"%d: prs CONNECT@%x", "%d: prs CONNECT@%pK", state->id, header);
state->id, (unsigned int)header);
state->version_common = ((VCHIQ_SLOT_ZERO_T *) state->version_common = ((VCHIQ_SLOT_ZERO_T *)
state->slot_data)->version; state->slot_data)->version;
up(&state->connect); up(&state->connect);
...@@ -1837,12 +1803,10 @@ parse_rx_slots(VCHIQ_STATE_T *state) ...@@ -1837,12 +1803,10 @@ parse_rx_slots(VCHIQ_STATE_T *state)
wmb(); wmb();
vchiq_log_info(vchiq_core_log_level, vchiq_log_info(vchiq_core_log_level,
"%d: prs %s@%x (%d->%d) %x@%x", "%d: prs %s@%pK (%d->%d) %x@%pK",
state->id, msg_type_str(type), state->id, msg_type_str(type),
(unsigned int)header, header, remoteport, localport,
remoteport, localport, bulk->remote_size, bulk->remote_data);
bulk->remote_size,
(unsigned int)bulk->remote_data);
queue->remote_insert++; queue->remote_insert++;
...@@ -1895,11 +1859,10 @@ parse_rx_slots(VCHIQ_STATE_T *state) ...@@ -1895,11 +1859,10 @@ parse_rx_slots(VCHIQ_STATE_T *state)
if ((int)(queue->remote_insert - if ((int)(queue->remote_insert -
queue->local_insert) >= 0) { queue->local_insert) >= 0) {
vchiq_log_error(vchiq_core_log_level, vchiq_log_error(vchiq_core_log_level,
"%d: prs %s@%x (%d->%d) " "%d: prs %s@%pK (%d->%d) "
"unexpected (ri=%d,li=%d)", "unexpected (ri=%d,li=%d)",
state->id, msg_type_str(type), state->id, msg_type_str(type),
(unsigned int)header, header, remoteport, localport,
remoteport, localport,
queue->remote_insert, queue->remote_insert,
queue->local_insert); queue->local_insert);
mutex_unlock(&service->bulk_mutex); mutex_unlock(&service->bulk_mutex);
...@@ -1915,11 +1878,10 @@ parse_rx_slots(VCHIQ_STATE_T *state) ...@@ -1915,11 +1878,10 @@ parse_rx_slots(VCHIQ_STATE_T *state)
queue->remote_insert++; queue->remote_insert++;
vchiq_log_info(vchiq_core_log_level, vchiq_log_info(vchiq_core_log_level,
"%d: prs %s@%x (%d->%d) %x@%x", "%d: prs %s@%pK (%d->%d) %x@%pK",
state->id, msg_type_str(type), state->id, msg_type_str(type),
(unsigned int)header, header, remoteport, localport,
remoteport, localport, bulk->actual, bulk->data);
bulk->actual, (unsigned int)bulk->data);
vchiq_log_trace(vchiq_core_log_level, vchiq_log_trace(vchiq_core_log_level,
"%d: prs:%d %cx li=%x ri=%x p=%x", "%d: prs:%d %cx li=%x ri=%x p=%x",
...@@ -1941,14 +1903,14 @@ parse_rx_slots(VCHIQ_STATE_T *state) ...@@ -1941,14 +1903,14 @@ parse_rx_slots(VCHIQ_STATE_T *state)
break; break;
case VCHIQ_MSG_PADDING: case VCHIQ_MSG_PADDING:
vchiq_log_trace(vchiq_core_log_level, vchiq_log_trace(vchiq_core_log_level,
"%d: prs PADDING@%x,%x", "%d: prs PADDING@%pK,%x",
state->id, (unsigned int)header, size); state->id, header, size);
break; break;
case VCHIQ_MSG_PAUSE: case VCHIQ_MSG_PAUSE:
/* If initiated, signal the application thread */ /* If initiated, signal the application thread */
vchiq_log_trace(vchiq_core_log_level, vchiq_log_trace(vchiq_core_log_level,
"%d: prs PAUSE@%x,%x", "%d: prs PAUSE@%pK,%x",
state->id, (unsigned int)header, size); state->id, header, size);
if (state->conn_state == VCHIQ_CONNSTATE_PAUSED) { if (state->conn_state == VCHIQ_CONNSTATE_PAUSED) {
vchiq_log_error(vchiq_core_log_level, vchiq_log_error(vchiq_core_log_level,
"%d: PAUSE received in state PAUSED", "%d: PAUSE received in state PAUSED",
...@@ -1971,8 +1933,8 @@ parse_rx_slots(VCHIQ_STATE_T *state) ...@@ -1971,8 +1933,8 @@ parse_rx_slots(VCHIQ_STATE_T *state)
break; break;
case VCHIQ_MSG_RESUME: case VCHIQ_MSG_RESUME:
vchiq_log_trace(vchiq_core_log_level, vchiq_log_trace(vchiq_core_log_level,
"%d: prs RESUME@%x,%x", "%d: prs RESUME@%pK,%x",
state->id, (unsigned int)header, size); state->id, header, size);
/* Release the slot mutex */ /* Release the slot mutex */
mutex_unlock(&state->slot_mutex); mutex_unlock(&state->slot_mutex);
if (state->is_master) if (state->is_master)
...@@ -1993,8 +1955,8 @@ parse_rx_slots(VCHIQ_STATE_T *state) ...@@ -1993,8 +1955,8 @@ parse_rx_slots(VCHIQ_STATE_T *state)
default: default:
vchiq_log_error(vchiq_core_log_level, vchiq_log_error(vchiq_core_log_level,
"%d: prs invalid msgid %x@%x,%x", "%d: prs invalid msgid %x@%pK,%x",
state->id, msgid, (unsigned int)header, size); state->id, msgid, header, size);
WARN(1, "invalid message\n"); WARN(1, "invalid message\n");
break; break;
} }
...@@ -2159,11 +2121,9 @@ sync_func(void *v) ...@@ -2159,11 +2121,9 @@ sync_func(void *v)
if (!service) { if (!service) {
vchiq_log_error(vchiq_sync_log_level, vchiq_log_error(vchiq_sync_log_level,
"%d: sf %s@%x (%d->%d) - " "%d: sf %s@%pK (%d->%d) - invalid/closed service %d",
"invalid/closed service %d",
state->id, msg_type_str(type), state->id, msg_type_str(type),
(unsigned int)header, header, remoteport, localport, localport);
remoteport, localport, localport);
release_message_sync(state, header); release_message_sync(state, header);
continue; continue;
} }
...@@ -2193,9 +2153,9 @@ sync_func(void *v) ...@@ -2193,9 +2153,9 @@ sync_func(void *v)
service->peer_version = payload->version; service->peer_version = payload->version;
} }
vchiq_log_info(vchiq_sync_log_level, vchiq_log_info(vchiq_sync_log_level,
"%d: sf OPENACK@%x,%x (%d->%d) v:%d", "%d: sf OPENACK@%pK,%x (%d->%d) v:%d",
state->id, (unsigned int)header, size, state->id, header, size, remoteport, localport,
remoteport, localport, service->peer_version); service->peer_version);
if (service->srvstate == VCHIQ_SRVSTATE_OPENING) { if (service->srvstate == VCHIQ_SRVSTATE_OPENING) {
service->remoteport = remoteport; service->remoteport = remoteport;
vchiq_set_service_state(service, vchiq_set_service_state(service,
...@@ -2208,9 +2168,8 @@ sync_func(void *v) ...@@ -2208,9 +2168,8 @@ sync_func(void *v)
case VCHIQ_MSG_DATA: case VCHIQ_MSG_DATA:
vchiq_log_trace(vchiq_sync_log_level, vchiq_log_trace(vchiq_sync_log_level,
"%d: sf DATA@%x,%x (%d->%d)", "%d: sf DATA@%pK,%x (%d->%d)",
state->id, (unsigned int)header, size, state->id, header, size, remoteport, localport);
remoteport, localport);
if ((service->remoteport == remoteport) && if ((service->remoteport == remoteport) &&
(service->srvstate == (service->srvstate ==
...@@ -2228,8 +2187,8 @@ sync_func(void *v) ...@@ -2228,8 +2187,8 @@ sync_func(void *v)
default: default:
vchiq_log_error(vchiq_sync_log_level, vchiq_log_error(vchiq_sync_log_level,
"%d: sf unexpected msgid %x@%x,%x", "%d: sf unexpected msgid %x@%pK,%x",
state->id, msgid, (unsigned int)header, size); state->id, msgid, header, size);
release_message_sync(state, header); release_message_sync(state, header);
break; break;
} }
...@@ -2310,16 +2269,16 @@ vchiq_init_state(VCHIQ_STATE_T *state, VCHIQ_SLOT_ZERO_T *slot_zero, ...@@ -2310,16 +2269,16 @@ vchiq_init_state(VCHIQ_STATE_T *state, VCHIQ_SLOT_ZERO_T *slot_zero,
int i; int i;
vchiq_log_warning(vchiq_core_log_level, vchiq_log_warning(vchiq_core_log_level,
"%s: slot_zero = 0x%08lx, is_master = %d", "%s: slot_zero = %pK, is_master = %d",
__func__, (unsigned long)slot_zero, is_master); __func__, slot_zero, is_master);
/* Check the input configuration */ /* Check the input configuration */
if (slot_zero->magic != VCHIQ_MAGIC) { if (slot_zero->magic != VCHIQ_MAGIC) {
vchiq_loud_error_header(); vchiq_loud_error_header();
vchiq_loud_error("Invalid VCHIQ magic value found."); vchiq_loud_error("Invalid VCHIQ magic value found.");
vchiq_loud_error("slot_zero=%x: magic=%x (expected %x)", vchiq_loud_error("slot_zero=%pK: magic=%x (expected %x)",
(unsigned int)slot_zero, slot_zero->magic, VCHIQ_MAGIC); slot_zero, slot_zero->magic, VCHIQ_MAGIC);
vchiq_loud_error_footer(); vchiq_loud_error_footer();
return VCHIQ_ERROR; return VCHIQ_ERROR;
} }
...@@ -2327,10 +2286,8 @@ vchiq_init_state(VCHIQ_STATE_T *state, VCHIQ_SLOT_ZERO_T *slot_zero, ...@@ -2327,10 +2286,8 @@ vchiq_init_state(VCHIQ_STATE_T *state, VCHIQ_SLOT_ZERO_T *slot_zero,
if (slot_zero->version < VCHIQ_VERSION_MIN) { if (slot_zero->version < VCHIQ_VERSION_MIN) {
vchiq_loud_error_header(); vchiq_loud_error_header();
vchiq_loud_error("Incompatible VCHIQ versions found."); vchiq_loud_error("Incompatible VCHIQ versions found.");
vchiq_loud_error("slot_zero=%x: VideoCore version=%d " vchiq_loud_error("slot_zero=%pK: VideoCore version=%d (minimum %d)",
"(minimum %d)", slot_zero, slot_zero->version, VCHIQ_VERSION_MIN);
(unsigned int)slot_zero, slot_zero->version,
VCHIQ_VERSION_MIN);
vchiq_loud_error("Restart with a newer VideoCore image."); vchiq_loud_error("Restart with a newer VideoCore image.");
vchiq_loud_error_footer(); vchiq_loud_error_footer();
return VCHIQ_ERROR; return VCHIQ_ERROR;
...@@ -2339,10 +2296,8 @@ vchiq_init_state(VCHIQ_STATE_T *state, VCHIQ_SLOT_ZERO_T *slot_zero, ...@@ -2339,10 +2296,8 @@ vchiq_init_state(VCHIQ_STATE_T *state, VCHIQ_SLOT_ZERO_T *slot_zero,
if (VCHIQ_VERSION < slot_zero->version_min) { if (VCHIQ_VERSION < slot_zero->version_min) {
vchiq_loud_error_header(); vchiq_loud_error_header();
vchiq_loud_error("Incompatible VCHIQ versions found."); vchiq_loud_error("Incompatible VCHIQ versions found.");
vchiq_loud_error("slot_zero=%x: version=%d (VideoCore " vchiq_loud_error("slot_zero=%pK: version=%d (VideoCore minimum %d)",
"minimum %d)", slot_zero, VCHIQ_VERSION, slot_zero->version_min);
(unsigned int)slot_zero, VCHIQ_VERSION,
slot_zero->version_min);
vchiq_loud_error("Restart with a newer kernel."); vchiq_loud_error("Restart with a newer kernel.");
vchiq_loud_error_footer(); vchiq_loud_error_footer();
return VCHIQ_ERROR; return VCHIQ_ERROR;
...@@ -2354,26 +2309,20 @@ vchiq_init_state(VCHIQ_STATE_T *state, VCHIQ_SLOT_ZERO_T *slot_zero, ...@@ -2354,26 +2309,20 @@ vchiq_init_state(VCHIQ_STATE_T *state, VCHIQ_SLOT_ZERO_T *slot_zero,
(slot_zero->max_slots_per_side != VCHIQ_MAX_SLOTS_PER_SIDE)) { (slot_zero->max_slots_per_side != VCHIQ_MAX_SLOTS_PER_SIDE)) {
vchiq_loud_error_header(); vchiq_loud_error_header();
if (slot_zero->slot_zero_size != sizeof(VCHIQ_SLOT_ZERO_T)) if (slot_zero->slot_zero_size != sizeof(VCHIQ_SLOT_ZERO_T))
vchiq_loud_error("slot_zero=%x: slot_zero_size=%x " vchiq_loud_error("slot_zero=%pK: slot_zero_size=%d (expected %d)",
"(expected %x)", slot_zero, slot_zero->slot_zero_size,
(unsigned int)slot_zero, (int)sizeof(VCHIQ_SLOT_ZERO_T));
slot_zero->slot_zero_size,
sizeof(VCHIQ_SLOT_ZERO_T));
if (slot_zero->slot_size != VCHIQ_SLOT_SIZE) if (slot_zero->slot_size != VCHIQ_SLOT_SIZE)
vchiq_loud_error("slot_zero=%x: slot_size=%d " vchiq_loud_error("slot_zero=%pK: slot_size=%d (expected %d)",
"(expected %d", slot_zero, slot_zero->slot_size,
(unsigned int)slot_zero, slot_zero->slot_size,
VCHIQ_SLOT_SIZE); VCHIQ_SLOT_SIZE);
if (slot_zero->max_slots != VCHIQ_MAX_SLOTS) if (slot_zero->max_slots != VCHIQ_MAX_SLOTS)
vchiq_loud_error("slot_zero=%x: max_slots=%d " vchiq_loud_error("slot_zero=%pK: max_slots=%d (expected %d)",
"(expected %d)", slot_zero, slot_zero->max_slots,
(unsigned int)slot_zero, slot_zero->max_slots,
VCHIQ_MAX_SLOTS); VCHIQ_MAX_SLOTS);
if (slot_zero->max_slots_per_side != VCHIQ_MAX_SLOTS_PER_SIDE) if (slot_zero->max_slots_per_side != VCHIQ_MAX_SLOTS_PER_SIDE)
vchiq_loud_error("slot_zero=%x: max_slots_per_side=%d " vchiq_loud_error("slot_zero=%pK: max_slots_per_side=%d (expected %d)",
"(expected %d)", slot_zero, slot_zero->max_slots_per_side,
(unsigned int)slot_zero,
slot_zero->max_slots_per_side,
VCHIQ_MAX_SLOTS_PER_SIDE); VCHIQ_MAX_SLOTS_PER_SIDE);
vchiq_loud_error_footer(); vchiq_loud_error_footer();
return VCHIQ_ERROR; return VCHIQ_ERROR;
...@@ -2750,20 +2699,16 @@ release_service_messages(VCHIQ_SERVICE_T *service) ...@@ -2750,20 +2699,16 @@ release_service_messages(VCHIQ_SERVICE_T *service)
if ((port == service->localport) && if ((port == service->localport) &&
(msgid & VCHIQ_MSGID_CLAIMED)) { (msgid & VCHIQ_MSGID_CLAIMED)) {
vchiq_log_info(vchiq_core_log_level, vchiq_log_info(vchiq_core_log_level,
" fsi - hdr %x", " fsi - hdr %pK", header);
(unsigned int)header);
release_slot(state, slot_info, header, release_slot(state, slot_info, header,
NULL); NULL);
} }
pos += calc_stride(header->size); pos += calc_stride(header->size);
if (pos > VCHIQ_SLOT_SIZE) { if (pos > VCHIQ_SLOT_SIZE) {
vchiq_log_error(vchiq_core_log_level, vchiq_log_error(vchiq_core_log_level,
"fsi - pos %x: header %x, " "fsi - pos %x: header %pK, msgid %x, header->msgid %x, header->size %x",
"msgid %x, header->msgid %x, " pos, header, msgid,
"header->size %x", header->msgid, header->size);
pos, (unsigned int)header,
msgid, header->msgid,
header->size);
WARN(1, "invalid slot position\n"); WARN(1, "invalid slot position\n");
} }
} }
...@@ -3335,10 +3280,9 @@ vchiq_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, ...@@ -3335,10 +3280,9 @@ vchiq_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle,
wmb(); wmb();
vchiq_log_info(vchiq_core_log_level, vchiq_log_info(vchiq_core_log_level,
"%d: bt (%d->%d) %cx %x@%x %x", "%d: bt (%d->%d) %cx %x@%pK %pK",
state->id, state->id, service->localport, service->remoteport, dir_char,
service->localport, service->remoteport, dir_char, size, bulk->data, userdata);
size, (unsigned int)bulk->data, (unsigned int)userdata);
/* The slot mutex must be held when the service is being closed, so /* The slot mutex must be held when the service is being closed, so
claim it here to ensure that isn't happening */ claim it here to ensure that isn't happening */
...@@ -3685,13 +3629,11 @@ vchiq_dump_state(void *dump_context, VCHIQ_STATE_T *state) ...@@ -3685,13 +3629,11 @@ vchiq_dump_state(void *dump_context, VCHIQ_STATE_T *state)
vchiq_dump(dump_context, buf, len + 1); vchiq_dump(dump_context, buf, len + 1);
len = snprintf(buf, sizeof(buf), len = snprintf(buf, sizeof(buf),
" tx_pos=%x(@%x), rx_pos=%x(@%x)", " tx_pos=%x(@%pK), rx_pos=%x(@%pK)",
state->local->tx_pos, state->local->tx_pos,
(uint32_t)state->tx_data + state->tx_data + (state->local_tx_pos & VCHIQ_SLOT_MASK),
(state->local_tx_pos & VCHIQ_SLOT_MASK),
state->rx_pos, state->rx_pos,
(uint32_t)state->rx_data + state->rx_data + (state->rx_pos & VCHIQ_SLOT_MASK));
(state->rx_pos & VCHIQ_SLOT_MASK));
vchiq_dump(dump_context, buf, len + 1); vchiq_dump(dump_context, buf, len + 1);
len = snprintf(buf, sizeof(buf), len = snprintf(buf, sizeof(buf),
......
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c
View file @ df044ebf
...@@ -155,9 +155,8 @@ VCHIQ_STATUS_T vchiq_shutdown(VCHIQ_INSTANCE_T instance) ...@@ -155,9 +155,8 @@ VCHIQ_STATUS_T vchiq_shutdown(VCHIQ_INSTANCE_T instance)
list); list);
list_del(pos); list_del(pos);
vchiq_log_info(vchiq_arm_log_level, vchiq_log_info(vchiq_arm_log_level,
"bulk_waiter - cleaned up %x " "bulk_waiter - cleaned up %pK for pid %d",
"for pid %d", waiter, waiter->pid);
(unsigned int)waiter, waiter->pid);
kfree(waiter); kfree(waiter);
} }
kfree(instance); kfree(instance);
...@@ -450,8 +449,8 @@ vchiq_blocking_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, void *data, ...@@ -450,8 +449,8 @@ vchiq_blocking_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, void *data,
list_add(&waiter->list, &instance->bulk_waiter_list); list_add(&waiter->list, &instance->bulk_waiter_list);
mutex_unlock(&instance->bulk_waiter_list_mutex); mutex_unlock(&instance->bulk_waiter_list_mutex);
vchiq_log_info(vchiq_arm_log_level, vchiq_log_info(vchiq_arm_log_level,
"saved bulk_waiter %x for pid %d", "saved bulk_waiter %pK for pid %d",
(unsigned int)waiter, current->pid); waiter, current->pid);
} }
return status; return status;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7