From nobody Tue May 21 02:38:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1661338818; cv=none; d=zohomail.com; s=zohoarc; b=WloZD/g2iI0ZCFPJGjZnePzOTwYeJvEuYBSicXAqSAM2CuGwEczZa/xEzv+jUTeOoLSuayUrwydWF2iSMa6JAZdoGaR1aGWR8/JpaXlDOMoJ83qx9a1z0jWiwszZJXc3FkgVbHMRkecGjJIDjmDBDkEXJW+YGNr/rBeB2bsyGVw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661338818; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=n+b+GlPhxE+OZEkdEEAi+Qtv4cAEYyGyzls/+mjXrC4=; b=Y5dx8ggtO/nRS5rWIhFEsQxof/VIDubDBFvHR54qKQrY00f/xpEJqrZ1NYVArcVGFsPjhsG30y23DWn2L7e+IvuRQQA4OGX/o8Wie4HPsWj6tm/Qku6PoHB8lbBPDY2fIJTENp0TKpPBT/rPA0aop8QakAbj4EgA+NRx5sjmeQE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1661338818673350.5934892959882; Wed, 24 Aug 2022 04:00:18 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.392408.630758 (Exim 4.92) (envelope-from ) id 1oQo6w-0001m2-Bl; Wed, 24 Aug 2022 10:59:50 +0000 Received: by outflank-mailman (output) from mailman id 392408.630758; Wed, 24 Aug 2022 10:59:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oQo6w-0001lv-8L; Wed, 24 Aug 2022 10:59:50 +0000 Received: by outflank-mailman (input) for mailman id 392408; Wed, 24 Aug 2022 10:59:49 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oQo6v-0001Gd-F5 for xen-devel@lists.xenproject.org; Wed, 24 Aug 2022 10:59:49 +0000 Received: from esa4.hc3370-68.iphmx.com (esa4.hc3370-68.iphmx.com [216.71.155.144]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id ddf38264-239b-11ed-bd2e-47488cf2e6aa; Wed, 24 Aug 2022 12:59:48 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: ddf38264-239b-11ed-bd2e-47488cf2e6aa DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1661338788; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Ea/jZybnglsFeEUUogUtQhSeX6C4gXqXHZmw0VungnM=; b=HtyCeLI6lV2V58EgSV5c5dRbDNw4ZHHnMAh7hqufekUwqER9cN6mqlTr 0OLWhd9O020mIeEEWYBiKKwSx5yaHE+1V1XD9PerCHCntVAHdf9wsyJca 4O552hogsL+H4P1cNmoeS8nRu/g6fK1ELvEjehOiq/Cu1EhWXKRmvPyYQ M=; Authentication-Results: esa4.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none X-SBRS: 2.7 X-MesageID: 81343715 X-Ironport-Server: esa4.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:znvxNq8b1l343a/kqLatDrUD436TJUtcMsCJ2f8bNWPcYEJGY0x3n GMWWj3XOKrZMTD2c9p2bdzjoE8Eu5LVmoMwGgBoryk8E34SpcT7XtnIdU2Y0wF+jyHgoOCLy +1EN7Es+ehtFie0Si+Fa+Sn9z8kvU2xbuKUIPbePSxsThNTRi4kiBZy88Y0mYctitWia++3k YqaT/b3ZRn0gFaYDkpOs/jZ8EM14Kyr0N8llgdWic5j7Qe2e0Y9VPrzFYnpR1PkT49dGPKNR uqr5NlVKUuAon/Bovv8+lrKWhViroz6ZGBiuVIPM0SWuTBQpzRa70oOHKF0hXG7Kdm+t4sZJ N1l7fRcQOqyV0HGsLx1vxJwS0mSMUDakVNuzLfWXcG7liX7n3XQL/pGFwJmMaIy0f9LGCJEp dYHaz0KP0vEiLfjqF67YrEEasULKcDqOMUUu216zCGfBvEjKXzBa/yUv5kChm52350QW6aFD yYaQWMHgBDoShtDIFoITrk5m/+lnCLXeDxEslOF46Ew5gA/ySQhieOxa4WMJ7RmQ+0MpU+yl mnE/l2gGzUnKPiuw2Gv0y2F07qncSTTB9tJSezQGuRRqEKX7nweDlsRT1TTiduTh1O6WtlfA 1cJ4Sdopq83nGS7Q9+4UxCmrXqsuh8HR8EWA+A88BuKyKff/0CeHGdsc9JaQIV47olsH2Vsj wLX2YOybdByjFGLYWnepru7hxirBTFWJz8oemwJSlpepNa29enfkSnzosZf/L+d14OrQGupk mDW8UDSlJ1I05dVivzTEUTvxmv1+8OXFlNdChD/BDrN0+9vWGKyi2VEA3D/5O0IEouWR0LpU JMsy5nHt7Bm4X1geUWwrAQx8FKBva/t3MX02wIHInXY323FF4SfVY5R+ipiA0xiL9wJfzTkC GeK510IvsACbSH0Nv8nC25UNyjN5fmIKDgYfqqMMoomjmZZLmdrAx2ClWbPhjuwwSDAYIk0O IuBcNbEMEv2/Z9PlWPuL9rxJJdxmUjSM0uPGs2gp/lmuJLCDEOopUAtagLVMbtktvvd+W04M b93bqO39vmWa8WmCgG/zGLZBQliwaQTbXwul/FqSw== IronPort-HdrOrdr: A9a23:F4VgE67QtppRJbWfUwPXwPLXdLJyesId70hD6qhwISY1TiX+rb HXoB17726MtN9/YgBCpTntAsa9qDbnhPpICOoqTNGftWvdyQmVxehZhOOIqVCNJ8S9zJ876U 4JSdkENDSaNzhHZKjBjjVQa+xQpeW6zA== X-IronPort-AV: E=Sophos;i="5.93,260,1654574400"; d="scan'208";a="81343715" From: Andrew Cooper To: Xen-devel CC: Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Wei Liu Subject: [PATCH 1/4] x86/hvmloader: SMP improvements Date: Wed, 24 Aug 2022 11:59:12 +0100 Message-ID: <20220824105915.32127-2-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20220824105915.32127-1-andrew.cooper3@citrix.com> References: <20220824105915.32127-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1661338820018100005 * Use MOV CR instead of LMSW. LMSW has no decode assist at all on AMD CPU= s, forcing us to fully emulate the instruction. * Use __attribute__((used)) to fix the comment about ap_start(). * Have ap_start() perform a self-INIT for APs, rather than having boot_cpu= () do it. This is marginally more parallel, and reduces the amount of remo= te vCPU management that Xen has to do on behalf of the guest. Signed-off-by: Andrew Cooper --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 CC: Wei Liu --- tools/firmware/hvmloader/smp.c | 46 ++++++++++++++++++++++++++++----------= ---- 1 file changed, 31 insertions(+), 15 deletions(-) diff --git a/tools/firmware/hvmloader/smp.c b/tools/firmware/hvmloader/smp.c index 082b17f13818..80154950ac32 100644 --- a/tools/firmware/hvmloader/smp.c +++ b/tools/firmware/hvmloader/smp.c @@ -35,9 +35,9 @@ asm ( " mov %cs,%ax \n" " mov %ax,%ds \n" " lgdt gdt_desr-ap_boot_start\n" - " xor %ax, %ax \n" - " inc %ax \n" - " lmsw %ax \n" + " mov %cr0, %eax \n" + " or $1, %al \n" + " mov %eax, %cr0 \n" " ljmpl $0x08,$1f \n" "gdt_desr: \n" " .word gdt_end - gdt - 1 \n" @@ -50,8 +50,6 @@ asm ( " movl $stack_top,%esp \n" " movl %esp,%ebp \n" " call ap_start \n" - "1: hlt \n" - " jmp 1b \n" " \n" " .align 8 \n" "gdt: \n" @@ -68,14 +66,37 @@ asm ( " .text \n" ); =20 -void ap_start(void); /* non-static avoids unused-function compiler warning= */ -/*static*/ void ap_start(void) +static void __attribute__((used)) ap_start(void) { - printf(" - CPU%d ... ", ap_cpuid); + unsigned int cpu =3D ap_cpuid; + + printf(" - CPU%d ... ", cpu); cacheattr_init(); printf("done.\n"); - wmb(); - ap_callin =3D 1; + + /* + * Call in to the BSP. For APs, take ourselves offline. + * + * We must not use the stack after calling in to the BSP. + */ + asm volatile ( + " movb $1, ap_callin \n" + + " test %[icr2], %[icr2] \n" + " jz .Lbsp \n" + + " movl %[icr2], %[ICR2] \n" + " movl %[init], %[ICR1] \n" + "1: hlt \n" + " jmp 1b \n" + + ".Lbsp: \n" + : + : [icr2] "r" (SET_APIC_DEST_FIELD(LAPIC_ID(cpu))), + [init] "i" (APIC_DM_INIT), + [ICR1] "m" (*(uint32_t *)(LAPIC_BASE_ADDRESS + APIC_ICR)), + [ICR2] "m" (*(uint32_t *)(LAPIC_BASE_ADDRESS + APIC_ICR2)) + : "memory" ); } =20 static void lapic_wait_ready(void) @@ -111,11 +132,6 @@ static void boot_cpu(unsigned int cpu) */ while ( !ap_callin ) cpu_relax(); - - /* Take the secondary processor offline. */ - lapic_write(APIC_ICR2, icr2); - lapic_write(APIC_ICR, APIC_DM_INIT); - lapic_wait_ready(); =20 } =20 void smp_initialise(void) --=20 2.11.0 From nobody Tue May 21 02:38:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1661338818; cv=none; d=zohomail.com; s=zohoarc; b=fWJzsQ+XkPpNjTPlzISQ7bdkfzUrSATr4OqbseNJOgU3TRQRQO+ScpnfKdTszb7LVcpplDKHidEwQ698ZDyS1dURvPiHmAFev8IzuJoRLP4gmT4aEvYbkoICzKlqgtuJMdhujrCOHOrR621Oxf4i11ozIOOvsyV9B61rmyBpKHo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661338818; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4u+/ahd0DGGSQwSLqLstYrAZQ90YhEncjgXGVdO6c0A=; b=OHFXj6k1zEkSkLNgVShL2qe0UXnauwz7WWx5ej44ggyvCF0qRFh0vkhjtTDqaMoECn1GQwOq61mGFfzcEDrdhXOt5Eb4fDjC5CrIK7YLaY6yNQgifh8S1OcvBcCEervLtYn04ZBuST/EXxYSIuSAGR34G6/6f2KHDrx7AksNNzY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1661338818571992.1105919301909; Wed, 24 Aug 2022 04:00:18 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.392409.630769 (Exim 4.92) (envelope-from ) id 1oQo72-00027y-KF; Wed, 24 Aug 2022 10:59:56 +0000 Received: by outflank-mailman (output) from mailman id 392409.630769; Wed, 24 Aug 2022 10:59:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oQo72-00027l-Gb; Wed, 24 Aug 2022 10:59:56 +0000 Received: by outflank-mailman (input) for mailman id 392409; Wed, 24 Aug 2022 10:59:54 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oQo70-0001Gd-Pf for xen-devel@lists.xenproject.org; Wed, 24 Aug 2022 10:59:54 +0000 Received: from esa1.hc3370-68.iphmx.com (esa1.hc3370-68.iphmx.com [216.71.145.142]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id e0e3da7d-239b-11ed-bd2e-47488cf2e6aa; Wed, 24 Aug 2022 12:59:53 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: e0e3da7d-239b-11ed-bd2e-47488cf2e6aa DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1661338793; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Hh19WK2pWTvwywXOkao9tOq09kUC7LQDI65VpWZ9804=; b=RV3jqLA0ubkB21wHe3K2hgYvGnBGXtVWuFrmKNbQ2oQUzyQMBXWQoH5p +zCS+Hkua9BF2Lr4XgN3TnQo2ohgl7O1hHQc+9U2mNyze8QYoDdHEBOEH x+xlou2KzflruSAj0lBcZlola1Bq6BVcDfpvdEBSBVLgmkiI7d74ui81p Q=; Authentication-Results: esa1.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none X-SBRS: 2.7 X-MesageID: 79232773 X-Ironport-Server: esa1.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:sDPgIqhcTr5B3pebbTS1dzapX161AxAKZh0ujC45NGQN5FlHY01je htvW2GAa6uMajP0etolOYrk/B8HupfRm9FrTlQ5/isyRiMb9cadCdqndUqhZCn6wu8v7a5EA 2fyTvGacajYm1eF/k/F3oDJ9CU6j+fQLlbFILasEjhrQgN5QzsWhxtmmuoo6qZlmtH8CA6W0 T/Ii5S31GSNhnglaQr414rZ8Ek15KSo5GtB1rADTasjUGH2xiF94K03fcldH1OgKqFIE+izQ fr0zb3R1gs1KD90V7tJOp6iGqE7aua60Tqm0xK6aID76vR2nQQg075TCRYpQRw/ZwNlPTxG4 I4lWZSYEW/FN0BX8QgXe0Ew/ypWZcWq9FJbSJQWXAP6I0DuKhPRL/tS4E4eH48kxfxtQkR0z vU8JBs2Sh6upfrtz+fuIgVsrpxLwMjDOYoevjdrzC3DDOZgSpfGK0nIzYYGhnFq3JkIRKuAI ZpCAdZsRE2ojxlnE1EbEp8h2syvgWHyaWZwo1OJv6snpWPUyWSd1ZCyYYCOIIPVHq25mG6Jr zjm0mCnWSocC8aAmDaMqlmhtvDAyHaTtIU6S+Tjq68CbEeo7nMXIA0bUx28u/bRomyUVs9bK kcU0jEztqV0/0uuJvHtUhv9rHOasxo0X9tLD/Z8+AyL0rDT4QuSGi4DVDEpVTA9nJZoH3pwj AbPxo63Q2w02FGIdZ6D3pWWkQyoI2swF1QLQSMvdi8Lzvv7+45m23ojUe1f/L6JYszdQG+um mrT/Xhi2t3/nuZQifzloAmvbyaE48GQE1Vrvli/sneNtFsRWWKzW2C/BbE3B95kJZ3RcFSOt WNsdyO2vLFXVsHleMBgrYww8FCVCxWtamS0baZHRcVJythU0yfLkXpsyD9/Plx1Fc0PZCXkZ kTe0SsIusEKZiT7PPUpONLhYyjP8UQHPYWNaxwpRoAWPsgZmPGvpkmCmnJ8L0iyyRNxwMnTy L+QcNq2DGZyNJmLOAGeHr5FuYLHMwhkmgs/s7inkEn8uVdfDVbJIYo43KymNLlis/jZ+l2Mq r6y9aKikn1ibQE3WQGPmaZ7ELzABSFT6UzewyCPStO+Hw== IronPort-HdrOrdr: A9a23:Lj+IwqNsuaWczMBcTvujsMiBIKoaSvp037Eqv3oRdfUzSL3hqy nOpoVj6faaskdzZJhNo7+90ey7MBfhHP1OkO8s1NWZLWvbUQKTRekIh+aP/9SjIVyYygc079 YaT0EUMr3N5DZB4/oSmDPIduod/A== X-IronPort-AV: E=Sophos;i="5.93,260,1654574400"; d="scan'208";a="79232773" From: Andrew Cooper To: Xen-devel CC: Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Wei Liu Subject: [PATCH 2/4] x86/hvmloader: Don't build as PIC/PIE Date: Wed, 24 Aug 2022 11:59:13 +0100 Message-ID: <20220824105915.32127-3-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20220824105915.32127-1-andrew.cooper3@citrix.com> References: <20220824105915.32127-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1661338820013100004 HVMLoader is not relocatable in memory, and 32bit PIC code has a large overhead. Build it as non-relocatable. Bloat-o-meter reports a net: add/remove: 0/0 grow/shrink: 3/107 up/down: 14/-3370 (-3356) No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 CC: Wei Liu --- tools/firmware/hvmloader/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/M= akefile index 4f31c881613c..eb757819274b 100644 --- a/tools/firmware/hvmloader/Makefile +++ b/tools/firmware/hvmloader/Makefile @@ -23,7 +23,8 @@ include $(XEN_ROOT)/tools/firmware/Rules.mk # SMBIOS spec requires format mm/dd/yyyy SMBIOS_REL_DATE ?=3D $(shell date +%m/%d/%Y) =20 -CFLAGS +=3D $(CFLAGS_xeninclude) +CFLAGS +=3D $(CFLAGS_xeninclude) -fno-pic +$(call cc-option-add,CFLAGS,-no-pie) =20 # We mustn't use tools-only public interfaces. CFLAGS +=3D -D__XEN_INTERFACE_VERSION__=3D__XEN_LATEST_INTERFACE_VERSION__ --=20 2.11.0 From nobody Tue May 21 02:38:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1661338829; cv=none; d=zohomail.com; s=zohoarc; b=cYvsU6xRm9QLB92+RARL21WYhiU+POlYAebU5DypiaFcucDq2M8h7GZ6ttj21IwirrVf0eun1VZ1bGO4LLfQcuj8gZifPzFOctJXLCkKypk+aOkW4trZF0ZhzNx8yE4C4E9tmZ9cFTcPEkKiG8q8SDK9K0dG4RmL/2BO5Vunp4I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661338829; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=P1KgJqigqSS1VHn0pj49dlE23/WFAKJ/wZfXv9O0OgM=; b=ETnwcaaTHANoPI73DccBtFjr5tcLD6elMXr4NNnR2cwSSwWA+ZAsMkQHD3fXQpr7EI+X1tVJB10CVb1N2ipoSNPKIlQjlb1StUWq9ZhwIlDXrAyy4wYVL4opV4GpiW0BrmUX2mtwwl1O0FMRS2ismlVZCFK55HDon3mDtx7PNV8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 16613388292231003.6084676016602; Wed, 24 Aug 2022 04:00:29 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.392410.630780 (Exim 4.92) (envelope-from ) id 1oQo7E-0003Y7-Ui; Wed, 24 Aug 2022 11:00:08 +0000 Received: by outflank-mailman (output) from mailman id 392410.630780; Wed, 24 Aug 2022 11:00:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oQo7E-0003Xe-QT; Wed, 24 Aug 2022 11:00:08 +0000 Received: by outflank-mailman (input) for mailman id 392410; Wed, 24 Aug 2022 11:00:07 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oQo7D-00037e-0D for xen-devel@lists.xenproject.org; Wed, 24 Aug 2022 11:00:07 +0000 Received: from esa6.hc3370-68.iphmx.com (esa6.hc3370-68.iphmx.com [216.71.155.175]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id e720f3d0-239b-11ed-9250-1f966e50362f; Wed, 24 Aug 2022 13:00:04 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: e720f3d0-239b-11ed-9250-1f966e50362f DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1661338804; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=+3yzR7H1mL4yzkhNJhzHDkUHVl2/a/svrgKmQFfjl8g=; b=YfMufqev0+WQ0VT4ib3RqkxJO0loxDykiylJGIffR9svGNlSfUNimuP5 40F4et5unznJ+uVTApSEdviwFlVJopNM4IZ3Hh5Dsjl9Gri47CmrLx17g K2FGq2kKtd/4/uXet87Po5G2PrrdItrw3lXnadEmjIJUKHAUrHRdFbyz0 Y=; Authentication-Results: esa6.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none X-SBRS: 2.7 X-MesageID: 78524460 X-Ironport-Server: esa6.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:CG5Xqav4KO1Vsg2efdvwCc1eF+fnVDReMUV32f8akzHdYApBsoF/q tZmKW3UPPuCZjTwfIx+aY+z8RkD7ZTRmt9mGgI6rHwxRXsb+JbJXdiXEBz9bniYRiHhoOOLz Cm8hv3odp1coqr0/0/1WlTZhSAgk/vOHtIQMcacUghpXwhoVSw9vhxqnu89k+ZAjMOwRgiAo rsemeWGULOe82MyYzl8B56r8ks15qyi4m9A5zTSWNgQ1LPgvyhNZH4gDfnZw0vQGuF8AuO8T uDf+7C1lkuxE8AFU47Nfh7TKyXmc5aKVeS8oiM+t5uK23CukhcawKcjXMfwXG8M49m/c3Kd/ /0W3XC4YV9B0qQhA43xWTEAe811FfUuFLMqvRFTGCFcpqHLWyKE/hlgMK05FYgdweNxPE9nz 8A/Di0vNTDf38Ks2ZvuH4GAhux7RCXqFIYWu3UmxjDFF/c2B5vERs0m5/cBgm123JoXW6+DO YxJMlKDbzyZC/FLEn4RBIgzg6GDgX7nficDgFmUubA28y7YywkZPL3Fb4qIIIDWG509ckCwl jLHxUn7BAkmHcHOzRnV1WOFgMbhtHauMG4VPOLhraM76LGJ/UQMDDUGWF39puO24maccd9CL 00f+gI1sLM/skesS7HVTxC+5XKJoBMYc95RCPEhrhGAzLLO5ASUDXRCSSROAOHKr+dvG2Zsj AXQ2Yq0W3o/69V5VE5x6J+RqAi3PxU7BFU+QgkZb1Alv4HDupga20enoslYLEKlsjHkMWiun WnQ9Xlu2+h7Yd0jjPviow2e6964jt2QF1NuuF2KNo6wxlkhDLNJcbBE/rQyARxoCI+CBmeMs 3Ef8yR1xLBfVMrd/MBhrQhkIV1I2xpmGGeF6bKXN8N9nwlBAlb6FWyq3BlwJV1yLuEPciLzb UnYtGt5vcENZSH1PP4tPdnhW6zGKJQM8vy0Ps04k/IUOsQhHON51HsGibGsM5DFzxF3zPBX1 WazesewF3cKYZlaIM6Nb75EidcWKtUWnzy7qWbTk0v6itJzpRe9Fd84Dbd5Rrpgt/zf/V+Nq o832gnj40w3bdASqxL/qeY7RW3m51BiXfgad+Q/mja/Hzdb IronPort-HdrOrdr: A9a23:J+u2rqy7b51f+juquuryKrPwFr1zdoMgy1knxilNoRw8SK2lfq eV7YwmPH7P+U8ssR4b6LO90cW7Lk80sKQFhbX5Xo3SOjUO2lHYTr2KhLGKq1aLdkHDH6xmpM BdmsBFeabN5DNB7foSjjPXLz9Z+qjjzJyV X-IronPort-AV: E=Sophos;i="5.93,260,1654574400"; d="scan'208";a="78524460" From: Andrew Cooper To: Xen-devel CC: Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Wei Liu Subject: [PATCH 3/4] x86/hvmloader: Don't override stddef.h Date: Wed, 24 Aug 2022 11:59:14 +0100 Message-ID: <20220824105915.32127-4-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20220824105915.32127-1-andrew.cooper3@citrix.com> References: <20220824105915.32127-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1661338830286100001 Since c/s 73b13705af7c ("firmware: provide a stand alone set of headers"), we've had an implementation of offsetof() which isn't undefined behaviour. Actually use it. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 CC: Wei Liu --- tools/firmware/hvmloader/util.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tools/firmware/hvmloader/util.h b/tools/firmware/hvmloader/uti= l.h index 8d95eab28a65..ac7ff264e247 100644 --- a/tools/firmware/hvmloader/util.h +++ b/tools/firmware/hvmloader/util.h @@ -28,12 +28,6 @@ enum { #define SEL_DATA32 0x0020 #define SEL_CODE64 0x0028 =20 -#undef offsetof -#define offsetof(t, m) ((unsigned long)&((t *)0)->m) - -#undef NULL -#define NULL ((void*)0) - void __assert_failed(const char *assertion, const char *file, int line) __attribute__((noreturn)); #define ASSERT(p) \ --=20 2.11.0 From nobody Tue May 21 02:38:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1661338819; cv=none; d=zohomail.com; s=zohoarc; b=Ia/rCUWLQAIPszgg9vyme+82nkcIziAX7l0/rL5e0fiCoSmbgJoqUGdqpmSPQJLpKvfFf/UJ9YkUNHD4BUcWyCR+Wu7Kg1Jb0kmbJ6SVucK/V8j0ITU0qDmXI9wMexcJD4LZcCAc594HJnE+YrMiWU7Ra69cjwkn60uVHrlycvY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661338819; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UIrpVZ5s5Mwog7B8IU4fwzSPeNTCRasMQa+wLt6JgvY=; b=BSBuhc0OnsrKfiwSJ8woGLb3exkkwpZGoTqTsgjShwoUQ4sJ7953ojKQViKO+4GuObABX+vvGegGNvoex5zy/m94g/JnCd6kcos0QCI08/1scsIXMNOjDiwJgddhGFOBuaqINL6sZE+XTF0nl1JrgiFzev3dk5myxeW6zFbhnAw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 166133881956114.355400903453074; Wed, 24 Aug 2022 04:00:19 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.392407.630747 (Exim 4.92) (envelope-from ) id 1oQo6u-0001WE-3q; Wed, 24 Aug 2022 10:59:48 +0000 Received: by outflank-mailman (output) from mailman id 392407.630747; Wed, 24 Aug 2022 10:59:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oQo6u-0001W7-0b; Wed, 24 Aug 2022 10:59:48 +0000 Received: by outflank-mailman (input) for mailman id 392407; Wed, 24 Aug 2022 10:59:47 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oQo6s-0001Gd-Sv for xen-devel@lists.xenproject.org; Wed, 24 Aug 2022 10:59:47 +0000 Received: from esa5.hc3370-68.iphmx.com (esa5.hc3370-68.iphmx.com [216.71.155.168]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id dcc85200-239b-11ed-bd2e-47488cf2e6aa; Wed, 24 Aug 2022 12:59:45 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: dcc85200-239b-11ed-bd2e-47488cf2e6aa DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1661338785; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ckFon/A44dzmeOdZ3hprwgRwV7uXCMZYwDX4BIU05i0=; b=b4Bfkfrl/jJWUQcVUtsNW5lKO6VKNSdSxS82W41/gz+F9J7zt0ki1uzh j4At7B/X/xI01Mip26iWkvAZT+yQeHreoAzex7G4ABA6KLuiCh/FvrK6n 1obx91Qms5/Ak3Oz1zVM25UcDYmL8soU3glsdU4dIuxUEZgXre5KbAl9q s=; Authentication-Results: esa5.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none X-SBRS: 2.7 X-MesageID: 78010165 X-Ironport-Server: esa5.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:Vwk6qa/06gsRTngByeaiDrUD436TJUtcMsCJ2f8bNWPcYEJGY0x3m mVJXT+CMvqIYGqheth3OoTj9EIP78OEyYdnHVA+pC48E34SpcT7XtnIdU2Y0wF+jyHgoOCLy +1EN7Es+ehtFie0Si+Fa+Sn9z8kvU2xbuKUIPbePSxsThNTRi4kiBZy88Y0mYctitWia++3k YqaT/b3ZRn0gFaYDkpOs/jZ8EM14Kyr0N8llgdWic5j7Qe2e0Y9VPrzFYnpR1PkT49dGPKNR uqr5NlVKUuAon/Bovv8+lrKWhViroz6ZGBiuVIPM0SWuTBQpzRa70oOHKF0hXG7Kdm+t4sZJ N1l7fRcQOqyV0HGsLx1vxJwS0mSMUDakVNuzLfWXcG7liX7n3XQL/pGBkhnBqI49cROM15sx f0lGh0jRDymvrfjqF67YrEEasULKcDqOMUUu216zCGfBvEjKXzBa/yUv5kChm52350QW6aFD yYaQWMHgBDoShtDIFoITrk5m/+lnCLXeDxEslOF46Ew5gA/ySQugOC0aIOLJ7RmQ+0Ot1nfp W773ligH0snF9mO7yeZynSz07qncSTTB9tJSezQGuRRqEKX7nweDlsRT1TTiduTh1O6WtlfA 1cJ4Sdopq83nGS7Q9+4UxCmrXqsuh8HR8EWA+A88BuKyKff/0CeHGdsc9JaQIV47olsH2Vsj wLX2YOybdByjFGLYXiUp4y7jTyQABoqD18DWB0pYyEpxuC29enfkSnzosZf/L+d14OrQGupk mDW8UDSlJ1I05dVivzTEUTvxmv1+8OXFlNdChD/BDrN0+9vWGKyi2VEA3D/5O0IEouWR0LpU JMsy5nHt7Bm4X1geUWwrAQx8FKBva/t3MX02wIHInXY323FF4SfVY5R+ipiA0xiL9wJfzTkC GeK510IvsACbSH0Nv8nC25UNyjN5fmIKDgYfqqMMoomjmZZLmdrAx2ClWbPhjuwwSDAYIk0O IuBcNbEMEv2/Z9PlWPuL9rxJJdxmUjSM0uPGs2gp/lmuJLCDEOopUAtagLVMbtktvvd+W04M b93bqO39vmWa8WmCgG/zGLZBQpiwaQTbXwul/FqSw== IronPort-HdrOrdr: A9a23:xMyW762yg68Jun+FpUPvoAqjBIokLtp133Aq2lEZdPRUGvb3qy nIpoVj6faUskd2ZJhOo7C90cW7LU80sKQFhLX5Xo3SOzUO2lHYT72KhLGKq1aLdhEWtNQtsZ uIG5IOcOEYZmIasS+V2maF+q4bsbu6zJw= X-IronPort-AV: E=Sophos;i="5.93,260,1654574400"; d="scan'208";a="78010165" From: Andrew Cooper To: Xen-devel CC: Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Wei Liu Subject: [PATCH 4/4] x86/hvmloader: Move various helpers to being static inlines Date: Wed, 24 Aug 2022 11:59:15 +0100 Message-ID: <20220824105915.32127-5-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20220824105915.32127-1-andrew.cooper3@citrix.com> References: <20220824105915.32127-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1661338820009100003 The IO port, MSR, IO-APIC and LAPIC accessors compile typically to single or pairs of instructions, which is less overhead than even the stack manipulat= ion to call the helpers. Move the implementations from util.c to being static inlines in util.h In addition, turn ioapic_base_address into a constant as it is never modifi= ed from 0xfec00000 (substantially shrinks the IO-APIC logic), and make use of = the "A" constraint for WRMSR/RDMSR like we already do for RDSTC. Bloat-o-meter reports a net: add/remove: 0/13 grow/shrink: 1/19 up/down: 6/-743 (-737) No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 CC: Wei Liu --- tools/firmware/hvmloader/config.h | 2 +- tools/firmware/hvmloader/hvmloader.c | 1 - tools/firmware/hvmloader/mp_tables.c | 2 +- tools/firmware/hvmloader/util.c | 78 +------------------------------- tools/firmware/hvmloader/util.h | 88 +++++++++++++++++++++++++++++++-= ---- 5 files changed, 79 insertions(+), 92 deletions(-) diff --git a/tools/firmware/hvmloader/config.h b/tools/firmware/hvmloader/c= onfig.h index c82adf6dc508..b16fad300fbc 100644 --- a/tools/firmware/hvmloader/config.h +++ b/tools/firmware/hvmloader/config.h @@ -44,7 +44,7 @@ extern struct bios_config ovmf_config; #define PAGE_SHIFT 12 #define PAGE_SIZE (1ul << PAGE_SHIFT) =20 -extern uint32_t ioapic_base_address; +#define IOAPIC_BASE_ADDRESS 0xfec00000 extern uint8_t ioapic_version; =20 #define IOAPIC_ID 0x01 diff --git a/tools/firmware/hvmloader/hvmloader.c b/tools/firmware/hvmloade= r/hvmloader.c index c58841e5b556..f8af88fabf24 100644 --- a/tools/firmware/hvmloader/hvmloader.c +++ b/tools/firmware/hvmloader/hvmloader.c @@ -113,7 +113,6 @@ asm ( =20 unsigned long scratch_start =3D SCRATCH_PHYSICAL_ADDRESS; =20 -uint32_t ioapic_base_address =3D 0xfec00000; uint8_t ioapic_version; =20 bool acpi_enabled; diff --git a/tools/firmware/hvmloader/mp_tables.c b/tools/firmware/hvmloade= r/mp_tables.c index d207ecbf00c9..77d3010406d0 100644 --- a/tools/firmware/hvmloader/mp_tables.c +++ b/tools/firmware/hvmloader/mp_tables.c @@ -229,7 +229,7 @@ static void fill_mp_ioapic_entry(struct mp_ioapic_entry= *mpie) mpie->ioapic_id =3D IOAPIC_ID; mpie->ioapic_version =3D ioapic_version; mpie->ioapic_flags =3D 1; /* enabled */ - mpie->ioapic_addr =3D ioapic_base_address; + mpie->ioapic_addr =3D IOAPIC_BASE_ADDRESS; } =20 =20 diff --git a/tools/firmware/hvmloader/util.c b/tools/firmware/hvmloader/uti= l.c index 581b35e5cfb5..d1dcc2844a43 100644 --- a/tools/firmware/hvmloader/util.c +++ b/tools/firmware/hvmloader/util.c @@ -42,60 +42,6 @@ bool check_overlap(uint64_t start, uint64_t size, (start < reserved_start + reserved_size); } =20 -void wrmsr(uint32_t idx, uint64_t v) -{ - asm volatile ( - "wrmsr" - : : "c" (idx), "a" ((uint32_t)v), "d" ((uint32_t)(v>>32)) ); -} - -uint64_t rdmsr(uint32_t idx) -{ - uint32_t lo, hi; - - asm volatile ( - "rdmsr" - : "=3Da" (lo), "=3Dd" (hi) : "c" (idx) ); - - return (lo | ((uint64_t)hi << 32)); -} - -void outb(uint16_t addr, uint8_t val) -{ - asm volatile ( "outb %%al, %%dx" : : "d" (addr), "a" (val) ); -} - -void outw(uint16_t addr, uint16_t val) -{ - asm volatile ( "outw %%ax, %%dx" : : "d" (addr), "a" (val) ); -} - -void outl(uint16_t addr, uint32_t val) -{ - asm volatile ( "outl %%eax, %%dx" : : "d" (addr), "a" (val) ); -} - -uint8_t inb(uint16_t addr) -{ - uint8_t val; - asm volatile ( "inb %%dx,%%al" : "=3Da" (val) : "d" (addr) ); - return val; -} - -uint16_t inw(uint16_t addr) -{ - uint16_t val; - asm volatile ( "inw %%dx,%%ax" : "=3Da" (val) : "d" (addr) ); - return val; -} - -uint32_t inl(uint16_t addr) -{ - uint32_t val; - asm volatile ( "inl %%dx,%%eax" : "=3Da" (val) : "d" (addr) ); - return val; -} - uint8_t cmos_inb(uint8_t idx) { outb(0x70, idx); @@ -493,28 +439,6 @@ void *scratch_alloc(uint32_t size, uint32_t align) return (void *)(unsigned long)s; } =20 -uint32_t ioapic_read(uint32_t reg) -{ - *(volatile uint32_t *)(ioapic_base_address + 0x00) =3D reg; - return *(volatile uint32_t *)(ioapic_base_address + 0x10); -} - -void ioapic_write(uint32_t reg, uint32_t val) -{ - *(volatile uint32_t *)(ioapic_base_address + 0x00) =3D reg; - *(volatile uint32_t *)(ioapic_base_address + 0x10) =3D val; -} - -uint32_t lapic_read(uint32_t reg) -{ - return *(volatile uint32_t *)(LAPIC_BASE_ADDRESS + reg); -} - -void lapic_write(uint32_t reg, uint32_t val) -{ - *(volatile uint32_t *)(LAPIC_BASE_ADDRESS + reg) =3D val; -} - #define PCI_CONF1_ADDRESS(bus, devfn, reg) \ (0x80000000 | (bus << 16) | (devfn << 8) | (reg & ~3)) =20 @@ -943,7 +867,7 @@ void hvmloader_acpi_build_tables(struct acpi_config *co= nfig, =20 config->lapic_base_address =3D LAPIC_BASE_ADDRESS; config->lapic_id =3D acpi_lapic_id; - config->ioapic_base_address =3D ioapic_base_address; + config->ioapic_base_address =3D IOAPIC_BASE_ADDRESS; config->ioapic_id =3D IOAPIC_ID; config->pci_isa_irq_mask =3D PCI_ISA_IRQ_MASK;=20 =20 diff --git a/tools/firmware/hvmloader/util.h b/tools/firmware/hvmloader/uti= l.h index ac7ff264e247..b6108a705eab 100644 --- a/tools/firmware/hvmloader/util.h +++ b/tools/firmware/hvmloader/util.h @@ -7,6 +7,7 @@ #include #include #include +#include "config.h" #include "e820.h" =20 /* Request un-prefixed values from errno.h. */ @@ -61,28 +62,91 @@ static inline int test_and_clear_bit(int nr, volatile v= oid *addr) } =20 /* MSR access */ -void wrmsr(uint32_t idx, uint64_t v); -uint64_t rdmsr(uint32_t idx); +static inline void wrmsr(uint32_t idx, uint64_t v) +{ + asm volatile ( "wrmsr" :: "c" (idx), "A" (v) : "memory" ); +} + +static inline uint64_t rdmsr(uint32_t idx) +{ + uint64_t res; + + asm volatile ( "rdmsr" : "=3DA" (res) : "c" (idx) ); + + return res; +} =20 /* I/O output */ -void outb(uint16_t addr, uint8_t val); -void outw(uint16_t addr, uint16_t val); -void outl(uint16_t addr, uint32_t val); +static inline void outb(uint16_t addr, uint8_t val) +{ + asm volatile ( "outb %%al, %%dx" :: "d" (addr), "a" (val) ); +} + +static inline void outw(uint16_t addr, uint16_t val) +{ + asm volatile ( "outw %%ax, %%dx" :: "d" (addr), "a" (val) ); +} + +static inline void outl(uint16_t addr, uint32_t val) +{ + asm volatile ( "outl %%eax, %%dx" :: "d" (addr), "a" (val) ); +} =20 /* I/O input */ -uint8_t inb(uint16_t addr); -uint16_t inw(uint16_t addr); -uint32_t inl(uint16_t addr); +static inline uint8_t inb(uint16_t addr) +{ + uint8_t val; + + asm volatile ( "inb %%dx,%%al" : "=3Da" (val) : "d" (addr) ); + + return val; +} + +static inline uint16_t inw(uint16_t addr) +{ + uint16_t val; + + asm volatile ( "inw %%dx,%%ax" : "=3Da" (val) : "d" (addr) ); + + return val; +} + +static inline uint32_t inl(uint16_t addr) +{ + uint32_t val; + + asm volatile ( "inl %%dx,%%eax" : "=3Da" (val) : "d" (addr) ); + + return val; +} =20 /* CMOS access */ uint8_t cmos_inb(uint8_t idx); void cmos_outb(uint8_t idx, uint8_t val); =20 /* APIC access */ -uint32_t ioapic_read(uint32_t reg); -void ioapic_write(uint32_t reg, uint32_t val); -uint32_t lapic_read(uint32_t reg); -void lapic_write(uint32_t reg, uint32_t val); +static inline uint32_t ioapic_read(uint32_t reg) +{ + *(volatile uint32_t *)(IOAPIC_BASE_ADDRESS + 0x00) =3D reg; + return *(volatile uint32_t *)(IOAPIC_BASE_ADDRESS + 0x10); +} + +static inline void ioapic_write(uint32_t reg, uint32_t val) +{ + *(volatile uint32_t *)(IOAPIC_BASE_ADDRESS + 0x00) =3D reg; + *(volatile uint32_t *)(IOAPIC_BASE_ADDRESS + 0x10) =3D val; +} + +#define LAPIC_BASE_ADDRESS 0xfee00000 +static inline uint32_t lapic_read(uint32_t reg) +{ + return *(volatile uint32_t *)(LAPIC_BASE_ADDRESS + reg); +} + +static inline void lapic_write(uint32_t reg, uint32_t val) +{ + *(volatile uint32_t *)(LAPIC_BASE_ADDRESS + reg) =3D val; +} =20 /* PCI access */ uint32_t pci_read(uint32_t devfn, uint32_t reg, uint32_t len); --=20 2.11.0