From patchwork Fri Mar 12 10:57:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 398547 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp1090857jai; Fri, 12 Mar 2021 02:58:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJxLiBTa2KnOFGVQVRBW64BSb6c4Ez6TWsNCbcNUDWxpC63jXVzXfQN8huoTCEqNZ6ARbgsp X-Received: by 2002:a5b:30c:: with SMTP id j12mr16685985ybp.360.1615546693973; Fri, 12 Mar 2021 02:58:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615546693; cv=none; d=google.com; s=arc-20160816; b=zLy/sVK/Z4/YXBCE+MRFWERrWUO+ir8/k7x6dlBHCDpueMM4NEqXfrK8RL3RsURsaF o8peXz8BAvmSv8q3Cpc4hHVSQKPYkR3MIc5Wj8gbGKNn+CH1cLOmoRVx8VKHK20Rw+3u 8szIPHy37FIhHz0lyoHxW3n3y2I4H2LDr5VXqMpz9QABr0i/9UW/8bApVMALHqImsm6q GPd50TMVl7TCOl9XlUsHTDEs1ZHj99igF/sceMXvNZwWTiLFEm7nl4jY9aWVdGcePZAS qe/ua5pUe7kH0b3+dRvt1s1dThWqB9RdvHFFFFve8ctVuCy7r70JdqwjK89jlxjl3Ebx qL+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=bdcJqxFfTnrdI3dfSKKaKUtkDcGdrZjqxk3hXGCYHWg=; b=Bk5nPubsnx9iEatCs/9HNU0DCM+VIT9iMOu6uFjnaFwVNm++KaRecy+wZgPXow+Xtn qK/JG/OeUBRRT+J54ZZEQbjfQR4aNtu2Q4PoHyH89F0CYFt38ZRXnPw7+hQh07HiuEGZ Y4jsIkVkvNHIxG+m9sGNEdW2av9Y23rQqOoJDhIQ77oQ7PqJrHcpdtK5EozBpEYhXvy0 XvwPUjKRUOp4s5clVeVu7OhHr89GFpLAP97Ph0RbccFzjfgtM3Wj2HuC4LJRM4d1CyNx 3LnNFmjZVnxfiFsEHqtJw67u5EATipcZVZlAKYIlNenf8+dQ7wFZhVDvKVRxZuH4TUVQ DbuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=kEIRTBzz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id q82si6245398ybq.469.2021.03.12.02.58.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 12 Mar 2021 02:58:13 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=kEIRTBzz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1]:49552 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lKfUj-0000NB-5X for patch@linaro.org; Fri, 12 Mar 2021 05:58:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50346) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKfU1-0000Lo-Te; Fri, 12 Mar 2021 05:57:29 -0500 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]:45100) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lKfTz-0003VL-Qr; Fri, 12 Mar 2021 05:57:29 -0500 Received: by mail-pl1-x636.google.com with SMTP id u18so11735357plc.12; Fri, 12 Mar 2021 02:57:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bdcJqxFfTnrdI3dfSKKaKUtkDcGdrZjqxk3hXGCYHWg=; b=kEIRTBzz6UEUWoRNKDjA+Xo9jKYQa0RSRMVNv7M+G3Ow81IJsjP4bm5pDTGedA0cBG 3+YNiYfr1PeZWQnI0Y0RC8VQdLiGVB2pD3NTebOeMpcs8VIy5ZQ0B03TkvdTcukljDaD G9r0037+SYe0XXOBErQdFTA+8RjyjGMSoBA+nCt7E0PodWAH7ExXQpfgPJvNA4sjVmHL ZBPdLFKqBB9XOq2MJ2gmIEzWuULVWiOvkYeqnlHLmAlkuxPtjVotKe5VnokKKGaeDoEo Iowp+i32YKNGdryvkVy37mIvXkoY5oKMgjj6TX2gCpWPmAm981MCrh54ZMKgNpXoCkFk xE6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=bdcJqxFfTnrdI3dfSKKaKUtkDcGdrZjqxk3hXGCYHWg=; b=ndjaSTxnRfGDgAN5OTZJ3QWIhGNG4eSvLZiPJ7ygklqKp5d81OK+FV3uGWznawsXvM bZE5U1LgEKxBmgYdsRY3ehKcjZnhfyspaiAj/1M2vGwzK8eyOBPt7jtNNLgbxUcY4Dno LvOh0s1X5Bwng5zJm04LZoPHZ9jqlAhePCWfVDET5UuasjRRiDrBFkDTrKw/jiOGsDRT HUu4CU53sV10RF4UDsVh/k9vL+eC+fL4X6kYL+HNAv9qW/DLVISKZMZyv7cfUDOYXUEk UbVKlA8h7VyVvpuB7PMqZ8kqJVtFZLyBOBoh2hnjuiE6I2G6OtibhPAZqgztt5lV1cD3 odWQ== X-Gm-Message-State: AOAM533dGbcWe3QO62kzT4J6Itm1tnJa7YDPLwBYrny+qQHioXGatbth 5G/Vop9RzLVdKCf7XdTp9HY= X-Received: by 2002:a17:902:ed88:b029:e3:6b9f:9ac3 with SMTP id e8-20020a170902ed88b02900e36b9f9ac3mr13434387plj.72.1615546644711; Fri, 12 Mar 2021 02:57:24 -0800 (PST) Received: from localhost.localdomain ([45.124.203.14]) by smtp.gmail.com with ESMTPSA id p25sm5326793pfe.100.2021.03.12.02.57.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Mar 2021 02:57:23 -0800 (PST) From: Joel Stanley To: =?utf-8?q?C=C3=A9dric_Le_Goater?= , Thomas Huth , Laurent Vivier Subject: [PATCH v3 1/3] hw: Model ASPEED's Hash and Crypto Engine Date: Fri, 12 Mar 2021 21:27:09 +1030 Message-Id: <20210312105711.551423-2-joel@jms.id.au> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210312105711.551423-1-joel@jms.id.au> References: <20210312105711.551423-1-joel@jms.id.au> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::636; envelope-from=joel.stan@gmail.com; helo=mail-pl1-x636.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Jeffery , Paolo Bonzini , qemu-arm@nongnu.org, qemu-devel@nongnu.org, Peter Maydell Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The HACE (Hash and Crypto Engine) is a device that offloads MD5, SHA1, SHA2, RSA and other cryptographic algorithms. This initial model implements a subset of the device's functionality; currently only direct access (non-scatter gather) hashing. Signed-off-by: Joel Stanley Signed-off-by: Cédric Le Goater --- v3: - rebase on upstream to fix meson.build conflict v2: - reorder register defines - mask src/dest/len registers according to hardware --- include/hw/misc/aspeed_hace.h | 33 ++++ hw/misc/aspeed_hace.c | 312 ++++++++++++++++++++++++++++++++++ hw/misc/meson.build | 1 + 3 files changed, 346 insertions(+) create mode 100644 include/hw/misc/aspeed_hace.h create mode 100644 hw/misc/aspeed_hace.c -- 2.30.1 diff --git a/include/hw/misc/aspeed_hace.h b/include/hw/misc/aspeed_hace.h new file mode 100644 index 000000000000..e1fce670ef9e --- /dev/null +++ b/include/hw/misc/aspeed_hace.h @@ -0,0 +1,33 @@ +/* + * ASPEED Hash and Crypto Engine + * + * Copyright (C) 2021 IBM Corp. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#ifndef ASPEED_HACE_H +#define ASPEED_HACE_H + +#include "hw/sysbus.h" + +#define TYPE_ASPEED_HACE "aspeed.hace" +#define ASPEED_HACE(obj) OBJECT_CHECK(AspeedHACEState, (obj), TYPE_ASPEED_HACE) + +#define ASPEED_HACE_NR_REGS (0x64 >> 2) + +typedef struct AspeedHACEState { + /* */ + SysBusDevice parent; + + /*< public >*/ + MemoryRegion iomem; + qemu_irq irq; + + uint32_t regs[ASPEED_HACE_NR_REGS]; + + MemoryRegion *dram_mr; + AddressSpace dram_as; +} AspeedHACEState; + +#endif /* _ASPEED_HACE_H_ */ diff --git a/hw/misc/aspeed_hace.c b/hw/misc/aspeed_hace.c new file mode 100644 index 000000000000..3d02fae2dd62 --- /dev/null +++ b/hw/misc/aspeed_hace.c @@ -0,0 +1,312 @@ +/* + * ASPEED Hash and Crypto Engine + * + * Copyright (C) 2021 IBM Corp. + * + * Joel Stanley + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qemu/log.h" +#include "qemu/error-report.h" +#include "hw/misc/aspeed_hace.h" +#include "qapi/error.h" +#include "migration/vmstate.h" +#include "crypto/hash.h" +#include "hw/qdev-properties.h" +#include "hw/irq.h" + +#define R_CRYPT_CMD (0x10 / 4) + +#define R_STATUS (0x1c / 4) +#define HASH_IRQ BIT(9) +#define CRYPT_IRQ BIT(12) +#define TAG_IRQ BIT(15) + +#define R_HASH_SRC (0x20 / 4) +#define R_HASH_DEST (0x24 / 4) +#define R_HASH_SRC_LEN (0x2c / 4) + +#define R_HASH_CMD (0x30 / 4) +/* Hash algorithim selection */ +#define HASH_ALGO_MASK (BIT(4) | BIT(5) | BIT(6)) +#define HASH_ALGO_MD5 0 +#define HASH_ALGO_SHA1 BIT(5) +#define HASH_ALGO_SHA224 BIT(6) +#define HASH_ALGO_SHA256 (BIT(4) | BIT(6)) +#define HASH_ALGO_SHA512_SERIES (BIT(5) | BIT(6)) +/* SHA512 algorithim selection */ +#define SHA512_HASH_ALGO_MASK (BIT(10) | BIT(11) | BIT(12)) +#define HASH_ALGO_SHA512_SHA512 0 +#define HASH_ALGO_SHA512_SHA384 BIT(10) +#define HASH_ALGO_SHA512_SHA256 BIT(11) +#define HASH_ALGO_SHA512_SHA224 (BIT(10) | BIT(11)) +/* HMAC modes */ +#define HASH_HMAC_MASK (BIT(7) | BIT(8)) +#define HASH_DIGEST 0 +#define HASH_DIGEST_HMAC BIT(7) +#define HASH_DIGEST_ACCUM BIT(8) +#define HASH_HMAC_KEY (BIT(7) | BIT(8)) +/* Cascscaed operation modes */ +#define HASH_ONLY 0 +#define HASH_ONLY2 BIT(0) +#define HASH_CRYPT_THEN_HASH BIT(1) +#define HASH_HASH_THEN_CRYPT (BIT(0) | BIT(1)) +/* Other cmd bits */ +#define HASH_IRQ_EN BIT(9) +#define HASH_SG_EN BIT(18) + + +static int do_hash_operation(AspeedHACEState *s, int algo) +{ + hwaddr src, len, dest; + uint8_t *digest_buf = NULL; + size_t digest_len = 0; + char *src_buf; + int rc; + + src = 0x80000000 | s->regs[R_HASH_SRC]; + len = s->regs[R_HASH_SRC_LEN]; + dest = 0x80000000 | s->regs[R_HASH_DEST]; + + src_buf = address_space_map(&s->dram_as, src, &len, false, + MEMTXATTRS_UNSPECIFIED); + if (!src_buf) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: failed to map dram\n", __func__); + return -EACCES; + } + + rc = qcrypto_hash_bytes(algo, src_buf, len, &digest_buf, &digest_len, + &error_fatal); + if (rc < 0) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: qcrypto failed\n", __func__); + return rc; + } + + rc = address_space_write(&s->dram_as, dest, MEMTXATTRS_UNSPECIFIED, + digest_buf, digest_len); + if (rc) { + qemu_log_mask(LOG_GUEST_ERROR, + "%s: address space write failed\n", __func__); + } + g_free(digest_buf); + + address_space_unmap(&s->dram_as, src_buf, len, false, len); + + /* + * Set status bits to indicate completion. Testing shows hardware sets + * these irrespective of HASH_IRQ_EN. + */ + s->regs[R_STATUS] |= HASH_IRQ; + + return 0; +} + + +static uint64_t aspeed_hace_read(void *opaque, hwaddr addr, unsigned int size) +{ + AspeedHACEState *s = ASPEED_HACE(opaque); + + addr >>= 2; + + if (addr >= ASPEED_HACE_NR_REGS) { + qemu_log_mask(LOG_GUEST_ERROR, + "%s: Out-of-bounds read at offset 0x%" HWADDR_PRIx "\n", + __func__, addr << 2); + return 0; + } + + return s->regs[addr]; +} + +static void aspeed_hace_write(void *opaque, hwaddr addr, uint64_t data, + unsigned int size) +{ + AspeedHACEState *s = ASPEED_HACE(opaque); + + addr >>= 2; + + if (addr >= ASPEED_HACE_NR_REGS) { + qemu_log_mask(LOG_GUEST_ERROR, + "%s: Out-of-bounds write at offset 0x%" HWADDR_PRIx "\n", + __func__, addr << 2); + return; + } + + switch (addr) { + case R_STATUS: + if (data & HASH_IRQ) { + data &= ~HASH_IRQ; + + if (s->regs[addr] & HASH_IRQ) { + qemu_irq_lower(s->irq); + } + } + break; + case R_HASH_SRC: + data &= 0x7FFFFFFF; + break; + case R_HASH_DEST: + data &= 0x7FFFFFF8; + break; + case R_HASH_SRC_LEN: + data &= 0x0FFFFFFF; + break; + case R_HASH_CMD: { + int algo = -1; + if ((data & HASH_HMAC_MASK)) { + qemu_log_mask(LOG_UNIMP, + "%s: HMAC engine command mode %ld not implemented", + __func__, (data & HASH_HMAC_MASK) >> 8); + } + if (data & HASH_SG_EN) { + qemu_log_mask(LOG_UNIMP, + "%s: Hash scatter gather mode not implemented", + __func__); + } + if (data & BIT(1)) { + qemu_log_mask(LOG_UNIMP, + "%s: Cascaded mode not implemented", + __func__); + } + switch (data & HASH_ALGO_MASK) { + case HASH_ALGO_MD5: + algo = QCRYPTO_HASH_ALG_MD5; + break; + case HASH_ALGO_SHA1: + algo = QCRYPTO_HASH_ALG_SHA1; + break; + case HASH_ALGO_SHA224: + algo = QCRYPTO_HASH_ALG_SHA224; + break; + case HASH_ALGO_SHA256: + algo = QCRYPTO_HASH_ALG_SHA256; + break; + case HASH_ALGO_SHA512_SERIES: + switch (data & SHA512_HASH_ALGO_MASK) { + case HASH_ALGO_SHA512_SHA512: + algo = QCRYPTO_HASH_ALG_SHA512; + break; + case HASH_ALGO_SHA512_SHA384: + algo = QCRYPTO_HASH_ALG_SHA384; + break; + case HASH_ALGO_SHA512_SHA256: + algo = QCRYPTO_HASH_ALG_SHA256; + break; + case HASH_ALGO_SHA512_SHA224: + algo = QCRYPTO_HASH_ALG_SHA224; + break; + default: + qemu_log_mask(LOG_GUEST_ERROR, + "%s: Invalid sha512 hash algorithm selection 0x%03lx\n", + __func__, data & SHA512_HASH_ALGO_MASK); + break; + } + break; + default: + qemu_log_mask(LOG_GUEST_ERROR, + "%s: Invalid hash algorithm selection 0x%03lx\n", + __func__, data & HASH_ALGO_MASK); + break; + } + if (algo >= 0) { + do_hash_operation(s, algo); + + if (data & HASH_IRQ_EN) { + qemu_irq_raise(s->irq); + } + } + + break; + } + case R_CRYPT_CMD: + qemu_log_mask(LOG_UNIMP, "%s: Crypt commands not implemented\n", + __func__); + break; + default: + break; + } + + s->regs[addr] = data; +} + +static const MemoryRegionOps aspeed_hace_ops = { + .read = aspeed_hace_read, + .write = aspeed_hace_write, + .endianness = DEVICE_LITTLE_ENDIAN, + .valid = { + .min_access_size = 1, + .max_access_size = 4, + }, +}; + +static void aspeed_hace_reset(DeviceState *dev) +{ + struct AspeedHACEState *s = ASPEED_HACE(dev); + + memset(s->regs, 0, sizeof(s->regs)); +} + +static void aspeed_hace_realize(DeviceState *dev, Error **errp) +{ + AspeedHACEState *s = ASPEED_HACE(dev); + SysBusDevice *sbd = SYS_BUS_DEVICE(dev); + + sysbus_init_irq(sbd, &s->irq); + + memory_region_init_io(&s->iomem, OBJECT(s), &aspeed_hace_ops, s, + TYPE_ASPEED_HACE, 0x1000); + + if (!s->dram_mr) { + error_setg(errp, TYPE_ASPEED_HACE ": 'dram' link not set"); + return; + } + + address_space_init(&s->dram_as, s->dram_mr, "dram"); + + sysbus_init_mmio(sbd, &s->iomem); +} + +static Property aspeed_hace_properties[] = { + DEFINE_PROP_LINK("dram", AspeedHACEState, dram_mr, + TYPE_MEMORY_REGION, MemoryRegion *), + DEFINE_PROP_END_OF_LIST(), +}; + + +static const VMStateDescription vmstate_aspeed_hace = { + .name = TYPE_ASPEED_HACE, + .version_id = 1, + .minimum_version_id = 1, + .fields = (VMStateField[]) { + VMSTATE_UINT32_ARRAY(regs, AspeedHACEState, ASPEED_HACE_NR_REGS), + VMSTATE_END_OF_LIST(), + } +}; + +static void aspeed_hace_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + + dc->realize = aspeed_hace_realize; + dc->reset = aspeed_hace_reset; + device_class_set_props(dc, aspeed_hace_properties); + dc->desc = "Aspeed Hash and Crypto Engine", + dc->vmsd = &vmstate_aspeed_hace; +} + +static const TypeInfo aspeed_hace_info = { + .name = TYPE_ASPEED_HACE, + .parent = TYPE_SYS_BUS_DEVICE, + .instance_size = sizeof(AspeedHACEState), + .class_init = aspeed_hace_class_init, +}; + +static void aspeed_hace_register_types(void) +{ + type_register_static(&aspeed_hace_info); +} + +type_init(aspeed_hace_register_types); diff --git a/hw/misc/meson.build b/hw/misc/meson.build index 00356cf12ec7..23b61d55f62e 100644 --- a/hw/misc/meson.build +++ b/hw/misc/meson.build @@ -104,6 +104,7 @@ softmmu_ss.add(when: 'CONFIG_PVPANIC_ISA', if_true: files('pvpanic-isa.c')) softmmu_ss.add(when: 'CONFIG_PVPANIC_PCI', if_true: files('pvpanic-pci.c')) softmmu_ss.add(when: 'CONFIG_AUX', if_true: files('auxbus.c')) softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( + 'aspeed_hace.c', 'aspeed_lpc.c', 'aspeed_scu.c', 'aspeed_sdmc.c', From patchwork Fri Mar 12 10:57:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 398549 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp1094982jai; Fri, 12 Mar 2021 03:03:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJwQzqDGF4t4NIwOf4ma5v+kV9EzpabeUObl0p6pJp8+S6+dLPo86RY5ZkD/bXNJ11hJ5RHF X-Received: by 2002:a5d:9510:: with SMTP id d16mr9532310iom.81.1615547022868; Fri, 12 Mar 2021 03:03:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615547022; cv=none; d=google.com; s=arc-20160816; b=ie3wL+aqQhwEtzlETU88WQPiKTNNaoHFrJU/Fq9vkdudsVSgxHJKTPeT1zGszPSk4s dSb2A0z4WV+WFC4UcXrrQZWaD/f9Nflkf5gfespm/4INxFJdfjmZIudwRA66REMfc57B TJfgvNpzaFSBk7YoHZr3uAfnZygscB09mPwE/ZQbYZvJvFNSuPnAj1gkDtpLN1lNEyTu oFdmxFqIa3LsQGtPdyf+yyADyb7738ayGEIZyTTdNWVaz8+ZNGqzIBA46KMYFqkFTKBD hLjyuxo8zzKQTkhXixhqD4yPzI3gSXqAoON55X36hye8Tuv5dxQSqjVGa8PaeWU4sv8j Vp9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=7atKKCwJ9b+vPjYJ+u0h0ndj46qZnDR8PNMM/Zt7gC4=; b=OrIwUAEossCmWSYsP1Dsrfe57TAFISmFCl92niLyyctIDsFtAPtUbJiXcMsO+EX5d3 9jpeOirWzdJBeppGHJzcFiRHlE2965oUbSPmMda/aYu7hmVc61pqBU3QPk2PU21ejviW Km5P7RBhzlNbbsbBp8HwBMIdnjRXdXd6Cu/C1AdDJR2bZ/hJ+7OHq8WHxdycUhstRgxb TuGhgD5k3iOeXdJdcFTX1RpVqT2nn6ph7bOEWUMolYL8hhwWsRtlnbVHwQnCs00XmNns W/hF3a7+Gl6zu3BNF/KZm++C5zmF/1oQKDxlyUXcRYWRfWvs7tl0w8ZY5yU1JYc1RnDl O4eg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=n5wlTF64; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id z1si1301346ill.75.2021.03.12.03.03.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 12 Mar 2021 03:03:42 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=n5wlTF64; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1]:57768 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lKfa2-0005f3-5x for patch@linaro.org; Fri, 12 Mar 2021 06:03:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50376) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKfU5-0000PB-4f; Fri, 12 Mar 2021 05:57:33 -0500 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]:36178) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lKfU3-0003Xy-CA; Fri, 12 Mar 2021 05:57:32 -0500 Received: by mail-pl1-x62a.google.com with SMTP id z5so11766921plg.3; Fri, 12 Mar 2021 02:57:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7atKKCwJ9b+vPjYJ+u0h0ndj46qZnDR8PNMM/Zt7gC4=; b=n5wlTF64r4HVLbnTCYjJqOp1UfEPdsnOV27qP4BTdUgS5xN2CnPOp0couKCfBenkPl 5B7DFAjQQfntRY48JBceZ4SljzeXM9mKHzDLUgxfA/BgySPLb9k2uCq3RXwxcO0oN2hb 8a5pYTt+2Oq83K2ENaZBRg14k/RNjgMJuHpTnf3TiRd1ZOqI/Kh9ldhCdcvoiWYc3Kcv 9xei4yoCL7BoH8UT9KT851eUoILVe/2msToNTzooguI4OQ9Ec4ZvRmBcZX2j8WvJxd1U CegvjgEHVcQvWPV/OiTjQ4747VFB/eDJnX/IMS4KUagyMUkzEDA28XRuxUq7iFxuVZ1L p++A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=7atKKCwJ9b+vPjYJ+u0h0ndj46qZnDR8PNMM/Zt7gC4=; b=gVBX9ebzrCs3Ruqiou/FHQPFS9Rs3Hk7huHbEg4MdpEvRd71BA8Vzm6oG0gbvYnXng ubwO5M48Jl/4sXghR5VgkknanHPHkgXnMZTdk4c8kcDdNPqPKnH9541fmrR+jh/nBJnZ tPYiRh/qGntAxid8Aq9870IC+AlYSfF2a3ctnoFYRKockOI95LPiW1tHXn1WiDggww/b UkuBKY9IsUZWys+HOr3isYzBKUwUPZ1lU5rZelM9Iqq4aWHgAMdfX2Hb6SpybkoMV+WL EXHxaYpxN4WFunD1Z1kRL5lKVR4IGBVoDSvmJbLI9pCRWC0Su2Lm79hC79BOvVINQdwv oykQ== X-Gm-Message-State: AOAM5329WkIIr5YkmOAIUavpRQjnbpTK8QJCVcW3wq/6JNw9WkJHL7cI vjlE/+HSgQF/B1TIn+t76gA= X-Received: by 2002:a17:90a:cf8f:: with SMTP id i15mr13932419pju.22.1615546649691; Fri, 12 Mar 2021 02:57:29 -0800 (PST) Received: from localhost.localdomain ([45.124.203.14]) by smtp.gmail.com with ESMTPSA id p25sm5326793pfe.100.2021.03.12.02.57.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Mar 2021 02:57:28 -0800 (PST) From: Joel Stanley To: =?utf-8?q?C=C3=A9dric_Le_Goater?= , Thomas Huth , Laurent Vivier Subject: [PATCH v3 2/3] aspeed: Integrate HACE Date: Fri, 12 Mar 2021 21:27:10 +1030 Message-Id: <20210312105711.551423-3-joel@jms.id.au> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210312105711.551423-1-joel@jms.id.au> References: <20210312105711.551423-1-joel@jms.id.au> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62a; envelope-from=joel.stan@gmail.com; helo=mail-pl1-x62a.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Jeffery , Paolo Bonzini , qemu-arm@nongnu.org, qemu-devel@nongnu.org, Peter Maydell Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Add the hash and crypto engine model to the Aspeed socs. Reviewed-by: Andrew Jeffery Signed-off-by: Joel Stanley --- v3: Rebase on upstream --- docs/system/arm/aspeed.rst | 2 +- include/hw/arm/aspeed_soc.h | 3 +++ hw/arm/aspeed_ast2600.c | 14 ++++++++++++++ hw/arm/aspeed_soc.c | 15 +++++++++++++++ 4 files changed, 33 insertions(+), 1 deletion(-) -- 2.30.1 diff --git a/docs/system/arm/aspeed.rst b/docs/system/arm/aspeed.rst index d1fb8f25b39c..f9466e6d8245 100644 --- a/docs/system/arm/aspeed.rst +++ b/docs/system/arm/aspeed.rst @@ -49,6 +49,7 @@ Supported devices * Ethernet controllers * Front LEDs (PCA9552 on I2C bus) * LPC Peripheral Controller (a subset of subdevices are supported) + * Hash/Crypto Engine (HACE) - Hash support only, no scatter-gather Missing devices @@ -59,7 +60,6 @@ Missing devices * PWM and Fan Controller * Slave GPIO Controller * Super I/O Controller - * Hash/Crypto Engine * PCI-Express 1 Controller * Graphic Display Controller * PECI Controller diff --git a/include/hw/arm/aspeed_soc.h b/include/hw/arm/aspeed_soc.h index 9359d6da336d..d9161d26d645 100644 --- a/include/hw/arm/aspeed_soc.h +++ b/include/hw/arm/aspeed_soc.h @@ -21,6 +21,7 @@ #include "hw/rtc/aspeed_rtc.h" #include "hw/i2c/aspeed_i2c.h" #include "hw/ssi/aspeed_smc.h" +#include "hw/misc/aspeed_hace.h" #include "hw/watchdog/wdt_aspeed.h" #include "hw/net/ftgmac100.h" #include "target/arm/cpu.h" @@ -50,6 +51,7 @@ struct AspeedSoCState { AspeedTimerCtrlState timerctrl; AspeedI2CState i2c; AspeedSCUState scu; + AspeedHACEState hace; AspeedXDMAState xdma; AspeedSMCState fmc; AspeedSMCState spi[ASPEED_SPIS_NUM]; @@ -133,6 +135,7 @@ enum { ASPEED_DEV_XDMA, ASPEED_DEV_EMMC, ASPEED_DEV_KCS, + ASPEED_DEV_HACE, }; #endif /* ASPEED_SOC_H */ diff --git a/hw/arm/aspeed_ast2600.c b/hw/arm/aspeed_ast2600.c index bc87e754a3cc..5a1fd01bc58a 100644 --- a/hw/arm/aspeed_ast2600.c +++ b/hw/arm/aspeed_ast2600.c @@ -42,6 +42,7 @@ static const hwaddr aspeed_soc_ast2600_memmap[] = { [ASPEED_DEV_ETH2] = 0x1E680000, [ASPEED_DEV_ETH4] = 0x1E690000, [ASPEED_DEV_VIC] = 0x1E6C0000, + [ASPEED_DEV_HACE] = 0x1E6D0000, [ASPEED_DEV_SDMC] = 0x1E6E0000, [ASPEED_DEV_SCU] = 0x1E6E2000, [ASPEED_DEV_XDMA] = 0x1E6E7000, @@ -102,6 +103,7 @@ static const int aspeed_soc_ast2600_irqmap[] = { [ASPEED_DEV_I2C] = 110, /* 110 -> 125 */ [ASPEED_DEV_ETH1] = 2, [ASPEED_DEV_ETH2] = 3, + [ASPEED_DEV_HACE] = 4, [ASPEED_DEV_ETH3] = 32, [ASPEED_DEV_ETH4] = 33, [ASPEED_DEV_KCS] = 138, /* 138 -> 142 */ @@ -213,6 +215,8 @@ static void aspeed_soc_ast2600_init(Object *obj) TYPE_SYSBUS_SDHCI); object_initialize_child(obj, "lpc", &s->lpc, TYPE_ASPEED_LPC); + + object_initialize_child(obj, "hace", &s->hace, TYPE_ASPEED_HACE); } /* @@ -498,6 +502,16 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev, Error **errp) sysbus_connect_irq(SYS_BUS_DEVICE(&s->lpc), 1 + aspeed_lpc_kcs_4, qdev_get_gpio_in(DEVICE(&s->a7mpcore), sc->irqmap[ASPEED_DEV_KCS] + aspeed_lpc_kcs_4)); + + /* HACE */ + object_property_set_link(OBJECT(&s->hace), "dram", OBJECT(s->dram_mr), + &error_abort); + if (!sysbus_realize(SYS_BUS_DEVICE(&s->hace), errp)) { + return; + } + sysbus_mmio_map(SYS_BUS_DEVICE(&s->hace), 0, sc->memmap[ASPEED_DEV_HACE]); + sysbus_connect_irq(SYS_BUS_DEVICE(&s->hace), 0, + aspeed_soc_get_irq(s, ASPEED_DEV_HACE)); } static void aspeed_soc_ast2600_class_init(ObjectClass *oc, void *data) diff --git a/hw/arm/aspeed_soc.c b/hw/arm/aspeed_soc.c index 057d053c8478..de0f2ca25027 100644 --- a/hw/arm/aspeed_soc.c +++ b/hw/arm/aspeed_soc.c @@ -34,6 +34,7 @@ static const hwaddr aspeed_soc_ast2400_memmap[] = { [ASPEED_DEV_VIC] = 0x1E6C0000, [ASPEED_DEV_SDMC] = 0x1E6E0000, [ASPEED_DEV_SCU] = 0x1E6E2000, + [ASPEED_DEV_HACE] = 0x1E6E3000, [ASPEED_DEV_XDMA] = 0x1E6E7000, [ASPEED_DEV_VIDEO] = 0x1E700000, [ASPEED_DEV_ADC] = 0x1E6E9000, @@ -65,6 +66,7 @@ static const hwaddr aspeed_soc_ast2500_memmap[] = { [ASPEED_DEV_VIC] = 0x1E6C0000, [ASPEED_DEV_SDMC] = 0x1E6E0000, [ASPEED_DEV_SCU] = 0x1E6E2000, + [ASPEED_DEV_HACE] = 0x1E6E3000, [ASPEED_DEV_XDMA] = 0x1E6E7000, [ASPEED_DEV_ADC] = 0x1E6E9000, [ASPEED_DEV_VIDEO] = 0x1E700000, @@ -117,6 +119,7 @@ static const int aspeed_soc_ast2400_irqmap[] = { [ASPEED_DEV_ETH2] = 3, [ASPEED_DEV_XDMA] = 6, [ASPEED_DEV_SDHCI] = 26, + [ASPEED_DEV_HACE] = 4, }; #define aspeed_soc_ast2500_irqmap aspeed_soc_ast2400_irqmap @@ -212,6 +215,8 @@ static void aspeed_soc_init(Object *obj) } object_initialize_child(obj, "lpc", &s->lpc, TYPE_ASPEED_LPC); + + object_initialize_child(obj, "hace", &s->hace, TYPE_ASPEED_HACE); } static void aspeed_soc_realize(DeviceState *dev, Error **errp) @@ -425,6 +430,16 @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp) sysbus_connect_irq(SYS_BUS_DEVICE(&s->lpc), 1 + aspeed_lpc_kcs_4, qdev_get_gpio_in(DEVICE(&s->lpc), aspeed_lpc_kcs_4)); + + /* HACE */ + object_property_set_link(OBJECT(&s->hace), "dram", OBJECT(s->dram_mr), + &error_abort); + if (!sysbus_realize(SYS_BUS_DEVICE(&s->hace), errp)) { + return; + } + sysbus_mmio_map(SYS_BUS_DEVICE(&s->hace), 0, sc->memmap[ASPEED_DEV_HACE]); + sysbus_connect_irq(SYS_BUS_DEVICE(&s->hace), 0, + aspeed_soc_get_irq(s, ASPEED_DEV_HACE)); } static Property aspeed_soc_properties[] = { DEFINE_PROP_LINK("dram", AspeedSoCState, dram_mr, TYPE_MEMORY_REGION, From patchwork Fri Mar 12 10:57:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 398550 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp1096087jai; Fri, 12 Mar 2021 03:05:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJzhaUPapHdkPq3XZS8uzZk57P3xOVNgFUL4QjWZ5Wp2rlD88IzqCM5Q6NFKZlIXPKKdm065 X-Received: by 2002:a05:6e02:174f:: with SMTP id y15mr2542409ill.304.1615547102760; Fri, 12 Mar 2021 03:05:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615547102; cv=none; d=google.com; s=arc-20160816; b=S1iLB/h2T0Ga+thAEF4MfJnEAO1zNoyc6hu/KeET3JdbZ/xHx2FEBoZHzs1Dv0wLO6 Iy1d9l5Uk+G+AlpHGwBAWu5zjdU3vduXnnMQ3/kUePk/Eq2UACJebIurfouru7oUYhIT 6w2zw9noQxUlIVBFGIPQt/o6a2u3j8qu9bUiUKpFjsDGwHKrWI411m1bGA6dlWCtBtXC iVzWy/TXuwQr0t7fujk6ZAq3SgJCBnPJ7XjKf/UtPnZDZ14wmJ8pPz/38L2RR9G0o3cB 8Qrr/mymaT/ErNWlQYLSC7l5K6nyc52c/g49lfbs5/WqorJ1qk8Bmkzaqyt7mhCUsX7x H7Cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=vWqXt+s+YyOcqmr0fllSCaROYeCkQgY2HzrpIeyZvn0=; b=Ahs0lobHF6LCm3a/4Zy/wgPqSAfthPdvGBolxhvUNEh0Ud5zjULwirLayKUgwphM4H 6gNXdLU1TkUKD7w3zpt8uuV3DlV6ZKKj+oAVywoameNfvzPhe+bhez5Wxa9n6Poy9SKu 0J7/0NzYrHtyhcyjjf7aJ6hsO/hi1GpuoBJVzhYAQspehNRIc1o6JL8E8mtyTEZeHI1L khIlU54e2kUxYW+xC1f5dk3VW/WaV5geMGc2x4ZpBb1q6eG+ckA9ZkxEFyTRhtFlB1HV WWEJl7CVKfX40fZXQsa4TFgsk+krh+rGftHr3u7EkCwDNPIw3PhTAr7hRk86BovNCWdN xs8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=hAc4KJtS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id c1si4976227ilo.55.2021.03.12.03.05.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 12 Mar 2021 03:05:02 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=hAc4KJtS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1]:59470 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lKfbJ-0006R1-FQ for patch@linaro.org; Fri, 12 Mar 2021 06:05:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50410) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKfUA-0000a4-4y; Fri, 12 Mar 2021 05:57:38 -0500 Received: from mail-pj1-x1032.google.com ([2607:f8b0:4864:20::1032]:53775) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lKfU8-0003bf-5P; Fri, 12 Mar 2021 05:57:37 -0500 Received: by mail-pj1-x1032.google.com with SMTP id t18so4977923pjs.3; Fri, 12 Mar 2021 02:57:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vWqXt+s+YyOcqmr0fllSCaROYeCkQgY2HzrpIeyZvn0=; b=hAc4KJtSMDoxdXAKIjGneGSU5NVerQr/Hdoa/hvEs5sFcTRx7Q3aguthMpCeHQoAiR D6phAn+7U4wvAKN8z5Gnk7o4sOz9YtrQMjfu23NcI1fsqIm9QXcGr6A2MOvVfeInGN8j e9Bx6gvTCmwqI6qHSkKRYnVXQiBEi87tsZBWahdIlVKVeydfjxz38zi++6FSMBCZ1q8r Hjg94idmKhBVjTATHVXDLrqZB8Ml5OuMFBXdwYlp3RtZpGdkTvkhTYjoGVsW24v2Xeyb j9A7OxMDz/uW/K2R6dYQvPOG3gtVNIavEeioE6pinkCMp+XCYsAycYXSpKHyyeoiQ0GJ lkGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=vWqXt+s+YyOcqmr0fllSCaROYeCkQgY2HzrpIeyZvn0=; b=sOn7e6u4nONwOZnKQCnFc9GlfgbRYU0AL/deQwRh1HtO+RMQpDHxdJPOGfHs/jlz/b Ak0lFoREfuTKHsQ9EDxZrSQfLIgZKiDfVMa7fA3xC1nCX9zi5z2k1RkKOFY9MraXMe4x /xOTmVelKpESaCdcGakhbhmoX8U+6aU+Oq+MQDvdkim41yDh/XujTQ2WyHOMu9kUbHjI 04fc6nZFIFrgIbR/4nEg5+tx42lxHFOceSFy7qw29zI7IiimsfTUGFbyywu5FobZFS6w 7saEO8eAOPtHJZu5/Pmw0raTvrGcUhTSih/flIJSdDoU+R56sPuyAkKpAklNoQ9pi2oA yfxw== X-Gm-Message-State: AOAM531R9TfiZxGLfbzcZUdbI/5zzS2wAKTiuWemgaBTB0Ii/caqUhvw yNi8ZclpmOo4Yvu8YlHounY= X-Received: by 2002:a17:90a:8505:: with SMTP id l5mr13478272pjn.100.1615546654295; Fri, 12 Mar 2021 02:57:34 -0800 (PST) Received: from localhost.localdomain ([45.124.203.14]) by smtp.gmail.com with ESMTPSA id p25sm5326793pfe.100.2021.03.12.02.57.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Mar 2021 02:57:33 -0800 (PST) From: Joel Stanley To: =?utf-8?q?C=C3=A9dric_Le_Goater?= , Thomas Huth , Laurent Vivier Subject: [PATCH v3 3/3] tests/qtest: Add test for Aspeed HACE Date: Fri, 12 Mar 2021 21:27:11 +1030 Message-Id: <20210312105711.551423-4-joel@jms.id.au> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210312105711.551423-1-joel@jms.id.au> References: <20210312105711.551423-1-joel@jms.id.au> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1032; envelope-from=joel.stan@gmail.com; helo=mail-pj1-x1032.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Jeffery , Paolo Bonzini , qemu-arm@nongnu.org, qemu-devel@nongnu.org, Peter Maydell Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This adds a test for the Aspeed Hash and Crypto (HACE) engine. It tests the currently implemented behavior of the hash functionality. The tests are similar, but are cut/pasted instead of broken out into a common function so the assert machinery produces useful output when a test fails. Signed-off-by: Joel Stanley --- v3: Write test without libqtest-single.h --- tests/qtest/aspeed_hace-test.c | 214 +++++++++++++++++++++++++++++++++ MAINTAINERS | 1 + tests/qtest/meson.build | 3 + 3 files changed, 218 insertions(+) create mode 100644 tests/qtest/aspeed_hace-test.c -- 2.30.1 Acked-by: Thomas Huth diff --git a/tests/qtest/aspeed_hace-test.c b/tests/qtest/aspeed_hace-test.c new file mode 100644 index 000000000000..f1c79b3acb38 --- /dev/null +++ b/tests/qtest/aspeed_hace-test.c @@ -0,0 +1,214 @@ +/* + * QTest testcase for the ASPEED Hash and Crypto Engine + * + * SPDX-License-Identifier: GPL-2.0-or-later + * Copyright 2021 IBM Corp. + */ + +#include "qemu/osdep.h" + +#include "libqos/libqtest.h" +#include "qemu-common.h" +#include "qemu/bitops.h" + +#define HACE_BASE 0x1e6d0000 + +#define HACE_CMD 0x10 +#define HACE_SHA_BE_EN BIT(3) +#define HACE_MD5_LE_EN BIT(2) +#define HACE_ALGO_MD5 0 +#define HACE_ALGO_SHA1 BIT(5) +#define HACE_ALGO_SHA224 BIT(6) +#define HACE_ALGO_SHA256 (BIT(4) | BIT(6)) +#define HACE_ALGO_SHA512 (BIT(5) | BIT(6)) +#define HACE_ALGO_SHA384 (BIT(5) | BIT(6) | BIT(10)) +#define HACE_SG_EN BIT(18) + +#define HACE_STS (HACE_BASE + 0x1c) +#define HACE_RSA_ISR BIT(13) +#define HACE_CRYPTO_ISR BIT(12) +#define HACE_HASH_ISR BIT(9) +#define HACE_RSA_BUSY BIT(2) +#define HACE_CRYPTO_BUSY BIT(1) +#define HACE_HASH_BUSY BIT(0) +#define HACE_HASH_SRC (HACE_BASE + 0x20) +#define HACE_HASH_DIGEST (HACE_BASE + 0x24) +#define HACE_HASH_KEY_BUFF (HACE_BASE + 0x28) +#define HACE_HASH_DATA_LEN (HACE_BASE + 0x2c) +#define HACE_HASH_CMD (HACE_BASE + 0x30) + +/* + * Test vector is the ascii "abc" + * + * Expected results were generated using command line utitiles: + * + * echo -n -e 'abc' | dd of=/tmp/test + * for hash in sha512sum sha256sum md5sum; do $hash /tmp/test; done + * + */ +static const uint8_t test_vector[] = {0x61, 0x62, 0x63}; + +static const uint8_t test_result_sha512[] = { + 0xdd, 0xaf, 0x35, 0xa1, 0x93, 0x61, 0x7a, 0xba, 0xcc, 0x41, 0x73, 0x49, + 0xae, 0x20, 0x41, 0x31, 0x12, 0xe6, 0xfa, 0x4e, 0x89, 0xa9, 0x7e, 0xa2, + 0x0a, 0x9e, 0xee, 0xe6, 0x4b, 0x55, 0xd3, 0x9a, 0x21, 0x92, 0x99, 0x2a, + 0x27, 0x4f, 0xc1, 0xa8, 0x36, 0xba, 0x3c, 0x23, 0xa3, 0xfe, 0xeb, 0xbd, + 0x45, 0x4d, 0x44, 0x23, 0x64, 0x3c, 0xe8, 0x0e, 0x2a, 0x9a, 0xc9, 0x4f, + 0xa5, 0x4c, 0xa4, 0x9f}; + +static const uint8_t test_result_sha256[] = { + 0xba, 0x78, 0x16, 0xbf, 0x8f, 0x01, 0xcf, 0xea, 0x41, 0x41, 0x40, 0xde, + 0x5d, 0xae, 0x22, 0x23, 0xb0, 0x03, 0x61, 0xa3, 0x96, 0x17, 0x7a, 0x9c, + 0xb4, 0x10, 0xff, 0x61, 0xf2, 0x00, 0x15, 0xad}; + +static const uint8_t test_result_md5[] = { + 0x90, 0x01, 0x50, 0x98, 0x3c, 0xd2, 0x4f, 0xb0, 0xd6, 0x96, 0x3f, 0x7d, + 0x28, 0xe1, 0x7f, 0x72}; + +static void write_regs(QTestState *s, uint64_t src, uint64_t length, + uint64_t out, uint32_t method) +{ + qtest_writel(s, HACE_HASH_SRC, src); + qtest_writel(s, HACE_HASH_DIGEST, out); + qtest_writel(s, HACE_HASH_DATA_LEN, length); + qtest_writel(s, HACE_HASH_CMD, HACE_SHA_BE_EN | method); +} + +static void test_md5(void) +{ + QTestState *s = qtest_init("-machine ast2600-evb"); + + uint64_t src_addr = 0x80000000; + uint64_t digest_addr = 0x81000000; + uint8_t digest[16] = {0}; + + /* Check engine is idle, no busy or irq bits set */ + g_assert_cmphex(qtest_readl(s, HACE_STS), ==, 0); + + /* Write test vector into memory */ + qtest_memwrite(s, src_addr, test_vector, sizeof(test_vector)); + + write_regs(s, src_addr, sizeof(test_vector), digest_addr, HACE_ALGO_MD5); + + /* Check hash IRQ status is asserted */ + g_assert_cmphex(qtest_readl(s, HACE_STS), ==, 0x00000200); + + /* Clear IRQ status and check status is deasserted */ + qtest_writel(s, HACE_STS, 0x00000200); + g_assert_cmphex(qtest_readl(s, HACE_STS), ==, 0); + + /* Read computed digest from memory */ + qtest_memread(s, digest_addr, digest, sizeof(digest)); + + /* Check result of computation */ + g_assert_cmpmem(digest, sizeof(digest), + test_result_md5, sizeof(digest)); +} + +static void test_sha256(void) +{ + QTestState *s = qtest_init("-machine ast2600-evb"); + + uint64_t src_addr = 0x80000000; + uint64_t digest_addr = 0x81000000; + uint8_t digest[32] = {0}; + + /* Check engine is idle, no busy or irq bits set */ + g_assert_cmphex(qtest_readl(s, HACE_STS), ==, 0); + + /* Write test vector into memory */ + qtest_memwrite(s, src_addr, test_vector, sizeof(test_vector)); + + write_regs(s, src_addr, sizeof(test_vector), digest_addr, HACE_ALGO_SHA256); + + /* Check hash IRQ status is asserted */ + g_assert_cmphex(qtest_readl(s, HACE_STS), ==, 0x00000200); + + /* Clear IRQ status and check status is deasserted */ + qtest_writel(s, HACE_STS, 0x00000200); + g_assert_cmphex(qtest_readl(s, HACE_STS), ==, 0); + + /* Read computed digest from memory */ + qtest_memread(s, digest_addr, digest, sizeof(digest)); + + /* Check result of computation */ + g_assert_cmpmem(digest, sizeof(digest), + test_result_sha256, sizeof(digest)); +} + +static void test_sha512(void) +{ + QTestState *s = qtest_init("-machine ast2600-evb"); + + uint64_t src_addr = 0x80000000; + uint64_t digest_addr = 0x81000000; + uint8_t digest[64] = {0}; + + /* Check engine is idle, no busy or irq bits set */ + g_assert_cmphex(qtest_readl(s, HACE_STS), ==, 0); + + /* Write test vector into memory */ + qtest_memwrite(s, src_addr, test_vector, sizeof(test_vector)); + + write_regs(s, src_addr, sizeof(test_vector), digest_addr, HACE_ALGO_SHA512); + + /* Check hash IRQ status is asserted */ + g_assert_cmphex(qtest_readl(s, HACE_STS), ==, 0x00000200); + + /* Clear IRQ status and check status is deasserted */ + qtest_writel(s, HACE_STS, 0x00000200); + g_assert_cmphex(qtest_readl(s, HACE_STS), ==, 0); + + /* Read computed digest from memory */ + qtest_memread(s, digest_addr, digest, sizeof(digest)); + + /* Check result of computation */ + g_assert_cmpmem(digest, sizeof(digest), + test_result_sha512, sizeof(digest)); +} + +static void test_addresses(void) +{ + QTestState *s = qtest_init("-machine ast2600-evb"); + + /* + * Check command mode is zero, meaning engine is in direct access mode, + * as this affects the masking behavior of the HASH_SRC register. + */ + g_assert_cmphex(qtest_readl(s, HACE_CMD), ==, 0); + g_assert_cmphex(qtest_readl(s, HACE_HASH_SRC), ==, 0); + g_assert_cmphex(qtest_readl(s, HACE_HASH_DIGEST), ==, 0); + g_assert_cmphex(qtest_readl(s, HACE_HASH_DATA_LEN), ==, 0); + + /* Check that the address masking is correct */ + qtest_writel(s, HACE_HASH_SRC, 0xffffffff); + g_assert_cmphex(qtest_readl(s, HACE_HASH_SRC), ==, 0x7fffffff); + + qtest_writel(s, HACE_HASH_DIGEST, 0xffffffff); + g_assert_cmphex(qtest_readl(s, HACE_HASH_DIGEST), ==, 0x7ffffff8); + + qtest_writel(s, HACE_HASH_DATA_LEN, 0xffffffff); + g_assert_cmphex(qtest_readl(s, HACE_HASH_DATA_LEN), ==, 0x0fffffff); + + /* Reset to zero */ + qtest_writel(s, HACE_HASH_SRC, 0); + qtest_writel(s, HACE_HASH_DIGEST, 0); + qtest_writel(s, HACE_HASH_DATA_LEN, 0); + + /* Check that all bits are now zero */ + g_assert_cmphex(qtest_readl(s, HACE_HASH_SRC), ==, 0); + g_assert_cmphex(qtest_readl(s, HACE_HASH_DIGEST), ==, 0); + g_assert_cmphex(qtest_readl(s, HACE_HASH_DATA_LEN), ==, 0); +} + +int main(int argc, char **argv) +{ + g_test_init(&argc, &argv, NULL); + + qtest_add_func("aspeed/hace/addresses", test_addresses); + qtest_add_func("aspeed/hace/sha512", test_sha512); + qtest_add_func("aspeed/hace/sha256", test_sha256); + qtest_add_func("aspeed/hace/md5", test_md5); + + return g_test_run(); +} diff --git a/MAINTAINERS b/MAINTAINERS index 8e9f0d591ee2..c74271ba3e01 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1026,6 +1026,7 @@ F: include/hw/misc/pca9552*.h F: hw/net/ftgmac100.c F: include/hw/net/ftgmac100.h F: docs/system/arm/aspeed.rst +F: tests/qtest/*aspeed* NRF51 M: Joel Stanley diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 2688e1bfad7f..2eec06b10094 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -156,12 +156,15 @@ qtests_npcm7xx = \ 'npcm7xx_timer-test', 'npcm7xx_watchdog_timer-test'] + \ (slirp.found() ? ['npcm7xx_emc-test'] : []) +qtests_aspeed = \ + ['aspeed_hace-test'] qtests_arm = \ (config_all_devices.has_key('CONFIG_MPS2') ? ['sse-timer-test'] : []) + \ (config_all_devices.has_key('CONFIG_CMSDK_APB_DUALTIMER') ? ['cmsdk-apb-dualtimer-test'] : []) + \ (config_all_devices.has_key('CONFIG_CMSDK_APB_TIMER') ? ['cmsdk-apb-timer-test'] : []) + \ (config_all_devices.has_key('CONFIG_CMSDK_APB_WATCHDOG') ? ['cmsdk-apb-watchdog-test'] : []) + \ (config_all_devices.has_key('CONFIG_PFLASH_CFI02') ? ['pflash-cfi02-test'] : []) + \ + (config_all_devices.has_key('CONFIG_ASPEED_SOC') ? qtests_aspeed : []) + \ (config_all_devices.has_key('CONFIG_NPCM7XX') ? qtests_npcm7xx : []) + \ ['arm-cpu-features', 'microbit-test',