linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/1] s390/pci: Log new handle in clp_disable_fh()
@ 2020-05-22 18:39 Petr Tesarik
  2020-05-28  9:08 ` Petr Tesarik
  0 siblings, 1 reply; 5+ messages in thread
From: Petr Tesarik @ 2020-05-22 18:39 UTC (permalink / raw)
  To: linux-s390
  Cc: Niklas Schnelle, Gerald Schaefer, Heiko Carstens, Vasily Gorbik,
	Christian Borntraeger, Peter Oberparleiter, linux-kernel,
	Petr Tesarik

After disabling a function, the original handle is logged instead of
the disabled handle.

Fixes: 17cdec960cf77 (s390/pci: Recover handle in clp_set_pci_fn())
Signed-off-by: Petr Tesarik <ptesarik@suse.com>
---
 arch/s390/pci/pci_clp.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/s390/pci/pci_clp.c b/arch/s390/pci/pci_clp.c
index ea794ae755ae..179bcecefdee 100644
--- a/arch/s390/pci/pci_clp.c
+++ b/arch/s390/pci/pci_clp.c
@@ -309,14 +309,13 @@ int clp_enable_fh(struct zpci_dev *zdev, u8 nr_dma_as)
 
 int clp_disable_fh(struct zpci_dev *zdev)
 {
-	u32 fh = zdev->fh;
 	int rc;
 
 	if (!zdev_enabled(zdev))
 		return 0;
 
 	rc = clp_set_pci_fn(zdev, 0, CLP_SET_DISABLE_PCI_FN);
-	zpci_dbg(3, "dis fid:%x, fh:%x, rc:%d\n", zdev->fid, fh, rc);
+	zpci_dbg(3, "dis fid:%x, fh:%x, rc:%d\n", zdev->fid, zdev->fh, rc);
 	return rc;
 }
 
-- 
2.26.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/1] s390/pci: Log new handle in clp_disable_fh()
  2020-05-22 18:39 [PATCH 1/1] s390/pci: Log new handle in clp_disable_fh() Petr Tesarik
@ 2020-05-28  9:08 ` Petr Tesarik
  2020-05-28 10:01   ` Pierre Morel
  2020-06-02  7:26   ` Niklas Schnelle
  0 siblings, 2 replies; 5+ messages in thread
From: Petr Tesarik @ 2020-05-28  9:08 UTC (permalink / raw)
  To: linux-s390
  Cc: Niklas Schnelle, Gerald Schaefer, Heiko Carstens, Vasily Gorbik,
	Christian Borntraeger, Peter Oberparleiter, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 1325 bytes --]

Hi all,

just a gentle ping.

If the current behaviour (logging the original handle) was intended,
then it was worth mentioning in the commit message for 17cdec960cf77,
which made the change, but since that's no longer an option, I'd be
happy with an explanation in email.

Petr T

On Fri, 22 May 2020 20:39:22 +0200
Petr Tesarik <ptesarik@suse.com> wrote:

> After disabling a function, the original handle is logged instead of
> the disabled handle.
> 
> Fixes: 17cdec960cf77 (s390/pci: Recover handle in clp_set_pci_fn())
> Signed-off-by: Petr Tesarik <ptesarik@suse.com>
> ---
>  arch/s390/pci/pci_clp.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/arch/s390/pci/pci_clp.c b/arch/s390/pci/pci_clp.c
> index ea794ae755ae..179bcecefdee 100644
> --- a/arch/s390/pci/pci_clp.c
> +++ b/arch/s390/pci/pci_clp.c
> @@ -309,14 +309,13 @@ int clp_enable_fh(struct zpci_dev *zdev, u8 nr_dma_as)
>  
>  int clp_disable_fh(struct zpci_dev *zdev)
>  {
> -	u32 fh = zdev->fh;
>  	int rc;
>  
>  	if (!zdev_enabled(zdev))
>  		return 0;
>  
>  	rc = clp_set_pci_fn(zdev, 0, CLP_SET_DISABLE_PCI_FN);
> -	zpci_dbg(3, "dis fid:%x, fh:%x, rc:%d\n", zdev->fid, fh, rc);
> +	zpci_dbg(3, "dis fid:%x, fh:%x, rc:%d\n", zdev->fid, zdev->fh, rc);
>  	return rc;
>  }
>  


