diff options
| author | jhb <jhb@FreeBSD.org> | 2011-06-10 13:24:56 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2011-06-10 13:24:56 +0000 |
| commit | 5b26ffdce6c025946a7296a007a3d32a2a074ae2 (patch) | |
| tree | 7aaa5203826886d4786571d03f48cb281e548ffb /sys/dev/pci/pci_pci.c | |
| parent | 10d756faa8b25a196668a57a01060a56d3c5f1bb (diff) | |
| download | FreeBSD-src-5b26ffdce6c025946a7296a007a3d32a2a074ae2.zip FreeBSD-src-5b26ffdce6c025946a7296a007a3d32a2a074ae2.tar.gz | |
Fix some off-by-one errors with the ending address of candidate regions
when attempting to grow a window.
Diffstat (limited to 'sys/dev/pci/pci_pci.c')
| -rw-r--r-- | sys/dev/pci/pci_pci.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/dev/pci/pci_pci.c b/sys/dev/pci/pci_pci.c index f68973b..da8465c 100644 --- a/sys/dev/pci/pci_pci.c +++ b/sys/dev/pci/pci_pci.c @@ -916,7 +916,8 @@ pcib_grow_window(struct pcib_softc *sc, struct pcib_window *w, int type, /* Move end_free down until it is properly aligned. */ end_free &= ~(align - 1); - front = end_free - count; + end_free--; + front = end_free - (count - 1); /* * The resource would now be allocated at (front, @@ -944,7 +945,7 @@ pcib_grow_window(struct pcib_softc *sc, struct pcib_window *w, int type, /* Move start_free up until it is properly aligned. */ start_free = roundup2(start_free, align); - back = start_free + count; + back = start_free + count - 1; /* * The resource would now be allocated at (start_free, @@ -957,7 +958,7 @@ pcib_grow_window(struct pcib_softc *sc, struct pcib_window *w, int type, if (bootverbose) printf("\tback candidate range: %#lx-%#lx\n", start_free, back); - back = roundup2(back, w->step) - 1; + back = roundup2(back + 1, w->step) - 1; back -= rman_get_end(w->res); } else back = 0; |
