Merge "mhi_bus: core: update format specifiers" (af13b7a9) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/bus/mhi/core/mhi_boot.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -62,7 +62,7 @@ void mhi_rddm_prepare(struct mhi_controller *mhi_cntrl,
		BHIE_RXVECDB_SEQNUM_BMSK, BHIE_RXVECDB_SEQNUM_SHFT,
		sequence_id);

		MHI_LOG("address:%pad len:0x%lx sequence:%u\n",
		MHI_LOG("address:%pad len:0x%zx sequence:%u\n",
		&mhi_buf->dma_addr, mhi_buf->len, sequence_id);
		}

		@@ -212,7 +212,7 @@ static int mhi_fw_load_amss(struct mhi_controller *mhi_cntrl,
		mhi_cntrl->sequence_id);
		read_unlock_bh(pm_lock);

		MHI_LOG("Upper:0x%x Lower:0x%x len:0x%lx sequence:%u\n",
		MHI_LOG("Upper:0x%x Lower:0x%x len:0x%zx sequence:%u\n",
		upper_32_bits(mhi_buf->dma_addr),
		lower_32_bits(mhi_buf->dma_addr),
		mhi_buf->len, mhi_cntrl->sequence_id);
		@@ -361,8 +361,8 @@ int mhi_alloc_bhie_table(struct mhi_controller *mhi_cntrl,
		if (!mhi_buf->buf)
		goto error_alloc_segment;

		MHI_LOG("Entry:%d Address:0x%llx size:%lu\n", i,
		mhi_buf->dma_addr, mhi_buf->len);
		MHI_LOG("Entry:%d Address:0x%llx size:%zu\n", i,
		(u64)mhi_buf->dma_addr, mhi_buf->len);
		}

		img_info->bhi_vec = img_info->mhi_buf[segments - 1].buf;

drivers/bus/mhi/core/mhi_init.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -23,6 +23,8 @@
		#include <linux/mhi.h>
		#include "mhi_internal.h"

		static struct dentry *mhi_parent;

		const char * const mhi_ee_str[MHI_EE_MAX] = {
		[MHI_EE_PBL] = "PBL",
		[MHI_EE_SBL] = "SBL",
		@@ -1388,7 +1390,8 @@ int of_register_mhi_controller(struct mhi_controller *mhi_cntrl)

		mhi_cntrl->mhi_dev = mhi_dev;

		mhi_cntrl->parent = debugfs_lookup(mhi_bus_type.name, NULL);
		mhi_cntrl->parent = mhi_parent;

		mhi_cntrl->klog_lvl = MHI_MSG_LVL_ERROR;

		/* adding it to this list only for debug purpose */
		@@ -1780,7 +1783,7 @@ static int __init mhi_init(void)
		INIT_LIST_HEAD(&mhi_bus.controller_list);

		/* parent directory */
		debugfs_create_dir(mhi_bus_type.name, NULL);
		mhi_parent = debugfs_create_dir(mhi_bus_type.name, NULL);

		ret = bus_register(&mhi_bus_type);

drivers/bus/mhi/core/mhi_internal.h

+4 −4

Original line number	Diff line number	Diff line
		@@ -517,10 +517,10 @@ enum MHI_XFER_TYPE {
		#define MHI_DEV_WAKE_DB (127)
		#define MHI_MAX_MTU (0xffff)

		#define MHI_BW_SCALE_SETUP(er_index) ((MHI_BW_SCALE_CHAN_DB << \
		BW_SCALE_CFG_CHAN_DB_ID_SHIFT) & BW_SCALE_CFG_CHAN_DB_ID_MASK \| \
		(1 << BW_SCALE_CFG_ENABLED_SHIFT) & BW_SCALE_CFG_ENABLED_MASK \| \
		((er_index) << BW_SCALE_CFG_ER_ID_SHIFT) & BW_SCALE_CFG_ER_ID_MASK)
		#define MHI_BW_SCALE_SETUP(er_index) (((MHI_BW_SCALE_CHAN_DB << \
		BW_SCALE_CFG_CHAN_DB_ID_SHIFT) & BW_SCALE_CFG_CHAN_DB_ID_MASK) \| \
		((1 << BW_SCALE_CFG_ENABLED_SHIFT) & BW_SCALE_CFG_ENABLED_MASK) \| \
		(((er_index) << BW_SCALE_CFG_ER_ID_SHIFT) & BW_SCALE_CFG_ER_ID_MASK))

		#define MHI_BW_SCALE_RESULT(status, seq) ((status & 0xF) << 8 \| (seq & 0xFF))
		#define MHI_BW_SCALE_NACK 0xF

