From patchwork Tue Jul 19 18:37:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jernej_=C5=A0krabec?= X-Patchwork-Id: 12922918 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 647CDC43334 for ; Tue, 19 Jul 2022 18:38:50 +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=fUJG9I4oo6zL03+nSlFlwL7fd4LOSpjmeKuxwD0uTIc=; b=WWcYsc+VB1Aoic +32MbeHUvEs2bk3CxpY45AXHt7OTXDqNJLApdsi4Uc5JR/rSQuiaT/gRcOOQem4PUx8rWQD2OfIPP CkhbAOUs7QEdd8j6QH7Tng7G5/sp/Hhh7TCz+IPa4NFeKXJorJjsbglP6ikJMJUBDV8nHVScm/Pi4 eg/n0MhtqzSK1xybWDsvYT1R+b5gi7iB+qQu76uAaaP775C24FV+7De2Gs2BIrASaNj2yv26873lW xMPt1ofnluYYRJJxmxZcBQETF+8xwFAxrQcATxNL1Fr2gTqWkvD6Ljf+lbHZ24jq0dsGCCRXETp/w OzUbCrXQnaRMeySM7TQQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oDs6B-00BMVA-MJ; Tue, 19 Jul 2022 18:37:35 +0000 Received: from mail-ej1-x62a.google.com ([2a00:1450:4864:20::62a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oDs68-00BMT0-Gi for linux-arm-kernel@lists.infradead.org; Tue, 19 Jul 2022 18:37:33 +0000 Received: by mail-ej1-x62a.google.com with SMTP id oy13so28772660ejb.1 for ; Tue, 19 Jul 2022 11:37:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=cmI+PQby/2CoTm1Le4E4JzH/gDv5I8DfTHHCjF+E0Yo=; b=bnapr9AglL7uJ+mEdePPNRjhQ+56XJg0PqREOWrSGwly5HmTo3Pf8wBgUKwYqlDXHW G0xrgAPoC+IUkE+p4NB18uKVhqtIj55YPPQiV+AZaYa+ExFaIttNQIEzXeY34Mc9rqDa M2KY6ixz2qOYzyRtUie1UGdONzvPefyYZkcdysBmO/m/Lypo2w6wgsZps5aHqI37MhcL c2vjJtPGHhTy5IyDXHBWjNTOYggTJNcAcbVtEOoq55h0dU1VbIB8QBq4xVequAa7PI0z 51MubYzQIECe2InjtZ+oSxYppZGRJyA1MfqYIcHeW3cR+/USBexggDzau8yvOoa4j/Db honQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=cmI+PQby/2CoTm1Le4E4JzH/gDv5I8DfTHHCjF+E0Yo=; b=d6K8syKiAWsuUYKu4pfQIbMON7NWVrq3Wp9E53SJSvn5oZrGTRTGDbVrfet4fm2Ol+ qnPSteMIcDQBgZTbLj4jYppYsJ3X+rKikOmRfPenG1Up1IdPU16qHJ0xYum6J4ipl1fS fL/Bloa6qjDjPGnNIdWOOKbS6gZc5XDdwg04yLDu3NJxwONFQwTnMdXG6/NO+18pfPE5 zmc+ewDHG+TXZcbcOqX+ARiqmLPXcpxJdNm9jOYztoYqvPYe3+YvLChnkekLpHntAWdI 3g1JvwLGDYTgHvrtH3NJdYwgFHuHwBfWl7hJOP8PW7Z3g2H/qwVxXSdhpPLx9tlbJHlz C23Q== X-Gm-Message-State: AJIora/B8dD4CU+Sw7XPJV1X0OnIrDMinW2WQ92wpKwBo0Jhh/W4q/Vz YWrZWnM9T9b1p5Imv446Bs0= X-Google-Smtp-Source: AGRyM1v0H52s37VXka8PL070L/fUmtAwwIDJVKfV4hQtsMLDYV0jRrvxrpV+jaX2mNOgVIZz9/o6Zg== X-Received: by 2002:a17:907:980d:b0:72f:2cf2:9aff with SMTP id ji13-20020a170907980d00b0072f2cf29affmr11494969ejc.165.1658255849567; Tue, 19 Jul 2022 11:37:29 -0700 (PDT) Received: from kista.localdomain (86-58-13-89.dynamic.telemach.net. [86.58.13.89]) by smtp.gmail.com with ESMTPSA id w13-20020aa7cb4d000000b0043a5004e714sm10830602edt.64.2022.07.19.11.37.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jul 2022 11:37:28 -0700 (PDT) From: Jernej Skrabec To: samuel@sholland.org, wens@csie.org Cc: mturquette@baylibre.com, sboyd@kernel.org, andre.przywara@arm.com, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, Jernej Skrabec Subject: [PATCH] clk: sunxi-ng: Fix H6 RTC clock definition Date: Tue, 19 Jul 2022 20:37:25 +0200 Message-Id: <20220719183725.2605141-1-jernej.skrabec@gmail.com> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220719_113732_574007_55F40C78 X-CRM114-Status: GOOD ( 10.42 ) X-BeenThere: linux-arm-kernel@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-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org While RTC clock was added in H616 ccu_common list, it was not in H6 list. That caused invalid pointer dereference like this: Unable to handle kernel NULL pointer dereference at virtual address 000000000000020c Mem abort info: ESR = 0x96000004 EC = 0x25: DABT (current EL), IL = 32 bits SET = 0, FnV = 0 EA = 0, S1PTW = 0 FSC = 0x04: level 0 translation fault Data abort info: ISV = 0, ISS = 0x00000004 CM = 0, WnR = 0 user pgtable: 4k pages, 48-bit VAs, pgdp=000000004d574000 [000000000000020c] pgd=0000000000000000, p4d=0000000000000000 Internal error: Oops: 96000004 [#1] PREEMPT SMP CPU: 3 PID: 339 Comm: cat Tainted: G B 5.18.0-rc1+ #1352 Hardware name: Tanix TX6 (DT) pstate: 00000005 (nzcv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : ccu_gate_is_enabled+0x48/0x74 lr : ccu_gate_is_enabled+0x40/0x74 sp : ffff80000c0b76d0 x29: ffff80000c0b76d0 x28: 00000000016e3600 x27: 0000000000000000 x26: 0000000000000000 x25: 0000000000000002 x24: ffff00000952fe08 x23: ffff800009611400 x22: ffff00000952fe79 x21: 0000000000000000 x20: 0000000000000001 x19: ffff80000aad6f08 x18: 0000000000000000 x17: 2d2d2d2d2d2d2d2d x16: 2d2d2d2d2d2d2d2d x15: 2d2d2d2d2d2d2d2d x14: 0000000000000000 x13: 00000000f2f2f2f2 x12: ffff700001816e89 x11: 1ffff00001816e88 x10: ffff700001816e88 x9 : dfff800000000000 x8 : ffff80000c0b7447 x7 : 0000000000000001 x6 : ffff700001816e88 x5 : ffff80000c0b7440 x4 : 0000000000000001 x3 : ffff800008935c50 x2 : dfff800000000000 x1 : 0000000000000000 x0 : 000000000000020c Call trace: ccu_gate_is_enabled+0x48/0x74 clk_core_is_enabled+0x7c/0x1c0 clk_summary_show_subtree+0x1dc/0x334 clk_summary_show_subtree+0x250/0x334 clk_summary_show_subtree+0x250/0x334 clk_summary_show_subtree+0x250/0x334 clk_summary_show_subtree+0x250/0x334 clk_summary_show+0x90/0xdc seq_read_iter+0x248/0x6d4 seq_read+0x17c/0x1fc full_proxy_read+0x90/0xf0 vfs_read+0xdc/0x28c ksys_read+0xc8/0x174 __arm64_sys_read+0x44/0x5c invoke_syscall+0x60/0x190 el0_svc_common.constprop.0+0x7c/0x160 do_el0_svc+0x38/0xa0 el0_svc+0x68/0x160 el0t_64_sync_handler+0x10c/0x140 el0t_64_sync+0x18c/0x190 Code: d1006260 97e5c981 785e8260 8b0002a0 (b9400000) ---[ end trace 0000000000000000 ]--- Fix that by adding rtc clock to H6 ccu_common list too. Fixes: 38d321b61bda ("clk: sunxi-ng: h6-r: Add RTC gate clock") Signed-off-by: Jernej Skrabec Reviewed-by: Samuel Holland --- drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c b/drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c index 29a8c710ae06..b7962e5149a5 100644 --- a/drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c +++ b/drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c @@ -138,6 +138,7 @@ static struct ccu_common *sun50i_h6_r_ccu_clks[] = { &r_apb2_rsb_clk.common, &r_apb1_ir_clk.common, &r_apb1_w1_clk.common, + &r_apb1_rtc_clk.common, &ir_clk.common, &w1_clk.common, };