UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

EDAC/amd64: Add AMD family 17h model 60h PCI IDs - conflict resolve 

commit b6bea24d41 upstream.

Conflict resolve when introduce commit aa9873f9fa1e ("EDAC/amd64:
Add AMD family 17h model 60h PCI IDs").

Signed-off-by: Jinliang Zheng <alexjlzheng@tencent.com>
Reviewed-by: caelli <caelli@tencent.com>
Signed-off-by: Jianping Liu <frankjpliu@tencent.com>
This commit is contained in:
Jinliang Zheng 2024-04-26 13:00:45 +08:00 committed by Jianping Liu
parent 42724daea4
commit 8fbb888f6d
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/edac/amd64_edac.c
View File

@ -2410,6 +2410,7 @@ static struct amd64_family_type family_types[] = {
.ctl_name = "F17h_M60h",
.f0_id = PCI_DEVICE_ID_AMD_17H_M60H_DF_F0,
.f6_id = PCI_DEVICE_ID_AMD_17H_M60H_DF_F6,
.max_mcs = 2,
.ops = {
.early_channel_count = f17_early_channel_count,
.dbam_to_cs = f17_addr_mask_to_cs_size,