From nobody Thu Apr 3 21:43:00 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1741137810; cv=none; d=zohomail.com; s=zohoarc; b=E/b8zrDgooJjpYVQoZjkoJfs9kv6zxola7alPQVVL4U1oJhLM5bOIa44JoXlYwlObWeBI6f6gvVFTqsaddvHuOm1VCJ8IkYLb/Wct7ufoswhiiuPIu2DzRv9TDttqpZHX9AOmm9hHpNRawb+xLgsM66oi8KG/RgqtJ+yhXpNdBQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1741137810; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=3ljppgKKf0FYL9KCQRnRz1JHGPRuMWcGj+dWfaNgXo0=; b=FphdxYXJObnPGimLg0yrAjHgvcEWG1HHJ3hF9yTj4jkAiNVEBm/lBzlEwqdYYYPhYvlmlmBQFPXrKhTjf0AA0YUDyMLIpri6yQXxvjPbw41N/W5ZEcvjz4UMD0DGrNijoAVIEu3P1QlIEr8E2NKrnQt5e9mgsP5Os6UutMQVok8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1741137810427310.689226957924; Tue, 4 Mar 2025 17:23:30 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpdTo-0000bE-LS; Tue, 04 Mar 2025 20:23:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tpdSw-000891-7Q for qemu-devel@nongnu.org; Tue, 04 Mar 2025 20:22:32 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpdSs-0006wR-EM for qemu-devel@nongnu.org; Tue, 04 Mar 2025 20:22:28 -0500 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-43bcf9612f4so6814435e9.3 for ; Tue, 04 Mar 2025 17:22:25 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43bd42badefsm1958265e9.18.2025.03.04.17.22.23 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 04 Mar 2025 17:22:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741137744; x=1741742544; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3ljppgKKf0FYL9KCQRnRz1JHGPRuMWcGj+dWfaNgXo0=; b=UMu3rZL2IEOhkXDKWSjeHFpBiUG+fouCNsKbc/WosDhRm8emdKaKW9ZjTA7f9WRRMN c8ek8ITMzmTqaj8kReF9rpgshr+HQARhia5oX5dt+vdKq3wlHiA25RhfA/rY7qESK7pN FTL6e/fA95VPWRCFdNchJi3MtXvCXcYqQyRjpu2TFmTgiXDYFyCXswSfiJtDW3HEdxGO txZljMgmbhkrWlQ7fIfpOHC6wlj3ZamKwnwWFi9CiE2v9u3iXEHgRcdeBXlIqSUimREd +4opBixbb5piZDtzmQrcgCI1165I9mvLUK4sNBmKhLqrAuwBMxJ4TEq5n2mzUqjMFare 4TLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741137744; x=1741742544; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3ljppgKKf0FYL9KCQRnRz1JHGPRuMWcGj+dWfaNgXo0=; b=AZQeLS1qr6DJXD2o3+c4jrE0rzqql5GEF8LPmP+XBFPFvBQaXhzbzzenZBdHsHjQL2 HHzNS6m/jfSquw1+K1/wIHJoTjpmYi7rtkf1hCvWA9/+AFJV2AvFWzOKOVvesWg3ekBG BAloVuBItPqBxZ+aThT7xHuctniD3Kfo2teM0/w4w2VNHlbNh6vFXYhFuvir4IS9VJbO JSEsrjp6J1KT9ORKNZfwD0VKvE5b52DV9nwvkcMJ/Jr58y5xXht75vpMojwid13U8wsU dAURZdSbzP/YIzHc1hr4mwq87Un+jthlWRHuXRzFlAEO7yu5yBWyyhZepE+1XnAKfYSm VAKA== X-Gm-Message-State: AOJu0Ywvfis8yJnhSTKcsBEba7HFYY/6V31gBOn8uAqGSLbtL98Hwiz6 Ea+LuFZSYzg5/SY8P5IkJwL2ezS09Imkx6tr9WtUo1QB3EVKKzkL1IXsis6/svMCFYP7dA+a9+d pQ5c= X-Gm-Gg: ASbGncuX6mMotMeJN1EOM3q5WIM5mN0Rgat8GDGRjfnPufyBrzoVFt73yZDhRN2cJYU xoyaKwJqSt059kGuoKmNZSqiuFQLGZpJMCsLC5y9GceZ1lAbW2tXHSItj9/gj+2pFTAp8NnD0UL adN2eRb6d2STJRGwGxMKY9iccNXqnddJ1bO3f6jSiVaDvO/LD5W9HJr0dkAlUAkOI06VD5b2fMI W3p1UUvwHMAcx8d5gtMaOPfk6d4LEMhdjEmVtRaJLnqUN3R9cTNGpaOq7I5vwjZa8by4PvHkLf/ x0MdAEtdgU3FMMd3gk3KYP8IBAzEGyQNo/C3uwWIJYZxksstkU6pofeNN3XpuLMvsc9YPcrpCqp b00U19Z+SD1sMquMb13M= X-Google-Smtp-Source: AGHT+IFDa7ch6resmZpDErhy4KzOvi10qiw58MIg5oVsE1pH93gq/1cewZIfx/0VMF2rme/3y/Z2eg== X-Received: by 2002:a05:600c:3ba8:b0:43b:cd0d:944f with SMTP id 5b1f17b1804b1-43bd2945f10mr7214395e9.5.1741137744212; Tue, 04 Mar 2025 17:22:24 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Alexander Graf , Phil Dennis-Jordan , Akihiko Odaki , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 05/41] hw/vmapple/bdif: Introduce vmapple backdoor interface Date: Wed, 5 Mar 2025 02:21:20 +0100 Message-ID: <20250305012157.96463-6-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250305012157.96463-1-philmd@linaro.org> References: <20250305012157.96463-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1741137812789019000 From: Alexander Graf The VMApple machine exposes AUX and ROOT block devices (as well as USB OTG emulation) via virtio-pci as well as a special, simple backdoor platform device. This patch implements this backdoor platform device to the best of my understanding. I left out any USB OTG parts; they're only needed for guest recovery and I don't understand the protocol yet. Signed-off-by: Alexander Graf Signed-off-by: Phil Dennis-Jordan Reviewed-by: Akihiko Odaki Tested-by: Akihiko Odaki Message-ID: <20241223221645.29911-11-phil@philjordan.eu> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/vmapple/vmapple.h | 2 + hw/vmapple/bdif.c | 274 +++++++++++++++++++++++++++++++++++ hw/vmapple/Kconfig | 3 + hw/vmapple/meson.build | 1 + hw/vmapple/trace-events | 5 + 5 files changed, 285 insertions(+) create mode 100644 hw/vmapple/bdif.c diff --git a/include/hw/vmapple/vmapple.h b/include/hw/vmapple/vmapple.h index 6762b6c869f..9090e9c5ac8 100644 --- a/include/hw/vmapple/vmapple.h +++ b/include/hw/vmapple/vmapple.h @@ -14,4 +14,6 @@ =20 #define TYPE_APPLE_AES "apple-aes" =20 +#define TYPE_VMAPPLE_BDIF "vmapple-bdif" + #endif /* HW_VMAPPLE_VMAPPLE_H */ diff --git a/hw/vmapple/bdif.c b/hw/vmapple/bdif.c new file mode 100644 index 00000000000..5827dd2aab8 --- /dev/null +++ b/hw/vmapple/bdif.c @@ -0,0 +1,274 @@ +/* + * VMApple Backdoor Interface + * + * Copyright =C2=A9 2023 Amazon.com, Inc. or its affiliates. All Rights Re= served. + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qemu/units.h" +#include "qemu/log.h" +#include "qemu/module.h" +#include "trace.h" +#include "hw/vmapple/vmapple.h" +#include "hw/sysbus.h" +#include "hw/block/block.h" +#include "qapi/error.h" +#include "system/block-backend.h" +#include "system/dma.h" + +OBJECT_DECLARE_SIMPLE_TYPE(VMAppleBdifState, VMAPPLE_BDIF) + +struct VMAppleBdifState { + SysBusDevice parent_obj; + + BlockBackend *aux; + BlockBackend *root; + MemoryRegion mmio; +}; + +#define VMAPPLE_BDIF_SIZE 0x00200000 + +#define REG_DEVID_MASK 0xffff0000 +#define DEVID_ROOT 0x00000000 +#define DEVID_AUX 0x00010000 +#define DEVID_USB 0x00100000 + +#define REG_STATUS 0x0 +#define REG_STATUS_ACTIVE BIT(0) +#define REG_CFG 0x4 +#define REG_CFG_ACTIVE BIT(1) +#define REG_UNK1 0x8 +#define REG_BUSY 0x10 +#define REG_BUSY_READY BIT(0) +#define REG_UNK2 0x400 +#define REG_CMD 0x408 +#define REG_NEXT_DEVICE 0x420 +#define REG_UNK3 0x434 + +typedef struct VblkSector { + uint32_t pad; + uint32_t pad2; + uint32_t sector; + uint32_t pad3; +} VblkSector; + +typedef struct VblkReqCmd { + uint64_t addr; + uint32_t len; + uint32_t flags; +} VblkReqCmd; + +typedef struct VblkReq { + VblkReqCmd sector; + VblkReqCmd data; + VblkReqCmd retval; +} VblkReq; + +#define VBLK_DATA_FLAGS_READ 0x00030001 +#define VBLK_DATA_FLAGS_WRITE 0x00010001 + +#define VBLK_RET_SUCCESS 0 +#define VBLK_RET_FAILED 1 + +static uint64_t bdif_read(void *opaque, hwaddr offset, unsigned size) +{ + uint64_t ret =3D -1; + uint64_t devid =3D offset & REG_DEVID_MASK; + + switch (offset & ~REG_DEVID_MASK) { + case REG_STATUS: + ret =3D REG_STATUS_ACTIVE; + break; + case REG_CFG: + ret =3D REG_CFG_ACTIVE; + break; + case REG_UNK1: + ret =3D 0x420; + break; + case REG_BUSY: + ret =3D REG_BUSY_READY; + break; + case REG_UNK2: + ret =3D 0x1; + break; + case REG_UNK3: + ret =3D 0x0; + break; + case REG_NEXT_DEVICE: + switch (devid) { + case DEVID_ROOT: + ret =3D 0x8000000; + break; + case DEVID_AUX: + ret =3D 0x10000; + break; + } + break; + } + + trace_bdif_read(offset, size, ret); + return ret; +} + +static void le2cpu_sector(VblkSector *sector) +{ + sector->sector =3D le32_to_cpu(sector->sector); +} + +static void le2cpu_reqcmd(VblkReqCmd *cmd) +{ + cmd->addr =3D le64_to_cpu(cmd->addr); + cmd->len =3D le32_to_cpu(cmd->len); + cmd->flags =3D le32_to_cpu(cmd->flags); +} + +static void le2cpu_req(VblkReq *req) +{ + le2cpu_reqcmd(&req->sector); + le2cpu_reqcmd(&req->data); + le2cpu_reqcmd(&req->retval); +} + +static void vblk_cmd(uint64_t devid, BlockBackend *blk, uint64_t gp_addr, + uint64_t static_off) +{ + VblkReq req; + VblkSector sector; + uint64_t off =3D 0; + g_autofree char *buf =3D NULL; + uint8_t ret =3D VBLK_RET_FAILED; + int r; + MemTxResult dma_result; + + dma_result =3D dma_memory_read(&address_space_memory, gp_addr, + &req, sizeof(req), MEMTXATTRS_UNSPECIFIED= ); + if (dma_result !=3D MEMTX_OK) { + goto out; + } + + le2cpu_req(&req); + + if (req.sector.len !=3D sizeof(sector)) { + goto out; + } + + /* Read the vblk command */ + dma_result =3D dma_memory_read(&address_space_memory, req.sector.addr, + §or, sizeof(sector), + MEMTXATTRS_UNSPECIFIED); + if (dma_result !=3D MEMTX_OK) { + goto out; + } + le2cpu_sector(§or); + + off =3D sector.sector * 512ULL + static_off; + + /* Sanity check that we're not allocating bogus sizes */ + if (req.data.len > 128 * MiB) { + goto out; + } + + buf =3D g_malloc0(req.data.len); + switch (req.data.flags) { + case VBLK_DATA_FLAGS_READ: + r =3D blk_pread(blk, off, req.data.len, buf, 0); + trace_bdif_vblk_read(devid =3D=3D DEVID_AUX ? "aux" : "root", + req.data.addr, off, req.data.len, r); + if (r < 0) { + goto out; + } + dma_result =3D dma_memory_write(&address_space_memory, req.data.ad= dr, buf, + req.data.len, MEMTXATTRS_UNSPECIFIED= ); + if (dma_result =3D=3D MEMTX_OK) { + ret =3D VBLK_RET_SUCCESS; + } + break; + case VBLK_DATA_FLAGS_WRITE: + /* Not needed, iBoot only reads */ + break; + default: + break; + } + +out: + dma_memory_write(&address_space_memory, req.retval.addr, &ret, 1, + MEMTXATTRS_UNSPECIFIED); +} + +static void bdif_write(void *opaque, hwaddr offset, + uint64_t value, unsigned size) +{ + VMAppleBdifState *s =3D opaque; + uint64_t devid =3D (offset & REG_DEVID_MASK); + + trace_bdif_write(offset, size, value); + + switch (offset & ~REG_DEVID_MASK) { + case REG_CMD: + switch (devid) { + case DEVID_ROOT: + vblk_cmd(devid, s->root, value, 0x0); + break; + case DEVID_AUX: + vblk_cmd(devid, s->aux, value, 0x0); + break; + } + break; + } +} + +static const MemoryRegionOps bdif_ops =3D { + .read =3D bdif_read, + .write =3D bdif_write, + .endianness =3D DEVICE_NATIVE_ENDIAN, + .valid =3D { + .min_access_size =3D 1, + .max_access_size =3D 8, + }, + .impl =3D { + .min_access_size =3D 1, + .max_access_size =3D 8, + }, +}; + +static void bdif_init(Object *obj) +{ + VMAppleBdifState *s =3D VMAPPLE_BDIF(obj); + + memory_region_init_io(&s->mmio, obj, &bdif_ops, obj, + "VMApple Backdoor Interface", VMAPPLE_BDIF_SIZE); + sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->mmio); +} + +static const Property bdif_properties[] =3D { + DEFINE_PROP_DRIVE("aux", VMAppleBdifState, aux), + DEFINE_PROP_DRIVE("root", VMAppleBdifState, root), +}; + +static void bdif_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + + dc->desc =3D "VMApple Backdoor Interface"; + device_class_set_props(dc, bdif_properties); +} + +static const TypeInfo bdif_info =3D { + .name =3D TYPE_VMAPPLE_BDIF, + .parent =3D TYPE_SYS_BUS_DEVICE, + .instance_size =3D sizeof(VMAppleBdifState), + .instance_init =3D bdif_init, + .class_init =3D bdif_class_init, +}; + +static void bdif_register_types(void) +{ + type_register_static(&bdif_info); +} + +type_init(bdif_register_types) diff --git a/hw/vmapple/Kconfig b/hw/vmapple/Kconfig index b1944d73129..ff5f97c292e 100644 --- a/hw/vmapple/Kconfig +++ b/hw/vmapple/Kconfig @@ -2,3 +2,6 @@ =20 config VMAPPLE_AES bool + +config VMAPPLE_BDIF + bool diff --git a/hw/vmapple/meson.build b/hw/vmapple/meson.build index a701d06a39d..e2aca6b7c2b 100644 --- a/hw/vmapple/meson.build +++ b/hw/vmapple/meson.build @@ -1,3 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-or-later =20 system_ss.add(when: 'CONFIG_VMAPPLE_AES', if_true: files('aes.c')) +system_ss.add(when: 'CONFIG_VMAPPLE_BDIF', if_true: files('bdif.c')) diff --git a/hw/vmapple/trace-events b/hw/vmapple/trace-events index 188547a6ad8..93380ede145 100644 --- a/hw/vmapple/trace-events +++ b/hw/vmapple/trace-events @@ -14,3 +14,8 @@ aes_write(uint64_t offset, uint64_t val) "offset=3D0x%"PR= Ix64" val=3D0x%"PRIx64 aes_2_read(uint64_t offset, uint64_t res) "offset=3D0x%"PRIx64" res=3D0x%"= PRIx64 aes_2_write(uint64_t offset, uint64_t val) "offset=3D0x%"PRIx64" val=3D0x%= "PRIx64 aes_dump_data(const char *desc, const char *hex) "%s%s" + +# bdif.c +bdif_read(uint64_t offset, uint32_t size, uint64_t value) "offset=3D0x%"PR= Ix64" size=3D0x%x value=3D0x%"PRIx64 +bdif_write(uint64_t offset, uint32_t size, uint64_t value) "offset=3D0x%"P= RIx64" size=3D0x%x value=3D0x%"PRIx64 +bdif_vblk_read(const char *dev, uint64_t addr, uint64_t offset, uint32_t l= en, int r) "dev=3D%s addr=3D0x%"PRIx64" off=3D0x%"PRIx64" size=3D0x%x r=3D%= d" --=20 2.47.1