From nobody Tue Feb 10 12:42:06 2026 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (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 CA014304BA8 for ; Wed, 10 Sep 2025 20:41:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757536910; cv=none; b=sTOoSOy4PE7sq6QjakxMakee7az/EgqPTeZOoPCKvRFrQV1L6Q3BZhK/HyIuslymRXvm+s5tmsQawPix60suMeIKf+voMV0UJ2wcDdpt8h8a3CA/Q6kfMN22IyRz/asewLFr32/rju4sBKcT8+lPClKRXMME+/QDkIPU7J23wsw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757536910; c=relaxed/simple; bh=k2U0NYyEKHtgpAev2ghnZsb3/qPyjZBLMwoarsWqCG0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dy5Wl0Mmcig6cux2eaJ++fQNIb+fA3nyqpgUFYUxlaf50rczOT1u00Vigp/0TiwgloKeJfT4qVAcRfW3CW7bgSSpo6h3aRlDQXQPqdjvtaoqmzoxH4FJwYP/YlhkeY/YCg/JUeB4nqd7l+F2/1vupOV7Ya8DPQ/u9ly7qlJBqyk= 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=FZOBlVaq; arc=none smtp.client-ip=209.85.128.48 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="FZOBlVaq" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-45de6490e74so174995e9.2 for ; Wed, 10 Sep 2025 13:41:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757536906; x=1758141706; darn=vger.kernel.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=uWelwUVBuuos1qOHG9IBB45ilO6ZU4Ljr34GA9uf6EU=; b=FZOBlVaqqcC7OsBLBCQh7FyCql5u/GW4sz/rtfTNS14cJc99R5oQ4FHwq/9AImeD6e kNJzlH+gpAw5PIB/6y47XxMBOdAbgG2W8Rio16LLi15xzGbQq6iUS1pROKdBkGtZzbKl SdFD8a/LfaZ6OX6BHd0HoIJTPcReVF68OPbipUDScNtwCPUZwxf5fs80KKYekKuVKGuF qjHQsoM0pZi0vqaWtD4cVekVbMvmnkK0Dtpb8zqqder8ex9SNIsSbqGo99KG8MeIhT4H m6ZrxaGtk+EKVInwbpjJfw7Optnj51wNkxiGRXZXpdNVFgAL8s6dxziwVmERp+iEqGMc Cuuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757536906; x=1758141706; 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=uWelwUVBuuos1qOHG9IBB45ilO6ZU4Ljr34GA9uf6EU=; b=YAcYeAztIF2BMxnF/NHeoHz1hORNqsnD09q2GAPsbEFkbIvG8x6WVMS7p3IxRAFBaQ R6Nb8K02CA1wYEY3A5HcZGn6rjxOnyb7cEElGYZsmu9u5eMWgMiA0iHAxntc/j3q84p8 k+o0EsaDMwtHwj/EbJil1dnbG6zKnAKyAk8KjElT4z8v0FMcI4IvZhRaq6LbeofBk+97 CsBX9jhREj0lH8QiPCmqRSxUAAK41hM4PbkWumtf1cG4+yjXiJnCVQP/zq8cj25qZBNG i2t/gwFLhEoqOp22eF+n8YOKl9hoMaVDdSnHl8KraAmKbYrK4GxVr0oC7p+yJNHmso/w tumA== X-Forwarded-Encrypted: i=1; AJvYcCV8V/PB21LhigCUWqFhUcf9gmtKxVsfFHxa428+JKC3sU6qr/Bk83YakB31Z70bOkZdTTPHSG7aYmUoqNk=@vger.kernel.org X-Gm-Message-State: AOJu0Yz0DNDBhpRZ+0VGeTyfrbgRmYgd3r61ZpegYkpU2/l3v2caHMn6 1na+ESg7jJmHtSMvu4akkeCTgnjmI1ktPuSlC1AhOyDpcRaCwsVibAiM X-Gm-Gg: ASbGncsBsCTjLyrqOr4AVmHkuifgzDkOBMlw4qpIEz5SA5Wk1Z1MnBNg2LT0QuZaEZx Lmxb+Ql28t3VFYF0WnYvvxMFpAwPXNakQ5Ch1QqD3FqiV39QU1/Fh4YzN/HijUiCvlc0hm8Yii7 iJzzwpVnMjqcCJk1f+hv0HacCGXMUGPANXjc6or11YyXSjs7CbGP72Dy3Sk1rvD5PyOMOtAxMQN n4diOMEXZpDo7WsQqoCYoL8Od0KUMHQJ5R6BjvGHBB326OYs0V45q56OvS8ERqAoZEDwJl1i52a X9ISirwb355npK2CEtaoJiQC3KH943ObA92Z5jvO/Y1uNS16ptKmUiWLY40dA2nmIrvLgmnW8p5 xRjVPGBke6qAg8z7qWIOiOuDA8SJDqF/fsJ43IciX4IaxTP4= X-Google-Smtp-Source: AGHT+IEx9TgeKssRAdhlUZivpFswe+DpuuWCCEbBX19Y4It+DwJLIOvtm0Q7IRCVZgXGeqHIDzir1Q== X-Received: by 2002:a05:600c:3b23:b0:45b:9c93:d21d with SMTP id 5b1f17b1804b1-45ddde957e4mr179410105e9.8.1757536905783; Wed, 10 Sep 2025 13:41:45 -0700 (PDT) Received: from iku.Home ([2a06:5906:61b:2d00:ee64:b92b:f8fd:6cd8]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45e0157d68esm320085e9.6.2025.09.10.13.41.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Sep 2025 13:41:45 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: =?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?= , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiner Kallweit , Russell King , Philipp Zabel , Wolfram Sang , Geert Uytterhoeven , Magnus Damm Cc: linux-renesas-soc@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Prabhakar , Biju Das , Fabrizio Castro , Lad Prabhakar Subject: [PATCH net-next v3 8/9] net: pcs: rzn1-miic: Add per-SoC control for MIIC register unlock/lock Date: Wed, 10 Sep 2025 21:41:29 +0100 Message-ID: <20250910204132.319975-9-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250910204132.319975-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20250910204132.319975-1-prabhakar.mahadev-lad.rj@bp.renesas.com> 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: Lad Prabhakar Make MIIC accessory register unlock/lock behaviour selectable via SoC/OF data. Add init_unlock_lock_regs and miic_write to struct miic_of_data so the driver can either perform the traditional global unlock sequence (as used on RZ/N1) or use a different policy for other SoCs (for example RZ/T2H, which does not require leaving registers unlocked). miic_reg_writel() now calls the per-SoC miic_write callback to perform register writes. Provide miic_reg_writel_unlocked() as the default writer and set it for the RZ/N1 OF data so existing platforms keep the same behaviour. Add a miic_unlock_regs() helper that implements the accessory register unlock sequence so the unlock/lock sequence can be reused where needed (for example when a SoC requires explicit unlock/lock around individual accesses). This change is preparatory work for supporting RZ/T2H. Signed-off-by: Lad Prabhakar Tested-by: Wolfram Sang --- v2->v3: - Dropped inlining of miic_unlock_regs(). - Fixed checkpatch warning to fit within 80 columns. - Added Tested-by tag. v1->v2: - No change. --- drivers/net/pcs/pcs-rzn1-miic.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/drivers/net/pcs/pcs-rzn1-miic.c b/drivers/net/pcs/pcs-rzn1-mii= c.c index 75009b30084a..ef10994d8c11 100644 --- a/drivers/net/pcs/pcs-rzn1-miic.c +++ b/drivers/net/pcs/pcs-rzn1-miic.c @@ -155,6 +155,9 @@ struct miic { * @sw_mode_mask: Switch mode mask * @reset_ids: Reset names array * @reset_count: Number of entries in the reset_ids array + * @init_unlock_lock_regs: Flag to indicate if registers need to be unlock= ed + * before access. + * @miic_write: Function pointer to write a value to a MIIC register */ struct miic_of_data { struct modctrl_match *match_table; @@ -169,6 +172,8 @@ struct miic_of_data { u8 sw_mode_mask; const char * const *reset_ids; u8 reset_count; + bool init_unlock_lock_regs; + void (*miic_write)(struct miic *miic, int offset, u32 value); }; =20 /** @@ -190,11 +195,25 @@ static struct miic_port *phylink_pcs_to_miic_port(str= uct phylink_pcs *pcs) return container_of(pcs, struct miic_port, pcs); } =20 -static void miic_reg_writel(struct miic *miic, int offset, u32 value) +static void miic_unlock_regs(struct miic *miic) +{ + /* Unprotect register writes */ + writel(0x00A5, miic->base + MIIC_PRCMD); + writel(0x0001, miic->base + MIIC_PRCMD); + writel(0xFFFE, miic->base + MIIC_PRCMD); + writel(0x0001, miic->base + MIIC_PRCMD); +} + +static void miic_reg_writel_unlocked(struct miic *miic, int offset, u32 va= lue) { writel(value, miic->base + offset); } =20 +static void miic_reg_writel(struct miic *miic, int offset, u32 value) +{ + miic->of_data->miic_write(miic, offset, value); +} + static u32 miic_reg_readl(struct miic *miic, int offset) { return readl(miic->base + offset); @@ -421,10 +440,8 @@ static int miic_init_hw(struct miic *miic, u32 cfg_mod= e) * is going to be used in conjunction with the Cortex-M3, this sequence * will have to be moved in register write */ - miic_reg_writel(miic, MIIC_PRCMD, 0x00A5); - miic_reg_writel(miic, MIIC_PRCMD, 0x0001); - miic_reg_writel(miic, MIIC_PRCMD, 0xFFFE); - miic_reg_writel(miic, MIIC_PRCMD, 0x0001); + if (miic->of_data->init_unlock_lock_regs) + miic_unlock_regs(miic); =20 /* TODO: Replace with FIELD_PREP() when compile-time constant * restriction is lifted. Currently __ffs() returns 0 for sw_mode_mask. @@ -645,6 +662,8 @@ static struct miic_of_data rzn1_miic_of_data =3D { .miic_port_start =3D 1, .miic_port_max =3D 5, .sw_mode_mask =3D GENMASK(4, 0), + .init_unlock_lock_regs =3D true, + .miic_write =3D miic_reg_writel_unlocked, }; =20 static const struct of_device_id miic_of_mtable[] =3D { --=20 2.51.0