[-- Attachment #2: Digitální podpis OpenPGP --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/1] s390/pci: Log new handle in clp_disable_fh()
  2020-05-28  9:08 ` Petr Tesarik
@ 2020-05-28 10:01   ` Pierre Morel
  2020-05-28 10:05     ` Vasily Gorbik
  2020-06-02  7:26   ` Niklas Schnelle
  1 sibling, 1 reply; 5+ messages in thread
From: Pierre Morel @ 2020-05-28 10:01 UTC (permalink / raw)
  To: Petr Tesarik, linux-s390
  Cc: Niklas Schnelle, Gerald Schaefer, Heiko Carstens, Vasily Gorbik,
	Christian Borntraeger, Peter Oberparleiter, linux-kernel


On 2020-05-28 11:08, Petr Tesarik wrote:
> Hi all,
> 
> just a gentle ping.
> 
> If the current behaviour (logging the original handle) was intended,
> then it was worth mentioning in the commit message for 17cdec960cf77,
> which made the change, but since that's no longer an option, I'd be
> happy with an explanation in email.
> 
> Petr T
> 
> On Fri, 22 May 2020 20:39:22 +0200
> Petr Tesarik <ptesarik@suse.com> wrote:
> 
>> After disabling a function, the original handle is logged instead of
>> the disabled handle.

Hi Petr,

Sorry for the delay, no doubt, you are right, the fh in zpci_dbg is the 
old one and we should use the one in the zdev struct.

Thanks,
Pierre

Reviewed-by: Pierre Morel <pmorel@linux.ibm.com>


>>
>> Fixes: 17cdec960cf77 (s390/pci: Recover handle in clp_set_pci_fn())
>> Signed-off-by: Petr Tesarik <ptesarik@suse.com>
>> ---
>>   arch/s390/pci/pci_clp.c | 3 +--
>>   1 file changed, 1 insertion(+), 2 deletions(-)
>>
>> diff --git a/arch/s390/pci/pci_clp.c b/arch/s390/pci/pci_clp.c
>> index ea794ae755ae..179bcecefdee 100644
>> --- a/arch/s390/pci/pci_clp.c
>> +++ b/arch/s390/pci/pci_clp.c
>> @@ -309,14 +309,13 @@ int clp_enable_fh(struct zpci_dev *zdev, u8 nr_dma_as)
>>   
>>   int clp_disable_fh(struct zpci_dev *zdev)
>>   {
>> -	u32 fh = zdev->fh;
>>   	int rc;
>>   
>>   	if (!zdev_enabled(zdev))
>>   		return 0;
>>   
>>   	rc = clp_set_pci_fn(zdev, 0, CLP_SET_DISABLE_PCI_FN);
>> -	zpci_dbg(3, "dis fid:%x, fh:%x, rc:%d\n", zdev->fid, fh, rc);
>> +	zpci_dbg(3, "dis fid:%x, fh:%x, rc:%d\n", zdev->fid, zdev->fh, rc);
>>   	return rc;
>>   }
>>   
> 

-- 
Pierre Morel
IBM Lab Boeblingen

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/1] s390/pci: Log new handle in clp_disable_fh()
  2020-05-28 10:01   ` Pierre Morel
@ 2020-05-28 10:05     ` Vasily Gorbik
  0 siblings, 0 replies; 5+ messages in thread
From: Vasily Gorbik @ 2020-05-28 10:05 UTC (permalink / raw)
  To: Pierre Morel
  Cc: Petr Tesarik, linux-s390, Niklas Schnelle, Gerald Schaefer,
	Heiko Carstens, Christian Borntraeger, Peter Oberparleiter,
	linux-kernel

