From patchwork Mon Nov 20 16:01:15 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: 13461563 X-Patchwork-Delegate: kuba@kernel.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="fl30HzBa" Received: from mail-lj1-x229.google.com (mail-lj1-x229.google.com [IPv6:2a00:1450:4864:20::229]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F556B4 for ; Mon, 20 Nov 2023 08:03:30 -0800 (PST) Received: by mail-lj1-x229.google.com with SMTP id 38308e7fff4ca-2c876e44157so24017791fa.2 for ; Mon, 20 Nov 2023 08:03:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ragnatech-se.20230601.gappssmtp.com; s=20230601; t=1700496209; x=1701101009; 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=TAl6nd1nCzN04zqiBnYIqrG9SwaJGuvdGPy3QreQOpU=; b=fl30HzBajmU6iBX/sNZgfLeGSGBViaEUu7KUbSEmOLODZoM292E8eatYCZL4Ub09f0 +Rbtw3vzg09boNsmENP2mkMdjli6fBFsbu/z11YFdCmX4IhKH8gQ22RC7bYk4RHDXdil iMWLjKZAkbnkPcB6fkg+VJycPPckYppNLUCegngV/e4oU0BW/xGV2h3HFhsXpsOvb4I1 wJZ1/h90NdpWp0f3jYMJkYOXEfkP53WOd/DWzRNlC/L9naLcz1WB8VeU30TE16XH8mQm grjbM+IQTTI++AB8WvazShgNYHFnF2KXihqA6COnzIF3LWgtUvkFU/R563TyfWMVJS2Z q/1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700496209; x=1701101009; 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=TAl6nd1nCzN04zqiBnYIqrG9SwaJGuvdGPy3QreQOpU=; b=IM/9ekOdBky1+gXEyhFqSXkYHG+6YMFuy0t5jOU24WHHtyyg/vJ04bv9p7e++yLawj K2TncU83+LK2B6l8DbpezndpgIbSfydcHtp4+GJz1Z4gdnvI98qCZpii9dlVs69JYPEJ OD81laZ2eNbQR3LyPsLddGphKZp2kouTsxzX/khjJjYCvikxssggBCejMFKYRvwQEfp+ VYNBNOV39zRBtzBX5w1bhnHdJC+vz8JPvGGfthEVpu4ECyWElxcZj8eJ4o9adqpOEGwJ Yf+pMj5im/Q/eUE826UpTXqYCzHUWw6mNaBzChfC+lBfAbzsjOqtzPETpaBaziEsHqtH o6Ww== X-Gm-Message-State: AOJu0YxcOpLQVzrm+4lH5JP6IQZfVg8zT7sJVP4sYb73e/cBVMBBxJr1 dADNvqjKzYtWdCklihllFWcvgg== X-Google-Smtp-Source: AGHT+IH9y3TjxSbJc9gvoYuUHR2atdzxyQzCyOsaNpkl35ZWJdmfWceSEAGzPZVSde7QgIkoFiUFzg== X-Received: by 2002:a2e:709:0:b0:2c5:6c7:9e73 with SMTP id 9-20020a2e0709000000b002c506c79e73mr5317559ljh.48.1700496208747; Mon, 20 Nov 2023 08:03:28 -0800 (PST) Received: from sleipner.berto.se (p4fcc8a96.dip0.t-ipconnect.de. [79.204.138.150]) by smtp.googlemail.com with ESMTPSA id m21-20020a7bce15000000b004080f0376a0sm13564631wmc.42.2023.11.20.08.03.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 08:03:27 -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 v2 2/5] net: ethernet: renesas: rcar_gen4_ptp: Fail on unknown register layout Date: Mon, 20 Nov 2023 17:01:15 +0100 Message-ID: <20231120160118.3524309-3-niklas.soderlund+renesas@ragnatech.se> X-Mailer: git-send-email 2.42.1 In-Reply-To: <20231120160118.3524309-1-niklas.soderlund+renesas@ragnatech.se> References: <20231120160118.3524309-1-niklas.soderlund+renesas@ragnatech.se> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org 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 --- * 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);