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

Commit 43d04534 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "dt-bindings: mhi: mhi netdev no longer support recycle memory"

parents bddfc749 a8b8b8df

Documentation/devicetree/bindings/bus/mhi.txt

+0 −5
Original line number Diff line number Diff line
@@ -291,11 +291,6 @@ MHI netdev properties 
  Value type: <string>

  Definition: Interface name to be given so clients can identify it



- mhi,recycle-buf

  Usage: optional

  Value type: <bool>

  Definition: Set true if interface support recycling buffers.



- aliases

  Usage: required

  Value type: <string>

drivers/bus/mhi/devices/mhi_netdev.c

+2 −17
Original line number Diff line number Diff line
@@ -89,13 +89,6 @@ struct mhi_stats { 
	u32 alloc_failed;

};



/* important: do not exceed sk_buf->cb (48 bytes) */

struct mhi_skb_priv {

	void *buf;

	size_t size;

	struct mhi_netdev *mhi_netdev;

};



struct mhi_netdev {

	int alias;

	struct mhi_device *mhi_dev;
@@ -149,7 +142,6 @@ static int mhi_netdev_alloc_skb(struct mhi_netdev *mhi_netdev, gfp_t gfp_t) 
{

	u32 cur_mru = mhi_netdev->mru;

	struct mhi_device *mhi_dev = mhi_netdev->mhi_dev;

	struct mhi_skb_priv *skb_priv;

	int ret;

	struct sk_buff *skb;

	int no_tre = mhi_get_no_free_descriptors(mhi_dev, DMA_FROM_DEVICE);
@@ -167,15 +159,11 @@ static int mhi_netdev_alloc_skb(struct mhi_netdev *mhi_netdev, gfp_t gfp_t) 
			goto error_queue;

		}



		skb_priv = (struct mhi_skb_priv *)skb->cb;

		skb_priv->buf = skb->data;

		skb_priv->size = cur_mru;

		skb_priv->mhi_netdev = mhi_netdev;

		skb->dev = mhi_netdev->ndev;



		spin_lock_bh(&mhi_netdev->rx_lock);

		ret = mhi_queue_transfer(mhi_dev, DMA_FROM_DEVICE, skb,

					 skb_priv->size, MHI_EOT);

		ret = mhi_queue_transfer(mhi_dev, DMA_FROM_DEVICE, skb, cur_mru,

					 MHI_EOT);

		spin_unlock_bh(&mhi_netdev->rx_lock);



		if (ret) {
@@ -310,12 +298,9 @@ static int mhi_netdev_xmit(struct sk_buff *skb, struct net_device *dev) 
	struct mhi_netdev *mhi_netdev = mhi_netdev_priv->mhi_netdev;

	struct mhi_device *mhi_dev = mhi_netdev->mhi_dev;

	int res = 0;

	struct mhi_skb_priv *tx_priv;



	MSG_VERB("Entered\n");



	tx_priv = (struct mhi_skb_priv *)(skb->cb);

	tx_priv->mhi_netdev = mhi_netdev;

	read_lock_bh(&mhi_netdev->pm_lock);



	if (unlikely(!mhi_netdev->enabled)) {