forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d 
 kernel/drivers/edac/i5400_edac.c
....@@ -8,7 +8,7 @@
88  *	 Ben Woodard <woodard@redhat.com>
99  *	 Mauro Carvalho Chehab
1010  *
11
- * Red Hat Inc. http://www.redhat.com
11
+ * Red Hat Inc. https://www.redhat.com
1212  *
1313  * Forked and adapted from the i5000_edac driver which was
1414  * written by Douglas Thompson Linux Networx <norsk5@xmission.com>
....@@ -548,8 +548,8 @@
548548 	ras = nrec_ras(info);
549549 	cas = nrec_cas(info);
550550 
551
-	edac_dbg(0, "\t\tDIMM= %d  Channels= %d,%d  (Branch= %d DRAM Bank= %d Buffer ID = %d rdwr= %s ras= %d cas= %d)\n",
552
-		 rank, channel, channel + 1, branch >> 1, bank,
551
+	edac_dbg(0, "\t\t%s DIMM= %d  Channels= %d,%d  (Branch= %d DRAM Bank= %d Buffer ID = %d rdwr= %s ras= %d cas= %d)\n",
552
+		 type, rank, channel, channel + 1, branch >> 1, bank,
553553 		 buf_id, rdwr_str(rdwr), ras, cas);
554554 
555555 	/* Only 1 bit will be on */
....@@ -1054,8 +1054,6 @@
10541054 	u32 actual_tolm;
10551055 	u16 limit;
10561056 	int slot_row;
1057
-	int maxch;
1058
-	int maxdimmperch;
10591057 	int way0, way1;
10601058 
10611059 	pvt = mci->pvt_info;
....@@ -1064,9 +1062,6 @@
10641062 			&pvt->u.ambase_bottom);
10651063 	pci_read_config_dword(pvt->system_address, AMBASE + sizeof(u32),
10661064 			&pvt->u.ambase_top);
1067
-
1068
-	maxdimmperch = pvt->maxdimmperch;
1069
-	maxch = pvt->maxch;
10701065 
10711066 	edac_dbg(2, "AMBASE= 0x%lx  MAXCH= %d  MAX-DIMM-Per-CH= %d\n",
10721067 		 (long unsigned int)pvt->ambase, pvt->maxch, pvt->maxdimmperch);
....@@ -1170,16 +1165,12 @@
11701165 {
11711166 	struct i5400_pvt *pvt;
11721167 	struct dimm_info *dimm;
1173
-	int ndimms, channel_count;
1174
-	int max_dimms;
1168
+	int ndimms;
11751169 	int mtr;
11761170 	int size_mb;
11771171 	int  channel, slot;
11781172 
11791173 	pvt = mci->pvt_info;
1180
-
1181
-	channel_count = pvt->maxch;
1182
-	max_dimms = pvt->maxdimmperch;
11831174 
11841175 	ndimms = 0;
11851176 
....@@ -1196,8 +1187,7 @@
11961187 			if (!MTR_DIMMS_PRESENT(mtr))
11971188 				continue;
11981189 
1199
-			dimm = EDAC_DIMM_PTR(mci->layers, mci->dimms, mci->n_layers,
1200
-				       channel / 2, channel % 2, slot);
1190
+			dimm = edac_get_dimm(mci, channel / 2, channel % 2, slot);
12011191 
12021192 			size_mb =  pvt->dimm_info[slot][channel].megabytes;
12031193 
....@@ -1470,7 +1460,7 @@
14701460 MODULE_LICENSE("GPL");
14711461 MODULE_AUTHOR("Ben Woodard <woodard@redhat.com>");
14721462 MODULE_AUTHOR("Mauro Carvalho Chehab");
1473
-MODULE_AUTHOR("Red Hat Inc. (http://www.redhat.com)");
1463
+MODULE_AUTHOR("Red Hat Inc. (https://www.redhat.com)");
14741464 MODULE_DESCRIPTION("MC Driver for Intel I5400 memory controllers - "
14751465 		   I5400_REVISION);
14761466