Skip to content

Commit

Permalink
[linda] Purge references to 8051
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Brown committed Nov 17, 2008
1 parent 1b3edd9 commit 8a80e7a
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
18 changes: 9 additions & 9 deletions src/drivers/infiniband/linda.c
Expand Up @@ -2096,12 +2096,12 @@ static struct linda_serdes_param linda_serdes_defaults3[] = {
};

/**
* Program the 8051 microcontroller RAM
* Program the microcontroller RAM
*
* @v linda Linda device
* @ret rc Return status code
*/
static int linda_program_8051 ( struct linda *linda ) {
static int linda_program_uc_ram ( struct linda *linda ) {
int rc;

if ( ( rc = linda_ib_epb_ram_xfer ( linda, 0, linda_ib_fw, NULL,
Expand All @@ -2115,12 +2115,12 @@ static int linda_program_8051 ( struct linda *linda ) {
}

/**
* Verify the 8051 microcontroller RAM
* Verify the microcontroller RAM
*
* @v linda Linda device
* @ret rc Return status code
*/
static int linda_verify_8051 ( struct linda *linda ) {
static int linda_verify_uc_ram ( struct linda *linda ) {
uint8_t verify[LINDA_EPB_UC_CHUNK_SIZE];
unsigned int offset;
int rc;
Expand Down Expand Up @@ -2150,7 +2150,7 @@ static int linda_verify_8051 ( struct linda *linda ) {
}

/**
* Use the 8051 microcontroller to trim the IB link
* Use the microcontroller to trim the IB link
*
* @v linda Linda device
* @ret rc Return status code
Expand All @@ -2161,7 +2161,7 @@ static int linda_trim_ib ( struct linda *linda ) {
unsigned int i;
int rc;

/* Bring the 8051 out of reset */
/* Bring the microcontroller out of reset */
linda_readq ( linda, &ctrl, QIB_7220_IBSerDesCtrl_offset );
BIT_SET ( &ctrl, ResetIB_uC_Core, 0 );
linda_writeq ( linda, &ctrl, QIB_7220_IBSerDesCtrl_offset );
Expand All @@ -2179,7 +2179,7 @@ static int linda_trim_ib ( struct linda *linda ) {
DBGC ( linda, "Linda %p timed out waiting for trim done\n", linda );
rc = -ETIMEDOUT;
out_reset:
/* Put the 8051 back into reset */
/* Put the microcontroller back into reset */
BIT_SET ( &ctrl, ResetIB_uC_Core, 1 );
linda_writeq ( linda, &ctrl, QIB_7220_IBSerDesCtrl_offset );

Expand Down Expand Up @@ -2240,12 +2240,12 @@ static int linda_init_ib_serdes ( struct linda *linda ) {
return rc;

/* Program the microcontroller RAM */
if ( ( rc = linda_program_8051 ( linda ) ) != 0 )
if ( ( rc = linda_program_uc_ram ( linda ) ) != 0 )
return rc;

/* Verify the microcontroller RAM contents */
if ( DBGLVL_LOG ) {
if ( ( rc = linda_verify_8051 ( linda ) ) != 0 )
if ( ( rc = linda_verify_uc_ram ( linda ) ) != 0 )
return rc;
}

Expand Down
6 changes: 3 additions & 3 deletions src/drivers/infiniband/linda.h
Expand Up @@ -201,7 +201,7 @@ enum linda_eager_buffer_size {

/** Linda external parallel bus chip selects */
#define LINDA_EPB_CS_SERDES 1
#define LINDA_EPB_CS_8051 2
#define LINDA_EPB_CS_UC 2

/** Linda external parallel bus read/write operations */
#define LINDA_EPB_WRITE 0
Expand All @@ -224,10 +224,10 @@ enum linda_eager_buffer_size {
#define LINDA_EPB_LOC_ADDRESS( _loc ) ( (_loc) & 0xffff )
#define LINDA_EPB_LOC_CS( _loc ) ( (_loc) >> 16 )

/** Linda external parallel bus 8051 microcontroller register addresses */
/** Linda external parallel bus microcontroller register addresses */
#define LINDA_EPB_UC_CHANNEL 6
#define LINDA_EPB_UC_LOC( _reg ) \
LINDA_EPB_LOC ( LINDA_EPB_CS_8051, LINDA_EPB_UC_CHANNEL, 0, (_reg) )
LINDA_EPB_LOC ( LINDA_EPB_CS_UC, LINDA_EPB_UC_CHANNEL, 0, (_reg) )
#define LINDA_EPB_UC_CTL LINDA_EPB_UC_LOC ( 0 )
#define LINDA_EPB_UC_CTL_WRITE 1
#define LINDA_EPB_UC_CTL_READ 2
Expand Down

0 comments on commit 8a80e7a

Please sign in to comment.