d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use bge_flags to save chipset family and remove dead code while I am here.

Browse Source
This commit is contained in:
Jung-uk Kim 2006-12-04 19:50:49 +00:00
parent 4598ab64b0
commit 0dae9719c3
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=164886
2 changed files with 43 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
sys/dev/bge/if_bge.c
View File

@ -281,35 +281,10 @@ static const struct bge_revision bge_majorrevs[] = {
{ 0, NULL }
};
#define BGE_IS_5705_OR_BEYOND(sc) \
((sc)->bge_asicrev == BGE_ASICREV_BCM5705 || \
(sc)->bge_asicrev == BGE_ASICREV_BCM5750 || \
(sc)->bge_asicrev == BGE_ASICREV_BCM5714_A0 || \
(sc)->bge_asicrev == BGE_ASICREV_BCM5780 || \
(sc)->bge_asicrev == BGE_ASICREV_BCM5714 || \
(sc)->bge_asicrev == BGE_ASICREV_BCM5752 || \
(sc)->bge_asicrev == BGE_ASICREV_BCM5755 || \
(sc)->bge_asicrev == BGE_ASICREV_BCM5787)
#define BGE_IS_575X_PLUS(sc) \
((sc)->bge_asicrev == BGE_ASICREV_BCM5750 || \
(sc)->bge_asicrev == BGE_ASICREV_BCM5714_A0 || \
(sc)->bge_asicrev == BGE_ASICREV_BCM5780 || \
(sc)->bge_asicrev == BGE_ASICREV_BCM5714 || \
(sc)->bge_asicrev == BGE_ASICREV_BCM5752 || \
(sc)->bge_asicrev == BGE_ASICREV_BCM5755 || \
(sc)->bge_asicrev == BGE_ASICREV_BCM5787)
#define BGE_IS_5714_FAMILY(sc) \
((sc)->bge_asicrev == BGE_ASICREV_BCM5714_A0 || \
(sc)->bge_asicrev == BGE_ASICREV_BCM5780 || \
(sc)->bge_asicrev == BGE_ASICREV_BCM5714)
#define BGE_IS_JUMBO_CAPABLE(sc) \
((sc)->bge_asicrev == BGE_ASICREV_BCM5700 || \
(sc)->bge_asicrev == BGE_ASICREV_BCM5701 || \
(sc)->bge_asicrev == BGE_ASICREV_BCM5703 || \
(sc)->bge_asicrev == BGE_ASICREV_BCM5704)
#define BGE_IS_JUMBO_CAPABLE(sc) ((sc)->bge_flags & BGE_FLAG_5700_FAMILY)
#define BGE_IS_5705_OR_BEYOND(sc) ((sc)->bge_flags & BGE_FLAG_5705_PLUS)
#define BGE_IS_5714_FAMILY(sc) ((sc)->bge_flags & BGE_FLAG_5714_FAMILY)
#define BGE_IS_575X_PLUS(sc) ((sc)->bge_flags & BGE_FLAG_575X_PLUS)
const struct bge_revision * bge_lookup_rev(uint32_t);
const struct bge_vendor * bge_lookup_vendor(uint16_t);
@ -1231,21 +1206,11 @@ bge_blockinit(struct bge_softc *sc)
if (!(BGE_IS_5705_OR_BEYOND(sc))) {
/* Configure mbuf memory pool */
if (sc->bge_flags & BGE_FLAG_EXTRAM) {
CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_BASEADDR,
BGE_EXT_SSRAM);
if (sc->bge_asicrev == BGE_ASICREV_BCM5704)
CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_LEN, 0x10000);
else
CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_LEN, 0x18000);
} else {
CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_BASEADDR,
BGE_BUFFPOOL_1);
if (sc->bge_asicrev == BGE_ASICREV_BCM5704)
CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_LEN, 0x10000);
else
CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_LEN, 0x18000);
}
CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_BASEADDR, BGE_BUFFPOOL_1);
if (sc->bge_asicrev == BGE_ASICREV_BCM5704)
CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_LEN, 0x10000);
else
CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_LEN, 0x18000);
/* Configure DMA resource pool */
CSR_WRITE_4(sc, BGE_BMAN_DMA_DESCPOOL_BASEADDR,
@ -1315,10 +1280,7 @@ bge_blockinit(struct bge_softc *sc)
else
rcb->bge_maxlen_flags =
BGE_RCB_MAXLEN_FLAGS(BGE_MAX_FRAMELEN, 0);
if (sc->bge_flags & BGE_FLAG_EXTRAM)
rcb->bge_nicaddr = BGE_EXT_STD_RX_RINGS;
else
rcb->bge_nicaddr = BGE_STD_RX_RINGS;
rcb->bge_nicaddr = BGE_STD_RX_RINGS;
CSR_WRITE_4(sc, BGE_RX_STD_RCB_HADDR_HI, rcb->bge_hostaddr.bge_addr_hi);
CSR_WRITE_4(sc, BGE_RX_STD_RCB_HADDR_LO, rcb->bge_hostaddr.bge_addr_lo);
@ -1344,10 +1306,7 @@ bge_blockinit(struct bge_softc *sc)
BUS_DMASYNC_PREREAD);
rcb->bge_maxlen_flags = BGE_RCB_MAXLEN_FLAGS(0,
BGE_RCB_FLAG_USE_EXT_RX_BD|BGE_RCB_FLAG_RING_DISABLED);
if (sc->bge_flags & BGE_FLAG_EXTRAM)
rcb->bge_nicaddr = BGE_EXT_JUMBO_RX_RINGS;
else
rcb->bge_nicaddr = BGE_JUMBO_RX_RINGS;
rcb->bge_nicaddr = BGE_JUMBO_RX_RINGS;
CSR_WRITE_4(sc, BGE_RX_JUMBO_RCB_HADDR_HI,
rcb->bge_hostaddr.bge_addr_hi);
CSR_WRITE_4(sc, BGE_RX_JUMBO_RCB_HADDR_LO,
@ -2156,6 +2115,33 @@ bge_attach(device_t dev)
sc->bge_asicrev = BGE_ASICREV(sc->bge_chipid);
sc->bge_chiprev = BGE_CHIPREV(sc->bge_chipid);
/* Save chipset family. */
switch (sc->bge_asicrev) {
case BGE_ASICREV_BCM5700:
case BGE_ASICREV_BCM5701:
case BGE_ASICREV_BCM5703:
case BGE_ASICREV_BCM5704:
sc->bge_flags |= BGE_FLAG_5700_FAMILY;
break;
case BGE_ASICREV_BCM5714_A0:
case BGE_ASICREV_BCM5780:
case BGE_ASICREV_BCM5714:
sc->bge_flags |= BGE_FLAG_5714_FAMILY;
/* Fall through */
case BGE_ASICREV_BCM5750:
case BGE_ASICREV_BCM5752:
case BGE_ASICREV_BCM5755:
case BGE_ASICREV_BCM5787:
sc->bge_flags |= BGE_FLAG_575X_PLUS;
/* Fall through */
case BGE_ASICREV_BCM5705:
sc->bge_flags |= BGE_FLAG_5705_PLUS;
break;
}
/*
* XXX: Broadcom Linux driver. Not in specs or eratta.
* PCI-Express?

6
sys/dev/bge/if_bgereg.h
View File

@ -2455,12 +2455,16 @@ struct bge_softc {
struct resource *bge_res;
struct ifmedia bge_ifmedia; /* TBI media info */
uint32_t bge_flags;
#define BGE_FLAG_EXTRAM 0x00000001 /* Has external SSRAM. */
#define BGE_FLAG_EXTRAM 0x00000001 /* Has external SSRAM (unused). */
#define BGE_FLAG_TBI 0x00000002
#define BGE_FLAG_RX_ALIGNBUG 0x00000004
#define BGE_FLAG_NO3LED 0x00000008
#define BGE_FLAG_PCIX 0x00000010
#define BGE_FLAG_PCIE 0x00000020
#define BGE_FLAG_5700_FAMILY 0x00000100
#define BGE_FLAG_5705_PLUS 0x00000200
#define BGE_FLAG_5714_FAMILY 0x00000400
#define BGE_FLAG_575X_PLUS 0x00000800
uint32_t bge_chipid;
uint8_t bge_asicrev;
uint8_t bge_chiprev;