From patchwork Tue Nov 17 19:31:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Eggers X-Patchwork-Id: 1401782 Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=arri.de Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CbGLR1JCYz9sTc for ; Wed, 18 Nov 2020 06:32:47 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729543AbgKQTco (ORCPT ); Tue, 17 Nov 2020 14:32:44 -0500 Received: from mailout11.rmx.de ([94.199.88.76]:43794 "EHLO mailout11.rmx.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727019AbgKQTco (ORCPT ); Tue, 17 Nov 2020 14:32:44 -0500 Received: from kdin01.retarus.com (kdin01.dmz1.retloc [172.19.17.48]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout11.rmx.de (Postfix) with ESMTPS id 4CbGLH5FB1z3yV3; Tue, 17 Nov 2020 20:32:39 +0100 (CET) Received: from mta.arri.de (unknown [217.111.95.66]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by kdin01.retarus.com (Postfix) with ESMTPS id 4CbGKV6zcVz2xZR; Tue, 17 Nov 2020 20:31:58 +0100 (CET) Received: from N95HX1G2.wgnetz.xx (192.168.54.38) by mta.arri.de (192.168.100.104) with Microsoft SMTP Server (TLS) id 14.3.487.0; Tue, 17 Nov 2020 20:31:58 +0100 From: Christian Eggers To: Richard Cochran , Andrew Lunn , Heiner Kallweit , Jakub Kicinski CC: Vladimir Oltean , Russell King , "David S . Miller" , , , Christian Eggers , "Kurt Kanzenbach" Subject: [PATCH net-next 1/4] net: ptp: introduce enum ptp_msg_type Date: Tue, 17 Nov 2020 20:31:21 +0100 Message-ID: <20201117193124.9789-1-ceggers@arri.de> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-Originating-IP: [192.168.54.38] X-RMX-ID: 20201117-203158-4CbGKV6zcVz2xZR-0@kdin01 X-RMX-SOURCE: 217.111.95.66 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Using a PTP wide enum will obsolete different driver internal defines and uses of magic numbers. Signed-off-by: Christian Eggers Cc: Kurt Kanzenbach --- include/linux/ptp_classify.h | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/include/linux/ptp_classify.h b/include/linux/ptp_classify.h index 56b2d7d66177..83024220cb42 100644 --- a/include/linux/ptp_classify.h +++ b/include/linux/ptp_classify.h @@ -93,6 +93,13 @@ unsigned int ptp_classify_raw(const struct sk_buff *skb); */ struct ptp_header *ptp_parse_header(struct sk_buff *skb, unsigned int type); +enum ptp_msg_type { + PTP_MSGTYPE_SYNC = 0x0, + PTP_MSGTYPE_DELAY_REQ = 0x1, + PTP_MSGTYPE_PDELAY_REQ = 0x2, + PTP_MSGTYPE_PDELAY_RESP = 0x3, +}; + /** * ptp_get_msgtype - Extract ptp message type from given header * @hdr: ptp header @@ -103,10 +110,10 @@ struct ptp_header *ptp_parse_header(struct sk_buff *skb, unsigned int type); * * Return: The message type */ -static inline u8 ptp_get_msgtype(const struct ptp_header *hdr, +static inline enum ptp_msg_type ptp_get_msgtype(const struct ptp_header *hdr, unsigned int type) { - u8 msgtype; + enum ptp_msg_type msgtype; if (unlikely(type & PTP_CLASS_V1)) { /* msg type is located at the control field for ptp v1 */ @@ -132,13 +139,13 @@ static inline struct ptp_header *ptp_parse_header(struct sk_buff *skb, { return NULL; } -static inline u8 ptp_get_msgtype(const struct ptp_header *hdr, +static inline enum ptp_msg_type ptp_get_msgtype(const struct ptp_header *hdr, unsigned int type) { /* The return is meaningless. The stub function would not be * executed since no available header from ptp_parse_header. */ - return 0; + return PTP_MSGTYPE_SYNC; } #endif #endif /* _PTP_CLASSIFY_H_ */ From patchwork Tue Nov 17 19:31:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Eggers X-Patchwork-Id: 1401784 Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=arri.de Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CbGMm01Wkz9sT6 for ; Wed, 18 Nov 2020 06:33:55 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728341AbgKQTdd (ORCPT ); Tue, 17 Nov 2020 14:33:33 -0500 Received: from mailout06.rmx.de ([94.199.90.92]:33061 "EHLO mailout06.rmx.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725613AbgKQTdd (ORCPT ); Tue, 17 Nov 2020 14:33:33 -0500 Received: from kdin01.retarus.com (kdin01.dmz1.retloc [172.19.17.48]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout06.rmx.de (Postfix) with ESMTPS id 4CbGMD3YZBz9tP3; Tue, 17 Nov 2020 20:33:28 +0100 (CET) Received: from mta.arri.de (unknown [217.111.95.66]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by kdin01.retarus.com (Postfix) with ESMTPS id 4CbGLH5BJpz2xGF; Tue, 17 Nov 2020 20:32:39 +0100 (CET) Received: from N95HX1G2.wgnetz.xx (192.168.54.38) by mta.arri.de (192.168.100.104) with Microsoft SMTP Server (TLS) id 14.3.487.0; Tue, 17 Nov 2020 20:32:33 +0100 From: Christian Eggers To: Richard Cochran , Andrew Lunn , Heiner Kallweit , Jakub Kicinski CC: Vladimir Oltean , Russell King , "David S . Miller" , , , Christian Eggers , "Richard Cochran" , Kurt Kanzenbach Subject: [PATCH net-next 2/4] net: phy: dp83640: use enum ptp_msg_type Date: Tue, 17 Nov 2020 20:31:22 +0100 Message-ID: <20201117193124.9789-2-ceggers@arri.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201117193124.9789-1-ceggers@arri.de> References: <20201117193124.9789-1-ceggers@arri.de> MIME-Version: 1.0 X-Originating-IP: [192.168.54.38] X-RMX-ID: 20201117-203247-4CbGLH5BJpz2xGF-0@kdin01 X-RMX-SOURCE: 217.111.95.66 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use new return type of ptp_get_msgtype(). Remove usage of magic number. Signed-off-by: Christian Eggers Cc: Richard Cochran Cc: Kurt Kanzenbach --- drivers/net/phy/dp83640.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c index f2caccaf4408..bb68db3518bc 100644 --- a/drivers/net/phy/dp83640.c +++ b/drivers/net/phy/dp83640.c @@ -88,7 +88,7 @@ struct rxts { unsigned long tmo; u64 ns; u16 seqid; - u8 msgtype; + enum ptp_msg_type msgtype; u16 hash; }; @@ -803,7 +803,7 @@ static int decode_evnt(struct dp83640_private *dp83640, static int match(struct sk_buff *skb, unsigned int type, struct rxts *rxts) { struct ptp_header *hdr; - u8 msgtype; + enum ptp_msg_type msgtype; u16 seqid; u16 hash; @@ -815,7 +815,7 @@ static int match(struct sk_buff *skb, unsigned int type, struct rxts *rxts) msgtype = ptp_get_msgtype(hdr, type); - if (rxts->msgtype != (msgtype & 0xf)) + if (rxts->msgtype != msgtype) return 0; seqid = be16_to_cpu(hdr->sequence_id); @@ -964,7 +964,7 @@ static void decode_status_frame(struct dp83640_private *dp83640, static int is_sync(struct sk_buff *skb, int type) { struct ptp_header *hdr; - u8 msgtype; + enum ptp_msg_type msgtype; hdr = ptp_parse_header(skb, type); if (!hdr) @@ -972,7 +972,7 @@ static int is_sync(struct sk_buff *skb, int type) msgtype = ptp_get_msgtype(hdr, type); - return (msgtype & 0xf) == 0; + return msgtype == PTP_MSGTYPE_SYNC; } static void dp83640_free_clocks(void) From patchwork Tue Nov 17 19:31:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Eggers X-Patchwork-Id: 1401785 Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=arri.de Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CbGNq6Grkz9sT6 for ; Wed, 18 Nov 2020 06:34:51 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729291AbgKQTeV (ORCPT ); Tue, 17 Nov 2020 14:34:21 -0500 Received: from mailout11.rmx.de ([94.199.88.76]:45111 "EHLO mailout11.rmx.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725613AbgKQTeU (ORCPT ); Tue, 17 Nov 2020 14:34:20 -0500 Received: from kdin01.retarus.com (kdin01.dmz1.retloc [172.19.17.48]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout11.rmx.de (Postfix) with ESMTPS id 4CbGN723kJz3yZF; Tue, 17 Nov 2020 20:34:15 +0100 (CET) Received: from mta.arri.de (unknown [217.111.95.66]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by kdin01.retarus.com (Postfix) with ESMTPS id 4CbGMD3QwMz2xFx; Tue, 17 Nov 2020 20:33:28 +0100 (CET) Received: from N95HX1G2.wgnetz.xx (192.168.54.38) by mta.arri.de (192.168.100.104) with Microsoft SMTP Server (TLS) id 14.3.487.0; Tue, 17 Nov 2020 20:33:11 +0100 From: Christian Eggers To: Richard Cochran , Andrew Lunn , Heiner Kallweit , Jakub Kicinski CC: Vladimir Oltean , Russell King , "David S . Miller" , , , Christian Eggers , "Ioana Ciornei" , Ioana Radulescu , Yangbo Lu Subject: [PATCH net-next 3/4] dpaa2-eth: use enum ptp_msg_type Date: Tue, 17 Nov 2020 20:31:23 +0100 Message-ID: <20201117193124.9789-3-ceggers@arri.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201117193124.9789-1-ceggers@arri.de> References: <20201117193124.9789-1-ceggers@arri.de> MIME-Version: 1.0 X-Originating-IP: [192.168.54.38] X-RMX-ID: 20201117-203328-4CbGMD3QwMz2xFx-0@kdin01 X-RMX-SOURCE: 217.111.95.66 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use new return type of ptp_get_msgtype(). Remove usage of magic numbers. Signed-off-by: Christian Eggers Cc: Ioana Ciornei Cc: Ioana Radulescu Cc: Yangbo Lu --- drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c index cf9400a9886d..7e6084124f8f 100644 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c @@ -617,7 +617,7 @@ static int dpaa2_eth_consume_frames(struct dpaa2_eth_channel *ch, } static int dpaa2_eth_ptp_parse(struct sk_buff *skb, - u8 *msgtype, u8 *twostep, u8 *udp, + enum ptp_msg_type *msgtype, u8 *twostep, u8 *udp, u16 *correction_offset, u16 *origintimestamp_offset) { @@ -659,7 +659,7 @@ static void dpaa2_eth_enable_tx_tstamp(struct dpaa2_eth_priv *priv, { struct ptp_tstamp origin_timestamp; struct dpni_single_step_cfg cfg; - u8 msgtype, twostep, udp; + u8 twostep, udp; struct dpaa2_faead *faead; struct dpaa2_fas *fas; struct timespec64 ts; @@ -684,9 +684,11 @@ static void dpaa2_eth_enable_tx_tstamp(struct dpaa2_eth_priv *priv, faead->ctrl = cpu_to_le32(ctrl); if (skb->cb[0] == TX_TSTAMP_ONESTEP_SYNC) { + enum ptp_msg_type msgtype; + if (dpaa2_eth_ptp_parse(skb, &msgtype, &twostep, &udp, &offset1, &offset2) || - msgtype != 0 || twostep) { + msgtype != PTP_MSGTYPE_SYNC || twostep) { WARN_ONCE(1, "Bad packet for one-step timestamping\n"); return; } @@ -1195,7 +1197,7 @@ static void dpaa2_eth_tx_onestep_tstamp(struct work_struct *work) static netdev_tx_t dpaa2_eth_tx(struct sk_buff *skb, struct net_device *net_dev) { struct dpaa2_eth_priv *priv = netdev_priv(net_dev); - u8 msgtype, twostep, udp; + u8 twostep, udp; u16 offset1, offset2; /* Utilize skb->cb[0] for timestamping request per skb */ @@ -1210,9 +1212,11 @@ static netdev_tx_t dpaa2_eth_tx(struct sk_buff *skb, struct net_device *net_dev) /* TX for one-step timestamping PTP Sync packet */ if (skb->cb[0] == TX_TSTAMP_ONESTEP_SYNC) { + enum ptp_msg_type msgtype; + if (!dpaa2_eth_ptp_parse(skb, &msgtype, &twostep, &udp, &offset1, &offset2)) - if (msgtype == 0 && twostep == 0) { + if (msgtype == PTP_MSGTYPE_SYNC && twostep == 0) { skb_queue_tail(&priv->tx_skbs, skb); queue_work(priv->dpaa2_ptp_wq, &priv->tx_onestep_tstamp); From patchwork Tue Nov 17 19:31:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Eggers X-Patchwork-Id: 1401786 Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=arri.de Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CbGPq2DMGz9sSn for ; Wed, 18 Nov 2020 06:35:43 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730351AbgKQTfG (ORCPT ); Tue, 17 Nov 2020 14:35:06 -0500 Received: from mailout08.rmx.de ([94.199.90.85]:37941 "EHLO mailout08.rmx.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728666AbgKQTfF (ORCPT ); Tue, 17 Nov 2020 14:35:05 -0500 Received: from kdin01.retarus.com (kdin01.dmz1.retloc [172.19.17.48]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout08.rmx.de (Postfix) with ESMTPS id 4CbGP00LtzzMm7K; Tue, 17 Nov 2020 20:35:00 +0100 (CET) Received: from mta.arri.de (unknown [217.111.95.66]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by kdin01.retarus.com (Postfix) with ESMTPS id 4CbGN71y83z2xDp; Tue, 17 Nov 2020 20:34:15 +0100 (CET) Received: from N95HX1G2.wgnetz.xx (192.168.54.38) by mta.arri.de (192.168.100.104) with Microsoft SMTP Server (TLS) id 14.3.487.0; Tue, 17 Nov 2020 20:33:48 +0100 From: Christian Eggers To: Richard Cochran , Andrew Lunn , Heiner Kallweit , Jakub Kicinski CC: Vladimir Oltean , Russell King , "David S . Miller" , , , Christian Eggers , "Kurt Kanzenbach" Subject: [PATCH net-next 4/4] ptp: ptp_ines: use enum ptp_msg_type Date: Tue, 17 Nov 2020 20:31:24 +0100 Message-ID: <20201117193124.9789-4-ceggers@arri.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201117193124.9789-1-ceggers@arri.de> References: <20201117193124.9789-1-ceggers@arri.de> MIME-Version: 1.0 X-Originating-IP: [192.168.54.38] X-RMX-ID: 20201117-203419-4CbGN71y83z2xDp-0@kdin01 X-RMX-SOURCE: 217.111.95.66 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use new return type of ptp_get_msgtype(). Remove driver internal defines for this. Signed-off-by: Christian Eggers Cc: Richard Cochran Cc: Kurt Kanzenbach Reported-by: kernel test robot --- drivers/ptp/ptp_ines.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/drivers/ptp/ptp_ines.c b/drivers/ptp/ptp_ines.c index 4700ffbdfced..4836c9c35604 100644 --- a/drivers/ptp/ptp_ines.c +++ b/drivers/ptp/ptp_ines.c @@ -108,11 +108,6 @@ MODULE_LICENSE("GPL"); #define MESSAGE_TYPE_P_DELAY_RESP 3 #define MESSAGE_TYPE_DELAY_REQ 4 -#define SYNC 0x0 -#define DELAY_REQ 0x1 -#define PDELAY_REQ 0x2 -#define PDELAY_RESP 0x3 - static LIST_HEAD(ines_clocks); static DEFINE_MUTEX(ines_clocks_lock); @@ -442,7 +437,7 @@ static bool ines_match(struct sk_buff *skb, unsigned int ptp_class, { struct ptp_header *hdr; u16 portn, seqid; - u8 msgtype; + enum ptp_msg_type msgtype; u64 clkid; if (unlikely(ptp_class & PTP_CLASS_V1)) @@ -675,7 +670,7 @@ static void ines_txtstamp_work(struct work_struct *work) static bool is_sync_pdelay_resp(struct sk_buff *skb, int type) { struct ptp_header *hdr; - u8 msgtype; + enum ptp_msg_type msgtype; hdr = ptp_parse_header(skb, type); if (!hdr) @@ -683,26 +678,26 @@ static bool is_sync_pdelay_resp(struct sk_buff *skb, int type) msgtype = ptp_get_msgtype(hdr, type); - switch ((msgtype & 0xf)) { - case SYNC: - case PDELAY_RESP: + switch (msgtype) { + case PTP_MSGTYPE_SYNC: + case PTP_MSGTYPE_PDELAY_RESP: return true; default: return false; } } -static u8 tag_to_msgtype(u8 tag) +static enum ptp_msg_type tag_to_msgtype(u8 tag) { switch (tag) { case MESSAGE_TYPE_SYNC: - return SYNC; + return PTP_MSGTYPE_SYNC; case MESSAGE_TYPE_P_DELAY_REQ: - return PDELAY_REQ; + return PTP_MSGTYPE_PDELAY_REQ; case MESSAGE_TYPE_P_DELAY_RESP: - return PDELAY_RESP; + return PTP_MSGTYPE_PDELAY_RESP; case MESSAGE_TYPE_DELAY_REQ: - return DELAY_REQ; + return PTP_MSGTYPE_DELAY_REQ; } return 0xf; }