fthd: Tune up and down info and debug messages

Also turn a BUG_ON() to WARN_ON()

Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
This commit is contained in:
Patrik Jakobsson
2016-09-28 21:06:44 +02:00
parent 1b18ea45bd
commit dbbac25be2
4 changed files with 6 additions and 10 deletions

View File

@@ -210,8 +210,7 @@ static void fthd_handle_irq(struct fthd_private *dev_priv, struct fw_channel *ch
return;
}
while((entry = fthd_channel_ringbuf_receive(dev_priv, chan)) != (u32)-1) {
pr_debug("channel %s: message available, address %08x\n", chan->name, FTHD_S2_MEM_READ(entry + FTHD_RINGBUF_ADDRESS_FLAGS));
while ((entry = fthd_channel_ringbuf_receive(dev_priv, chan)) != (u32)-1) {
if (chan == dev_priv->channel_shared_malloc) {
sharedmalloc_handler(dev_priv, chan, entry);
} else if (chan == dev_priv->channel_terminal) {
@@ -257,8 +256,7 @@ static void fthd_irq_work(struct work_struct *work)
for(i = 0; i < dev_priv->num_channels; i++) {
chan = dev_priv->channels[i];
BUG_ON(chan->source > 3);
WARN_ON(chan->source > 3);
if (!((0x10 << chan->source) & pending))
continue;
fthd_handle_irq(dev_priv, chan);

View File

@@ -109,9 +109,9 @@ static int fthd_hw_s2_pll_init(struct fthd_private *dev_priv, u32 ddr_speed)
ref_clk_25 = reg & S2_PLL_REFCLK_25MHZ ? 1 : 0;
if (ref_clk_25)
pr_info("Refclk: 25MHz (0x%x)\n", reg);
pr_debug("Refclk: 25MHz (0x%x)\n", reg);
else
pr_info("Refclk: 24MHz (0x%x\n", reg);
pr_debug("Refclk: 24MHz (0x%x\n", reg);
if (ddr_speed == 400) {
if (ref_clk_25) {
@@ -464,7 +464,7 @@ static int fthd_hw_s2_init_ddr_controller_soc(struct fthd_private *dev_priv)
return -ENODEV;
}
pr_info("DDR40 PLL is locked after %d us\n", i);
pr_debug("DDR40 PLL is locked after %d us\n", i);
/* Configure DDR40 VDL */
FTHD_S2_REG_WRITE(0, S2_DDR40_PHY_VDL_CTL);

View File

@@ -164,7 +164,7 @@ static int isp_load_firmware(struct fthd_private *dev_priv)
/* Might need a flush here if we map ISP memory cached */
pr_debug("Loaded firmware, size: %lukb\n", fw->size / 1024);
pr_info("Loaded firmware, size: %lukb\n", fw->size / 1024);
release_firmware(fw);

View File

@@ -78,8 +78,6 @@ int fthd_channel_ringbuf_send(struct fthd_private *dev_priv,
{
u32 entry;
pr_debug("send %08x\n", data_offset);
spin_lock_irq(&chan->lock);
entry = FTHD_ENTRY_ADDR(chan, chan->ringbuf.idx);