Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc4e05d0 authored by Hong Liu's avatar Hong Liu Committed by Jiri Kosina
Browse files

HID: intel-ish-hid: using list_head for ipc write queue 



Currently wr_msg_ctl_info is used in ishtp_device just for list head
purpose, using list_head directly can save ~150 bytes size for
each replacement.

Also this patch can save ~170 bytes of code size in intel-ish-ipc.ko.

Signed-off-by: default avatarHong Liu <hong.liu@intel.com>
Acked-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 946a7773

drivers/hid/intel-ish-hid/ipc/ipc.c

+14 −18
Original line number Diff line number Diff line
@@ -280,13 +280,13 @@ static int write_ipc_from_queue(struct ishtp_device *dev) 
	 * if tx send list is empty - return 0;

	 * may happen, as RX_COMPLETE handler doesn't check list emptiness.

	 */

	if (list_empty(&dev->wr_processing_list_head.link)) {

	if (list_empty(&dev->wr_processing_list)) {

		spin_unlock_irqrestore(&dev->wr_processing_spinlock, flags);

		out_ipc_locked = 0;

		return	0;

	}



	ipc_link = list_entry(dev->wr_processing_list_head.link.next,

	ipc_link = list_first_entry(&dev->wr_processing_list,

				    struct wr_msg_ctl_info, link);

	/* first 4 bytes of the data is the doorbell value (IPC header) */

	length = ipc_link->length - sizeof(uint32_t);
@@ -338,7 +338,7 @@ static int write_ipc_from_queue(struct ishtp_device *dev) 
	ipc_send_compl = ipc_link->ipc_send_compl;

	ipc_send_compl_prm = ipc_link->ipc_send_compl_prm;

	list_del_init(&ipc_link->link);

	list_add_tail(&ipc_link->link, &dev->wr_free_list_head.link);

	list_add(&ipc_link->link, &dev->wr_free_list);

	spin_unlock_irqrestore(&dev->wr_processing_spinlock, flags);



	/*
@@ -378,11 +378,11 @@ static int write_ipc_to_queue(struct ishtp_device *dev, 
		return -EMSGSIZE;



	spin_lock_irqsave(&dev->wr_processing_spinlock, flags);

	if (list_empty(&dev->wr_free_list_head.link)) {

	if (list_empty(&dev->wr_free_list)) {

		spin_unlock_irqrestore(&dev->wr_processing_spinlock, flags);

		return -ENOMEM;

	}

	ipc_link = list_entry(dev->wr_free_list_head.link.next,

	ipc_link = list_first_entry(&dev->wr_free_list,

				    struct wr_msg_ctl_info, link);

	list_del_init(&ipc_link->link);
@@ -391,7 +391,7 @@ static int write_ipc_to_queue(struct ishtp_device *dev, 
	ipc_link->length = length;

	memcpy(ipc_link->inline_data, msg, length);



	list_add_tail(&ipc_link->link, &dev->wr_processing_list_head.link);

	list_add_tail(&ipc_link->link, &dev->wr_processing_list);

	spin_unlock_irqrestore(&dev->wr_processing_spinlock, flags);



	write_ipc_from_queue(dev);
@@ -487,17 +487,13 @@ static int ish_fw_reset_handler(struct ishtp_device *dev) 
{

	uint32_t	reset_id;

	unsigned long	flags;

	struct wr_msg_ctl_info *processing, *next;



	/* Read reset ID */

	reset_id = ish_reg_read(dev, IPC_REG_ISH2HOST_MSG) & 0xFFFF;



	/* Clear IPC output queue */

	spin_lock_irqsave(&dev->wr_processing_spinlock, flags);

	list_for_each_entry_safe(processing, next,

			&dev->wr_processing_list_head.link, link) {

		list_move_tail(&processing->link, &dev->wr_free_list_head.link);

	}

	list_splice_init(&dev->wr_processing_list, &dev->wr_free_list);

	spin_unlock_irqrestore(&dev->wr_processing_spinlock, flags);



	/* ISHTP notification in IPC_RESET */
@@ -921,9 +917,9 @@ struct ishtp_device *ish_dev_init(struct pci_dev *pdev) 
	spin_lock_init(&dev->out_ipc_spinlock);



	/* Init IPC processing and free lists */

	INIT_LIST_HEAD(&dev->wr_processing_list_head.link);

	INIT_LIST_HEAD(&dev->wr_free_list_head.link);

	for (i = 0; i < IPC_TX_FIFO_SIZE; ++i) {

	INIT_LIST_HEAD(&dev->wr_processing_list);

	INIT_LIST_HEAD(&dev->wr_free_list);

	for (i = 0; i < IPC_TX_FIFO_SIZE; i++) {

		struct wr_msg_ctl_info	*tx_buf;



		tx_buf = devm_kzalloc(&pdev->dev,
@@ -939,7 +935,7 @@ struct ishtp_device *ish_dev_init(struct pci_dev *pdev) 
				i);

			break;

		}

		list_add_tail(&tx_buf->link, &dev->wr_free_list_head.link);

		list_add_tail(&tx_buf->link, &dev->wr_free_list);

	}



	dev->ops = &ish_hw_ops;

drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ struct ishtp_device { 
	struct work_struct bh_hbm_work;



	/* IPC write queue */

	struct wr_msg_ctl_info wr_processing_list_head, wr_free_list_head;

	struct list_head wr_processing_list, wr_free_list;

	/* For both processing list  and free list */

	spinlock_t wr_processing_spinlock;