From: Thor Thayer <thor.thayer@linux.intel.com>
To: "Ooi, Joyce" <joyce.ooi@intel.com>,
"David S . Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
Dalon Westergreen <dalon.westergreen@linux.intel.com>,
Tan Ley Foon <ley.foon.tan@intel.com>,
See Chin Liang <chin.liang.see@intel.com>,
Dinh Nguyen <dinh.nguyen@intel.com>
Subject: Re: [PATCH v4 07/10] net: eth: altera: change tx functions to type netdev_tx_t
Date: Thu, 23 Jul 2020 11:41:11 -0500 [thread overview]
Message-ID: <d7a0caaf-bf28-4b85-c65d-b646e31fcff6@linux.intel.com> (raw)
In-Reply-To: <20200708072401.169150-8-joyce.ooi@intel.com>
On 7/8/20 2:23 AM, Ooi, Joyce wrote:
> From: Dalon Westergreen <dalon.westergreen@linux.intel.com>
>
> Modify all msgdma and sgdma tx_buffer functions to be of type
> netdev_tx_t, and also modify main tx function to be of
> netdev_tx_t type.
>
> Signed-off-by: Dalon Westergreen <dalon.westergreen@linux.intel.com>
> Signed-off-by: Joyce Ooi <joyce.ooi@intel.com>
> ---
> v2: this patch is added in patch version 2
> v3: no change
> v4: no change
> ---
> drivers/net/ethernet/altera/altera_msgdma.c | 5 +++--
> drivers/net/ethernet/altera/altera_msgdma.h | 4 ++--
> drivers/net/ethernet/altera/altera_sgdma.c | 5 +++--
> drivers/net/ethernet/altera/altera_sgdma.h | 4 ++--
> drivers/net/ethernet/altera/altera_tse.h | 4 ++--
> 5 files changed, 12 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/net/ethernet/altera/altera_msgdma.c b/drivers/net/ethernet/altera/altera_msgdma.c
> index ac1efd08267a..ac68151a7f47 100644
> --- a/drivers/net/ethernet/altera/altera_msgdma.c
> +++ b/drivers/net/ethernet/altera/altera_msgdma.c
> @@ -106,7 +106,8 @@ void msgdma_clear_txirq(struct altera_tse_private *priv)
> }
>
> /* return 0 to indicate transmit is pending */
> -int msgdma_tx_buffer(struct altera_tse_private *priv, struct tse_buffer *buffer)
> +netdev_tx_t
> +msgdma_tx_buffer(struct altera_tse_private *priv, struct tse_buffer *buffer)
> {
> csrwr32(lower_32_bits(buffer->dma_addr), priv->tx_dma_desc,
> msgdma_descroffs(read_addr_lo));
> @@ -120,7 +121,7 @@ int msgdma_tx_buffer(struct altera_tse_private *priv, struct tse_buffer *buffer)
> msgdma_descroffs(stride));
> csrwr32(MSGDMA_DESC_CTL_TX_SINGLE, priv->tx_dma_desc,
> msgdma_descroffs(control));
> - return 0;
> + return NETDEV_TX_OK;
> }
>
> u32 msgdma_tx_completions(struct altera_tse_private *priv)
> diff --git a/drivers/net/ethernet/altera/altera_msgdma.h b/drivers/net/ethernet/altera/altera_msgdma.h
> index 23f5b2a13898..d816b24dfa7f 100644
> --- a/drivers/net/ethernet/altera/altera_msgdma.h
> +++ b/drivers/net/ethernet/altera/altera_msgdma.h
> @@ -16,8 +16,8 @@ void msgdma_clear_txirq(struct altera_tse_private *priv);
> u32 msgdma_tx_completions(struct altera_tse_private *priv);
> void msgdma_add_rx_desc(struct altera_tse_private *priv,
> struct tse_buffer *buffer);
> -int msgdma_tx_buffer(struct altera_tse_private *priv,
> - struct tse_buffer *buffer);
> +netdev_tx_t msgdma_tx_buffer(struct altera_tse_private *priv,
> + struct tse_buffer *buffer);
> u32 msgdma_rx_status(struct altera_tse_private *priv);
> int msgdma_initialize(struct altera_tse_private *priv);
> void msgdma_uninitialize(struct altera_tse_private *priv);
> diff --git a/drivers/net/ethernet/altera/altera_sgdma.c b/drivers/net/ethernet/altera/altera_sgdma.c
> index fe6276c7e4a3..6898ec682425 100644
> --- a/drivers/net/ethernet/altera/altera_sgdma.c
> +++ b/drivers/net/ethernet/altera/altera_sgdma.c
> @@ -166,7 +166,8 @@ void sgdma_clear_txirq(struct altera_tse_private *priv)
> * will now actually look at the code, so from now, 0 is good and return
> * NETDEV_TX_BUSY when busy.
> */
> -int sgdma_tx_buffer(struct altera_tse_private *priv, struct tse_buffer *buffer)
> +netdev_tx_t
> +sgdma_tx_buffer(struct altera_tse_private *priv, struct tse_buffer *buffer)
> {
> struct sgdma_descrip __iomem *descbase =
> (struct sgdma_descrip __iomem *)priv->tx_dma_desc;
> @@ -196,7 +197,7 @@ int sgdma_tx_buffer(struct altera_tse_private *priv, struct tse_buffer *buffer)
> /* enqueue the request to the pending transmit queue */
> queue_tx(priv, buffer);
>
> - return 0;
> + return NETDEV_TX_OK;
> }
>
>
> diff --git a/drivers/net/ethernet/altera/altera_sgdma.h b/drivers/net/ethernet/altera/altera_sgdma.h
> index 3fb201417820..6a41833f0965 100644
> --- a/drivers/net/ethernet/altera/altera_sgdma.h
> +++ b/drivers/net/ethernet/altera/altera_sgdma.h
> @@ -13,8 +13,8 @@ void sgdma_disable_rxirq(struct altera_tse_private *priv);
> void sgdma_disable_txirq(struct altera_tse_private *priv);
> void sgdma_clear_rxirq(struct altera_tse_private *priv);
> void sgdma_clear_txirq(struct altera_tse_private *priv);
> -int sgdma_tx_buffer(struct altera_tse_private *priv,
> - struct tse_buffer *buffer);
> +netdev_tx_t sgdma_tx_buffer(struct altera_tse_private *priv,
> + struct tse_buffer *buffer);
> u32 sgdma_tx_completions(struct altera_tse_private *priv);
> void sgdma_add_rx_desc(struct altera_tse_private *priv,
> struct tse_buffer *buffer);
> diff --git a/drivers/net/ethernet/altera/altera_tse.h b/drivers/net/ethernet/altera/altera_tse.h
> index fa24ab3c7d6a..79d02748c89d 100644
> --- a/drivers/net/ethernet/altera/altera_tse.h
> +++ b/drivers/net/ethernet/altera/altera_tse.h
> @@ -392,8 +392,8 @@ struct altera_dmaops {
> void (*disable_rxirq)(struct altera_tse_private *priv);
> void (*clear_txirq)(struct altera_tse_private *priv);
> void (*clear_rxirq)(struct altera_tse_private *priv);
> - int (*tx_buffer)(struct altera_tse_private *priv,
> - struct tse_buffer *buffer);
> + netdev_tx_t (*tx_buffer)(struct altera_tse_private *priv,
> + struct tse_buffer *buffer);
> u32 (*tx_completions)(struct altera_tse_private *priv);
> void (*add_rx_desc)(struct altera_tse_private *priv,
> struct tse_buffer *buffer);
>
Reviewed-by: Thor Thayer <thor.thayer@linux.intel.com>
next prev parent reply other threads:[~2020-07-23 16:41 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-08 7:23 [PATCH v4 00/10] net: eth: altera: tse: Add PTP and mSGDMA prefetcher Ooi, Joyce
2020-07-08 7:23 ` [PATCH v4 01/10] net: eth: altera: tse_start_xmit ignores tx_buffer call response Ooi, Joyce
2020-07-23 16:32 ` Thor Thayer
2020-07-08 7:23 ` [PATCH v4 02/10] net: eth: altera: set rx and tx ring size before init_dma call Ooi, Joyce
2020-07-23 16:33 ` Thor Thayer
2020-07-08 7:23 ` [PATCH v4 03/10] net: eth: altera: fix altera_dmaops declaration Ooi, Joyce
2020-07-23 16:33 ` Thor Thayer
2020-07-08 7:23 ` [PATCH v4 04/10] net: eth: altera: add optional function to start tx dma Ooi, Joyce
2020-07-23 16:35 ` Thor Thayer
2020-07-08 7:23 ` [PATCH v4 05/10] net: eth: altera: Move common functions to altera_utils Ooi, Joyce
2020-07-23 16:39 ` Thor Thayer
2020-07-08 7:23 ` [PATCH v4 06/10] net: eth: altera: Add missing identifier names to function declarations Ooi, Joyce
2020-07-23 16:40 ` Thor Thayer
2020-07-08 7:23 ` [PATCH v4 07/10] net: eth: altera: change tx functions to type netdev_tx_t Ooi, Joyce
2020-07-23 16:41 ` Thor Thayer [this message]
2020-07-08 7:23 ` [PATCH v4 08/10] net: eth: altera: add support for ptp and timestamping Ooi, Joyce
2020-07-09 11:31 ` Richard Cochran
2020-07-15 3:48 ` Ooi, Joyce
2020-07-23 17:05 ` Thor Thayer
2020-07-08 7:24 ` [PATCH v4 09/10] net: eth: altera: add msgdma prefetcher Ooi, Joyce
2020-07-08 17:33 ` David Miller
2020-07-14 14:36 ` Ooi, Joyce
2020-07-08 21:49 ` Jakub Kicinski
2020-07-14 14:35 ` Ooi, Joyce
2020-07-14 15:55 ` Jakub Kicinski
2020-07-14 15:58 ` Westergreen, Dalon
2020-07-14 16:29 ` Jakub Kicinski
2020-07-14 18:51 ` Westergreen, Dalon
2020-07-14 19:13 ` Jakub Kicinski
2020-07-14 20:23 ` David Miller
2020-07-14 23:25 ` Westergreen, Dalon
2020-07-08 7:24 ` [PATCH v4 10/10] net: eth: altera: update devicetree bindings documentation Ooi, Joyce
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d7a0caaf-bf28-4b85-c65d-b646e31fcff6@linux.intel.com \
--to=thor.thayer@linux.intel.com \
--cc=chin.liang.see@intel.com \
--cc=dalon.westergreen@linux.intel.com \
--cc=davem@davemloft.net \
--cc=dinh.nguyen@intel.com \
--cc=joyce.ooi@intel.com \
--cc=kuba@kernel.org \
--cc=ley.foon.tan@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.