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

Remove pic_map_msix from ARM64, it is unneeded as all mappings happen

Browse Source 
through pic_map_msi (without the x).

Sponsored by:	ABT Systems Ltd
This commit is contained in:
Andrew Turner 2015-12-10 15:51:02 +00:00
parent c1d5e7a1f1
commit 6d8433cb00
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=292063
4 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/arm64/arm64/gic_v3_its.c
View File

@ -74,10 +74,9 @@ static device_method_t gic_v3_its_methods[] = {
*/
/* MSI-X */
DEVMETHOD(pic_alloc_msix, gic_v3_its_alloc_msix),
DEVMETHOD(pic_map_msix, gic_v3_its_map_msix),
/* MSI */
DEVMETHOD(pic_alloc_msi, gic_v3_its_alloc_msi),
DEVMETHOD(pic_map_msi, gic_v3_its_map_msix),
DEVMETHOD(pic_map_msi, gic_v3_its_map_msi),
/* End */
DEVMETHOD_END
@ -1658,7 +1657,7 @@ gic_v3_its_alloc_msi(device_t dev, device_t pci_dev, int count, int *irqs)
}
int
gic_v3_its_map_msix(device_t dev, device_t pci_dev, int irq, uint64_t *addr,
gic_v3_its_map_msi(device_t dev, device_t pci_dev, int irq, uint64_t *addr,
uint32_t *data)
{
struct gic_v3_its_softc *sc;

2
sys/arm64/arm64/gic_v3_var.h
View File

@ -253,7 +253,7 @@ int gic_v3_its_detach(device_t);
int gic_v3_its_alloc_msix(device_t, device_t, int *);
int gic_v3_its_alloc_msi(device_t, device_t, int, int *);
int gic_v3_its_map_msix(device_t, device_t, int, uint64_t *, uint32_t *);
int gic_v3_its_map_msi(device_t, device_t, int, uint64_t *, uint32_t *);
int its_init_cpu(struct gic_v3_its_softc *);

7
sys/arm64/arm64/intr_machdep.c
View File

@ -252,13 +252,6 @@ arm_release_msix(device_t pci, device_t child, int irq)
}
int
arm_map_msix(device_t pci, device_t child, int irq, uint64_t *addr, uint32_t *data)
{
return (PIC_MAP_MSIX(msi_pic, child, irq, addr, data));
}
/*
* Finalize interrupts bring-up (should be called from configure_final()).
* Enables all interrupts registered by bus_setup_intr() during boot

8
sys/arm64/arm64/pic_if.m
View File

@ -158,14 +158,6 @@ METHOD int map_msi {
uint32_t *data;
};
METHOD int map_msix {
device_t dev;
device_t pci_dev;
int irq;
uint64_t *addr;
uint32_t *data;
};
METHOD int release_msi {
device_t dev;
device_t pci_dev;