From patchwork Fri Oct 27 22:11:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiaxun Yang X-Patchwork-Id: 159172 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp913237vqb; Fri, 27 Oct 2023 15:12:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFMimKV1SKOKNuTrFcs2Svs3VtIacOFO5UPbrs+iwUI5hIkLJPwLYrB3A01jVCL5/riGk2F X-Received: by 2002:a17:90b:790:b0:27d:4ab9:fcd9 with SMTP id l16-20020a17090b079000b0027d4ab9fcd9mr3658593pjz.21.1698444733249; Fri, 27 Oct 2023 15:12:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698444733; cv=none; d=google.com; s=arc-20160816; b=cuGVDnDd8/vUDzZvz+tlbnLcjagnJx1wemb6ttIPIVR02VdEUEByhT5/R5BDvoOCYi tZObQg4Q6+DL8Yg+fKyYjp1iHrRaTRI2ggbF3QLM9T/9eb0kU1W6vQx3RUpaX1/e75tI v7yejlfvSMQSAu2xvY5qKuQZaaowlw7WvemMlTrmN/KU4ptRWKG9x86NlT8Q0/xvh7r4 Hz5KYMPM2Q0fIozQ3O47nvN1z4JqT7caYZMr3wpHHCtxQ2eQP74r2PSdNoa1SCCU8TrK hiolIhqaK5lNbVbQLjFb8WmQXmt6oDPiAxiMTCCHX5lqjBboP9w2+58DYQNRDKw5W7+g zKow== 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=z1/hT0gfhZcXEOcRfnRggstjECOl2aSsJ7lZKpBlqTw=; fh=34VXqKbbbRVUWYKB0XlF9D4jmhXxe51P2+smd1zcTfU=; b=exYc6TD+m1RLCkdG5c/v22fBO0jQ36QfVbAQyDxIWggSxG3jAKtkUR9ugQiBr0mPlJ jJU7Hi9NuKJyj3wQQ1/GIWNY1/s+AOpzEW1aA4QVQFWBGNw6suFnNPcYV2mj7G+Cottn pghFgNi7P3rxTgYTwnlrEV3ru3avnUo9MteOxosP0Xlr+HVs5HVSaqL+lNGSJ5ZAI384 VNTB+0K6IcCZI+bbLF5a6yRmyJv2BB2NUOZFhyED7xQj4nWDR1sGRXIjOr2EFNk65crq IpuEdVZ/o0IuqoDzZ/yMn1oAhy0r0yDpucbQVjE/CK2+2Puk/tBa39GniJKjZix1UWUB ArrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@flygoat.com header.s=fm1 header.b=ie76scIs; dkim=pass header.i=@messagingengine.com header.s=fm3 header.b=mUpktjBn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id pf3-20020a17090b1d8300b002790b1320d4si3587820pjb.84.2023.10.27.15.12.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Oct 2023 15:12:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@flygoat.com header.s=fm1 header.b=ie76scIs; dkim=pass header.i=@messagingengine.com header.s=fm3 header.b=mUpktjBn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (Postfix) with ESMTP id 7224883EE9ED; Fri, 27 Oct 2023 15:12:07 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346683AbjJ0WLg (ORCPT + 27 others); Fri, 27 Oct 2023 18:11:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51568 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346649AbjJ0WLZ (ORCPT ); Fri, 27 Oct 2023 18:11:25 -0400 Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 791F01B9; Fri, 27 Oct 2023 15:11:22 -0700 (PDT) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 7889B3200930; Fri, 27 Oct 2023 18:11:21 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Fri, 27 Oct 2023 18:11:22 -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=1698444680; x= 1698531080; bh=z1/hT0gfhZcXEOcRfnRggstjECOl2aSsJ7lZKpBlqTw=; b=i e76scIspHwkejyfMlnNEsixiVulfjcVKOLLUtgoLrR11xkpC01KVmQhVHs2TefaD os2qKf+GPYO7zQEtb2JpXtEqsAvCecYBKwyw71y/mB4Z1YkU5+ItMtj4gt+oU1kF VvywaEgcocRVyucR8+JkP7vOsX9xYXX9qkF1X+7J/wGCPKbmwVhls7iRmBOpmlVW CubsWCdA35vNnHZhUyINIEzT9PPioX8vtRspLjG6TtzZe/+2oiwj1XHFj9oM2+7D nnWIX8fAxCtmUK5QjlIBrZlf5XuvVdZ1/nZqEw5UYqW/v6HSlK2e0xhUxnUZTriQ 0YLCDxpkIWVzoe+kozbIw== 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=1698444680; x= 1698531080; bh=z1/hT0gfhZcXEOcRfnRggstjECOl2aSsJ7lZKpBlqTw=; b=m UpktjBn4KhValcLCW3JZDXm2MAbITWg2wnxsAVP4ABdz6qTmcSs661UOCnGARar4 rNjg8ncG9spH9kheEDBsZgHrpkgp62yis2D11+/JX39HJRLghnhBi8R7ghQN16Po 0uKuS5Oz6BYMLNkjBBa+G2xnHcW3kkEul8obcaS/fYtGJ13yfpJJGh1xUvZB/k3A h6UTk3lOQkeADwj+8YYh3SKb6Ahqq1sETozW8iubI0kTCHAmTiNvM6rF5z1/HJlH WBTVAn/SvFxRfNACEfITQmCUtJAyEbW5Mbz/JwNJg9HB77vvU9pldwePiaeOo+JV 2n6JYAvVoMKTIGOjNVJqw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrleehgddtjecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekre dtredttdenucfhrhhomheplfhirgiguhhnucgjrghnghcuoehjihgrgihunhdrhigrnhhg sehflhihghhorghtrdgtohhmqeenucggtffrrghtthgvrhhnpeefledufeehgedvuedvvd egkefgvddttedtleeiiefhgeetudegkefhvdfhjeeftdenucevlhhushhtvghrufhiiigv pedunecurfgrrhgrmhepmhgrihhlfhhrohhmpehjihgrgihunhdrhigrnhhgsehflhihgh horghtrdgtohhm X-ME-Proxy: Feedback-ID: ifd894703:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 27 Oct 2023 18:11:19 -0400 (EDT) From: Jiaxun Yang 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 Subject: [PATCH v2 04/10] MIPS: Fix set_uncached_handler for ebase in XKPHYS Date: Fri, 27 Oct 2023 23:11:00 +0100 Message-Id: <20231027221106.405666-5-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 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 howler.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Fri, 27 Oct 2023 15:12:07 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780948384688499620 X-GMAIL-MSGID: 1780948384688499620 ebase may be in XKPHYS if memblock unable to allocate memory within KSEG0 physical range. To map ebase into uncached space we just convert it back to physical address and then use platform's TO_UNCAC helper to create mapping. Co-developed-by: Vladimir Kondratiev Signed-off-by: Vladimir Kondratiev Co-developed-by: Gregory CLEMENT Signed-off-by: Gregory CLEMENT Signed-off-by: Jiaxun Yang --- arch/mips/kernel/traps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c index 60c513c51684..230728d76d11 100644 --- a/arch/mips/kernel/traps.c +++ b/arch/mips/kernel/traps.c @@ -2346,7 +2346,7 @@ static const char panic_null_cerr[] = void set_uncached_handler(unsigned long offset, void *addr, unsigned long size) { - unsigned long uncached_ebase = CKSEG1ADDR(ebase); + unsigned long uncached_ebase = TO_UNCAC(__pa(ebase)); if (!addr) panic(panic_null_cerr);