Unverified Commit 09176f76 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15228 EDAC/amd64: Add support family types for hygon family 4h~5h and 7h. 

Merge Pull Request from: @hygon_fanwh 
 
In commit https://gitee.com/openeuler/kernel/commit/f53aa5cf1c234b6ac03ad99acf34f34906bb9ce1, it revert the support for hygon family 4h~5h and 7h committed by hygon, this will cause the print info to be displayed incorrectly after edac driver loaded.

Reference：
https://gitee.com/openeuler/kernel/commit/f2f10bd1625a612f3c36628c4042b0be7de84674
https://gitee.com/openeuler/kernel/commit/bec622ac48bd33e309eeee99c8a237b771cd1b95
https://gitee.com/openeuler/kernel/commit/ff48959f9a3065ee87cac7a669b566c6e116dfe7
https://gitee.com/openeuler/kernel/commit/f53aa5cf1c234b6ac03ad99acf34f34906bb9ce1 
 
Link:https://gitee.com/openeuler/kernel/pulls/15228

 

Reviewed-by: default avatarHan Liyang <hanliyang@hygon.cn>
Reviewed-by: default avatarLi Nan <linan122@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parents 25fd923e ba6fd3b3

drivers/edac/amd64_edac.c

+11 −0
Original line number Diff line number Diff line
@@ -3574,9 +3574,20 @@ static int per_family_init(struct amd64_pvt *pvt) 


	case 0x18:

		switch (pvt->model) {

		case 0x04:

			pvt->ctl_name			= "F18h_M04h";

			pvt->max_mcs			= 3;

			break;

		case 0x05:

			pvt->ctl_name			= "F18h_M05h";

			pvt->max_mcs			= 1;

			break;

		case 0x06:

			pvt->ctl_name			= "F18h_M06h";

			break;

		case 0x07:

			pvt->ctl_name			= "F18h_M07h";

			break;

		case 0x10:

			pvt->ctl_name			= "F18h_M10h";

			break;