Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change the 32-bit fields of the RFA to an arrays of bytes, so that

Browse Source 
egcs won't attempt to optimize inline copies of them into a single
load/store (the RFA is not 4-byte aligned in the DMA area).

Just use memcpy() to copy those fields, now, not our own home-grown.
This commit is contained in:
thorpej 1998-08-25 01:08:15 +00:00
parent d54f140300
commit 85c6c03e2a
2 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sys/dev/pci/if_fxp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_fxp.c,v 1.20 1998/08/11 00:11:39 thorpej Exp $ */
/* $NetBSD: if_fxp.c,v 1.21 1998/08/25 01:08:15 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@ -126,22 +126,6 @@
*/
#define RFA_ALIGNMENT_FUDGE 2
/*
* Inline function to copy a 16-bit aligned 32-bit quantity.
*/
static __inline void fxp_lwcopy __P((volatile u_int32_t *,
volatile u_int32_t *));
static __inline void
fxp_lwcopy(src, dst)
volatile u_int32_t *src, *dst;
{
volatile u_int16_t *a = (u_int16_t *)src;
volatile u_int16_t *b = (u_int16_t *)dst;
b[0] = a[0];
b[1] = a[1];
}
/*
* Template for default configuration parameters.
* See struct fxp_cb_config for the bit definitions.
@ -1429,17 +1413,19 @@ fxp_add_rfabuf(sc, rxd)
rfa->size = MCLBYTES - sizeof(struct fxp_rfa) - RFA_ALIGNMENT_FUDGE;
/*
* Initialize the rest of the RFA. Note that since the RFA
* is misaligned, we cannot store values directly. Instead,
* we use an optimized, inline copy.
* Initialize the rest of the RFA.
*/
rfa->rfa_status = 0;
rfa->rfa_control = FXP_RFA_CONTROL_EL;
rfa->actual_size = 0;
/*
* Note that since the RFA is misaligned, we cannot store values
* directly. Instead, we must copy.
*/
v = -1;
fxp_lwcopy(&v, &rfa->link_addr);
fxp_lwcopy(&v, &rfa->rbd_addr);
memcpy((void *)&rfa->link_addr, &v, sizeof(v));
memcpy((void *)&rfa->rbd_addr, &v, sizeof(v));
/*
* If there are other buffers already on the list, attach this
@ -1451,7 +1437,7 @@ fxp_add_rfabuf(sc, rxd)
RFA_ALIGNMENT_FUDGE);
sc->rfa_tail->fr_next = rxd;
v = rxmap->dm_segs[0].ds_addr + RFA_ALIGNMENT_FUDGE;
fxp_lwcopy(&v, &p_rfa->link_addr);
memcpy((void *)&p_rfa->link_addr, &v, sizeof(v));
p_rfa->rfa_control &= ~FXP_RFA_CONTROL_EL;
} else {
sc->rfa_head = rxd;

10
sys/dev/pci/if_fxpreg.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_fxpreg.h,v 1.8 1998/08/11 00:12:20 thorpej Exp $ */
/* $NetBSD: if_fxpreg.h,v 1.9 1998/08/25 01:08:16 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -304,13 +304,17 @@ struct fxp_cb_tx {
/*
* RFA definitions
* NOTE! The RFA will NOT be aligned on a 4-byte boundary in the DMA
* area! To prevent EGCS from optimizing the copy of link_addr and
* rbd_addr (which would cause an unaligned access fault on RISC systems),
* we must make them an array of bytes!
*/
struct fxp_rfa {
volatile u_int16_t rfa_status;
volatile u_int16_t rfa_control;
volatile u_int32_t link_addr;
volatile u_int32_t rbd_addr;
volatile u_int8_t link_addr[4];
volatile u_int8_t rbd_addr[4];
volatile u_int16_t actual_size;
volatile u_int16_t size;
};