Merge branches 'pm-devfreq' and 'pm-cpufreq'

* pm-devfreq:
  PM / devfreq: fix double kfree
  PM / devfreq: Fix governor_store()

* pm-cpufreq:
  cpufreq: prevent lockup on reading scaling_available_frequencies
  cpufreq: acpi_cpufreq: prevent crash on reading freqdomain_cpus

3 files changed, 20 insertions, 1 deletions

diff --git a/drivers/net/ethernet/intel/i40e/i40e_adminq.c b/drivers/net/ethernet/intel/i40e/i40e_adminq.c
index 3e0d20037675..62488a67149d 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_adminq.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_adminq.c
@@ -946,6 +946,13 @@ i40e_status i40e_clean_arq_element(struct i40e_hw *hw,
         /* take the lock before we start messing with the ring */
         mutex_lock(&hw->aq.arq_mutex);
 
+        if (hw->aq.arq.count == 0) {
+                i40e_debug(hw, I40E_DEBUG_AQ_MESSAGE,
+                           "AQRX: Admin queue not initialized.\n");
+                ret_code = I40E_ERR_QUEUE_EMPTY;
+                goto clean_arq_element_err;
+        }
+
         /* set next_to_use to head */
         ntu = (rd32(hw, hw->aq.arq.head) & I40E_PF_ARQH_ARQH_MASK);
         if (ntu == ntc) {
@@ -1007,6 +1014,8 @@ clean_arq_element_out:
         /* Set pending if needed, unlock and return */
         if (pending != NULL)
                 *pending = (ntc > ntu ? hw->aq.arq.count : 0) + (ntu - ntc);
+
+clean_arq_element_err:
         mutex_unlock(&hw->aq.arq_mutex);
 
         if (i40e_is_nvm_update_op(&e->desc)) {
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 851c1a159be8..2fdf978ae6a5 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -2672,7 +2672,8 @@ static int i40e_configure_rx_ring(struct i40e_ring *ring)
                 rx_ctx.lrxqthresh = 2;
         rx_ctx.crcstrip = 1;
         rx_ctx.l2tsel = 1;
-        rx_ctx.showiv = 1;
+        /* this controls whether VLAN is stripped from inner headers */
+        rx_ctx.showiv = 0;
 #ifdef I40E_FCOE
         rx_ctx.fc_ena = (vsi->type == I40E_VSI_FCOE);
 #endif
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_adminq.c b/drivers/net/ethernet/intel/i40evf/i40e_adminq.c
index f08450b90774..929d47152bf2 100644
--- a/drivers/net/ethernet/intel/i40evf/i40e_adminq.c
+++ b/drivers/net/ethernet/intel/i40evf/i40e_adminq.c
@@ -887,6 +887,13 @@ i40e_status i40evf_clean_arq_element(struct i40e_hw *hw,
         /* take the lock before we start messing with the ring */
         mutex_lock(&hw->aq.arq_mutex);
 
+        if (hw->aq.arq.count == 0) {
+                i40e_debug(hw, I40E_DEBUG_AQ_MESSAGE,
+                           "AQRX: Admin queue not initialized.\n");
+                ret_code = I40E_ERR_QUEUE_EMPTY;
+                goto clean_arq_element_err;
+        }
+
         /* set next_to_use to head */
         ntu = (rd32(hw, hw->aq.arq.head) & I40E_VF_ARQH1_ARQH_MASK);
         if (ntu == ntc) {
@@ -948,6 +955,8 @@ clean_arq_element_out:
         /* Set pending if needed, unlock and return */
         if (pending != NULL)
                 *pending = (ntc > ntu ? hw->aq.arq.count : 0) + (ntu - ntc);
+
+clean_arq_element_err:
         mutex_unlock(&hw->aq.arq_mutex);
 
         return ret_code;