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

Enable PCI bus master during attach in case the BIOS hasn't done it for us.

Browse Source
This commit is contained in:
Mike Spengler 1999-05-10 22:53:45 +00:00
parent 9adcb188e5
commit 8abd11a431
2 changed files with 63 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
sys/dev/hea/eni.c
View File

@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
* @(#) $Id: eni.c,v 1.6 1999/04/24 20:17:05 peter Exp $
* @(#) $Id: eni.c,v 1.7 1999/05/09 17:07:27 peter Exp $
*
*/
@ -42,7 +42,7 @@
#include <dev/hea/eni_var.h>
#ifndef lint
__RCSID("@(#) $Id: eni.c,v 1.6 1999/04/24 20:17:05 peter Exp $");
__RCSID("@(#) $Id: eni.c,v 1.7 1999/05/09 17:07:27 peter Exp $");
#endif
/*
@ -391,15 +391,27 @@ eni_pci_attach ( pcici_t config_id, int unit )
eup->eu_vcc_pool = &eni_vcc_pool;
eup->eu_nif_pool = &eni_nif_pool;
/*
* Enable Memory Mapping / Bus Mastering
*/
val = pci_conf_read(config_id, PCI_COMMAND_STATUS_REG);
val |= (PCIM_CMD_MEMEN | PCIM_CMD_BUSMASTEREN);
pci_conf_write(config_id, PCI_COMMAND_STATUS_REG, val);
/*
* Map in adapter RAM
*/
val = pci_conf_read(config_id, PCI_COMMAND_STATUS_REG);
if ((val & PCIM_CMD_MEMEN) == 0) {
log(LOG_ERR, "%s%d: memory mapping not enabled\n",
ENI_DEV_NAME, unit);
goto failed;
}
if ( ( pci_map_mem ( config_id, PCI_MAP_REG_START, &va, &pa ) ) == 0 )
{
/*
* Nothing's happened yet that we need to undo.
*/
return;
log(LOG_ERR, "%s%d: unable to map memory\n",
ENI_DEV_NAME, unit);
goto failed;
}
/*
* Map okay - retain address assigned
@ -432,10 +444,9 @@ eni_pci_attach ( pcici_t config_id, int unit )
* Adapter memory test failed. Clean up and
* return.
*/
/*
* FreeBSD doesn't support unmapping PCI memory (yet?).
*/
return;
log(LOG_ERR, "%s%d: memory test failed\n",
ENI_DEV_NAME, unit);
goto failed;
}
/*
@ -467,14 +478,9 @@ eni_pci_attach ( pcici_t config_id, int unit )
*/
if ( !pci_map_int ( config_id, eni_intr, (void *)eup, &net_imask ) )
{
/*
* Finish by unmapping memory, etc.
*/
log ( LOG_ERR, "eni_pci_attach: Unable to map interrupt\n" );
/*
* Can't unmap PCI memory (yet).
*/
return;
log(LOG_ERR, "%s%d: unable to map interrupt\n",
ENI_DEV_NAME, unit);
goto failed;
}
/*
@ -532,16 +538,9 @@ eni_pci_attach ( pcici_t config_id, int unit )
/*
* Registration failed - back everything out
*/
/*
* Can't unmap PCI memory (yet).
*/
/*
* Unmap PCI interrupt
*/
(void) pci_unmap_int ( config_id );
log ( LOG_ERR,
"eni_pci_attach: atm_physif_register failed\n" );
return;
log(LOG_ERR, "%s%d: atm_physif_register failed\n",
ENI_DEV_NAME, unit);
goto failed;
}
eni_units[unit] = eup;
@ -557,21 +556,21 @@ eni_pci_attach ( pcici_t config_id, int unit )
* Initialize driver processing
*/
if ( eni_init ( eup ) ) {
log ( LOG_ERR, "eni_pci_attach: Failed eni_init()\n" );
/*
* Can't unmap PCI memory (yet).
*/
/*
* Unmap PCI interrupt
*/
(void) pci_unmap_int ( config_id );
/*
* Fall through to return
*/
log(LOG_ERR, "%s%d: adapter init failed\n",
ENI_DEV_NAME, unit);
goto failed;
}
return;
failed:
/*
* Attach failed - clean up
*/
eni_pci_reset(eup);
(void) pci_unmap_int(config_id);
atm_dev_free(eup);
return;
}
/*
@ -595,15 +594,17 @@ eni_pci_reset ( eup )
* we assume we're shutting the card down for good.
*/
/*
* Issue RESET command to Midway chip
*/
eup->eu_midway[MIDWAY_ID] = MIDWAY_RESET;
if (eup->eu_midway) {
/*
* Issue RESET command to Midway chip
*/
eup->eu_midway[MIDWAY_ID] = MIDWAY_RESET;
/*
* Delay to allow everything to terminate
*/
DELAY ( MIDWAY_DELAY );
/*
* Delay to allow everything to terminate
*/
DELAY ( MIDWAY_DELAY );
}
return;
}

17
sys/dev/hfa/fore_load.c
View File

@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
* @(#) $Id: fore_load.c,v 1.6 1999/04/24 20:17:05 peter Exp $
* @(#) $Id: fore_load.c,v 1.7 1999/05/09 17:07:30 peter Exp $
*
*/
@ -38,7 +38,7 @@
#include <dev/hfa/fore_include.h>
#ifndef lint
__RCSID("@(#) $Id: fore_load.c,v 1.6 1999/04/24 20:17:05 peter Exp $");
__RCSID("@(#) $Id: fore_load.c,v 1.7 1999/05/09 17:07:30 peter Exp $");
#endif
@ -948,9 +948,22 @@ fore_pci_attach(config_id, unit)
fup->fu_config.ac_device = DEV_UNKNOWN;
}
/*
* Enable Memory Mapping / Bus Mastering
*/
val = pci_conf_read(config_id, PCI_COMMAND_STATUS_REG);
val |= (PCIM_CMD_MEMEN | PCIM_CMD_BUSMASTEREN);
pci_conf_write(config_id, PCI_COMMAND_STATUS_REG, val);
/*
* Map RAM
*/
val = pci_conf_read(config_id, PCI_COMMAND_STATUS_REG);
if ((val & PCIM_CMD_MEMEN) == 0) {
log(LOG_ERR, "%s%d: memory mapping not enabled\n",
FORE_DEV_NAME, unit);
goto failed;
}
if ((pci_map_mem(config_id, PCA200E_PCI_MEMBASE, &va, &pa)) == 0) {
log(LOG_ERR, "%s%d: unable to map memory\n",
FORE_DEV_NAME, unit);