diff --git a/drivers/bus/mhi/host/boot.c b/drivers/bus/mhi/host/boot.c index 6b30eb14d619..14f771c1a3ec 100644 --- a/drivers/bus/mhi/host/boot.c +++ b/drivers/bus/mhi/host/boot.c @@ -35,7 +35,7 @@ int mhi_rddm_prepare(struct mhi_controller *mhi_cntrl, bhi_vec->size = mhi_buf->len; } - dev_dbg(dev, "BHIe programming for RDDM\n"); + MHI_VERB(dev, "BHIe programming for RDDM\n"); mhi_write_reg(mhi_cntrl, base, BHIE_RXVECADDR_HIGH_OFFS, upper_32_bits(mhi_buf->dma_addr)); @@ -49,11 +49,11 @@ int mhi_rddm_prepare(struct mhi_controller *mhi_cntrl, ret = mhi_write_reg_field(mhi_cntrl, base, BHIE_RXVECDB_OFFS, BHIE_RXVECDB_SEQNUM_BMSK, sequence_id); if (ret) { - dev_err(dev, "Failed to write sequence ID for BHIE_RXVECDB\n"); + MHI_ERR(dev, "Failed to write sequence ID for BHIE_RXVECDB\n"); return ret; } - dev_dbg(dev, "Address: %p and len: 0x%zx sequence: %u\n", + MHI_VERB(dev, "Address: %p and len: 0x%zx sequence: %u\n", &mhi_buf->dma_addr, mhi_buf->len, sequence_id); return 0; @@ -103,7 +103,7 @@ static int __mhi_download_rddm_in_panic(struct mhi_controller *mhi_cntrl) int rddm_retry = rddm_timeout_us / delayus; struct device *dev = &mhi_cntrl->mhi_dev->dev; - dev_dbg(dev, "Entered with pm_state:%s dev_state:%s ee:%s\n", + MHI_VERB(dev, "Entered with pm_state:%s dev_state:%s ee:%s\n", to_mhi_pm_state_str(mhi_cntrl->pm_state), mhi_state_str(mhi_cntrl->dev_state), TO_MHI_EXEC_STR(mhi_cntrl->ee)); @@ -133,10 +133,10 @@ static int __mhi_download_rddm_in_panic(struct mhi_controller *mhi_cntrl) goto error_exit_rddm; if (ee != MHI_EE_RDDM) { - dev_dbg(dev, "Trigger device into RDDM mode using SYS ERR\n"); + MHI_VERB(dev, "Trigger device into RDDM mode using SYS ERR\n"); mhi_set_mhi_state(mhi_cntrl, MHI_STATE_SYS_ERR); - dev_dbg(dev, "Waiting for device to enter RDDM\n"); + MHI_VERB(dev, "Waiting for device to enter RDDM\n"); while (rddm_retry--) { ee = mhi_get_exec_env(mhi_cntrl); if (ee == MHI_EE_RDDM) @@ -147,7 +147,7 @@ static int __mhi_download_rddm_in_panic(struct mhi_controller *mhi_cntrl) if (rddm_retry <= 0) { /* Hardware reset so force device to enter RDDM */ - dev_dbg(dev, + MHI_VERB(dev, "Did not enter RDDM, do a host req reset\n"); mhi_soc_reset(mhi_cntrl); udelay(delayus); @@ -156,7 +156,7 @@ static int __mhi_download_rddm_in_panic(struct mhi_controller *mhi_cntrl) ee = mhi_get_exec_env(mhi_cntrl); } - dev_dbg(dev, + MHI_VERB(dev, "Waiting for RDDM image download via BHIe, current EE:%s\n", TO_MHI_EXEC_STR(ee)); @@ -167,7 +167,7 @@ static int __mhi_download_rddm_in_panic(struct mhi_controller *mhi_cntrl) } error_exit_rddm: - dev_err(dev, "RDDM transfer failed. Current EE: %s\n", + MHI_ERR(dev, "RDDM transfer failed. Current EE: %s\n", TO_MHI_EXEC_STR(ee)); return -EIO; @@ -183,7 +183,7 @@ int mhi_download_rddm_image(struct mhi_controller *mhi_cntrl, bool in_panic) if (in_panic) return __mhi_download_rddm_in_panic(mhi_cntrl); - dev_dbg(dev, "Waiting for RDDM image download via BHIe\n"); + MHI_VERB(dev, "Waiting for RDDM image download via BHIe\n"); /* Wait for the image download to complete */ wait_event_timeout(mhi_cntrl->state_event, @@ -213,7 +213,7 @@ static int mhi_fw_load_bhie(struct mhi_controller *mhi_cntrl, } mhi_cntrl->session_id = MHI_RANDOM_U32_NONZERO(BHIE_TXVECSTATUS_SEQNUM_BMSK); - dev_dbg(dev, "Starting image download via BHIe. Sequence ID: %u\n", + MHI_VERB(dev, "Starting image download via BHIe. Sequence ID: %u\n", mhi_cntrl->session_id); mhi_write_reg(mhi_cntrl, base, BHIE_TXVECADDR_HIGH_OFFS, upper_32_bits(mhi_buf->dma_addr)); @@ -272,7 +272,7 @@ static int mhi_fw_load_bhi(struct mhi_controller *mhi_cntrl, } session_id = MHI_RANDOM_U32_NONZERO(BHI_TXDB_SEQNUM_BMSK); - dev_dbg(dev, "Starting image download via BHI. Session ID: %u\n", + MHI_VERB(dev, "Starting image download via BHI. Session ID: %u\n", session_id); mhi_write_reg(mhi_cntrl, base, BHI_STATUS, 0); mhi_write_reg(mhi_cntrl, base, BHI_IMGADDR_HIGH, @@ -293,7 +293,7 @@ static int mhi_fw_load_bhi(struct mhi_controller *mhi_cntrl, goto invalid_pm_state; if (tx_status == BHI_STATUS_ERROR) { - dev_err(dev, "Image transfer failed\n"); + MHI_ERR(dev, "Image transfer failed\n"); read_lock_bh(pm_lock); if (MHI_REG_ACCESS_VALID(mhi_cntrl->pm_state)) { for (i = 0; error_reg[i].name; i++) { @@ -301,7 +301,7 @@ static int mhi_fw_load_bhi(struct mhi_controller *mhi_cntrl, error_reg[i].offset, &val); if (ret) break; - dev_err(dev, "Reg: %s value: 0x%x\n", + MHI_ERR(dev, "Reg: %s value: 0x%x\n", error_reg[i].name, val); } } @@ -426,7 +426,7 @@ void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl) int i, ret; if (MHI_PM_IN_ERROR_STATE(mhi_cntrl->pm_state)) { - dev_err(dev, "Device MHI is not in valid state\n"); + MHI_ERR(dev, "Device MHI is not in valid state\n"); return; } @@ -434,13 +434,13 @@ void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl) ret = mhi_read_reg(mhi_cntrl, mhi_cntrl->bhi, BHI_SERIALNU, &mhi_cntrl->serial_number); if (ret) - dev_err(dev, "Could not capture serial number via BHI\n"); + MHI_ERR(dev, "Could not capture serial number via BHI\n"); for (i = 0; i < ARRAY_SIZE(mhi_cntrl->oem_pk_hash); i++) { ret = mhi_read_reg(mhi_cntrl, mhi_cntrl->bhi, BHI_OEMPKHASH(i), &mhi_cntrl->oem_pk_hash[i]); if (ret) { - dev_err(dev, "Could not capture OEM PK HASH via BHI\n"); + MHI_ERR(dev, "Could not capture OEM PK HASH via BHI\n"); break; } } @@ -454,7 +454,7 @@ void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl) if (!fw_name || (mhi_cntrl->fbc_download && (!mhi_cntrl->sbl_size || !mhi_cntrl->seg_len))) { - dev_err(dev, + MHI_ERR(dev, "No firmware image defined or !sbl_size || !seg_len\n"); goto error_fw_load; } @@ -462,7 +462,7 @@ void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl) ret = request_firmware(&firmware, fw_name, dev->parent); if (ret) { if (!mhi_cntrl->fallback_fw_image) { - dev_err(dev, "Error loading firmware: %d\n", ret); + MHI_ERR(dev, "Error loading firmware: %d\n", ret); goto error_fw_load; } @@ -470,7 +470,7 @@ void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl) mhi_cntrl->fallback_fw_image, dev->parent); if (ret) { - dev_err(dev, "Error loading fallback firmware: %d\n", + MHI_ERR(dev, "Error loading fallback firmware: %d\n", ret); goto error_fw_load; } @@ -497,7 +497,7 @@ void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl) /* Error or in EDL mode, we're done */ if (ret) { - dev_err(dev, "MHI did not load image over BHI, ret: %d\n", ret); + MHI_ERR(dev, "MHI did not load image over BHI, ret: %d\n", ret); release_firmware(firmware); goto error_fw_load; } @@ -534,11 +534,11 @@ void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl) /* Transitioning into MHI RESET->READY state */ ret = mhi_ready_state_transition(mhi_cntrl); if (ret) { - dev_err(dev, "MHI did not enter READY state\n"); + MHI_ERR(dev, "MHI did not enter READY state\n"); goto error_ready_state; } - dev_info(dev, "Wait for device to enter SBL or Mission mode\n"); + MHI_LOG(dev, "Wait for device to enter SBL or Mission mode\n"); return; error_ready_state: @@ -563,7 +563,7 @@ int mhi_download_amss_image(struct mhi_controller *mhi_cntrl) /* Vector table is the last entry */ &image_info->mhi_buf[image_info->entries - 1]); if (ret) { - dev_err(dev, "MHI did not load AMSS, ret:%d\n", ret); + MHI_ERR(dev, "MHI did not load AMSS, ret:%d\n", ret); mhi_cntrl->pm_state = MHI_PM_FW_DL_ERR; wake_up_all(&mhi_cntrl->state_event); } diff --git a/drivers/bus/mhi/host/init.c b/drivers/bus/mhi/host/init.c index 85b39d69fdac..3878d875bf5e 100644 --- a/drivers/bus/mhi/host/init.c +++ b/drivers/bus/mhi/host/init.c @@ -190,7 +190,7 @@ int mhi_init_irq_setup(struct mhi_controller *mhi_cntrl) continue; if (mhi_event->irq >= mhi_cntrl->nr_irqs) { - dev_err(dev, "irq %d not available for event ring\n", + MHI_ERR(dev, "irq %d not available for event ring\n", mhi_event->irq); ret = -EINVAL; goto error_request; @@ -201,7 +201,7 @@ int mhi_init_irq_setup(struct mhi_controller *mhi_cntrl) irq_flags, "mhi", mhi_event); if (ret) { - dev_err(dev, "Error requesting irq:%d for ev:%d\n", + MHI_ERR(dev, "Error requesting irq:%d for ev:%d\n", mhi_cntrl->irq[mhi_event->irq], i); goto error_request; } @@ -507,12 +507,12 @@ int mhi_init_mmio(struct mhi_controller *mhi_cntrl) {0, 0} }; - dev_dbg(dev, "Initializing MHI registers\n"); + MHI_VERB(dev, "Initializing MHI registers\n"); /* Read channel db offset */ ret = mhi_read_reg(mhi_cntrl, base, CHDBOFF, &val); if (ret) { - dev_err(dev, "Unable to read CHDBOFF register\n"); + MHI_ERR(dev, "Unable to read CHDBOFF register\n"); return -EIO; } @@ -528,7 +528,7 @@ int mhi_init_mmio(struct mhi_controller *mhi_cntrl) /* Read event ring db offset */ ret = mhi_read_reg(mhi_cntrl, base, ERDBOFF, &val); if (ret) { - dev_err(dev, "Unable to read ERDBOFF register\n"); + MHI_ERR(dev, "Unable to read ERDBOFF register\n"); return -EIO; } @@ -552,14 +552,14 @@ int mhi_init_mmio(struct mhi_controller *mhi_cntrl) ret = mhi_write_reg_field(mhi_cntrl, base, MHICFG, MHICFG_NER_MASK, mhi_cntrl->total_ev_rings); if (ret) { - dev_err(dev, "Unable to write MHICFG register\n"); + MHI_ERR(dev, "Unable to write MHICFG register\n"); return ret; } ret = mhi_write_reg_field(mhi_cntrl, base, MHICFG, MHICFG_NHWER_MASK, mhi_cntrl->hw_ev_rings); if (ret) { - dev_err(dev, "Unable to write MHICFG register\n"); + MHI_ERR(dev, "Unable to write MHICFG register\n"); return ret; } @@ -680,7 +680,7 @@ static int parse_ev_cfg(struct mhi_controller *mhi_cntrl, /* This event ring has a dedicated channel */ mhi_event->chan = event_cfg->channel; if (mhi_event->chan >= mhi_cntrl->max_chan) { - dev_err(dev, + MHI_ERR(dev, "Event Ring channel not available\n"); goto error_ev_cfg; } @@ -716,7 +716,7 @@ static int parse_ev_cfg(struct mhi_controller *mhi_cntrl, mhi_event->process_event = mhi_process_misc_tsync_ev_ring; break; default: - dev_err(dev, "Event Ring type not supported\n"); + MHI_ERR(dev, "Event Ring type not supported\n"); goto error_ev_cfg; } @@ -769,7 +769,7 @@ static int parse_ch_cfg(struct mhi_controller *mhi_cntrl, chan = ch_cfg->num; if (chan >= mhi_cntrl->max_chan) { - dev_err(dev, "Channel %d not available\n", chan); + MHI_ERR(dev, "Channel %d not available\n", chan); goto error_chan_cfg; } @@ -816,7 +816,7 @@ static int parse_ch_cfg(struct mhi_controller *mhi_cntrl, * should be DMA_FROM_DEVICE */ if (mhi_chan->pre_alloc && mhi_chan->dir != DMA_FROM_DEVICE) { - dev_err(dev, "Invalid channel configuration\n"); + MHI_ERR(dev, "Invalid channel configuration\n"); goto error_chan_cfg; } @@ -826,14 +826,14 @@ static int parse_ch_cfg(struct mhi_controller *mhi_cntrl, */ if ((mhi_chan->dir == DMA_BIDIRECTIONAL || mhi_chan->dir == DMA_NONE) && !mhi_chan->offload_ch) { - dev_err(dev, "Invalid channel configuration\n"); + MHI_ERR(dev, "Invalid channel configuration\n"); goto error_chan_cfg; } if (!mhi_chan->offload_ch) { mhi_chan->db_cfg.brstmode = ch_cfg->doorbell; if (MHI_INVALID_BRSTMODE(mhi_chan->db_cfg.brstmode)) { - dev_err(dev, "Invalid Door bell mode\n"); + MHI_ERR(dev, "Invalid Door bell mode\n"); goto error_chan_cfg; } } @@ -1119,12 +1119,12 @@ int mhi_prepare_for_power_up(struct mhi_controller *mhi_cntrl) ret = mhi_read_reg(mhi_cntrl, mhi_cntrl->regs, BHIOFF, &bhi_off); if (ret) { - dev_err(dev, "Error getting BHI offset\n"); + MHI_ERR(dev, "Error getting BHI offset\n"); goto error_reg_offset; } if (bhi_off >= mhi_cntrl->reg_len) { - dev_err(dev, "BHI offset: 0x%x is out of range: 0x%zx\n", + MHI_ERR(dev, "BHI offset: 0x%x is out of range: 0x%zx\n", bhi_off, mhi_cntrl->reg_len); ret = -EINVAL; goto error_reg_offset; @@ -1135,12 +1135,12 @@ int mhi_prepare_for_power_up(struct mhi_controller *mhi_cntrl) ret = mhi_read_reg(mhi_cntrl, mhi_cntrl->regs, BHIEOFF, &bhie_off); if (ret) { - dev_err(dev, "Error getting BHIE offset\n"); + MHI_ERR(dev, "Error getting BHIE offset\n"); goto error_reg_offset; } if (bhie_off >= mhi_cntrl->reg_len) { - dev_err(dev, + MHI_ERR(dev, "BHIe offset: 0x%x is out of range: 0x%zx\n", bhie_off, mhi_cntrl->reg_len); ret = -EINVAL; diff --git a/drivers/bus/mhi/host/main.c b/drivers/bus/mhi/host/main.c index 9baae90e4fbe..c14dd41298ae 100644 --- a/drivers/bus/mhi/host/main.c +++ b/drivers/bus/mhi/host/main.c @@ -325,7 +325,7 @@ int mhi_destroy_device(struct device *dev, void *data) put_device(&dl_chan->mhi_dev->dev); } - dev_dbg(&mhi_cntrl->mhi_dev->dev, "destroy device for chan:%s\n", + MHI_VERB(dev, "destroy device for chan:%s\n", mhi_dev->name); /* Notify the client and remove the device from MHI bus */ @@ -398,7 +398,7 @@ void mhi_create_devices(struct mhi_controller *mhi_cntrl) mhi_dev->dl_event_id = mhi_chan->er_index; break; default: - dev_err(dev, "Direction not supported\n"); + MHI_ERR(dev, "Direction not supported\n"); put_device(&mhi_dev->dev); return; } @@ -477,7 +477,7 @@ irqreturn_t mhi_irq_handler(int irq_number, void *priv) void *dev_rp; if (!is_valid_ring_ptr(ev_ring, ptr)) { - dev_err(&mhi_cntrl->mhi_dev->dev, + MHI_ERR(dev, "Event ring rp points outside of the event ring\n"); return IRQ_HANDLED; } @@ -510,7 +510,7 @@ irqreturn_t mhi_irq_handler(int irq_number, void *priv) queue_work(mhi_cntrl->hiprio_wq, &mhi_event->work); break; default: - dev_dbg(dev, "skip unknown priority event\n"); + MHI_VERB(dev, "skip unknown priority event\n"); break; } @@ -533,13 +533,13 @@ irqreturn_t mhi_intvec_threaded_handler(int irq_number, void *priv) state = mhi_get_mhi_state(mhi_cntrl); ee = mhi_get_exec_env(mhi_cntrl); - dev_dbg(dev, "local ee: %s state: %s device ee: %s state: %s\n", + MHI_VERB(dev, "local ee: %s state: %s device ee: %s state: %s\n", TO_MHI_EXEC_STR(mhi_cntrl->ee), mhi_state_str(mhi_cntrl->dev_state), TO_MHI_EXEC_STR(ee), mhi_state_str(state)); if (state == MHI_STATE_SYS_ERR) { - dev_dbg(dev, "System error detected\n"); + MHI_VERB(dev, "System error detected\n"); pm_state = mhi_tryset_pm_state(mhi_cntrl, MHI_PM_SYS_ERR_DETECT); } @@ -652,7 +652,7 @@ static int parse_xfer_event(struct mhi_controller *mhi_cntrl, u16 xfer_len; if (!is_valid_ring_ptr(tre_ring, ptr)) { - dev_err(&mhi_cntrl->mhi_dev->dev, + MHI_ERR(dev, "Event element points outside of the tre ring\n"); break; } @@ -705,7 +705,7 @@ static int parse_xfer_event(struct mhi_controller *mhi_cntrl, mhi_chan->dir, buf_info->cb_buf, buf_info->len, MHI_EOT)) { - dev_err(dev, + MHI_ERR(dev, "Error recycling buffer for chan:%d\n", mhi_chan->chan); kfree(buf_info->cb_buf); @@ -821,7 +821,7 @@ static void mhi_process_cmd_completion(struct mhi_controller *mhi_cntrl, u32 chan; if (!is_valid_ring_ptr(mhi_ring, ptr)) { - dev_err(&mhi_cntrl->mhi_dev->dev, + MHI_ERR(dev, "Event element points outside of the cmd ring\n"); return; } @@ -848,7 +848,7 @@ static void mhi_process_cmd_completion(struct mhi_controller *mhi_cntrl, complete(&mhi_chan->completion); write_unlock_bh(&mhi_chan->lock); } else { - dev_err(&mhi_cntrl->mhi_dev->dev, + MHI_ERR(dev, "Completion packet for invalid channel ID: %d\n", chan); } @@ -879,7 +879,7 @@ int mhi_process_ctrl_ev_ring(struct mhi_controller *mhi_cntrl, return -EIO; if (!is_valid_ring_ptr(ev_ring, ptr)) { - dev_err(&mhi_cntrl->mhi_dev->dev, + MHI_ERR(dev, "Event ring rp points outside of the event ring\n"); return -EIO; } @@ -890,7 +890,7 @@ int mhi_process_ctrl_ev_ring(struct mhi_controller *mhi_cntrl, while (dev_rp != local_rp) { enum mhi_pkt_type type = MHI_TRE_GET_EV_TYPE(local_rp); - dev_dbg(dev, "RP:0x%llx Processing Event:0x%llx 0x%08x 0x%08x\n", + MHI_VERB(dev, "RP:0x%llx Processing Event:0x%llx 0x%08x 0x%08x\n", (u64)mhi_to_physical(ev_ring, local_rp), local_rp->ptr, local_rp->dword[0], local_rp->dword[1]); @@ -906,7 +906,7 @@ int mhi_process_ctrl_ev_ring(struct mhi_controller *mhi_cntrl, link_info->target_link_width = MHI_TRE_GET_EV_LINKWIDTH(local_rp); write_unlock_irq(&mhi_cntrl->pm_lock); - dev_dbg(dev, "Received BW_REQ event\n"); + MHI_VERB(dev, "Received BW_REQ event\n"); mhi_cntrl->status_cb(mhi_cntrl, MHI_CB_BW_REQ); break; } @@ -916,7 +916,7 @@ int mhi_process_ctrl_ev_ring(struct mhi_controller *mhi_cntrl, new_state = MHI_TRE_GET_EV_STATE(local_rp); - dev_dbg(dev, "State change event to state: %s\n", + MHI_VERB(dev, "State change event to state: %s\n", mhi_state_str(new_state)); switch (new_state) { @@ -933,7 +933,7 @@ int mhi_process_ctrl_ev_ring(struct mhi_controller *mhi_cntrl, { enum mhi_pm_state pm_state; - dev_dbg(dev, "System error detected\n"); + MHI_VERB(dev, "System error detected\n"); write_lock_irq(&mhi_cntrl->pm_lock); pm_state = mhi_tryset_pm_state(mhi_cntrl, MHI_PM_SYS_ERR_DETECT); @@ -943,7 +943,7 @@ int mhi_process_ctrl_ev_ring(struct mhi_controller *mhi_cntrl, break; } default: - dev_err(dev, "Invalid state: %s\n", + MHI_ERR(dev, "Invalid state: %s\n", mhi_state_str(new_state)); } @@ -957,7 +957,7 @@ int mhi_process_ctrl_ev_ring(struct mhi_controller *mhi_cntrl, enum dev_st_transition st = DEV_ST_TRANSITION_MAX; enum mhi_ee_type event = MHI_TRE_GET_EV_EXECENV(local_rp); - dev_dbg(dev, "Received EE event: %s\n", + MHI_VERB(dev, "Received EE event: %s\n", TO_MHI_EXEC_STR(event)); switch (event) { case MHI_EE_SBL: @@ -978,7 +978,7 @@ int mhi_process_ctrl_ev_ring(struct mhi_controller *mhi_cntrl, wake_up_all(&mhi_cntrl->state_event); break; default: - dev_err(dev, + MHI_ERR(dev, "Unhandled EE event: 0x%x\n", type); } if (st != DEV_ST_TRANSITION_MAX) @@ -1004,7 +1004,7 @@ int mhi_process_ctrl_ev_ring(struct mhi_controller *mhi_cntrl, } break; default: - dev_err(dev, "Unhandled event type: %d\n", type); + MHI_ERR(dev, "Unhandled event type: %d\n", type); break; } @@ -1013,7 +1013,7 @@ int mhi_process_ctrl_ev_ring(struct mhi_controller *mhi_cntrl, ptr = le64_to_cpu(er_ctxt->rp); if (!is_valid_ring_ptr(ev_ring, ptr)) { - dev_err(&mhi_cntrl->mhi_dev->dev, + MHI_ERR(dev, "Event ring rp points outside of the event ring\n"); return -EIO; } @@ -1048,7 +1048,7 @@ int mhi_process_data_event_ring(struct mhi_controller *mhi_cntrl, return -EIO; if (!is_valid_ring_ptr(ev_ring, ptr)) { - dev_err(&mhi_cntrl->mhi_dev->dev, + MHI_ERR(dev, "Event ring rp points outside of the event ring\n"); return -EIO; } @@ -1059,7 +1059,7 @@ int mhi_process_data_event_ring(struct mhi_controller *mhi_cntrl, while (dev_rp != local_rp && event_quota > 0) { enum mhi_pkt_type type = MHI_TRE_GET_EV_TYPE(local_rp); - dev_dbg(dev, "Processing Event:0x%llx 0x%08x 0x%08x\n", + MHI_VERB(dev, "Processing Event:0x%llx 0x%08x 0x%08x\n", local_rp->ptr, local_rp->dword[0], local_rp->dword[1]); chan = MHI_TRE_GET_EV_CHID(local_rp); @@ -1088,7 +1088,7 @@ int mhi_process_data_event_ring(struct mhi_controller *mhi_cntrl, ptr = le64_to_cpu(er_ctxt->rp); if (!is_valid_ring_ptr(ev_ring, ptr)) { - dev_err(&mhi_cntrl->mhi_dev->dev, + MHI_ERR(dev, "Event ring rp points outside of the event ring\n"); return -EIO; } @@ -1152,7 +1152,7 @@ void mhi_ctrl_ev_task(unsigned long data) write_lock_irq(&mhi_cntrl->pm_lock); state = mhi_get_mhi_state(mhi_cntrl); if (state == MHI_STATE_SYS_ERR) { - dev_dbg(dev, "System error detected\n"); + MHI_VERB(dev, "System error detected\n"); pm_state = mhi_tryset_pm_state(mhi_cntrl, MHI_PM_SYS_ERR_DETECT); } @@ -1169,7 +1169,7 @@ void mhi_process_ev_work(struct work_struct *work) struct mhi_controller *mhi_cntrl = mhi_event->mhi_cntrl; struct device *dev = mhi_cntrl->cntrl_dev; - dev_dbg(dev, "Enter with pm_state:%s MHI_STATE:%s ee:%s\n", + MHI_VERB(dev, "Enter with pm_state:%s MHI_STATE:%s ee:%s\n", to_mhi_pm_state_str(mhi_cntrl->pm_state), mhi_state_str(mhi_cntrl->dev_state), TO_MHI_EXEC_STR(mhi_cntrl->ee)); @@ -1399,7 +1399,7 @@ int mhi_send_cmd(struct mhi_controller *mhi_cntrl, &cmd_tre->dword[1]); break; default: - dev_err(dev, "Command not supported\n"); + MHI_ERR(dev, "Command not supported\n"); break; } @@ -1422,7 +1422,7 @@ static int mhi_update_channel_state(struct mhi_controller *mhi_cntrl, enum mhi_cmd_type cmd = MHI_CMD_NOP; int ret; - dev_dbg(dev, "%d: Updating channel state to: %s\n", mhi_chan->chan, + MHI_VERB(dev, "%d: Updating channel state to: %s\n", mhi_chan->chan, TO_CH_STATE_TYPE_STR(to_state)); switch (to_state) { @@ -1453,7 +1453,7 @@ static int mhi_update_channel_state(struct mhi_controller *mhi_cntrl, cmd = MHI_CMD_START_CHAN; break; default: - dev_err(dev, "%d: Channel state update to %s not allowed\n", + MHI_ERR(dev, "%d: Channel state update to %s not allowed\n", mhi_chan->chan, TO_CH_STATE_TYPE_STR(to_state)); return -EINVAL; } @@ -1467,7 +1467,7 @@ static int mhi_update_channel_state(struct mhi_controller *mhi_cntrl, reinit_completion(&mhi_chan->completion); ret = mhi_send_cmd(mhi_cntrl, mhi_chan, cmd); if (ret) { - dev_err(dev, "%d: Failed to send %s channel command\n", + MHI_ERR(dev, "%d: Failed to send %s channel command\n", mhi_chan->chan, TO_CH_STATE_TYPE_STR(to_state)); goto exit_channel_update; } @@ -1475,7 +1475,7 @@ static int mhi_update_channel_state(struct mhi_controller *mhi_cntrl, ret = wait_for_completion_timeout(&mhi_chan->completion, msecs_to_jiffies(mhi_cntrl->timeout_ms)); if (!ret || mhi_chan->ccs != MHI_EV_CC_SUCCESS) { - dev_err(dev, + MHI_ERR(dev, "%d: Failed to receive %s channel command completion\n", mhi_chan->chan, TO_CH_STATE_TYPE_STR(to_state)); ret = -EIO; @@ -1491,7 +1491,7 @@ static int mhi_update_channel_state(struct mhi_controller *mhi_cntrl, write_unlock_irq(&mhi_chan->lock); } - dev_dbg(dev, "%d: Channel state change to %s successful\n", + MHI_VERB(dev, "%d: Channel state change to %s successful\n", mhi_chan->chan, TO_CH_STATE_TYPE_STR(to_state)); exit_channel_update: @@ -1510,7 +1510,7 @@ static void mhi_unprepare_channel(struct mhi_controller *mhi_cntrl, mutex_lock(&mhi_chan->mutex); if (!(BIT(mhi_cntrl->ee) & mhi_chan->ee_mask)) { - dev_dbg(dev, "Current EE: %s Required EE Mask: 0x%x\n", + MHI_VERB(dev, "Current EE: %s Required EE Mask: 0x%x\n", TO_MHI_EXEC_STR(mhi_cntrl->ee), mhi_chan->ee_mask); goto exit_unprepare_channel; } @@ -1519,7 +1519,7 @@ static void mhi_unprepare_channel(struct mhi_controller *mhi_cntrl, ret = mhi_update_channel_state(mhi_cntrl, mhi_chan, MHI_CH_STATE_TYPE_RESET); if (ret) - dev_err(dev, "%d: Failed to reset channel, still resetting\n", + MHI_ERR(dev, "%d: Failed to reset channel, still resetting\n", mhi_chan->chan); exit_unprepare_channel: @@ -1531,7 +1531,7 @@ static void mhi_unprepare_channel(struct mhi_controller *mhi_cntrl, mhi_reset_chan(mhi_cntrl, mhi_chan); mhi_deinit_chan_ctxt(mhi_cntrl, mhi_chan); } - dev_dbg(dev, "%d: successfully reset\n", mhi_chan->chan); + MHI_VERB(dev, "%d: successfully reset\n", mhi_chan->chan); mutex_unlock(&mhi_chan->mutex); } @@ -1543,7 +1543,7 @@ int mhi_prepare_channel(struct mhi_controller *mhi_cntrl, struct device *dev = &mhi_chan->mhi_dev->dev; if (!(BIT(mhi_cntrl->ee) & mhi_chan->ee_mask)) { - dev_err(dev, "Current EE: %s Required EE Mask: 0x%x\n", + MHI_ERR(dev, "Current EE: %s Required EE Mask: 0x%x\n", TO_MHI_EXEC_STR(mhi_cntrl->ee), mhi_chan->ee_mask); return -ENOTCONN; } @@ -1633,7 +1633,7 @@ static void mhi_mark_stale_events(struct mhi_controller *mhi_cntrl, unsigned long flags; dma_addr_t ptr; - dev_dbg(dev, "Marking all events for chan: %d as stale\n", chan); + MHI_VERB(dev, "Marking all events for chan: %d as stale\n", chan); ev_ring = &mhi_event->ring; @@ -1642,7 +1642,7 @@ static void mhi_mark_stale_events(struct mhi_controller *mhi_cntrl, ptr = le64_to_cpu(er_ctxt->rp); if (!is_valid_ring_ptr(ev_ring, ptr)) { - dev_err(&mhi_cntrl->mhi_dev->dev, + MHI_ERR(dev, "Event ring rp points outside of the event ring\n"); dev_rp = ev_ring->rp; } else { @@ -1660,7 +1660,7 @@ static void mhi_mark_stale_events(struct mhi_controller *mhi_cntrl, local_rp = ev_ring->base; } - dev_dbg(dev, "Finished marking events as stale events\n"); + MHI_VERB(dev, "Finished marking events as stale events\n"); spin_unlock_irqrestore(&mhi_event->lock, flags); } diff --git a/drivers/bus/mhi/host/pm.c b/drivers/bus/mhi/host/pm.c index 78c2b483080a..85a464241968 100644 --- a/drivers/bus/mhi/host/pm.c +++ b/drivers/bus/mhi/host/pm.c @@ -141,7 +141,7 @@ void mhi_set_mhi_state(struct mhi_controller *mhi_cntrl, enum mhi_state state) } if (ret) - dev_err(dev, "Failed to set MHI state to: %s\n", + MHI_ERR(dev, "Failed to set MHI state to: %s\n", mhi_state_str(state)); } @@ -205,7 +205,7 @@ int mhi_ready_state_transition(struct mhi_controller *mhi_cntrl) /* Check if device entered error state */ if (MHI_PM_IN_FATAL_STATE(mhi_cntrl->pm_state)) { - dev_err(dev, "Device link is not accessible\n"); + MHI_ERR(dev, "Device link is not accessible\n"); return -EIO; } @@ -213,25 +213,25 @@ int mhi_ready_state_transition(struct mhi_controller *mhi_cntrl) ret = mhi_poll_reg_field(mhi_cntrl, mhi_cntrl->regs, MHICTRL, MHICTRL_RESET_MASK, 0, interval_us); if (ret) { - dev_err(dev, "Device failed to clear MHI Reset\n"); + MHI_ERR(dev, "Device failed to clear MHI Reset\n"); return ret; } ret = mhi_poll_reg_field(mhi_cntrl, mhi_cntrl->regs, MHISTATUS, MHISTATUS_READY_MASK, 1, interval_us); if (ret) { - dev_err(dev, "Device failed to enter MHI Ready\n"); + MHI_ERR(dev, "Device failed to enter MHI Ready\n"); return ret; } - dev_dbg(dev, "Device in READY State\n"); + MHI_VERB(dev, "Device in READY State\n"); write_lock_irq(&mhi_cntrl->pm_lock); cur_state = mhi_tryset_pm_state(mhi_cntrl, MHI_PM_POR); mhi_cntrl->dev_state = MHI_STATE_READY; write_unlock_irq(&mhi_cntrl->pm_lock); if (cur_state != MHI_PM_POR) { - dev_err(dev, "Error moving to state %s from %s\n", + MHI_ERR(dev, "Error moving to state %s from %s\n", to_mhi_pm_state_str(MHI_PM_POR), to_mhi_pm_state_str(cur_state)); return -EIO; @@ -239,14 +239,14 @@ int mhi_ready_state_transition(struct mhi_controller *mhi_cntrl) read_lock_bh(&mhi_cntrl->pm_lock); if (!MHI_REG_ACCESS_VALID(mhi_cntrl->pm_state)) { - dev_err(dev, "Device registers not accessible\n"); + MHI_ERR(dev, "Device registers not accessible\n"); goto error_mmio; } /* Configure MMIO registers */ ret = mhi_init_mmio(mhi_cntrl); if (ret) { - dev_err(dev, "Error configuring MMIO registers\n"); + MHI_ERR(dev, "Error configuring MMIO registers\n"); goto error_mmio; } @@ -277,7 +277,7 @@ int mhi_pm_m0_transition(struct mhi_controller *mhi_cntrl) cur_state = mhi_tryset_pm_state(mhi_cntrl, MHI_PM_M0); write_unlock_irq(&mhi_cntrl->pm_lock); if (unlikely(cur_state != MHI_PM_M0)) { - dev_err(dev, "Unable to transition to M0 state\n"); + MHI_ERR(dev, "Unable to transition to M0 state\n"); return -EIO; } mhi_cntrl->M0++; @@ -353,7 +353,7 @@ void mhi_pm_m1_transition(struct mhi_controller *mhi_cntrl) /* If there are any pending resources, exit M2 immediately */ if (unlikely(atomic_read(&mhi_cntrl->pending_pkts) || atomic_read(&mhi_cntrl->dev_wake))) { - dev_dbg(dev, + MHI_VERB(dev, "Exiting M2, pending_pkts: %d dev_wake: %d\n", atomic_read(&mhi_cntrl->pending_pkts), atomic_read(&mhi_cntrl->dev_wake)); @@ -380,7 +380,7 @@ int mhi_pm_m3_transition(struct mhi_controller *mhi_cntrl) state = mhi_tryset_pm_state(mhi_cntrl, MHI_PM_M3); write_unlock_irq(&mhi_cntrl->pm_lock); if (state != MHI_PM_M3) { - dev_err(dev, "Unable to transition to M3 state\n"); + MHI_ERR(dev, "Unable to transition to M3 state\n"); return -EIO; } @@ -397,7 +397,7 @@ static int mhi_pm_mission_mode_transition(struct mhi_controller *mhi_cntrl) enum mhi_ee_type ee = MHI_EE_MAX, current_ee = mhi_cntrl->ee; int ret; - dev_dbg(dev, "Processing Mission Mode transition\n"); + MHI_VERB(dev, "Processing Mission Mode transition\n"); write_lock_irq(&mhi_cntrl->pm_lock); if (MHI_REG_ACCESS_VALID(mhi_cntrl->pm_state)) @@ -466,7 +466,7 @@ static void mhi_pm_disable_transition(struct mhi_controller *mhi_cntrl) struct device *dev = &mhi_cntrl->mhi_dev->dev; int ret, i; - dev_dbg(dev, "Processing disable transition with PM state: %s\n", + MHI_VERB(dev, "Processing disable transition with PM state: %s\n", to_mhi_pm_state_str(mhi_cntrl->pm_state)); mhi_reset_reg_write_q(mhi_cntrl); @@ -480,14 +480,14 @@ static void mhi_pm_disable_transition(struct mhi_controller *mhi_cntrl) if ((!MHI_PM_IN_FATAL_STATE(mhi_cntrl->pm_state)) && (mhi_cntrl->rddm_image && mhi_get_exec_env(mhi_cntrl) != MHI_EE_RDDM)) { - dev_dbg(dev, "Triggering MHI Reset in device\n"); + MHI_VERB(dev, "Triggering MHI Reset in device\n"); mhi_set_mhi_state(mhi_cntrl, MHI_STATE_RESET); /* Wait for the reset bit to be cleared by the device */ ret = mhi_poll_reg_field(mhi_cntrl, mhi_cntrl->regs, MHICTRL, MHICTRL_RESET_MASK, 0, 25000); if (ret) - dev_err(dev, "Device failed to clear MHI Reset\n"); + MHI_ERR(dev, "Device failed to clear MHI Reset\n"); /* * Device will clear BHI_INTVEC as a part of RESET processing, @@ -501,11 +501,11 @@ static void mhi_pm_disable_transition(struct mhi_controller *mhi_cntrl) MHISTATUS, MHISTATUS_READY_MASK, 1, 25000); if (ret) - dev_err(dev, "Device failed to enter READY state\n"); + MHI_ERR(dev, "Device failed to enter READY state\n"); } } - dev_dbg(dev, + MHI_VERB(dev, "Waiting for all pending event ring processing to complete\n"); mhi_event = mhi_cntrl->mhi_event; for (i = 0; i < mhi_cntrl->total_ev_rings; i++, mhi_event++) { @@ -521,10 +521,10 @@ static void mhi_pm_disable_transition(struct mhi_controller *mhi_cntrl) /* Release lock and wait for all pending threads to complete */ mutex_unlock(&mhi_cntrl->pm_mutex); mhi_misc_disable(mhi_cntrl); - dev_dbg(dev, "Waiting for all pending threads to complete\n"); + MHI_VERB(dev, "Waiting for all pending threads to complete\n"); wake_up_all(&mhi_cntrl->state_event); - dev_dbg(dev, "Reset all active channels and remove MHI devices\n"); + MHI_VERB(dev, "Reset all active channels and remove MHI devices\n"); device_for_each_child(&mhi_cntrl->mhi_dev->dev, NULL, mhi_destroy_device); mutex_lock(&mhi_cntrl->pm_mutex); @@ -533,7 +533,7 @@ static void mhi_pm_disable_transition(struct mhi_controller *mhi_cntrl) WARN_ON(atomic_read(&mhi_cntrl->pending_pkts)); /* Reset the ev rings and cmd rings */ - dev_dbg(dev, "Resetting EV CTXT and CMD CTXT\n"); + MHI_VERB(dev, "Resetting EV CTXT and CMD CTXT\n"); mhi_cmd = mhi_cntrl->mhi_cmd; cmd_ctxt = mhi_cntrl->mhi_ctxt->cmd_ctxt; for (i = 0; i < NR_OF_CMD_RINGS; i++, mhi_cmd++, cmd_ctxt++) { @@ -566,11 +566,11 @@ static void mhi_pm_disable_transition(struct mhi_controller *mhi_cntrl) cur_state = mhi_tryset_pm_state(mhi_cntrl, MHI_PM_DISABLE); write_unlock_irq(&mhi_cntrl->pm_lock); if (unlikely(cur_state != MHI_PM_DISABLE)) - dev_err(dev, "Error moving from PM state: %s to: %s\n", + MHI_ERR(dev, "Error moving from PM state: %s to: %s\n", to_mhi_pm_state_str(cur_state), to_mhi_pm_state_str(MHI_PM_DISABLE)); - dev_dbg(dev, "Exiting with PM state: %s, MHI state: %s\n", + MHI_VERB(dev, "Exiting with PM state: %s, MHI state: %s\n", to_mhi_pm_state_str(mhi_cntrl->pm_state), mhi_state_str(mhi_cntrl->dev_state)); @@ -589,7 +589,7 @@ static void mhi_pm_sys_error_transition(struct mhi_controller *mhi_cntrl) struct device *dev = &mhi_cntrl->mhi_dev->dev; int ret, i; - dev_dbg(dev, "Transitioning from PM state: %s to: %s\n", + MHI_VERB(dev, "Transitioning from PM state: %s to: %s\n", to_mhi_pm_state_str(mhi_cntrl->pm_state), to_mhi_pm_state_str(MHI_PM_SYS_ERR_PROCESS)); @@ -603,7 +603,7 @@ static void mhi_pm_sys_error_transition(struct mhi_controller *mhi_cntrl) write_unlock_irq(&mhi_cntrl->pm_lock); if (cur_state != MHI_PM_SYS_ERR_PROCESS) { - dev_err(dev, "Failed to transition from PM state: %s to: %s\n", + MHI_ERR(dev, "Failed to transition from PM state: %s to: %s\n", to_mhi_pm_state_str(cur_state), to_mhi_pm_state_str(MHI_PM_SYS_ERR_PROCESS)); goto exit_sys_error_transition; @@ -620,7 +620,7 @@ static void mhi_pm_sys_error_transition(struct mhi_controller *mhi_cntrl) u32 in_reset = -1; unsigned long timeout = msecs_to_jiffies(mhi_cntrl->timeout_ms); - dev_dbg(dev, "Triggering MHI Reset in device\n"); + MHI_VERB(dev, "Triggering MHI Reset in device\n"); mhi_set_mhi_state(mhi_cntrl, MHI_STATE_RESET); /* Wait for the reset bit to be cleared by the device */ @@ -632,7 +632,7 @@ static void mhi_pm_sys_error_transition(struct mhi_controller *mhi_cntrl) &in_reset) || !in_reset, timeout); if (!ret || in_reset) { - dev_err(dev, "Device failed to exit MHI Reset state\n"); + MHI_ERR(dev, "Device failed to exit MHI Reset state\n"); goto exit_sys_error_transition; } @@ -643,7 +643,7 @@ static void mhi_pm_sys_error_transition(struct mhi_controller *mhi_cntrl) mhi_write_reg(mhi_cntrl, mhi_cntrl->bhi, BHI_INTVEC, 0); } - dev_dbg(dev, + MHI_VERB(dev, "Waiting for all pending event ring processing to complete\n"); mhi_event = mhi_cntrl->mhi_event; for (i = 0; i < mhi_cntrl->total_ev_rings; i++, mhi_event++) { @@ -658,10 +658,10 @@ static void mhi_pm_sys_error_transition(struct mhi_controller *mhi_cntrl) /* Release lock and wait for all pending threads to complete */ mutex_unlock(&mhi_cntrl->pm_mutex); mhi_misc_disable(mhi_cntrl); - dev_dbg(dev, "Waiting for all pending threads to complete\n"); + MHI_VERB(dev, "Waiting for all pending threads to complete\n"); wake_up_all(&mhi_cntrl->state_event); - dev_dbg(dev, "Reset all active channels and remove MHI devices\n"); + MHI_VERB(dev, "Reset all active channels and remove MHI devices\n"); device_for_each_child(&mhi_cntrl->mhi_dev->dev, NULL, mhi_destroy_device); mutex_lock(&mhi_cntrl->pm_mutex); @@ -670,7 +670,7 @@ static void mhi_pm_sys_error_transition(struct mhi_controller *mhi_cntrl) WARN_ON(atomic_read(&mhi_cntrl->pending_pkts)); /* Reset the ev rings and cmd rings */ - dev_dbg(dev, "Resetting EV CTXT and CMD CTXT\n"); + MHI_VERB(dev, "Resetting EV CTXT and CMD CTXT\n"); mhi_cmd = mhi_cntrl->mhi_cmd; cmd_ctxt = mhi_cntrl->mhi_ctxt->cmd_ctxt; for (i = 0; i < NR_OF_CMD_RINGS; i++, mhi_cmd++, cmd_ctxt++) { @@ -704,7 +704,7 @@ static void mhi_pm_sys_error_transition(struct mhi_controller *mhi_cntrl) cur_state = mhi_tryset_pm_state(mhi_cntrl, MHI_PM_POR); write_unlock_irq(&mhi_cntrl->pm_lock); if (cur_state != MHI_PM_POR) { - dev_err(dev, "Error moving to state %s from %s\n", + MHI_ERR(dev, "Error moving to state %s from %s\n", to_mhi_pm_state_str(MHI_PM_POR), to_mhi_pm_state_str(cur_state)); goto exit_sys_error_transition; @@ -717,7 +717,7 @@ static void mhi_pm_sys_error_transition(struct mhi_controller *mhi_cntrl) mhi_queue_state_transition(mhi_cntrl, next_state); exit_sys_error_transition: - dev_dbg(dev, "Exiting with PM state: %s, MHI state: %s\n", + MHI_VERB(dev, "Exiting with PM state: %s, MHI state: %s\n", to_mhi_pm_state_str(mhi_cntrl->pm_state), mhi_state_str(mhi_cntrl->dev_state)); @@ -751,7 +751,7 @@ void mhi_pm_sys_err_handler(struct mhi_controller *mhi_cntrl) /* skip if controller supports RDDM */ if (mhi_cntrl->rddm_image) { - dev_dbg(dev, "Controller supports RDDM, skip SYS_ERROR\n"); + MHI_VERB(dev, "Controller supports RDDM, skip SYS_ERROR\n"); return; } @@ -774,7 +774,7 @@ void mhi_pm_st_worker(struct work_struct *work) list_for_each_entry_safe(itr, tmp, &head, node) { list_del(&itr->node); - dev_dbg(dev, "Handling state transition: %s\n", + MHI_VERB(dev, "Handling state transition: %s\n", TO_DEV_STATE_TRANS_STR(itr->state)); switch (itr->state) { @@ -882,7 +882,7 @@ int mhi_pm_suspend(struct mhi_controller *mhi_cntrl) read_unlock_bh(&mhi_cntrl->pm_lock); if (!ret || MHI_PM_IN_ERROR_STATE(mhi_cntrl->pm_state)) { - dev_err(dev, + MHI_ERR(dev, "Could not enter M0/M1 state"); return -EIO; } @@ -895,11 +895,11 @@ int mhi_pm_suspend(struct mhi_controller *mhi_cntrl) return -EBUSY; } - dev_dbg(dev, "Allowing M3 transition\n"); + MHI_VERB(dev, "Allowing M3 transition\n"); new_state = mhi_tryset_pm_state(mhi_cntrl, MHI_PM_M3_ENTER); if (new_state != MHI_PM_M3_ENTER) { write_unlock_irq(&mhi_cntrl->pm_lock); - dev_err(dev, + MHI_ERR(dev, "Error setting to PM state: %s from: %s\n", to_mhi_pm_state_str(MHI_PM_M3_ENTER), to_mhi_pm_state_str(mhi_cntrl->pm_state)); @@ -909,7 +909,7 @@ int mhi_pm_suspend(struct mhi_controller *mhi_cntrl) /* Set MHI to M3 and wait for completion */ mhi_set_mhi_state(mhi_cntrl, MHI_STATE_M3); write_unlock_irq(&mhi_cntrl->pm_lock); - dev_dbg(dev, "Waiting for M3 completion\n"); + MHI_VERB(dev, "Waiting for M3 completion\n"); /* finish reg writes before D3 cold */ mhi_force_reg_write(mhi_cntrl); @@ -924,7 +924,7 @@ int mhi_pm_suspend(struct mhi_controller *mhi_cntrl) panic("Timedout waiting for M3 ACK"); return -EIO; } else if (MHI_PM_IN_ERROR_STATE(mhi_cntrl->pm_state)) { - dev_err(dev, + MHI_ERR(dev, "Did not enter M3 state, MHI state: %s, PM state: %s\n", mhi_state_str(mhi_cntrl->dev_state), to_mhi_pm_state_str(mhi_cntrl->pm_state)); @@ -950,7 +950,7 @@ static int __mhi_pm_resume(struct mhi_controller *mhi_cntrl, bool force) enum mhi_pm_state cur_state; int ret; - dev_dbg(dev, "Entered with PM state: %s, MHI state: %s\n", + MHI_VERB(dev, "Entered with PM state: %s, MHI state: %s\n", to_mhi_pm_state_str(mhi_cntrl->pm_state), mhi_state_str(mhi_cntrl->dev_state)); @@ -978,7 +978,7 @@ static int __mhi_pm_resume(struct mhi_controller *mhi_cntrl, bool force) cur_state = mhi_tryset_pm_state(mhi_cntrl, MHI_PM_M3_EXIT); if (cur_state != MHI_PM_M3_EXIT) { write_unlock_irq(&mhi_cntrl->pm_lock); - dev_info(dev, + MHI_LOG(dev, "Error setting to PM state: %s from: %s\n", to_mhi_pm_state_str(MHI_PM_M3_EXIT), to_mhi_pm_state_str(mhi_cntrl->pm_state)); @@ -998,7 +998,7 @@ static int __mhi_pm_resume(struct mhi_controller *mhi_cntrl, bool force) if (!ret || MHI_PM_IN_ERROR_STATE(mhi_cntrl->pm_state)) { if (mhi_in_rddm(mhi_cntrl)) return 0; - dev_err(dev, + MHI_ERR(dev, "Did not enter M0 state, MHI state: %s, PM state: %s\n", mhi_state_str(mhi_cntrl->dev_state), to_mhi_pm_state_str(mhi_cntrl->pm_state)); @@ -1131,7 +1131,7 @@ int mhi_async_power_up(struct mhi_controller *mhi_cntrl) u32 interval_us = 25000; /* poll register field every 25 milliseconds */ int ret, i; - dev_info(dev, "Requested to power ON\n"); + MHI_LOG(dev, "Requested to power ON\n"); /* Supply default wake routines if not provided by controller driver */ if (!mhi_cntrl->wake_get || !mhi_cntrl->wake_put || @@ -1155,14 +1155,14 @@ int mhi_async_power_up(struct mhi_controller *mhi_cntrl) /* Confirm that the device is in valid exec env */ if (!MHI_POWER_UP_CAPABLE(current_ee)) { - dev_err(dev, "%s is not a valid EE for power on\n", + MHI_ERR(dev, "%s is not a valid EE for power on\n", TO_MHI_EXEC_STR(current_ee)); ret = -EIO; goto error_exit; } state = mhi_get_mhi_state(mhi_cntrl); - dev_dbg(dev, "Attempting power on with EE: %s, state: %s\n", + MHI_VERB(dev, "Attempting power on with EE: %s, state: %s\n", TO_MHI_EXEC_STR(current_ee), mhi_state_str(state)); if (state == MHI_STATE_SYS_ERR) { @@ -1170,7 +1170,7 @@ int mhi_async_power_up(struct mhi_controller *mhi_cntrl) ret = mhi_poll_reg_field(mhi_cntrl, mhi_cntrl->regs, MHICTRL, MHICTRL_RESET_MASK, 0, interval_us); if (ret) { - dev_info(dev, "Failed to reset MHI due to syserr state\n"); + MHI_LOG(dev, "Failed to reset MHI due to syserr state\n"); goto error_exit; } @@ -1199,7 +1199,7 @@ int mhi_async_power_up(struct mhi_controller *mhi_cntrl) mutex_unlock(&mhi_cntrl->pm_mutex); - dev_info(dev, "Power on setup success\n"); + MHI_LOG(dev, "Power on setup success\n"); return 0; @@ -1231,7 +1231,7 @@ void mhi_power_down(struct mhi_controller *mhi_cntrl, bool graceful) cur_state = mhi_tryset_pm_state(mhi_cntrl, transition_state); if (cur_state != transition_state) { - dev_err(dev, "Failed to move to state: %s from: %s\n", + MHI_ERR(dev, "Failed to move to state: %s from: %s\n", to_mhi_pm_state_str(transition_state), to_mhi_pm_state_str(mhi_cntrl->pm_state)); /* Force link down or error fatal detected state */ @@ -1287,7 +1287,7 @@ int mhi_force_rddm_mode(struct mhi_controller *mhi_cntrl) if (mhi_cntrl->ee == MHI_EE_RDDM) return 0; - dev_dbg(dev, "Triggering SYS_ERR to force RDDM state\n"); + MHI_VERB(dev, "Triggering SYS_ERR to force RDDM state\n"); mhi_set_mhi_state(mhi_cntrl, MHI_STATE_SYS_ERR); /* Wait for RDDM event */