diff options
| author | Matt Carlson <mcarlson@broadcom.com> | 2011-01-25 15:58:50 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-25 19:38:17 -0800 |
| commit | 0583d52114b19ea06d03dd2cf762a7737c265400 (patch) | |
| tree | d290f5fa1a4fd201a6cb378fe26b76a16f73a52c | |
| parent | bf933c802763b2beb1a1d4977f00af1a78c4fb70 (diff) | |
| download | op-kernel-dev-0583d52114b19ea06d03dd2cf762a7737c265400.zip op-kernel-dev-0583d52114b19ea06d03dd2cf762a7737c265400.tar.gz | |
tg3: Disable multivec mode for 1 MSIX vector
For single vector MSI-X allocations, we do not want to enable
multivector modes. This patch makes the necessary corrections.
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Reviewed-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/tg3.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index d4b29f4..b2a16b4 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -8322,7 +8322,8 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy) tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl); udelay(100); - if (tp->tg3_flags2 & TG3_FLG2_USING_MSIX) { + if ((tp->tg3_flags2 & TG3_FLG2_USING_MSIX) && + tp->irq_cnt > 1) { val = tr32(MSGINT_MODE); val |= MSGINT_MODE_MULTIVEC_EN | MSGINT_MODE_ENABLE; tw32(MSGINT_MODE, val); @@ -9062,7 +9063,8 @@ static void tg3_ints_init(struct tg3 *tp) if (tp->tg3_flags2 & TG3_FLG2_USING_MSI_OR_MSIX) { u32 msi_mode = tr32(MSGINT_MODE); - if (tp->tg3_flags2 & TG3_FLG2_USING_MSIX) + if ((tp->tg3_flags2 & TG3_FLG2_USING_MSIX) && + tp->irq_cnt > 1) msi_mode |= MSGINT_MODE_MULTIVEC_EN; tw32(MSGINT_MODE, msi_mode | MSGINT_MODE_ENABLE); } |
