mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-02-06 18:29:47 +00:00
Code Issues Releases Activity

Switch to memory space register mapping over IO space. If that

Browse Source 
mapping fails fall back to traditional IO space access.
This commit is contained in:
Pyun YongHyeon 2008-07-02 05:21:09 +00:00
parent f98dd8cf50
commit ace7ed5dd5
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=180169
2 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
sys/dev/re/if_re.c
View File

@ -155,11 +155,6 @@ MODULE_DEPEND(re, miibus, 1, 1, 1);
/* "device miibus" required. See GENERIC if you get errors here. */
#include "miibus_if.h"
/*
* Default to using PIO access for this driver.
*/
#define RE_USEIOSPACE
/* Tunables. */
static int msi_disable = 1;
TUNABLE_INT("hw.re.msi_disable", &msi_disable);
@ -272,14 +267,6 @@ static void re_clrwol (struct rl_softc *);
static int re_diag (struct rl_softc *);
#endif
#ifdef RE_USEIOSPACE
#define RL_RES SYS_RES_IOPORT
#define RL_RID RL_PCI_LOIO
#else
#define RL_RES SYS_RES_MEMORY
#define RL_RID RL_PCI_LOMEM
#endif
static device_method_t re_methods[] = {
/* Device interface */
DEVMETHOD(device_probe, re_probe),
@ -1129,7 +1116,7 @@ re_attach(dev)
struct ifnet *ifp;
struct rl_hwrev *hw_rev;
int hwrev;
u_int16_t re_did = 0;
u_int16_t devid, re_did = 0;
int error = 0, rid, i;
int msic, reg;
uint8_t cfg;
@ -1146,14 +1133,26 @@ re_attach(dev)
*/
pci_enable_busmaster(dev);
rid = RL_RID;
sc->rl_res = bus_alloc_resource_any(dev, RL_RES, &rid,
RF_ACTIVE);
devid = pci_get_device(dev);
/* Prefer memory space register mapping over IO space. */
sc->rl_res_id = PCIR_BAR(1);
sc->rl_res_type = SYS_RES_MEMORY;
/* RTL8168/8101E seems to use different BARs. */
if (devid == RT_DEVICEID_8168 || devid == RT_DEVICEID_8101E)
sc->rl_res_id = PCIR_BAR(2);
sc->rl_res = bus_alloc_resource_any(dev, sc->rl_res_type,
&sc->rl_res_id, RF_ACTIVE);
if (sc->rl_res == NULL) {
device_printf(dev, "couldn't map ports/memory\n");
error = ENXIO;
goto fail;
sc->rl_res_id = PCIR_BAR(0);
sc->rl_res_type = SYS_RES_IOPORT;
sc->rl_res = bus_alloc_resource_any(dev, sc->rl_res_type,
&sc->rl_res_id, RF_ACTIVE);
if (sc->rl_res == NULL) {
device_printf(dev, "couldn't map ports/memory\n");
error = ENXIO;
goto fail;
}
}
sc->rl_btag = rman_get_bustag(sc->rl_res);
@ -1463,7 +1462,8 @@ re_detach(dev)
pci_release_msi(dev);
}
if (sc->rl_res)
bus_release_resource(dev, RL_RES, RL_RID, sc->rl_res);
bus_release_resource(dev, sc->rl_res_type, sc->rl_res_id,
sc->rl_res);
/* Unload and free the RX DMA ring memory and map */

2
sys/pci/if_rlreg.h
View File

@ -775,6 +775,8 @@ struct rl_softc {
bus_space_tag_t rl_btag; /* bus space tag */
device_t rl_dev;
struct resource *rl_res;
int rl_res_id;
int rl_res_type;
struct resource *rl_irq[RL_MSI_MESSAGES];
void *rl_intrhand[RL_MSI_MESSAGES];
device_t rl_miibus;