hpsa: add missing pci_set_master in kdump path

PATCH Applied Tomas Henzl 3 participants 8 messages Sep 12, 2014 – Sep 25, 2014

Subsystems (2)

SCSI Hewlett-packard smart array RAID driver (hpsa)

lore

Share & tools

lore

Tomas Henzl

author

2014-09-12 12:44 UTC #0 lore raw

PATCH 1/1 hpsa: add missing pci_set_master in kdump path

Add a call to pci_set_master(...) missing in the previous patch "hpsa: refine the pci enable/disable handling". Found thanks to Rob Elliot.

---
 drivers/scsi/hpsa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/scsi/hpsa.c +1 -1

index 7828834..cef5d49 100644
@@ -6544,7 +6544,7 @@ static int hpsa_init_reset_devices(struct pci_dev *pdev)
 		dev_warn(&pdev->dev, "failed to enable device.\n");
 		return -ENODEV;
 	}
-
+	pci_set_master(pdev);
 	/* Reset the controller with a PCI power-cycle or via doorbell */
 	rc = hpsa_kdump_hard_reset_controller(pdev);

Signature · 1 line

1.8.3.1

Tomas Henzl

author

2014-09-24 10:32 UTC #1 lore raw

Christoph,

this is a fix for 132aa220b45d60e9b20def1e9d8be9422eed9616 hpsa: refine the pci enable/disable handling which is in 'for-3.18'.
If this patch will not be reviewed and added to 3.18 the aforementioned patch needs to be reverted.

Tomas

Quoted 20 lines · Tomas Henzl

Add a call to pci_set_master(...) missing in the previous patch "hpsa: refine the pci enable/disable handling". Found thanks to Rob Elliot.

---
 drivers/scsi/hpsa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/scsi/hpsa.c +1 -1

index 7828834..cef5d49 100644
@@ -6544,7 +6544,7 @@ static int hpsa_init_reset_devices(struct pci_dev *pdev)
 		dev_warn(&pdev->dev, "failed to enable device.\n");
 		return -ENODEV;
 	}
-
+	pci_set_master(pdev);
 	/* Reset the controller with a PCI power-cycle or via doorbell */
 	rc = hpsa_kdump_hard_reset_controller(pdev);

Christoph Hellwig

2014-09-24 13:54 UTC #2 lore raw

Robert or Webb: can you give me a review on this? Given that Robert helped finding it that should be easy..

Elliott, Robert (Server Storage)

Reviewed-by Tested-by Acked-by

2014-09-24 14:00 UTC #3 lore raw

In reply to Tomas Henzl

Quoted 12 lines

-----Original Message-----
From: Tomas Henzl [mailto:[email protected]]
Sent: Wednesday, September 24, 2014 5:32 AM
To: '[email protected]'
Cc: Elliott, Robert (Server Storage); [email protected]; Christoph Hellwig; Handzik, Joe
Subject: Re: [PATCH] hpsa: add missing pci_set_master in kdump path
Christoph,

Quoted 7 lines

this is a fix for 132aa220b45d60e9b20def1e9d8be9422eed9616 hpsa: refine the pci enable/disable handling
which is in 'for-3.18'.
If this patch will not be reviewed and added to 3.18 the aforementioned patch needs to be reverted.
Tomas

Sorry for the delay - that is fine to go in directly, or will be part of a larger hpsa series if HP or PMC is able to post one for 3.18.

Bit of business turmoil here lately...

For the interim you can add:

Reviewed-by Robert Elliott <[email protected]>

Tested-by Robert Elliott <[email protected]>

Acked-by Robert Elliott <[email protected]>

Christoph Hellwig

2014-09-24 14:04 UTC #4 lore raw

Quoted 2 lines · Robert (Server Storage)

Sorry for the delay - that is fine to go in directly, or will be part of a larger hpsa series if HP or PMC is able to post one for 3.18.

Thanks. For a fix like this I'd prefer to take it ASAP instead of waiting for a series, specially near the end of the merge window.

Christoph Hellwig

2014-09-25 12:18 UTC #5 lore raw

In reply to Tomas Henzl

Tomas, can you also give me a signed-off-by for this one?

Quoted 28 lines · Tomas Henzl

Add a call to pci_set_master(...) missing in the previous patch "hpsa: refine the pci enable/disable handling". Found thanks to Rob Elliot.

---
 drivers/scsi/hpsa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/scsi/hpsa.c +1 -1

index 7828834..cef5d49 100644
@@ -6544,7 +6544,7 @@ static int hpsa_init_reset_devices(struct pci_dev *pdev)
 		dev_warn(&pdev->dev, "failed to enable device.\n");
 		return -ENODEV;
 	}
-
+	pci_set_master(pdev);
 	/* Reset the controller with a PCI power-cycle or via doorbell */
 	rc = hpsa_kdump_hard_reset_controller(pdev);

Signature · 7 lines

1.8.3.1


--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

---end quoted text---

Tomas Henzl

author

2014-09-25 12:41 UTC #6 lore raw

Quoted 1 line · Christoph Hellwig

Tomas, can you also give me a signed-off-by for this one?

Oh, I forgot to add it before.

Patch is

Signed-off-by Tomas Henzl <[email protected]>

Quoted 35 lines · Tomas Henzl

Quoted 28 lines
Add a call to pci_set_master(...) missing in the previous patch "hpsa: refine the pci enable/disable handling". Found thanks to Rob Elliot.
---
 drivers/scsi/hpsa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/hpsa.c +1 -1
index 7828834..cef5d49 100644
@@ -6544,7 +6544,7 @@ static int hpsa_init_reset_devices(struct pci_dev *pdev)
 		dev_warn(&pdev->dev, "failed to enable device.\n");
 		return -ENODEV;
 	}
-
+	pci_set_master(pdev);
 	/* Reset the controller with a PCI power-cycle or via doorbell */
 	rc = hpsa_kdump_hard_reset_controller(pdev);
 
Signature · 7 lines
1.8.3.1


--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
---end quoted text---
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Christoph Hellwig

Applied

2014-09-25 16:59 UTC #7 lore raw

In reply to Tomas Henzl

Thanks, applied to drivers-for-3.18.