Message ID | 201004261427.07099.adetsch@br.ibm.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
On Mon, 2010-04-26 at 11:10 -0700, David Miller wrote: > From: Andre Detsch <adetsch@br.ibm.com> > Date: Mon, 26 Apr 2010 14:27:07 -0300 > > > tg3: Fix INTx fallback when MSI fails > > > > MSI setup changes the value of irq_vec in struct tg3 *tp. > > This attribute must be taken into account and restored before > > we try to do a new request_irq for INTx fallback. > > > > In powerpc, the original code was leading to an EINVAL return within > > request_irq, because the driver was trying to use the disabled MSI > > virtual irq number instead of tp->pdev->irq. > > > > Signed-off-by: Andre Detsch <adetsch@br.ibm.com> > > Broadcom folks, I've already asked you to review Andre's original patch. > > If you can't be bothered to look at and ACK/NACK a simple fix like > this for 10 days, then I'm just going to apply Andre's patch as-is > since it looks right to me. > > If the idea was to bundle this up into a set of 15 patches you guys > already have ready to bomb at me, I absolutely do not want you guys to > operate that way. It doesn't work. You should be able to ACK a > simple patch like this as soon as possible so it can be integrated > upstream in the most expediant manner possible. > > Thanks. > Sorry, Matt just got back from vacation. I discussed with Andre earlier today to come up with the new v2 patch. So this patch has my: Acked-by: Michael Chan <mchan@broadcom.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Andre Detsch <adetsch@br.ibm.com> Date: Mon, 26 Apr 2010 14:27:07 -0300 > tg3: Fix INTx fallback when MSI fails > > MSI setup changes the value of irq_vec in struct tg3 *tp. > This attribute must be taken into account and restored before > we try to do a new request_irq for INTx fallback. > > In powerpc, the original code was leading to an EINVAL return within > request_irq, because the driver was trying to use the disabled MSI > virtual irq number instead of tp->pdev->irq. > > Signed-off-by: Andre Detsch <adetsch@br.ibm.com> Broadcom folks, I've already asked you to review Andre's original patch. If you can't be bothered to look at and ACK/NACK a simple fix like this for 10 days, then I'm just going to apply Andre's patch as-is since it looks right to me. If the idea was to bundle this up into a set of 15 patches you guys already have ready to bomb at me, I absolutely do not want you guys to operate that way. It doesn't work. You should be able to ACK a simple patch like this as soon as possible so it can be integrated upstream in the most expediant manner possible. Thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: "Michael Chan" <mchan@broadcom.com> Date: Mon, 26 Apr 2010 11:01:21 -0700 > Sorry, Matt just got back from vacation. I discussed with Andre earlier > today to come up with the new v2 patch. So this patch has my: > > Acked-by: Michael Chan <mchan@broadcom.com> > Thanks a lot, applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Index: linux-2.6.34-rc5/drivers/net/tg3.c =================================================================== --- linux-2.6.34-rc5.orig/drivers/net/tg3.c 2010-04-19 20:29:56.000000000 -0300 +++ linux-2.6.34-rc5/drivers/net/tg3.c 2010-04-26 14:10:42.000000000 -0300 @@ -8633,6 +8633,7 @@ static int tg3_test_msi(struct tg3 *tp) pci_disable_msi(tp->pdev); tp->tg3_flags2 &= ~TG3_FLG2_USING_MSI; + tp->napi[0].irq_vec = tp->pdev->irq; err = tg3_request_irq(tp, 0); if (err)
tg3: Fix INTx fallback when MSI fails MSI setup changes the value of irq_vec in struct tg3 *tp. This attribute must be taken into account and restored before we try to do a new request_irq for INTx fallback. In powerpc, the original code was leading to an EINVAL return within request_irq, because the driver was trying to use the disabled MSI virtual irq number instead of tp->pdev->irq. Signed-off-by: Andre Detsch <adetsch@br.ibm.com> --- Tested on powerpc, but should be safe for other architectures as well. v2: removed unnecessary changes -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html