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

Explicitly enable I/O and memory decoding in the bridge's command register

Browse Source 
when activating an I/O or memory window on the CardBus bridge.

Tested by:	Olivier Cochard-Labbe <olivier@cochard.me>
Reviewed by:	imp
MFC after:	3 days
This commit is contained in:
jhb 2014-01-27 19:49:52 +00:00
parent 245519112a
commit f19aad4127
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/dev/pccbb/pccbb.c
View File

@ -1038,6 +1038,13 @@ cbb_cardbus_power_disable_socket(device_t brdev, device_t child)
/* CardBus Resource */ /* CardBus Resource */
/************************************************************************/ /************************************************************************/
static void
cbb_activate_window(device_t brdev, int type)
{
PCI_ENABLE_IO(device_get_parent(brdev), brdev, type);
}
static int static int
cbb_cardbus_io_open(device_t brdev, int win, uint32_t start, uint32_t end) cbb_cardbus_io_open(device_t brdev, int win, uint32_t start, uint32_t end)
{ {
@ -1055,6 +1062,7 @@ cbb_cardbus_io_open(device_t brdev, int win, uint32_t start, uint32_t end)
pci_write_config(brdev, basereg, start, 4); pci_write_config(brdev, basereg, start, 4);
pci_write_config(brdev, limitreg, end, 4); pci_write_config(brdev, limitreg, end, 4);
cbb_activate_window(brdev, SYS_RES_IOPORT);
return (0); return (0);
} }
@ -1075,6 +1083,7 @@ cbb_cardbus_mem_open(device_t brdev, int win, uint32_t start, uint32_t end)
pci_write_config(brdev, basereg, start, 4); pci_write_config(brdev, basereg, start, 4);
pci_write_config(brdev, limitreg, end, 4); pci_write_config(brdev, limitreg, end, 4);
cbb_activate_window(brdev, SYS_RES_MEMORY);
return (0); return (0);
} }
@ -1342,7 +1351,12 @@ cbb_pcic_activate_resource(device_t brdev, device_t child, int type, int rid,
struct resource *res) struct resource *res)
{ {
struct cbb_softc *sc = device_get_softc(brdev); struct cbb_softc *sc = device_get_softc(brdev);
return (exca_activate_resource(&sc->exca[0], child, type, rid, res)); int error;
error = exca_activate_resource(&sc->exca[0], child, type, rid, res);
if (error == 0)
cbb_activate_window(brdev, type);
return (error);
} }
static int static int