* [PATCH] net: eth: realtek: atp: checkpatch errors and warnings corrected
@ 2014-11-03 18:24 Roberto Medina
2014-11-03 18:51 ` Joe Perches
0 siblings, 1 reply; 5+ messages in thread
From: Roberto Medina @ 2014-11-03 18:24 UTC (permalink / raw)
To: netdev; +Cc: linux-kernel, Roberto Medina
From: Roberto Medina <robertoxmed@gmail.com>
Several warnings and errors corrected using checkpatch.
Some warnings like "line over 80" are still present.
Before the patch:
total: 16 errors, 155 warnings, 38 checks, 883 lines checked
With the patch:
total: 0 errors, 64 warnings, 24 checks, 905 lines checked
Compile tested.
Signed-off-by: Roberto Medina <robertoxmed@gmail.com>
---
drivers/net/ethernet/realtek/atp.c | 470 +++++++++++++++++++------------------
1 file changed, 246 insertions(+), 224 deletions(-)
diff --git a/drivers/net/ethernet/realtek/atp.c b/drivers/net/ethernet/realtek/atp.c
index d77d60e..8291260 100644
--- a/drivers/net/ethernet/realtek/atp.c
+++ b/drivers/net/ethernet/realtek/atp.c
@@ -1,43 +1,42 @@
/* atp.c: Attached (pocket) ethernet adapter driver for linux. */
-/*
- This is a driver for commonly OEM pocket (parallel port)
- ethernet adapters based on the Realtek RTL8002 and RTL8012 chips.
-
- Written 1993-2000 by Donald Becker.
-
- This software may be used and distributed according to the terms of
- the GNU General Public License (GPL), incorporated herein by reference.
- Drivers based on or derived from this code fall under the GPL and must
- retain the authorship, copyright and license notice. This file is not
- a complete program and may only be used when the entire operating
- system is licensed under the GPL.
-
- Copyright 1993 United States Government as represented by the Director,
- National Security Agency. Copyright 1994-2000 retained by the original
- author, Donald Becker. The timer-based reset code was supplied in 1995
- by Bill Carlson, wwc@super.org.
-
- The author may be reached as becker@scyld.com, or C/O
- Scyld Computing Corporation
- 410 Severn Ave., Suite 210
- Annapolis MD 21403
-
- Support information and updates available at
- http://www.scyld.com/network/atp.html
-
-
- Modular support/softnet added by Alan Cox.
- _bit abuse fixed up by Alan Cox
-
-*/
+/* This is a driver for commonly OEM pocket (parallel port)
+ * ethernet adapters based on the Realtek RTL8002 and RTL8012 chips.
+ *
+ * Written 1993-2000 by Donald Becker.
+ *
+ * This software may be used and distributed according to the terms of
+ * the GNU General Public License (GPL), incorporated herein by reference.
+ * Drivers based on or derived from this code fall under the GPL and must
+ * retain the authorship, copyright and license notice. This file is not
+ * a complete program and may only be used when the entire operating
+ * system is licensed under the GPL.
+ *
+ * Copyright 1993 United States Government as represented by the Director,
+ * National Security Agency. Copyright 1994-2000 retained by the original
+ * author, Donald Becker. The timer-based reset code was supplied in 1995
+ * by Bill Carlson, wwc@super.org.
+ *
+ * The author may be reached as becker@scyld.com, or C/O
+ * Scyld Computing Corporation
+ * 410 Severn Ave., Suite 210
+ * Annapolis MD 21403
+ *
+ * Support information and updates available at
+ * http://www.scyld.com/network/atp.html
+ *
+ * Modular support/softnet added by Alan Cox.
+ * _bit abuse fixed up by Alan Cox
+ *
+ */
static const char version[] =
"atp.c:v1.09=ac 2002/10/01 Donald Becker <becker@scyld.com>\n";
/* The user-configurable values.
- These may be modified when a driver module is loaded.*/
+ * These may be modified when a driver module is loaded.
+ */
-static int debug = 1; /* 1 normal messages, 0 quiet .. 7 verbose. */
+static int debug = 1; /* 1 normal messages, 0 quiet .. 7 verbose. */
#define net_debug debug
/* Maximum events (Rx packets, etc.) to handle at each interrupt. */
@@ -47,80 +46,79 @@ static int max_interrupt_work = 15;
/* The standard set of ISA module parameters. */
static int io[NUM_UNITS];
static int irq[NUM_UNITS];
-static int xcvr[NUM_UNITS]; /* The data transfer mode. */
+static int xcvr[NUM_UNITS]; /* The data transfer mode. */
/* Operational parameters that are set at compile time. */
/* Time in jiffies before concluding the transmitter is hung. */
#define TX_TIMEOUT (400*HZ/1000)
-/*
- This file is a device driver for the RealTek (aka AT-Lan-Tec) pocket
- ethernet adapter. This is a common low-cost OEM pocket ethernet
- adapter, sold under many names.
-
- Sources:
- This driver was written from the packet driver assembly code provided by
- Vincent Bono of AT-Lan-Tec. Ever try to figure out how a complicated
- device works just from the assembly code? It ain't pretty. The following
- description is written based on guesses and writing lots of special-purpose
- code to test my theorized operation.
-
- In 1997 Realtek made available the documentation for the second generation
- RTL8012 chip, which has lead to several driver improvements.
- http://www.realtek.com.tw/
-
- Theory of Operation
-
- The RTL8002 adapter seems to be built around a custom spin of the SEEQ
- controller core. It probably has a 16K or 64K internal packet buffer, of
- which the first 4K is devoted to transmit and the rest to receive.
- The controller maintains the queue of received packet and the packet buffer
- access pointer internally, with only 'reset to beginning' and 'skip to next
- packet' commands visible. The transmit packet queue holds two (or more?)
- packets: both 'retransmit this packet' (due to collision) and 'transmit next
- packet' commands must be started by hand.
-
- The station address is stored in a standard bit-serial EEPROM which must be
- read (ughh) by the device driver. (Provisions have been made for
- substituting a 74S288 PROM, but I haven't gotten reports of any models
- using it.) Unlike built-in devices, a pocket adapter can temporarily lose
- power without indication to the device driver. The major effect is that
- the station address, receive filter (promiscuous, etc.) and transceiver
- must be reset.
-
- The controller itself has 16 registers, some of which use only the lower
- bits. The registers are read and written 4 bits at a time. The four bit
- register address is presented on the data lines along with a few additional
- timing and control bits. The data is then read from status port or written
- to the data port.
-
- Correction: the controller has two banks of 16 registers. The second
- bank contains only the multicast filter table (now used) and the EEPROM
- access registers.
-
- Since the bulk data transfer of the actual packets through the slow
- parallel port dominates the driver's running time, four distinct data
- (non-register) transfer modes are provided by the adapter, two in each
- direction. In the first mode timing for the nibble transfers is
- provided through the data port. In the second mode the same timing is
- provided through the control port. In either case the data is read from
- the status port and written to the data port, just as it is accessing
- registers.
-
- In addition to the basic data transfer methods, several more are modes are
- created by adding some delay by doing multiple reads of the data to allow
- it to stabilize. This delay seems to be needed on most machines.
-
- The data transfer mode is stored in the 'dev->if_port' field. Its default
- value is '4'. It may be overridden at boot-time using the third parameter
- to the "ether=..." initialization.
-
- The header file <atp.h> provides inline functions that encapsulate the
- register and data access methods. These functions are hand-tuned to
- generate reasonable object code. This header file also documents my
- interpretations of the device registers.
-*/
+/* This file is a device driver for the RealTek (aka AT-Lan-Tec) pocket
+ * ethernet adapter. This is a common low-cost OEM pocket ethernet
+ * adapter, sold under many names.
+ *
+ * Sources:
+ * This driver was written from the packet driver assembly code provided by
+ * Vincent Bono of AT-Lan-Tec. Ever try to figure out how a complicated
+ * device works just from the assembly code? It ain't pretty. The following
+ * description is written based on guesses and writing lots of special-purpose
+ * code to test my theorized operation.
+ *
+ * In 1997 Realtek made available the documentation for the second generation
+ * RTL8012 chip, which has lead to several driver improvements.
+ * http://www.realtek.com.tw/
+ *
+ * Theory of Operation
+ *
+ * The RTL8002 adapter seems to be built around a custom spin of the SEEQ
+ * controller core. It probably has a 16K or 64K internal packet buffer, of
+ * which the first 4K is devoted to transmit and the rest to receive.
+ * The controller maintains the queue of received packet and the packet buffer
+ * access pointer internally, with only 'reset to beginning' and 'skip to next
+ * packet' commands visible. The transmit packet queue holds two (or more?)
+ * packets: both 'retransmit this packet' (due to collision) and 'transmit next
+ * packet' commands must be started by hand.
+ *
+ * The station address is stored in a standard bit-serial EEPROM which must be
+ * read (ughh) by the device driver. (Provisions have been made for
+ * substituting a 74S288 PROM, but I haven't gotten reports of any models
+ * using it.) Unlike built-in devices, a pocket adapter can temporarily lose
+ * power without indication to the device driver. The major effect is that
+ * the station address, receive filter (promiscuous, etc.) and transceiver
+ * must be reset.
+ *
+ * The controller itself has 16 registers, some of which use only the lower
+ * bits. The registers are read and written 4 bits at a time. The four bit
+ * register address is presented on the data lines along with a few additional
+ * timing and control bits. The data is then read from status port or written
+ * to the data port.
+ *
+ * Correction: the controller has two banks of 16 registers. The second
+ * bank contains only the multicast filter table (now used) and the EEPROM
+ * access registers.
+ *
+ * Since the bulk data transfer of the actual packets through the slow
+ * parallel port dominates the driver's running time, four distinct data
+ * (non-register) transfer modes are provided by the adapter, two in each
+ * direction. In the first mode timing for the nibble transfers is
+ * provided through the data port. In the second mode the same timing is
+ * provided through the control port. In either case the data is read from
+ * the status port and written to the data port, just as it is accessing
+ * registers.
+ *
+ * In addition to the basic data transfer methods, several more are modes are
+ * created by adding some delay by doing multiple reads of the data to allow
+ * it to stabilize. This delay seems to be needed on most machines.
+ *
+ * The data transfer mode is stored in the 'dev->if_port' field. Its default
+ * value is '4'. It may be overridden at boot-time using the third parameter
+ * to the "ether=..." initialization.
+ *
+ * The header file <atp.h> provides inline functions that encapsulate the
+ * register and data access methods. These functions are hand-tuned to
+ * generate reasonable object code. This header file also documents my
+ * interpretations of the device registers.
+ */
#include <linux/kernel.h>
#include <linux/module.h>
@@ -140,7 +138,7 @@ static int xcvr[NUM_UNITS]; /* The data transfer mode. */
#include <linux/delay.h>
#include <linux/bitops.h>
-#include <asm/io.h>
+#include <linux/io.h>
#include <asm/dma.h>
#include "atp.h"
@@ -167,20 +165,21 @@ MODULE_PARM_DESC(xcvr, "ATP transceiver(s) (0=internal, 1=external)");
static char mux_8012[] = { 0xff, 0xf7, 0xff, 0xfb, 0xf3, 0xfb, 0xff, 0xf7,};
struct net_local {
- spinlock_t lock;
- struct net_device *next_module;
- struct timer_list timer; /* Media selection timer. */
- long last_rx_time; /* Last Rx, in jiffies, to handle Rx hang. */
- int saved_tx_size;
- unsigned int tx_unit_busy:1;
- unsigned char re_tx, /* Number of packet retransmissions. */
- addr_mode, /* Current Rx filter e.g. promiscuous, etc. */
+ spinlock_t lock;
+ struct net_device *next_module;
+ struct timer_list timer; /* Media selection timer. */
+ long last_rx_time; /* Last Rx, in jiffies, to handle Rx hang. */
+ int saved_tx_size;
+ unsigned int tx_unit_busy:1;
+ unsigned char re_tx, /* Number of packet retransmissions. */
+ addr_mode, /* Current Rx filter e.g. promiscuous, etc. */
pac_cnt_in_tx_buf;
};
/* This code, written by wwc@super.org, resets the adapter every
- TIMED_CHECKER ticks. This recovers from an unknown error which
- hangs the device. */
+ * TIMED_CHECKER ticks. This recovers from an unknown error which
+ * hangs the device.
+ */
#define TIMED_CHECKER (HZ/4)
#ifdef TIMED_CHECKER
#include <linux/timer.h>
@@ -194,41 +193,43 @@ static void get_node_ID(struct net_device *dev);
static unsigned short eeprom_op(long ioaddr, unsigned int cmd);
static int net_open(struct net_device *dev);
static void hardware_init(struct net_device *dev);
-static void write_packet(long ioaddr, int length, unsigned char *packet, int pad, int mode);
+static void write_packet(long ioaddr, int length, unsigned char *packet,
+ int pad, int mode);
static void trigger_send(long ioaddr, int length);
static netdev_tx_t atp_send_packet(struct sk_buff *skb,
struct net_device *dev);
static irqreturn_t atp_interrupt(int irq, void *dev_id);
static void net_rx(struct net_device *dev);
-static void read_block(long ioaddr, int length, unsigned char *buffer, int data_mode);
+static void read_block(long ioaddr, int length, unsigned char *buffer,
+ int data_mode);
static int net_close(struct net_device *dev);
static void set_rx_mode(struct net_device *dev);
static void tx_timeout(struct net_device *dev);
-
/* A list of all installed ATP devices, for removing the driver module. */
static struct net_device *root_atp_dev;
/* Check for a network adapter of this type, and return '0' iff one exists.
- If dev->base_addr == 0, probe all likely locations.
- If dev->base_addr == 1, always return failure.
- If dev->base_addr == 2, allocate space for the device and return success
- (detachable devices only).
-
- FIXME: we should use the parport layer for this
- */
+ * If dev->base_addr == 0, probe all likely locations.
+ * If dev->base_addr == 1, always return failure.
+ * If dev->base_addr == 2, allocate space for the device and return success
+ * (detachable devices only).
+ *
+ * FIXME: we should use the parport layer for this
+ */
static int __init atp_init(void)
{
int *port, ports[] = {0x378, 0x278, 0x3bc, 0};
int base_addr = io[0];
- if (base_addr > 0x1ff) /* Check a single specified location. */
+ if (base_addr > 0x1ff) /* Check a single specified location. */
return atp_probe1(base_addr);
else if (base_addr == 1) /* Don't probe at all. */
return -ENXIO;
for (port = ports; *port; port++) {
long ioaddr = *port;
+
outb(0x57, ioaddr + PAR_DATA);
if (inb(ioaddr + PAR_DATA) != 0x57)
continue;
@@ -246,7 +247,7 @@ static const struct net_device_ops atp_netdev_ops = {
.ndo_set_rx_mode = set_rx_mode,
.ndo_tx_timeout = tx_timeout,
.ndo_change_mtu = eth_change_mtu,
- .ndo_set_mac_address = eth_mac_addr,
+ .ndo_set_mac_address = eth_mac_addr,
.ndo_validate_addr = eth_validate_addr,
};
@@ -259,7 +260,8 @@ static int __init atp_probe1(long ioaddr)
outb(0xff, ioaddr + PAR_DATA);
/* Save the original value of the Control register, in case we guessed
- wrong. */
+ * wrong.
+ */
saved_ctrl_reg = inb(ioaddr + PAR_CONTROL);
if (net_debug > 3)
printk("atp: Control register was %#2.2x.\n", saved_ctrl_reg);
@@ -330,8 +332,7 @@ static int __init atp_probe1(long ioaddr)
printk(KERN_INFO "%s", version);
#endif
- printk(KERN_NOTICE "%s: Pocket adapter found at %#3lx, IRQ %d, "
- "SAPROM %pM.\n",
+ printk(KERN_NOTICE "%s: Pocket adapter found at %#3lx, IRQ %d, SAPROM %pM.\n",
dev->name, dev->base_addr, dev->irq, dev->dev_addr);
/* Reset the ethernet hardware and activate the printer pass-through. */
@@ -349,7 +350,7 @@ static int __init atp_probe1(long ioaddr)
if (dev->mem_end & 0xf)
net_debug = dev->mem_end & 7;
- dev->netdev_ops = &atp_netdev_ops;
+ dev->netdev_ops = &atp_netdev_ops;
dev->watchdog_timeo = TX_TIMEOUT;
res = register_netdev(dev);
@@ -374,7 +375,8 @@ static void __init get_node_ID(struct net_device *dev)
write_reg(ioaddr, CMR2, CMR2_EEPROM); /* Point to the EEPROM control registers. */
/* Some adapters have the station address at offset 15 instead of offset
- zero. Check for it, and fix it if needed. */
+ * zero. Check for it, and fix it if needed.
+ */
if (eeprom_op(ioaddr, EE_READ(0)) == 0xffff)
sa_offset = 15;
@@ -385,9 +387,8 @@ static void __init get_node_ID(struct net_device *dev)
write_reg(ioaddr, CMR2, CMR2_NULL);
}
-/*
- An EEPROM read command starts by shifting out 0x60+address, and then
- shifting in the serial data. See the NatSemi databook for details.
+/* An EEPROM read command starts by shifting out 0x60+address, and then
+ * shifting in the serial data. See the NatSemi databook for details.
* ________________
* CS : __|
* ___ ___
@@ -404,6 +405,7 @@ static unsigned short __init eeprom_op(long ioaddr, u32 cmd)
while (--num_bits >= 0) {
char outval = (cmd & (1<<num_bits)) ? EE_DATA_WRITE : 0;
+
write_reg_high(ioaddr, PROM_CMD, outval | EE_CLK_LOW);
write_reg_high(ioaddr, PROM_CMD, outval | EE_CLK_HIGH);
eedata_out <<= 1;
@@ -414,25 +416,25 @@ static unsigned short __init eeprom_op(long ioaddr, u32 cmd)
return eedata_out;
}
-
/* Open/initialize the board. This is called (in the current kernel)
- sometime after booting when the 'ifconfig' program is run.
-
- This routine sets everything up anew at each open, even
- registers that "should" only need to be set once at boot, so that
- there is non-reboot way to recover if something goes wrong.
-
- This is an attachable device: if there is no private entry then it wasn't
- probed for at boot-time, and we need to probe for it again.
- */
+ * sometime after booting when the 'ifconfig' program is run.
+ *
+ * This routine sets everything up anew at each open, even
+ * registers that "should" only need to be set once at boot, so that
+ * there is non-reboot way to recover if something goes wrong.
+ *
+ * This is an attachable device: if there is no private entry then it wasn't
+ * probed for at boot-time, and we need to probe for it again.
+ */
static int net_open(struct net_device *dev)
{
struct net_local *lp = netdev_priv(dev);
int ret;
/* The interrupt line is turned off (tri-stated) when the device isn't in
- use. That's especially important for "attached" interfaces where the
- port or interrupt may be shared. */
+ * use. That's especially important for "attached" interfaces where the
+ * port or interrupt may be shared.
+ */
ret = request_irq(dev->irq, atp_interrupt, 0, dev->name, dev);
if (ret)
return ret;
@@ -450,40 +452,41 @@ static int net_open(struct net_device *dev)
}
/* This routine resets the hardware. We initialize everything, assuming that
- the hardware may have been temporarily detached. */
+ * the hardware may have been temporarily detached.
+ */
static void hardware_init(struct net_device *dev)
{
struct net_local *lp = netdev_priv(dev);
long ioaddr = dev->base_addr;
- int i;
+ int i;
/* Turn off the printer multiplexer on the 8012. */
for (i = 0; i < 8; i++)
outb(mux_8012[i], ioaddr + PAR_DATA);
write_reg_high(ioaddr, CMR1, CMR1h_RESET);
- for (i = 0; i < 6; i++)
+ for (i = 0; i < 6; i++)
write_reg_byte(ioaddr, PAR0 + i, dev->dev_addr[i]);
write_reg_high(ioaddr, CMR2, lp->addr_mode);
if (net_debug > 2) {
printk(KERN_DEBUG "%s: Reset: current Rx mode %d.\n", dev->name,
- (read_nibble(ioaddr, CMR2_h) >> 3) & 0x0f);
+ (read_nibble(ioaddr, CMR2_h) >> 3) & 0x0f);
}
- write_reg(ioaddr, CMR2, CMR2_IRQOUT);
- write_reg_high(ioaddr, CMR1, CMR1h_RxENABLE | CMR1h_TxENABLE);
+ write_reg(ioaddr, CMR2, CMR2_IRQOUT);
+ write_reg_high(ioaddr, CMR1, CMR1h_RxENABLE | CMR1h_TxENABLE);
/* Enable the interrupt line from the serial port. */
outb(Ctrl_SelData + Ctrl_IRQEN, ioaddr + PAR_CONTROL);
/* Unmask the interesting interrupts. */
- write_reg(ioaddr, IMR, ISR_RxOK | ISR_TxErr | ISR_TxOK);
- write_reg_high(ioaddr, IMR, ISRh_RxErr);
+ write_reg(ioaddr, IMR, ISR_RxOK | ISR_TxErr | ISR_TxOK);
+ write_reg_high(ioaddr, IMR, ISRh_RxErr);
lp->tx_unit_busy = 0;
- lp->pac_cnt_in_tx_buf = 0;
+ lp->pac_cnt_in_tx_buf = 0;
lp->saved_tx_size = 0;
}
@@ -496,23 +499,22 @@ static void trigger_send(long ioaddr, int length)
static void write_packet(long ioaddr, int length, unsigned char *packet, int pad_len, int data_mode)
{
- if (length & 1)
- {
- length++;
- pad_len++;
- }
-
- outb(EOC+MAR, ioaddr + PAR_DATA);
- if ((data_mode & 1) == 0) {
+ if (length & 1) {
+ length++;
+ pad_len++;
+ }
+
+ outb(EOC+MAR, ioaddr + PAR_DATA);
+ if ((data_mode & 1) == 0) {
/* Write the packet out, starting with the write addr. */
outb(WrAddr+MAR, ioaddr + PAR_DATA);
do {
write_byte_mode0(ioaddr, *packet++);
- } while (--length > pad_len) ;
+ } while (--length > pad_len);
do {
write_byte_mode0(ioaddr, 0);
- } while (--length > 0) ;
- } else {
+ } while (--length > 0);
+ } else {
/* Write the packet out in slow mode. */
unsigned char outbyte = *packet++;
@@ -528,10 +530,10 @@ static void write_packet(long ioaddr, int length, unsigned char *packet, int pad
write_byte_mode1(ioaddr, *packet++);
while (--length > 0)
write_byte_mode1(ioaddr, 0);
- }
- /* Terminate the Tx frame. End of write: ECB. */
- outb(0xff, ioaddr + PAR_DATA);
- outb(Ctrl_HNibWrite | Ctrl_SelData | Ctrl_IRQEN, ioaddr + PAR_CONTROL);
+ }
+ /* Terminate the Tx frame. End of write: ECB. */
+ outb(0xff, ioaddr + PAR_DATA);
+ outb(Ctrl_HNibWrite | Ctrl_SelData | Ctrl_IRQEN, ioaddr + PAR_CONTROL);
}
static void tx_timeout(struct net_device *dev)
@@ -539,8 +541,8 @@ static void tx_timeout(struct net_device *dev)
long ioaddr = dev->base_addr;
printk(KERN_WARNING "%s: Transmit timed out, %s?\n", dev->name,
- inb(ioaddr + PAR_CONTROL) & 0x10 ? "network cable problem"
- : "IRQ conflict");
+ inb(ioaddr + PAR_CONTROL) & 0x10 ? "network cable problem"
+ : "IRQ conflict");
dev->stats.tx_errors++;
/* Try to restart the adapter. */
hardware_init(dev);
@@ -562,7 +564,8 @@ static netdev_tx_t atp_send_packet(struct sk_buff *skb,
netif_stop_queue(dev);
/* Disable interrupts by writing 0x00 to the Interrupt Mask Register.
- This sequence must not be interrupted by an incoming packet. */
+ * This sequence must not be interrupted by an incoming packet.
+ */
spin_lock_irqsave(&lp->lock, flags);
write_reg(ioaddr, IMR, 0);
@@ -574,22 +577,23 @@ static netdev_tx_t atp_send_packet(struct sk_buff *skb,
lp->pac_cnt_in_tx_buf++;
if (lp->tx_unit_busy == 0) {
trigger_send(ioaddr, length);
- lp->saved_tx_size = 0; /* Redundant */
+ lp->saved_tx_size = 0; /* Redundant */
lp->re_tx = 0;
lp->tx_unit_busy = 1;
- } else
+ } else {
lp->saved_tx_size = length;
+ }
/* Re-enable the LPT interrupts. */
write_reg(ioaddr, IMR, ISR_RxOK | ISR_TxErr | ISR_TxOK);
write_reg_high(ioaddr, IMR, ISRh_RxErr);
- dev_kfree_skb (skb);
+ dev_kfree_skb(skb);
return NETDEV_TX_OK;
}
-
/* The typical workload of the driver:
- Handle the network interface interrupts. */
+ * Handle the network interface interrupts.
+ */
static irqreturn_t atp_interrupt(int irq, void *dev_instance)
{
struct net_device *dev = dev_instance;
@@ -611,20 +615,25 @@ static irqreturn_t atp_interrupt(int irq, void *dev_instance)
write_reg(ioaddr, CMR2, CMR2_NULL);
write_reg(ioaddr, IMR, 0);
- if (net_debug > 5) printk(KERN_DEBUG "%s: In interrupt ", dev->name);
- while (--boguscount > 0) {
+ if (net_debug > 5)
+ printk(KERN_DEBUG "%s: In interrupt ", dev->name);
+ while (--boguscount > 0) {
int status = read_nibble(ioaddr, ISR);
- if (net_debug > 5) printk("loop status %02x..", status);
+
+ if (net_debug > 5)
+ printk("loop status %02x..", status);
if (status & (ISR_RxOK<<3)) {
handled = 1;
write_reg(ioaddr, ISR, ISR_RxOK); /* Clear the Rx interrupt. */
do {
int read_status = read_nibble(ioaddr, CMR1);
+
if (net_debug > 6)
printk("handling Rx packet %02x..", read_status);
/* We acknowledged the normal Rx interrupt, so if the interrupt
- is still outstanding we must have a Rx error. */
+ * is still outstanding we must have a Rx error.
+ */
if (read_status & (CMR1_IRQ << 3)) { /* Overrun. */
dev->stats.rx_over_errors++;
/* Set to no-accept mode long enough to remove a packet. */
@@ -636,14 +645,17 @@ static irqreturn_t atp_interrupt(int irq, void *dev_instance)
} else if ((read_status & (CMR1_BufEnb << 3)) == 0) {
net_rx(dev);
num_tx_since_rx = 0;
- } else
+ } else {
break;
+ }
} while (--boguscount > 0);
} else if (status & ((ISR_TxErr + ISR_TxOK)<<3)) {
handled = 1;
- if (net_debug > 6) printk("handling Tx done..");
- /* Clear the Tx interrupt. We should check for too many failures
- and reinitialize the adapter. */
+ if (net_debug > 6)
+ printk("handling Tx done..");
+ /* Clear the Tx interrupt. We should check for too many
+ * failures and reinitialize the adapter.
+ */
write_reg(ioaddr, ISR, ISR_TxErr + ISR_TxOK);
if (status & (ISR_TxErr<<3)) {
dev->stats.collisions++;
@@ -653,38 +665,41 @@ static irqreturn_t atp_interrupt(int irq, void *dev_instance)
break;
}
/* Attempt to retransmit. */
- if (net_debug > 6) printk("attempting to ReTx");
+ if (net_debug > 6)
+ printk("attempting to ReTx");
write_reg(ioaddr, CMR1, CMR1_ReXmit + CMR1_Xmit);
} else {
/* Finish up the transmit. */
dev->stats.tx_packets++;
lp->pac_cnt_in_tx_buf--;
- if ( lp->saved_tx_size) {
+ if (lp->saved_tx_size) {
trigger_send(ioaddr, lp->saved_tx_size);
lp->saved_tx_size = 0;
lp->re_tx = 0;
- } else
+ } else {
lp->tx_unit_busy = 0;
+ }
netif_wake_queue(dev); /* Inform upper layers. */
}
num_tx_since_rx++;
} else if (num_tx_since_rx > 8 &&
time_after(jiffies, dev->last_rx + HZ)) {
if (net_debug > 2)
- printk(KERN_DEBUG "%s: Missed packet? No Rx after %d Tx and "
- "%ld jiffies status %02x CMR1 %02x.\n", dev->name,
- num_tx_since_rx, jiffies - dev->last_rx, status,
- (read_nibble(ioaddr, CMR1) >> 3) & 15);
+ printk(KERN_DEBUG "%s: Missed packet? No Rx after %d Tx and %ld jiffies status %02x CMR1 %02x.\n",
+ dev->name, num_tx_since_rx, jiffies - dev->last_rx, status,
+ (read_nibble(ioaddr, CMR1) >> 3) & 15);
dev->stats.rx_missed_errors++;
hardware_init(dev);
num_tx_since_rx = 0;
break;
- } else
+ } else {
break;
- }
+ }
+ }
/* This following code fixes a rare (and very difficult to track down)
- problem where the adapter forgets its ethernet address. */
+ * problem where the adapter forgets its ethernet address.
+ */
{
int i;
for (i = 0; i < 6; i++)
@@ -695,22 +710,24 @@ static irqreturn_t atp_interrupt(int irq, void *dev_instance)
}
/* Tell the adapter that it can go back to using the output line as IRQ. */
- write_reg(ioaddr, CMR2, CMR2_IRQOUT);
+ write_reg(ioaddr, CMR2, CMR2_IRQOUT);
/* Enable the physical interrupt line, which is sure to be low until.. */
outb(Ctrl_SelData + Ctrl_IRQEN, ioaddr + PAR_CONTROL);
/* .. we enable the interrupt sources. */
write_reg(ioaddr, IMR, ISR_RxOK | ISR_TxErr | ISR_TxOK);
- write_reg_high(ioaddr, IMR, ISRh_RxErr); /* Hmmm, really needed? */
+ write_reg_high(ioaddr, IMR, ISRh_RxErr); /* Hmmm, really needed? */
spin_unlock(&lp->lock);
- if (net_debug > 5) printk("exiting interrupt.\n");
+ if (net_debug > 5)
+ printk("exiting interrupt.\n");
return IRQ_RETVAL(handled);
}
#ifdef TIMED_CHECKER
/* This following code fixes a rare (and very difficult to track down)
- problem where the adapter forgets its ethernet address. */
+ * problem where the adapter forgets its ethernet address.
+ */
static void atp_timed_checker(unsigned long data)
{
struct net_device *dev = (struct net_device *)data;
@@ -727,19 +744,19 @@ static void atp_timed_checker(unsigned long data)
lp->last_rx_time = jiffies;
#else
for (i = 0; i < 6; i++)
- if (read_cmd_byte(ioaddr, PAR0 + i) != atp_timed_dev->dev_addr[i])
- {
- struct net_local *lp = netdev_priv(atp_timed_dev);
- write_reg_byte(ioaddr, PAR0 + i, atp_timed_dev->dev_addr[i]);
- if (i == 2)
- dev->stats.tx_errors++;
- else if (i == 3)
- dev->stats.tx_dropped++;
- else if (i == 4)
- dev->stats.collisions++;
- else
- dev->stats.rx_errors++;
- }
+ if (read_cmd_byte(ioaddr, PAR0 + i) != atp_timed_dev->dev_addr[i]) {
+ struct net_local *lp = netdev_priv(atp_timed_dev);
+
+ write_reg_byte(ioaddr, PAR0 + i, atp_timed_dev->dev_addr[i]);
+ if (i == 2)
+ dev->stats.tx_errors++;
+ else if (i == 3)
+ dev->stats.tx_dropped++;
+ else if (i == 4)
+ dev->stats.collisions++;
+ else
+ dev->stats.rx_errors++;
+ }
#endif
}
spin_unlock(&lp->lock);
@@ -757,23 +774,26 @@ static void net_rx(struct net_device *dev)
/* Process the received packet. */
outb(EOC+MAR, ioaddr + PAR_DATA);
- read_block(ioaddr, 8, (unsigned char*)&rx_head, dev->if_port);
+ read_block(ioaddr, 8, (unsigned char *)&rx_head, dev->if_port);
if (net_debug > 5)
printk(KERN_DEBUG " rx_count %04x %04x %04x %04x..", rx_head.pad,
- rx_head.rx_count, rx_head.rx_status, rx_head.cur_addr);
+ rx_head.rx_count, rx_head.rx_status, rx_head.cur_addr);
if ((rx_head.rx_status & 0x77) != 0x01) {
dev->stats.rx_errors++;
- if (rx_head.rx_status & 0x0004) dev->stats.rx_frame_errors++;
- else if (rx_head.rx_status & 0x0002) dev->stats.rx_crc_errors++;
+ if (rx_head.rx_status & 0x0004)
+ dev->stats.rx_frame_errors++;
+ else if (rx_head.rx_status & 0x0002)
+ dev->stats.rx_crc_errors++;
if (net_debug > 3)
printk(KERN_DEBUG "%s: Unknown ATP Rx error %04x.\n",
- dev->name, rx_head.rx_status);
+ dev->name, rx_head.rx_status);
if (rx_head.rx_status & 0x0020) {
dev->stats.rx_fifo_errors++;
write_reg_high(ioaddr, CMR1, CMR1h_TxENABLE);
write_reg_high(ioaddr, CMR1, CMR1h_RxENABLE | CMR1h_TxENABLE);
- } else if (rx_head.rx_status & 0x0050)
+ } else if (rx_head.rx_status & 0x0050) {
hardware_init(dev);
+ }
return;
} else {
/* Malloc up new buffer. The "-4" omits the FCS (CRC). */
@@ -787,7 +807,7 @@ static void net_rx(struct net_device *dev)
}
skb_reserve(skb, 2); /* Align IP on 16 byte boundaries */
- read_block(ioaddr, pkt_len, skb_put(skb,pkt_len), dev->if_port);
+ read_block(ioaddr, pkt_len, skb_put(skb, pkt_len), dev->if_port);
skb->protocol = eth_type_trans(skb, dev);
netif_rx(skb);
dev->last_rx = jiffies;
@@ -804,7 +824,7 @@ static void read_block(long ioaddr, int length, unsigned char *p, int data_mode)
if (data_mode <= 3) { /* Mode 0 or 1 */
outb(Ctrl_LNibRead, ioaddr + PAR_CONTROL);
outb(length == 8 ? RdAddr | HNib | MAR : RdAddr | MAR,
- ioaddr + PAR_DATA);
+ ioaddr + PAR_DATA);
if (data_mode <= 1) { /* Mode 0 or 1 */
do { *p++ = read_byte_mode0(ioaddr); } while (--length > 0);
} else { /* Mode 2 or 3 */
@@ -844,8 +864,7 @@ net_close(struct net_device *dev)
return 0;
}
-/*
- * Set or clear the multicast filter for this adapter.
+/* Set or clear the multicast filter for this adapter.
*/
static void set_rx_mode(struct net_device *dev)
@@ -860,17 +879,20 @@ static void set_rx_mode(struct net_device *dev)
write_reg_high(ioaddr, CMR2, lp->addr_mode);
}
-static int __init atp_init_module(void) {
- if (debug) /* Emit version even if no cards detected. */
+static int __init atp_init_module(void)
+{
+ if (debug) /* Emit version even if no cards detected. */
printk(KERN_INFO "%s", version);
return atp_init();
}
-static void __exit atp_cleanup_module(void) {
+static void __exit atp_cleanup_module(void)
+{
struct net_device *next_dev;
while (root_atp_dev) {
struct net_local *atp_local = netdev_priv(root_atp_dev);
+
next_dev = atp_local->next_module;
unregister_netdev(root_atp_dev);
/* No need to release_region(), since we never snarf it. */
--
2.1.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] net: eth: realtek: atp: checkpatch errors and warnings corrected
2014-11-03 18:24 [PATCH] net: eth: realtek: atp: checkpatch errors and warnings corrected Roberto Medina
@ 2014-11-03 18:51 ` Joe Perches
2014-11-03 19:09 ` Roberto Medina
0 siblings, 1 reply; 5+ messages in thread
From: Joe Perches @ 2014-11-03 18:51 UTC (permalink / raw)
To: Roberto Medina; +Cc: netdev, linux-kernel
On Mon, 2014-11-03 at 19:24 +0100, Roberto Medina wrote:
> From: Roberto Medina <robertoxmed@gmail.com>
>
> Several warnings and errors corrected using checkpatch.
> Some warnings like "line over 80" are still present.
>
> Before the patch:
> total: 16 errors, 155 warnings, 38 checks, 883 lines checked
>
> With the patch:
> total: 0 errors, 64 warnings, 24 checks, 905 lines checked
>
> Compile tested.
Some ancient drivers could be regarded as neolithic
curiosities that never need updating. This may be one.
But if you really want to change it, could you please
make sure that objdiff shows no changes?
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] net: eth: realtek: atp: checkpatch errors and warnings corrected
2014-11-03 18:51 ` Joe Perches
@ 2014-11-03 19:09 ` Roberto Medina
2014-11-04 10:19 ` David Laight
0 siblings, 1 reply; 5+ messages in thread
From: Roberto Medina @ 2014-11-03 19:09 UTC (permalink / raw)
To: Joe Perches; +Cc: netdev, linux-kernel
On 11/03/2014 07:51 PM, Joe Perches wrote:
>
> Some ancient drivers could be regarded as neolithic
> curiosities that never need updating. This may be one.
>
> But if you really want to change it, could you please
> make sure that objdiff shows no changes?
>
I see some changes with objdiff, maybe this is caused by the include
file that I changed to linux/io.h instead of asm/io.h
---
/home/vov/Git/linux-next/.tmp_objdiff/a641d0e/drivers/net/ethernet/realtek/atp.dis
2014-11-03 19:59:18.723954900 +0100
+++
/home/vov/Git/linux-next/.tmp_objdiff/5f19b70/drivers/net/ethernet/realtek/atp.dis
2014-11-03 20:00:34.133954217 +0100
@@ -1753,9 +1753,8 @@
...
: e3 0a jrcxz 4c4 <__gcov_.atp_probe1+0x14>
: 00 00 add %al,(%rax)
-: e2 e2 loop 4a0 <__gcov_.atp_init+0x20>
-: 9c pushfq
-: 9a (bad)
+: 4b b4 98 rex.WXB mov $0x98,%r12b
+: ac lods %ds:(%rsi),%al
: 67 2f addr32 (bad)
: e4 e3 in $0xe3,%al
: 00 00 add %al,(%rax)
@@ -1767,30 +1766,37 @@
...
: e4 0a in $0xa,%al
: 00 00 add %al,(%rax)
-: a5 movsl %ds:(%rsi),%es:(%rdi)
-: 21 4f ca and %ecx,-0x36(%rdi)
-: a0 82 0e 4f 00 00 00 movabs 0x7000000004f0e82,%al
-: 00 07
+: d6 (bad)
+: ad lods %ds:(%rsi),%eax
+: 51 push %rcx
+: 70 a0 jo 491 <__gcov_.atp_init+0x11>
+: 82 (bad)
+: 0e (bad)
+: 4f 00 00 rex.WRXB add %r8b,(%r8)
+: 00 00 add %al,(%rax)
+: 07 (bad)
...
0000000000000510 <__gcov_.eeprom_op>:
...
: e5 0a in $0xa,%eax
: 00 00 add %al,(%rax)
-: cd c3 int $0xc3
-: 0f c4 5c 4b fc 84 pinsrw $0x84,-0x4(%rbx,%rcx,2),%mm3
-: 00 00 add %al,(%rax)
+: 54 push %rsp
+: 0e (bad)
+: dd ca (bad)
+: 5c pop %rsp
+: 4b fc rex.WXB cld
+: 84 00 test %al,(%rax)
: 00 00 add %al,(%rax)
-: 07 (bad)
+: 00 07 add %al,(%rdi)
...
0000000000000540 <__gcov_.net_open>:
...
: e6 0a out %al,$0xa
: 00 00 add %al,(%rax)
-: 52 push %rdx
-: e7 5d out %eax,$0x5d
-: 8f (bad)
+: 0f bf 0e movswl (%rsi),%ecx
+: 4f rex.WRXB
: 66 af scas %es:(%rdi),%ax
: e2 a2 loop 4f6 <__gcov_.get_node_ID+0x16>
: 00 00 add %al,(%rax)
@@ -1802,15 +1808,16 @@
...
: e7 0a out %eax,$0xa
: 00 00 add %al,(%rax)
-: a9 17 a9 64 dc test $0xdc64a917,%eax
-: 20 8c 1d 00 00 00 00 and %cl,0x0(%rbp,%rbx,1)
+: 21 8a b7 70 dc 20 and %ecx,0x20dc70b7(%rdx)
+: 8c 1d 00 00 00 00 mov %ds,0x0(%rip) # 588
<__gcov_.hardware_init+0x18>
: 0f 00 00 sldt (%rax)
...
00000000000005a0 <__gcov_.trigger_send>:
...
-: e8 0a 00 00 b9 callq ffffffffb90005b7
<net_open+0xffffffffb8ffeeb8>
-: d3 0c 12 rorl %cl,(%rdx,%rdx,1)
+: e8 0a 00 00 38 callq 380005b7 <net_open+0x37ffeeb8>
+: 2e cs
+: e7 bb out %eax,$0xbb
: b9 43 f3 81 00 mov $0x81f343,%ecx
: 00 00 add %al,(%rax)
: 00 04 00 add %al,(%rax,%rax,1)
@@ -1818,10 +1825,10 @@
00000000000005d0 <__gcov_.write_packet>:
...
-: e9 0a 00 00 63 jmpq 630005e7 <net_open+0x62ffeee8>
-: e5 05 in $0x5,%eax
-: 96 xchg %eax,%esi
-: 27 (bad)
+: e9 0a 00 00 05 jmpq 50005e7 <net_open+0x4ffeee8>
+: 54 push %rsp
+: 5f pop %rdi
+: 23 27 and (%rdi),%esp
: 0d e5 2c 00 00 or $0x2ce5,%eax
: 00 00 add %al,(%rax)
: 15 00 00 00 00 adc $0x0,%eax
@@ -1831,7 +1838,7 @@
...
: ea (bad)
: 0a 00 or (%rax),%al
-: 00 2d d0 35 4c 7a add %ch,0x7a4c35d0(%rip) # 7a4c3be1
<net_open+0x7a4c24e2>
+: 00 8e bf 72 94 7a add %cl,0x7a9472bf(%rsi)
: c4 61 e7 00 (bad)
: 00 00 add %al,(%rax)
: 00 06 add %al,(%rsi)
@@ -1841,9 +1848,11 @@
...
: eb 0a jmp 644 <__gcov_.atp_send_packet+0x14>
: 00 00 add %al,(%rax)
-: 78 ac js 5ea <__gcov_.write_packet+0x1a>
-: 9b fwait
-: 4f 63 b6 a7 f3 00 00 rex.WRXB movslq 0xf3a7(%r14),%r14
+: 4e ed rex.WRX in (%dx),%eax
+: 5b pop %rbx
+: dd 63 b6 frstor -0x4a(%rbx)
+: a7 cmpsl %es:(%rdi),%ds:(%rsi)
+: f3 00 00 repz add %al,(%rax)
: 00 00 add %al,(%rax)
: 0c 00 or $0x0,%al
...
@@ -1852,9 +1861,10 @@
...
: ec in (%dx),%al
: 0a 00 or (%rax),%al
-: 00 66 37 add %ah,0x37(%rsi)
-: 2f (bad)
-: d0 3e sarb (%rsi)
+: 00 f9 add %bh,%cl
+: 64 4d fs rex.WRB
+: 44 rex.R
+: 3e ds
: 16 (bad)
: 72 d7 jb 64b <__gcov_.atp_send_packet+0x1b>
: 00 00 add %al,(%rax)
@@ -1866,8 +1876,9 @@
...
: ed in (%dx),%eax
: 0a 00 or (%rax),%al
-: 00 50 2e add %dl,0x2e(%rax)
-: 24 2a and $0x2a,%al
+: 00 5a 73 add %bl,0x73(%rdx)
+: 56 push %rsi
+: cf iret
: b0 28 mov $0x28,%al
: 9e sahf
: 0c 00 or $0x0,%al
@@ -1879,9 +1890,9 @@
...
: ee out %al,(%dx)
: 0a 00 or (%rax),%al
-: 00 60 1b add %ah,0x1b(%rax)
-: f5 cmc
-: b9 ca 01 fa fa mov $0xfafa01ca,%ecx
+: 00 85 af 2d b0 ca add %al,-0x354fd251(%rbp)
+: 01 fa add %edi,%edx
+: fa cli
: 00 00 add %al,(%rax)
: 00 00 add %al,(%rax)
: 17 (bad)
@@ -1891,7 +1902,8 @@
...
: ef out %eax,(%dx)
: 0a 00 or (%rax),%al
-: 00 b3 fb 8e ed 58 add %dh,0x58ed8efb(%rbx)
+: 00 e8 add %ch,%al
+: 09 7c 81 58 or %edi,0x58(%rcx,%rax,4)
: 32 13 xor (%rbx),%dl
: 9d popfq
: 00 00 add %al,(%rax)
@@ -1902,7 +1914,8 @@
0000000000000720 <__gcov_.net_close>:
...
: f0 0a 00 lock or (%rax),%al
-: 00 ae b2 85 8a 2a add %ch,0x2a8a85b2(%rsi)
+: 00 54 b3 8a add %dl,-0x76(%rbx,%rsi,4)
+: 3b 2a cmp (%rdx),%ebp
: 24 53 and $0x53,%al
: 13 00 adc (%rax),%eax
: 00 00 add %al,(%rax)
@@ -1913,11 +1926,7 @@
...
: f1 icebp
: 0a 00 or (%rax),%al
-: 00 20 add %ah,(%rax)
-: f5 cmc
-: d4 (bad)
-: c7 (bad)
-: 96 xchg %eax,%esi
+: 00 b5 7a 16 07 96 add %dh,-0x69f8e986(%rbp)
: df 25 67 00 00 00 fbld 0x67(%rip) # 7ce
<__gcov_.atp_init_module+0x4e>
: 00 04 00 add %al,(%rax,%rax,1)
...
@@ -1925,10 +1934,7 @@
0000000000000780 <__gcov_.atp_init_module>:
...
: f2 0a 00 repnz or (%rax),%al
-: 00 3f add %bh,(%rdi)
-: 2e cs
-: 04 c9 add $0xc9,%al
-: 9e sahf
+: 00 a6 4d 6b ed 9e add %ah,-0x611294b3(%rsi)
: 66 data16
: b2 b6 mov $0xb6,%dl
: 00 00 add %al,(%rax)
@@ -1940,7 +1946,8 @@
: 30 34 00 xor %dh,(%rax,%rax,1)
...
: 00 00 add %al,(%rax)
-: 00 6c 48 04 add %ch,0x4(%rax,%rcx,2)
+: 00 2c c8 add %ch,(%rax,%rcx,8)
+: 06 (bad)
: 77 00 ja 7d5 <__gcov_.atp_init_module+0x55>
...
: 00 00 add %al,(%rax)
@@ -1950,9 +1957,8 @@
0000000000000840 <__gcov_.atp_cleanup_module>:
...
: f3 0a 00 repz or (%rax),%al
-: 00 20 add %ah,(%rax)
-: d2 18 rcrb %cl,(%rax)
-: bd 5e f3 45 61 mov $0x6145f35e,%ebp
+: 00 bb a8 99 b6 5e add %bh,0x5eb699a8(%rbx)
+: f3 45 61 repz rex.RB (bad)
: 00 00 add %al,(%rax)
: 00 00 add %al,(%rax)
: 04 00 add $0x0,%al
@@ -2076,13 +2082,13 @@
0000000000000c50 <__gcov0.atp_cleanup_module>:
...
-0000000000000c70 <num_tx_since_rx.44203>:
+0000000000000c70 <num_tx_since_rx.44241>:
...
-0000000000000c78 <__key.44146>:
+0000000000000c78 <__key.44184>:
...
-0000000000000c80 <__key.44121>:
+0000000000000c80 <__key.44159>:
...
0000000000000c88 <root_atp_dev>:
^ permalink raw reply [flat|nested] 5+ messages in thread
* RE: [PATCH] net: eth: realtek: atp: checkpatch errors and warnings corrected
2014-11-03 19:09 ` Roberto Medina
@ 2014-11-04 10:19 ` David Laight
2014-11-05 7:44 ` Roberto Medina
0 siblings, 1 reply; 5+ messages in thread
From: David Laight @ 2014-11-04 10:19 UTC (permalink / raw)
To: 'Roberto Medina', Joe Perches
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org
From: Roberto Medina
> On 11/03/2014 07:51 PM, Joe Perches wrote:
> >
> > Some ancient drivers could be regarded as neolithic
> > curiosities that never need updating. This may be one.
> >
> > But if you really want to change it, could you please
> > make sure that objdiff shows no changes?
> >
>
> I see some changes with objdiff, maybe this is caused by the include
> file that I changed to linux/io.h instead of asm/io.h
>
> ---
> /home/vov/Git/linux-next/.tmp_objdiff/a641d0e/drivers/net/ethernet/realtek/atp.dis
> 2014-11-03 19:59:18.723954900 +0100
> +++
> /home/vov/Git/linux-next/.tmp_objdiff/5f19b70/drivers/net/ethernet/realtek/atp.dis
> 2014-11-03 20:00:34.133954217 +0100
> @@ -1753,9 +1753,8 @@
> ...
> : e3 0a jrcxz 4c4 <__gcov_.atp_probe1+0x14>
> : 00 00 add %al,(%rax)
> -: e2 e2 loop 4a0 <__gcov_.atp_init+0x20>
> -: 9c pushfq
> -: 9a (bad)
> +: 4b b4 98 rex.WXB mov $0x98,%r12b
> +: ac lods %ds:(%rsi),%al
> : 67 2f addr32 (bad)
> : e4 e3 in $0xe3,%al
> : 00 00 add %al,(%rax)
That code (and all the ones below) are gibberish, neither the old or new
sequences make any sense.
Almost as though you used the wrong instruction set!
David
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] net: eth: realtek: atp: checkpatch errors and warnings corrected
2014-11-04 10:19 ` David Laight
@ 2014-11-05 7:44 ` Roberto Medina
0 siblings, 0 replies; 5+ messages in thread
From: Roberto Medina @ 2014-11-05 7:44 UTC (permalink / raw)
To: David Laight, Joe Perches
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org
On 11/04/2014 11:19 AM, David Laight wrote:
>
> That code (and all the ones below) are gibberish, neither the old or new
> sequences make any sense.
>
Thank you for your feedback I did it again and objdiff doesn't show any
changes (if I'm not mistaken).
> Almost as though you used the wrong instruction set!
>
> David
diff -Nurd
/home/vov/Git/linux-next/.tmp_objdiff/a641d0e/drivers/net/ethernet/realtek/atp.dis
/home/vov/Git/linux-next/.tmp_objdiff/5f19b70/drivers/net/ethernet/realtek/atp.dis
---
/home/vov/Git/linux-next/.tmp_objdiff/a641d0e/drivers/net/ethernet/realtek/atp.dis
2014-11-05 08:38:49.244100507 +0100
+++
/home/vov/Git/linux-next/.tmp_objdiff/5f19b70/drivers/net/ethernet/realtek/atp.dis
2014-11-05 08:39:14.654101606 +0100
@@ -1357,7 +1357,7 @@
Disassembly of section .bss:
-00000000 <num_tx_since_rx.36127>:
+00000000 <num_tx_since_rx.36172>:
: 00 00 add %al,(%eax)
...
Thanks,
Roberto
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-11-05 7:44 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-03 18:24 [PATCH] net: eth: realtek: atp: checkpatch errors and warnings corrected Roberto Medina
2014-11-03 18:51 ` Joe Perches
2014-11-03 19:09 ` Roberto Medina
2014-11-04 10:19 ` David Laight
2014-11-05 7:44 ` Roberto Medina
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).