From patchwork Tue Dec 10 01:30:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Geis X-Patchwork-Id: 13900604 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 69BEDE7717D for ; Tue, 10 Dec 2024 01:32: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:References:In-Reply-To: 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: List-Owner; bh=0t9aGxSJsIGn+KdrkZtcgrCiMTJwscD7zNudgVd4Bfw=; b=Gc8pIwdtIe0+qy DLpIS5KW+qh+yGV4aNoZG02LXGRJDUqPQnBa/2AqLf7DVrrEUKUS3f6dz13NPcMdhS0ViMhOlJUQP f0uXs8fF1mxPpN3m2vKYJyBoFlMD5jA+zX5rDJYBFwBNIjPq9Q+0sWLuvcTmzVqKf9Y/ZOamGRQKk zgnnyy5UW/Hgy7YxbbjnKVOiI6eJp4UqwpZYxRNkT77a+5QKKeH3mDgDVeBnJHIlBbOaArxt2n8BV ypATSo2JQxzlRidlzb5vaK5o4FWg55Iq/hyz0KNMhf6YHHpqXufLXzy8+Z0RL1Llc9HYDBitYPn5i M/rpVDfbaQRyPg8+OrCA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tKp75-00000009qOb-3HGT; Tue, 10 Dec 2024 01:32:35 +0000 Received: from mail-qv1-xf2b.google.com ([2607:f8b0:4864:20::f2b]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tKp51-00000009prv-3deJ; Tue, 10 Dec 2024 01:30:28 +0000 Received: by mail-qv1-xf2b.google.com with SMTP id 6a1803df08f44-6d87ab49423so49438826d6.0; Mon, 09 Dec 2024 17:30:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1733794226; x=1734399026; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5sUmnsMlb6+J2z+CZq/V8Utz5Q8oJwF2bHLJE2t/SHA=; b=OQq5cmxEsisnTo66N4MK6r3f6XGqT8Qarnln/KIY+N6X4F3SQDROy3elWlinvP9Uc4 rJDGmAF3ipJDQ9zWFTkj5wkBQTMCmzCVWSqgTDlriLUe1/MAtRLY2ikVZw4lVJygBE5A d2yvW7vmAuZwTlr+z9jXh+tKE3JlXSVuWl6DCdQpHstmzdkfpRLJEYgdaI/NbC0WD0eL tRuskhYEN5RQoDmrmMIqeWGgE+B4Fz27lNJ5l5B7Ae2YrENMxIYY+Vp9NEcWNW2ZozzD +5f0qyCN2Qi5UMOYYmTHv8mS0hWcv1ayGr2+CFVcq3TihzTxyCEQ7yfafxGVK+6HwzXm 1yDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733794226; x=1734399026; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5sUmnsMlb6+J2z+CZq/V8Utz5Q8oJwF2bHLJE2t/SHA=; b=YY82Se2+I6KOCV82J2S/CD2Jf/wkdRc3pwzKeK5YQqToU62L3AsLSHBUHIDNgMqgva 5SvxOkjWfA8n7ZzkPMR4EUPSb9gUxhAxKhFhqb/fr3CeQl1MKCUfrrs4xqJQVgeOXJDL fdZzLpOXYOpVvrUrRRiVWiiewXiXIY1ul07cEncvkk4UnBmdqI+uGTWTYSkTyuJ/ghiX kRFR39T3WBIDNbeRJ0I3fGqVSMP0AoQaWo/CD9/f6PoNdHb9WDhIGm29LC3gW7tCLwI4 baiIisE0AiAHUPWU/ckSLS1oS2pBlY+wa8hnZsIk9tZLhAU4xscK/jRyhKW0BPz8Xfh4 O5Vg== X-Forwarded-Encrypted: i=1; AJvYcCVU12Iud63yN3cDq59HkFGbDcCqyUXrs7CB5bk3pioZz/0fZj+2DqkajVMgWlV7bQFC4Rk6xliuQG5t8l63317A@lists.infradead.org, AJvYcCXKRtAZrHbmksuC/OEWDE9lk+9E5fWisnXbaWiCouSe1D2awP9lNdAtMm3vetYKtm259Upy3eNQevWDOLFTYpI=@lists.infradead.org X-Gm-Message-State: AOJu0Yx7O+kEjyGUS0poeI6AKi3N0gxFUQ5FIAxsGV94SrT/rusurpKp x8kwAJ7OEG069XTbjT6UyftkWZ519vFsZJQRdnvbtbtv87b9EjgV X-Gm-Gg: ASbGncvKAeeQX+MAIlvolqKuH3vhp5mIcGnyqh2k0wAgtn8Nw8k9TSEJtHOJHzuJRHp FL8bB9d40pGskzvdTodanYguY2DFDP/uaMQOVqy7lwfWVbUYqiXP7k2MyUvOOZqSnkEgFaofvvz N279+EyILQWVpu2elF9YS12y6Limwd5SPzX7+DFtqWdu08ot/KgvMlbZ8L3K8ToZCXww+Op+Pht fD/8J9FxbQZilPethpZzTVR9iadahMEBpXY6snWU+O09JwMjyD/snpeXhIUCM9tlA== X-Google-Smtp-Source: AGHT+IE1D13JutVol/zUpThGrVNHALTvBXJmh1Qc3SYE16zwA1SMBc6vR4AEEi2kPGJtGcjxoFLleg== X-Received: by 2002:a05:6214:23c6:b0:6d8:960e:5785 with SMTP id 6a1803df08f44-6d91e314427mr51513186d6.13.1733794226579; Mon, 09 Dec 2024 17:30:26 -0800 (PST) Received: from master-x64.sparksnet ([204.111.53.234]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6d8f429a79csm36834346d6.72.2024.12.09.17.30.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Dec 2024 17:30:26 -0800 (PST) From: Peter Geis To: Heiko Stuebner Cc: Peter Geis , Caesar Wang , Detlev Casanova , Finley Xiao , Jonathan Cameron , Kevin Hilman , Krzysztof Kozlowski , Ulf Hansson , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, linux-rockchip@lists.infradead.org Subject: [PATCH 1/6] pmdomain: rockchip: fix rockchip_pd_power error handling Date: Tue, 10 Dec 2024 01:30:05 +0000 Message-Id: <20241210013010.81257-2-pgwipeout@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241210013010.81257-1-pgwipeout@gmail.com> References: <20241210013010.81257-1-pgwipeout@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241209_173027_903600_137932B8 X-CRM114-Status: GOOD ( 12.47 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org The calls rockchip_pd_power makes to rockchip_pmu_set_idle_request lack any return error handling, causing device drivers to incorrectly believe the hardware idle requests succeed when they may have failed. This leads to software possibly accessing hardware that is powered off and the subsequent SError panic that follows. Add error checking and return errors to the calling function to prevent such crashes. gst-launch-1.0 videotestsrc num-buffers=2000 ! v4l2jpegenc ! fakesink Setting pipeline to PAUSED ...er-x64 Pipeline is PREROLLING ... Redistribute latency... rockchip-pm-domain ff100000.syscon:power-controller: failed to get ack on domain 'hevc', val=0x98260, idle = 0 SError Interrupt on CPU2, code 0x00000000bf000002 -- SError CPU: 2 UID: 0 PID: 804 Comm: videotestsrc0:s Not tainted 6.12.0-rc5+ #54 Hardware name: Firefly roc-rk3328-cc (DT) pstate: 60400005 (nZCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : rockchip_vpu2_jpeg_enc_run+0x168/0xbc8 lr : device_run+0xb0/0x128 sp : ffff800082143a20 x29: ffff800082143a20 x28: 0000000000000140 x27: 0000000000000000 x26: ffff582c47a313e8 x25: ffff582c53e95000 x24: ffff582c53e92800 x23: ffff582c5bbe0000 x22: 0000000000000000 x21: ffff582c47a31080 x20: ffffa0d78cfa4168 x19: ffffa0d78cfa4168 x18: ffffb755b0519000 x17: 000000040044ffff x16: 00500072b5503510 x15: a7a6a5a4a3a29a99 x14: 989796959493928a x13: 0000000051eb851f x12: 00000000000000ff x11: ffffa0d78d812880 x10: ffffa0d78d7fbca0 x9 : 000000000000003f x8 : 0000000000000063 x7 : 000000000000003f x6 : 0000000000000040 x5 : ffff80008010d000 x4 : ffffa0d78cfa4168 x3 : ffffa0d78cfbfdd8 x2 : ffff80008010d0f4 x1 : 0000000000000020 x0 : 0000000000000140 Kernel panic - not syncing: Asynchronous SError Interrupt CPU: 2 UID: 0 PID: 804 Comm: videotestsrc0:s Not tainted 6.12.0-rc5+ #54 Hardware name: Firefly roc-rk3328-cc (DT) Call trace: dump_backtrace+0xa0/0x128 show_stack+0x20/0x38 dump_stack_lvl+0xc8/0xf8 dump_stack+0x18/0x28 panic+0x3ec/0x428 nmi_panic+0x48/0xa0 arm64_serror_panic+0x6c/0x88 do_serror+0x30/0x70 el1h_64_error_handler+0x38/0x60 el1h_64_error+0x7c/0x80 rockchip_vpu2_jpeg_enc_run+0x168/0xbc8 device_run+0xb0/0x128 v4l2_m2m_try_run+0xac/0x230 v4l2_m2m_ioctl_streamon+0x70/0x90 v4l_streamon+0x2c/0x40 __video_do_ioctl+0x194/0x400 video_usercopy+0x10c/0x808 video_ioctl2+0x20/0x80 v4l2_ioctl+0x48/0x70 __arm64_sys_ioctl+0xb0/0x100 invoke_syscall+0x50/0x120 el0_svc_common.constprop.0+0x48/0xf0 do_el0_svc+0x24/0x38 el0_svc+0x38/0x100 el0t_64_sync_handler+0xc0/0xc8 el0t_64_sync+0x1a8/0x1b0 SMP: stopping secondary CPUs Kernel Offset: 0x20d70c000000 from 0xffff800080000000 PHYS_OFFSET: 0xffffa7d3c0000000 CPU features: 0x00,00000090,00200000,0200421b Memory Limit: none ---[ end Kernel panic - not syncing: Asynchronous SError Interrupt ]--- Fixes: 7c696693a4f5 ("soc: rockchip: power-domain: Add power domain driver") Signed-off-by: Peter Geis --- drivers/pmdomain/rockchip/pm-domains.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/pmdomain/rockchip/pm-domains.c b/drivers/pmdomain/rockchip/pm-domains.c index cb0f93800138..57e8fa25d2bd 100644 --- a/drivers/pmdomain/rockchip/pm-domains.c +++ b/drivers/pmdomain/rockchip/pm-domains.c @@ -590,14 +590,18 @@ static int rockchip_pd_power(struct rockchip_pm_domain *pd, bool power_on) rockchip_pmu_save_qos(pd); /* if powering down, idle request to NIU first */ - rockchip_pmu_set_idle_request(pd, true); + ret = rockchip_pmu_set_idle_request(pd, true); + if (ret < 0) + return ret; } rockchip_do_pmu_set_power_domain(pd, power_on); if (power_on) { /* if powering up, leave idle mode */ - rockchip_pmu_set_idle_request(pd, false); + ret = rockchip_pmu_set_idle_request(pd, false); + if (ret < 0) + return ret; rockchip_pmu_restore_qos(pd); } From patchwork Tue Dec 10 01:30:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Geis X-Patchwork-Id: 13900605 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 116A5E7717D for ; Tue, 10 Dec 2024 01:33:42 +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:References:In-Reply-To: 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: List-Owner; bh=fksxNQ/suGa9HBkgaLc0rSOj907mBrqIQQGBgYREa4o=; b=jiKpKoXhN4Ujjl ho1pKY6JXYfFfIOZ1icncUSAwDkUtvq+fzOrqpxkAxwNHTRhfgih5ntsPztn9fZ5lS3oEPkXvVQH3 ahBI9g2wtpMELXP0SOroU+i6vheggdsxQrEf1FbmetWd7IDNWMxWUneoRTjRoie/U5xp9bKaZSA6U SFShRMwEgf2C8dT4CstQk4EnNkY7SSLZZMzUJYABdtxFpqr2mgaIirZ8eBk/x92bhlAr6PHkjIzRc nXg3lke/fW9C9EYfNFVpK1coJlFyOijwLzQGXx6O+ON0/v2YzW21kWd6inGOz3RwmsfZl4KlGFBUL b6i33tDuTZ5jRclFwioA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tKp86-00000009qWi-41Pr; Tue, 10 Dec 2024 01:33:38 +0000 Received: from mail-qv1-f54.google.com ([209.85.219.54]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tKp53-00000009pss-4ALQ; Tue, 10 Dec 2024 01:30:31 +0000 Received: by mail-qv1-f54.google.com with SMTP id 6a1803df08f44-6d87ab49423so49438986d6.0; Mon, 09 Dec 2024 17:30:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1733794228; x=1734399028; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZbMZ1XEGG9+iR89acIoDRWlRdmkKPe5qHYKAcY8LBOk=; b=J14ImJTwPQ7M2FqqIbWQC06kaAXCdyBKecIb+X+UmID6ROQMu7hDZ83Kf/Jjd18nw0 8JiQxATkorkOSyhYbiMbJiouVXU7O6OJa2jmfjs34afejtAc1RBT4jBrxd039mPjIZtZ g57HC8AFA9x/Ea9ksvAcXKlSS657q1jbSqoqwSSyq2PpEysNMYDdt94T00NkORH6Rmrv kfHoj3QGoE3z6nfulDTt76GL3f/pfSMI+Rg6O1PUbPyh0+PbnGCAZc5YkJlYIVp3WxM0 Js2mC022G1ki7zZTE3Y4ZaIU40y6q+055xXEUdPFIh4ft1dNjZ6+4I6W8zLy4FqjuDef v/SQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733794228; x=1734399028; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZbMZ1XEGG9+iR89acIoDRWlRdmkKPe5qHYKAcY8LBOk=; b=TGUAtrg/UnHHR3XQaYbnDkyQ7PzQr5HQ2yuufOjNU9RgsW4SMdcix/pTYy7Retg3eJ Ry5lFWhg1C2C5e9kYdXooFa5lVwYmEf5amOgoY82Izy9ud3sfulYDf8O9R114Ntpc53k hCKPGWCj2RhOPz6Wa3w1q+byLhxahT0HBUxeR2SAq8/otrGqp67A6WosUQO07fEV6pOz wG0AI73kwsD1lq3E+R9f7hXtDOLggz/4SSFRCTYv/f0KEjaM7gpRB6ygfRNv4Gz2cHv1 b7nBcGc4lqZFU/ACSizqyF7vUJ0gRC8ug3hAOwkJzGnDiLdyN4dE2FB5D4XRkqnPCN9Z tQLA== X-Forwarded-Encrypted: i=1; AJvYcCV/EaxKRYKFsoAYy7u6rZTvDoYML+6f7bdlRh3aJlF5WryPXL+/s/RySlVYQMrV9MXpfGRyMroWMoRj9zEXHkE=@lists.infradead.org, AJvYcCX4kZ0d9Q1O1xw1bk6a85Y/DoqcZTGKentnhNjfX8IYbj6uvXMMXZ6JvGfFMdntzT6JAyTll8FCTV9sglURutBo@lists.infradead.org X-Gm-Message-State: AOJu0YwrfK9U3uh192BddwOBwE0SlWCuxCaT7/Sv2FggfLQQpnxMQKB2 Lo7O0dTCLNDYtD/wixVgdv0e9FnXZCd/wcw7ga6Co/f2DbnZF/w0 X-Gm-Gg: ASbGnct5Q4r3S7QZuE+v18O9St8DAN+DSc+8MJ7MWQqb36QVvAWOr74esah5AHAzQMq j2TRVm+b5QWzrZwhyZbhcuXOvJIA0EynNlIPpkaiymu7nJx7kofnUd4+U55+n6L2n7dfc+bgrdV kPOIjuPlnoKoPTYpZOKv2XSuurR8K9VB0UtLBU5ZGipazaK9BZtqO/FRIb9h0jxbP8KUAMsMHYV VjyJOYXzqcr4pe0UaA+OMpTZCV6pGp52q521StQi2nvyTE+llQLtyfLBzqWDA0D9w== X-Google-Smtp-Source: AGHT+IHtWOPd4M5xIQAtOFMGvJ2WXw5oVrlCvjGb1M5Y3tJlywOZoegb0SMUWVqBgkFNZkQZZVQ7Og== X-Received: by 2002:a05:6214:d06:b0:6d8:850a:4d6a with SMTP id 6a1803df08f44-6d91e2d2bf2mr47042826d6.1.1733794228302; Mon, 09 Dec 2024 17:30:28 -0800 (PST) Received: from master-x64.sparksnet ([204.111.53.234]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6d8f429a79csm36834346d6.72.2024.12.09.17.30.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Dec 2024 17:30:27 -0800 (PST) From: Peter Geis To: Heiko Stuebner Cc: Peter Geis , Elaine Zhang , Michael Turquette , Stephen Boyd , linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org Subject: [PATCH 2/6] clk: rockchip: fix wrong clk_ref_usb3otg parent for rk3328 Date: Tue, 10 Dec 2024 01:30:06 +0000 Message-Id: <20241210013010.81257-3-pgwipeout@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241210013010.81257-1-pgwipeout@gmail.com> References: <20241210013010.81257-1-pgwipeout@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241209_173030_032422_EA5456C0 X-CRM114-Status: GOOD ( 10.63 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Correct the clk_ref_usb3otg parent to fix clock control for the usb3 controller on rk3328. Verified against the rk3328 trm and usb3 clock tree documentation. Fixes: fe3511ad8a1c ("clk: rockchip: add clock controller for rk3328") Signed-off-by: Peter Geis --- drivers/clk/rockchip/clk-rk3328.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/rockchip/clk-rk3328.c b/drivers/clk/rockchip/clk-rk3328.c index 3bb87b27b662..cf60fcf2fa5c 100644 --- a/drivers/clk/rockchip/clk-rk3328.c +++ b/drivers/clk/rockchip/clk-rk3328.c @@ -201,7 +201,7 @@ PNAME(mux_aclk_peri_pre_p) = { "cpll_peri", "gpll_peri", "hdmiphy_peri" }; PNAME(mux_ref_usb3otg_src_p) = { "xin24m", - "clk_usb3otg_ref" }; + "clk_ref_usb3otg_src" }; PNAME(mux_xin24m_32k_p) = { "xin24m", "clk_rtc32k" }; PNAME(mux_mac2io_src_p) = { "clk_mac2io_src", From patchwork Tue Dec 10 01:30:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Geis X-Patchwork-Id: 13900615 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 79320E7717D for ; Tue, 10 Dec 2024 01:34:45 +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:References:In-Reply-To: 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: List-Owner; bh=pNzC8Jq5ELXdDqzGaX7x7a3c5l4YCPTVtOfavIMAVYw=; b=aI1D5dLcjhVyfX 49H6lNYZL5Q/rLp3hNTYGtqvymR01+RVnv/1gAwXIa1VimqmJL+h7p85/BKdajzQ6GkKy3BT+zGRd QZblfJSmbM9CmXj8OhFmtkiioieSImZomeST6xu1lomCXTYUj/pxVRqj4BvGgpzDlkT07ttOm6Z+y Skpp0FSF7QCqhmmMOHkLC+pxT3nFh7BbPvIB2CFTpuSUaAYfg3Q5WmfZ0mEdMEfzTbXWz4R/Zh6zy m5p2u3EkW5Keta/6xHIIJs48iR/D+DFOtSjspzbVXqU42H7Rex99bnpLb9M1IODLyoSr40kbMyZ46 DixT69wYw8I9gdSmsnsg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tKp97-00000009qeJ-3auU; Tue, 10 Dec 2024 01:34:41 +0000 Received: from mail-qv1-xf2e.google.com ([2607:f8b0:4864:20::f2e]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tKp56-00000009puH-18Ut; Tue, 10 Dec 2024 01:30:33 +0000 Received: by mail-qv1-xf2e.google.com with SMTP id 6a1803df08f44-6d89a727a19so53826346d6.0; Mon, 09 Dec 2024 17:30:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1733794231; x=1734399031; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7ryxhFq/D6uK4o3TwTQ7Wdb4StN8ThF9XTxHXMGYXkM=; b=LyQ4uTbLQJzdR4GCSGiOAUcZcy8YFsvRmCiclxv4A7ebnCgn1mC4mgxejKl8Sio6Ju cuk4cos3RAoUiMSXOxcVGOyIiPRjgybnPtk+ZCgSl2OY2N22KbZMJAo+4PbcAKqNL4d5 spZ+pDQkelsc98IEma2n56goi2JTCkyalaaNH4VxO2j22g/sd6NQr9QkTtibyghW8Hpx iUsUBd5pXe3iWw7yEsk1kVnZ2XrrwldmGDqgQ6pB6NWiknMTy8xz1fsYCXuwxnmg82/5 94ZP8OM5IcCYsYbRZU9A1yllhyU9Cg7sF9yM7zIvB8A4InOEwfCdriwbI1fu4x/pwUrO bJLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733794231; x=1734399031; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7ryxhFq/D6uK4o3TwTQ7Wdb4StN8ThF9XTxHXMGYXkM=; b=CXwAYD2Vqxur8241rxO1zScOzL5IPfNm3JCNwHl+YRM6OSDSGN484oAxnd8+3t/zvK pg0s0gEJY1mnvxjVm/ZxeXyPZ7Wz5ALaTJIKZq8jVXSP0zyx+UJg8cAgWAw8LUEkUp2M 9HreyFvagjUj4X7HvXjL3F5UuSsqxo0jsjEf0iHnRWSNq9DtTTNKq9meRDtFD1I3uID0 r5GAmPlO590OG4n7J/8RW9xKp3pFwds9tSYpW+AEMwMkZ0/5jIXqI4DQO0fe+k88ezoa 3zJhTkxm/65xpnQwOVA8Ia0VRxfFj6HUb4QltrIW9qMaQ+PA+6EtkNudr1iwqD/CHcnN iEmA== X-Forwarded-Encrypted: i=1; AJvYcCUlT6WwNpzWRcmPTIgHJK55c+cHUyGS7v8dqOfGNUJYjW1gIfUGMu6xj4DjeawfTD+MemqcDPlcRoqJdXkoRgs=@lists.infradead.org, AJvYcCVY6QyqiKDoLMHLbRPQbToG46TGMAzJpWffm0M1M1WVoa5DahN2UaNGgB+Q7qeVUYf11NxC6j2ip9uAfTl4yQhu@lists.infradead.org X-Gm-Message-State: AOJu0YxJjq9YNSB8fQneeWjWc8WDfRTF1OBZdhg71DFRhAWJHZuJb6wh 9GUDepfNcyJ9+RLesHpgc9gUcYTC3hLaPOeiba89UndaRWdGKTAhrpbOgrgB X-Gm-Gg: ASbGncsVteRPlJFrOQEqlJrT9+GRqLohWZoZNUL7reo71DMC0vM9HH1dGgKLO7gyLxS +qz45lImODam7A/OTcUs5e2xeKWJCSaGbLLFXeG2N1JDi5ybD3Xtk4vY8wgPDEw0atbuDYVWyxV 1Y4NUXVcySdYct584o5OnmhKcUcoiFFw8r6ehUWNEi7006KUjNIyOTFhPEvh8XhLc6olbDQfqR9 BaW4ueEHJi79PISQKzzUhIsKF2IDehtB3AtsuqPtl423nyufT4YyI3wUPAqq2Ym5Q== X-Google-Smtp-Source: AGHT+IGnHu4GKol3hVAzHldnP2oJaYa4cSwD67AUlgoZTcrdM6Y6t8bZ454xDQJ+meiSiuoKJRyJhw== X-Received: by 2002:a0c:edcd:0:b0:6d4:287d:b8d9 with SMTP id 6a1803df08f44-6d92128fb74mr27104106d6.2.1733794230935; Mon, 09 Dec 2024 17:30:30 -0800 (PST) Received: from master-x64.sparksnet ([204.111.53.234]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6d8f429a79csm36834346d6.72.2024.12.09.17.30.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Dec 2024 17:30:29 -0800 (PST) From: Peter Geis To: Heiko Stuebner Cc: Peter Geis , Conor Dooley , Diederik de Haas , Dragan Simic , Johan Jonker , Krzysztof Kozlowski , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org Subject: [PATCH 3/6] arm64: dts: rockchip: remove ethernet alias from rk3328-roc Date: Tue, 10 Dec 2024 01:30:07 +0000 Message-Id: <20241210013010.81257-4-pgwipeout@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241210013010.81257-1-pgwipeout@gmail.com> References: <20241210013010.81257-1-pgwipeout@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241209_173032_305821_EE5079F2 X-CRM114-Status: UNSURE ( 9.99 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Remove the ethernet alias added back in during the rk3328-roc dtsi conversion. Fixes: f3c6526d6fb2 ("arm64: dts: rockchip: Convert dts files used as parents to dtsi files") Signed-off-by: Peter Geis --- arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi index b5bd5e7d5748..f782c8220dd3 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi @@ -9,7 +9,6 @@ / { aliases { - ethernet0 = &gmac2io; mmc0 = &sdmmc; mmc1 = &emmc; }; From patchwork Tue Dec 10 01:30:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Geis X-Patchwork-Id: 13900616 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 A1E2EE7717D for ; Tue, 10 Dec 2024 01:35:46 +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:References:In-Reply-To: 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: List-Owner; bh=tawh8CZvVQgGp20N0bqnTwCSD9b23qiqutlE9jOB/pc=; b=Ah9g8942yfNq3Q dmtLMIj982IYdytlHe/a2bAtkPqhdwefUY2s6e8h1I0RduXxZSwpL4WtRhzmf7qM2Ho1XRp5P6Hxm wFcc4gsZUIfoIt17rKXOp2dJXb2b826S/QQQSLhkT8COsg1N//cPgNfk4xD3BBZhLIj8nd/cmabAp bNGQ3K9YIlyaXiywUdogDyEP+1PsAixs64eFtjPEO5w1FzaosITV0FZolKNorNW2+iQoPdaq3c8C4 FOe+Ze8Hb5O6Zacy8AJoqAsDPMMIItdw0PAvhcrDSSIqbTj5+Rqm51Qc5eIzIMJi06cpxBqNBkcY3 4+HXNaV+KSlBWMeHhkgA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tKpA7-00000009qlo-3fPW; Tue, 10 Dec 2024 01:35:43 +0000 Received: from mail-qv1-xf35.google.com ([2607:f8b0:4864:20::f35]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tKp58-00000009pvD-12gl; Tue, 10 Dec 2024 01:30:35 +0000 Received: by mail-qv1-xf35.google.com with SMTP id 6a1803df08f44-6d8918ec243so50940656d6.1; Mon, 09 Dec 2024 17:30:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1733794233; x=1734399033; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nes5VB2VcAfNvacXIUYzGUAIsX7gVlGNiJVgrHet/68=; b=g1G5I81eJOstLqZYRVcgyO/0gCjTXxMgkN3fZwlA/pyKFuMOrnHPuJSJI9njrbEQX0 Oc3XdZY/mn2P9+7oK3fDlFjXZrD01s2oGaMqAq9Wg7R7a1UyoGVy9hg4MPwrp/aX/Ifn IozEZEencvbLyiSkHprTnhBeQ5Pc45jorcfDmp/20TCAfipwgKIx35UHdesqMgLfuuR7 AxDit9bE96HorBSqRzhvkabr4pJFjTzWbzTe7UGVwH00SzDG9zGfE7fHwAFa7zai7vkx GdcL6UkPqVZgtBk848JeXmd1xreeIsnIBUkYzcbkmJPjkzDaM6q9oYIc6qwkudU5vR/1 ur5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733794233; x=1734399033; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nes5VB2VcAfNvacXIUYzGUAIsX7gVlGNiJVgrHet/68=; b=iJoQI86RhMATP87jNxQyhzrY9MNrh5Rx+vBa/2pxExo0VSFma7rPVsWn6mNXcNsQVC K/KdOZT2O1hHLlay0WdYYi0yceX/KSU7S1TtbowcHd4rPMKp+8kSYzgnu4YqyzBWWvmc 4SOSv4hv0WmoVuX/UAgXp+x92Q1E0wR8PRt214Y8ZT7Co4RdIi8CAr/+FQfNb2oYq6IH rodOcYbDQt8f8H4LFpbCuRNIELVmpg1k2o0fqFqUgAzW5CPsGQ2ML6Rw1pggJ+ncWrE+ fpFSsx8X182UwZLyZhu4loxjRD045PHBxSouFh4LjSk7Kw12m45NXqO95HsoAMy3R4fr LGgg== X-Forwarded-Encrypted: i=1; AJvYcCWTAb2j1Da+hVq0IgAC4u8TWoN/6iLpsxTYyL/rhE9WGs4xfN6bkW2klUNBpxbMbJrvXqTGdq7vZDDSpdoDLNTm@lists.infradead.org, AJvYcCX1sVQ/4PZGW4cwmfz63ElM3LdDF57gHaiub7k5tzykbfbCejQU12etX6NIqfnIjSfUXVuP7dTMtjL+sPsUJDI=@lists.infradead.org X-Gm-Message-State: AOJu0Yx3O+zhLzqlZEpyfQewK/S8WsDWlLmxNrp/7PCEpyso/YZNrpFT ptlwSy++xUDIZ0a2ao80qsBxJFcYyaKV4nHp79KNCmJSk5wYuM/s X-Gm-Gg: ASbGnct0E19d3rw1mRWQMbAGG6AU/n6xkfnnMsgF8B4XlFuUonLLfdWPluJfBQvxI2Z w6C+fhwXn0ZYBe5OxqnazcDX6gEW/z42SFbSijXghNy2R/fAjLnG8CrePH+4VgtmSktYQiPIVD1 oj3TfvTAkBPw/LYMG+hD5E3rLvlq+/umaGBAYzyt9eWrVfxT6CKeEDP8RAiTuTNWz/aczzdQbFv W+I0D5e5z9ZIbz+JblRcQlDeOlWwWiJ2NYXgK6oOlGUJJbxGg/Ai0zKnZCgTx6EPQ== X-Google-Smtp-Source: AGHT+IGDRUk9+gv8pP1CJieucgxw/FIyVkf5JoAn+WsrS/JAfYgwU4trbE3sWTyJ4SkA4cp4lgjq+A== X-Received: by 2002:a05:6214:d06:b0:6d8:850a:4d6a with SMTP id 6a1803df08f44-6d91e2d2bf2mr47046016d6.1.1733794232931; Mon, 09 Dec 2024 17:30:32 -0800 (PST) Received: from master-x64.sparksnet ([204.111.53.234]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6d8f429a79csm36834346d6.72.2024.12.09.17.30.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Dec 2024 17:30:31 -0800 (PST) From: Peter Geis To: Heiko Stuebner Cc: Peter Geis , Alex Bee , Conor Dooley , Diederik de Haas , Dragan Simic , Johan Jonker , Jonas Karlman , Krzysztof Kozlowski , Liang Chen , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, shironeko Subject: [PATCH 4/6] arm64: dts: rockchip: add hevc power domain clock to rk3328 Date: Tue, 10 Dec 2024 01:30:08 +0000 Message-Id: <20241210013010.81257-5-pgwipeout@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241210013010.81257-1-pgwipeout@gmail.com> References: <20241210013010.81257-1-pgwipeout@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241209_173034_284650_A4E28749 X-CRM114-Status: GOOD ( 11.29 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org There is a race condition at startup between disabling power domains not used and disabling clocks not used on the rk3328. When the clocks are disabled first, the hevc power domain fails to shut off leading to a splat of failures. Add the hevc core clock to the rk3328 power domain node to prevent this condition. rcu: INFO: rcu_sched detected expedited stalls on CPUs/tasks: { 3-.... } 1087 jiffies s: 89 root: 0x8/. rcu: blocking rcu_node structures (internal RCU debug): Sending NMI from CPU 0 to CPUs 3: NMI backtrace for cpu 3 CPU: 3 UID: 0 PID: 86 Comm: kworker/3:3 Not tainted 6.12.0-rc5+ #53 Hardware name: Firefly ROC-RK3328-CC (DT) Workqueue: pm genpd_power_off_work_fn pstate: 20400005 (nzCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : regmap_unlock_spinlock+0x18/0x30 lr : regmap_read+0x60/0x88 sp : ffff800081123c00 x29: ffff800081123c00 x28: ffff2fa4c62cad80 x27: 0000000000000000 x26: ffffd74e6e660eb8 x25: ffff2fa4c62cae00 x24: 0000000000000040 x23: ffffd74e6d2f3ab8 x22: 0000000000000001 x21: ffff800081123c74 x20: 0000000000000000 x19: ffff2fa4c0412000 x18: 0000000000000000 x17: 77202c31203d2065 x16: 6c6469203a72656c x15: 6c6f72746e6f632d x14: 7265776f703a6e6f x13: 2063766568206e69 x12: 616d6f64202c3431 x11: 347830206f742030 x10: 3430303034783020 x9 : ffffd74e6c7369e0 x8 : 3030316666206e69 x7 : 205d383738353733 x6 : 332e31202020205b x5 : ffffd74e6c73fc88 x4 : ffffd74e6c73fcd4 x3 : ffffd74e6c740b40 x2 : ffff800080015484 x1 : 0000000000000000 x0 : ffff2fa4c0412000 Call trace: regmap_unlock_spinlock+0x18/0x30 rockchip_pmu_set_idle_request+0xac/0x2c0 rockchip_pd_power+0x144/0x5f8 rockchip_pd_power_off+0x1c/0x30 _genpd_power_off+0x9c/0x180 genpd_power_off.part.0.isra.0+0x130/0x2a8 genpd_power_off_work_fn+0x6c/0x98 process_one_work+0x170/0x3f0 worker_thread+0x290/0x4a8 kthread+0xec/0xf8 ret_from_fork+0x10/0x20 rockchip-pm-domain ff100000.syscon:power-controller: failed to get ack on domain 'hevc', val=0x88220 Fixes: 52e02d377a72 ("arm64: dts: rockchip: add core dtsi file for RK3328 SoCs") Signed-off-by: Peter Geis Reviewed-by: Dragan Simic --- arch/arm64/boot/dts/rockchip/rk3328.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi index 0597de415fe0..7d992c3c01ce 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi @@ -333,6 +333,7 @@ power: power-controller { power-domain@RK3328_PD_HEVC { reg = ; + clocks = <&cru SCLK_VENC_CORE>; #power-domain-cells = <0>; }; power-domain@RK3328_PD_VIDEO { From patchwork Tue Dec 10 01:30:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Geis X-Patchwork-Id: 13900617 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 BDC57E7717D for ; Tue, 10 Dec 2024 01:36: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:References:In-Reply-To: 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: List-Owner; bh=5vNXAmVPEzTSxrPoJlH8HYDnEZ4JGEsynNV+WhsmvkA=; b=hOcx3AW/pXwLvb bUTKadhZYj7jBSFVgf3FiI5tTphJtVVgahLj01L5eSKObSCw0WlnYz9NnlW5eL36bHokx9F3KsPjp EBj0nfw084wMRR5mzHFVlVieS8Z+l640FruqFlQ9CB/MfguX7bZlxROxerb/G3z7oKV3LN8jYRTSS ZpSEkFsrX/aN2jrkIDxcLtyvLcVlTtcFPccGG5YXB8nAlklOj6qAwnsRdXMJwgG7eriaU80EQwUoS xB9ljurjEQtTwUp+qedyzm/qhQS8eKBEYaNYKtFtF3hyIwtqDo2F2xQYWMEf0hiqYZ3goic9qg3Vo CtAhj0+XHHuSOVB7YnIg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tKpB8-00000009qu5-3LlD; Tue, 10 Dec 2024 01:36:46 +0000 Received: from mail-qv1-xf35.google.com ([2607:f8b0:4864:20::f35]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tKp5A-00000009pw6-1txl; Tue, 10 Dec 2024 01:30:37 +0000 Received: by mail-qv1-xf35.google.com with SMTP id 6a1803df08f44-6d88d3d1eb6so48207116d6.0; Mon, 09 Dec 2024 17:30:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1733794235; x=1734399035; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fC9D6bBSfVEUhHq7Trd28DiW5CSpsRgZ8oSjVO7Uwcc=; b=Qs2FYrgVj/DwLkYMuTHa1uJ7Ht1dc2PEb+df+mbkWKBCCBdATrhoo5dFd+onWDwesZ zW5hIBpEi7SiNONH5C8PjpD8QFF8scpnucsNcmNkJIwpnFnqRwZhtLuubxBN+1kJRlZu CajFGarM6qU1ilTNXuMMCF/LqcmtkwGIVq6R0oFNBKaWdvCBzeapBQINUK5F2TD9KbZ/ HHxmh1lURxZZHL3432pjPB3fHVhkAxe02hlSmwBdzdpkTXPENtjoXLP+oktmxvpwz1sc WTAp1dsV19+p70WqnunjvOg+VnAGrRsC2VJqdfiIqJfozW3bJk9JgLlBeceAJkWnNMdD RjMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733794235; x=1734399035; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fC9D6bBSfVEUhHq7Trd28DiW5CSpsRgZ8oSjVO7Uwcc=; b=teDC/zZ//Esy1aPeCovcCydNHeGoHjT7hNSxsmkkeRxNIKCUGd2BBTcUUG0+S2SAbS QzZpGwshLX3GOZ22tARf3Z8kpepggDEDnDV+dgu/hxk/zttGEPzsa2MrHEjphZ9KcW/m fYGh47QbrEhYKsFEbBXuwIaz55GMDbCOmnzwhwUstAy+po7eji8KcGA+hz8gs/d1icPu GgEX4TvFd1M4Nemf+Sb+DsKvCAsPluZJxHXnbnzlH2lvzJUAwmVYhocYmm10IfwVUp+B XuBzfxprJmNzPqWow7ME1RDrvnli7yl2oP28FMp/X8Ofoq0VzqzHgLYhKqeGwFjUB5eV tgxg== X-Forwarded-Encrypted: i=1; AJvYcCVs79OxYNFPWnwvUpdrQvBTygxtdfLSwBCShyXZg/LtC7yDRFc4wgtwWVM1uzY9UzdMncXfrkSCy1I8Hqubjew=@lists.infradead.org, AJvYcCVvFc6MzdGlDcUKwst9zjuyOk0UbllPWxCAQX/2w5td7wivF9UE1PdwamQo0epAG9BXBudf72z8sWzqjWwhuhXV@lists.infradead.org X-Gm-Message-State: AOJu0YyqgLl9/Q2iYwoTEzyLGXb9o5/gv0W9KfTnFdY7GIuZw9/KH2G+ EOHoarhpR8f5qT2p5sK+TwsdDPTyO2ZXMbGWj4oZKS22s8EiqEMJ0IUp+qR8 X-Gm-Gg: ASbGncveb3XUBxESKewQeQFQVrjBq3bNhFJpVMnsxtLnQsGiyj/0cp3djB2fTTfQWEq yTdEDK6UEBg3qgnGd43aMwz6/Lv07hZRPuWa90wPj1sKXGzz0uL6uy05K0d8raDUiSNWchGsV5e RUreiQIX5EUkiwdiLOf7bdqvKR6gTk78EKOGF/WKoUguIjsW0kOue2bSdKh1vf0udQLGLz7qrSz NsBtFHIR/izEoEiDIDFoNqxEdWwa2mtTzDp79UGKh8Y07M4meEA5piXWFAeuzNhgg== X-Google-Smtp-Source: AGHT+IEljNAVBvyvJhfVHfvliBl66vtZbHIQPQl7CHgoQDBd6uJthPJkN2CurCsM+FLREOa8EJMyWQ== X-Received: by 2002:a05:6214:c82:b0:6d8:b5dd:7699 with SMTP id 6a1803df08f44-6d92131428amr19515826d6.17.1733794235614; Mon, 09 Dec 2024 17:30:35 -0800 (PST) Received: from master-x64.sparksnet ([204.111.53.234]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6d8f429a79csm36834346d6.72.2024.12.09.17.30.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Dec 2024 17:30:34 -0800 (PST) From: Peter Geis To: Heiko Stuebner Cc: Peter Geis , Conor Dooley , Diederik de Haas , Dragan Simic , Johan Jonker , Krzysztof Kozlowski , Levin Du , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org Subject: [PATCH 5/6] arm64: dts: rockchip: correct rk3328-roc regulator map Date: Tue, 10 Dec 2024 01:30:09 +0000 Message-Id: <20241210013010.81257-6-pgwipeout@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241210013010.81257-1-pgwipeout@gmail.com> References: <20241210013010.81257-1-pgwipeout@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241209_173036_488933_1B00FABE X-CRM114-Status: GOOD ( 12.42 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org The rk3328-roc-cc input power is sourced from a micro-usb port, while the rk3328-roc-pc input power is sourced from a usb-c port. Both inputs are 5vdc only. Remove the 12v input from the device tree. While we are at it, add missing voltages and supply to vcc_phy, missing voltages to vcc_host1_5v, and standardize the order of regulator properties among the fixed regulators. Fixes: 2171f4fdac06 ("arm64: dts: rockchip: add roc-rk3328-cc board") Signed-off-by: Peter Geis --- arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi | 23 +++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi index f782c8220dd3..6984387ff8b3 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi @@ -24,22 +24,23 @@ gmac_clkin: external-gmac-clock { #clock-cells = <0>; }; - dc_12v: regulator-dc-12v { + /* fed from passive usb input connector */ + dc_5v: regulator-dc-5v { compatible = "regulator-fixed"; - regulator-name = "dc_12v"; + regulator-name = "dc_5v"; regulator-always-on; regulator-boot-on; - regulator-min-microvolt = <12000000>; - regulator-max-microvolt = <12000000>; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; }; vcc_sd: regulator-sdmmc { compatible = "regulator-fixed"; + regulator-name = "vcc_sd"; gpio = <&gpio0 RK_PD6 GPIO_ACTIVE_LOW>; pinctrl-names = "default"; pinctrl-0 = <&sdmmc0m1_pin>; regulator-boot-on; - regulator-name = "vcc_sd"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; vin-supply = <&vcc_io>; @@ -50,22 +51,25 @@ vcc_sdio: regulator-sdmmcio { states = <1800000 0x1>, <3300000 0x0>; regulator-name = "vcc_sdio"; regulator-type = "voltage"; + regulator-always-on; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3300000>; - regulator-always-on; vin-supply = <&vcc_sys>; }; vcc_host1_5v: vcc_otg_5v: regulator-vcc-host1-5v { compatible = "regulator-fixed"; + regulator-name = "vcc_host1_5v"; enable-active-high; pinctrl-names = "default"; pinctrl-0 = <&usb20_host_drv>; - regulator-name = "vcc_host1_5v"; regulator-always-on; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; vin-supply = <&vcc_sys>; }; + /* sourced from usb input through 3A fuse */ vcc_sys: regulator-vcc-sys { compatible = "regulator-fixed"; regulator-name = "vcc_sys"; @@ -73,7 +77,7 @@ vcc_sys: regulator-vcc-sys { regulator-boot-on; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - vin-supply = <&dc_12v>; + vin-supply = <&dc_5v>; }; vcc_phy: regulator-vcc-phy { @@ -81,6 +85,9 @@ vcc_phy: regulator-vcc-phy { regulator-name = "vcc_phy"; regulator-always-on; regulator-boot-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + vin-supply = <&vcc_io>; }; leds { From patchwork Tue Dec 10 01:30:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Geis X-Patchwork-Id: 13900618 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 250A1E7717D for ; Tue, 10 Dec 2024 01:37:55 +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:References:In-Reply-To: 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: List-Owner; bh=+BR95bjxdzO9+AS+9qE25Sjz5xTc3tnBQVtRH5wSEYU=; b=Ie9vJxUhzMlBF6 v5ohsOvo9UzcnG+z3TVJ05G2uIMUFQqz2Ln6VtF1d6C6bvLdLh5V1FnbSdsLONCszD6rjgEG3EpDq L9QNtC4BGDywOEs+k2ObMGRTkf9YOM2UwclVRYI3HWYuB+aovX0Bq8c4hmTqeMZQH1sQJiXqPCuFW wGszAgsqMWYLABthDdo1fdUiwrTWIUWI4aJOVq+K+Tmv7oweNkYpsOTRaGYcdFe96G4VD128RtqUF rDeNnEzVH3oDws1tQRI5sWpqJbEGFXCORnXhHANptD0wSjP5lSPoq2pFVXE3iOEU8QxIGg1wuR4c1 LKtytJLs3FYnJI4fIB1g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tKpC9-00000009r5p-48bh; Tue, 10 Dec 2024 01:37:49 +0000 Received: from mail-qv1-xf2e.google.com ([2607:f8b0:4864:20::f2e]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tKp5C-00000009pwq-3ibn; Tue, 10 Dec 2024 01:30:39 +0000 Received: by mail-qv1-xf2e.google.com with SMTP id 6a1803df08f44-6d900c27af7so24580096d6.2; Mon, 09 Dec 2024 17:30:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1733794238; x=1734399038; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Jqw9ssvr+RamFhuTkFddw4DLtLM/EJe/MJOiR1nlAKE=; b=f64XJqmRvgmxsRNUgX404/4hp4JVHmUu5h40KH1sfI1yT6ilQZEcMAcHFCgIgfbSwt McAMpfUpfu3gSXoQJWSD5fxKm0owWHG/QA3j89rbFwkmU4wfeM8sPlBJNlN2/2Hm7ZfD 2OMl0qoMMJOKEN/V2l7M6HrHZqTeBA3ifIstORW5kCzA/0JsMP4Z6HvVPrTZI49y1FOw VD2Oz0zWTqYpyPIG8OwjF0Pq1vs8CVJWkWN+GloVHmcTlXlbHMInbKMcsFWCl4mGksB3 8zRn+BOV73xeGh5wI/GoK2aj08JGi2aQnXyQD/tT0hc2g5KLbL8CLn0iz5/Y3p1CjJWS U/GA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733794238; x=1734399038; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Jqw9ssvr+RamFhuTkFddw4DLtLM/EJe/MJOiR1nlAKE=; b=s3oEj2g6aN9onhVySxW7L/6RFQ+EUdJzGHpp0sn9a5aXyo3K4d9oGHeS2+2vpmBeKt cnXOuAHxhcLoCKNcSJfsCMiHis8+oxVqQl+YPMsxhAj3Y7rFAZ32u7kFxrRji2bJAQ7D 3DId1k8/s4yhkdWwh1pBdpAYX8JUGuuF/vjYbF5kngp7zZhbUfbBhFuPPpRN6qxNFeZD J+7Ea7gidUOrH7EJ60hM+n6epEdcA5BqwAybpZYKscdaoiTQIH4VXJkD/x3wdOcdoNvR zJi+M19gOclnBsJfuRFeSxVZViW+OQX7JHDKiQGCCD4QpJEiHaz5pbVVIYu5sez4117D CcJw== X-Forwarded-Encrypted: i=1; AJvYcCU3aPAjezH4I4sfNh6WCkCj7iNrhV1osj5K30rL4lgLjZCfPcOObxoWcllWRmb7XVvKLMX3hidv5sTSM35Bo2EL@lists.infradead.org, AJvYcCWpl95gkYjzFObwV+P3R4TyJuiydI5mpovFSIbMdG2O74u/GPdRs0xg/syEF8MVnWl5LRIDc4jtVMx9PtJg69E=@lists.infradead.org X-Gm-Message-State: AOJu0YxsULYoe4edbceqOWl+qjoHV48uA6XlElSDn+4D4a9l4AUO9OjL fWkXzsueZVHwPxx7bcPwC8tJpgqEOKkxeCsl4++wmXUilim6zjCS X-Gm-Gg: ASbGncv2k0FtJnxQZgZmU+WobQ+JwX6vCZaLLaHFA55ALC2yNHeUhZ2goPiirKiUY+P 1zCSlNCFdxjBuxYv4L4hfAIZkokStFIDiHHaEhiPhasW8HiMURUiuXSFGv/bf9N7gBByUg9FKpL nCB9KxrOI3XS4uclilo6eHHiOd/76R1ajWEnG7E+3bmwwSg7RZWt8v/SgaXf2h1SLev1runSUWx C6LT5gwmTTUcQkS580OMj7YKn63OlRSVql4ZTg07ZpDd0DSli99LQ1EHP/UTY0TPQ== X-Google-Smtp-Source: AGHT+IH6JIbgEEMAy3xvXZsAPmdWHrEPx5XojlgCSN0/zSm0Ou9M/ynX9WkvMGNi2Bhw9DACvmHMFw== X-Received: by 2002:a05:6214:226a:b0:6d8:86c8:c2a9 with SMTP id 6a1803df08f44-6d8e73bf6b0mr241598566d6.31.1733794238061; Mon, 09 Dec 2024 17:30:38 -0800 (PST) Received: from master-x64.sparksnet ([204.111.53.234]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6d8f429a79csm36834346d6.72.2024.12.09.17.30.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Dec 2024 17:30:36 -0800 (PST) From: Peter Geis To: Heiko Stuebner Cc: Peter Geis , Conor Dooley , Diederik de Haas , Dragan Simic , Johan Jonker , Krzysztof Kozlowski , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org Subject: [PATCH 6/6] arm64: dts: rockchip: Remove address aligned beats from rk3328-roc Date: Tue, 10 Dec 2024 01:30:10 +0000 Message-Id: <20241210013010.81257-7-pgwipeout@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241210013010.81257-1-pgwipeout@gmail.com> References: <20241210013010.81257-1-pgwipeout@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241209_173038_923956_C8099543 X-CRM114-Status: GOOD ( 10.54 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Since commit 8a469ee35606 ("arm64: dts: rockchip: Add txpbl node for RK3399/RK3328"), the snps,aal, snps,txpbl, and snps,rxpbl nodes have been unnecessary in the separate device trees. There is also a performance loss to using snps,aal. Remove these from the rk3328-roc device tree. Signed-off-by: Peter Geis Reviewed-by: Dragan Simic --- arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi index 6984387ff8b3..0d476cc2144d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi @@ -155,12 +155,9 @@ &gmac2io { phy-mode = "rgmii"; pinctrl-names = "default"; pinctrl-0 = <&rgmiim1_pins>; - snps,aal; snps,reset-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>; snps,reset-active-low; snps,reset-delays-us = <0 10000 50000>; - snps,rxpbl = <0x4>; - snps,txpbl = <0x4>; tx_delay = <0x24>; rx_delay = <0x18>; status = "okay";