From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 15 Jan 2016 01:04:19 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
X-Git-Tag: v4.5-rc1~95
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=7d1fc01afc5af35e5197e0e75abe900f6bd279b8;p=linux-2.6-block.git

Merge branch 'for-linus' of git://git./linux/kernel/git/jikos/trivial

Pull trivial tree updates from Jiri Kosina.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
  floppy: make local variable non-static
  exynos: fixes an incorrect header guard
  dt-bindings: fixes some incorrect header guards
  cpufreq-dt: correct dead link in documentation
  cpufreq: ARM big LITTLE: correct dead link in documentation
  treewide: Fix typos in printk
  Documentation: filesystem: Fix typo in fs/eventfd.c
  fs/super.c: use && instead of & for warn_on condition
  Documentation: fix sysfs-ptp
  lib: scatterlist: fix Kconfig description
---

7d1fc01afc5af35e5197e0e75abe900f6bd279b8
diff --cc drivers/net/ethernet/intel/i40evf/i40evf_main.c
index a0bbb6b9f5aa,6b84c0d7f120..94da913b151d
--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
@@@ -1239,72 -1229,38 +1239,72 @@@ static int i40evf_config_rss_aq(struct 
  
  	if (adapter->current_op != I40E_VIRTCHNL_OP_UNKNOWN) {
  		/* bail because we already have a command pending */
- 		dev_err(&adapter->pdev->dev, "Cannot confiure RSS, command %d pending\n",
+ 		dev_err(&adapter->pdev->dev, "Cannot configure RSS, command %d pending\n",
  			adapter->current_op);
 -		return;
 +		return -EBUSY;
  	}
  
 -	memset(&rss_key, 0, sizeof(rss_key));
 -	memcpy(&rss_key, seed, sizeof(rss_key));
 +	if (seed) {
 +		struct i40e_aqc_get_set_rss_key_data *rss_key =
 +			(struct i40e_aqc_get_set_rss_key_data *)seed;
 +		ret = i40evf_aq_set_rss_key(hw, vsi->id, rss_key);
 +		if (ret) {
 +			dev_err(&adapter->pdev->dev, "Cannot set RSS key, err %s aq_err %s\n",
 +				i40evf_stat_str(hw, ret),
 +				i40evf_aq_str(hw, hw->aq.asq_last_status));
 +			return ret;
 +		}
 +	}
  
 -	rss_lut = kzalloc(((I40E_VFQF_HLUT_MAX_INDEX + 1) * 4), GFP_KERNEL);
 -	if (!rss_lut)
 -		return;
 +	if (lut) {
 +		ret = i40evf_aq_set_rss_lut(hw, vsi->id, false, lut, lut_size);
 +		if (ret) {
 +			dev_err(&adapter->pdev->dev,
 +				"Cannot set RSS lut, err %s aq_err %s\n",
 +				i40evf_stat_str(hw, ret),
 +				i40evf_aq_str(hw, hw->aq.asq_last_status));
 +			return ret;
 +		}
 +	}
  
 -	/* Populate the LUT with max no. PF queues in round robin fashion */
 -	for (i = 0; i <= (I40E_VFQF_HLUT_MAX_INDEX * 4); i++)
 -		rss_lut[i] = i % adapter->num_active_queues;
 +	return ret;
 +}
  
 -	ret = i40evf_aq_set_rss_key(hw, vsi->id, &rss_key);
 -	if (ret) {
 -		dev_err(&adapter->pdev->dev,
 -			"Cannot set RSS key, err %s aq_err %s\n",
 -			i40evf_stat_str(hw, ret),
 -			i40evf_aq_str(hw, hw->aq.asq_last_status));
 -		return;
 +/**
 + * i40evf_config_rss_reg - Configure RSS keys and lut by writing registers
 + * @vsi: Pointer to vsi structure
 + * @seed: RSS hash seed
 + * @lut: Lookup table
 + * @lut_size: Lookup table size
 + *
 + * Returns 0 on success, negative on failure
 + **/
 +static int i40evf_config_rss_reg(struct i40e_vsi *vsi, const u8 *seed,
 +				 const u8 *lut, u16 lut_size)
 +{
 +	struct i40evf_adapter *adapter = vsi->back;
 +	struct i40e_hw *hw = &adapter->hw;
 +	u16 i;
 +
 +	if (seed) {
 +		u32 *seed_dw = (u32 *)seed;
 +
 +		for (i = 0; i <= I40E_VFQF_HKEY_MAX_INDEX; i++)
 +			wr32(hw, I40E_VFQF_HKEY(i), seed_dw[i]);
  	}
  
 -	ret = i40evf_aq_set_rss_lut(hw, vsi->id, false, rss_lut,
 -				    (I40E_VFQF_HLUT_MAX_INDEX + 1) * 4);
 -	if (ret)
 -		dev_err(&adapter->pdev->dev,
 -			"Cannot set RSS lut, err %s aq_err %s\n",
 -			i40evf_stat_str(hw, ret),
 -			i40evf_aq_str(hw, hw->aq.asq_last_status));
 +	if (lut) {
 +		u32 *lut_dw = (u32 *)lut;
 +
 +		if (lut_size != I40EVF_HLUT_ARRAY_SIZE)
 +			return -EINVAL;
 +
 +		for (i = 0; i <= I40E_VFQF_HLUT_MAX_INDEX; i++)
 +			wr32(hw, I40E_VFQF_HLUT(i), lut_dw[i]);
 +	}
 +	i40e_flush(hw);
 +
 +	return 0;
  }
  
  /**