Commit 2184b3d6 authored by Chris Wilson's avatar Chris Wilson

drm/i915/guc: Replace %phn with %ph

%phn is not a valid specifier, and the trailing 'n' is being eaten by
the format-specifier and defaulting to the ' ' separator. Avoid angering
smatch by using the unknown specifier, and use the default we expect.

drivers/gpu/drm/i915/intel_guc_ct.c:616 ctb_read() warn: '%ph' cannot be followed by 'n'
drivers/gpu/drm/i915/intel_guc_ct.c:616 ctb_read() warn: '%ph' cannot be followed by 'n'
drivers/gpu/drm/i915/intel_guc_ct.c:616 ctb_read() warn: '%ph' cannot be followed by 'n'
drivers/gpu/drm/i915/intel_guc_ct.c:669 ct_handle_response() warn: '%ph' cannot be followed by 'n'
drivers/gpu/drm/i915/intel_guc_ct.c:679 ct_handle_response() warn: '%ph' cannot be followed by 'n'
drivers/gpu/drm/i915/intel_guc_ct.c:693 ct_handle_response() warn: '%ph' cannot be followed by 'n'
drivers/gpu/drm/i915/intel_guc_ct.c:707 ct_handle_response() warn: '%ph' cannot be followed by 'n'
drivers/gpu/drm/i915/intel_guc_ct.c:727 ct_process_request() warn: '%ph' cannot be followed by 'n'
drivers/gpu/drm/i915/intel_guc_ct.c:803 ct_handle_request() warn: '%ph' cannot be followed by 'n'
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Reviewed-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180410111417.27563-1-chris@chris-wilson.co.uk
parent 3834dc1f
...@@ -361,7 +361,7 @@ static int ctb_write(struct intel_guc_ct_buffer *ctb, ...@@ -361,7 +361,7 @@ static int ctb_write(struct intel_guc_ct_buffer *ctb,
(want_response ? GUC_CT_MSG_SEND_STATUS : 0) | (want_response ? GUC_CT_MSG_SEND_STATUS : 0) |
(action[0] << GUC_CT_MSG_ACTION_SHIFT); (action[0] << GUC_CT_MSG_ACTION_SHIFT);
CT_DEBUG_DRIVER("CT: writing %*phn %*phn %*phn\n", CT_DEBUG_DRIVER("CT: writing %*ph %*ph %*ph\n",
4, &header, 4, &fence, 4, &header, 4, &fence,
4 * (len - 1), &action[1]); 4 * (len - 1), &action[1]);
...@@ -613,7 +613,7 @@ static int ctb_read(struct intel_guc_ct_buffer *ctb, u32 *data) ...@@ -613,7 +613,7 @@ static int ctb_read(struct intel_guc_ct_buffer *ctb, u32 *data)
/* message len with header */ /* message len with header */
len = ct_header_get_len(data[0]) + 1; len = ct_header_get_len(data[0]) + 1;
if (unlikely(len > (u32)available)) { if (unlikely(len > (u32)available)) {
DRM_ERROR("CT: incomplete message %*phn %*phn %*phn\n", DRM_ERROR("CT: incomplete message %*ph %*ph %*ph\n",
4, data, 4, data,
4 * (head + available - 1 > size ? 4 * (head + available - 1 > size ?
size - head : available - 1), &cmds[head], size - head : available - 1), &cmds[head],
...@@ -626,7 +626,7 @@ static int ctb_read(struct intel_guc_ct_buffer *ctb, u32 *data) ...@@ -626,7 +626,7 @@ static int ctb_read(struct intel_guc_ct_buffer *ctb, u32 *data)
data[i] = cmds[head]; data[i] = cmds[head];
head = (head + 1) % size; head = (head + 1) % size;
} }
CT_DEBUG_DRIVER("CT: received %*phn\n", 4 * len, data); CT_DEBUG_DRIVER("CT: received %*ph\n", 4 * len, data);
desc->head = head * 4; desc->head = head * 4;
return 0; return 0;
...@@ -666,7 +666,7 @@ static int ct_handle_response(struct intel_guc_ct *ct, const u32 *msg) ...@@ -666,7 +666,7 @@ static int ct_handle_response(struct intel_guc_ct *ct, const u32 *msg)
/* Response payload shall at least include fence and status */ /* Response payload shall at least include fence and status */
if (unlikely(len < 2)) { if (unlikely(len < 2)) {
DRM_ERROR("CT: corrupted response %*phn\n", 4 * msglen, msg); DRM_ERROR("CT: corrupted response %*ph\n", 4 * msglen, msg);
return -EPROTO; return -EPROTO;
} }
...@@ -676,7 +676,7 @@ static int ct_handle_response(struct intel_guc_ct *ct, const u32 *msg) ...@@ -676,7 +676,7 @@ static int ct_handle_response(struct intel_guc_ct *ct, const u32 *msg)
/* Format of the status follows RESPONSE message */ /* Format of the status follows RESPONSE message */
if (unlikely(!INTEL_GUC_MSG_IS_RESPONSE(status))) { if (unlikely(!INTEL_GUC_MSG_IS_RESPONSE(status))) {
DRM_ERROR("CT: corrupted response %*phn\n", 4 * msglen, msg); DRM_ERROR("CT: corrupted response %*ph\n", 4 * msglen, msg);
return -EPROTO; return -EPROTO;
} }
...@@ -690,7 +690,7 @@ static int ct_handle_response(struct intel_guc_ct *ct, const u32 *msg) ...@@ -690,7 +690,7 @@ static int ct_handle_response(struct intel_guc_ct *ct, const u32 *msg)
continue; continue;
} }
if (unlikely(datalen > req->response_len)) { if (unlikely(datalen > req->response_len)) {
DRM_ERROR("CT: response %u too long %*phn\n", DRM_ERROR("CT: response %u too long %*ph\n",
req->fence, 4 * msglen, msg); req->fence, 4 * msglen, msg);
datalen = 0; datalen = 0;
} }
...@@ -704,7 +704,7 @@ static int ct_handle_response(struct intel_guc_ct *ct, const u32 *msg) ...@@ -704,7 +704,7 @@ static int ct_handle_response(struct intel_guc_ct *ct, const u32 *msg)
spin_unlock(&ct->lock); spin_unlock(&ct->lock);
if (!found) if (!found)
DRM_ERROR("CT: unsolicited response %*phn\n", 4 * msglen, msg); DRM_ERROR("CT: unsolicited response %*ph\n", 4 * msglen, msg);
return 0; return 0;
} }
...@@ -713,7 +713,7 @@ static void ct_process_request(struct intel_guc_ct *ct, ...@@ -713,7 +713,7 @@ static void ct_process_request(struct intel_guc_ct *ct,
{ {
struct intel_guc *guc = ct_to_guc(ct); struct intel_guc *guc = ct_to_guc(ct);
CT_DEBUG_DRIVER("CT: request %x %*phn\n", action, 4 * len, payload); CT_DEBUG_DRIVER("CT: request %x %*ph\n", action, 4 * len, payload);
switch (action) { switch (action) {
case INTEL_GUC_ACTION_DEFAULT: case INTEL_GUC_ACTION_DEFAULT:
...@@ -724,7 +724,7 @@ static void ct_process_request(struct intel_guc_ct *ct, ...@@ -724,7 +724,7 @@ static void ct_process_request(struct intel_guc_ct *ct,
default: default:
fail_unexpected: fail_unexpected:
DRM_ERROR("CT: unexpected request %x %*phn\n", DRM_ERROR("CT: unexpected request %x %*ph\n",
action, 4 * len, payload); action, 4 * len, payload);
break; break;
} }
...@@ -800,7 +800,7 @@ static int ct_handle_request(struct intel_guc_ct *ct, const u32 *msg) ...@@ -800,7 +800,7 @@ static int ct_handle_request(struct intel_guc_ct *ct, const u32 *msg)
request = kmalloc(sizeof(*request) + 4 * msglen, GFP_ATOMIC); request = kmalloc(sizeof(*request) + 4 * msglen, GFP_ATOMIC);
if (unlikely(!request)) { if (unlikely(!request)) {
DRM_ERROR("CT: dropping request %*phn\n", 4 * msglen, msg); DRM_ERROR("CT: dropping request %*ph\n", 4 * msglen, msg);
return 0; /* XXX: -ENOMEM ? */ return 0; /* XXX: -ENOMEM ? */
} }
memcpy(request->msg, msg, 4 * msglen); memcpy(request->msg, msg, 4 * msglen);
......
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