From patchwork Tue Nov 21 20:24:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 13463541 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 DAEDFC61D85 for ; Tue, 21 Nov 2023 20:25:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=qeKba4mST/qfERcbG6ORpd9k2j+4b7JIoyI1GBLnMkA=; b=HxMSy/Dd6lcesp WLxgKTuHe8NX4tlyXX5u8Egfywq1lcXNZZcrKAsOphpuREyKp/yfA25WalsFuYtjkubztcwgYtw5B a5VEMQjjx3fvWW7ws+tM0K2DmyR0o9PhYY0SXDGffQ6VfGkqNuUP8r74Bcs1zPFf6ZlRc5DWlhRPA InrbdK6cArVx29+cmuyl3iwZZBROgH0Qk/dPL/YhW/jvaW1FhfaZu7+m1uizWuuoXX4+0MT7IG4pX xR5Y/URXYepSDUZJqP9MiJEsFPxjRShDB6/IuEMPoMYTTHZjbtwcEdi0Hlq4HHxyghJAQZnrypHZL o1+nCixkn2kZfayFAsbw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r5XJD-0001mb-2Q; Tue, 21 Nov 2023 20:25:23 +0000 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r5XJB-0001m3-0M for linux-riscv@lists.infradead.org; Tue, 21 Nov 2023 20:25:22 +0000 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-32faea0fa1fso83123f8f.1 for ; Tue, 21 Nov 2023 12:25:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700598318; x=1701203118; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=8lC0ovH1sMR+X7ZTtQkf2fWPZEJbRi0PVuO8TV/5qUo=; b=agE/vCPRgcWWM6WWLxk6ZJ3mCSm7VY7Iietw7lw7syOkbYagqy0Usd2KlDgn88tZmL kcCTYWCv2/UJZWYHX+aVfAmyZziE8x/TYpj9hzbBlLdDdrmFDrACOaVY+jy5KzlK8Wt2 hsOWYb1+/gUeZRHl3B2p0NF6l7yWc4AT6U6Julqs0hkRRL0dDh4RN7cr5o+AtKddXmQZ XCXj5Sz6DhPamCrc6H2OM/3CKGqPOf8MvzPBlsUlW3ogEQTFNIKlDyVtJrt4uiLWki9I XQlyUIYTfKraliwzENU3PsIYzrd9VkXunXCdT12HnkK8ssxy93uEKxQS4MWmNdc5D6+T 7XOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700598318; x=1701203118; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=8lC0ovH1sMR+X7ZTtQkf2fWPZEJbRi0PVuO8TV/5qUo=; b=BI/4N9xty1QODLblFGtEw0K76fT421OsuzfRB/Uj52Q7ji9GnMrzuefsunFKkz3NFD 7MI9yyOB1w9G/00ATo9ewwl8XfN1d6TJxLLXYSVoC2mobXv39ClM+W+fnk5iCC5uHzeh YJvus9/EDISezt3/aH4muv2IHgn6utQwTujENKnNer/7lT9U7wVB2JEICLQbYS/6l9WC 2XLNZjl+fCX9UmD+dz7kPlAhlEv5eoFWiKfLsc9glYwL6WmlxIqArAUae2AH8KbUf/5O gpuRVGCgrotbqD55F5rvMsrWaqc69WrUOB2xkEKbOG3jV97hM4uyYiWbeUI8bXCGe9Py fmBg== X-Gm-Message-State: AOJu0YzyyOBrMdi5NyJfXK/n1JUcwlZKn9paK0qfgI7XtDNWV7yC/wuR LHV73xLLaCP9WPj/f+cc2Ag= X-Google-Smtp-Source: AGHT+IGnOJCswD/GMiWfzz5U/DvJq6IUq4AzQP1MJUZYSDpefmTpGDGZ71qCsRphGv/gClRSdHwzFg== X-Received: by 2002:a5d:584b:0:b0:32f:7a22:8b42 with SMTP id i11-20020a5d584b000000b0032f7a228b42mr3418449wrf.23.1700598318173; Tue, 21 Nov 2023 12:25:18 -0800 (PST) Received: from prasmi.home ([2a00:23c8:2500:a01:cf5b:fb56:995b:b106]) by smtp.gmail.com with ESMTPSA id p11-20020adfcc8b000000b0032d9337e7d1sm15370009wrj.11.2023.11.21.12.25.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 12:25:17 -0800 (PST) From: Prabhakar X-Google-Original-From: Prabhakar To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Conor Dooley , Geert Uytterhoeven Cc: Yu Chien Peter Lin , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Prabhakar , Biju Das , Lad Prabhakar Subject: [PATCH] riscv: errata: andes: Probe IOCP during boot stage Date: Tue, 21 Nov 2023 20:24:59 +0000 Message-Id: <20231121202459.36874-1-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231121_122521_152614_BEC1A7CE X-CRM114-Status: GOOD ( 11.59 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org From: Lad Prabhakar We should be probing for IOCP during boot stage only. As we were probing for IOCP for all the stages this caused the below issue during module-init stage, [9.019104] Unable to handle kernel paging request at virtual address ffffffff8100d3a0 [9.027153] Oops [#1] [9.029421] Modules linked in: rcar_canfd renesas_usbhs i2c_riic can_dev spi_rspi i2c_core [9.037686] CPU: 0 PID: 90 Comm: udevd Not tainted 6.7.0-rc1+ #57 [9.043756] Hardware name: Renesas SMARC EVK based on r9a07g043f01 (DT) [9.050339] epc : riscv_noncoherent_supported+0x10/0x3e [9.055558]  ra : andes_errata_patch_func+0x4a/0x52 [9.060418] epc : ffffffff8000d8c2 ra : ffffffff8000d95c sp : ffffffc8003abb00 [9.067607]  gp : ffffffff814e25a0 tp : ffffffd80361e540 t0 : 0000000000000000 [9.074795]  t1 : 000000000900031e t2 : 0000000000000001 s0 : ffffffc8003abb20 [9.081984]  s1 : ffffffff015b57c7 a0 : 0000000000000000 a1 : 0000000000000001 [9.089172]  a2 : 0000000000000000 a3 : 0000000000000000 a4 : ffffffff8100d8be [9.096360]  a5 : 0000000000000001 a6 : 0000000000000001 a7 : 000000000900031e [9.103548]  s2 : ffffffff015b57d7 s3 : 0000000000000001 s4 : 000000000000031e [9.110736]  s5 : 8000000000008a45 s6 : 0000000000000500 s7 : 000000000000003f [9.117924]  s8 : ffffffc8003abd48 s9 : ffffffff015b1140 s10: ffffffff8151a1b0 [9.125113]  s11: ffffffff015b1000 t3 : 0000000000000001 t4 : fefefefefefefeff [9.132301]  t5 : ffffffff015b57c7 t6 : ffffffd8b63a6000 [9.137587] status: 0000000200000120 badaddr: ffffffff8100d3a0 cause: 000000000000000f [9.145468] [] riscv_noncoherent_supported+0x10/0x3e [9.151972] [] _apply_alternatives+0x84/0x86 [9.157784] [] apply_module_alternatives+0x10/0x1a [9.164113] [] module_finalize+0x5e/0x7a [9.169583] [] load_module+0xfd8/0x179c [9.174965] [] init_module_from_file+0x76/0xaa [9.180948] [] __riscv_sys_finit_module+0x176/0x2a8 [9.187365] [] do_trap_ecall_u+0xbe/0x130 [9.192922] [] ret_from_exception+0x0/0x64 [9.198573] Code: 0009 b7e9 6797 014d a783 85a7 c799 4785 0717 0100 (0123) aef7 [9.205994] ---[ end trace 0000000000000000 ]--- This is because we called riscv_noncoherent_supported() for all the stages during IOCP probe. riscv_noncoherent_supported() function sets noncoherent_supported variable to true which has an annotation set to "__ro_after_init" due to which we were seeing the above splat. Fix this by probing IOCP during boot stage only. Fixes: e021ae7f5145 ("riscv: errata: Add Andes alternative ports") Signed-off-by: Lad Prabhakar Reviewed-by: Samuel Holland Reviewed-by: Yu Chien Peter Lin --- arch/riscv/errata/andes/errata.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/riscv/errata/andes/errata.c b/arch/riscv/errata/andes/errata.c index d2e1abcac967..1c0fef111273 100644 --- a/arch/riscv/errata/andes/errata.c +++ b/arch/riscv/errata/andes/errata.c @@ -60,7 +60,8 @@ void __init_or_module andes_errata_patch_func(struct alt_entry *begin, struct al unsigned long archid, unsigned long impid, unsigned int stage) { - errata_probe_iocp(stage, archid, impid); + if (stage == RISCV_ALTERNATIVES_BOOT) + errata_probe_iocp(stage, archid, impid); /* we have nothing to patch here ATM so just return back */ }