[PATCH] hpsa: add missing pci_set_master in kdump path

[PATCH] hpsa: add missing pci_set_master in kdump path

[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(-)

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 7828834..cef5d49 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -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);
 
-- 
1.8.3.1

Re: [PATCH] hpsa: add missing pci_set_master in kdump path

[Tomas Henzl]

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


On 09/12/2014 02:44 PM, Tomas Henzl wrote:
> 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(-)
>
> diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
> index 7828834..cef5d49 100644
> --- a/drivers/scsi/hpsa.c
> +++ b/drivers/scsi/hpsa.c
> @@ -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);
>  

Re: [PATCH] hpsa: add missing pci_set_master in kdump path

[Christoph Hellwig]

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

RE: [PATCH] hpsa: add missing pci_set_master in kdump path

[Elliott, Robert (Server Storage)]

> -----Original Message-----
> From: Tomas Henzl [mailto:thenzl@redhat.com]
> Sent: Wednesday, September 24, 2014 5:32 AM
> To: 'linux-scsi@vger.kernel.org'
> Cc: Elliott, Robert (Server Storage); steve.cameron@hp.com; Christoph
> Hellwig; Handzik, Joe
> Subject: Re: [PATCH] hpsa: add missing pci_set_master in kdump path
> 
> 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

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 <elliott@hp.com>
Tested-by: Robert Elliott <elliott@hp.com>
Acked-by: Robert Elliott <elliott@hp.com>

Re: [PATCH] hpsa: add missing pci_set_master in kdump path

[Christoph Hellwig]

On Wed, Sep 24, 2014 at 01:59:04PM +0000, Elliott, Robert (Server Storage) wrote:
> 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.

Re: [PATCH] hpsa: add missing pci_set_master in kdump path

[Christoph Hellwig]

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

On Fri, Sep 12, 2014 at 02:44:15PM +0200, Tomas Henzl wrote:
> 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(-)
> 
> diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
> index 7828834..cef5d49 100644
> --- a/drivers/scsi/hpsa.c
> +++ b/drivers/scsi/hpsa.c
> @@ -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);
>  
> -- 
> 1.8.3.1
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
---end quoted text---

Re: [PATCH] hpsa: add missing pci_set_master in kdump path

[Tomas Henzl]

On 09/25/2014 02:20 PM, Christoph Hellwig wrote:
> 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 <thenzl@redhat.com>

>
> On Fri, Sep 12, 2014 at 02:44:15PM +0200, Tomas Henzl wrote:
>> 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(-)
>>
>> diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
>> index 7828834..cef5d49 100644
>> --- a/drivers/scsi/hpsa.c
>> +++ b/drivers/scsi/hpsa.c
>> @@ -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);
>>  
>> -- 
>> 1.8.3.1
>>
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
>> the body of a message to majordomo@vger.kernel.org
>> 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 majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] hpsa: add missing pci_set_master in kdump path

[Christoph Hellwig]

Thanks, applied to drivers-for-3.18.