[PATCH 3/4] arm: Add the cpufreq device model

2020-02-12 Thread fangying1 
From: Ying Fang 

On ARM64 platform, CPU frequency is retrieved by ACPI CPPC,
so here we create the virtual cpufreq device to present
the CPPC registers and ACPI _CPC objects.

The default frequency is set host CPU nominal frequency, which
is obtained from the host CPPC sysfs. Other performance data
are set to the same value, since we don't support guest performance scaling.

Performance counters are also not emulated and they simply return 1
if readed, and guest should fallback to use the desired performance
value as the current performance.

Signed-off-by: Heyi Guo 
Signed-off-by: Ying Fang 
---
 hw/acpi/Makefile.objs |   1 +
 hw/acpi/cpufreq.c | 247 ++
 2 files changed, 248 insertions(+)
 create mode 100644 hw/acpi/cpufreq.c

diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs
index 777da07f4d..61530675d4 100644
--- a/hw/acpi/Makefile.objs
+++ b/hw/acpi/Makefile.objs
@@ -16,6 +16,7 @@ common-obj-y += bios-linker-loader.o
 common-obj-y += aml-build.o utils.o
 common-obj-$(CONFIG_ACPI_PCI) += pci.o
 common-obj-$(CONFIG_TPM) += tpm.o
+common-obj-$(CONFIG_CPUFREQ) += cpufreq.o
 
 common-obj-$(CONFIG_IPMI) += ipmi.o
 common-obj-$(call lnot,$(CONFIG_IPMI)) += ipmi-stub.o
