system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-06 17:18:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ofw pcib when it rman_init fails

Browse source 
rman_fini assumes rman_init has been called successfully. Clean up
init faulure by only calling rman_fini when rman_init has succeeded.

While here add ofw_pcib_fini that can be used by a sub-class to clean
up.

Reviewed by:	bz, imp
Sponsored by:	The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D35681
This commit is contained in:
Andrew Turner 2022-06-30 19:12:46 +01:00
parent 1c799a6f29
commit b1e9313274
2 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
sys/dev/ofw/ofw_pcib.c
View file

@ -211,7 +211,7 @@ ofw_pcib_init(device_t dev)
error = rman_init(&sc->sc_mem_rman);
if (error != 0) {
device_printf(dev, "rman_init() failed. error = %d\n", error);
goto out;
goto out_mem_rman;
}
sc->sc_pmem_rman.rm_type = RMAN_ARRAY;
@ -219,7 +219,7 @@ ofw_pcib_init(device_t dev)
error = rman_init(&sc->sc_pmem_rman);
if (error != 0) {
device_printf(dev, "rman_init() failed. error = %d\n", error);
goto out;
goto out_pmem_rman;
}
for (i = 0; i < sc->sc_nrange; i++) {
@ -254,21 +254,37 @@ ofw_pcib_init(device_t dev)
"error = %d\n", rp->pci_hi &
OFW_PCI_PHYS_HI_SPACEMASK, rp->pci,
rp->pci + rp->size - 1, error);
goto out;
goto out_full;
}
}
ofw_bus_setup_iinfo(node, &sc->sc_pci_iinfo, sizeof(cell_t));
return (0);
out_full:
rman_fini(&sc->sc_pmem_rman);
out_pmem_rman:
rman_fini(&sc->sc_mem_rman);
out_mem_rman:
rman_fini(&sc->sc_io_rman);
out:
free(cell_info, M_DEVBUF);
free(sc->sc_cell_info, M_DEVBUF);
free(sc->sc_range, M_DEVBUF);
return (error);
}
void
ofw_pcib_fini(device_t dev)
{
struct ofw_pci_softc *sc;
sc = device_get_softc(dev);
free(sc->sc_cell_info, M_DEVBUF);
free(sc->sc_range, M_DEVBUF);
rman_fini(&sc->sc_io_rman);
rman_fini(&sc->sc_mem_rman);
rman_fini(&sc->sc_pmem_rman);
return (error);
}
int

1
sys/dev/ofw/ofwpci.h
View file

@ -78,6 +78,7 @@ struct ofw_pci_softc {
};
int ofw_pcib_init(device_t);
void ofw_pcib_fini(device_t);
int ofw_pcib_attach(device_t);
int ofw_pcib_read_ivar(device_t, device_t, int, uintptr_t *);
int ofw_pcib_write_ivar(device_t, device_t, int, uintptr_t);