mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-28 07:13:34 +00:00
Code Issues Releases Wiki Activity

[media] cec: improve debug messages

Browse source 
- use __func__ instead of writing the full function name
- drop debug message in cec_config_log_addr since the same information
  will be reported later
- use debug level 1 for errors and infrequent events, use level 2 for
  debugging CEC message traffic
- log when a transmit is retried, very useful to know when debugging
- debug messages now all start with lower case

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Hans Verkuil 2017-05-31 06:50:26 -03:00 committed by Mauro Carvalho Chehab
parent 43b288baa8
commit a7a04b5b2c
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
drivers/media/cec/cec-adap.c
View file

@ -392,7 +392,7 @@ int cec_thread_func(void *_adap)
* happen and is an indication of a faulty CEC adapter * happen and is an indication of a faulty CEC adapter
* driver, or the CEC bus is in some weird state. * driver, or the CEC bus is in some weird state.
*/ */
dprintk(0, "message %*ph timed out!\n", dprintk(0, "%s: message %*ph timed out!\n", __func__,
adap->transmitting->msg.len, adap->transmitting->msg.len,
adap->transmitting->msg.msg); adap->transmitting->msg.msg);
/* Just give up on this. */ /* Just give up on this. */
@ -468,7 +468,7 @@ void cec_transmit_done(struct cec_adapter *adap, u8 status, u8 arb_lost_cnt,
struct cec_msg *msg; struct cec_msg *msg;
u64 ts = ktime_get_ns(); u64 ts = ktime_get_ns();
dprintk(2, "cec_transmit_done %02x\n", status); dprintk(2, "%s: status %02x\n", __func__, status);
mutex_lock(&adap->lock); mutex_lock(&adap->lock);
data = adap->transmitting; data = adap->transmitting;
if (!data) { if (!data) {
@ -477,7 +477,8 @@ void cec_transmit_done(struct cec_adapter *adap, u8 status, u8 arb_lost_cnt,
* unplugged while the transmit is ongoing. Ignore this * unplugged while the transmit is ongoing. Ignore this
* transmit in that case. * transmit in that case.
*/ */
dprintk(1, "cec_transmit_done without an ongoing transmit!\n"); dprintk(1, "%s was called without an ongoing transmit!\n",
__func__);
goto unlock; goto unlock;
} }
@ -504,6 +505,12 @@ void cec_transmit_done(struct cec_adapter *adap, u8 status, u8 arb_lost_cnt,
!(status & (CEC_TX_STATUS_MAX_RETRIES | CEC_TX_STATUS_OK))) { !(status & (CEC_TX_STATUS_MAX_RETRIES | CEC_TX_STATUS_OK))) {
/* Retry this message */ /* Retry this message */
data->attempts--; data->attempts--;
if (msg->timeout)
dprintk(2, "retransmit: %*ph (attempts: %d, wait for 0x%02x)\n",
msg->len, msg->msg, data->attempts, msg->reply);
else
dprintk(2, "retransmit: %*ph (attempts: %d)\n",
msg->len, msg->msg, data->attempts);
/* Add the message in front of the transmit queue */ /* Add the message in front of the transmit queue */
list_add(&data->list, &adap->transmit_queue); list_add(&data->list, &adap->transmit_queue);
adap->transmit_queue_sz++; adap->transmit_queue_sz++;
@ -911,7 +918,7 @@ void cec_received_msg(struct cec_adapter *adap, struct cec_msg *msg)
memset(msg->msg + msg->len, 0, sizeof(msg->msg) - msg->len); memset(msg->msg + msg->len, 0, sizeof(msg->msg) - msg->len);
mutex_lock(&adap->lock); mutex_lock(&adap->lock);
dprintk(2, "cec_received_msg: %*ph\n", msg->len, msg->msg); dprintk(2, "%s: %*ph\n", __func__, msg->len, msg->msg);
/* Check if this message was for us (directed or broadcast). */ /* Check if this message was for us (directed or broadcast). */
if (!cec_msg_is_broadcast(msg)) if (!cec_msg_is_broadcast(msg))
@ -1112,9 +1119,6 @@ static int cec_config_log_addr(struct cec_adapter *adap,
las->log_addr[idx] = log_addr; las->log_addr[idx] = log_addr;
las->log_addr_mask |= 1 << log_addr; las->log_addr_mask |= 1 << log_addr;
adap->phys_addrs[log_addr] = adap->phys_addr; adap->phys_addrs[log_addr] = adap->phys_addr;
dprintk(2, "claimed addr %d (%d)\n", log_addr,
las->primary_device_type[idx]);
return 1; return 1;
} }
@ -1300,7 +1304,7 @@ static int cec_config_thread_func(void *arg)
/* Report Physical Address */ /* Report Physical Address */
cec_msg_report_physical_addr(&msg, adap->phys_addr, cec_msg_report_physical_addr(&msg, adap->phys_addr,
las->primary_device_type[i]); las->primary_device_type[i]);
dprintk(2, "config: la %d pa %x.%x.%x.%x\n", dprintk(1, "config: la %d pa %x.%x.%x.%x\n",
las->log_addr[i], las->log_addr[i],
cec_phys_addr_exp(adap->phys_addr)); cec_phys_addr_exp(adap->phys_addr));
cec_transmit_msg_fh(adap, &msg, NULL, false); cec_transmit_msg_fh(adap, &msg, NULL, false);
@ -1534,12 +1538,12 @@ int __cec_s_log_addrs(struct cec_adapter *adap,
if (log_addrs->num_log_addrs == 2) { if (log_addrs->num_log_addrs == 2) {
if (!(type_mask & ((1 << CEC_LOG_ADDR_TYPE_AUDIOSYSTEM) | if (!(type_mask & ((1 << CEC_LOG_ADDR_TYPE_AUDIOSYSTEM) |
(1 << CEC_LOG_ADDR_TYPE_TV)))) { (1 << CEC_LOG_ADDR_TYPE_TV)))) {
dprintk(1, "Two LAs is only allowed for audiosystem and TV\n"); dprintk(1, "two LAs is only allowed for audiosystem and TV\n");
return -EINVAL; return -EINVAL;
} }
if (!(type_mask & ((1 << CEC_LOG_ADDR_TYPE_PLAYBACK) | if (!(type_mask & ((1 << CEC_LOG_ADDR_TYPE_PLAYBACK) |
(1 << CEC_LOG_ADDR_TYPE_RECORD)))) { (1 << CEC_LOG_ADDR_TYPE_RECORD)))) {
dprintk(1, "An audiosystem/TV can only be combined with record or playback\n"); dprintk(1, "an audiosystem/TV can only be combined with record or playback\n");
return -EINVAL; return -EINVAL;
} }
} }
@ -1653,7 +1657,7 @@ static int cec_receive_notify(struct cec_adapter *adap, struct cec_msg *msg,
bool from_unregistered = init_laddr == 0xf; bool from_unregistered = init_laddr == 0xf;
struct cec_msg tx_cec_msg = { }; struct cec_msg tx_cec_msg = { };
dprintk(1, "cec_receive_notify: %*ph\n", msg->len, msg->msg); dprintk(2, "%s: %*ph\n", __func__, msg->len, msg->msg);
/* If this is a CDC-Only device, then ignore any non-CDC messages */ /* If this is a CDC-Only device, then ignore any non-CDC messages */
if (cec_is_cdc_only(&adap->log_addrs) && if (cec_is_cdc_only(&adap->log_addrs) &&
@ -1722,7 +1726,7 @@ static int cec_receive_notify(struct cec_adapter *adap, struct cec_msg *msg,
if (!from_unregistered) if (!from_unregistered)
adap->phys_addrs[init_laddr] = pa; adap->phys_addrs[init_laddr] = pa;
dprintk(1, "Reported physical address %x.%x.%x.%x for logical address %d\n", dprintk(1, "reported physical address %x.%x.%x.%x for logical address %d\n",
cec_phys_addr_exp(pa), init_laddr); cec_phys_addr_exp(pa), init_laddr);
break; break;
} }