aboutsummaryrefslogtreecommitdiffstats
path: root/patches/fuel-nailgun-agent/0003-AArch64-Add-CPU-details-detection.patch
blob: d1691d0e31c2f8074b7126bf5e6657a010c8759f (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
: Copyright (c) 2017 Enea AB, Cavium and others.
:
: All rights reserved. This program and the accompanying materials
: are made available under the terms of the Apache License, Version 2.0
: which accompanies this distribution, and is available at
: http://www.apache.org/licenses/LICENSE-2.0
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Fri, 19 May 2017 20:37:13 +0200
Subject: [PATCH] AArch64: Add CPU details detection

[ Alexandru Avadanii ]
Based on Stan's previous patch for ohai, extend fuel-nailgun-agent
to properly support AArch64 CPUs.

[ Stanislaw Kardach ]
There is currently little human readable detail in /proc/cpuinfo on
arm64 so this patch tries to enchance this information by parsing the
DMI data (using `dmidecode`) and fail gracefully to empty strings
if no information could not be read from there. By no means this
parsing is to be taken as a standardised way of discovering an
arm64 CPU, it is just a suggestion.

Signed-off-by: Stanislaw Kardach <stanislaw.kardach@cavium.com>
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
 .../0003-AArch64-Add-CPU-details-detection.patch   | 130 +++++++++++++++++++++
 debian/patches/series                              |   1 +
 2 files changed, 131 insertions(+)
 create mode 100644 debian/patches/0003-AArch64-Add-CPU-details-detection.patch

diff --git a/debian/patches/0003-AArch64-Add-CPU-details-detection.patch b/debian/patches/0003-AArch64-Add-CPU-details-detection.patch
new file mode 100644
index 0000000..b9f41f7
--- /dev/null
+++ b/debian/patches/0003-AArch64-Add-CPU-details-detection.patch
@@ -0,0 +1,130 @@
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Sun, 15 Jan 2017 08:09:10 +0100
+Subject: [PATCH 2/4] AArch64: Add CPU details detection
+
+[ Alexandru Avadanii ]
+Based on Stan's previous patch for ohai, extend fuel-nailgun-agent
+to properly support AArch64 CPUs.
+
+[ Stanislaw Kardach ]
+There is currently little human readable detail in /proc/cpuinfo on
+arm64 so this patch tries to enchance this information by parsing the
+DMI data (using `dmidecode`) and fail gracefully to empty strings
+if no information could not be read from there. By no means this
+parsing is to be taken as a standardised way of discovering an
+arm64 CPU, it is just a suggestion.
+
+Signed-off-by: Stanislaw Kardach <stanislaw.kardach@cavium.com>
+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+---
+ agent | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 90 insertions(+)
+
+diff --git a/agent b/agent
+index 2c041ec..c3f5d28 100755
+--- a/agent
++++ b/agent
+@@ -288,6 +288,15 @@ class NodeAgent
+   end
+
+   def _get_detailed_cpuinfo
++    case `uname -m`
++      when /aarch64.*/
++        _get_detailed_cpuinfo_for_arm64
++      else # default to x86
++        _get_detailed_cpuinfo_for_x86
++    end
++  end
++
++  def _get_detailed_cpuinfo_for_x86
+     real = {}
+     info = {}
+     info[:total] = 0
+@@ -319,6 +328,87 @@ class NodeAgent
+     info
+   end
+
++  def _get_detailed_cpuinfo_for_arm64
++    cpu_implementers = {
++      "0x41" => "ARM",
++      "0x53" => "Samsung",
++      "0x51" => "Qualcom",
++      "0x43" => "Cavium",
++      "0x50" => "APM"
++    }
++    core_models = {
++      "0xd04" => "cortex-a35",
++      "0xd03" => "cortex-a53",
++      "0xd07" => "cortex-a57",
++      "0xd08" => "cortex-a72",
++      "0x001" => "exynos-m1",
++      "0x800" => "qdf24xx",
++      "0x0a1" => "thunderx",
++      "0x000" => "xgene1",
++      "0xd07.0xd03" => "cortex-a57.cortex-a53",
++      "0xd08.0xd03" => "cortex-a72.cortex-a53"
++    }
++    cpuinfo = {}
++    real_cpus = {}
++    cpu_number = -1
++    current_cpu = nil
++    `dmidecode -t 4 -q`.each_line do |line|
++      case line
++        when /Processor Information/
++          cpu_number +=1
++          real_cpus[cpu_number] = {}
++        when /\s*Manufacturer:\s(.+)/
++          real_cpus[cpu_number][:vendor_id] = $1
++        when /\s*Family:\s(.+)/
++          real_cpus[cpu_number][:family] = $1
++        when /\s*Max Speed:\s(.+)\s*MHz/
++          real_cpus[cpu_number][:mhz] = $1.strip
++        when /\s*Core Enabled:\s(.+)/
++          real_cpus[cpu_number][:cores] = $1
++      end
++    end
++
++    cpu_number = 0
++    File.open("/proc/cpuinfo").each do |line|
++      case line
++      when /processor\s+:\s(.+)/
++        cpuinfo[$1] = {}
++        current_cpu = $1
++        cpu_number += 1
++        phys_id = File.read(
++          "/sys/devices/system/cpu/cpu%d/topology/physical_package_id" %
++            $1).strip
++        i = phys_id.to_i
++        cpuinfo[$1][:core_id] =
++          File.read("/sys/devices/system/cpu/cpu%d/topology/core_id" %
++            $1).strip rescue ""
++        cpuinfo[$1][:physical_id] = phys_id if not phys_id.empty?
++        if real_cpus[i].nil?
++          i = 0
++        end
++        if not real_cpus[i].nil?
++          cpuinfo[$1][:family] = real_cpus[i][:family] rescue ""
++          cpuinfo[$1][:cores] = real_cpus[i][:cores] rescue ""
++          cpuinfo[$1][:mhz] = real_cpus[i][:mhz] rescue ""
++        end
++      when /CPU implementer\s+:\s(.+)/
++        cpuinfo[current_cpu][:vendor_id] = cpu_implementers[$1]
++        cpuinfo[current_cpu][:vendor_id] ||= real_cpus[cpuinfo[current_cpu][:physical_id].to_i][:vendor_id] rescue nil
++        cpuinfo[current_cpu][:vendor_id] ||= real_cpus[0][:vendor_id] rescue nil
++        cpuinfo[current_cpu][:vendor_id] ||= $1
++      when /CPU part\s+:\s(.+)/
++        cpuinfo[current_cpu][:model] = $1
++        cpuinfo[current_cpu][:model_name] = core_models[$1]
++        cpuinfo[current_cpu][:model_name] ||= ""
++      when /Features\s+:\s(.+)/
++        cpuinfo[current_cpu][:flags] = $1.split(' ')
++      end
++    end
++    cpuinfo[:total] = cpu_number
++    cpuinfo[:real] = real_cpus.keys.length
++    cpuinfo
++  end
++
+   def _get_blkdev_info
+     info = {}
+     if File.directory?('/sys/block/')
diff --git a/debian/patches/series b/debian/patches/series
index 3980c60..fa57b98 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-ohai-Support-reading-L1-info-from-ethtool.patch
 0002-Temporary-SR-IOV-Fix-VNICs-broken-filter.patch
+0003-AArch64-Add-CPU-details-detection.patch