From patchwork Mon Sep 14 21:01:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Armin Wolf X-Patchwork-Id: 260889 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A366EC433E2 for ; Mon, 14 Sep 2020 21:03:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5795C215A4 for ; Mon, 14 Sep 2020 21:03:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=gmx.net header.i=@gmx.net header.b="c1D1D856" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726074AbgINVDW (ORCPT ); Mon, 14 Sep 2020 17:03:22 -0400 Received: from mout.gmx.net ([212.227.17.21]:54325 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726149AbgINVCH (ORCPT ); Mon, 14 Sep 2020 17:02:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1600117315; bh=B1OYnE8BGzCWscLxjwXCNOerwW8iT8fk8qVgkYJwkoc=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=c1D1D856ZBJBLWViBbuv3wCzMlePFRMPSmt+RUfNfeiR8e6ldVvPgP89kbC/sAcvM HP1nfmckfcgPsGteupre0tM3BA8O6R6UlCmytUZz07QFA6YLn6+w595E0nEehgyTEL bgzsu1pFzUXSp9Te+59447Jf+P9RHdcdp6CeAg9M= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from mx-linux-amd.fritz.box ([79.242.188.32]) by mail.gmx.com (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1Mnpru-1kse5I2NpK-00pJIq; Mon, 14 Sep 2020 23:01:54 +0200 From: Armin Wolf To: davem@davemloft.net Cc: netdev@vger.kernel.org Subject: [PATCH net-next v5 1/6] lib8390: Fix coding style issues and remove version printing Date: Mon, 14 Sep 2020 23:01:23 +0200 Message-Id: <20200914210128.7741-2-W_Armin@gmx.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200914210128.7741-1-W_Armin@gmx.de> References: <20200914210128.7741-1-W_Armin@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:n17zQvoalyXcGfU5PV+pWAN8BlFmhbCGufHkzUXyeI8l95SuOSN 4DW6B89/tGVb61YC1jaHsZGB7QLGRZ/9vzMtlMNmFhQHRUpuifTPYNxuCa3MoPJNVVOgOB7 bCDDxbNEPOKQPSby771sAtF7BHha/NduJSSYqS+3vK1i4AdCp4J5uRZQsv5u7hE5d/Jgyga K6XYR6Uw9hpPqY4Z4/mlA== X-UI-Out-Filterresults: notjunk:1; V03:K0:YFfhNY29uFc=:cfhtX2srkqfaryNPyTQR1r g244qcPt7Fa1/v8+LsSl29fEK+JZN2fTMqCpozqk5k7XJIE6TKrd4AQ3tPDvu/ncafaDtFwPc LdaBHdvgl+8AlucuuWF0HFp7efPr9scD8KjW2SSclEtQIy12MXByBZyssKuxlBX1E34LibH4s 0k85/Zg7apX4vBtTUN2gYBHFR5QFfZJkaRbU64QDqQcz+xf3IvranvwBWyGyUnUAAA4Tmxeb8 v968Av7RuZDWl7SYbq1PWyhNsUCXBn+wqauyns923dIvgVzC7RUv6lCG2POlbfAnmluF2kfn/ /P/ALropvgOQb2oq1wahBETggc4i5yhsbIOnHF8vacJLRsA1HVDN4+5xCzsh8C7nWrUi+Rv8I jKs+qK+VzptBJjDPm4NRY8ELEOEOjpcwlZM3VwMhnw3S7zpYSPGo1snidqNzZy3H543cxFQ/2 5oc9abP3EXT0wADsGuc8cy/SQtjrYmlQgkyJgSdQMot0mCC8To1W4fhOXCoETp+jpZPrCpXwC 5GreRYrgunTKmClb6W1Yd8gFddzW38/BW43Jvx3RJP7G8jKAZTWmsrUCuLZxTQp0LYC0UbiMd KdrzghAyFWmPuOqfbgda+c3F1+CaF+jSk16Q+joA3jICglkyyvM7ld6cP0cCYvLLR3khzUctU plIWveflykZZ8frcnKQdk/KyJaBTroHeR/5Rw8eVk+G1FdOEulOqyjvi8Tpx35kzslNq73WNz X5iRzJIVw6kSEZHX8WtngS89g4NHhNE+cVBTZPWhmehb5qLN1Ts6DJNxy1F3kgcNRMtcwlm9d a9xC1YSWKP0RgdTfo7bEaxwJ1CZitARnh4VeOPOIMGGI7rP54vnzWolLOw2bwLYytPH4lPCVp RzFZBYdBM6JogE1TYetGJkzHHffxuHoup+b/TiijxuCMOUXqZr00ksO4lNP9HTqSbJW8HCHvI Jjt2oksEiYU+xZK/zsTN4WAPDa2soZWVqgzCXE5+k3CLCOkFxY975lV/Ut/n2CCdSFGS5dolM 1yUAAR8SsIWL0KKD7WMICm22NbOhHXtIVxdXiYrRObDNRfpn3APJHgqBZ7xgeEgTF9dZJlwVS l5QRbrfVgN3zfgLfng7ffnhNP+gxyXAM9vN/wT1vG8enoHnSV8OsGTrzXrgA6avUvuQP8j356 mrsS1Dqdf8gpbFTcLBNRGCRbol/45eJULHzi/Fb3NFuqYvn42ybUZUHB5fUC+M9f8ZsRvzQ3P n1NKXO5T/4BAURZ9B Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix various checkpatch warnings. Remove version printing so modules including lib8390 do not have to provide a global version string for successful compilation. Signed-off-by: Armin Wolf --- drivers/net/ethernet/8390/lib8390.c | 402 +++++++++++++--------------- 1 file changed, 186 insertions(+), 216 deletions(-) -- 2.20.1 diff --git a/drivers/net/ethernet/8390/lib8390.c b/drivers/net/ethernet/8390/lib8390.c index 1f48d7f6365c..3a2b1e33a47a 100644 --- a/drivers/net/ethernet/8390/lib8390.c +++ b/drivers/net/ethernet/8390/lib8390.c @@ -1,54 +1,51 @@ -/* 8390.c: A general NS8390 ethernet driver core for linux. */ -/* - Written 1992-94 by Donald Becker. - - Copyright 1993 United States Government as represented by the - Director, National Security Agency. - - This software may be used and distributed according to the terms - of the GNU General Public License, incorporated herein by reference. - - The author may be reached as becker@scyld.com, or C/O - Scyld Computing Corporation - 410 Severn Ave., Suite 210 - Annapolis MD 21403 - - - This is the chip-specific code for many 8390-based ethernet adaptors. - This is not a complete driver, it must be combined with board-specific - code such as ne.c, wd.c, 3c503.c, etc. - - Seeing how at least eight drivers use this code, (not counting the - PCMCIA ones either) it is easy to break some card by what seems like - a simple innocent change. Please contact me or Donald if you think - you have found something that needs changing. -- PG - - - Changelog: - - Paul Gortmaker : remove set_bit lock, other cleanups. - Paul Gortmaker : add ei_get_8390_hdr() so we can pass skb's to - ei_block_input() for eth_io_copy_and_sum(). - Paul Gortmaker : exchange static int ei_pingpong for a #define, - also add better Tx error handling. - Paul Gortmaker : rewrite Rx overrun handling as per NS specs. - Alexey Kuznetsov : use the 8390's six bit hash multicast filter. - Paul Gortmaker : tweak ANK's above multicast changes a bit. - Paul Gortmaker : update packet statistics for v2.1.x - Alan Cox : support arbitrary stupid port mappings on the - 68K Macintosh. Support >16bit I/O spaces - Paul Gortmaker : add kmod support for auto-loading of the 8390 - module by all drivers that require it. - Alan Cox : Spinlocking work, added 'BUG_83C690' - Paul Gortmaker : Separate out Tx timeout code from Tx path. - Paul Gortmaker : Remove old unused single Tx buffer code. - Hayato Fujiwara : Add m32r support. - Paul Gortmaker : use skb_padto() instead of stack scratch area - - Sources: - The National Semiconductor LAN Databook, and the 3Com 3c503 databook. - - */ +/* lib8390.c: A general NS8390 ethernet driver core for linux. */ +/* Written 1992-94 by Donald Becker. + * + * Copyright 1993 United States Government as represented by the + * Director, National Security Agency. + * + * This software may be used and distributed according to the terms + * of the GNU General Public License, incorporated herein by reference. + * + * The author may be reached as becker@scyld.com, or C/O + * Scyld Computing Corporation + * 410 Severn Ave., Suite 210 + * Annapolis MD 21403 + * + * This is the chip-specific code for many 8390-based ethernet adaptors. + * This is not a complete driver, it must be combined with board-specific + * code such as ne.c, wd.c, 3c503.c, etc. + * + * Seeing how at least eight drivers use this code, (not counting the + * PCMCIA ones either) it is easy to break some card by what seems like + * a simple innocent change. Please contact me or Donald if you think + * you have found something that needs changing. -- PG + */ + +/* Changelog: + * + * Paul Gortmaker : remove set_bit lock, other cleanups. + * Paul Gortmaker : add ei_get_8390_hdr() so we can pass skb's to + * ei_block_input() for eth_io_copy_and_sum(). + * Paul Gortmaker : exchange static int ei_pingpong for a #define, + * also add better Tx error handling. + * Paul Gortmaker : rewrite Rx overrun handling as per NS specs. + * Alexey Kuznetsov : use the 8390's six bit hash multicast filter. + * Paul Gortmaker : tweak ANK's above multicast changes a bit. + * Paul Gortmaker : update packet statistics for v2.1.x + * Alan Cox : support arbitrary stupid port mappings on the + * 68K Macintosh. Support >16bit I/O spaces + * Paul Gortmaker : add kmod support for auto-loading of the 8390 + * module by all drivers that require it. + * Alan Cox : Spinlocking work, added 'BUG_83C690' + * Paul Gortmaker : Separate out Tx timeout code from Tx path. + * Paul Gortmaker : Remove old unused single Tx buffer code. + * Hayato Fujiwara : Add m32r support. + * Paul Gortmaker : use skb_padto() instead of stack scratch area + * + * Sources: + * The National Semiconductor LAN Databook, and the 3Com 3c503 databook. + */ #include #include @@ -77,23 +74,25 @@ #define BUG_83C690 /* These are the operational function interfaces to board-specific - routines. - void reset_8390(struct net_device *dev) - Resets the board associated with DEV, including a hardware reset of - the 8390. This is only called when there is a transmit timeout, and - it is always followed by 8390_init(). - void block_output(struct net_device *dev, int count, const unsigned char *buf, - int start_page) - Write the COUNT bytes of BUF to the packet buffer at START_PAGE. The - "page" value uses the 8390's 256-byte pages. - void get_8390_hdr(struct net_device *dev, struct e8390_hdr *hdr, int ring_page) - Read the 4 byte, page aligned 8390 header. *If* there is a - subsequent read, it will be of the rest of the packet. - void block_input(struct net_device *dev, int count, struct sk_buff *skb, int ring_offset) - Read COUNT bytes from the packet buffer into the skb data area. Start - reading from RING_OFFSET, the address as the 8390 sees it. This will always - follow the read of the 8390 header. -*/ + * routines. + * void reset_8390(struct net_device *dev) + * Resets the board associated with DEV, including a hardware reset + * of the 8390. This is only called when there is a transmit + * timeout, and it is always followed by 8390_init(). + * void block_output(struct net_device *dev, int count, + * const unsigned char *buf, int start_page) + * Write the COUNT bytes of BUF to the packet buffer at START_PAGE. + * The "page" value uses the 8390's 256-byte pages. + * void get_8390_hdr(struct net_device *dev, struct e8390_hdr *hdr, + * int ring_page) + * Read the 4 byte, page aligned 8390 header. *If* there is a + * subsequent read, it will be of the rest of the packet. + * void block_input(struct net_device *dev, int count, + * struct sk_buff *skb, int ring_offset) + * Read COUNT bytes from the packet buffer into the skb data area. + * Start reading from RING_OFFSET, the address as the 8390 sees it. + * This will always follow the read of the 8390 header. + */ #define ei_reset_8390 (ei_local->reset_8390) #define ei_block_output (ei_local->block_output) #define ei_block_input (ei_local->block_input) @@ -106,18 +105,16 @@ static void ei_receive(struct net_device *dev); static void ei_rx_overrun(struct net_device *dev); /* Routines generic to NS8390-based boards. */ -static void NS8390_trigger_send(struct net_device *dev, unsigned int length, - int start_page); +static void NS8390_trigger_send(struct net_device *dev, unsigned int length, int start_page); static void do_set_multicast_list(struct net_device *dev); static void __NS8390_init(struct net_device *dev, int startp); -static unsigned version_printed; static u32 msg_enable; + module_param(msg_enable, uint, 0444); MODULE_PARM_DESC(msg_enable, "Debug message level (see linux/netdevice.h for bitmap)"); -/* - * SMP and the 8390 setup. +/* SMP and the 8390 setup. * * The 8390 isn't exactly designed to be multithreaded on RX/TX. There is * a page register that controls bank and packet buffer access. We guard @@ -188,8 +185,6 @@ MODULE_PARM_DESC(msg_enable, "Debug message level (see linux/netdevice.h for bit * activities on the chip." [lkml, 25 Jul 2007] */ - - /** * ei_open - Open/initialize the board. * @dev: network device to initialize @@ -206,15 +201,15 @@ static int __ei_open(struct net_device *dev) if (dev->watchdog_timeo <= 0) dev->watchdog_timeo = TX_TIMEOUT; - /* - * Grab the page lock so we own the register set, then call + /* Grab the page lock so we own the register set, then call * the init function. */ spin_lock_irqsave(&ei_local->page_lock, flags); __NS8390_init(dev, 1); /* Set the flag before we drop the lock, That way the IRQ arrives - after its set and we get no silly warnings */ + * after its set and we get no silly warnings + */ netif_start_queue(dev); spin_unlock_irqrestore(&ei_local->page_lock, flags); ei_local->irqlock = 0; @@ -232,9 +227,7 @@ static int __ei_close(struct net_device *dev) struct ei_device *ei_local = netdev_priv(dev); unsigned long flags; - /* - * Hold the page lock during close - */ + /* Hold the page lock during close */ spin_lock_irqsave(&ei_local->page_lock, flags); __NS8390_init(dev, 0); @@ -261,8 +254,8 @@ static void __ei_tx_timeout(struct net_device *dev, unsigned int txqueue) dev->stats.tx_errors++; spin_lock_irqsave(&ei_local->page_lock, flags); - txsr = ei_inb(e8390_base+EN0_TSR); - isr = ei_inb(e8390_base+EN0_ISR); + txsr = ei_inb(e8390_base + EN0_TSR); + isr = ei_inb(e8390_base + EN0_ISR); spin_unlock_irqrestore(&ei_local->page_lock, flags); netdev_dbg(dev, "Tx timed out, %s TSR=%#2x, ISR=%#2x, t=%d\n", @@ -308,25 +301,24 @@ static netdev_tx_t __ei_start_xmit(struct sk_buff *skb, char *data = skb->data; if (skb->len < ETH_ZLEN) { - memset(buf, 0, ETH_ZLEN); /* more efficient than doing just the needed bits */ + /* More efficient than doing just the needed bits */ + memset(buf, 0, ETH_ZLEN); memcpy(buf, data, skb->len); send_length = ETH_ZLEN; data = buf; } /* Mask interrupts from the ethercard. - SMP: We have to grab the lock here otherwise the IRQ handler - on another CPU can flip window and race the IRQ mask set. We end - up trashing the mcast filter not disabling irqs if we don't lock */ + * SMP: We have to grab the lock here otherwise the IRQ handler + * on another CPU can flip window and race the IRQ mask set. We end + * up trashing the mcast filter not disabling irqs if we don't lock. + */ spin_lock_irqsave(&ei_local->page_lock, flags); ei_outb_p(0x00, e8390_base + EN0_IMR); spin_unlock_irqrestore(&ei_local->page_lock, flags); - - /* - * Slow phase with lock held. - */ + /* Slow phase with lock held. */ disable_irq_nosync_lockdep_irqsave(dev->irq, &flags); @@ -334,8 +326,7 @@ static netdev_tx_t __ei_start_xmit(struct sk_buff *skb, ei_local->irqlock = 1; - /* - * We have two Tx slots available for use. Find the first free + /* We have two Tx slots available for use. Find the first free * slot, and then perform some sanity checks. With two Tx bufs, * you get very close to transmitting back-to-back packets. With * only one Tx buf, the transmitter sits idle while you reload the @@ -347,18 +338,16 @@ static netdev_tx_t __ei_start_xmit(struct sk_buff *skb, ei_local->tx1 = send_length; if ((netif_msg_tx_queued(ei_local)) && ei_local->tx2 > 0) - netdev_dbg(dev, - "idle transmitter tx2=%d, lasttx=%d, txing=%d\n", + netdev_dbg(dev, "idle transmitter tx2=%d, lasttx=%d, txing=%d\n", ei_local->tx2, ei_local->lasttx, ei_local->txing); } else if (ei_local->tx2 == 0) { - output_page = ei_local->tx_start_page + TX_PAGES/2; + output_page = ei_local->tx_start_page + TX_PAGES / 2; ei_local->tx2 = send_length; if ((netif_msg_tx_queued(ei_local)) && ei_local->tx1 > 0) - netdev_dbg(dev, - "idle transmitter, tx1=%d, lasttx=%d, txing=%d\n", + netdev_dbg(dev, "idle transmitter, tx1=%d, lasttx=%d, txing=%d\n", ei_local->tx1, ei_local->lasttx, ei_local->txing); - } else { /* We should never get here. */ + } else { /* We should never get here. */ netif_dbg(ei_local, tx_err, dev, "No Tx buffers free! tx1=%d tx2=%d last=%d\n", ei_local->tx1, ei_local->tx2, ei_local->lasttx); @@ -371,8 +360,7 @@ static netdev_tx_t __ei_start_xmit(struct sk_buff *skb, return NETDEV_TX_BUSY; } - /* - * Okay, now upload the packet and trigger a send if the transmitter + /* Okay, now upload the packet and trigger a send if the transmitter * isn't already sending. If it is busy, the interrupt handler will * trigger the send later, upon receiving a Tx done interrupt. */ @@ -389,8 +377,9 @@ static netdev_tx_t __ei_start_xmit(struct sk_buff *skb, ei_local->tx2 = -1; ei_local->lasttx = -2; } - } else + } else { ei_local->txqueue++; + } if (ei_local->tx1 && ei_local->tx2) netif_stop_queue(dev); @@ -429,15 +418,12 @@ static irqreturn_t __ei_interrupt(int irq, void *dev_id) int interrupts, nr_serviced = 0; struct ei_device *ei_local = netdev_priv(dev); - /* - * Protect the irq test too. - */ + /* Protect the irq test too. */ spin_lock(&ei_local->page_lock); if (ei_local->irqlock) { - /* - * This might just be an interrupt for a PCI device sharing + /* This might just be an interrupt for a PCI device sharing * this line */ netdev_err(dev, "Interrupted while interrupts are masked! isr=%#2x imr=%#2x\n", @@ -448,7 +434,7 @@ static irqreturn_t __ei_interrupt(int irq, void *dev_id) } /* Change to page 0 and read the intr status reg. */ - ei_outb_p(E8390_NODMA+E8390_PAGE0, e8390_base + E8390_CMD); + ei_outb_p(E8390_NODMA + E8390_PAGE0, e8390_base + E8390_CMD); netif_dbg(ei_local, intr, dev, "interrupt(isr=%#2.2x)\n", ei_inb_p(e8390_base + EN0_ISR)); @@ -462,9 +448,9 @@ static irqreturn_t __ei_interrupt(int irq, void *dev_id) interrupts = 0; break; } - if (interrupts & ENISR_OVER) + if (interrupts & ENISR_OVER) { ei_rx_overrun(dev); - else if (interrupts & (ENISR_RX+ENISR_RX_ERR)) { + } else if (interrupts & (ENISR_RX + ENISR_RX_ERR)) { /* Got a good (?) packet. */ ei_receive(dev); } @@ -485,11 +471,11 @@ static irqreturn_t __ei_interrupt(int irq, void *dev_id) if (interrupts & ENISR_RDC) ei_outb_p(ENISR_RDC, e8390_base + EN0_ISR); - ei_outb_p(E8390_NODMA+E8390_PAGE0+E8390_START, e8390_base + E8390_CMD); + ei_outb_p(E8390_NODMA + E8390_PAGE0 + E8390_START, e8390_base + E8390_CMD); } if (interrupts && (netif_msg_intr(ei_local))) { - ei_outb_p(E8390_NODMA+E8390_PAGE0+E8390_START, e8390_base + E8390_CMD); + ei_outb_p(E8390_NODMA + E8390_PAGE0 + E8390_START, e8390_base + E8390_CMD); if (nr_serviced >= MAX_SERVICE) { /* 0xFF is valid for a card removal */ if (interrupts != 0xFF) @@ -552,10 +538,9 @@ static void ei_tx_err(struct net_device *dev) #endif ei_outb_p(ENISR_TX_ERR, e8390_base + EN0_ISR); /* Ack intr. */ - - if (tx_was_aborted) + if (tx_was_aborted) { ei_tx_intr(dev); - else { + } else { dev->stats.tx_errors++; if (txsr & ENTSR_CRS) dev->stats.tx_carrier_errors++; @@ -582,8 +567,7 @@ static void ei_tx_intr(struct net_device *dev) ei_outb_p(ENISR_TX, e8390_base + EN0_ISR); /* Ack intr. */ - /* - * There are two Tx buffers, see which one finished, and trigger + /* There are two Tx buffers, see which one finished, and trigger * the send of another one if it exists. */ ei_local->txqueue--; @@ -618,17 +602,17 @@ static void ei_tx_intr(struct net_device *dev) ei_local->lasttx = 10; ei_local->txing = 0; } - } /* else - netdev_warn(dev, "unexpected TX-done interrupt, lasttx=%d\n", - ei_local->lasttx); -*/ + } + /* else + * netdev_warn(dev, "unexpected TX-done interrupt, lasttx=%d\n", ei_local->lasttx); + */ /* Minimize Tx latency: update the statistics after we restart TXing. */ if (status & ENTSR_COL) dev->stats.collisions++; - if (status & ENTSR_PTX) + if (status & ENTSR_PTX) { dev->stats.tx_packets++; - else { + } else { dev->stats.tx_errors++; if (status & ENTSR_ABT) { dev->stats.tx_aborted_errors++; @@ -662,26 +646,28 @@ static void ei_receive(struct net_device *dev) unsigned short current_offset; int rx_pkt_count = 0; struct e8390_pkt_hdr rx_frame; - int num_rx_pages = ei_local->stop_page-ei_local->rx_start_page; + int num_rx_pages = ei_local->stop_page - ei_local->rx_start_page; while (++rx_pkt_count < 10) { int pkt_len, pkt_stat; /* Get the rx page (incoming packet pointer). */ - ei_outb_p(E8390_NODMA+E8390_PAGE1, e8390_base + E8390_CMD); + ei_outb_p(E8390_NODMA + E8390_PAGE1, e8390_base + E8390_CMD); rxing_page = ei_inb_p(e8390_base + EN1_CURPAG); - ei_outb_p(E8390_NODMA+E8390_PAGE0, e8390_base + E8390_CMD); + ei_outb_p(E8390_NODMA + E8390_PAGE0, e8390_base + E8390_CMD); - /* Remove one frame from the ring. Boundary is always a page behind. */ + /* Remove one frame from the ring. Boundary is always a page behind. + */ this_frame = ei_inb_p(e8390_base + EN0_BOUNDARY) + 1; if (this_frame >= ei_local->stop_page) this_frame = ei_local->rx_start_page; - /* Someday we'll omit the previous, iff we never get this message. - (There is at least one clone claimed to have a problem.) - - Keep quiet if it looks like a card removal. One problem here - is that some clones crash in roughly the same way. + /* Someday we'll omit the previous, if we never get + * this message. (There is at least one clone claimed + * to have a problem.) + * + * Keep quiet if it looks like a card removal. One problem + * here is that some clones crash in roughly the same way. */ if ((netif_msg_rx_status(ei_local)) && this_frame != ei_local->current_page && @@ -699,17 +685,18 @@ static void ei_receive(struct net_device *dev) pkt_len = rx_frame.count - sizeof(struct e8390_pkt_hdr); pkt_stat = rx_frame.status; - next_frame = this_frame + 1 + ((pkt_len+4)>>8); + next_frame = this_frame + 1 + ((pkt_len + 4) >> 8); - /* Check for bogosity warned by 3c503 book: the status byte is never - written. This happened a lot during testing! This code should be - cleaned up someday. */ + /* Check for bogosity warned by 3c503 book: the status byte is + * never written. This happened a lot during testing! This code + * should be cleaned up someday. + */ if (rx_frame.next != next_frame && rx_frame.next != next_frame + 1 && rx_frame.next != next_frame - num_rx_pages && rx_frame.next != next_frame + 1 - num_rx_pages) { ei_local->current_page = rxing_page; - ei_outb(ei_local->current_page-1, e8390_base+EN0_BOUNDARY); + ei_outb(ei_local->current_page - 1, e8390_base + EN0_BOUNDARY); dev->stats.rx_errors++; continue; } @@ -725,24 +712,21 @@ static void ei_receive(struct net_device *dev) struct sk_buff *skb; skb = netdev_alloc_skb(dev, pkt_len + 2); - if (skb == NULL) { - netif_err(ei_local, rx_err, dev, - "Couldn't allocate a sk_buff of size %d\n", - pkt_len); + if (!skb) { dev->stats.rx_dropped++; break; - } else { - skb_reserve(skb, 2); /* IP headers on 16 byte boundaries */ - skb_put(skb, pkt_len); /* Make room */ - ei_block_input(dev, pkt_len, skb, current_offset + sizeof(rx_frame)); - skb->protocol = eth_type_trans(skb, dev); - if (!skb_defer_rx_timestamp(skb)) - netif_rx(skb); - dev->stats.rx_packets++; - dev->stats.rx_bytes += pkt_len; - if (pkt_stat & ENRSR_PHY) - dev->stats.multicast++; } + /* IP headers on 16 byte boundaries */ + skb_reserve(skb, 2); + skb_put(skb, pkt_len); /* Make room */ + ei_block_input(dev, pkt_len, skb, current_offset + sizeof(rx_frame)); + skb->protocol = eth_type_trans(skb, dev); + if (!skb_defer_rx_timestamp(skb)) + netif_rx(skb); + dev->stats.rx_packets++; + dev->stats.rx_bytes += pkt_len; + if (pkt_stat & ENRSR_PHY) + dev->stats.multicast++; } else { netif_err(ei_local, rx_err, dev, "bogus packet: status=%#2x nxpg=%#2x size=%d\n", @@ -762,12 +746,13 @@ static void ei_receive(struct net_device *dev) next_frame = ei_local->rx_start_page; } ei_local->current_page = next_frame; - ei_outb_p(next_frame-1, e8390_base+EN0_BOUNDARY); + ei_outb_p(next_frame - 1, e8390_base + EN0_BOUNDARY); } /* We used to also ack ENISR_OVER here, but that would sometimes mask - a real overrun, leaving the 8390 in a stopped state with rec'vr off. */ - ei_outb_p(ENISR_RX+ENISR_RX_ERR, e8390_base+EN0_ISR); + * a real overrun, leaving the 8390 in a stopped state with rec'vr off. + */ + ei_outb_p(ENISR_RX + ENISR_RX_ERR, e8390_base + EN0_ISR); } /** @@ -790,18 +775,16 @@ static void ei_rx_overrun(struct net_device *dev) /* ei_local is used on some platforms via the EI_SHIFT macro */ struct ei_device *ei_local __maybe_unused = netdev_priv(dev); - /* - * Record whether a Tx was in progress and then issue the + /* Record whether a Tx was in progress and then issue the * stop command. */ - was_txing = ei_inb_p(e8390_base+E8390_CMD) & E8390_TRANS; - ei_outb_p(E8390_NODMA+E8390_PAGE0+E8390_STOP, e8390_base+E8390_CMD); + was_txing = ei_inb_p(e8390_base + E8390_CMD) & E8390_TRANS; + ei_outb_p(E8390_NODMA + E8390_PAGE0 + E8390_STOP, e8390_base + E8390_CMD); netif_dbg(ei_local, rx_err, dev, "Receiver overrun\n"); dev->stats.rx_over_errors++; - /* - * Wait a full Tx time (1.2ms) + some guard time, NS says 1.6ms total. + /* Wait a full Tx time (1.2ms) + some guard time, NS says 1.6ms total. * Early datasheets said to poll the reset bit, but now they say that * it "is not a reliable indicator and subsequently should be ignored." * We wait at least 10ms. @@ -809,47 +792,42 @@ static void ei_rx_overrun(struct net_device *dev) mdelay(10); - /* - * Reset RBCR[01] back to zero as per magic incantation. - */ - ei_outb_p(0x00, e8390_base+EN0_RCNTLO); - ei_outb_p(0x00, e8390_base+EN0_RCNTHI); + /* Reset RBCR[01] back to zero as per magic incantation. */ + ei_outb_p(0x00, e8390_base + EN0_RCNTLO); + ei_outb_p(0x00, e8390_base + EN0_RCNTHI); - /* - * See if any Tx was interrupted or not. According to NS, this + /* See if any Tx was interrupted or not. According to NS, this * step is vital, and skipping it will cause no end of havoc. */ if (was_txing) { - unsigned char tx_completed = ei_inb_p(e8390_base+EN0_ISR) & (ENISR_TX+ENISR_TX_ERR); + unsigned char tx_completed = ei_inb_p(e8390_base + EN0_ISR) & (ENISR_TX + ENISR_TX_ERR); + if (!tx_completed) must_resend = 1; } - /* - * Have to enter loopback mode and then restart the NIC before + /* Have to enter loopback mode and then restart the NIC before * you are allowed to slurp packets up off the ring. */ + ei_outb_p(E8390_TXOFF, e8390_base + EN0_TXCR); ei_outb_p(E8390_NODMA + E8390_PAGE0 + E8390_START, e8390_base + E8390_CMD); - /* - * Clear the Rx ring of all the debris, and ack the interrupt. - */ + /* Clear the Rx ring of all the debris, and ack the interrupt. */ + ei_receive(dev); - ei_outb_p(ENISR_OVER, e8390_base+EN0_ISR); + ei_outb_p(ENISR_OVER, e8390_base + EN0_ISR); + + /* Leave loopback mode, and resend any packet that got stopped */ - /* - * Leave loopback mode, and resend any packet that got stopped. - */ ei_outb_p(E8390_TXCONFIG, e8390_base + EN0_TXCR); if (must_resend) - ei_outb_p(E8390_NODMA + E8390_PAGE0 + E8390_START + E8390_TRANS, e8390_base + E8390_CMD); + ei_outb_p(E8390_NODMA + E8390_PAGE0 + E8390_START + E8390_TRANS, + e8390_base + E8390_CMD); } -/* - * Collect the stats. This is called unlocked and from several contexts. - */ +/* Collect the stats. This is called unlocked and from several contexts. */ static struct net_device_stats *__ei_get_stats(struct net_device *dev) { @@ -871,8 +849,7 @@ static struct net_device_stats *__ei_get_stats(struct net_device *dev) return &dev->stats; } -/* - * Form the 64 bit 8390 multicast table from the linked list of addresses +/* Form the 64 bit 8390 multicast table from the linked list of addresses * associated with this dev structure. */ @@ -882,11 +859,10 @@ static inline void make_mc_bits(u8 *bits, struct net_device *dev) netdev_for_each_mc_addr(ha, dev) { u32 crc = ether_crc(ETH_ALEN, ha->addr); - /* - * The 8390 uses the 6 most significant bits of the + /* The 8390 uses the 6 most significant bits of the * CRC to index the multicast table. */ - bits[crc>>29] |= (1<<((crc>>26)&7)); + bits[crc >> 29] |= (1 << ((crc >> 26) & 7)); } } @@ -904,15 +880,15 @@ static void do_set_multicast_list(struct net_device *dev) int i; struct ei_device *ei_local = netdev_priv(dev); - if (!(dev->flags&(IFF_PROMISC|IFF_ALLMULTI))) { + if (!(dev->flags & (IFF_PROMISC | IFF_ALLMULTI))) { memset(ei_local->mcfilter, 0, 8); if (!netdev_mc_empty(dev)) make_mc_bits(ei_local->mcfilter, dev); - } else + } else { memset(ei_local->mcfilter, 0xFF, 8); /* mcast set to accept-all */ + } - /* - * DP8390 manuals don't specify any magic sequence for altering + /* DP8390 manuals don't specify any magic sequence for altering * the multicast regs on an already running card. To be safe, we * ensure multicast mode is off prior to loading up the new hash * table. If this proves to be not enough, we can always resort @@ -931,13 +907,12 @@ static void do_set_multicast_list(struct net_device *dev) ei_outb_p(ei_local->mcfilter[i], e8390_base + EN1_MULT_SHIFT(i)); #ifndef BUG_83C690 if (ei_inb_p(e8390_base + EN1_MULT_SHIFT(i)) != ei_local->mcfilter[i]) - netdev_err(dev, "Multicast filter read/write mismap %d\n", - i); + netdev_err(dev, "Multicast filter read/write mismap %d\n", i); #endif } ei_outb_p(E8390_NODMA + E8390_PAGE0, e8390_base + E8390_CMD); - if (dev->flags&IFF_PROMISC) + if (dev->flags & IFF_PROMISC) ei_outb_p(E8390_RXCONFIG | 0x18, e8390_base + EN0_RXCR); else if (dev->flags & IFF_ALLMULTI || !netdev_mc_empty(dev)) ei_outb_p(E8390_RXCONFIG | 0x08, e8390_base + EN0_RXCR); @@ -945,8 +920,7 @@ static void do_set_multicast_list(struct net_device *dev) ei_outb_p(E8390_RXCONFIG, e8390_base + EN0_RXCR); } -/* - * Called without lock held. This is invoked from user context and may +/* Called without lock held. This is invoked from user context and may * be parallel to just about everything else. Its also fairly quick and * not called too often. Must protect against both bh and irq users */ @@ -973,9 +947,6 @@ static void ethdev_setup(struct net_device *dev) { struct ei_device *ei_local = netdev_priv(dev); - if ((msg_enable & NETIF_MSG_DRV) && (version_printed++ == 0)) - pr_info("%s", version); - ether_setup(dev); spin_lock_init(&ei_local->page_lock); @@ -995,9 +966,6 @@ static struct net_device *____alloc_ei_netdev(int size) NET_NAME_UNKNOWN, ethdev_setup); } - - - /* This page of functions should be 8390 generic */ /* Follow National Semi's recommendations for initializing the "NIC". */ @@ -1021,7 +989,7 @@ static void __NS8390_init(struct net_device *dev, int startp) if (sizeof(struct e8390_pkt_hdr) != 4) panic("8390.c: header struct mispacked\n"); /* Follow National Semi's recommendations for initing the DP83902. */ - ei_outb_p(E8390_NODMA+E8390_PAGE0+E8390_STOP, e8390_base+E8390_CMD); /* 0x21 */ + ei_outb_p(E8390_NODMA + E8390_PAGE0 + E8390_STOP, e8390_base + E8390_CMD); /* 0x21 */ ei_outb_p(endcfg, e8390_base + EN0_DCFG); /* 0x48 or 0x49 */ /* Clear the remote byte count registers. */ ei_outb_p(0x00, e8390_base + EN0_RCNTLO); @@ -1031,9 +999,10 @@ static void __NS8390_init(struct net_device *dev, int startp) ei_outb_p(E8390_TXOFF, e8390_base + EN0_TXCR); /* 0x02 */ /* Set the transmit page and receive ring. */ ei_outb_p(ei_local->tx_start_page, e8390_base + EN0_TPSR); - ei_local->tx1 = ei_local->tx2 = 0; + ei_local->tx1 = 0; + ei_local->tx2 = 0; ei_outb_p(ei_local->rx_start_page, e8390_base + EN0_STARTPG); - ei_outb_p(ei_local->stop_page-1, e8390_base + EN0_BOUNDARY); /* 3c503 says 0x3f,NS0x26*/ + ei_outb_p(ei_local->stop_page - 1, e8390_base + EN0_BOUNDARY); /* 3c503 says 0x3f,NS0x26*/ ei_local->current_page = ei_local->rx_start_page; /* assert boundary+1 */ ei_outb_p(ei_local->stop_page, e8390_base + EN0_STOPPG); /* Clear the pending interrupts and mask. */ @@ -1042,25 +1011,26 @@ static void __NS8390_init(struct net_device *dev, int startp) /* Copy the station address into the DS8390 registers. */ - ei_outb_p(E8390_NODMA + E8390_PAGE1 + E8390_STOP, e8390_base+E8390_CMD); /* 0x61 */ + ei_outb_p(E8390_NODMA + E8390_PAGE1 + E8390_STOP, e8390_base + E8390_CMD); /* 0x61 */ for (i = 0; i < 6; i++) { ei_outb_p(dev->dev_addr[i], e8390_base + EN1_PHYS_SHIFT(i)); - if ((netif_msg_probe(ei_local)) && - ei_inb_p(e8390_base + EN1_PHYS_SHIFT(i)) != dev->dev_addr[i]) + if ((netif_msg_probe(ei_local)) && ei_inb_p(e8390_base + + EN1_PHYS_SHIFT(i)) != dev->dev_addr[i]) netdev_err(dev, "Hw. address read/write mismap %d\n", i); } ei_outb_p(ei_local->rx_start_page, e8390_base + EN1_CURPAG); - ei_outb_p(E8390_NODMA+E8390_PAGE0+E8390_STOP, e8390_base+E8390_CMD); + ei_outb_p(E8390_NODMA + E8390_PAGE0 + E8390_STOP, e8390_base + E8390_CMD); - ei_local->tx1 = ei_local->tx2 = 0; + ei_local->tx1 = 0; + ei_local->tx2 = 0; ei_local->txing = 0; if (startp) { ei_outb_p(0xff, e8390_base + EN0_ISR); ei_outb_p(ENISR_ALL, e8390_base + EN0_IMR); - ei_outb_p(E8390_NODMA+E8390_PAGE0+E8390_START, e8390_base+E8390_CMD); + ei_outb_p(E8390_NODMA + E8390_PAGE0 + E8390_START, e8390_base + E8390_CMD); ei_outb_p(E8390_TXCONFIG, e8390_base + EN0_TXCR); /* xmit on. */ /* 3c503 TechMan says rxconfig only after the NIC is started. */ ei_outb_p(E8390_RXCONFIG, e8390_base + EN0_RXCR); /* rx on, */ @@ -1069,15 +1039,15 @@ static void __NS8390_init(struct net_device *dev, int startp) } /* Trigger a transmit start, assuming the length is valid. - Always called with the page lock held */ + * Always called with the page lock held. + */ -static void NS8390_trigger_send(struct net_device *dev, unsigned int length, - int start_page) +static void NS8390_trigger_send(struct net_device *dev, unsigned int length, int start_page) { unsigned long e8390_base = dev->base_addr; struct ei_device *ei_local __attribute((unused)) = netdev_priv(dev); - ei_outb_p(E8390_NODMA+E8390_PAGE0, e8390_base+E8390_CMD); + ei_outb_p(E8390_NODMA + E8390_PAGE0, e8390_base + E8390_CMD); if (ei_inb_p(e8390_base + E8390_CMD) & E8390_TRANS) { netdev_warn(dev, "trigger_send() called with the transmitter busy\n"); @@ -1086,5 +1056,5 @@ static void NS8390_trigger_send(struct net_device *dev, unsigned int length, ei_outb_p(length & 0xff, e8390_base + EN0_TCNTLO); ei_outb_p(length >> 8, e8390_base + EN0_TCNTHI); ei_outb_p(start_page, e8390_base + EN0_TPSR); - ei_outb_p(E8390_NODMA+E8390_TRANS+E8390_START, e8390_base+E8390_CMD); + ei_outb_p(E8390_NODMA + E8390_TRANS + E8390_START, e8390_base + E8390_CMD); }