From nobody Wed Dec 17 18:01:11 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 9A8A41581E0 for ; Sun, 8 Dec 2024 15:52:45 +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=1733673167; cv=none; b=k8M4uQ+NGkzBkKWAZJpAgavgr7s+WTkHOaAjWY1Z8V4Jb/uIQoqfjKdDe2L7qmy08RXDfHSn+6jja5o1jzDuooUIOkn7o1h1Fr9+RRrcooqiTk2ef1D2Rr2abUhAyt/TVmMkzA5n+yMou9iAoS3bo16sWCdgTQspgR5u36EZisc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733673167; c=relaxed/simple; bh=pR239TJH6DkmyjLOOWJrEa9qa6lKwq6zBqCCU7HNb+o=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=IsDKfh7+R70+Uwf0zl7D9QXqkNbTwjYgxzSK6vEkPhY9tINtmuHF5owkSFnX/SYV1RDzazH8Y3OC+VZ2OAscOeUK4dOIZmxfHu3FjGYMc8s4WnI2lEUO8+eukJ3YIwXPOkb2SoTgEQ5wcxfJdikkstxokFKLEcsvGyp1PxKF+kU= 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=d1Iv4bpY; 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="d1Iv4bpY" Received: by mail-lf1-f48.google.com with SMTP id 2adb3069b0e04-53ffaaeeb76so793497e87.0 for ; Sun, 08 Dec 2024 07:52:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cogentembedded-com.20230601.gappssmtp.com; s=20230601; t=1733673164; x=1734277964; 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=YM5DZdXZqiBry1GF0hiPMUU57y91Is3FbX9t5e3p81c=; b=d1Iv4bpYYgxKt8zGwpriFDplZs2LllAYlDDcdMvk+YGdmkeyc24NiIve5F85xmWY2B gGDjXGCL3uYJfGwbLxJvapUleLflyrW/AhZ35GbdiAIrPxJXzyUCjPFdVJWlx8FieEvP 4NPSLDNFX1fnlRk7HNOJhzmYVsv6RjPubGHwSuYGaKegtEr8JkVhl6JVK+DoWZ3/Yd++ uVoi76ppkhQv0h8fRHZNtom3fodCbWRadyntxgr82uEpM3LYsguzBnMzq1wb6b7Z6QJO dtxQsRvWVI9gPeytZS8XnbGY18/mOsj9FajuOOeYUDRjKF1PWm51HG3ACBPDTyQgXPAf qxkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733673164; x=1734277964; 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=YM5DZdXZqiBry1GF0hiPMUU57y91Is3FbX9t5e3p81c=; b=tsnqpL+fSpaAdWv2Gxf9gGR65yYoqSguwdmkai3W+PhBm0A1Zz1AFNgYQnL3Vfo3jC iUtw9koblr2JwIcBn4Uml8MKZ+N/u5aWXPAO4s4tSKnrj5d3G0v6OPXJu371T4E28igd 7ZQssYmmOYZ/9a5IqtNeSI1uxgCxsYRhvtjKJlfq+LjCOP1Sb4jKvVf2gRiMEi13XgOH K9Tt1DafjQ32/nuQ9Pe04k+XcbWv93IW66u/vUtFG6XZ+dE7GydClwFy1GSxR/gh9erM DcfxbMkhDAIh9cHOz+0sDprb6SeOx6VD68FSMwo0UDJQqsg+781yKqdmdVfHBpt1FFzJ PI6w== X-Forwarded-Encrypted: i=1; AJvYcCWXEHJl6ksbZAOFZwCGExuyq3mkersEKt/ORtTv/D85efQxZoGWl9mecYt4WNIhB5LcvCirWZSdabV1KLg=@vger.kernel.org X-Gm-Message-State: AOJu0YxnHnnwhlNt55eMhOFjCdNaN1bImtxfrWd+nAz68+8d908huDcn DlOd+J1RxH6U3+fBvMnpK7Ea1MtxU8pQQBBYxQ+NQwmLJhn2PlORSZCSEkZh09w= X-Gm-Gg: ASbGnctQWILElIH9WoOCsrJMwwbphi4OIfxYbCRIAoD2Rl4VnvRAGZgHKAQ8K+iI2DI 9ZKldh49FE5p4zIjagzqi+rLFm+mZCAgv+9oxMqb+sLsU95X2shvnOun+/tSXkOtw1aYcQTuFIV 8UojJ/usxUUE5OZ+KvlM++pwABKC/SSKUGrInSO3dyay8WKsBCMc3fFe20QYldomH8PQCPVrV3U /ifsTryYpdlVg5Uhhql3UZPW0E7ocfEolnepmko5Y6Rdd1dJNLZN2z0NKa5f1j5 X-Google-Smtp-Source: AGHT+IH0mhFJkzgTaRltbt/3f/uOZ0/C8ZdKxaDXSeoLslSVJ6jaMefU1FWkl1ufVYiQ/d2eGcmVPQ== X-Received: by 2002:a05:6512:2823:b0:53f:232e:31ea with SMTP id 2adb3069b0e04-53f232e3741mr1250833e87.54.1733673163671; Sun, 08 Dec 2024 07:52:43 -0800 (PST) Received: from cobook.home ([91.198.101.25]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-53e3a1ce70bsm580882e87.66.2024.12.08.07.52.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Dec 2024 07:52:43 -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 1/4] net: renesas: rswitch: do not write to MPSM register at init time Date: Sun, 8 Dec 2024 20:52:33 +0500 Message-Id: <20241208155236.108582-2-nikita.yoush@cogentembedded.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241208155236.108582-1-nikita.yoush@cogentembedded.com> References: <20241208155236.108582-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 8ac6ef532c6a..57d0f992f9a5 100644 --- a/drivers/net/ethernet/renesas/rswitch.c +++ b/drivers/net/ethernet/renesas/rswitch.c @@ -1139,7 +1139,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 18:01:11 2025 Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) (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 69F4815B0E2 for ; Sun, 8 Dec 2024 15:52:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733673169; cv=none; b=HMURmSZaFg68eTiONwD1ZTiRpHOo+UeqA3imwPcSaj8DZLreGhkcIxGWPApZrKOj1/1mFH/8ROLl3AaXqTzKOkynC3cKAFrD/R0lrljvIPkYgxPB6gS/YVFhqbkkuAnhJkg6CZyPBRZ4a+7RyyVPXCVOq4jI+Y6gxW570NJI1Mw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733673169; c=relaxed/simple; bh=RWCtaYm/JVslyITM0sBPkX8+GSKakwBGh/MBx/cs9wU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=OtalCBuOaoqOsrt5ufwdYMcu4S1bd/cPfxl2tJ5TjigIiBHjlyreRDMCCDePSaOmcikkjfJvVrZpCx/bUIaWLenL9tRUMkkb4yidtW1p8bvbnAnrhANIEFHqiJdyjb480MqOocSR+L7qRjdg5/ilnZyJMKuJHNLr1yvo7YMfIPA= 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=Yp5OhfG+; arc=none smtp.client-ip=209.85.167.43 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="Yp5OhfG+" Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-53e3a90336eso1258411e87.3 for ; Sun, 08 Dec 2024 07:52:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cogentembedded-com.20230601.gappssmtp.com; s=20230601; t=1733673165; x=1734277965; 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=ZQxkVzK7EnNsOjYzKhrnJfnqM/CbI5Zj781Mc6uR9Vc=; b=Yp5OhfG+J9JKgunbNkXmnc13IO1iI1fkc+BxXTEkaXSfmRtjqzhRoinzRW7GUMExKG pTfSm6S5bppsl/ryi0REEUKPzZ4wcQrGQ9wb30ATElqKTtKZkpqdBUwBTEvU4YF0mTHB FAjLq+yfrc4YDyEzYgLUidQToRb684WbbOnd4rBkIrkosa3/KPrn2BimLwTS5ZQAaH/O XDs8CSeWhsAM8Qz3ucDh3H3BRjK7cOjxRzU2H3onNjZe4pQRuGDtaijRa3sfpKS7PWRj rpW3kuvC6nRwS36AOGT7OVooEtQ4NMeHoql4EMJxFRz0YCUG6w17Njidc4YIoSYliHZI c4Rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733673165; x=1734277965; 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=ZQxkVzK7EnNsOjYzKhrnJfnqM/CbI5Zj781Mc6uR9Vc=; b=PLC0SpWbo+duozwAqCY5amRqDbw3IsFB4FxW8uvDeyQaYYDxylHZ+MjgvnottJaCVU Wr6ZTWUyfh3ILgmNWGgU/CDOvs2TPviCt9soauM9vwq8tk9Yxd8GKLfyMTMVCi+2Yu9+ QyepfOa2fHaewIKJ5Te18ozlrcW+IurrNwIlhlhdaOnBoZkDmlp6VHnVVnGBPUIMw9Si XExSbyTd203zLrXvYW15pNb9KfxtVzYSOsrmpDFNCjb4w3CBjmLmdDbuPaBVp6L5ZxCI g7zmhRRhaux0ly0kaHORKYM2ZEg1YTcDhn/3Lng/z35grr82sIZxVxxUm1LB27VV7dhG sOcg== X-Forwarded-Encrypted: i=1; AJvYcCVphBDfObcGOqCjt56cDRvU9aW7QBj0Kt/eOIZDTMY/Xy/Ap6XWBVl2/s4SU7qjACiKU75pQAYgYJTIFY0=@vger.kernel.org X-Gm-Message-State: AOJu0Yz+tBtjNNsAmyU14rd6cZHI9SjqFYetjq/W1CSUoL37Tf374sGW /KQUFd5PE9bu9NzvxZUXrn11n/xUxwDIVH6SWMwPzk6djaa9RYQ+xkuwjEVo1eM= X-Gm-Gg: ASbGncvd4SoC+0speVMSQNG4sWxa80V7KIZbQw09l7MHTU3585mjSFfOqobATqwCr8Z AhMNPloWxpTF49BEVrnXOy3uZmScvvbACAkLU7igDvjqVBG5riTtYHrf4goXKKcr45qFSmqIIyH 4WzZbn3/kLSwvIRz2v4FnARBjciOdWxpBy91ydpUJOj98DkR3t1qyH5V//zDISWY4yK6UMohstE LVrLnhGhBDqrpNZBbVM1fcqGfmaLjearMw6vTBhRutrxkoVojW+bt3teOGNK5S1 X-Google-Smtp-Source: AGHT+IFN0e6LLKXo0Wdi3CnElwzhg/3WaQvnNCfHh7dkeACryOt6FCzNDEV9CQMLSH98javWI++cxQ== X-Received: by 2002:a05:6512:3092:b0:540:1d58:da72 with SMTP id 2adb3069b0e04-5401d58db83mr536069e87.4.1733673165577; Sun, 08 Dec 2024 07:52:45 -0800 (PST) Received: from cobook.home ([91.198.101.25]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-53e3a1ce70bsm580882e87.66.2024.12.08.07.52.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Dec 2024 07:52:45 -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 2/4] net: renesas: rswitch: align mdio C45 operations with datasheet Date: Sun, 8 Dec 2024 20:52:34 +0500 Message-Id: <20241208155236.108582-3-nikita.yoush@cogentembedded.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241208155236.108582-1-nikita.yoush@cogentembedded.com> References: <20241208155236.108582-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 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/renesas/rswitch.c b/drivers/net/ethernet/= renesas/rswitch.c index 57d0f992f9a5..120d56754692 100644 --- a/drivers/net/ethernet/renesas/rswitch.c +++ b/drivers/net/ethernet/renesas/rswitch.c @@ -1177,32 +1177,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; --=20 2.39.5 From nobody Wed Dec 17 18:01:11 2025 Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) (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 5CC121607AC for ; Sun, 8 Dec 2024 15:52:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733673171; cv=none; b=l4FXJb5J1zCbua+71V/rDzCxRP7VrlkT4vldsgYRPSpOo/CLiVN3sWthl224dh1tpMoSCASNvGAezFc7QOFbiSW/oQIPO5j7P+qk7zcsDjCMqZxaLgg0WpF5nHM0vQtbSwOHBvYOY0CMm6wn1X19c0suwsRvKUTf+x0YBY/X+xU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733673171; c=relaxed/simple; bh=W3XAcV3Mjj3KVk9T8n9IytlKibEylzK1ulVMw68GUA4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=W7D6crHftrXbgERbBfqBCqQCAzISBMKGkH7IegZZO0VtoJ4nKWBcrneaAIg7prZOH1o/DCgfvz0b9/W9ER252LCndddkhQmBUEAhdJbTRlSXF9b3g6ejZHja/eheyWLIR51SI0qzyJLgAuMwlZOf3BxiG9RZhNzSNiUWdUq4OAk= 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=HuLz2byx; arc=none smtp.client-ip=209.85.167.43 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="HuLz2byx" Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-53dd59a2bc1so3384932e87.2 for ; Sun, 08 Dec 2024 07:52:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cogentembedded-com.20230601.gappssmtp.com; s=20230601; t=1733673168; x=1734277968; 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=Vg2upxs4mtRpSPhYhiU3jXij7s08m89bnWpedFCJNHI=; b=HuLz2byxSDwXg7Ngw6/TGXKO3ZQGrdWYyTTAfKt814qaQ59AVddF5sjAJJ/ibUKjqU 8xa4WrlIMNb1Ce/G6aoZwDFmWJeFU30rmDyaFyR8B009rtLoiCdnYe1tkxtocCbmS5WI e6NS/PCRkBAfRvFBAANObn+4Lp/Hvkt0+VHvxuAFMB/fUKV9RICYpaGPCttlkXhslRkv zkWL97p2900mVTl9bsNCSx1d40OJccRZqFinJfXqCYRFHeUY4JzWi9FUQDuNSiG+JjXt eTsyXnc0GDcCk2F3cKcD2uv8+75sL5CbGcUgmSZF061zV6cJhMQVWt6225xLfjpwfZhQ 7SPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733673168; x=1734277968; 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=Vg2upxs4mtRpSPhYhiU3jXij7s08m89bnWpedFCJNHI=; b=taOaQqN1aWyP7PCiU9xh9wrjY1/kkFVL8UABNqWIAtsnWgOD7mzxkGRydk53yft9jK jJu2YFWnsx6bS4XDgbyeLk55v0o9X/GteZsurS5O1NkJkmUFxZOulDgoEjYMtKRAqf1w YnJK+WZqbFsL3piPaEmtDDVy5mKPeqzWU1U995aT9b1XtxiAfLp2+7g2muVbbmZdfQRc bLx8PHWp3UFw5M4EuhHWFwobIxjHxDtzsVI/TGGhSBg8mhKVM4NpbSV3qpkqFLB0Fk7P psPewsX0douNEwoklxBqJhfHpg40FofbBFWDH9TVfAMYO3ty9xf/E5cQu94VXgb/VEw2 IVbA== X-Forwarded-Encrypted: i=1; AJvYcCXmrCsPrSaUG7hR55I8gMJbygsiCi2mcv+a93DNbmVX0TJS3ytKAFWajuRHQDKmYQqVbI1SOO7mZZOQTZQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yxn+zNVnM/g/WagrS3HvcA+YhTv9gn7b7hA3HBx0UrOBGln1Cd0 +i8oBNm+cqifcam5gURElvovvYDdHQNHBJnqjp/XeZFbRhKUbpO5xCdDvi4Zr4s= X-Gm-Gg: ASbGncvLsJJPHOpxCyazKyxRj/216fScrGXi0Rf595Oym4Bs7u48prh9cBuLNOAJ9gC IYTF/2XpsE8EZApYregSvY6QPTTTNSR3nQ14lII6x0sbymg+C3SZLckIrZV0BdOzLzRQV/AYMbF oQxYoW3PZlZ7nwI8tR49Kn7MDrrL/RMXdYE75Dlt5qnYPSxyO/pbODwgCyw205+onxcHF0dyTvG AMxj/9TBHed2X5/XubwknXndR6GBfWXQzt4vqVUqEEH4YXxAgQWmBHPt6X73I+j X-Google-Smtp-Source: AGHT+IFqYHH7wOS5mwp8GRa50qvmO5IVTtwcTYIqm5zeEE/lumQiP2cK0ka70R8JpyU75hFUVIIn4g== X-Received: by 2002:a05:6512:138a:b0:53f:a8c0:22a7 with SMTP id 2adb3069b0e04-53fa8c023aemr1206069e87.38.1733673167473; Sun, 08 Dec 2024 07:52:47 -0800 (PST) Received: from cobook.home ([91.198.101.25]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-53e3a1ce70bsm580882e87.66.2024.12.08.07.52.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Dec 2024 07:52:47 -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 3/4] net: renesas: rswitch: use generic MPSM operation for mdio C45 Date: Sun, 8 Dec 2024 20:52:35 +0500 Message-Id: <20241208155236.108582-4-nikita.yoush@cogentembedded.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241208155236.108582-1-nikita.yoush@cogentembedded.com> References: <20241208155236.108582-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 120d56754692..8dc5ddfee01d 100644 --- a/drivers/net/ethernet/renesas/rswitch.c +++ b/drivers/net/ethernet/renesas/rswitch.c @@ -1167,36 +1167,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; @@ -1206,16 +1199,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 303883369b94..9ac55b4f5b14 100644 --- a/drivers/net/ethernet/renesas/rswitch.h +++ b/drivers/net/ethernet/renesas/rswitch.h @@ -732,13 +732,18 @@ enum rswitch_etha_mode { #define MPIC_LSC_1G (2 << MPIC_LSC_SHIFT) #define MPIC_LSC_2_5G (3 << MPIC_LSC_SHIFT) =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 /* Completion flags */ #define MMIS1_PAACS BIT(2) /* Address */ --=20 2.39.5 From nobody Wed Dec 17 18:01:11 2025 Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) (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 6D93D16DEBB for ; Sun, 8 Dec 2024 15:52:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733673173; cv=none; b=uhdfR/i9MK/sdsX6yMZyEA+ZMDY3z9FFrN1jmlWgs6YagKhcJEOnbgZRjIJHFWlRcyfdjLi/sUp3OicjE0dumsL2O/sbctu+JV3Yo9aHslOYVSX35i9BK+b2UfX1o2yK49j3kONQ4PMmnBfIXYtEc3wY+L07PqYxTrLARul7bzk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733673173; c=relaxed/simple; bh=HyyWUkVImKTbnfUbDT8H94jFhoM3eDYkpcrXi4gTshE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Z5FqyDjrcFYTC1D1pVC07scsGvlz45JkRdLLrdhYFWPqxV2o/4siJoZCR5dE6h5SXvfpBnY1ShIbfaxG1H4d8KxYTYQ3f2K/xy1pFUbfGakEqHH3FshE4LR6wKZsa8z+v3aERHakZYD45Q9NDwvopZBzZPIijstCK4xxRirybKY= 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=x0Wk2VkA; arc=none smtp.client-ip=209.85.167.42 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="x0Wk2VkA" Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-5401fb9fa03so78324e87.1 for ; Sun, 08 Dec 2024 07:52:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cogentembedded-com.20230601.gappssmtp.com; s=20230601; t=1733673169; x=1734277969; 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=gJl98tLA1KqA94ObFzxMBXTp9IXq9js5q87hBKbnvrg=; b=x0Wk2VkAF0goOOK9oA5ZQyOFU7541kKbRDUhCxBiBiP13EQpMeUSKSrSqThZcm7wFG BWCNbrThqdrJDPbgzoBc9XjN9x7/eh2pNT/HErJPJNx6yoLK5EnADw/7DozfAyWyNPvE h8/3n5yfZ2TYGY2rVOnVDzttFCE8SYVwib1Kirq+v2558bEIRb0SEc43PKJNSjvLi8AJ tG8SCmRhCdSw0YgX9/0wII4vH9fCU6CAoHNQo3qvAby1iZiV+RMvFbhdq8FPnNicYaDw DsGrcwjOxml7PyNKBnJlLCxLf2FbuttzNP+gEB5Ix2zZUGdwaJeOwDHzDBss6BwuUDHT i7Fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733673169; x=1734277969; 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=gJl98tLA1KqA94ObFzxMBXTp9IXq9js5q87hBKbnvrg=; b=YSW+h/TSI9nlgQt1MHB6R8zTK7YuyQYXjbqm6Cdg7PFfWSzgIpZv7KJK7yZNnx1yHq Tbil3cr/lmN1YrxS/jAHE4SoM4OFVmZSRI3qzg3RNKAwGAeuE61pTDitw+jrgdUEJeYY niLKez7dh/lgz7oxRYepnN+c4+8bODpAEskIXu+/jPC/h0o+qeFAC4Ll65olGiOtHxjL K56ky2oo1hC9xvh8sJiUZFf2HzyWwwWy5bEPsUCUWf/c8rkL3j0kF8q+gFM5d7iddQmh wfztLO7j0f/6koLyH7w/NeFMBQFKTsO+3PotYfYWHrpH4q+n8iBu2jRwFZcWeYSd+7ed 8lqg== X-Forwarded-Encrypted: i=1; AJvYcCX13DA8Tg5ogfiP/wSLRFKFtU97Tfri/7ZNCmrQzo6wbhJjA5Z9eZQNdce+buUD76I37lPk3xfaSEhZJYo=@vger.kernel.org X-Gm-Message-State: AOJu0Yz7eI7WTepYtNhsJ3vuHdJIEoMeHm5K62GewZ9abV6zd1QxiUAW tOOjU/z8QXQv7Mf60oZaxpcZCkxZDc+7aC+aH511Wrlop3xn4jUEGLg3y4uWovU= X-Gm-Gg: ASbGncvIOKH0jCw2JyLHMt3HMmoJaBwt6wcy1h+G+krlrQwjg27Hg0iJvp6kBCUuKge 722lKNFYzD4+YQU+39Vpwak3QJO0ORpI/HAOv3yzYkMpZnIVLaYLCF4ElPicEvM38nWJeQ9Y7Us 0cHaTR1oqIuB2BBZQ2+fr3gzzv0YieKgl1bkX0gAkc/87UmUMWs9QdS5jHa/og3neiz7bdTTCYC hWy+tRuyDMfEE2fzU8HR23zwXIoz9ftDcXog2UCytbkF7V284EroLKyFW61vpxd X-Google-Smtp-Source: AGHT+IH3PSTZTHavCvoa1I3kEsvmuL+iD0caZGd6QozHV+KkfcwNGoYPhdqy84lNEnLmvIZv5Ekjcg== X-Received: by 2002:a05:6512:6d2:b0:53e:16eb:d845 with SMTP id 2adb3069b0e04-53e2b7328d9mr3358489e87.18.1733673169476; Sun, 08 Dec 2024 07:52:49 -0800 (PST) Received: from cobook.home ([91.198.101.25]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-53e3a1ce70bsm580882e87.66.2024.12.08.07.52.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Dec 2024 07:52:49 -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 4/4] net: renesas: rswitch: add mdio C22 support Date: Sun, 8 Dec 2024 20:52:36 +0500 Message-Id: <20241208155236.108582-5-nikita.yoush@cogentembedded.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241208155236.108582-1-nikita.yoush@cogentembedded.com> References: <20241208155236.108582-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 8dc5ddfee01d..444e7576b31c 100644 --- a/drivers/net/ethernet/renesas/rswitch.c +++ b/drivers/net/ethernet/renesas/rswitch.c @@ -1225,6 +1225,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) { @@ -1307,6 +1324,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