Skip to contentSkip to conversation

FAILED: patch "[PATCH] crypto: qat - VF should never trigger SBR on PH" failed to apply to 4.1-stable tree

PATCH [email protected] 2 participants 2 messages Oct 17, 2015 – Oct 19, 2015

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From 17762c5acee2f1f065291d2a74ebea4d0168063b Mon Sep 17 00:00:00 2001

From: Conor McLoughlin <[email protected]>
Date: Fri, 18 Sep 2015 08:59:47 -0700
Subject: [PATCH] crypto: qat - VF should never trigger SBR on PH

Don't allow to trigger SBR from a VF running in VMM context.

drivers/crypto/qat/qat_common/adf_aer.c +3 -0
index a57b4194de28..0a5ca0ba5d64 100644
@@ -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);
 
#1 lore raw
Quoted 30 lines · On 10/17/2015 04:35 PM, [email protected] wrote:

The patch below does not apply to the 4.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 17762c5acee2f1f065291d2a74ebea4d0168063b Mon Sep 17 00:00:00 2001
From: Conor McLoughlin <[email protected]>
Date: Fri, 18 Sep 2015 08:59:47 -0700
Subject: [PATCH] crypto: qat - VF should never trigger SBR on PH

Don't allow to trigger SBR from a VF running in VMM context.

drivers/crypto/qat/qat_common/adf_aer.c +0 -0
index a57b4194de28..0a5ca0ba5d64 100644

drivers/crypto/qat/qat_common/adf_aer.c static void adf_dev_restore(struct adf_accel_dev *accel_dev) · line 96

Quoted 9 lines
drivers/crypto/qat/qat_common/adf_aer.c +3 -0
@@ -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);
 

Hi Greg,
This is only applicable for 4.3. Sorry for the confusion. Thanks