From patchwork Mon Mar 1 19:24:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danny Milosavljevic X-Patchwork-Id: 1445737 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=datacom-wien.20150623.gappssmtp.com header.i=@datacom-wien.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=if8Km4cH; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Dq9G52jxcz9sVt for ; Tue, 2 Mar 2021 06:25:31 +1100 (AEDT) Received: from localhost ([::1]:34716 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lGoAb-0006hx-Ej for incoming@patchwork.ozlabs.org; Mon, 01 Mar 2021 14:25:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43666) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lGo9o-0006hU-No for qemu-devel@nongnu.org; Mon, 01 Mar 2021 14:24:40 -0500 Received: from mail-lf1-x135.google.com ([2a00:1450:4864:20::135]:36004) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lGo9j-0006HM-Ms for qemu-devel@nongnu.org; Mon, 01 Mar 2021 14:24:38 -0500 Received: by mail-lf1-x135.google.com with SMTP id f1so27363898lfu.3 for ; Mon, 01 Mar 2021 11:24:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=datacom-wien.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VEo9Eiy8vjye84vTRLFgEJdqewoF5w7bpdIfR33P/zI=; b=if8Km4cHBGoJ7ed8ALj7i3ptenSWemuCWApKuPcIwlkiOIv1yrzegN9Ly5/RDGPMOJ YMX2Nx5GtLXiPim+Rr4XAiT1iT6oQJWy2v1oMDEutq67EUe8rmvW1ghTDAxuBg0o9B9F MkymFLV4DLY1Hhv8SKtSCGx0gOpt81b6qp5fM/gBzoEMMyBbwbyUvqxhK+eIfx1HgPmI GYEcN9GAhXb3EoTacmzdo8gWUJm6MkmLFngN6ayvWnMeoRC0CbUYQ/4X44jrhnML5F+3 GbRFGS01ghJHlcsJ+nC9QCFy7HgsZW+SA1fXZGIzVTAHtPNQCK4OxyR7OEqz6FF/7+4a EeEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VEo9Eiy8vjye84vTRLFgEJdqewoF5w7bpdIfR33P/zI=; b=JZj7xRWWX+9y9fBtAdVJl9QF8tAuN6vrPP/omlhOHj8/LDWpaCMXaJzuQGV7RcEl00 A55jTxeOFPzauWvhN1UsBqsjFU1JUWSB7dutUAE0a1L/s9iod3W2NU/EIQ4fFyWD9zst WswC0S4/EcphcKGMnyZdLV111bLpqXRUTBWwq/9/XV24Hv3UuXAzLTcRuBGiiSkGBKkD jk23oQdYIsnAvNWeMI+kpvcUuBClmq6tWmN3WHR7kS+VxfKXuWDD/naKanOn7d36j1Qc PkRUaNWX+MoAJ/DYVYXECLSVmDHwzPiaxJ07D/Qc0qJYcwJD1V0PQw24nH2lHRJ7bzlZ 0k1w== X-Gm-Message-State: AOAM530i09QKuDeFSxy1CfQlzPdp4AUeeRfyg7jPdOCmuJHSIQUchM6i Lf8V1hvuaWH0L4ZrW7vXcYwZl4GSIDOV7g== X-Google-Smtp-Source: ABdhPJx6G6lEfixVcGK8yObX71f/dxr1XLrjANj9Ns7c5m1ZrO6v+0CDBKhtr0xqjdBhksxf8O0AXw== X-Received: by 2002:a05:6512:208b:: with SMTP id t11mr6480248lfr.131.1614626673515; Mon, 01 Mar 2021 11:24:33 -0800 (PST) Received: from dayas.lan (2a02-8388-0281-94f0-b958-b6e3-fc53-344d.cable.dynamic.v6.surfer.at. [2a02:8388:281:94f0:b958:b6e3:fc53:344d]) by smtp.gmail.com with ESMTPSA id z28sm1181170ljm.44.2021.03.01.11.24.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Mar 2021 11:24:33 -0800 (PST) From: Danny Milosavljevic To: qemu-devel@nongnu.org, rminnich@google.com Subject: [PATCH v2 1/1] i386: Add support for AMD new-style boot mechanism. Date: Mon, 1 Mar 2021 20:24:23 +0100 Message-Id: <20210301192423.32396-2-danny.milo@datacom.wien> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210301192423.32396-1-danny.milo@datacom.wien> References: <20210301192423.32396-1-danny.milo@datacom.wien> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::135; envelope-from=danny.milo@datacom.wien; helo=mail-lf1-x135.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Danny Milosavljevic Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This introduces a new generic-loader setting "csbaseaddr" that allows you to set the segment base address of CS. Signed-off-by: Danny Milosavljevic --- hw/core/generic-loader.c | 6 +++++- include/hw/core/cpu.h | 1 + include/hw/core/generic-loader.h | 1 + target/i386/cpu.c | 11 +++++++++++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/hw/core/generic-loader.c b/hw/core/generic-loader.c index 2b2a7b5e9a..1770ee0229 100644 --- a/hw/core/generic-loader.c +++ b/hw/core/generic-loader.c @@ -53,6 +53,9 @@ static void generic_loader_reset(void *opaque) cpu_reset(s->cpu); if (cc) { cc->set_pc(s->cpu, s->addr); + if (cc->set_csbase) { + cc->set_csbase(s->cpu, s->csbaseaddr); + } } } @@ -103,7 +106,7 @@ static void generic_loader_realize(DeviceState *dev, Error **errp) if (s->cpu_num != CPU_NONE) { s->set_pc = true; } - } else if (s->addr) { + } else if (s->addr || s->csbaseaddr) { /* User is setting the PC */ if (s->data || s->data_len || s->data_be) { error_setg(errp, "data can not be specified when setting a " @@ -180,6 +183,7 @@ static void generic_loader_unrealize(DeviceState *dev) } static Property generic_loader_props[] = { + DEFINE_PROP_UINT64("csbaseaddr", GenericLoaderState, csbaseaddr, 0xffff0000), DEFINE_PROP_UINT64("addr", GenericLoaderState, addr, 0), DEFINE_PROP_UINT64("data", GenericLoaderState, data, 0), DEFINE_PROP_UINT8("data-len", GenericLoaderState, data_len, 0), diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index c005d3dc2d..9998b6b986 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -161,6 +161,7 @@ struct CPUClass { void (*get_memory_mapping)(CPUState *cpu, MemoryMappingList *list, Error **errp); void (*set_pc)(CPUState *cpu, vaddr value); + void (*set_csbase)(CPUState *cpu, vaddr value); hwaddr (*get_phys_page_debug)(CPUState *cpu, vaddr addr); hwaddr (*get_phys_page_attrs_debug)(CPUState *cpu, vaddr addr, MemTxAttrs *attrs); diff --git a/include/hw/core/generic-loader.h b/include/hw/core/generic-loader.h index 19d87b39c8..b407d8e8e9 100644 --- a/include/hw/core/generic-loader.h +++ b/include/hw/core/generic-loader.h @@ -29,6 +29,7 @@ struct GenericLoaderState { /* */ CPUState *cpu; + uint64_t csbaseaddr; uint64_t addr; uint64_t data; uint8_t data_len; diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 6a53446e6a..7cb4634e18 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -7171,6 +7171,16 @@ static void x86_cpu_set_pc(CPUState *cs, vaddr value) cpu->env.eip = value; } +static void x86_cpu_set_csbase(CPUState *cs, vaddr value) +{ + X86CPU *cpu = X86_CPU(cs); + CPUX86State *env = &cpu->env; + + cpu_x86_load_seg_cache(env, R_CS, 0xf000, value, 0xffff, + DESC_P_MASK | DESC_S_MASK | DESC_CS_MASK | + DESC_R_MASK | DESC_A_MASK); +} + int x86_cpu_pending_interrupt(CPUState *cs, int interrupt_request) { X86CPU *cpu = X86_CPU(cs); @@ -7412,6 +7422,7 @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data) cc->dump_state = x86_cpu_dump_state; cc->set_pc = x86_cpu_set_pc; + cc->set_csbase = x86_cpu_set_csbase; cc->gdb_read_register = x86_cpu_gdb_read_register; cc->gdb_write_register = x86_cpu_gdb_write_register; cc->get_arch_id = x86_cpu_get_arch_id;