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

Add support of PCI_RES_BUS to Marvell PCI driver

Browse Source 
GENERIC ARM config use NEW_PCIB driver (https://wiki.freebsd.org/NEW_PCIB).
To satisfy it, allocation and deallocation of PCI_RES_BUS is necessary.
Conditional compilation is added for backward compatibility with ARMv5
configs.

Submitted by: Rafal Kozik <rk@semihalf.com>
Reviewed by: jhb
Obtained from: Semihalf
Sponsored by: Stormshield
Differential Revision: https://reviews.freebsd.org/D14748
This commit is contained in:
mw 2018-04-04 12:36:55 +00:00
parent 0655655c64
commit 3f2a8d70de
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/arm/mv/mv_pci.c
View File

@ -312,6 +312,8 @@ struct mv_pcib_softc {
int sc_skip_enable_procedure;
int sc_enable_find_root_slot;
struct ofw_bus_iinfo sc_pci_iinfo;
int ap_segment; /* PCI domain */
};
/* Local forward prototypes */
@ -441,6 +443,8 @@ mv_pcib_attach(device_t self)
return(ENXIO);
}
sc->ap_segment = port_id;
if (ofw_bus_node_is_compatible(node, "mrvl,pcie")) {
sc->sc_type = MV_TYPE_PCIE;
if (ofw_bus_node_is_compatible(parnode, "marvell,armada-370-pcie")) {
@ -879,6 +883,11 @@ mv_pcib_alloc_resource(device_t dev, device_t child, int type, int *rid,
case SYS_RES_MEMORY:
rm = &sc->sc_mem_rman;
break;
#ifdef PCI_RES_BUS
case PCI_RES_BUS:
return (pci_domain_alloc_bus(sc->ap_segment, child, rid, start,
end, count, flags));
#endif
default:
return (BUS_ALLOC_RESOURCE(device_get_parent(dev), dev,
type, rid, start, end, count, flags));
@ -915,7 +924,12 @@ static int
mv_pcib_release_resource(device_t dev, device_t child, int type, int rid,
struct resource *res)
{
#ifdef PCI_RES_BUS
struct mv_pcib_softc *sc = device_get_softc(dev);
if (type == PCI_RES_BUS)
return (pci_domain_release_bus(sc->ap_segment, child, rid, res));
#endif
if (type != SYS_RES_IOPORT && type != SYS_RES_MEMORY)
return (BUS_RELEASE_RESOURCE(device_get_parent(dev), child,
type, rid, res));