summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Brown2008-11-18 00:55:43 +0100
committerMichael Brown2008-11-18 00:55:43 +0100
commit8a80e7ace1b64c2a060a4b02f656259e0469f47a (patch)
tree664657bc320b7163441514707c531f00c0f053ba
parent[infiniband] Respect hop pointer when building directed route SMP return path (diff)
downloadipxe-8a80e7ace1b64c2a060a4b02f656259e0469f47a.tar.gz
ipxe-8a80e7ace1b64c2a060a4b02f656259e0469f47a.tar.xz
ipxe-8a80e7ace1b64c2a060a4b02f656259e0469f47a.zip
[linda] Purge references to 8051
-rw-r--r--src/drivers/infiniband/linda.c18
-rw-r--r--src/drivers/infiniband/linda.h6
2 files changed, 12 insertions, 12 deletions
diff --git a/src/drivers/infiniband/linda.c b/src/drivers/infiniband/linda.c
index 6189851a..170eec47 100644
--- a/src/drivers/infiniband/linda.c
+++ b/src/drivers/infiniband/linda.c
@@ -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,
@@ -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;
@@ -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
@@ -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 );
@@ -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 );
@@ -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;
}
diff --git a/src/drivers/infiniband/linda.h b/src/drivers/infiniband/linda.h
index fa082336..4a91e3ed 100644
--- a/src/drivers/infiniband/linda.h
+++ b/src/drivers/infiniband/linda.h
@@ -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
@@ -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