[2.6 patch] fix pciehp_free_irq()

[2.6 patch] fix pciehp_free_irq()

[Adrian Bunk]

This patch fixes an obvious bug (loop was never entered) caused by
commit 820943b6fc4781621dee52ba026106758a727dd3
(pciehp: cleanup pcie_poll_cmd).

Reported-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Adrian Bunk <bunk@kernel.org>

---
0cca78f4b7c7d6c7b64ae5acc08bb641454b4835 
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
index ab31f5b..9d934dd 100644
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@ -250,23 +250,23 @@ static inline void pciehp_free_irq(struct controller *ctrl)
 static int pcie_poll_cmd(struct controller *ctrl)
 {
 	u16 slot_status;
 	int timeout = 1000;
 
 	if (!pciehp_readw(ctrl, SLOTSTATUS, &slot_status)) {
 		if (slot_status & CMD_COMPLETED) {
 			pciehp_writew(ctrl, SLOTSTATUS, CMD_COMPLETED);
 			return 1;
 		}
 	}
-	while (timeout > 1000) {
+	while (timeout > 0) {
 		msleep(10);
 		timeout -= 10;
 		if (!pciehp_readw(ctrl, SLOTSTATUS, &slot_status)) {
 			if (slot_status & CMD_COMPLETED) {
 				pciehp_writew(ctrl, SLOTSTATUS, CMD_COMPLETED);
 				return 1;
 			}
 		}
 	}
 	return 0;	/* timeout */
 }

Re: [2.6 patch] fix pciehp_free_irq()

[Kenji Kaneshige]

Adrian Bunk wrote:
> This patch fixes an obvious bug (loop was never entered) caused by
> commit 820943b6fc4781621dee52ba026106758a727dd3
> (pciehp: cleanup pcie_poll_cmd).
> 
> Reported-by: Adrian Bunk <bunk@kernel.org>
> Signed-off-by: Adrian Bunk <bunk@kernel.org>
> 
> ---
> 0cca78f4b7c7d6c7b64ae5acc08bb641454b4835 
> diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
> index ab31f5b..9d934dd 100644
> --- a/drivers/pci/hotplug/pciehp_hpc.c
> +++ b/drivers/pci/hotplug/pciehp_hpc.c
> @@ -250,23 +250,23 @@ static inline void pciehp_free_irq(struct controller *ctrl)
>  static int pcie_poll_cmd(struct controller *ctrl)
>  {
>  	u16 slot_status;
>  	int timeout = 1000;
>  
>  	if (!pciehp_readw(ctrl, SLOTSTATUS, &slot_status)) {
>  		if (slot_status & CMD_COMPLETED) {
>  			pciehp_writew(ctrl, SLOTSTATUS, CMD_COMPLETED);
>  			return 1;
>  		}
>  	}
> -	while (timeout > 1000) {
> +	while (timeout > 0) {
>  		msleep(10);
>  		timeout -= 10;
>  		if (!pciehp_readw(ctrl, SLOTSTATUS, &slot_status)) {
>  			if (slot_status & CMD_COMPLETED) {
>  				pciehp_writew(ctrl, SLOTSTATUS, CMD_COMPLETED);
>  				return 1;
>  			}
>  		}
>  	}
>  	return 0;	/* timeout */
>  }
> 
> 

Sorry, that's my bad.
Thank you for the patch, Adrian.

Acked-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>

Thanks,
Kenji Kaneshige

Re: [2.6 patch] fix pciehp_free_irq()

[Jesse Barnes]

On Wednesday, August 27, 2008 3:05 pm Adrian Bunk wrote:
> This patch fixes an obvious bug (loop was never entered) caused by
> commit 820943b6fc4781621dee52ba026106758a727dd3
> (pciehp: cleanup pcie_poll_cmd).
>
> Reported-by: Adrian Bunk <bunk@kernel.org>
> Signed-off-by: Adrian Bunk <bunk@kernel.org>

Applied to my linux-next branch.  Kenji-san do you think this should go into 
2.6.27?  I haven't heard any regression reports about it, but it does seem 
like a good and simple fix...

Thanks,
Jesse

Re: Re: [2.6 patch] fix pciehp_free_irq()

[Kenji Kaneshige]

----- Original Message -----
>From: Jesse Barnes <jbarnes@virtuousgeek.org>
>To: Adrian Bunk <bunk@kernel.org>
>Subject: Re: [2.6 patch] fix pciehp_free_irq()
>Date: Tue, 9 Sep 2008 11:40:41 -0700
>Cc: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>,
>   linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org
>
>
>On Wednesday, August 27, 2008 3:05 pm Adrian Bunk wrote:
>> This patch fixes an obvious bug (loop was never entered) caused by
>> commit 820943b6fc4781621dee52ba026106758a727dd3
>> (pciehp: cleanup pcie_poll_cmd).
>>
>> Reported-by: Adrian Bunk <bunk@kernel.org>
>> Signed-off-by: Adrian Bunk <bunk@kernel.org>
>
>Applied to my linux-next branch.  Kenji-san do you think this should go into 
>2.6.27?  I haven't heard any regression reports about it, but it does seem 
>like a good and simple fix...
>

Though regression was not reported, it is actually a regression internally.
It doesn't have a big impact against the hotplug controller that supports 
"command completed interrupt", but it might have a impact against the
controller that doesn't support "command completed interrupt". So I think
it should go into 2.6.27. As you said, the patch looks good and simple.

Thanks,
Kenji Kaneshige

Re: [2.6 patch] fix pciehp_free_irq()

[Jesse Barnes]

On Tuesday, September 9, 2008 3:52 pm Kenji Kaneshige wrote:
> ----- Original Message -----
>
> >From: Jesse Barnes <jbarnes@virtuousgeek.org>
> >To: Adrian Bunk <bunk@kernel.org>
> >Subject: Re: [2.6 patch] fix pciehp_free_irq()
> >Date: Tue, 9 Sep 2008 11:40:41 -0700
> >Cc: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>,
> >   linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org
> >
> >On Wednesday, August 27, 2008 3:05 pm Adrian Bunk wrote:
> >> This patch fixes an obvious bug (loop was never entered) caused by
> >> commit 820943b6fc4781621dee52ba026106758a727dd3
> >> (pciehp: cleanup pcie_poll_cmd).
> >>
> >> Reported-by: Adrian Bunk <bunk@kernel.org>
> >> Signed-off-by: Adrian Bunk <bunk@kernel.org>
> >
> >Applied to my linux-next branch.  Kenji-san do you think this should go
> > into 2.6.27?  I haven't heard any regression reports about it, but it
> > does seem like a good and simple fix...
>
> Though regression was not reported, it is actually a regression internally.
> It doesn't have a big impact against the hotplug controller that supports
> "command completed interrupt", but it might have a impact against the
> controller that doesn't support "command completed interrupt". So I think
> it should go into 2.6.27. As you said, the patch looks good and simple.

Ok, thanks, I've queued it up for 2.6.27.

-- 
Jesse Barnes, Intel Open Source Technology Center