On Fri, 16 Jun 2023 15:14:16 -0700 Justin Chen wrote:
> Add support for the Broadcom ASP 2.0 Ethernet controller which is first
> introduced with 72165. This controller features two distinct Ethernet
> ports that can be independently operated.
First of all - thanks for splitting the patches up.
This one is still a bit big but much better and good enough.
> + /* Probe each interface (Initialization should continue even if
> + * interfaces are unable to come up)
> + */
> + i = 0;
> + for_each_available_child_of_node(ports_node, intf_node) {
> + priv->intfs[i] = bcmasp_interface_create(priv, intf_node, i);
> + i++;
> + }
> +
> + /* Drop the clock reference count now and let ndo_open()/ndo_close()
> + * manage it for us from now on.
> + */
> + bcmasp_core_clock_set(priv, 0, ASP_CTRL_CLOCK_CTRL_ASP_ALL_DISABLE);
> +
> + clk_disable_unprepare(priv->clk);
> +
> + /* Now do the registration of the network ports which will take care
> + * of managing the clock properly.
> + */
> + for (i = 0; i < priv->intf_count; i++) {
> + intf = priv->intfs[i];
> + if (!intf)
> + continue;
> +
> + ret = register_netdev(intf->ndev);
> + if (ret) {
> + netdev_err(intf->ndev,
> + "failed to register net_device: %d\n", ret);
> + bcmasp_interface_destroy(intf, false);
> + continue;
Did you mean to clear the priv->intfs[i] pointer after destroy?
Otherwise remove will try to free it again.
> + }
> + count++;
> + }
> +
> + dev_info(dev, "Initialized %d port(s)\n", count);
> +
> +of_put_exit:
> + of_node_put(ports_node);
> + return ret;
And in case the last register_netdev() fails .probe will return an
error, meaning that .remove will never get called.
Why are you trying to gracefully handle the case where only some ports
were registered? It's error prone, why not fail probe if any netdev
fails to register?
> +}
> +
> +static int bcmasp_remove(struct platform_device *pdev)
> +{
> + struct bcmasp_priv *priv = dev_get_drvdata(&pdev->dev);
> + struct bcmasp_intf *intf;
> + int i;
> +
since .shutdown is defined this callback should probably clear the priv
pointer and check whether priv != NULL before proceeding. It's a bit
unclear whether both .remove and .shutdown may get called for the same
device..
> + for (i = 0; i < priv->intf_count; i++) {
> + intf = priv->intfs[i];
> + if (!intf)
> + continue;
> +
> + bcmasp_interface_destroy(intf, true);
> + }
> +
> + return 0;
> +}
> +MODULE_AUTHOR("Broadcom");
Companies cannot be authors. MODULE_AUTHOR() is not required,
you can drop it if you don't want to put your name there.
> + if (unlikely(skb_headroom(skb) < sizeof(*offload))) {
> + new_skb = skb_realloc_headroom(skb, sizeof(*offload));
That's not right, you can't push to an tx skb just because there's
headroom. Use skb_cow_head().
> + if (tx_spb_ring_full(intf, nr_frags + 1)) {
> + netif_stop_queue(dev);
> + netdev_err(dev, "Tx Ring Full!\n");
rate limit this one, please
> + /* Calculate virt addr by offsetting from physical addr */
> + data = intf->rx_ring_cpu +
> + (DESC_ADDR(desc->buf) - intf->rx_ring_dma);
> +
> + flags = DESC_FLAGS(desc->buf);
> + if (unlikely(flags & (DESC_CRC_ERR | DESC_RX_SYM_ERR))) {
> + netif_err(intf, rx_status, intf->ndev, "flags=0x%llx\n",
> + flags);
ditto
> + u64_stats_update_begin(&stats->syncp);
> + if (flags & DESC_CRC_ERR)
> + u64_stats_inc(&stats->rx_crc_errs);
> + if (flags & DESC_RX_SYM_ERR)
> + u64_stats_inc(&stats->rx_sym_errs);
> + u64_stats_inc(&stats->rx_dropped);
Not right, please see the documentation on struct rtnl_link_stats64
These are errors not drops. Please read that comment and double
check all your stats.
> + u64_stats_update_end(&stats->syncp);
> +
> + goto next;
> + }
> +
> + dma_sync_single_for_cpu(kdev, DESC_ADDR(desc->buf), desc->size,
> + DMA_FROM_DEVICE);
> +
> + len = desc->size;
> +
> + skb = __netdev_alloc_skb(intf->ndev, len,
> + GFP_ATOMIC | __GFP_NOWARN);
maybe napi_alloc_skb()?
> + if (!skb) {
> + u64_stats_update_begin(&stats->syncp);
> + u64_stats_inc(&stats->rx_errors);
> + u64_stats_update_end(&stats->syncp);
> +
> + netif_warn(intf, rx_err, intf->ndev,
> + "SKB alloc failed\n");
error counter is enough for allocations, OOMs are common
> + goto next;
> + }
--
pw-bot: cr
