Skip to content

[Deepin-Kernel-SIG] [linux 6.6.y] [Hygon] EDAC/amd64: format hygon_get_umc_base #1632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
opsiff merged 1 commit into from
Apr 16, 2026
Merged

[Deepin-Kernel-SIG] [linux 6.6.y] [Hygon] EDAC/amd64: format hygon_get_umc_base #1632

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions drivers/edac/amd64_edac.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,20 +114,20 @@ static u32 get_umc_base_f18h_m18h(u8 channel)

static u32 hygon_get_umc_base(struct amd64_pvt *pvt, u8 channel)
{
u32 umc_base;

if (hygon_f18h_m4h())
umc_base = get_umc_base_f18h_m4h(pvt->mc_node_id, channel);
/*
* For Hygon family 18h model 0x18h-0x1fh processors, the UMC base
* are identical.
*/
else if (hygon_f18h_m10h() && boot_cpu_data.x86_model >= 0x18)
umc_base = get_umc_base_f18h_m18h(channel);
else
umc_base = get_umc_base(channel);

return umc_base;
u32 umc_base;

if (hygon_f18h_m4h())
umc_base = get_umc_base_f18h_m4h(pvt->mc_node_id, channel);
/*
* For Hygon family 18h model 0x18h-0x1fh processors, the UMC base
* are identical.
*/
else if (hygon_f18h_m10h() && boot_cpu_data.x86_model >= 0x18)
umc_base = get_umc_base_f18h_m18h(channel);
else
umc_base = get_umc_base(channel);

return umc_base;
}

/*
Expand Down
Loading