On Thu, May 28, 2020 at 12:01:45PM +0200, Pierre Morel wrote:
> 
> On 2020-05-28 11:08, Petr Tesarik wrote:
> > Hi all,
> > 
> > just a gentle ping.
> > 
> > If the current behaviour (logging the original handle) was intended,
> > then it was worth mentioning in the commit message for 17cdec960cf77,
> > which made the change, but since that's no longer an option, I'd be
> > happy with an explanation in email.
> > 
> > Petr T
> > 
> > On Fri, 22 May 2020 20:39:22 +0200
> > Petr Tesarik <ptesarik@suse.com> wrote:
> > 
> > > After disabling a function, the original handle is logged instead of
> > > the disabled handle.
> 
> Hi Petr,
> 
> Sorry for the delay, no doubt, you are right, the fh in zpci_dbg is the old
> one and we should use the one in the zdev struct.
> 
> Thanks,
> Pierre
> 
> Reviewed-by: Pierre Morel <pmorel@linux.ibm.com>

Applied, thanks

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/1] s390/pci: Log new handle in clp_disable_fh()
  2020-05-28  9:08 ` Petr Tesarik
  2020-05-28 10:01   ` Pierre Morel
@ 2020-06-02  7:26   ` Niklas Schnelle
  1 sibling, 0 replies; 5+ messages in thread
From: Niklas Schnelle @ 2020-06-02  7:26 UTC (permalink / raw)
  To: Petr Tesarik, linux-s390, Pierre Morel
  Cc: Vasily Gorbik, Christian Borntraeger, Peter Oberparleiter, linux-kernel

Hi Petr,

sorry for not reacting sooner, I was on holiday, saw your message but figured it wasn't super critical.
Thanks for finding this issue and thank you Pierre and Vasily for stepping in.

Best,
Niklas Schnelle

On 5/28/20 11:08 AM, Petr Tesarik wrote:
> Hi all,
> 
> just a gentle ping.
> 
> If the current behaviour (logging the original handle) was intended,
> then it was worth mentioning in the commit message for 17cdec960cf77,
> which made the change, but since that's no longer an option, I'd be
> happy with an explanation in email.
> 
> Petr T
> 
> On Fri, 22 May 2020 20:39:22 +0200
> Petr Tesarik <ptesarik@suse.com> wrote:
> 
>> After disabling a function, the original handle is logged instead of
>> the disabled handle.
>>
>> Fixes: 17cdec960cf77 (s390/pci: Recover handle in clp_set_pci_fn())
>> Signed-off-by: Petr Tesarik <ptesarik@suse.com>
>> ---
>>  arch/s390/pci/pci_clp.c | 3 +--
>>  1 file changed, 1 insertion(+), 2 deletions(-)
>>
>> diff --git a/arch/s390/pci/pci_clp.c b/arch/s390/pci/pci_clp.c
>> index ea794ae755ae..179bcecefdee 100644
>> --- a/arch/s390/pci/pci_clp.c
>> +++ b/arch/s390/pci/pci_clp.c
>> @@ -309,14 +309,13 @@ int clp_enable_fh(struct zpci_dev *zdev, u8 nr_dma_as)
>>  
>>  int clp_disable_fh(struct zpci_dev *zdev)
>>  {
>> -	u32 fh = zdev->fh;
>>  	int rc;
>>  
>>  	if (!zdev_enabled(zdev))
>>  		return 0;
>>  
>>  	rc = clp_set_pci_fn(zdev, 0, CLP_SET_DISABLE_PCI_FN);
>> -	zpci_dbg(3, "dis fid:%x, fh:%x, rc:%d\n", zdev->fid, fh, rc);
>> +	zpci_dbg(3, "dis fid:%x, fh:%x, rc:%d\n", zdev->fid, zdev->fh, rc);
>>  	return rc;
>>  }
>>  
> 

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2020-06-02  7:26 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-22 18:39 [PATCH 1/1] s390/pci: Log new handle in clp_disable_fh() Petr Tesarik
2020-05-28  9:08 ` Petr Tesarik
2020-05-28 10:01   ` Pierre Morel
2020-05-28 10:05     ` Vasily Gorbik
2020-06-02  7:26   ` Niklas Schnelle

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).