drivers/bus/mhi/core/mhi_main.c

+6 −5

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@
		#include <linux/skbuff.h>
		#include <linux/slab.h>
		#include <linux/mhi.h>
		#include <linux/types.h>
		#include "mhi_internal.h"

		static void __mhi_unprepare_channel(struct mhi_controller *mhi_cntrl,
		@@ -2022,8 +2023,8 @@ int mhi_debugfs_mhi_event_show(struct seq_file m, void d)
		seq_printf(m,
		" rp:0x%llx wp:0x%llx local_rp:0x%llx db:0x%llx\n",
		er_ctxt->rp, er_ctxt->wp,
		mhi_to_physical(ring, ring->rp),
		mhi_event->db_cfg.db_val);
		(u64)mhi_to_physical(ring, ring->rp),
		(u64)mhi_event->db_cfg.db_val);
		}
		}

		@@ -2056,9 +2057,9 @@ int mhi_debugfs_mhi_chan_show(struct seq_file m, void d)
		" base:0x%llx len:0x%llx wp:0x%llx local_rp:0x%llx local_wp:0x%llx db:0x%llx\n",
		chan_ctxt->rbase, chan_ctxt->rlen,
		chan_ctxt->wp,
		mhi_to_physical(ring, ring->rp),
		mhi_to_physical(ring, ring->wp),
		mhi_chan->db_cfg.db_val);
		(u64)mhi_to_physical(ring, ring->rp),
		(u64)mhi_to_physical(ring, ring->wp),
		(u64)mhi_chan->db_cfg.db_val);
		}
		}

drivers/bus/mhi/devices/mhi_uci.c

+7 −7

Original line number	Diff line number	Diff line
		@@ -136,7 +136,7 @@ static int mhi_queue_inbound(struct uci_dev *uci_dev)
		uci_buf = buf + mtu;
		uci_buf->data = buf;

		MSG_VERB("Allocated buf %d of %d size %ld\n", i, nr_trbs, mtu);
		MSG_VERB("Allocated buf %d of %d size %zx\n", i, nr_trbs, mtu);

		ret = mhi_queue_transfer(mhi_dev, DMA_FROM_DEVICE, buf, mtu,
		MHI_EOT);
		@@ -281,7 +281,7 @@ static ssize_t mhi_uci_write(struct file *file,
		return -ERESTARTSYS;
		}

		MSG_VERB("Enter: to xfer:%lu bytes\n", count);
		MSG_VERB("Enter: to xfer:%zx bytes\n", count);

		while (count) {
		size_t xfer_size;
		@@ -304,7 +304,7 @@ static ssize_t mhi_uci_write(struct file *file,
		xfer_size = min_t(size_t, count, uci_dev->mtu);
		kbuf = kmalloc(xfer_size, GFP_KERNEL);
		if (!kbuf) {
		MSG_ERR("Failed to allocate memory %lu\n", xfer_size);
		MSG_ERR("Failed to allocate memory %zx\n", xfer_size);
		return -ENOMEM;
		}

		@@ -339,7 +339,7 @@ static ssize_t mhi_uci_write(struct file *file,
		}

		spin_unlock_bh(&uci_chan->lock);
		MSG_VERB("Exit: Number of bytes xferred:%lu\n", bytes_xfered);
		MSG_VERB("Exit: Number of bytes xferred:%zx\n", bytes_xfered);

		return bytes_xfered;

		@@ -365,7 +365,7 @@ static ssize_t mhi_uci_read(struct file *file,
		if (!buf)
		return -EINVAL;

		MSG_VERB("Client provided buf len:%lu\n", count);
		MSG_VERB("Client provided buf len:%zx\n", count);

		/* confirm channel is active */
		spin_lock_bh(&uci_chan->lock);
		@@ -420,7 +420,7 @@ static ssize_t mhi_uci_read(struct file *file,
		if (ret)
		return ret;

		MSG_VERB("Copied %lu of %lu bytes\n", to_copy, uci_chan->rx_size);
		MSG_VERB("Copied %zx of %zx bytes\n", to_copy, uci_chan->rx_size);
		uci_chan->rx_size -= to_copy;

		/* we finished with this buffer, queue it back to hardware */
		@@ -444,7 +444,7 @@ static ssize_t mhi_uci_read(struct file *file,
		spin_unlock_bh(&uci_chan->lock);
		}

		MSG_VERB("Returning %lu bytes\n", to_copy);
		MSG_VERB("Returning %zx bytes\n", to_copy);

		return to_copy;