mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-19 10:53:58 +00:00
Code Issues Releases Activity

sys/mips/rmi/msgring.h - fixes and clean up.

Browse Source 
- Remove sync from msgrng_send, sync needs to be called just once before
  sending.
- Fix retry logic - don't reload registers when retrying in message_send,
  also fix check for send pending fail.
- remove unused message_send_block_fast()
- merge message_receive_fast() to message_receive
- style(9) fixes, and comments
- rge and nlge updated for the sys/mips/rmi/msgring.h changes
This commit is contained in:
Jayachandran C. 2010-09-13 13:11:50 +00:00
parent 7820a71113
commit 480f6157fb
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=212553
3 changed files with 198 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/mips/rmi/dev/nlge/if_nlge.c
View File

@ -1035,7 +1035,7 @@ nlna_submit_rx_free_desc(struct nlna_softc *sc, uint32_t n_desc)
n = 0;
do {
msgrng_flags = msgrng_access_enable();
ret = message_send_retry(1, code, stid, &msg);
ret = message_send(1, code, stid, &msg);
msgrng_restore(msgrng_flags);
KASSERT(n++ < 100000, ("Too many credit fails\n"));
} while (ret != 0);
@ -1960,7 +1960,7 @@ send_fmn_msg_tx(struct nlge_softc *sc, struct msgrng_msg *msg,
do {
msgrng_flags = msgrng_access_enable();
ret = message_send_retry(n_entries, MSGRNG_CODE_MAC,
ret = message_send(n_entries, MSGRNG_CODE_MAC,
sc->tx_bucket_id, msg);
msgrng_restore(msgrng_flags);
KASSERT(i++ < 100000, ("Too many credit fails\n"));

4
sys/mips/rmi/dev/xlr/rge.c
View File

@ -731,7 +731,7 @@ xlr_mac_send_fr(struct driver_data *priv,
do {
msgrng_flags = msgrng_access_enable();
ret = message_send_retry(1, code, stid, &msg);
ret = message_send(1, code, stid, &msg);
msgrng_restore(msgrng_flags);
KASSERT(i++ < 100000, ("Too many credit fails\n"));
} while (ret != 0);
@ -1468,7 +1468,7 @@ mac_xmit(struct mbuf *m, struct rge_softc *sc,
else {
mflags = msgrng_access_enable();
if ((rv = message_send_retry(1, MSGRNG_CODE_MAC, stid, &msg)) != 0) {
if ((rv = message_send(1, MSGRNG_CODE_MAC, stid, &msg)) != 0) {
msg_snd_failed++;
msgrng_restore(mflags);
release_tx_desc(&msg, 0);

161
sys/mips/rmi/msgring.h
View File

@ -174,61 +174,58 @@
#define msgrng_read_status() read_c2_register32(MSGRNG_MSG_STATUS_REG, 0)
#define msgrng_read_config() read_c2_register32(MSGRNG_MSG_CONFIG_REG, 0)
#define msgrng_write_config(value) write_c2_register32(MSGRNG_MSG_CONFIG_REG, 0, value)
#define msgrng_write_config(v) write_c2_register32(MSGRNG_MSG_CONFIG_REG, 0, v)
#define msgrng_read_bucksize(bucket) read_c2_register32(MSGRNG_MSG_BUCKSIZE_REG, bucket)
#define msgrng_write_bucksize(bucket, value) write_c2_register32(MSGRNG_MSG_BUCKSIZE_REG, bucket, value)
#define msgrng_read_bucksize(b) read_c2_register32(MSGRNG_MSG_BUCKSIZE_REG, b)
#define msgrng_write_bucksize(b, v) write_c2_register32(MSGRNG_MSG_BUCKSIZE_REG, b, v)
#define msgrng_read_cc(reg, pri) read_c2_register32(reg, pri)
#define msgrng_write_cc(reg, value, pri) write_c2_register32(reg, pri, value)
#define msgrng_read_cc(r, s) read_c2_register32(r, s)
#define msgrng_write_cc(r, v, s) write_c2_register32(r, s, v)
#define msgrng_load_rx_msg0() read_c2_register64(MSGRNG_RX_BUF_REG, 0)
#define msgrng_load_rx_msg1() read_c2_register64(MSGRNG_RX_BUF_REG, 1)
#define msgrng_load_rx_msg2() read_c2_register64(MSGRNG_RX_BUF_REG, 2)
#define msgrng_load_rx_msg3() read_c2_register64(MSGRNG_RX_BUF_REG, 3)
#define msgrng_load_tx_msg0(value) write_c2_register64(MSGRNG_TX_BUF_REG, 0, value)
#define msgrng_load_tx_msg1(value) write_c2_register64(MSGRNG_TX_BUF_REG, 1, value)
#define msgrng_load_tx_msg2(value) write_c2_register64(MSGRNG_TX_BUF_REG, 2, value)
#define msgrng_load_tx_msg3(value) write_c2_register64(MSGRNG_TX_BUF_REG, 3, value)
#define msgrng_load_tx_msg0(v) write_c2_register64(MSGRNG_TX_BUF_REG, 0, v)
#define msgrng_load_tx_msg1(v) write_c2_register64(MSGRNG_TX_BUF_REG, 1, v)
#define msgrng_load_tx_msg2(v) write_c2_register64(MSGRNG_TX_BUF_REG, 2, v)
#define msgrng_load_tx_msg3(v) write_c2_register64(MSGRNG_TX_BUF_REG, 3, v)
static inline void
static __inline void
msgrng_send(unsigned int stid)
{
__asm__ volatile (
".set push\n"
".set noreorder\n"
"sync\n"
// "msgsnd %0\n"
"move $8, %0\n"
"c2 0x80001\n"
"c2 0x80001\n" /* msgsnd $8 */
".set pop\n"
:: "r" (stid): "$8"
);
}
static inline void
static __inline void
msgrng_receive(unsigned int pri)
{
__asm__ volatile (
".set push\n"
".set noreorder\n"
// "msgld %0\n"
"move $8, %0\n"
"c2 0x80002\n"
"c2 0x80002\n" /* msgld $8 */
".set pop\n"
:: "r" (pri): "$8"
);
}
static inline void
static __inline void
msgrng_wait(unsigned int mask)
{
__asm__ volatile (
".set push\n"
".set noreorder\n"
// "msgwait %0\n"
"move $8, %0\n"
"c2 0x80003\n"
"c2 0x80003\n" /* msgwait $8 */
".set pop\n"
:: "r" (mask): "$8"
);
@ -251,111 +248,77 @@ msgrng_restore(uint32_t sr)
}
struct msgrng_msg {
__uint64_t msg0;
__uint64_t msg1;
__uint64_t msg2;
__uint64_t msg3;
uint64_t msg0;
uint64_t msg1;
uint64_t msg2;
uint64_t msg3;
};
static inline void
message_send_block_fast(int size, unsigned int code, unsigned int stid,
unsigned long long msg0, unsigned long long msg1,
unsigned long long msg2, unsigned long long msg3)
{
__asm__ __volatile__(".set push\n"
".set noreorder\n"
".set mips64\n"
"dmtc2 %1, $0, 0\n"
"dmtc2 %2, $0, 1\n"
"dmtc2 %3, $0, 2\n"
"dmtc2 %4, $0, 3\n"
"move $8, %0\n"
"1: c2 0x80001\n"
"mfc2 $8, $2\n"
"andi $8, $8, 0x6\n"
"bnez $8, 1b\n"
"move $8, %0\n"
".set pop\n"
:
: "r"(((size - 1) << 16) | (code << 8) | stid), "r"(msg0), "r"(msg1), "r"(msg2), "r"(msg3)
: "$8"
);
}
#define message_receive_fast(bucket, size, code, stid, msg0, msg1, msg2, msg3) \
( { unsigned int _status=0, _tmp=0; \
msgrng_receive(bucket); \
while ( (_status=msgrng_read_status()) & 0x08) ; \
_tmp = _status & 0x30; \
if (__builtin_expect((!_tmp), 1)) { \
(size)=((_status & 0xc0)>>6)+1; \
(code)=(_status & 0xff00)>>8; \
(stid)=(_status & 0x7f0000)>>16; \
(msg0)=msgrng_load_rx_msg0(); \
(msg1)=msgrng_load_rx_msg1(); \
(msg2)=msgrng_load_rx_msg2(); \
(msg3)=msgrng_load_rx_msg3(); \
_tmp=0; \
} \
_tmp; \
} )
static __inline int
message_send(unsigned int size, unsigned int code,
unsigned int stid, struct msgrng_msg *msg)
{
unsigned int dest = 0;
unsigned long long status = 0;
#ifdef INVARIANTS
int i = 0;
#endif
/*
* Make sure that all the writes pending at the cpu are flushed.
* Any writes pending on CPU will not be see by devices. L1/L2
* caches are coherent with IO, so no cache flush needed.
*/
__asm __volatile ("sync");
/* Load TX message buffers */
msgrng_load_tx_msg0(msg->msg0);
msgrng_load_tx_msg1(msg->msg1);
msgrng_load_tx_msg2(msg->msg2);
msgrng_load_tx_msg3(msg->msg3);
dest = ((size - 1) << 16) | (code << 8) | (stid);
msgrng_send(dest);
/* Wait for the thread pending to clear */
do {
status = msgrng_read_status();
KASSERT(i++ < 10000, ("Too many fails\n"));
} while ((status & 0x2) != 0);
/* If there is a credit failure, return error */
return status & 0x06;
}
static __inline int
message_send_retry(unsigned int size, unsigned int code,
unsigned int stid, struct msgrng_msg *msg)
{
int i, ret;
dest = ((size - 1) << 16) | (code << 8) | stid;
/*
* we are in with interrupt disabled, retrying too many
* times is not good
* Retry a few times on credit fail, this should be a
* transient condition, unless there is a configuration
* failure, or the receiver is stuck.
*/
for (i = 0; i < 16; i++) {
ret = message_send(size, code, stid, msg);
if (ret == 0)
for (i = 0; i < 8; i++) {
msgrng_send(dest);
status = msgrng_read_status();
KASSERT((status & 0x2) == 0, ("Send pending fail!"));
if ((status & 0x4) == 0)
return (0);
}
return (1);
/* If there is a credit failure, return error */
return (status & 0x06);
}
static __inline__ int
message_receive(int pri, int *size, int *code, int *src_id,
static __inline int
message_receive(int bucket, int *size, int *code, int *stid,
struct msgrng_msg *msg)
{
int res;
uint32_t status = 0, tmp = 0;
res = message_receive_fast(pri, *size, *code, *src_id,
msg->msg0, msg->msg1, msg->msg2, msg->msg3);
return res;
msgrng_receive(bucket);
/* wait for load pending to clear */
do {
status = msgrng_read_status();
} while ((status & 0x08) != 0);
/* receive error bits */
tmp = status & 0x30;
if (tmp != 0)
return (tmp);
*size = ((status & 0xc0) >> 6) + 1;
*code = (status & 0xff00) >> 8;
*stid = (status & 0x7f0000) >> 16;
msg->msg0 = msgrng_load_rx_msg0();
msg->msg1 = msgrng_load_rx_msg1();
msg->msg2 = msgrng_load_rx_msg2();
msg->msg3 = msgrng_load_rx_msg3();
return (0);
}
#define MSGRNG_STN_RX_QSIZE 256