diff --git a/hw/acpi/cpufreq.c b/hw/acpi/cpufreq.c
new file mode 100644
index 00..f38087884a
--- /dev/null
+++ b/hw/acpi/cpufreq.c
@@ -0,0 +1,247 @@
+/*
+ * ACPI CPPC register device
+ *
+ * Support for showing CPU frequency in guest OS.
+ *
+ * Copyright (c) 2019 HUAWEI TECHNOLOGIES CO.,LTD.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, see .
+ */
+
+#include "qemu/osdep.h"
+#include "hw/sysbus.h"
+#include "chardev/char.h"
+#include "qemu/log.h"
+#include "trace.h"
+#include "qemu/option.h"
+#include "sysemu/sysemu.h"
+#include "hw/acpi/acpi-defs.h"
+#include "qemu/cutils.h"
+#include "qemu/error-report.h"
+#include "hw/boards.h"
+
+#define TYPE_CPUFREQ "cpufreq"
+#define CPUFREQ(obj) OBJECT_CHECK(CpufreqState, (obj), TYPE_CPUFREQ)
+#define NOMINAL_FREQ_FILE "/sys/devices/system/cpu/cpu0/acpi_cppc/nominal_freq"
+#define CPU_MAX_FREQ_FILE 
"/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq"
+#define HZ_MAX_LENGTH 1024
+#define MAX_SUPPORT_SPACE 0x1
+
+typedef struct CpufreqState {
+SysBusDevice parent_obj;
+
+MemoryRegion iomem;
+uint32_t HighestPerformance;
+uint32_t NominalPerformance;
+uint32_t LowestNonlinearPerformance;
+uint32_t LowestPerformance;
+uint32_t GuaranteedPerformance;
+uint32_t DesiredPerformance;
+uint64_t ReferencePerformanceCounter;
+uint64_t DeliveredPerformanceCounter;
+uint32_t PerformanceLimited;
+uint32_t LowestFreq;
+uint32_t NominalFreq;
+uint32_t reg_size;
+} CpufreqState;
+
+
+static uint64_t cpufreq_read(void *opaque, hwaddr offset,
+   unsigned size)
+{
+CpufreqState *s = (CpufreqState *)opaque;
+uint64_t r;
+uint64_t n;
+
+MachineState *ms = MACHINE(qdev_get_machine());
+unsigned int smp_cpus = ms->smp.cpus;
+
+if (offset >= smp_cpus * CPPC_REG_PER_CPU_STRIDE) {
+warn_report("cpufreq_read: offset 0x%lx out of range", offset);
+return 0;
+}
+
+n = offset % CPPC_REG_PER_CPU_STRIDE;
+switch (n) {
+case 0:
+r = s->HighestPerformance;
+break;
+case 4:
+r = s->NominalPerformance;
+break;
+case 8:
+r = s->LowestNonlinearPerformance;
+break;
+case 12:
+r = s->LowestPerformance;
+break;
+case 16:
+r = s->GuaranteedPerformance;
+break;
+case 20:
+r = s->DesiredPerformance;
+break;
+/*
+ * We don't have real counters and it is hard to emulate, so always set the
+ * counter value to 1 to rely on Linux to use the DesiredPerformance value
+ * directly.
+ */
+case 24:
+r = s->ReferencePerformanceCounter;
+break;
+/*
+ * Guest may still access the register by 32bit; add the process to
+ * eliminate unnecessary warnings
+ */
+case 28:
+r = s->ReferencePerformanceCounter >> 32;
+break;
+case 32:
+r = s->DeliveredPerformanceCounter;
+break;
+case 36:
+r = s->DeliveredPerformanceCounter >> 32;
+break;
+
+case 40:
+r = s->PerformanceLimited;
+break;
+case 44:
+r =

[PATCH 0/4] arm64: Add the cpufreq device to show cpufreq info to guest

2020-02-12 Thread fangying1 
From: Ying Fang 

On ARM64 platform, cpu frequency is retrieved via ACPI CPPC.
A virtual cpufreq device based on ACPI CPPC is created to
present cpu frequency info to the guest.

The default frequency is set to host cpu nominal frequency,
which is obtained from the host CPPC sysfs. Other performance
data are set to the same value, since we don't support guest
performance scaling here.

Performance counters are also not emulated and they simply
return 1 if read, and guest should fallback to use desired
performance value as the current performance.

Guest kernel version above 4.18 is required to make it work.

Ying Fang (4):
  acpi: add aml_generic_register
  acpi/cppc: add ACPI CPPC registers
  arm_virt: add the cpufreq device model
  arm_virt: create the cpufreq device

 default-configs/aarch64-softmmu.mak |   1 +
 hw/acpi/Kconfig |   4 +
 hw/acpi/Makefile.objs   |   1 +
 hw/acpi/aml-build.c |  22 +++
 hw/acpi/cpufreq.c   | 247 
 hw/arm/virt-acpi-build.c|  74 -
 hw/arm/virt.c   |  14 ++
 include/hw/acpi/acpi-defs.h |  32 
 include/hw/acpi/aml-build.h |   3 +
 include/hw/arm/virt.h   |   1 +
 10 files changed, 397 insertions(+), 2 deletions(-)
 create mode 100644 hw/acpi/cpufreq.c

-- 
2.19.1

[PATCH 2/4] acpi/cppc: Add ACPI CPPC registers

2020-02-12 Thread fangying1 
From: Ying Fang 

The Continuous Performance Control Package is used to
describe the ACPI CPPC registers.

Signed-off-by: Heyi Guo 
Signed-off-by: Ying Fang 
---
 hw/arm/virt-acpi-build.c| 74 -
 hw/arm/virt.c   |  1 +
 include/hw/acpi/acpi-defs.h | 32 
 include/hw/arm/virt.h   |  1 +
 4 files changed, 106 insertions(+), 2 deletions(-)

diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index bd5f771e9b..d133bad738 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -41,6 +41,7 @@
 #include "hw/acpi/pci.h"
 #include "hw/acpi/memory_hotplug.h"
 #include "hw/acpi/generic_event_device.h"
+#include "hw/acpi/acpi-defs.h"
 #include "hw/pci/pcie_host.h"
 #include "hw/pci/pci.h"
 #include "hw/arm/virt.h"
@@ -51,7 +52,70 @@
 
 #define ARM_SPI_BASE 32
 
-static void acpi_dsdt_add_cpus(Aml *scope, int smp_cpus)
+
+static void acpi_dsdt_add_psd(Aml *dev, int cpus)
+{
+Aml *pkg;
+Aml *sub;
+
+sub = aml_package(5);
+aml_append(sub, aml_int(5));
+aml_append(sub, aml_int(0));
+/* Assume all vCPUs belong to the same domain */
+aml_append(sub, aml_int(0));
+/* SW_ANY: OSPM coordinate, initiate on any processor */
+aml_append(sub, aml_int(0xFD));
+aml_append(sub, aml_int(cpus));
+
+pkg = aml_package(1);
+aml_append(pkg, sub);
+
+aml_append(dev, aml_name_decl("_PSD", pkg));
+}
+
+static void acpi_dsdt_add_cppc(Aml *dev, uint64_t cpu_base)
+{
+Aml *cpc;
+int i;
+
+/* ACPI 6.3 8.4.7.1, version 3 of the CPPC table is used */
+cpc = aml_package(23);
+aml_append(cpc, aml_int(23));
+aml_append(cpc, aml_int(3));
+
+for (i = 0; i < CPPC_REG_COUNT; i++) {
+Aml *res;
+uint8_t reg_width;
+uint8_t acc_type;
+uint64_t addr;
+/* Only some necessary registers are emulated */
+if ((i >= MIN_PERF && i < REFERENCE_CTR) ||
+(i >= ENABLE && i < LOWEST_FREQ)) {
+reg_width = 0;
+acc_type = AML_ANY_ACC;
+addr = 0;
+} else {
+addr = cpu_base + i * 4;
+if (i == REFERENCE_CTR || i == DELIVERED_CTR) {
+reg_width = 64;
+acc_type = AML_QWORD_ACC;
+} else {
+reg_width = 32;
+acc_type = AML_DWORD_ACC;
+}
+}
+
+res = aml_resource_template();
+aml_append(res, aml_generic_register(AML_SYSTEM_MEMORY, reg_width, 0,
+ acc_type, addr));
+aml_append(cpc, res);
+}
+
+aml_append(dev, aml_name_decl("_CPC", cpc));
+}
+
+static void acpi_dsdt_add_cpus(Aml *scope, int smp_cpus,
+   const MemMapEntry *cppc_memmap)
 {
 uint16_t i;
 
@@ -60,6 +124,12 @@ static void acpi_dsdt_add_cpus(Aml *scope, int smp_cpus)
 aml_append(dev, aml_name_decl("_HID", aml_string("ACPI0007")));
 aml_append(dev, aml_name_decl("_UID", aml_int(i)));
 aml_append(scope, dev);
+/*
+ * Append _CPC and _PSD to show CPU frequency
+ */
+acpi_dsdt_add_cppc(dev,
+   cppc_memmap->base + i * CPPC_REG_PER_CPU_STRIDE);
+acpi_dsdt_add_psd(dev, smp_cpus);
 }
 }
 
@@ -736,7 +806,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, 
VirtMachineState *vms)
  * the RTC ACPI device at all when using UEFI.
  */
 scope = aml_scope("\\_SB");
