| Message ID | 20150918155947.24663.97648.stgit@tstruk-mobl1 (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Herbert Xu |
| Headers | show |
Hi Herbert, On 09/18/2015 08:59 AM, Tadeusz Struk wrote: > From: Conor McLoughlin <conor.mcloughlin@intel.com> > > Don't allow to trigger SBR from a VF running in VMM context. > > Signed-off-by: Conor McLoughlin <conor.mcloughlin@intel.com> > Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com> > --- > drivers/crypto/qat/qat_common/adf_aer.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/crypto/qat/qat_common/adf_aer.c b/drivers/crypto/qat/qat_common/adf_aer.c > index a57b419..0a5ca0b 100644 > --- a/drivers/crypto/qat/qat_common/adf_aer.c > +++ b/drivers/crypto/qat/qat_common/adf_aer.c > @@ -88,6 +88,9 @@ static void adf_dev_restore(struct adf_accel_dev *accel_dev) > struct pci_dev *parent = pdev->bus->self; > uint16_t bridge_ctl = 0; > > + if (accel_dev->is_vf) > + return; > + > dev_info(&GET_DEV(accel_dev), "Resetting device qat_dev%d\n", > accel_dev->accel_id); This should also go to 4.2 stable. Thanks -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Sep 18, 2015 at 08:59:47AM -0700, Tadeusz Struk wrote: > From: Conor McLoughlin <conor.mcloughlin@intel.com> > > Don't allow to trigger SBR from a VF running in VMM context. > > Signed-off-by: Conor McLoughlin <conor.mcloughlin@intel.com> > Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com> Applied to crypto.
On 09/21/2015 08:04 AM, Herbert Xu wrote: >> Don't allow to trigger SBR from a VF running in VMM context. >> > >> > Signed-off-by: Conor McLoughlin <conor.mcloughlin@intel.com> >> > Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com> > Applied to crypto. Thanks Herbert. Actually it's only needed for 4.3 when VF support was added. Thanks -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" 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/crypto/qat/qat_common/adf_aer.c b/drivers/crypto/qat/qat_common/adf_aer.c index a57b419..0a5ca0b 100644 --- a/drivers/crypto/qat/qat_common/adf_aer.c +++ b/drivers/crypto/qat/qat_common/adf_aer.c @@ -88,6 +88,9 @@ static void adf_dev_restore(struct adf_accel_dev *accel_dev) struct pci_dev *parent = pdev->bus->self; uint16_t bridge_ctl = 0; + if (accel_dev->is_vf) + return; + dev_info(&GET_DEV(accel_dev), "Resetting device qat_dev%d\n", accel_dev->accel_id);