From patchwork Tue Nov 21 15:53:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 13463324 X-Patchwork-Delegate: geert@linux-m68k.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ragnatech-se.20230601.gappssmtp.com header.i=@ragnatech-se.20230601.gappssmtp.com header.b="aGYjPjNw" Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AACFE1A3 for ; Tue, 21 Nov 2023 07:53:43 -0800 (PST) Received: by mail-ej1-x62c.google.com with SMTP id a640c23a62f3a-a00f67f120aso180211166b.2 for ; Tue, 21 Nov 2023 07:53:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ragnatech-se.20230601.gappssmtp.com; s=20230601; t=1700582022; x=1701186822; 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=OsgRT09PxDe983Ru7T/2ehV/VQm25XU9PRCmjt8k4L8=; b=aGYjPjNwEZjPn8kuBshn7NFi2dHasOAha6rlOSaPVBvs13Gdmwr30D8zQOcj8HSyBO t9cP00ZreHTnUnovPbs+2VZbf5ZfS2WVZH4TtACJWcpKU1obMBpOkLnNPyN9tCafg95B tISXzBfQPKcI/HJSI5JEzLJf1MYWjzn0aOBvR6qNNqsLe2AGPDXdaHUlCnpRydcMeWkz qUVckKsnOt87os5K6ry916EF4gDCUZKvcxY9fQUULjOdEt60ofVWkPG8bYmsirGTqn4W aqVjZ/xULE89IWP5f1Erc6ofyHy43CZR9UAV6z3qgoN+CoCwYr/YxJggyKpDn/0y4y7o YTjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700582022; x=1701186822; 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=OsgRT09PxDe983Ru7T/2ehV/VQm25XU9PRCmjt8k4L8=; b=Af6LoB8syDqdy00ifePH7NImz4xDXSkMy+F8yAeLaEQPWgZB/Uo5afpFIuTb2zoiCg +I3lAbNpRT0Z0urk63n3EP7gKEaZT3ksTn3L4GS/OHE+WsKo/J/6QbfWLri1SPZAIJQI cWEq4HF7dcX7ahn1GRHakeFEEA2hxlpCrsfWJgrKdT6Y+W73ouPeqqbrYFzfCNXBRSwf qjryzMrX5cmmiHZdg8yldIyaJOjgxOxx6ckcHM093o86Er3oAzm27RqGP5nS5pFyoWzo hj9wDCBS/TQWkhMzXX8Dp5XhivPOotOC6vgAOnHVVhNn/g7tbsHRRRFX0BGq3rh6f/uL Xu7Q== X-Gm-Message-State: AOJu0YxNCQs6HdTwXCdEQGBSPbLUugPgWbSgzT0d+4fbVSwi+pxIRSbZ T/u5n3q0Hz7l3LwY90wIlUyBQg== X-Google-Smtp-Source: AGHT+IFkaP85F01IPGjJeYVQuKY3ifaMp+75FN1HK2cHpYI9JkXozMDhhs3tuYprFTtd2vpVQciQtg== X-Received: by 2002:a17:906:ae46:b0:9fe:392:c535 with SMTP id lf6-20020a170906ae4600b009fe0392c535mr5313865ejb.69.1700582022034; Tue, 21 Nov 2023 07:53:42 -0800 (PST) Received: from sleipner.berto.se (p4fcc8a96.dip0.t-ipconnect.de. [79.204.138.150]) by smtp.googlemail.com with ESMTPSA id dv8-20020a170906b80800b009fdc15b5304sm2896853ejb.102.2023.11.21.07.53.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 07:53:41 -0800 (PST) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Richard Cochran , netdev@vger.kernel.org Cc: linux-renesas-soc@vger.kernel.org, =?utf-8?q?Niklas_S=C3=B6derlund?= , Wolfram Sang Subject: [net-next v3 2/5] net: ethernet: renesas: rcar_gen4_ptp: Fail on unknown register layout Date: Tue, 21 Nov 2023 16:53:03 +0100 Message-ID: <20231121155306.515446-3-niklas.soderlund+renesas@ragnatech.se> X-Mailer: git-send-email 2.42.1 In-Reply-To: <20231121155306.515446-1-niklas.soderlund+renesas@ragnatech.se> References: <20231121155306.515446-1-niklas.soderlund+renesas@ragnatech.se> Precedence: bulk X-Mailing-List: linux-renesas-soc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Instead of printing a warning and proceeding with an unknown register layout return an error. The only call site is already prepared to propagate the error. Signed-off-by: Niklas Söderlund Reviewed-by: Wolfram Sang Reviewed-by: Simon Horman --- * Changes since v2 - No change. * Changes since v1 - Added review tag from Wolfram. --- drivers/net/ethernet/renesas/rcar_gen4_ptp.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/renesas/rcar_gen4_ptp.c b/drivers/net/ethernet/renesas/rcar_gen4_ptp.c index c007e33c47e1..443ca5a18703 100644 --- a/drivers/net/ethernet/renesas/rcar_gen4_ptp.c +++ b/drivers/net/ethernet/renesas/rcar_gen4_ptp.c @@ -130,23 +130,30 @@ static struct ptp_clock_info rcar_gen4_ptp_info = { .enable = rcar_gen4_ptp_enable, }; -static void rcar_gen4_ptp_set_offs(struct rcar_gen4_ptp_private *ptp_priv, - enum rcar_gen4_ptp_reg_layout layout) +static int rcar_gen4_ptp_set_offs(struct rcar_gen4_ptp_private *ptp_priv, + enum rcar_gen4_ptp_reg_layout layout) { - WARN_ON(layout != RCAR_GEN4_PTP_REG_LAYOUT_S4); + if (layout != RCAR_GEN4_PTP_REG_LAYOUT_S4) + return -EINVAL; ptp_priv->offs = &s4_offs; + + return 0; } int rcar_gen4_ptp_register(struct rcar_gen4_ptp_private *ptp_priv, enum rcar_gen4_ptp_reg_layout layout, u32 clock) { + int ret; + if (ptp_priv->initialized) return 0; spin_lock_init(&ptp_priv->lock); - rcar_gen4_ptp_set_offs(ptp_priv, layout); + ret = rcar_gen4_ptp_set_offs(ptp_priv, layout); + if (ret) + return ret; ptp_priv->default_addend = clock; iowrite32(ptp_priv->default_addend, ptp_priv->addr + ptp_priv->offs->increment);