Update for new Family 17 cores

jlgreathouse · Aug 6, 2019 · ce475e6 · ce475e6
1 parent a567525
commit ce475e6
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -178,6 +178,8 @@ In addition, it has been tested on the following processors, though its logic sh
     - Family 17h Model 01h (CPU formerly code-named "Zen")
 * AMD Ryzen 5 2400GE
     - Family 17h Model 11h (CPU formerly code-named "Zen")
+* AMD Ryzen 7 3700 X
+    - Family 17h Model 71h (CPU formerly code-named "Zen 2")
 
 Using the AMD Research IBS Toolkit
 --------------------------------------------------------------------------------
@@ -279,5 +281,5 @@ For more information about micro-ops in AMD cores, please refer to AMD's softwar
 
 Trademark Attribution
 --------------------------------------------------------------------------------
-&copy; 2017-2018 Advanced Micro Devices, Inc. All rights reserved. AMD, the AMD Arrow logo, AMD Phenom, Opteron, Ryzen, EPYC, and combinations thereof are trademarks of Advanced Micro Devices, Inc. in the United States and/or other jurisdictions. Linux is a registered trademark of Linus Torvalds. Other names are for informational purposes only and may be trademarks of their
+&copy; 2017-2019 Advanced Micro Devices, Inc. All rights reserved. AMD, the AMD Arrow logo, AMD Phenom, Opteron, Ryzen, EPYC, and combinations thereof are trademarks of Advanced Micro Devices, Inc. in the United States and/or other jurisdictions. Linux is a registered trademark of Linus Torvalds. Other names are for informational purposes only and may be trademarks of their
 respective owners.
diff --git a/README.txt b/README.txt
@@ -216,6 +216,8 @@ that support IBS:
         Family 17h Model 01h (CPU formerly code-named "Zen")
   * AMD Ryzen 5 2400GE
         Family 17h Model 11h (CPU formerly code-named "Zen")
+  * AMD Ryzen 7 3700X
+        Family 17h Model 71h (CPU formerly code-named "Zen 2")
 
 Using the AMD Research IBS Toolkit
 --------------------------------------------------------------------------------
@@ -441,7 +443,7 @@ samples macro-ops at dispatch time.
 
 Trademark Attribution
 --------------------------------------------------------------------------------
-(c) 2017-2018 Advanced Micro Devices, Inc. All rights reserved.
+(c) 2017-2019 Advanced Micro Devices, Inc. All rights reserved.
 AMD, the AMD Arrow logo, AMD Phenom, Opteron, Ryzen, EPYC, and combinations
 thereof are trademarks of Advanced Micro Devices, Inc. in the United States
 and/or other jurisdictions. Linux is a registered trademark of Linus Torvalds.

diff --git a/driver/ibs-core.c b/driver/ibs-core.c
@@ -1,7 +1,7 @@
 /*
  * Linux kernel driver for the AMD Research IBS Toolkit
  *
- * Copyright (C) 2015-2018 Advanced Micro Devices, Inc.
+ * Copyright (C) 2015-2019 Advanced Micro Devices, Inc.
  *
  * This driver is available under the Linux kernel's version of the GPLv2.
  * See driver/LICENSE for more licensing details.
@@ -88,8 +88,8 @@ static int workaround_fam10h_err_420 = 0;
 /* Family 15h Models 00h-1Fh Erratum 718: the processor only sets but never
  * clears MSR C001_1037[3], [6], and [19]. */
 static int workaround_fam15h_err_718 = 0;
-/* Family 17h Model 07h processors do not necessarily enable IBS by default.
- * They require setting some bits in each core to run IBS.
+/* First-generation Family 17h processors do not necessarily enable IBS by
+ * default. They require setting some bits in each core to run IBS.
  * This can be done with a BIOS setting on many boards, but we run the same
  * settings in this driver to increase compatibility */
 static int workaround_fam17h_zn = 0;

diff --git a/tools/ibs_decoder/ibs_decoder.c b/tools/ibs_decoder/ibs_decoder.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2017 Advanced Micro Devices, Inc.
+ * Copyright (C) 2015-2019 Advanced Micro Devices, Inc.
  *
  * This file is distributed under the BSD license described in tools/LICENSE
  *
@@ -643,6 +643,12 @@ static void output_fetch_entry(FILE *outf, ibs_fetch_t fetch,
                 fprintf(outf, "1 GB,");
                 break;
             case 3:
+                if (family == 0x17)
+                {
+                    fprintf(outf, "16 KB,");
+                    break;
+                }
+                /* Fallthrough */
             default:
                 fprintf(outf, "Reserved-%" PRIu8 ",",
                         fetch.fetch_ctl.reg.ibs_l1_tlb_pg_sz);
@@ -750,5 +756,5 @@ int main(int argc, char *argv[]) {
         do_fetch_work();
 
     printf("Decoding complete. Exiting application.\n\n");
-	exit(EXIT_SUCCESS);
+    exit(EXIT_SUCCESS);
 }