From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 29EC12744D for ; Tue, 10 Oct 2023 15:37:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="kG+srMFa" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BE456C433C7; Tue, 10 Oct 2023 15:37:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1696952274; bh=ccn0ErrI3BKGdflhAH1/B0pSw0wAE/4xTGwBpyvuDHw=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=kG+srMFaKg3Sy4x78n9VSvAOJFgmN0tdjNSTW/JeDSUZzFPLVe3WowEvrDEfZ+JSv DegXXrPaqpdMdctSGVLgHgU2EsUP9+VL0GbCMLEuA27pJl2InJCFBZnTdq+OCQE7m3 7dNritxb+Rz0HFEy0DvIWu+OWocGqGTSKH8pVS2BL1pO7s85X40JdKsKaLC4dHuuqE 6BOR5JmgtWj5yM8HibBVEJems72H2ueDl2y4Ph2mcebhKw/g6AcnAqKMIuF3K8zlKJ JIbFWypFUL53+BB3R4sIBMKQoV1iih1afXuD6Zflj2N+sUaIM3Lvrq/FPs2WYICkrZ M3cIxSC17Pn1Q== Date: Tue, 10 Oct 2023 17:37:47 +0200 From: Simon Horman To: =?utf-8?B?S8O2cnk=?= Maincent Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Thomas Petazzoni , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Jonathan Corbet , Jay Vosburgh , Andy Gospodarek , Nicolas Ferre , Claudiu Beznea , Horatiu Vultur , UNGLinuxDriver@microchip.com, Florian Fainelli , Broadcom internal kernel review list , Andrew Lunn , Heiner Kallweit , Russell King , Richard Cochran , Radu Pirea , Willem de Bruijn , Vladimir Oltean , Michael Walle , Jacob Keller , Maxime Chevallier Subject: Re: [PATCH net-next v5 01/16] net: Convert PHYs hwtstamp callback to use kernel_hwtstamp_config Message-ID: References: <20231009155138.86458-1-kory.maincent@bootlin.com> <20231009155138.86458-2-kory.maincent@bootlin.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20231009155138.86458-2-kory.maincent@bootlin.com> ... > diff --git a/drivers/net/phy/nxp-c45-tja11xx.c b/drivers/net/phy/nxp-c45-tja11xx.c > index 7ab080ff02df..416484ea6eb3 100644 > --- a/drivers/net/phy/nxp-c45-tja11xx.c > +++ b/drivers/net/phy/nxp-c45-tja11xx.c > @@ -1022,24 +1022,21 @@ static bool nxp_c45_rxtstamp(struct mii_timestamper *mii_ts, > } > > static int nxp_c45_hwtstamp(struct mii_timestamper *mii_ts, > - struct ifreq *ifreq) > + struct kernel_hwtstamp_config *config, > + struct netlink_ext_ack *extack) > { > struct nxp_c45_phy *priv = container_of(mii_ts, struct nxp_c45_phy, > mii_ts); > struct phy_device *phydev = priv->phydev; > const struct nxp_c45_phy_data *data; > - struct hwtstamp_config cfg; > > - if (copy_from_user(&cfg, ifreq->ifr_data, sizeof(cfg))) > - return -EFAULT; > - > - if (cfg.tx_type < 0 || cfg.tx_type > HWTSTAMP_TX_ON) > + if (cfg->tx_type < 0 || cfg->tx_type > HWTSTAMP_TX_ON) Hi Köry, cfg is removed from this function by this patch, but is used here. > return -ERANGE; > > data = nxp_c45_get_data(phydev); > - priv->hwts_tx = cfg.tx_type; > + priv->hwts_tx = cfg->tx_type; > > - switch (cfg.rx_filter) { > + switch (cfg->rx_filter) { > case HWTSTAMP_FILTER_NONE: > priv->hwts_rx = 0; > break; > @@ -1047,7 +1044,7 @@ static int nxp_c45_hwtstamp(struct mii_timestamper *mii_ts, > case HWTSTAMP_FILTER_PTP_V2_L2_SYNC: > case HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ: > priv->hwts_rx = 1; > - cfg.rx_filter = HWTSTAMP_FILTER_PTP_V2_L2_EVENT; > + cfg->rx_filter = HWTSTAMP_FILTER_PTP_V2_L2_EVENT; > break; > default: > return -ERANGE; > @@ -1074,7 +1071,7 @@ static int nxp_c45_hwtstamp(struct mii_timestamper *mii_ts, > nxp_c45_clear_reg_field(phydev, &data->regmap->irq_egr_ts_en); > > nxp_c45_no_ptp_irq: > - return copy_to_user(ifreq->ifr_data, &cfg, sizeof(cfg)) ? -EFAULT : 0; > + return 0; > } > ...