From patchwork Sun Dec 11 02:10:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= X-Patchwork-Id: 13070472 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0CD26C4708D for ; Sun, 11 Dec 2022 02:10:52 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.458706.716507 (Exim 4.92) (envelope-from ) id 1p4BnT-0002d4-Lz; Sun, 11 Dec 2022 02:10:31 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 458706.716507; Sun, 11 Dec 2022 02:10:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1p4BnT-0002cd-FG; Sun, 11 Dec 2022 02:10:31 +0000 Received: by outflank-mailman (input) for mailman id 458706; Sun, 11 Dec 2022 02:10:29 +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 1p4BnR-0002cH-5w for xen-devel@lists.xenproject.org; Sun, 11 Dec 2022 02:10:29 +0000 Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id f9eb4daf-78f8-11ed-8fd2-01056ac49cbb; Sun, 11 Dec 2022 03:10:26 +0100 (CET) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id AB4185C00AD; Sat, 10 Dec 2022 21:10:25 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Sat, 10 Dec 2022 21:10:25 -0500 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 10 Dec 2022 21:10:24 -0500 (EST) 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: f9eb4daf-78f8-11ed-8fd2-01056ac49cbb DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= invisiblethingslab.com; h=cc:cc:content-transfer-encoding :content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to; s=fm1; t=1670724625; x=1670811025; bh=JbnZPi5CqE 43ZODZw6U/mp6Yrnv9+Sh8ckKp+USh51M=; b=IQ3LNIaB5kob96AC1AFnfCJU0Z mxdSDoM8TmeyHS7asyLDDOVhKgXwBW/bp75VJAajys3E7JbNYR4IBZ7FVjod7RM2 8ld5f/VObj0YRitO1+Ec1iRmcSlEt2BndWES8MMABewnLp+kyhgdn6sPEpv3zGY/ W4KPTFnrwEK12TbdF6JmzQ9uXdxTQ1XSCIxxBNIeOdkYW7dmyUKNrD0dKl2LIw1H S0Gw/IC0PUYXKAZIRKWDOZcdeImyOvEHgk6MQr8ne0/6KEjQNT3l7aUwCJprBSGt S5Pl0gcR/4BGoAGKc79/dBA1QBFjgKnxl3utwDwegjpj6YfYPkQ75gwmNQNg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1670724625; x= 1670811025; bh=JbnZPi5CqE43ZODZw6U/mp6Yrnv9+Sh8ckKp+USh51M=; b=S lCUti6o4f9XbjvUPVi2RnTlevm225dmVZtQodZ3tOnbkCe/KhnYQV9DlOpaAraVI JKodXZsLyg5VmNSafrWP6pean85kMKiSYrZ5HiQ19KqaaRd5O5D71XCD0usX+OdD eHrCsJirgTp1jI0IRDsM7VMCeJ6koogKSriStG8A9r3nC5wSCLRg9VBQgEfvkwMz YofxB2S7NBFI1w5snaGNOCmfWBE9oDlqk36ZZnnfsdVQYWZ8LYvLQowU4+jPDIU/ +dPlVxo/lB9veu6JdzJmmsCsfL+ilPU04cVFKzVz9tn7cIAa6fiOr5JUN5EB0sZ7 TPrnKnzFNAyCqMqztCaKA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdehgdeggecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomhepofgrrhgv khcuofgrrhgtiiihkhhofihskhhiqdfikphrvggtkhhiuceomhgrrhhmrghrvghksehinh hvihhsihgslhgvthhhihhnghhslhgrsgdrtghomheqnecuggftrfgrthhtvghrnhepgfeu udehgfdvfeehhedujeehfeduveeugefhkefhheelgeevudetueeiudfggfffnecuvehluh hsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepmhgrrhhmrghrvghk sehinhhvihhsihgslhgvthhhihhnghhslhgrsgdrtghomh X-ME-Proxy: Feedback-ID: i1568416f:Fastmail From: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: Andrew Cooper , =?utf-8?q?Marek_Marczykowski-?= =?utf-8?q?G=C3=B3recki?= , Jan Beulich , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Wei Liu , George Dunlap , Julien Grall , Stefano Stabellini Subject: [RFC PATCH 1/3] drivers/char: support up to 1M BAR0 of xhci Date: Sun, 11 Dec 2022 03:10:04 +0100 Message-Id: <3398f603208397e2894dd452e9de047431599c58.1670724490.git-series.marmarek@invisiblethingslab.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: References: MIME-Version: 1.0 AMD's XHCI has BAR0 of 1M (compared to 64K on Intel). Map it as a whole (reserving more space in the fixmap). Make fixmap slot conditional on CONFIG_XHCI. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Jan Beulich --- xen/arch/x86/include/asm/fixmap.h | 4 +++- xen/drivers/char/xhci-dbc.c | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/include/asm/fixmap.h b/xen/arch/x86/include/asm/fixmap.h index bc39ffe896b1..516ec3fa6c95 100644 --- a/xen/arch/x86/include/asm/fixmap.h +++ b/xen/arch/x86/include/asm/fixmap.h @@ -25,7 +25,7 @@ #include #include -#define MAX_XHCI_PAGES 16 +#define MAX_XHCI_PAGES 256 /* * Here we define all the compile-time 'special' virtual @@ -45,8 +45,10 @@ enum fixed_addresses { FIX_COM_BEGIN, FIX_COM_END, FIX_EHCI_DBGP, +#ifdef CONFIG_XHCI FIX_XHCI_BEGIN, FIX_XHCI_END = FIX_XHCI_BEGIN + MAX_XHCI_PAGES - 1, +#endif #ifdef CONFIG_XEN_GUEST FIX_PV_CONSOLE, FIX_XEN_SHARED_INFO, diff --git a/xen/drivers/char/xhci-dbc.c b/xen/drivers/char/xhci-dbc.c index 86f6df6bef67..60b781f87202 100644 --- a/xen/drivers/char/xhci-dbc.c +++ b/xen/drivers/char/xhci-dbc.c @@ -268,10 +268,12 @@ static void *dbc_sys_map_xhc(uint64_t phys, size_t size) { size_t i; - if ( size != MAX_XHCI_PAGES * PAGE_SIZE ) + if ( size > MAX_XHCI_PAGES * PAGE_SIZE ) return NULL; - for ( i = FIX_XHCI_END; i >= FIX_XHCI_BEGIN; i-- ) + size >>= PAGE_SHIFT; + + for ( i = FIX_XHCI_END; i > FIX_XHCI_END - size; i-- ) { set_fixmap_nocache(i, phys); phys += PAGE_SIZE;