Message ID | 20231027221106.405666-10-jiaxun.yang@flygoat.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp913421vqb; Fri, 27 Oct 2023 15:12:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGR+PDKeTg7qcsogu6VFILBRmwsoPR39sn7e40fFrjKSzW4IkvRvDMchMIUssiEbBIHxJfA X-Received: by 2002:a81:4153:0:b0:58a:83cd:115d with SMTP id f19-20020a814153000000b0058a83cd115dmr3487110ywk.50.1698444755887; Fri, 27 Oct 2023 15:12:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698444755; cv=none; d=google.com; s=arc-20160816; b=v2/BGcY7Xx5a/m7ILMbaK9iUA7N3iVglDUbk85drH5x/MY3eln/6RRlIls1U23H34I 8CG2Atyf0rHPvc7RZz2gH8TjOeJYibS5gFx5qLV0MoW3VdK8UublPsJBSitib67Pxk7r grPM7f9r5HBtKUGglFRl12iEyMk6uDuUxhKcnUV+2Vj0NoCsR2OussjJJyoGT0rhsdOm YfR0Wj/XJBxRaglfJqMwVzArd5XQcHqgcKbsxgyr32wG4pApoO0TViNzisQ+YmYuA/83 P2gF0vvUUj1Vw2YQ6DvYmP3UH3vfMsTNt4JEmARSpyvWVdJ89I5jnQeUT+JN7qu4/D2L +uuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :feedback-id:dkim-signature:dkim-signature; bh=Tr/TAb04SGgGEOsJanw3F3kr/0Ce06JzReERHar06zI=; fh=34VXqKbbbRVUWYKB0XlF9D4jmhXxe51P2+smd1zcTfU=; b=wVZVW9nVXgmG9YibMnEfbZy7D9gD73em9HBIoxP8sG9SafWt0Lr/BiI6mM+WebHWKM LPXeUCBhcVHN9fOQBIvo0bJleXqF7NOVyYoONbBvErBbKOm8hdsh7oYxEJ08g1GT1IQK uTIgSqPnd+gh/w6/0rxBQId+zf09W2n7dgr+KW3lcmt5HQlYbUzJG2G/42VsSJXodLgB x33223sen5P34B/AB/tolYitMSPxe393xe58CFp2vajXeBMbDGjJIfRapa0lWV5cjE1J Vcw37lROWlD3ghr2YFs2qxZl4fqGS1gUpBuLGdCTtgUre3S9evdRFq1zLgYNuurEf4Td 85iQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@flygoat.com header.s=fm1 header.b=DI3igvTc; dkim=pass header.i=@messagingengine.com header.s=fm3 header.b=L50aUpio; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=flygoat.com Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id w10-20020a81620a000000b005841b3e0b57si4185621ywb.271.2023.10.27.15.12.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Oct 2023 15:12:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@flygoat.com header.s=fm1 header.b=DI3igvTc; dkim=pass header.i=@messagingengine.com header.s=fm3 header.b=L50aUpio; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=flygoat.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id AB47882B1064; Fri, 27 Oct 2023 15:12:33 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346668AbjJ0WMQ (ORCPT <rfc822;yuanzuo1009@gmail.com> + 27 others); Fri, 27 Oct 2023 18:12:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47294 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346731AbjJ0WLx (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Fri, 27 Oct 2023 18:11:53 -0400 Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 72986170F; Fri, 27 Oct 2023 15:11:35 -0700 (PDT) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id D888532008FE; Fri, 27 Oct 2023 18:11:33 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Fri, 27 Oct 2023 18:11:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=flygoat.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=1698444693; x= 1698531093; bh=Tr/TAb04SGgGEOsJanw3F3kr/0Ce06JzReERHar06zI=; b=D I3igvTc0X3IIXEx9TqmJrqMHtqRy0ldREmqW7oPdW2oX088sqJOPLdhQToP/Z/SX 66ddy/mLaTGkDySXh94EPIe7TdiGvrEI61CPHk09nM32WbKD/ZDEmP6S1sjPe+8p Cq23UghDFcyIe5HtsuUzjcCZE0AsHmwnF76SWHi2NAxMLH/2T9zhC1w4hLa7G4Kr 1+JofBWB2KkVrqtYc551rufoTof3WttjChngXJpnXaO8eEwm+RaX7WGkKCb4Gpsl 47TJ9Q1K6dPM1CRxNZIlzgu9BqqSffSEWYG5BJ//lFpV6a2SWJyBCk8NPoYPiuqz btoBi4NxD2HHIEihrPqAQ== 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=fm3; t=1698444693; x= 1698531093; bh=Tr/TAb04SGgGEOsJanw3F3kr/0Ce06JzReERHar06zI=; b=L 50aUpiouRR02XAY0YNvD36dCLMlJLUcVmnlBQavFz4vu3mtBVhmAnxIKcX3vyJip Pxc7MwO2vk02SnYqjUS3Z/gojfcaZdZg7DNDyZJtubI9JSTNVtsHuf0m96ATuRsO fDxGkIy3TpRk3DidfX0K/PJVnF/+hjnfxblGhQHWEh/51Z5AzFQgIpZ6SXi4IJ1s qnxB+8ZNhpxIHGXtOeT2E6vSL9+WdtxPwZwjs8IjOmmPI+qhGN61PsXllnfKI5eH lzOCv65BoIhtRG1s+y589Nt7Ns3YkwqrsPfL2lFYpiQT2BH1WK5YjHwaB7f/zv40 w+uSVxL5zIe4ndve6xTvg== X-ME-Sender: <xms:lTU8ZXV5EQpRtEFQ672NCza0Frx5OwzN_s1ks-AveFedtbxUJkMvNA> <xme:lTU8ZfnwYbJpqMS3-4_YnLNAZrgRGxJ2KxijteNt_W6FKDN9aMw_G9_UXglFuDb1o WQbdRrT5aIcQjjRSAE> X-ME-Received: <xmr:lTU8ZTaoH_3ydylnjifH1-q6I5SsCz7RTrgRzVbL461w3hY2842gZTuFA8TVGl-h9Nu2ZnVdsoI> X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrleehgddtiecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekre dtredttdenucfhrhhomheplfhirgiguhhnucgjrghnghcuoehjihgrgihunhdrhigrnhhg sehflhihghhorghtrdgtohhmqeenucggtffrrghtthgvrhhnpeefledufeehgedvuedvvd egkefgvddttedtleeiiefhgeetudegkefhvdfhjeeftdenucevlhhushhtvghrufhiiigv pedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehjihgrgihunhdrhigrnhhgsehflhihgh horghtrdgtohhm X-ME-Proxy: <xmx:lTU8ZSWPRmJ2nl9btRCujZ4A7-0Rgaj2jeulPdRAffkWgo1oHs6rGA> <xmx:lTU8ZRn1BYWsxVSizrgAray4ktOZUHrTVu6xaS0fEn9bZuz8wyGB9Q> <xmx:lTU8ZfdtsB9wB-roRnCIaFFvuYUn63QNGuR9frkbY3FgnYtVnjzsrg> <xmx:lTU8ZaCBjZ-nUFP8mcA2Svxo6DtvoYqSf0ktCOIyrFdCsinAEapEIw> Feedback-ID: ifd894703:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 27 Oct 2023 18:11:32 -0400 (EDT) From: Jiaxun Yang <jiaxun.yang@flygoat.com> To: linux-mips@vger.kernel.org Cc: linux-kernel@vger.kernel.org, tsbogend@alpha.franken.de, gregory.clement@bootlin.com, vladimir.kondratiev@intel.com, Jiaxun Yang <jiaxun.yang@flygoat.com> Subject: [PATCH v2 09/10] MIPS: traps: Enhance memblock ebase allocation process Date: Fri, 27 Oct 2023 23:11:05 +0100 Message-Id: <20231027221106.405666-10-jiaxun.yang@flygoat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231027221106.405666-1-jiaxun.yang@flygoat.com> References: <20231027221106.405666-1-jiaxun.yang@flygoat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Fri, 27 Oct 2023 15:12:33 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780948408165584204 X-GMAIL-MSGID: 1780948408165584204 |
Series |
MIPS: Fix kernel in XKPHYS
|
|
Commit Message
Jiaxun Yang
Oct. 27, 2023, 10:11 p.m. UTC
We try to allocate from KSEG0 accessible space first, and
then if we really can't allocate any memory from KSEG0 and
we are sure that we support ebase in higher segment, give
it another go without restriction.
This can maximize the possibility of having ebase in KSEG0.
Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
---
arch/mips/kernel/traps.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c index b6e94654f621..68f1dd54cde1 100644 --- a/arch/mips/kernel/traps.c +++ b/arch/mips/kernel/traps.c @@ -2399,7 +2399,12 @@ void __init trap_init(void) memblock_reserve(ebase_pa, vec_size); } else { vec_size = max(vec_size, PAGE_SIZE); - ebase_pa = memblock_phys_alloc(vec_size, 1 << fls(vec_size)); + ebase_pa = memblock_phys_alloc_range(vec_size, 1 << fls(vec_size), + 0x0, KSEGX_SIZE - 1); + + if (!ebase_pa && (IS_ENABLED(CONFIG_EVA) || cpu_has_ebase_wg)) + ebase_pa = memblock_phys_alloc(vec_size, 1 << fls(vec_size)); + if (!ebase_pa) panic("%s: Failed to allocate %lu bytes align=0x%x\n", __func__, vec_size, 1 << fls(vec_size));