Browse Source

[linda] Purge references to 8051

tags/v0.9.6
Michael Brown 15 years ago
parent
commit
8a80e7ace1
2 changed files with 12 additions and 12 deletions
  1. 9
    9
      src/drivers/infiniband/linda.c
  2. 3
    3
      src/drivers/infiniband/linda.h

+ 9
- 9
src/drivers/infiniband/linda.c View File

@@ -2096,12 +2096,12 @@ static struct linda_serdes_param linda_serdes_defaults3[] = {
2096 2096
 };
2097 2097
 
2098 2098
 /**
2099
- * Program the 8051 microcontroller RAM
2099
+ * Program the microcontroller RAM
2100 2100
  *
2101 2101
  * @v linda		Linda device
2102 2102
  * @ret rc		Return status code
2103 2103
  */
2104
-static int linda_program_8051 ( struct linda *linda ) {
2104
+static int linda_program_uc_ram ( struct linda *linda ) {
2105 2105
 	int rc;
2106 2106
 
2107 2107
 	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 ) {
2115 2115
 }
2116 2116
 
2117 2117
 /**
2118
- * Verify the 8051 microcontroller RAM
2118
+ * Verify the microcontroller RAM
2119 2119
  *
2120 2120
  * @v linda		Linda device
2121 2121
  * @ret rc		Return status code
2122 2122
  */
2123
-static int linda_verify_8051 ( struct linda *linda ) {
2123
+static int linda_verify_uc_ram ( struct linda *linda ) {
2124 2124
 	uint8_t verify[LINDA_EPB_UC_CHUNK_SIZE];
2125 2125
 	unsigned int offset;
2126 2126
 	int rc;
@@ -2150,7 +2150,7 @@ static int linda_verify_8051 ( struct linda *linda ) {
2150 2150
 }
2151 2151
 
2152 2152
 /**
2153
- * Use the 8051 microcontroller to trim the IB link
2153
+ * Use the microcontroller to trim the IB link
2154 2154
  *
2155 2155
  * @v linda		Linda device
2156 2156
  * @ret rc		Return status code
@@ -2161,7 +2161,7 @@ static int linda_trim_ib ( struct linda *linda ) {
2161 2161
 	unsigned int i;
2162 2162
 	int rc;
2163 2163
 
2164
-	/* Bring the 8051 out of reset */
2164
+	/* Bring the microcontroller out of reset */
2165 2165
 	linda_readq ( linda, &ctrl, QIB_7220_IBSerDesCtrl_offset );
2166 2166
 	BIT_SET ( &ctrl, ResetIB_uC_Core, 0 );
2167 2167
 	linda_writeq ( linda, &ctrl, QIB_7220_IBSerDesCtrl_offset );
@@ -2179,7 +2179,7 @@ static int linda_trim_ib ( struct linda *linda ) {
2179 2179
 	DBGC ( linda, "Linda %p timed out waiting for trim done\n", linda );
2180 2180
 	rc = -ETIMEDOUT;
2181 2181
  out_reset:
2182
-	/* Put the 8051 back into reset */
2182
+	/* Put the microcontroller back into reset */
2183 2183
 	BIT_SET ( &ctrl, ResetIB_uC_Core, 1 );
2184 2184
 	linda_writeq ( linda, &ctrl, QIB_7220_IBSerDesCtrl_offset );
2185 2185
 
@@ -2240,12 +2240,12 @@ static int linda_init_ib_serdes ( struct linda *linda ) {
2240 2240
 		return rc;
2241 2241
 
2242 2242
 	/* Program the microcontroller RAM */
2243
-	if ( ( rc = linda_program_8051 ( linda ) ) != 0 )
2243
+	if ( ( rc = linda_program_uc_ram ( linda ) ) != 0 )
2244 2244
 		return rc;
2245 2245
 
2246 2246
 	/* Verify the microcontroller RAM contents */
2247 2247
 	if ( DBGLVL_LOG ) {
2248
-		if ( ( rc = linda_verify_8051 ( linda ) ) != 0 )
2248
+		if ( ( rc = linda_verify_uc_ram ( linda ) ) != 0 )
2249 2249
 			return rc;
2250 2250
 	}
2251 2251
 

+ 3
- 3
src/drivers/infiniband/linda.h View File

@@ -201,7 +201,7 @@ enum linda_eager_buffer_size {
201 201
 
202 202
 /** Linda external parallel bus chip selects */
203 203
 #define LINDA_EPB_CS_SERDES 1
204
-#define LINDA_EPB_CS_8051 2
204
+#define LINDA_EPB_CS_UC 2
205 205
 
206 206
 /** Linda external parallel bus read/write operations */
207 207
 #define LINDA_EPB_WRITE 0
@@ -224,10 +224,10 @@ enum linda_eager_buffer_size {
224 224
 #define LINDA_EPB_LOC_ADDRESS( _loc )	( (_loc) & 0xffff )
225 225
 #define LINDA_EPB_LOC_CS( _loc )	( (_loc) >> 16 )
226 226
 
227
-/** Linda external parallel bus 8051 microcontroller register addresses */
227
+/** Linda external parallel bus microcontroller register addresses */
228 228
 #define LINDA_EPB_UC_CHANNEL 6
229 229
 #define LINDA_EPB_UC_LOC( _reg ) \
230
-	LINDA_EPB_LOC ( LINDA_EPB_CS_8051, LINDA_EPB_UC_CHANNEL, 0, (_reg) )
230
+	LINDA_EPB_LOC ( LINDA_EPB_CS_UC, LINDA_EPB_UC_CHANNEL, 0, (_reg) )
231 231
 #define LINDA_EPB_UC_CTL	LINDA_EPB_UC_LOC ( 0 )
232 232
 #define LINDA_EPB_UC_CTL_WRITE	1
233 233
 #define LINDA_EPB_UC_CTL_READ	2

Loading…
Cancel
Save