diff options
| author | yongari <yongari@FreeBSD.org> | 2011-12-09 18:34:45 +0000 |
|---|---|---|
| committer | yongari <yongari@FreeBSD.org> | 2011-12-09 18:34:45 +0000 |
| commit | d172d2529b2163eb892833da9a15590946625ad4 (patch) | |
| tree | e3e922151562af4ddc21c2f96d2f8bc466c4289f /sys/dev/et | |
| parent | 78c57131bbbef12fcd40db1c89254c750d23cf03 (diff) | |
| download | FreeBSD-src-d172d2529b2163eb892833da9a15590946625ad4.zip FreeBSD-src-d172d2529b2163eb892833da9a15590946625ad4.tar.gz | |
Remove unnecessary definition of ET_PCIR_BAR. Controller support
I/O memory only.
While here, use pci_set_max_read_req(9) rather than directly
manipulating PCIe device control register.
Diffstat (limited to 'sys/dev/et')
| -rw-r--r-- | sys/dev/et/if_et.c | 11 | ||||
| -rw-r--r-- | sys/dev/et/if_etreg.h | 2 |
2 files changed, 3 insertions, 10 deletions
diff --git a/sys/dev/et/if_et.c b/sys/dev/et/if_et.c index 6c1df0e..660d35f 100644 --- a/sys/dev/et/if_et.c +++ b/sys/dev/et/if_et.c @@ -250,9 +250,9 @@ et_attach(device_t dev) /* * Allocate IO memory */ - sc->sc_mem_rid = ET_PCIR_BAR; + sc->sc_mem_rid = PCIR_BAR(0); sc->sc_mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, - &sc->sc_mem_rid, RF_ACTIVE); + &sc->sc_mem_rid, RF_ACTIVE); if (sc->sc_mem_res == NULL) { device_printf(dev, "can't allocate IO memory\n"); return (ENXIO); @@ -722,12 +722,7 @@ et_bus_config(struct et_softc *sc) /* * Set max read request size to 2048 bytes */ - val = pci_read_config(sc->dev, - sc->sc_expcap + PCIR_EXPRESS_DEVICE_CTL, 2); - val &= ~PCIM_EXP_CTL_MAX_READ_REQUEST; - val |= ET_PCIV_DEVICE_CTRL_RRSZ_2K; - pci_write_config(sc->dev, - sc->sc_expcap + PCIR_EXPRESS_DEVICE_CTL, val, 2); + pci_set_max_read_req(sc->dev, 2048); return (0); } diff --git a/sys/dev/et/if_etreg.h b/sys/dev/et/if_etreg.h index 6767e53..138bf83 100644 --- a/sys/dev/et/if_etreg.h +++ b/sys/dev/et/if_etreg.h @@ -53,8 +53,6 @@ * ET_PCIV_REPLAY_TIMER_{128,256} are from * PCI EXPRESS BASE SPECIFICATION, REV. 1.0a, Table 3-4 */ -#define ET_PCIR_BAR PCIR_BAR(0) - #define ET_PCIR_DEVICE_CAPS 0x4C #define ET_PCIM_DEVICE_CAPS_MAX_PLSZ 0x7 /* Max playload size */ #define ET_PCIV_DEVICE_CAPS_PLSZ_128 0x0 |
