* [net-2.6 PATCH 0/2] qlge: EEH and Mbox command fixes.
@ 2009-11-06 17:44 Ron Mercer
2009-11-06 17:44 ` [net-2.6 PATCH 1/2] qlge: Fix early exit from mbox cmd complete wait Ron Mercer
2009-11-06 17:44 ` [net-2.6 PATCH 2/2] qlge: Set PCIe reset type for EEH to fundamental Ron Mercer
0 siblings, 2 replies; 6+ messages in thread
From: Ron Mercer @ 2009-11-06 17:44 UTC (permalink / raw)
To: davem; +Cc: netdev, ron.mercer
Dave,
Patch 1 adds a line that I accidentally omitted from the previous patch on 10/26.
Patch 2 changes the EEH PCIe reset type to fundamental as required by
this device.
Regards,
Ron Mercer
^ permalink raw reply [flat|nested] 6+ messages in thread
* [net-2.6 PATCH 1/2] qlge: Fix early exit from mbox cmd complete wait.
2009-11-06 17:44 [net-2.6 PATCH 0/2] qlge: EEH and Mbox command fixes Ron Mercer
@ 2009-11-06 17:44 ` Ron Mercer
2009-11-07 4:35 ` David Miller
2009-11-06 17:44 ` [net-2.6 PATCH 2/2] qlge: Set PCIe reset type for EEH to fundamental Ron Mercer
1 sibling, 1 reply; 6+ messages in thread
From: Ron Mercer @ 2009-11-06 17:44 UTC (permalink / raw)
To: davem; +Cc: netdev, ron.mercer
This line was accidentally left out of the previous commit #
da03945140a035a2962f7f93e359085596f20499.
Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
---
drivers/net/qlge/qlge_mpi.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/qlge/qlge_mpi.c b/drivers/net/qlge/qlge_mpi.c
index bcf13c9..aec05f2 100644
--- a/drivers/net/qlge/qlge_mpi.c
+++ b/drivers/net/qlge/qlge_mpi.c
@@ -499,7 +499,7 @@ static int ql_mailbox_command(struct ql_adapter *qdev, struct mbox_params *mbcp)
/* Wait for the interrupt to come in. */
status = ql_wait_mbx_cmd_cmplt(qdev);
if (status)
- goto end;
+ continue;
/* Process the event. If it's an AEN, it
* will be handled in-line or a worker
--
1.6.0.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [net-2.6 PATCH 2/2] qlge: Set PCIe reset type for EEH to fundamental.
2009-11-06 17:44 [net-2.6 PATCH 0/2] qlge: EEH and Mbox command fixes Ron Mercer
2009-11-06 17:44 ` [net-2.6 PATCH 1/2] qlge: Fix early exit from mbox cmd complete wait Ron Mercer
@ 2009-11-06 17:44 ` Ron Mercer
2009-11-07 4:35 ` David Miller
1 sibling, 1 reply; 6+ messages in thread
From: Ron Mercer @ 2009-11-06 17:44 UTC (permalink / raw)
To: davem; +Cc: netdev, ron.mercer
This device requires a fundamental reset when recovering from EEH.
Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
---
drivers/net/qlge/qlge_main.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index cea7531..a2fc70a 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -3916,6 +3916,8 @@ static int __devinit ql_init_device(struct pci_dev *pdev,
goto err_out;
}
+ /* Set PCIe reset type for EEH to fundamental. */
+ pdev->needs_freset = 1;
pci_save_state(pdev);
qdev->reg_base =
ioremap_nocache(pci_resource_start(pdev, 1),
--
1.6.0.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [net-2.6 PATCH 1/2] qlge: Fix early exit from mbox cmd complete wait.
2009-11-06 17:44 ` [net-2.6 PATCH 1/2] qlge: Fix early exit from mbox cmd complete wait Ron Mercer
@ 2009-11-07 4:35 ` David Miller
2009-11-07 18:32 ` Ron Mercer
0 siblings, 1 reply; 6+ messages in thread
From: David Miller @ 2009-11-07 4:35 UTC (permalink / raw)
To: ron.mercer; +Cc: netdev
From: Ron Mercer <ron.mercer@qlogic.com>
Date: Fri, 6 Nov 2009 09:44:57 -0800
> This line was accidentally left out of the previous commit #
> da03945140a035a2962f7f93e359085596f20499.
>
> Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
Applied, but please provide a text string of the commit's
header line when referencing a commit, don't just provide
the SHA1 ID as that can be not referencable in a -stable
backport.
Here is how I fixed up your commit message so that you can
see how to form it next time, thanks.
qlge: Fix early exit from mbox cmd complete wait.
This line was accidentally left out of the previous commit #
da03945140a035a2962f7f93e359085596f20499 ("qlge: Fix firmware mailbox
command timeout.").
Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [net-2.6 PATCH 2/2] qlge: Set PCIe reset type for EEH to fundamental.
2009-11-06 17:44 ` [net-2.6 PATCH 2/2] qlge: Set PCIe reset type for EEH to fundamental Ron Mercer
@ 2009-11-07 4:35 ` David Miller
0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2009-11-07 4:35 UTC (permalink / raw)
To: ron.mercer; +Cc: netdev
From: Ron Mercer <ron.mercer@qlogic.com>
Date: Fri, 6 Nov 2009 09:44:58 -0800
> This device requires a fundamental reset when recovering from EEH.
>
> Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
Applied.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [net-2.6 PATCH 1/2] qlge: Fix early exit from mbox cmd complete wait.
2009-11-07 4:35 ` David Miller
@ 2009-11-07 18:32 ` Ron Mercer
0 siblings, 0 replies; 6+ messages in thread
From: Ron Mercer @ 2009-11-07 18:32 UTC (permalink / raw)
To: David Miller; +Cc: netdev
On Fri, Nov 06, 2009 at 08:35:32PM -0800, David Miller wrote:
> From: Ron Mercer <ron.mercer@qlogic.com>
> Date: Fri, 6 Nov 2009 09:44:57 -0800
>
>
> Applied, but please provide a text string of the commit's
> header line when referencing a commit, don't just provide
> the SHA1 ID as that can be not referencable in a -stable
> backport.
>
Dave,
Will do. Thanks for the fix up and instructions.
Ron
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-11-07 18:38 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-11-06 17:44 [net-2.6 PATCH 0/2] qlge: EEH and Mbox command fixes Ron Mercer
2009-11-06 17:44 ` [net-2.6 PATCH 1/2] qlge: Fix early exit from mbox cmd complete wait Ron Mercer
2009-11-07 4:35 ` David Miller
2009-11-07 18:32 ` Ron Mercer
2009-11-06 17:44 ` [net-2.6 PATCH 2/2] qlge: Set PCIe reset type for EEH to fundamental Ron Mercer
2009-11-07 4:35 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.