From: Andrew Lunn <andrew@lunn•ch>
To: Igor Russkikh <Igor.Russkikh@aquantia•com>
Cc: "netdev@vger•kernel.org" <netdev@vger•kernel.org>,
"davem@davemloft•net" <davem@davemloft•net>,
"richardcochran@gmail•com" <richardcochran@gmail•com>,
Egor Pomozov <Egor.Pomozov@aquantia•com>,
Dmitry Bezrukov <Dmitry.Bezrukov@aquantia•com>,
Simon Edelhaus <sedelhaus@marvell•com>,
Sergey Samoilenko <Sergey.Samoilenko@aquantia•com>
Subject: Re: [PATCH v2 net-next 04/12] net: aquantia: add PTP rings infrastructure
Date: Mon, 14 Oct 2019 18:14:51 +0200 [thread overview]
Message-ID: <20191014161451.GM21165@lunn.ch> (raw)
In-Reply-To: <eea16e6e4fe987819dca72304b92b8b921c65286.1570531332.git.igor.russkikh@aquantia.com>
> @@ -978,7 +992,9 @@ void aq_nic_deinit(struct aq_nic_s *self)
> self->aq_vecs > i; ++i, aq_vec = self->aq_vec[i])
> aq_vec_deinit(aq_vec);
>
> + aq_ptp_ring_deinit(self);
> aq_ptp_unregister(self);
> + aq_ptp_ring_free(self);
> aq_ptp_free(self);
Is this order safe? Seems like you should first unregister, and then
deinit?
> +int aq_ptp_ring_init(struct aq_nic_s *aq_nic)
> +{
> + struct aq_ptp_s *aq_ptp = aq_nic->aq_ptp;
> + int err = 0;
> +
> + if (!aq_ptp)
> + return 0;
> +
> + err = aq_ring_init(&aq_ptp->ptp_tx);
> + if (err < 0)
> + goto err_exit;
> + err = aq_nic->aq_hw_ops->hw_ring_tx_init(aq_nic->aq_hw,
> + &aq_ptp->ptp_tx,
> + &aq_ptp->ptp_ring_param);
> + if (err < 0)
> + goto err_exit;
> +
> + err = aq_ring_init(&aq_ptp->ptp_rx);
> + if (err < 0)
> + goto err_exit;
> + err = aq_nic->aq_hw_ops->hw_ring_rx_init(aq_nic->aq_hw,
> + &aq_ptp->ptp_rx,
> + &aq_ptp->ptp_ring_param);
> + if (err < 0)
> + goto err_exit;
> +
> + err = aq_ring_rx_fill(&aq_ptp->ptp_rx);
> + if (err < 0)
> + goto err_exit;
> + err = aq_nic->aq_hw_ops->hw_ring_rx_fill(aq_nic->aq_hw,
> + &aq_ptp->ptp_rx,
> + 0U);
> + if (err < 0)
> + goto err_exit;
> +
> + err = aq_ring_init(&aq_ptp->hwts_rx);
> + if (err < 0)
> + goto err_exit;
> + err = aq_nic->aq_hw_ops->hw_ring_rx_init(aq_nic->aq_hw,
> + &aq_ptp->hwts_rx,
> + &aq_ptp->ptp_ring_param);
> +
> +err_exit:
> + return err;
Maybe there should be some undoing going on here. If you filled the rx
ring, do you need to empty it on error?
> +}
> +
> +int aq_ptp_ring_start(struct aq_nic_s *aq_nic)
> +{
> + struct aq_ptp_s *aq_ptp = aq_nic->aq_ptp;
> + int err = 0;
> +
> + if (!aq_ptp)
> + return 0;
> +
> + err = aq_nic->aq_hw_ops->hw_ring_tx_start(aq_nic->aq_hw, &aq_ptp->ptp_tx);
> + if (err < 0)
> + goto err_exit;
> +
> + err = aq_nic->aq_hw_ops->hw_ring_rx_start(aq_nic->aq_hw, &aq_ptp->ptp_rx);
> + if (err < 0)
> + goto err_exit;
> +
> + err = aq_nic->aq_hw_ops->hw_ring_rx_start(aq_nic->aq_hw,
> + &aq_ptp->hwts_rx);
> + if (err < 0)
> + goto err_exit;
> +
> +err_exit:
Do you need to stop the rings which started, before the error
happened?
> + return err;
> +}
> +
> +int aq_ptp_ring_alloc(struct aq_nic_s *aq_nic)
> +{
> + struct aq_ptp_s *aq_ptp = aq_nic->aq_ptp;
> + unsigned int tx_ring_idx, rx_ring_idx;
> + struct aq_ring_s *hwts = 0;
> + u32 tx_tc_mode, rx_tc_mode;
> + struct aq_ring_s *ring;
> + int err;
> +
> + if (!aq_ptp)
> + return 0;
> +
> + /* Index must to be 8 (8 TCs) or 16 (4 TCs).
> + * It depends from Traffic Class mode.
> + */
> + aq_nic->aq_hw_ops->hw_tx_tc_mode_get(aq_nic->aq_hw, &tx_tc_mode);
> + if (tx_tc_mode == 0)
> + tx_ring_idx = PTP_8TC_RING_IDX;
> + else
> + tx_ring_idx = PTP_4TC_RING_IDX;
> +
> + ring = aq_ring_tx_alloc(&aq_ptp->ptp_tx, aq_nic,
> + tx_ring_idx, &aq_nic->aq_nic_cfg);
> + if (!ring) {
> + err = -ENOMEM;
> + goto err_exit_1;
> + }
> +
> + aq_nic->aq_hw_ops->hw_rx_tc_mode_get(aq_nic->aq_hw, &rx_tc_mode);
> + if (rx_tc_mode == 0)
> + rx_ring_idx = PTP_8TC_RING_IDX;
> + else
> + rx_ring_idx = PTP_4TC_RING_IDX;
> +
> + ring = aq_ring_rx_alloc(&aq_ptp->ptp_rx, aq_nic,
> + rx_ring_idx, &aq_nic->aq_nic_cfg);
> + if (!ring) {
> + err = -ENOMEM;
> + goto err_exit_2;
> + }
> +
> + hwts = aq_ring_hwts_rx_alloc(&aq_ptp->hwts_rx, aq_nic, PTP_HWST_RING_IDX,
> + aq_nic->aq_nic_cfg.rxds,
> + aq_nic->aq_nic_cfg.aq_hw_caps->rxd_size);
> + if (!hwts) {
> + err = -ENOMEM;
> + goto err_exit_3;
> + }
> +
> + err = aq_ptp_skb_ring_init(&aq_ptp->skb_ring, aq_nic->aq_nic_cfg.rxds);
> + if (err != 0) {
> + err = -ENOMEM;
> + goto err_exit_4;
> + }
> +
> + return 0;
> +
> +err_exit_4:
> + aq_ring_free(&aq_ptp->hwts_rx);
> +err_exit_3:
> + aq_ring_free(&aq_ptp->ptp_rx);
> +err_exit_2:
> + aq_ring_free(&aq_ptp->ptp_tx);
> +err_exit_1:
> + return err;
Not very descriptive names. err_exit_hwts_rx, err_exit_ptp_rx, etc?
> +struct aq_ring_s *
> +aq_ring_hwts_rx_alloc(struct aq_ring_s *self, struct aq_nic_s *aq_nic,
> + unsigned int idx, unsigned int size, unsigned int dx_size)
> +{
> + struct device *dev = aq_nic_get_dev(aq_nic);
> + int err = 0;
> + size_t sz = size * dx_size + AQ_CFG_RXDS_DEF;
> +
> + memset(self, 0, sizeof(*self));
> +
> + self->aq_nic = aq_nic;
> + self->idx = idx;
> + self->size = size;
> + self->dx_size = dx_size;
More self. Why not ring? I suppose because the rest of this file is
using the unhelpful self?
> +
> + self->dx_ring = dma_alloc_coherent(dev, sz, &self->dx_ring_pa,
> + GFP_KERNEL);
> + if (!self->dx_ring) {
> + err = -ENOMEM;
> + goto err_exit;
> + }
> +
> +err_exit:
> + if (err < 0) {
> + aq_ring_free(self);
> + return NULL;
return ERR_PTR(err)?
> + }
> +
> + return self;
And this code structure seem odd. Why not.
+ self->dx_ring = dma_alloc_coherent(dev, sz, &self->dx_ring_pa,
+ GFP_KERNEL);
+ if (!self->dx_ring) {
+ err = -ENOMEM;
+ goto err_exit;
+ }
+
+ return self;
+
+err_exit:
+ aq_ring_free(self);
+ return ERR_PTR(err)?
> +}
Andrew
next prev parent reply other threads:[~2019-10-14 16:14 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-08 10:56 [PATCH v2 net-next 00/12] net: aquantia: PTP support for AQC devices Igor Russkikh
2019-10-08 10:56 ` [PATCH v2 net-next 01/12] net: aquantia: PTP skeleton declarations and callbacks Igor Russkikh
2019-10-12 18:49 ` Richard Cochran
2019-10-12 18:56 ` Richard Cochran
2019-10-08 10:56 ` [PATCH v2 net-next 02/12] net: aquantia: unify styling of bit enums Igor Russkikh
2019-10-14 15:50 ` Andrew Lunn
2019-10-08 10:56 ` [PATCH v2 net-next 03/12] net: aquantia: add basic ptp_clock callbacks Igor Russkikh
2019-10-12 19:02 ` Richard Cochran
2019-10-14 11:43 ` Igor Russkikh
2019-10-08 10:56 ` [PATCH v2 net-next 04/12] net: aquantia: add PTP rings infrastructure Igor Russkikh
2019-10-14 16:14 ` Andrew Lunn [this message]
2019-10-15 9:02 ` Igor Russkikh
2019-10-08 10:56 ` [PATCH v2 net-next 05/12] net: aquantia: styling fixes on ptp related functions Igor Russkikh
2019-10-14 16:16 ` Andrew Lunn
2019-10-08 10:56 ` [PATCH v2 net-next 06/12] net: aquantia: implement data PTP datapath Igor Russkikh
2019-10-14 16:36 ` Andrew Lunn
2019-10-15 9:09 ` Igor Russkikh
2019-10-08 10:56 ` [PATCH v2 net-next 07/12] net: aquantia: rx filters for ptp Igor Russkikh
2019-10-08 10:56 ` [PATCH v2 net-next 08/12] net: aquantia: add support for ptp ioctls Igor Russkikh
2019-10-14 16:23 ` Andrew Lunn
2019-10-15 9:06 ` Igor Russkikh
2019-10-08 10:56 ` [PATCH v2 net-next 09/12] net: aquantia: implement get_ts_info ethtool Igor Russkikh
2019-10-12 19:07 ` Richard Cochran
2019-10-14 11:45 ` Igor Russkikh
2019-10-08 10:56 ` [PATCH v2 net-next 10/12] net: aquantia: add support for Phy access Igor Russkikh
2019-10-15 12:19 ` Andrew Lunn
2019-10-16 13:12 ` Igor Russkikh
2019-10-16 19:38 ` Andrew Lunn
2019-10-08 10:56 ` [PATCH v2 net-next 11/12] net: aquantia: add support for PIN funcs Igor Russkikh
2019-10-12 19:25 ` Richard Cochran
2019-10-15 12:35 ` Andrew Lunn
2019-10-08 10:57 ` [PATCH v2 net-next 12/12] net: aquantia: adding atlantic ptp maintainer Igor Russkikh
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=20191014161451.GM21165@lunn.ch \
--to=andrew@lunn$(echo .)ch \
--cc=Dmitry.Bezrukov@aquantia$(echo .)com \
--cc=Egor.Pomozov@aquantia$(echo .)com \
--cc=Igor.Russkikh@aquantia$(echo .)com \
--cc=Sergey.Samoilenko@aquantia$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=netdev@vger$(echo .)kernel.org \
--cc=richardcochran@gmail$(echo .)com \
--cc=sedelhaus@marvell$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox