Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

sfc: Fix some incorrect or redundant comments

In particular, the comment about EVQ_RPTR_REG is based on inconsistent
preliminary hardware documentation, though the following code was
fixed long before release.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Ben Hutchings and committed by
David S. Miller
754c653a 2291b20f

+7 -15
+2 -2
drivers/net/sfc/ethtool.c
··· 196 196 efx->phy_op->get_settings(efx, ecmd); 197 197 mutex_unlock(&efx->mac_lock); 198 198 199 - /* Falcon GMAC does not support 1000Mbps HD */ 199 + /* GMAC does not support 1000Mbps HD */ 200 200 ecmd->supported &= ~SUPPORTED_1000baseT_Half; 201 201 /* Both MACs support pause frames (bidirectional and respond-only) */ 202 202 ecmd->supported |= SUPPORTED_Pause | SUPPORTED_Asym_Pause; ··· 216 216 struct efx_nic *efx = netdev_priv(net_dev); 217 217 int rc; 218 218 219 - /* Falcon GMAC does not support 1000Mbps HD */ 219 + /* GMAC does not support 1000Mbps HD */ 220 220 if (ecmd->speed == SPEED_1000 && ecmd->duplex != DUPLEX_FULL) { 221 221 EFX_LOG(efx, "rejecting unsupported 1000Mbps HD" 222 222 " setting\n");
+1 -1
drivers/net/sfc/falcon.c
··· 1730 1730 1731 1731 /************************************************************************** 1732 1732 * 1733 - * Revision-dependent attributes used by efx.c 1733 + * Revision-dependent attributes used by efx.c and nic.c 1734 1734 * 1735 1735 ************************************************************************** 1736 1736 */
+4 -8
drivers/net/sfc/net_driver.h
··· 101 101 * Special buffers are used for the event queues and the TX and RX 102 102 * descriptor queues for each channel. They are *not* used for the 103 103 * actual transmit and receive buffers. 104 - * 105 - * Note that for Falcon, TX and RX descriptor queues live in host memory. 106 - * Allocation and freeing procedures must take this into account. 107 104 */ 108 105 struct efx_special_buffer { 109 106 void *addr; ··· 297 300 * @dma_addr: DMA base address of the buffer 298 301 * @len: Buffer length, in bytes 299 302 * 300 - * Falcon uses these buffers for its interrupt status registers and 303 + * The NIC uses these buffers for its interrupt status registers and 301 304 * MAC stats dumps. 302 305 */ 303 306 struct efx_buffer { ··· 671 674 * @irq_status: Interrupt status buffer 672 675 * @last_irq_cpu: Last CPU to handle interrupt. 673 676 * This register is written with the SMP processor ID whenever an 674 - * interrupt is handled. It is used by falcon_test_interrupt() 677 + * interrupt is handled. It is used by efx_nic_test_interrupt() 675 678 * to verify that an interrupt has occurred. 676 679 * @spi_flash: SPI flash device 677 680 * This field will be %NULL if no flash device is present (or for Siena). ··· 720 723 * @loopback_modes: Supported loopback mode bitmask 721 724 * @loopback_selftest: Offline self-test private state 722 725 * 723 - * The @priv field of the corresponding &struct net_device points to 724 - * this. 726 + * This is stored in the private area of the &struct net_device. 725 727 */ 726 728 struct efx_nic { 727 729 char name[IFNAMSIZ]; ··· 993 997 * that the net driver will program into the MAC as the maximum frame 994 998 * length. 995 999 * 996 - * The 10G MAC used in Falcon requires 8-byte alignment on the frame 1000 + * The 10G MAC requires 8-byte alignment on the frame 997 1001 * length, so we round up to the nearest 8. 998 1002 * 999 1003 * Re-clocking by the XGXS on RX can reduce an IPG to 32 bits (half an
-4
drivers/net/sfc/nic.c
··· 623 623 * 624 624 * This writes the EVQ_RPTR_REG register for the specified channel's 625 625 * event queue. 626 - * 627 - * Note that EVQ_RPTR_REG contains the index of the "last read" event, 628 - * whereas channel->eventq_read_ptr contains the index of the "next to 629 - * read" event. 630 626 */ 631 627 void efx_nic_eventq_read_ack(struct efx_channel *channel) 632 628 {