-acpi_dsdt_add_cpus(scope, vms->smp_cpus);
+acpi_dsdt_add_cpus(scope, vms->smp_cpus, [VIRT_CPUFREQ]);
 acpi_dsdt_add_uart(scope, [VIRT_UART],
(irqmap[VIRT_UART] + ARM_SPI_BASE));
 acpi_dsdt_add_flash(scope, [VIRT_FLASH]);
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index f788fe27d6..ed9dc38b60 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -144,6 +144,7 @@ static const MemMapEntry base_memmap[] = {
 [VIRT_PCDIMM_ACPI] ={ 0x0907, MEMORY_HOTPLUG_IO_LEN },
 [VIRT_ACPI_GED] =   { 0x0908, ACPI_GED_EVT_SEL_LEN },
 [VIRT_MMIO] =   { 0x0a00, 0x0200 },
+[VIRT_CPUFREQ] ={ 0x0b00, 0x0001 },
 /* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that size */
 [VIRT_PLATFORM_BUS] =   { 0x0c00, 0x0200 },
 [VIRT_SECURE_MEM] = { 0x0e00, 0x0100 },
diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
index 57a3f58b0c..3a33f7220d 100644
--- a/include/hw/acpi/acpi-defs.h
+++ b/include/hw/acpi/acpi-defs.h
@@ -634,4 +634,36 @@ struct AcpiIortRC {
 } QEMU_PACKED;
 typedef struct AcpiIortRC AcpiIortRC;
 
+/*
+ * CPPC register definition from kernel header
+ * include/acpi/cppc_acpi.h
+ * The last element is newly added for easy use
+ */
+enum cppc_regs {
+HIGHEST_PERF,
+NOMINAL_PERF,
+LOW_NON_LINEAR_PERF,
+LOWEST_PERF,
+GUARANTEED_PERF,
+DESIRED_PERF,
+MIN_PERF,
+MAX_PERF,
+

[PATCH 1/4] acpi: Add aml_generic_register

2020-02-12 Thread fangying1 
From: Ying Fang 

The generic register descriptor describes the localtion of a
fixed width register within any of the ACPI-defined address space.

This is needed to declare the ACPI CPPC registers.

Signed-off-by: Heyi Guo 
Signed-off-by: Ying Fang 
---
 hw/acpi/aml-build.c | 22 ++
 include/hw/acpi/aml-build.h |  3 +++
 2 files changed, 25 insertions(+)

diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
index 2c3702b882..79b1431f07 100644
--- a/hw/acpi/aml-build.c
+++ b/hw/acpi/aml-build.c
@@ -1370,6 +1370,28 @@ Aml *aml_sleep(uint64_t msec)
 return var;
 }
 
+/* ACPI 5.0b: 6.4.3.7 Generic Register Descriptor */
+Aml *aml_generic_register(AmlRegionSpace rs, uint8_t reg_width,
+  uint8_t reg_offset, AmlAccessType type, uint64_t 
addr)
+{
+int i;
+Aml *var = aml_alloc();
+build_append_byte(var->buf, 0x82); /* Generic Register Descriptor */
+build_append_byte(var->buf, 0x0C); /* Length, bits[7:0] value = 0x0C */
+build_append_byte(var->buf, 0);/* Length, bits[15:8] value = 0 */
+build_append_byte(var->buf, rs);   /* Address Space ID */
+build_append_byte(var->buf, reg_width);   /* Register Bit Width */
+build_append_byte(var->buf, reg_offset);  /* Register Bit Offset */
+build_append_byte(var->buf, type);/* Access Size */
+
+/* Register address */
+for (i = 0; i < 8; i++) {
+build_append_byte(var->buf, extract64(addr, i * 8, 8));
+}
+
+return var;
+}
+
 static uint8_t Hex2Byte(const char *src)
 {
 int hi, lo;
diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h
index de4a406568..37a047b156 100644
--- a/include/hw/acpi/aml-build.h
+++ b/include/hw/acpi/aml-build.h
@@ -364,6 +364,9 @@ Aml *aml_qword_memory(AmlDecode dec, AmlMinFixed min_fixed,
 Aml *aml_dma(AmlDmaType typ, AmlDmaBusMaster bm, AmlTransferSize sz,
  uint8_t channel);
 Aml *aml_sleep(uint64_t msec);
+Aml *aml_generic_register(AmlRegionSpace rs, uint8_t reg_width,
+  uint8_t reg_offset, AmlAccessType type,
+  uint64_t addr);
 Aml *aml_i2c_serial_bus_device(uint16_t address, const char *resource_source);
 
 /* Block AML object primitives */
-- 
2.19.1

[PATCH 4/4] arm: Create the cpufreq device

2020-02-12 Thread fangying1 
From: Ying Fang 

Signed-off-by: Heyi Guo 
Signed-off-by: Ying Fang 
---
 default-configs/aarch64-softmmu.mak |  1 +
 hw/acpi/Kconfig |  4 
 hw/arm/virt.c   | 13 +
 3 files changed, 18 insertions(+)

diff --git a/default-configs/aarch64-softmmu.mak 
b/default-configs/aarch64-softmmu.mak
index 958b1e08e4..0a030e853f 100644
--- a/default-configs/aarch64-softmmu.mak
+++ b/default-configs/aarch64-softmmu.mak
@@ -6,3 +6,4 @@ include arm-softmmu.mak
 CONFIG_XLNX_ZYNQMP_ARM=y
 CONFIG_XLNX_VERSAL=y
 CONFIG_SBSA_REF=y
+CONFIG_CPUFREQ=y
diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig
index 54209c6f2f..7d8aa58492 100644
--- a/hw/acpi/Kconfig
+++ b/hw/acpi/Kconfig
@@ -38,3 +38,7 @@ config ACPI_VMGENID
 depends on PC
 
 config ACPI_HW_REDUCED
+
+config CPUFREQ
+bool
+default y
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index ed9dc38b60..53638f9557 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -764,6 +764,17 @@ static void create_uart(const VirtMachineState *vms, int 
uart,
 g_free(nodename);
 }
 
+static void create_cpufreq(const VirtMachineState *vms, MemoryRegion *mem)
+{
+hwaddr base = vms->memmap[VIRT_CPUFREQ].base;
+DeviceState *dev = qdev_create(NULL, "cpufreq");
+SysBusDevice *s = SYS_BUS_DEVICE(dev);
+
+qdev_init_nofail(dev);
+memory_region_add_subregion(mem, base, sysbus_mmio_get_region(s, 0));
+}
+
+
 static void create_rtc(const VirtMachineState *vms)
 {
 char *nodename;
@@ -1723,6 +1734,8 @@ static void machvirt_init(MachineState *machine)
 
 create_uart(vms, VIRT_UART, sysmem, serial_hd(0));
 
+create_cpufreq(vms, sysmem);
+
 if (vms->secure) {
 create_secure_ram(vms, secure_sysmem);
 create_uart(vms, VIRT_SECURE_UART, secure_sysmem, serial_hd(1));
-- 
2.19.1