| Message ID | 1424661944-1779-11-git-send-email-jeffrey.t.kirsher@intel.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
Hello. On 2/23/2015 6:25 AM, Jeff Kirsher wrote: > From: Anjali Singhai Jain <anjali.singhai@intel.com> > We shouldn't trigger another EMPR when we receive an EMPR event. > This patch handles EMPR event reception with a different state > so that we can do the right thing for NVM. > Change-ID: I9cac70b3658600f016a65beb6fb157e1c1f9adf9 > Signed-off-by: Anjali Singhai Jain <anjali.singhai@intel.com> > Tested-by: Jim Young <james.m.young@intel.com> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> [...] > diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c > index 2260cc1..0c1c38e 100644 > --- a/drivers/net/ethernet/intel/i40e/i40e_main.c > +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c > @@ -6179,8 +6179,8 @@ static void i40e_reset_and_rebuild(struct i40e_pf *pf, bool reinit) > } > > /* re-verify the eeprom if we just had an EMP reset */ > - if (test_bit(__I40E_EMP_RESET_REQUESTED, &pf->state)) { > - clear_bit(__I40E_EMP_RESET_REQUESTED, &pf->state); > + if (test_bit(__I40E_EMP_RESET_INTR_RECEIVED, &pf->state)) { > + clear_bit(__I40E_EMP_RESET_INTR_RECEIVED, &pf->state); Why not use test_and_clear_bit()? > i40e_verify_eeprom(pf); > } WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h index 2b65cdc..5912fdf 100644 --- a/drivers/net/ethernet/intel/i40e/i40e.h +++ b/drivers/net/ethernet/intel/i40e/i40e.h @@ -140,6 +140,7 @@ enum i40e_state_t { __I40E_CORE_RESET_REQUESTED, __I40E_GLOBAL_RESET_REQUESTED, __I40E_EMP_RESET_REQUESTED, + __I40E_EMP_RESET_INTR_RECEIVED, __I40E_FILTER_OVERFLOW_PROMISC, __I40E_SUSPENDED, __I40E_PTP_TX_IN_PROGRESS, diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index 2260cc1..0c1c38e 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c @@ -3171,7 +3171,7 @@ static irqreturn_t i40e_intr(int irq, void *data) pf->globr_count++; } else if (val == I40E_RESET_EMPR) { pf->empr_count++; - set_bit(__I40E_EMP_RESET_REQUESTED, &pf->state); + set_bit(__I40E_EMP_RESET_INTR_RECEIVED, &pf->state); } } @@ -6179,8 +6179,8 @@ static void i40e_reset_and_rebuild(struct i40e_pf *pf, bool reinit) } /* re-verify the eeprom if we just had an EMP reset */ - if (test_bit(__I40E_EMP_RESET_REQUESTED, &pf->state)) { - clear_bit(__I40E_EMP_RESET_REQUESTED, &pf->state); + if (test_bit(__I40E_EMP_RESET_INTR_RECEIVED, &pf->state)) { + clear_bit(__I40E_EMP_RESET_INTR_RECEIVED, &pf->state); i40e_verify_eeprom(pf); }