From nobody Wed Dec 17 17:53:16 2025 Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.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 2B0301B87F9 for ; Mon, 16 Dec 2024 07:20:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734333610; cv=none; b=eQ3NRfy/w8QZo2oA3uI0GbBGLxWjQXql4X9RR25gWlTUz606PlZiz+/yCNgDsQHpQOfsXG6kwamYcvnYPMQSf1YkRBL0d4IvQ22hAONEMt2xhtfMV/YH60BSnAZwP5zzAHb3v138W7zwgGgH/Md2ble9vyeoF/5EwU3j7aPoLWE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734333610; c=relaxed/simple; bh=7H+b53eqi9DiOlmG0r4AJgg7nxrSVI5qv94MdpvGEik=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=kHAGWVFoeZjTsSvB5vcdA6nEOyguehkuYh8bYNCmWQrYG4eRdNqeiyQsQYem9YhmHxedBL2ERo+ixpPUcTB+uYbD/K0yP2nt/OT5dRJEPFTisujmZvBBr0fVV4qtpQwzWxguHrit3unwoNseQdt2iLOKFdyz5dfLhRngUQpqyFM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=cogentembedded.com; spf=pass smtp.mailfrom=cogentembedded.com; dkim=pass (2048-bit key) header.d=cogentembedded-com.20230601.gappssmtp.com header.i=@cogentembedded-com.20230601.gappssmtp.com header.b=YpEKWB77; arc=none smtp.client-ip=209.85.167.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=cogentembedded.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=cogentembedded.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=cogentembedded-com.20230601.gappssmtp.com header.i=@cogentembedded-com.20230601.gappssmtp.com header.b="YpEKWB77" Received: by mail-lf1-f41.google.com with SMTP id 2adb3069b0e04-540218726d5so3990576e87.2 for ; Sun, 15 Dec 2024 23:20:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cogentembedded-com.20230601.gappssmtp.com; s=20230601; t=1734333607; x=1734938407; 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=A37fHc27Oue7tYt3kSCSnf+lK1Jrrg8n8kixoTW3puQ=; b=YpEKWB77gdtab48SF5Al3qjMsTEvgHwzYWUbj9SnB6h1TyqQKIxd+mcUPG6lVc1PIK OSh8ivpuIz3ae9rHDRzGy1Qjg3le4lx3x+fyVmaNZLsdN8GtI0/zcgzBYjAwDuKVebkB y/lu8Zulb/tpSz/+K4lc8oAfMrB6lTD3S0qiFj+68BnAGkgkuXcTeYS33lXGoRJGwm8Z T8rhgIuAYfBhe/F/7iUC4Qur5tFIRIJM49DmEF6goUDX0T2AFXJmWmHHuW4Wlreihqc9 xKqq3rWfZqzRGlwFewhMKbfwh3u00urxAXLqnQ4kc19C1EgkI3z5vnrHo3KPmAwdoN8G yK5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734333607; x=1734938407; 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=A37fHc27Oue7tYt3kSCSnf+lK1Jrrg8n8kixoTW3puQ=; b=ivJrmlbybB3OcJjJX6sX4clsniunA+MYDrc8swvhade2vPibJGbpX4msB6vbEn43Cm Vibazr1HZkIrauFyEgomFQ03IhyYb68wVduw9uhGQ7TsQPhSHanKY6PVVm48VXCeUUMz p3Zdb1I3OAmvhsKoiwdyjpKjKOP1bDnP9Aory+eJ7jkoiW0I9jZwoIfd47FpLTsjye6g yY4uq58RTxsJaw2xt2Ze0/tVF6LgiZUfyorutBDO7MCMw6W/gP5XBEAJB9etsLDqirNo 3x4EOJCKpXFbMgHu5z+mW9WkQmjYr1rip/C9USs0tKe3Nox0WHAJ6xMfA/thZ74td++N Rhzw== X-Forwarded-Encrypted: i=1; AJvYcCUowHVIwMLjIXpypNEfBBqSnmPcNpZRV2KrsJ3drJO/EThOP+2inuy4k/4xCc2VyEppcM5aT2fY0KKxH68=@vger.kernel.org X-Gm-Message-State: AOJu0YxFXE4u0aX0N2rk71kd72Vy3g74LpE/u3/Wb7W07b38fyG5ZETq qdhwV2WmjJ3ZiicMZpsC75KUXEB/4A++h2wTuB/2b+7Xi3SOuRdhANhEqqwVHPg= X-Gm-Gg: ASbGncvsFhIopE12M6KYBrd7fuwjLJ+DQTA8UjrzwGhxxk1YW08MAVCAcMViNzjtcQ7 BCa0LRRu5kIo8sCD2GvN8O5mVTjhBItyJD/dpbpe2Vra17+ID6pB6WDkA1EnyJA6aksxZzZYsH9 i4wvrMWRDswxIZXXWqaQc0HlhO+nKry04I0htBszreRNvKapSq3Yr1awBqNnyvO6xSZxUZ9mPX6 wG0gC+j+xuAAOIvE0SN6iVBeR4OFlRM/Sqv2fDviFEaX8rR/zO4I4Jw3RbavN3ArIC8Y8I= X-Google-Smtp-Source: AGHT+IFZevgraoAzerxr2hEHYj5Vn6YWN6RGjMC+XJAc2rFLiXryY0wNygBr6mROD0KIKhDpCjOFXA== X-Received: by 2002:a05:6512:33d6:b0:540:1c18:4e23 with SMTP id 2adb3069b0e04-54099b6d6f9mr3446396e87.47.1734333607243; Sun, 15 Dec 2024 23:20:07 -0800 (PST) Received: from cobook.home ([91.198.101.25]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-54120ba9b2bsm748930e87.94.2024.12.15.23.20.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Dec 2024 23:20:07 -0800 (PST) From: Nikita Yushchenko To: Yoshihiro Shimoda , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Geert Uytterhoeven Cc: netdev@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Michael Dege , Christian Mardmoeller , Dennis Ostermann , Nikita Yushchenko Subject: [PATCH net-next v2 1/5] net: renesas: rswitch: do not write to MPSM register at init time Date: Mon, 16 Dec 2024 12:19:53 +0500 Message-Id: <20241216071957.2587354-2-nikita.yoush@cogentembedded.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241216071957.2587354-1-nikita.yoush@cogentembedded.com> References: <20241216071957.2587354-1-nikita.yoush@cogentembedded.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" MPSM register is used to execute mdio bus transactions. There is no need to initialize it early. Signed-off-by: Nikita Yushchenko --- drivers/net/ethernet/renesas/rswitch.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/ethernet/renesas/rswitch.c b/drivers/net/ethernet/= renesas/rswitch.c index 5fc8c94d1e4b..12efee9f75d8 100644 --- a/drivers/net/ethernet/renesas/rswitch.c +++ b/drivers/net/ethernet/renesas/rswitch.c @@ -1166,7 +1166,6 @@ static void rswitch_etha_enable_mii(struct rswitch_et= ha *etha) { rswitch_modify(etha->addr, MPIC, MPIC_PSMCS_MASK | MPIC_PSMHT_MASK, MPIC_PSMCS(etha->psmcs) | MPIC_PSMHT(0x06)); - rswitch_modify(etha->addr, MPSM, 0, MPSM_MFF_C45); } =20 static int rswitch_etha_hw_init(struct rswitch_etha *etha, const u8 *mac) --=20 2.39.5 From nobody Wed Dec 17 17:53:16 2025 Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.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 490821D358F for ; Mon, 16 Dec 2024 07:20:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734333614; cv=none; b=Tb7nHeEW6iT9+KxvuzqAn2IeW92WgI6MOOz0AiY6vxsxp2bCG85tLDaycJTgZzyAsdHZCEuvkxGqX7ex2j1j+x2FFj+Jwlx5Sk0L5zbKQEyqa7rgP7OMg5fuSimi9U4twR/AxslIhgpUuOtB8xbbsyCfoFcnqqgX8PDxgwetrVM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734333614; c=relaxed/simple; bh=2tnr8Bwh6X/FYoBAuSdjBG6lvqx9CRulw85LcMBiY9E=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=uujCwrmW78zL71JlGmdHjhkE8G5kpVorlD+fgHQbJpaovy0PMR/lf8C82aPDCi8hnSf8Mk/gL+F2RQ0u3c2aRCkbS9QDgQNppvEwzwmqLO9Wq31WXzOo12kYpyMcRYyaaq1WU2d/Ps/WPHg+Zu5JM5Z9YvVbTC1HSKbhyjvGB7U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=cogentembedded.com; spf=pass smtp.mailfrom=cogentembedded.com; dkim=pass (2048-bit key) header.d=cogentembedded-com.20230601.gappssmtp.com header.i=@cogentembedded-com.20230601.gappssmtp.com header.b=RoRWDaW8; arc=none smtp.client-ip=209.85.167.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=cogentembedded.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=cogentembedded.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=cogentembedded-com.20230601.gappssmtp.com header.i=@cogentembedded-com.20230601.gappssmtp.com header.b="RoRWDaW8" Received: by mail-lf1-f48.google.com with SMTP id 2adb3069b0e04-5401c52000dso4221093e87.3 for ; Sun, 15 Dec 2024 23:20:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cogentembedded-com.20230601.gappssmtp.com; s=20230601; t=1734333610; x=1734938410; 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=FDorma76GwDfrQOXtmRW3Vi/QHYCkRM+JtP0H9DhWBY=; b=RoRWDaW8BhoHbU7XzolTUw8JLg7TxIbssoSsv0Ren3JnFgVrvuq2OxVCeRgaZGzkq1 sTK9b3HdmP6nAP95n+UUOlwip8obpCJYGm7ZhovExFNBhxsxWTXzR+DkF385T8hZimyD H3y1xHEj7N6lLXD8rTgQpcmFruroFny3jb8HsOf0m8rSBhejyFWhdT9zqMEAfHZcst96 RYzk2bfGLK1c0s2S8T+CmaCJ7nsfnkPvsTrmcr5cTkCWbmY1ieSuepVbO/ozxEYHu7/q CD1r/4+lISBwQJNAZaVU6zDJOGgL43s0TBSP1zvkkBvCsaqFN3vyqDwjZUIzyl9C3QEv CBCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734333610; x=1734938410; 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=FDorma76GwDfrQOXtmRW3Vi/QHYCkRM+JtP0H9DhWBY=; b=aSA0X7he2eEqL5hxSTXmXLtpDFTwfCdgBYIdOz7iR63WYeEkHz/i5INzd7n/3gCXps +8Gc5fiPy0Rhd+8blogN+wnZOESaCZiEO7XwEnX+sGrN65k86AX316I86CJ5RqNk3si0 jX8hrQZaxAuXQrkvWp4NHaJ4qElEMOa4ESVyVn1NlQpliK2YEsujitTJSN4wqD62eVhX R9+tvGD2EYjpWmC5+nO5V9VjmmYwHQRGxKHCprsGRa1IfZj0Zl377CjELBCUBi8Ehyh5 IVIiDd56iNBY/QfCIPF/gQZnx8hEeJPGDygzLhL83QhdthkBGX0FMT/ePegjf9YTYI4C 9Xfw== X-Forwarded-Encrypted: i=1; AJvYcCWURyXaJla2CwrglZbWdmwMWQ3Xb+UkpumVRGu+LcEreiqT/DQrggPmo5f4EmMkx5Xpbqc2RZp/XMqidmA=@vger.kernel.org X-Gm-Message-State: AOJu0Yy5J5b/Sz9dcdpcr2E4b564HEGq19auBlc310XLLx2xDWCymo9i gEKogjaN5VJ0Yq7hZo75n/RRgnbr6NSrh96fXSx/eT/403cl+SpiE0yuYxis2ho= X-Gm-Gg: ASbGncvErb9eD+sxhyiMh7S24j3ItrIt9WYpHVYBWKssJCJO0Ce2OdhaCn7tpb/Z1lK vHbquMVE6PhMYXXtmo2QTEggnaHIxBYW0ndDJOzI5gbBe4+luUlXqni/Iype4axFKAS0dd2u3Wc Ek89/jrEtJ9zNMTHrnFWowMVa3f2sfp8IMzObGDTtdipVMFdQkvL3S+UiW4yoxJzsXnSkXlg0Lk iyjfetXUN2pgHuz8gJN5JCDbY2iSTaL0g8S64CZFRD4tZp+1zKucLjLe/qQ1wtnpXntgRQ= X-Google-Smtp-Source: AGHT+IHopqkpGhBw9gHzXw4RFZJ8eHI7vJAH0G9GOleXtOF0VwnbcXx/A2P2rJLeqHcvXE4tjhMdyA== X-Received: by 2002:a05:6512:2813:b0:53e:37df:6637 with SMTP id 2adb3069b0e04-540905618d0mr3129724e87.32.1734333610495; Sun, 15 Dec 2024 23:20:10 -0800 (PST) Received: from cobook.home ([91.198.101.25]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-54120ba9b2bsm748930e87.94.2024.12.15.23.20.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Dec 2024 23:20:10 -0800 (PST) From: Nikita Yushchenko To: Yoshihiro Shimoda , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Geert Uytterhoeven Cc: netdev@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Michael Dege , Christian Mardmoeller , Dennis Ostermann , Nikita Yushchenko Subject: [PATCH net-next v2 2/5] net: renesas: rswitch: use FIELD_PREP for remaining MPIC register fields Date: Mon, 16 Dec 2024 12:19:54 +0500 Message-Id: <20241216071957.2587354-3-nikita.yoush@cogentembedded.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241216071957.2587354-1-nikita.yoush@cogentembedded.com> References: <20241216071957.2587354-1-nikita.yoush@cogentembedded.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" Commit fb9e6039c325 ("net: renesas: rswitch: fix initial MPIC register setting") converted setting some MPIC fields to FIELD_PREP. To keep common style, do the same with mii bus related fields of the same register. Signed-off-by: Nikita Yushchenko --- drivers/net/ethernet/renesas/rswitch.c | 5 +++-- drivers/net/ethernet/renesas/rswitch.h | 10 ++-------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/net/ethernet/renesas/rswitch.c b/drivers/net/ethernet/= renesas/rswitch.c index 12efee9f75d8..e1541a206687 100644 --- a/drivers/net/ethernet/renesas/rswitch.c +++ b/drivers/net/ethernet/renesas/rswitch.c @@ -1164,8 +1164,9 @@ static void rswitch_rmac_setting(struct rswitch_etha = *etha, const u8 *mac) =20 static void rswitch_etha_enable_mii(struct rswitch_etha *etha) { - rswitch_modify(etha->addr, MPIC, MPIC_PSMCS_MASK | MPIC_PSMHT_MASK, - MPIC_PSMCS(etha->psmcs) | MPIC_PSMHT(0x06)); + rswitch_modify(etha->addr, MPIC, MPIC_PSMCS | MPIC_PSMHT, + FIELD_PREP(MPIC_PSMCS, etha->psmcs) | + FIELD_PREP(MPIC_PSMHT, 0x06)); } =20 static int rswitch_etha_hw_init(struct rswitch_etha *etha, const u8 *mac) diff --git a/drivers/net/ethernet/renesas/rswitch.h b/drivers/net/ethernet/= renesas/rswitch.h index 4b1489100330..78c0325cdf30 100644 --- a/drivers/net/ethernet/renesas/rswitch.h +++ b/drivers/net/ethernet/renesas/rswitch.h @@ -732,6 +732,8 @@ enum rswitch_etha_mode { #define MPIC_LSC_100M 1 #define MPIC_LSC_1G 2 #define MPIC_LSC_2_5G 3 +#define MPIC_PSMCS GENMASK(22, 16) +#define MPIC_PSMHT GENMASK(26, 24) =20 #define MDIO_READ_C45 0x03 #define MDIO_WRITE_C45 0x01 @@ -747,14 +749,6 @@ enum rswitch_etha_mode { #define MMIS1_PRACS BIT(0) /* Read */ #define MMIS1_CLEAR_FLAGS 0xf =20 -#define MPIC_PSMCS_SHIFT 16 -#define MPIC_PSMCS_MASK GENMASK(22, MPIC_PSMCS_SHIFT) -#define MPIC_PSMCS(val) ((val) << MPIC_PSMCS_SHIFT) - -#define MPIC_PSMHT_SHIFT 24 -#define MPIC_PSMHT_MASK GENMASK(26, MPIC_PSMHT_SHIFT) -#define MPIC_PSMHT(val) ((val) << MPIC_PSMHT_SHIFT) - #define MLVC_PLV BIT(16) =20 /* GWCA */ --=20 2.39.5 From nobody Wed Dec 17 17:53:16 2025 Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) (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 E0FB81D47AD for ; Mon, 16 Dec 2024 07:20:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734333616; cv=none; b=oXlrFCvo/DNe2gzzFhDAFajzx/fFnZ9jDKiF9J2DNg/o+Mzp8aTtNgZtn2XUlJHiOLUlfkkgkvFLDaIAHJZcjvn01S7XxHFs4LizX2RpL7SdOoVrAGcHMh0arE5QEw9aSMPLtncEufsu1dxR7TBR4bydwbr66T7wh9zZT1p3kG4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734333616; c=relaxed/simple; bh=UlHsVBY2+5OwtS51cm0ukD6vGIqcaS4QJZtIio5czj8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=clG1pRL26G4WHN7rbPDLAoirBGsi/foSB6MHQb/2CdYCTIb6hEFctBdIn50GOpkgb3fP1CRxQbre8Mole51aCUrsUetACX8/zDmCQBLeXw6865OmMguIOTzJo9UOdr8UrpL+HR3CQobqK0hPOLqC6NkEcZ2FIn6hbiFm2DKG1AU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=cogentembedded.com; spf=pass smtp.mailfrom=cogentembedded.com; dkim=pass (2048-bit key) header.d=cogentembedded-com.20230601.gappssmtp.com header.i=@cogentembedded-com.20230601.gappssmtp.com header.b=iEVBDoLx; arc=none smtp.client-ip=209.85.167.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=cogentembedded.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=cogentembedded.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=cogentembedded-com.20230601.gappssmtp.com header.i=@cogentembedded-com.20230601.gappssmtp.com header.b="iEVBDoLx" Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-53e28cf55cdso3405596e87.3 for ; Sun, 15 Dec 2024 23:20:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cogentembedded-com.20230601.gappssmtp.com; s=20230601; t=1734333613; x=1734938413; 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=O3lnZaher8bDGwGr+xGMpx7jXGopkkIbw5+lGNp1zoU=; b=iEVBDoLx8hevq8+eKfYH+Jrv876CkWEMz76oueIVs+LW7BWBDTLah6nzOJOAZ8Jh44 fBAOb3l0c+vKSKTSfoKvcQd2dZHrfrNFzfWMLDO0t5gg+9St3aReV4Dc0VHQZKo/0cMJ ekLduMAckf/2H/tnN2o9ZyMEGioNvGshPY/hP39iYMfdMLAFujnoQvKYV1N6g4ZnH6HC zgc4WmShfDKvAGrKkYnwREWeiZXnOdfih9rsHQ8+sJ6jZIRBS605nduRfTvauMnymZo9 qQenTfwPv3VCYl61+syp+SgdxR0HhyxxdMCzRxOMILj20ORpx16ECHutt2t3KwRZtemO tW2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734333613; x=1734938413; 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=O3lnZaher8bDGwGr+xGMpx7jXGopkkIbw5+lGNp1zoU=; b=dWqsIyYYq8R2mWv4lnbnXHldQhZ116OHZdtVZSeT2snDBEKQwd8ux/NHgC3Zvy9R2K YMItek6W0+HH7oI8iidnXxyE9qKsjuEAlPJBJZt3PcmlH54p/6wRoDycbBDw51wpZIb6 5RJOkZOLmFmp4IRKIjLxcwDGvR7uZTYrb6+gFqgDCdMMAZGc+m/ZfAtAXmD6JZTzaSzK Dw1lWrEypJIWclvGvc8TX5u4nmBo4Qy2Cantcauj4wkeK5joPsoVMW4ft8DytZw8lIoR xHjm7KWJ7EefNCs0wSPNxtvi5JRUWf+QK6edE22Q0snb/ikRuXInyWJ3/IeSjui0BJMm LACA== X-Forwarded-Encrypted: i=1; AJvYcCWEAQmZ8DJKgUIUYiWtu7csk8HCb1syXns3qHMcDksxdo5stR//QEHx3eJsjeVFp6gyuDolKTZqLaG9qjo=@vger.kernel.org X-Gm-Message-State: AOJu0YyiXYBk/W0D4fkuYvxsDQy2atkQ9bicSzQGO83yM20xtaqqFfa0 SIfz/kZ7h8zvGlhF/DBnSPmE7VMYLVahnTwmAaWAbkTMm1DVOZ7XD/moCiceaj8= X-Gm-Gg: ASbGnctw4MytK8zVgi7te1FbNDu9c9bXybAezjqejf7Oj9WZxD0xhKT0R/slKMlghEu f5QI7QdBON4N9w5sN/AxJ+lgGG97EQQfYuYsfKoqbWLIfQGDrUeS01ah+/9gPjH1cQ2Rjtt9/N0 MOjmYtXwjq40lcH0va9WODyoh5XVmIZhHTAkgqoB2yBFIdoYLRUNI40wVJ0E1q9SdGEwYeSWfvb AMTlpWNwNqpCJYaDpAvQBaBXsug22MOHJlHP99oD1/BwZwQovMTOUnmO6L/hKbCXLpFRzY= X-Google-Smtp-Source: AGHT+IHGvvy7ocT/yLWz+20NQrkjy9SXMAlu4TryyrSG9B3M6ZvfiDNezXzU5CTqzAb6oEJrphXPtQ== X-Received: by 2002:a05:6512:b18:b0:540:1dac:c03d with SMTP id 2adb3069b0e04-5409a2297e1mr3485716e87.57.1734333613069; Sun, 15 Dec 2024 23:20:13 -0800 (PST) Received: from cobook.home ([91.198.101.25]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-54120ba9b2bsm748930e87.94.2024.12.15.23.20.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Dec 2024 23:20:12 -0800 (PST) From: Nikita Yushchenko To: Yoshihiro Shimoda , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Geert Uytterhoeven Cc: netdev@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Michael Dege , Christian Mardmoeller , Dennis Ostermann , Nikita Yushchenko Subject: [PATCH net-next v2 3/5] net: renesas: rswitch: align mdio C45 operations with datasheet Date: Mon, 16 Dec 2024 12:19:55 +0500 Message-Id: <20241216071957.2587354-4-nikita.yoush@cogentembedded.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241216071957.2587354-1-nikita.yoush@cogentembedded.com> References: <20241216071957.2587354-1-nikita.yoush@cogentembedded.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" Per rswitch datasheet, software can know that mdio operation completed either by polling MPSM.PSME bit, or via interrupt. Instead, the driver currently polls for interrupt status bit. Although this still provides correct result, it requires additional register operations to clean the interrupt status bits, and generally looks wrong. Fix it to poll MPSM.PSME bit, as the datasheet suggests. Signed-off-by: Nikita Yushchenko --- drivers/net/ethernet/renesas/rswitch.c | 12 +++--------- drivers/net/ethernet/renesas/rswitch.h | 6 ------ 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/drivers/net/ethernet/renesas/rswitch.c b/drivers/net/ethernet/= renesas/rswitch.c index e1541a206687..6e3f162ae3b3 100644 --- a/drivers/net/ethernet/renesas/rswitch.c +++ b/drivers/net/ethernet/renesas/rswitch.c @@ -1205,32 +1205,26 @@ static int rswitch_etha_set_access(struct rswitch_e= tha *etha, bool read, if (devad =3D=3D 0xffffffff) return -ENODEV; =20 - writel(MMIS1_CLEAR_FLAGS, etha->addr + MMIS1); - val =3D MPSM_PSME | MPSM_MFF_C45; iowrite32((regad << 16) | (devad << 8) | (phyad << 3) | val, etha->addr += MPSM); =20 - ret =3D rswitch_reg_wait(etha->addr, MMIS1, MMIS1_PAACS, MMIS1_PAACS); + ret =3D rswitch_reg_wait(etha->addr, MPSM, MPSM_PSME, 0); if (ret) return ret; =20 - rswitch_modify(etha->addr, MMIS1, MMIS1_PAACS, MMIS1_PAACS); - if (read) { writel((pop << 13) | (devad << 8) | (phyad << 3) | val, etha->addr + MPS= M); =20 - ret =3D rswitch_reg_wait(etha->addr, MMIS1, MMIS1_PRACS, MMIS1_PRACS); + ret =3D rswitch_reg_wait(etha->addr, MPSM, MPSM_PSME, 0); if (ret) return ret; =20 ret =3D (ioread32(etha->addr + MPSM) & MPSM_PRD_MASK) >> 16; - - rswitch_modify(etha->addr, MMIS1, MMIS1_PRACS, MMIS1_PRACS); } else { iowrite32((data << 16) | (pop << 13) | (devad << 8) | (phyad << 3) | val, etha->addr + MPSM); =20 - ret =3D rswitch_reg_wait(etha->addr, MMIS1, MMIS1_PWACS, MMIS1_PWACS); + ret =3D rswitch_reg_wait(etha->addr, MPSM, MPSM_PSME, 0); } =20 return ret; diff --git a/drivers/net/ethernet/renesas/rswitch.h b/drivers/net/ethernet/= renesas/rswitch.h index 78c0325cdf30..2cb66f3f4716 100644 --- a/drivers/net/ethernet/renesas/rswitch.h +++ b/drivers/net/ethernet/renesas/rswitch.h @@ -743,12 +743,6 @@ enum rswitch_etha_mode { #define MPSM_PRD_SHIFT 16 #define MPSM_PRD_MASK GENMASK(31, MPSM_PRD_SHIFT) =20 -/* Completion flags */ -#define MMIS1_PAACS BIT(2) /* Address */ -#define MMIS1_PWACS BIT(1) /* Write */ -#define MMIS1_PRACS BIT(0) /* Read */ -#define MMIS1_CLEAR_FLAGS 0xf - #define MLVC_PLV BIT(16) =20 /* GWCA */ --=20 2.39.5 From nobody Wed Dec 17 17:53:16 2025 Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.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 DA7151D54D1 for ; Mon, 16 Dec 2024 07:20:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734333621; cv=none; b=DBIEVNq8I3cymbs0oTkoAv2qrnJf9K7GnWVBEYfZM8h2irof/Js5MEgJNc9axyBsTL9afuezCAo/CgF6AArQKK8amMlCUHMRETHiHDfCPoK+Sbvvjc6kyHS+DptRwUFD1KFxwafg9JDpxfqlfISaoR3J+n2Inisg18tXYH3BgY0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734333621; c=relaxed/simple; bh=/e66GSylh66fjrDoof3R9JK40ytReFSDT/2ZT0m0crc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=D+ZYo/KvwJD8Eq7xET7+EV6SpnhNnZzF0ozbjCY4C3zQyXttHcKtWaxmdaRDX61ZedMsKwyZI6M++s8yrgp5SOgdTmuJOnZv7TWDbxBPKL+edIYx5bM5krvhtgxfRKdQRyYLintQ/zN3rVtvXkTgncCRJJqtxTHL9EG9azWBMo0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=cogentembedded.com; spf=pass smtp.mailfrom=cogentembedded.com; dkim=pass (2048-bit key) header.d=cogentembedded-com.20230601.gappssmtp.com header.i=@cogentembedded-com.20230601.gappssmtp.com header.b=YrMIBCaI; arc=none smtp.client-ip=209.85.167.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=cogentembedded.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=cogentembedded.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=cogentembedded-com.20230601.gappssmtp.com header.i=@cogentembedded-com.20230601.gappssmtp.com header.b="YrMIBCaI" Received: by mail-lf1-f41.google.com with SMTP id 2adb3069b0e04-53df6322ea7so5267380e87.0 for ; Sun, 15 Dec 2024 23:20:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cogentembedded-com.20230601.gappssmtp.com; s=20230601; t=1734333616; x=1734938416; 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=Sy6PRdyvTJmt4nLi/KLtgN81vqndB8nEbZyDRKOmQYI=; b=YrMIBCaINhbLE1bcM91uB41cb03Sp6FHW8uD+BDZtli4MbkULihiELpZVEFTeabbXP zv9u8QwteplQwMwAuxwAHM8AAD/Ze4Kru0FZfnBW1O/J2wi6K2cRJ5hxxMQQtBqYH+mH 6MG9TODuS4xAo3Z477z7q+E/vBDr8Te+puPHmAKCr7IeH7seadVufnjuQBZYVDLubzZw fYvQVYiLqC6NI5LcJFd0j4D1sREE3Njz8O96CeOIsA0l1R6nL18xBoMsYX56gLLMHZna 0BMAOCs3R8OH6EhJO1W+DmeZ21XS/QRkf+VkVZtA/0OzMRBOI6+sZrau5thzt+BHovCx +/Kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734333616; x=1734938416; 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=Sy6PRdyvTJmt4nLi/KLtgN81vqndB8nEbZyDRKOmQYI=; b=g0d1IJf5SN5SYxASKVSuHyknA3Yr0HGQzXOCx69w+Xwjb9DnZC5+AjPdPYwVV+FSaH iDw2a2jZ5lHO9Z7Q46Etg3hddceU7g0BeLDlSRGwgocMmWyOs7L/uVAy9Qah2OAfB7Y6 zLssBbkG9twatijoesixDYfffVKfIchUpWI8LJ46MMeAJnSuUqIyCEdKXrASwfuY0ALp 1K/23I5NDXTtkuspCH0db8e6wkdgA+lwcsbhp4ef5Dk8fEjch2K3sgws+m895ZhjC8CS gtmdtUUzRxmgqO+ouO8T/WLrsBtxj1x1yKsL+L5HTqm6HYHohEB91YJfjCM0Z2yTKVnx y0wA== X-Forwarded-Encrypted: i=1; AJvYcCU0ZC2kckJ0+3KenAe5fuehkqTIQs0jkiHj+/nPvHMYrJpPkrYxHfRGnOh3hIiZOT3OWeFdtc6DObKtRbY=@vger.kernel.org X-Gm-Message-State: AOJu0YxxTEIJSkhpiJUXYZMdusXYmGepNJvcRLETPxTVeJgI9QkgRt6W sslcFh8z3IIWHoN1Qk4/Q4rINX8b53cmbHgd3LPePjaZUZn76e1fBjABcY2rN94= X-Gm-Gg: ASbGncu7C3b/JETc+S7+kEQbeJ7EKM7obwaS37czrcEBaIzNQug5+i1k2+BAiUQRiif /fTVd9/uJFv4/30Uy+V9W1KKUNLLOiUH0LAuX/dG8eFlasjpyJXz3l9mqDu/wY8Evdwk3sa+Byp oiyzEoiVI7O8bUA5VmVrj2GhPSUybX+pENamw1qq8rbHzkjnVOsfzGnBQIVLLW76wZjGFBq8OtU /GSC+Huv8FOmpZI0AfW3VYKmvlUkPs23uRvJ/rb14WXTl8AkUFnLxT2ndT/3I7o1bCur4s= X-Google-Smtp-Source: AGHT+IH9reL5lhWoFaKGj2Yh05YQwmvxJkqzpPUY5yPuPlhytzfhLRIBepAdoB6afrfzAgPi3F0HPA== X-Received: by 2002:a05:6512:3d27:b0:53e:1c3e:34 with SMTP id 2adb3069b0e04-540905974b1mr3654998e87.38.1734333616046; Sun, 15 Dec 2024 23:20:16 -0800 (PST) Received: from cobook.home ([91.198.101.25]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-54120ba9b2bsm748930e87.94.2024.12.15.23.20.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Dec 2024 23:20:15 -0800 (PST) From: Nikita Yushchenko To: Yoshihiro Shimoda , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Geert Uytterhoeven Cc: netdev@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Michael Dege , Christian Mardmoeller , Dennis Ostermann , Nikita Yushchenko Subject: [PATCH net-next v2 4/5] net: renesas: rswitch: use generic MPSM operation for mdio C45 Date: Mon, 16 Dec 2024 12:19:56 +0500 Message-Id: <20241216071957.2587354-5-nikita.yoush@cogentembedded.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241216071957.2587354-1-nikita.yoush@cogentembedded.com> References: <20241216071957.2587354-1-nikita.yoush@cogentembedded.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" Introduce rswitch_etha_mpsm_op() that accepts values for MPSM register fields and executes the transaction. This avoids some code duptication, and can be used both for C45 and C22. Convert C45 read and write operations to use that. Signed-off-by: Nikita Yushchenko --- drivers/net/ethernet/renesas/rswitch.c | 51 +++++++++++++++----------- drivers/net/ethernet/renesas/rswitch.h | 17 ++++++--- 2 files changed, 40 insertions(+), 28 deletions(-) diff --git a/drivers/net/ethernet/renesas/rswitch.c b/drivers/net/ethernet/= renesas/rswitch.c index 6e3f162ae3b3..a3ba2a91c0ab 100644 --- a/drivers/net/ethernet/renesas/rswitch.c +++ b/drivers/net/ethernet/renesas/rswitch.c @@ -1195,36 +1195,29 @@ static int rswitch_etha_hw_init(struct rswitch_etha= *etha, const u8 *mac) return rswitch_etha_change_mode(etha, EAMC_OPC_OPERATION); } =20 -static int rswitch_etha_set_access(struct rswitch_etha *etha, bool read, - int phyad, int devad, int regad, int data) +static int rswitch_etha_mpsm_op(struct rswitch_etha *etha, bool read, + unsigned int mmf, unsigned int pda, + unsigned int pra, unsigned int pop, + unsigned int prd) { - int pop =3D read ? MDIO_READ_C45 : MDIO_WRITE_C45; u32 val; int ret; =20 - if (devad =3D=3D 0xffffffff) - return -ENODEV; - - val =3D MPSM_PSME | MPSM_MFF_C45; - iowrite32((regad << 16) | (devad << 8) | (phyad << 3) | val, etha->addr += MPSM); + val =3D MPSM_PSME | + FIELD_PREP(MPSM_MFF, mmf) | + FIELD_PREP(MPSM_PDA, pda) | + FIELD_PREP(MPSM_PRA, pra) | + FIELD_PREP(MPSM_POP, pop) | + FIELD_PREP(MPSM_PRD, prd); + iowrite32(val, etha->addr + MPSM); =20 ret =3D rswitch_reg_wait(etha->addr, MPSM, MPSM_PSME, 0); if (ret) return ret; =20 if (read) { - writel((pop << 13) | (devad << 8) | (phyad << 3) | val, etha->addr + MPS= M); - - ret =3D rswitch_reg_wait(etha->addr, MPSM, MPSM_PSME, 0); - if (ret) - return ret; - - ret =3D (ioread32(etha->addr + MPSM) & MPSM_PRD_MASK) >> 16; - } else { - iowrite32((data << 16) | (pop << 13) | (devad << 8) | (phyad << 3) | val, - etha->addr + MPSM); - - ret =3D rswitch_reg_wait(etha->addr, MPSM, MPSM_PSME, 0); + val =3D ioread32(etha->addr + MPSM); + ret =3D FIELD_GET(MPSM_PRD, val); } =20 return ret; @@ -1234,16 +1227,30 @@ static int rswitch_etha_mii_read_c45(struct mii_bus= *bus, int addr, int devad, int regad) { struct rswitch_etha *etha =3D bus->priv; + int ret; =20 - return rswitch_etha_set_access(etha, true, addr, devad, regad, 0); + ret =3D rswitch_etha_mpsm_op(etha, false, MPSM_MMF_C45, addr, devad, + MPSM_POP_ADDRESS, regad); + if (ret) + return ret; + + return rswitch_etha_mpsm_op(etha, true, MPSM_MMF_C45, addr, devad, + MPSM_POP_READ_C45, 0); } =20 static int rswitch_etha_mii_write_c45(struct mii_bus *bus, int addr, int d= evad, int regad, u16 val) { struct rswitch_etha *etha =3D bus->priv; + int ret; + + ret =3D rswitch_etha_mpsm_op(etha, false, MPSM_MMF_C45, addr, devad, + MPSM_POP_ADDRESS, regad); + if (ret) + return ret; =20 - return rswitch_etha_set_access(etha, false, addr, devad, regad, val); + return rswitch_etha_mpsm_op(etha, false, MPSM_MMF_C45, addr, devad, + MPSM_POP_WRITE, val); } =20 /* Call of_node_put(port) after done */ diff --git a/drivers/net/ethernet/renesas/rswitch.h b/drivers/net/ethernet/= renesas/rswitch.h index 2cb66f3f4716..35ee73766396 100644 --- a/drivers/net/ethernet/renesas/rswitch.h +++ b/drivers/net/ethernet/renesas/rswitch.h @@ -735,13 +735,18 @@ enum rswitch_etha_mode { #define MPIC_PSMCS GENMASK(22, 16) #define MPIC_PSMHT GENMASK(26, 24) =20 -#define MDIO_READ_C45 0x03 -#define MDIO_WRITE_C45 0x01 - #define MPSM_PSME BIT(0) -#define MPSM_MFF_C45 BIT(2) -#define MPSM_PRD_SHIFT 16 -#define MPSM_PRD_MASK GENMASK(31, MPSM_PRD_SHIFT) +#define MPSM_MFF BIT(2) +#define MPSM_MMF_C22 0 +#define MPSM_MMF_C45 1 +#define MPSM_PDA GENMASK(7, 3) +#define MPSM_PRA GENMASK(12, 8) +#define MPSM_POP GENMASK(14, 13) +#define MPSM_POP_ADDRESS 0 +#define MPSM_POP_WRITE 1 +#define MPSM_POP_READ_C22 2 +#define MPSM_POP_READ_C45 3 +#define MPSM_PRD GENMASK(31, 16) =20 #define MLVC_PLV BIT(16) =20 --=20 2.39.5 From nobody Wed Dec 17 17:53:16 2025 Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) (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 0E5A11D54E2 for ; Mon, 16 Dec 2024 07:20:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734333622; cv=none; b=c/GpoXpxF1pokGc43hEMx65EdRcbn4ZbrgQMJ8o8fq0e4tuQxVreDvHEWebafRjFRVBwNY8oCHvzmHJH9ict7znr2JbsfVUp8IOGrJjJOF6S49RfJc/B5dPyBprCLB30Qm8GXO+djAzOCDvU/u0iExJ4sVnE0weNQcGdhXejcaU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734333622; c=relaxed/simple; bh=PPu77jqSXBAgupPgYnoSOAHUAmL6TvEmfGQvFsLGMGU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=tzG4JafMBHl1B6IHQIpyBvPqGdkZsiDrWD10ckK87g9XepAs8qtjAMlDDguPTC0gpR8xcRJqsZQlQooNDDOzSYhVDBAdM+Uw4W6r3zm2oJ6nDDxecVbGOLkvNWkciYJIcarthpL8qZT+U8rgWBI7ZQkTYPvfZHumCqAI3Q/lCfI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=cogentembedded.com; spf=pass smtp.mailfrom=cogentembedded.com; dkim=pass (2048-bit key) header.d=cogentembedded-com.20230601.gappssmtp.com header.i=@cogentembedded-com.20230601.gappssmtp.com header.b=lp2QMC9C; arc=none smtp.client-ip=209.85.167.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=cogentembedded.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=cogentembedded.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=cogentembedded-com.20230601.gappssmtp.com header.i=@cogentembedded-com.20230601.gappssmtp.com header.b="lp2QMC9C" Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-53df80eeeedso3773925e87.2 for ; Sun, 15 Dec 2024 23:20:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cogentembedded-com.20230601.gappssmtp.com; s=20230601; t=1734333619; x=1734938419; 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=2bRm8i06V7UAQJx4SsgcbkPUCzwQb13lEnvW91v/XN8=; b=lp2QMC9CI3ikyuAy2Tt9MtnsgHTh/Weq/TNHrCzoGhFjpSqj4i8hVoFa/H4ntMR3zd AG/vIuyn2m4gJyTClbQnI480tmeJt4eOsthR0NBvtXbBYSALivYD/k3wk1iH28mRcmv1 58AZAMhi1F1qBENhYGKpkveJZYs/1KOwDyCAp1CuTff/TH/+Jt3HY4nCYJcebVH2V4AK 99anuJvKzysRb7SK6WXSxlIaGRfnH2fl85X1lFdSi/M+MzMoqovJmfSWhaeBlStPuXMj V+JUzYSqRbwbHLMe65qZb4zYO9vpvynX7r3AYZKm0mNNr/vh7A7nxMcC0mM36mh4BKav DpMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734333619; x=1734938419; 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=2bRm8i06V7UAQJx4SsgcbkPUCzwQb13lEnvW91v/XN8=; b=cMXixF3z2svWkiWADH0cQdUrdmXGlPGF5TPD5Pxk5ZeIEB4ChWnWqIr2qhu6Mtwshh QzK4oKy0ntx1Li3ONP/cwReyrdscCsQcX0uVclvEbTgc7CUr0NXMQhGclbOnk+ZFpBpy aXP6I/f/sEgwXWDm7qEIy9DL4d1a7ICjIXq0ymnvvj/gUAz+r7dXVGUmNm3BVNblRRi/ yxLcOfYcYpL8MfYTq2rVE3n/os3lv1JVI1rEWs4M6FhR/NNvjHY/FRnND5kY/yfxN42P FW5hptAnvNZ4o3A4fVV/TuD4yLVYPreONUa8NJY6t3po9emTdLHKt4L3j3xwGQTITXCc 8Ugg== X-Forwarded-Encrypted: i=1; AJvYcCWxtFrjs58uHLnEFhzDrlyKAZfQuc1N3+MFj1MV82SKRLENT7fFmOTNVFwXLxYVZm2lE6gi+evgz0O1sy0=@vger.kernel.org X-Gm-Message-State: AOJu0YzPtcWtSA/ay4NnCy85sK0gT6vI3hbLkOLLVqJwraR6UG8l6pw6 u5zzqQLQltiWCafLgBRY3mdseJ2iRT/bE/tp9fYw1StSdnf0O97Zl8XxT07rwmA= X-Gm-Gg: ASbGncvki2CyBrfAb3a7BR2loQkDq4EzHmXZ+h3EMPX5pHwo1BqsWPmKAPkrsnKDhDu HOsLUcz/Iks8JRvAuw9DslSl6PUdGKIuSd3CIyUzGoq9bhj74JFQ7Hwm58SoVomnSRpIQxstSS1 QaUUBG+Dx4PBaakl2y1fpgs7VghG2JtRPCPTWufDCYq44GssXKm3qAxhkVKfRocGSkzZjvRQGFq tzeKfYQionU9i3er1aAfNnMTcvnoxEpn7hvspKkIDCHYpPX6w+ugPKAUdn1reVmdipCNKY= X-Google-Smtp-Source: AGHT+IFowAXgGjOedfuT8nJJtjG23yp3KyVX22HWiWvy1vf9kaEvbhBVhV1xHsfmSOlU8xeDwiDt1Q== X-Received: by 2002:a05:6512:401b:b0:540:c349:a81b with SMTP id 2adb3069b0e04-540c349a962mr3449085e87.48.1734333619267; Sun, 15 Dec 2024 23:20:19 -0800 (PST) Received: from cobook.home ([91.198.101.25]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-54120ba9b2bsm748930e87.94.2024.12.15.23.20.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Dec 2024 23:20:19 -0800 (PST) From: Nikita Yushchenko To: Yoshihiro Shimoda , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Geert Uytterhoeven Cc: netdev@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Michael Dege , Christian Mardmoeller , Dennis Ostermann , Nikita Yushchenko Subject: [PATCH net-next v2 5/5] net: renesas: rswitch: add mdio C22 support Date: Mon, 16 Dec 2024 12:19:57 +0500 Message-Id: <20241216071957.2587354-6-nikita.yoush@cogentembedded.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241216071957.2587354-1-nikita.yoush@cogentembedded.com> References: <20241216071957.2587354-1-nikita.yoush@cogentembedded.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" The generic MPSM operation added by the previous patch can be used both for C45 and C22. Add handlers for C22 operations. Signed-off-by: Nikita Yushchenko --- drivers/net/ethernet/renesas/rswitch.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/drivers/net/ethernet/renesas/rswitch.c b/drivers/net/ethernet/= renesas/rswitch.c index a3ba2a91c0ab..aae26098bc0c 100644 --- a/drivers/net/ethernet/renesas/rswitch.c +++ b/drivers/net/ethernet/renesas/rswitch.c @@ -1253,6 +1253,23 @@ static int rswitch_etha_mii_write_c45(struct mii_bus= *bus, int addr, int devad, MPSM_POP_WRITE, val); } =20 +static int rswitch_etha_mii_read_c22(struct mii_bus *bus, int phyad, int r= egad) +{ + struct rswitch_etha *etha =3D bus->priv; + + return rswitch_etha_mpsm_op(etha, true, MPSM_MMF_C22, phyad, regad, + MPSM_POP_READ_C22, 0); +} + +static int rswitch_etha_mii_write_c22(struct mii_bus *bus, int phyad, + int regad, u16 val) +{ + struct rswitch_etha *etha =3D bus->priv; + + return rswitch_etha_mpsm_op(etha, false, MPSM_MMF_C22, phyad, regad, + MPSM_POP_WRITE, val); +} + /* Call of_node_put(port) after done */ static struct device_node *rswitch_get_port_node(struct rswitch_device *rd= ev) { @@ -1335,6 +1352,8 @@ static int rswitch_mii_register(struct rswitch_device= *rdev) mii_bus->priv =3D rdev->etha; mii_bus->read_c45 =3D rswitch_etha_mii_read_c45; mii_bus->write_c45 =3D rswitch_etha_mii_write_c45; + mii_bus->read =3D rswitch_etha_mii_read_c22; + mii_bus->write =3D rswitch_etha_mii_write_c22; mii_bus->parent =3D &rdev->priv->pdev->dev; =20 mdio_np =3D of_get_child_by_name(rdev->np_port, "mdio"); --=20 2.39.5