From nobody Tue Dec 2 02:43:28 2025 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2BE362D24A0 for ; Tue, 18 Nov 2025 12:39:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763469572; cv=none; b=N6vaT+PWBn5mI3uH3Xmr9kY208I2QisZ6JLOKKZjIIPeaOylTPHuQGvF/rhYHlTgpyk1McL0JYp+sHT8zm5gmqPbGIzeVNGsvvxi3CJUHRVOrgXqnEKK1GRXpZKOwCSwniVfQQQrgYP7uj14gYb8MbDB1kE2oLgzR5qJ07yPzPg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763469572; c=relaxed/simple; bh=08QgB8qKaX3i2DapxCTs97dy/bfjef6zfRlNUY2ki3Q=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=b3lk8V3zSELRGOY7LNQfUshafmlqOdNfSSkEvaHlPvE35DKXvcTaAPByXYu/3qKtnc9zQhDPVjsry5faSi+9VypHKe0d/aDqSJAwouJMKtUlGWX+tH+HnQEJMn4nCd0xsI9w/xICx7JKJvPmtwToY0ZMw+zJlGgB94ZBHI2KQtM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=GR4+0i0p; arc=none smtp.client-ip=209.85.128.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GR4+0i0p" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-4779d47be12so22854365e9.2 for ; Tue, 18 Nov 2025 04:39:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763469569; x=1764074369; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=vwrEerijLR8cEtR08TVeGqvxntRRCMtwXVUkvykKipc=; b=GR4+0i0pqTX7Z7vC3Bd+VRcYn50dTLS2s+mvZdzzQnLd3o7C1AvnRTIpIs0nQkdL1W JWonek3Ut3x0cfxq8y//0GrknfheYCwyK1ounOX+g1lBasmO137wSa0pEfhdPrghDwb2 6PN5WMwnn0gy/KAvjZLQnwN5v7xvXnoK1GTHdFJi3Jyl0rbFlX94JU0SIDn/X/PVpX5L nlAF3fgOrGNqZy1fc0GGxOxepHVrMFhujnO2qj+L4xxjXsd8pDKUKnKAyknej7mAGHCX PHOs/EuAAk6djRRo79BcL+xxarpcvd8OaqMqFLgAg+ih4U01DqgMxbvGaixlICy/TsWX nZxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763469569; x=1764074369; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=vwrEerijLR8cEtR08TVeGqvxntRRCMtwXVUkvykKipc=; b=h6rHaAchXAAstx5n67MjDpKkN84518tEUDYQLb2Yu07q6tt9OPArI7yoMEKZZ1A22u Py/SBzQb1u3Ec9Us67gb+lfdViRjWgF65JvAOZ42tGMK5WfHp0ixg3oTaREOemFU6Fi1 6M9CFbBrJB+zhp5fUD1JvRrEN6xhFt2OYoNWYq25KK8rEgNwmTdO3mPAi3jDylcadZe5 g1/RT9iOyMF1x6GvS2Egy1ilA4gh4UqnEP8QTWbnkui4KtooEpnwwRHDoy5pKL/XxIMC fSR3+fNgWtDvnr3GmNdya1T1sqQx6MMoA+bORv4vge+HXpnjhBLG4PTYqxhDgSMF4zEo rkog== X-Forwarded-Encrypted: i=1; AJvYcCWEYCthr+f4HYBFH+/322wYC4LOWQHiSJgwOvCg1YAbogLRjZsNQEQXbhwSP8r8lhA+M/y0RE5ODnuvauA=@vger.kernel.org X-Gm-Message-State: AOJu0Yytyt0Y0ygsBfMLgnlM61rhx2eYNXGa/VXZHNbZ6vf1rTQIDofU xOMy1eZON6VMaecQAmF/S2x7dt0ZXNYz88TGzSrIyKE9vguWB+FQdCRN X-Gm-Gg: ASbGncs4hZQlXkp9FiS4YugCKcxZSIWsMYN4TQtttcUBM2nYvTVhMUwurn1r+weMp1Z JhKhBn4rs68LaiGtHYYyq3HmU7oM5zuwkTAjjq0qGquLfExkTsLeBsGb2lXrf8q/8O+ChIOkbhi BgMhPGn5AqqJxkL0QK48nxnybjVQo0T583Kac4hjLQovUS42IPoud+ierX1WWUcxXuUn+YtLAMU nX0k5mmo1XQbNNMAUyViLljdwK+Bdx81NYcqvF1RD3te6lNqpI0aPJN4vmPvyGwVmIBRp4f9/kz ba0+NW3QeQT/zk+TCsnoygPx+ZiKfOSbInrUIHQls4Q0orCDx01FWYY0/W6R1UTyxvlR/dPPWLO mDxYXVTOCpq6CpUaJ5uI0emLsAd7qQCGoIxKf46NJ5dJoUY2N9x8CEKjc0iNCJ7ll7mC9V90v2+ NOFdXODyQNkIK7L2Ide0/3cnzf2GxJRqR5hnjjf8OtiEEGWOigSr8dM6xGmqlMk8iADQOIDlLXg Tcx86oQIem8+7FE X-Google-Smtp-Source: AGHT+IEoYNWQzEZD7paWmkP6FwlKTYsbsMXIs34oAOoA8ChioIklj1ImVoN2jNXCXJsyM7m/ic/zHw== X-Received: by 2002:a05:600c:a05:b0:475:da1a:5418 with SMTP id 5b1f17b1804b1-4778fe55465mr137719985e9.1.1763469569384; Tue, 18 Nov 2025 04:39:29 -0800 (PST) Received: from localhost.localdomain (host86-162-200-138.range86-162.btcentralplus.com. [86.162.200.138]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47796a8a695sm199431895e9.13.2025.11.18.04.39.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Nov 2025 04:39:29 -0800 (PST) From: Biju X-Google-Original-From: Biju To: Marc Kleine-Budde , Vincent Mailhol , Geert Uytterhoeven , Magnus Damm Cc: Biju Das , Tranh Ha , Duy Nguyen , linux-can@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Prabhakar Mahadev Lad , Biju Das , stable@vger.kernel.org Subject: [PATCH] can: rcar_canfd: Fix CAN-FD mode as default Date: Tue, 18 Nov 2025 12:39:25 +0000 Message-ID: <20251118123926.193445-1-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Biju Das The commit 5cff263606a1 ("can: rcar_canfd: Fix controller mode setting") has aligned with the flow mentioned in the hardware manual for all SoCs except R-Car Gen3 and RZ/G2L SoCs. On R-Car Gen4 and RZ/G3E SoCs, due to the wrong logic in the commit[1] sets the default mode to FD-Only mode instead of CAN-FD mode. This patch sets the CAN-FD mode as the default for all SoCs by dropping the rcar_canfd_set_mode() as some SoC requires mode setting in global reset mode, and the rest of the SoCs in channel reset mode and update the rcar_canfd_reset_controller() to take care of these constraints. Moreover, the RZ/G3E and R-Car Gen4 SoCs support 3 modes compared to 2 modes on the R-Car Gen3. Use inverted logic in rcar_canfd_reset_controller() to simplify the code later to support FD-only mode. [1] commit 45721c406dcf ("can: rcar_canfd: Add support for r8a779a0 SoC") Fixes: 5cff263606a1 ("can: rcar_canfd: Fix controller mode setting") Cc: stable@vger.kernel.org Signed-off-by: Biju Das --- drivers/net/can/rcar/rcar_canfd.c | 53 ++++++++++++++++++------------- 1 file changed, 31 insertions(+), 22 deletions(-) diff --git a/drivers/net/can/rcar/rcar_canfd.c b/drivers/net/can/rcar/rcar_= canfd.c index 49ab65274b51..05dbdf46dd6f 100644 --- a/drivers/net/can/rcar/rcar_canfd.c +++ b/drivers/net/can/rcar/rcar_canfd.c @@ -709,6 +709,11 @@ static void rcar_canfd_set_bit_reg(void __iomem *addr,= u32 val) rcar_canfd_update(val, val, addr); } =20 +static void rcar_canfd_clear_bit_reg(void __iomem *addr, u32 val) +{ + rcar_canfd_update(val, 0, addr); +} + static void rcar_canfd_update_bit_reg(void __iomem *addr, u32 mask, u32 va= l) { rcar_canfd_update(mask, val, addr); @@ -755,25 +760,6 @@ static void rcar_canfd_set_rnc(struct rcar_canfd_globa= l *gpriv, unsigned int ch, rcar_canfd_set_bit(gpriv->base, RCANFD_GAFLCFG(w), rnc); } =20 -static void rcar_canfd_set_mode(struct rcar_canfd_global *gpriv) -{ - if (gpriv->info->ch_interface_mode) { - u32 ch, val =3D gpriv->fdmode ? RCANFD_GEN4_FDCFG_FDOE - : RCANFD_GEN4_FDCFG_CLOE; - - for_each_set_bit(ch, &gpriv->channels_mask, - gpriv->info->max_channels) - rcar_canfd_set_bit_reg(&gpriv->fcbase[ch].cfdcfg, val); - } else { - if (gpriv->fdmode) - rcar_canfd_set_bit(gpriv->base, RCANFD_GRMCFG, - RCANFD_GRMCFG_RCMC); - else - rcar_canfd_clear_bit(gpriv->base, RCANFD_GRMCFG, - RCANFD_GRMCFG_RCMC); - } -} - static int rcar_canfd_reset_controller(struct rcar_canfd_global *gpriv) { struct device *dev =3D &gpriv->pdev->dev; @@ -806,6 +792,16 @@ static int rcar_canfd_reset_controller(struct rcar_can= fd_global *gpriv) /* Reset Global error flags */ rcar_canfd_write(gpriv->base, RCANFD_GERFL, 0x0); =20 + /* Set the controller into appropriate mode */ + if (!gpriv->info->ch_interface_mode) { + if (gpriv->fdmode) + rcar_canfd_set_bit(gpriv->base, RCANFD_GRMCFG, + RCANFD_GRMCFG_RCMC); + else + rcar_canfd_clear_bit(gpriv->base, RCANFD_GRMCFG, + RCANFD_GRMCFG_RCMC); + } + /* Transition all Channels to reset mode */ for_each_set_bit(ch, &gpriv->channels_mask, gpriv->info->max_channels) { rcar_canfd_clear_bit(gpriv->base, @@ -823,10 +819,23 @@ static int rcar_canfd_reset_controller(struct rcar_ca= nfd_global *gpriv) dev_dbg(dev, "channel %u reset failed\n", ch); return err; } - } =20 - /* Set the controller into appropriate mode */ - rcar_canfd_set_mode(gpriv); + /* Set the controller into appropriate mode */ + if (gpriv->info->ch_interface_mode) { + /* Do not set CLOE and FDOE simultaneously */ + if (!gpriv->fdmode) { + rcar_canfd_clear_bit_reg(&gpriv->fcbase[ch].cfdcfg, + RCANFD_GEN4_FDCFG_FDOE); + rcar_canfd_set_bit_reg(&gpriv->fcbase[ch].cfdcfg, + RCANFD_GEN4_FDCFG_CLOE); + } else { + rcar_canfd_clear_bit_reg(&gpriv->fcbase[ch].cfdcfg, + RCANFD_GEN4_FDCFG_FDOE); + rcar_canfd_clear_bit_reg(&gpriv->fcbase[ch].cfdcfg, + RCANFD_GEN4_FDCFG_CLOE); + } + } + } =20 return 0; } --=20 2.43.0