From: "John W. Linville" <linville@tuxdriver.com>
To: linux-kernel@vger.kernel.org, netdev@oss.sgi.com
Cc: jgarzik@pobox.com, davem@davemloft.net
Subject: [patch 2.6.12-rc2 4/10] tg3: use TG3_FLG2_5705_PLUS instead of multi-way if's
Date: Wed, 13 Apr 2005 19:38:44 -0400 [thread overview]
Message-ID: <04132005193844.8539@laptop> (raw)
In-Reply-To: <04132005193844.8474@laptop>
Replace a number of three-way if statements checking for 5705, 5750,
and 5752 to reference the equivalent TG3_FLG2_5705_PLUS flag instead.
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---
drivers/net/tg3.c | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
--- bcm5752-support/drivers/net/tg3.c.orig 2005-04-08 17:42:28.059553796 -0400
+++ bcm5752-support/drivers/net/tg3.c 2005-04-08 17:42:16.584131525 -0400
@@ -85,9 +85,7 @@
/* hardware minimum and maximum for a single frame's data payload */
#define TG3_MIN_MTU 60
#define TG3_MAX_MTU(tp) \
- ((GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705 && \
- GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5750 && \
- GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5752) ? 9000 : 1500)
+ (!(tp->tg3_flags2 & TG3_FLG2_5705_PLUS) ? 9000 : 1500)
/* These numbers seem to be hard coded in the NIC firmware somehow.
* You can't change the ring sizes, but you can change where you place
@@ -863,9 +861,7 @@ out:
if ((tp->phy_id & PHY_ID_MASK) == PHY_ID_BCM5401) {
/* Cannot do read-modify-write on 5401 */
tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x4c20);
- } else if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705 &&
- GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5750 &&
- GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5752) {
+ } else if (!(tp->tg3_flags2 & TG3_FLG2_5705_PLUS)) {
u32 phy_reg;
/* Set bit 14 with read-modify-write to preserve other bits */
@@ -877,9 +873,7 @@ out:
/* Set phy register 0x10 bit 0 to high fifo elasticity to support
* jumbo frames transmission.
*/
- if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705 &&
- GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5750 &&
- GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5752) {
+ if (!(tp->tg3_flags2 & TG3_FLG2_5705_PLUS)) {
u32 phy_reg;
if (!tg3_readphy(tp, MII_TG3_EXT_CTRL, &phy_reg))
@@ -8483,9 +8477,7 @@ static int __devinit tg3_test_dma(struct
/* DMA read watermark not used on PCIE */
tp->dma_rwctrl |= 0x00180000;
} else if (!(tp->tg3_flags & TG3_FLAG_PCIX_MODE)) {
- if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705 ||
- GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750 ||
- GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5752)
+ if (tp->tg3_flags2 & TG3_FLG2_5705_PLUS)
tp->dma_rwctrl |= 0x003f0000;
else
tp->dma_rwctrl |= 0x003f000f;
next prev parent reply other threads:[~2005-04-13 23:48 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-04-13 23:38 [patch 2.6.12-rc2 0/10] add bcm5752 support plus some cleanup to tg3 John W. Linville
2005-04-13 23:38 ` [patch 2.6.12-rc2 1/10] tg3: add basic bcm5752 support John W. Linville
2005-04-13 23:38 ` [patch 2.6.12-rc2 2/10] tg3: add bcm5752 to tg3_pci_tbl John W. Linville
2005-04-13 23:38 ` [patch 2.6.12-rc2 3/10] tg3: add bcm5752 entry to pci_ids.h John W. Linville
2005-04-13 23:38 ` John W. Linville [this message]
2005-04-13 23:38 ` [patch 2.6.12-rc2 5/10] tg3: define TG3_FLG2_5750_PLUS flag John W. Linville
2005-04-13 23:38 ` [patch 2.6.12-rc2 6/10] tg3: use new " John W. Linville
2005-04-13 23:38 ` [patch 2.6.12-rc2 7/10] tg3: more use of TG3_FLG2_5705_PLUS flag John W. Linville
2005-04-13 23:38 ` [patch 2.6.12-rc2 8/10] tg3: use TG3_FLG2_57{05,50}_PLUS flags in tg3_get_invariants John W. Linville
2005-04-13 23:38 ` [patch 2.6.12-rc2 9/10] tg3: check TG3_FLG2_5750_PLUS flag to set TG3_FLG2_5705_PLUS flag John W. Linville
2005-04-13 23:38 ` [patch 2.6.12-rc2 10/10] tg3: add support for bcm5752 rev a1 John W. Linville
2005-04-22 0:04 ` David S. Miller
2005-04-22 0:04 ` [patch 2.6.12-rc2 9/10] tg3: check TG3_FLG2_5750_PLUS flag to set TG3_FLG2_5705_PLUS flag David S. Miller
2005-04-22 0:03 ` [patch 2.6.12-rc2 8/10] tg3: use TG3_FLG2_57{05,50}_PLUS flags in tg3_get_invariants David S. Miller
2005-04-22 0:02 ` [patch 2.6.12-rc2 7/10] tg3: more use of TG3_FLG2_5705_PLUS flag David S. Miller
2005-04-22 0:02 ` [patch 2.6.12-rc2 6/10] tg3: use new TG3_FLG2_5750_PLUS flag David S. Miller
2005-04-22 0:01 ` [patch 2.6.12-rc2 5/10] tg3: define " David S. Miller
2005-04-22 0:00 ` [patch 2.6.12-rc2 4/10] tg3: use TG3_FLG2_5705_PLUS instead of multi-way if's David S. Miller
2005-04-21 23:59 ` [patch 2.6.12-rc2 3/10] tg3: add bcm5752 entry to pci_ids.h David S. Miller
2005-05-27 18:47 ` [patch 2.6.12-rc5] tg3: add bcm5752 entry to pci.ids John W. Linville
2005-05-27 18:53 ` Christoph Hellwig
2005-05-27 19:00 ` John W. Linville
2005-05-27 18:12 ` Michael Chan
2005-05-27 19:02 ` Christoph Hellwig
2005-05-27 19:30 ` David S. Miller
2005-05-27 19:24 ` Michael Chan
2005-05-27 20:40 ` Jeff Garzik
2005-05-27 20:41 ` David S. Miller
2005-05-27 20:40 ` David S. Miller
2005-05-27 22:46 ` Dave Jones
2005-04-21 23:58 ` [patch 2.6.12-rc2 2/10] tg3: add bcm5752 to tg3_pci_tbl David S. Miller
2005-04-21 23:57 ` [patch 2.6.12-rc2 1/10] tg3: add basic bcm5752 support David S. Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=04132005193844.8539@laptop \
--to=linville@tuxdriver.com \
--cc=davem@davemloft.net \
--cc=jgarzik@pobox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).