Project

General

Profile

Bug #12999

MSR_AMD_DE_CFG is twice defined

Added by Patrick Mooney 10 days ago. Updated 9 days ago.

Status:
Closed
Priority:
Normal
Assignee:
-
Category:
kernel
Start date:
Due date:
% Done:

100%

Estimated time:
Difficulty:
Medium
Tags:
Gerrit CR:

Description

While searching through our sources for references to MSR_AMD_DE_CFG (0xc0011029), I found that we've accidentally defined it twice, under two different names:

uts/intel/sys/controlregs.h:#define    MSR_AMD_DE_CFG  0xc0011029
uts/intel/sys/x86_archext.h:#define    MSR_AMD_DECODE_CONFIG                   0xc0011029

It would be nice to consolidate them. (Probably into the controlregs.h file?)

History

#1

Updated by Patrick Mooney 10 days ago

  • Description updated (diff)
#2

Updated by Electric Monk 10 days ago

  • Gerrit CR set to 823
#3

Updated by Patrick Mooney 10 days ago

I tested this via wsdiff(1) and observed that beyond the normal DOF noise, there were no reported differences between the build from vanilla illumos-gate, and one with the patch applied.

The differing git SHA of the "release" was in the diff for the kernel, indicating that wsdiff was working:

platform/i86pc/kernel/amd64/unix
NOTE: ELF .data difference detected.

10334,10335c10334,10335
< 0706100   g   8   4   b   5   2   4   4   0   b   b  \0  \0  \0  \0  \0
<         62343867 34343235 00626230 00000000
---
> 0706100   g   2   2   c   f   9   1   5   9   b   4  \0  \0  \0  \0  \0
>         63323267 35313966 00346239 00000000

platform/i86xpv/kernel/amd64/unix
NOTE: ELF .data difference detected.

8592,8593c8592,8593
< 1075040   r   -   0   -   g   8   4   b   5   2   4   4   0   b   b  \0
<         2d302d72 62343867 34343235 00626230
---
> 1075040   r   -   0   -   g   2   2   c   f   9   1   5   9   b   4  \0
>         2d302d72 63323267 35313966 00346239

#4

Updated by Electric Monk 9 days ago

  • Status changed from New to Closed
  • % Done changed from 0 to 100

git commit da2b26b186539432c4bee88ce2f08f41574e009f

commit  da2b26b186539432c4bee88ce2f08f41574e009f
Author: Patrick Mooney <pmooney@pfmooney.com>
Date:   2020-07-30T18:25:58.000Z

    12999 MSR_AMD_DE_CFG is twice defined
    Reviewed by: Robert Mustacchi <rm@fingolfin.org>
    Approved by: Dan McDonald <danmcd@joyent.com>

Also available in: Atom PDF