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

author was assuming that nextpaddr declared *inside* the do loop would

Browse Source 
survive within the loop.  This is not guarenteed by C.  I have moved
    the nextpaddr declaration to outside the do loop.
This commit is contained in:
Matthew Dillon 1998-12-14 05:35:56 +00:00
parent 98848ba89a
commit c5a8ae50dd
2 changed files with 74 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
sys/amd64/amd64/busdma_machdep.c
View File

@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: busdma_machdep.c,v 1.10 1998/10/07 03:38:14 gibbs Exp $
* $Id: busdma_machdep.c,v 1.11 1998/10/13 08:24:33 dg Exp $
*/
#include <sys/param.h>
@ -435,38 +435,45 @@ bus_dmamap_load(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf,
seg = 1;
sg->ds_len = 0;
do {
bus_size_t size;
vm_offset_t nextpaddr; /* GCC warning expected */
{
/*
* note: nextpaddr not used on first loop
*/
vm_offset_t nextpaddr = 0;
paddr = pmap_kextract(vaddr);
size = PAGE_SIZE - (paddr & PAGE_MASK);
if (size > buflen)
size = buflen;
do {
bus_size_t size;
if (map->pagesneeded != 0
&& run_filter(dmat, paddr)) {
paddr = add_bounce_page(dmat, map, vaddr, size);
}
paddr = pmap_kextract(vaddr);
size = PAGE_SIZE - (paddr & PAGE_MASK);
if (size > buflen)
size = buflen;
if (sg->ds_len == 0) {
sg->ds_addr = paddr;
sg->ds_len = size;
} else if (paddr == nextpaddr) {
sg->ds_len += size;
} else {
/* Go to the next segment */
sg++;
seg++;
if (seg > dmat->nsegments)
break;
sg->ds_addr = paddr;
sg->ds_len = size;
}
vaddr += size;
nextpaddr = paddr + size;
buflen -= size;
} while (buflen > 0);
if (map->pagesneeded != 0
&& run_filter(dmat, paddr)) {
paddr = add_bounce_page(dmat, map,
vaddr, size);
}
if (sg->ds_len == 0) {
sg->ds_addr = paddr;
sg->ds_len = size;
} else if (paddr == nextpaddr) {
sg->ds_len += size;
} else {
/* Go to the next segment */
sg++;
seg++;
if (seg > dmat->nsegments)
break;
sg->ds_addr = paddr;
sg->ds_len = size;
}
vaddr += size;
nextpaddr = paddr + size;
buflen -= size;
} while (buflen > 0);
}
if (buflen != 0) {
printf("bus_dmamap_load: Too many segs! buf_len = 0x%lx\n",

67
sys/i386/i386/busdma_machdep.c
View File

@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: busdma_machdep.c,v 1.10 1998/10/07 03:38:14 gibbs Exp $
* $Id: busdma_machdep.c,v 1.11 1998/10/13 08:24:33 dg Exp $
*/
#include <sys/param.h>
@ -435,38 +435,45 @@ bus_dmamap_load(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf,
seg = 1;
sg->ds_len = 0;
do {
bus_size_t size;
vm_offset_t nextpaddr; /* GCC warning expected */
{
/*
* note: nextpaddr not used on first loop
*/
vm_offset_t nextpaddr = 0;
paddr = pmap_kextract(vaddr);
size = PAGE_SIZE - (paddr & PAGE_MASK);
if (size > buflen)
size = buflen;
do {
bus_size_t size;
if (map->pagesneeded != 0
&& run_filter(dmat, paddr)) {
paddr = add_bounce_page(dmat, map, vaddr, size);
}
paddr = pmap_kextract(vaddr);
size = PAGE_SIZE - (paddr & PAGE_MASK);
if (size > buflen)
size = buflen;
if (sg->ds_len == 0) {
sg->ds_addr = paddr;
sg->ds_len = size;
} else if (paddr == nextpaddr) {
sg->ds_len += size;
} else {
/* Go to the next segment */
sg++;
seg++;
if (seg > dmat->nsegments)
break;
sg->ds_addr = paddr;
sg->ds_len = size;
}
vaddr += size;
nextpaddr = paddr + size;
buflen -= size;
} while (buflen > 0);
if (map->pagesneeded != 0
&& run_filter(dmat, paddr)) {
paddr = add_bounce_page(dmat, map,
vaddr, size);
}
if (sg->ds_len == 0) {
sg->ds_addr = paddr;
sg->ds_len = size;
} else if (paddr == nextpaddr) {
sg->ds_len += size;
} else {
/* Go to the next segment */
sg++;
seg++;
if (seg > dmat->nsegments)
break;
sg->ds_addr = paddr;
sg->ds_len = size;
}
vaddr += size;
nextpaddr = paddr + size;
buflen -= size;
} while (buflen > 0);
}
if (buflen != 0) {
printf("bus_dmamap_load: Too many segs! buf_len = 0x%lx\n",