From 5f4d46e2ac5fe314ef01078b84a9e4459cd9e8cb Mon Sep 17 00:00:00 2001 From: Justin Hibbits Date: Tue, 3 Nov 2015 00:54:14 +0000 Subject: [PATCH] Use 64-bit addresses for configuring inbound and outbound address windows. This allows using the full host and PCI ranges in the controller configuration. --- sys/powerpc/mpc85xx/pci_mpc85xx.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/powerpc/mpc85xx/pci_mpc85xx.c b/sys/powerpc/mpc85xx/pci_mpc85xx.c index b7384c99dcb..70bdb72e658 100644 --- a/sys/powerpc/mpc85xx/pci_mpc85xx.c +++ b/sys/powerpc/mpc85xx/pci_mpc85xx.c @@ -129,11 +129,11 @@ static void fsl_pcib_cfgwrite(struct fsl_pcib_softc *, u_int, u_int, u_int, u_int, uint32_t, int); static int fsl_pcib_decode_win(phandle_t, struct fsl_pcib_softc *); static void fsl_pcib_err_init(device_t); -static void fsl_pcib_inbound(struct fsl_pcib_softc *, int, int, u_long, - u_long, u_long); +static void fsl_pcib_inbound(struct fsl_pcib_softc *, int, int, uint64_t, + uint64_t, uint64_t); static int fsl_pcib_init(struct fsl_pcib_softc *, int, int); -static void fsl_pcib_outbound(struct fsl_pcib_softc *, int, int, u_long, - u_long, u_long); +static void fsl_pcib_outbound(struct fsl_pcib_softc *, int, int, uint64_t, + uint64_t, uint64_t); /* Forward declerations. */ static int fsl_pcib_attach(device_t); @@ -645,8 +645,8 @@ fsl_pcib_init(struct fsl_pcib_softc *sc, int bus, int maxslot) } static void -fsl_pcib_inbound(struct fsl_pcib_softc *sc, int wnd, int tgt, u_long start, - u_long size, u_long pci_start) +fsl_pcib_inbound(struct fsl_pcib_softc *sc, int wnd, int tgt, uint64_t start, + uint64_t size, uint64_t pci_start) { uint32_t attr, bar, tar; @@ -671,8 +671,8 @@ fsl_pcib_inbound(struct fsl_pcib_softc *sc, int wnd, int tgt, u_long start, } static void -fsl_pcib_outbound(struct fsl_pcib_softc *sc, int wnd, int res, u_long start, - u_long size, u_long pci_start) +fsl_pcib_outbound(struct fsl_pcib_softc *sc, int wnd, int res, uint64_t start, + uint64_t size, uint64_t pci_start) { uint32_t attr, bar, tar;