Misc driver fixes for 2.6.32
Subsystems (7)
cover Misc driver fixes for 2.6.32
This is a series of patches which
o 1/6, 2/6, 3/6: Fixes for the Octeon ethernet driver in drivers/staging. The Octeon is a MIPS-based SOC so with permisson from Greg I'm merging these via the MIPS tree.
o 4/6: A fix to a MIPS-specific SPI driver. Posted before, no comments were received.
o 5/6: A fix to the resource allocation to the framebuffer of the MIPS- based SGI O2 and i686-based Visual Workstation. Also posted before, no comments were received.
o 6/6: A fix to the serial driver for the BCM63xx which is a MIPS-based SOC.
Ralf
PATCH 1/6 Staging: Octeon: Fix compile error in drivers/staging/octeon/ethernet-mdio.c
From: David Daney <[email protected]>
drivers/staging/octeon/ethernet-mdio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/octeon/ethernet-mdio.c +1 -1
@@ -170,7 +170,7 @@ static u32 cvm_oct_get_link(struct net_dreturn ret; } -struct const ethtool_ops cvm_oct_ethtool_ops = { +const struct ethtool_ops cvm_oct_ethtool_ops = { .get_drvinfo = cvm_oct_get_drvinfo, .get_settings = cvm_oct_get_settings, .set_settings = cvm_oct_set_settings,
PATCH 2/6 Staging: Octeon: Use symbolic values for irq numbers.
In reply to Ralf BaechleFrom: David Daney <[email protected]>
In addition to being magic numbers, the irq number passed to free_irq is incorrect. We need to use the correct symbolic value instead.
drivers/staging/octeon/ethernet-spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/octeon/ethernet-spi.c +1 -1
@@ -317,6 +317,6 @@ void cvm_oct_spi_uninit(struct net_deviccvmx_write_csr (CVMX_SPXX_INT_MSK (interface),0 );cvmx_write_csr (CVMX_STXX_INT_MSK (interface),0 ); } -free_irq (8 +46 , &number_spi_ports); +free_irq (OCTEON_IRQ_RML , &number_spi_ports); } }
PATCH 3/6 Staging: octeon-ethernet: Assign proper MAC addresses.
In reply to Ralf BaechleFrom: David Daney <[email protected]>
Allocate MAC addresses using the same method as the bootloader. This avoids changing the MAC between bootloader and kernel operation as well as avoiding duplicates and use of addresses outside of the assigned range.
drivers/staging/octeon/ethernet.c | 53 +++++++++++++++++++++++++++++--------- 1 file changed, 41 insertions(+), 12 deletions(-)
drivers/staging/octeon/ethernet.c +41 -12
@@ -111,6 +111,16 @@ MODULE_PARM_DESC(disable_core_queueing,"\tallows packets to be sent without lock contention in the packet\n" "\tscheduler resulting in some cases in improved throughput.\n"); + +/* +* The offset from mac_addr_base that should be used for the next port +* that is configured. By convention, if any mgmt ports exist on the +* chip, they get the first mac addresses, The ports controlled by +* this driver are numbered sequencially following any mgmt addresses +* that may exist. +*/ +static unsigned int cvm_oct_mac_addr_offset; +/** * Periodic timer to check auto negotiation */
@@ -474,16 +484,30 @@ static int cvm_oct_common_set_mac_addres*/ int cvm_oct_common_init (struct net_device *dev) { -static int count; -char mac[8 ] = {0x00 ,0x00 , - octeon_bootinfo->mac_addr_base[0 ], - octeon_bootinfo->mac_addr_base[1 ], - octeon_bootinfo->mac_addr_base[2 ], - octeon_bootinfo->mac_addr_base[3 ], - octeon_bootinfo->mac_addr_base[4 ], - octeon_bootinfo->mac_addr_base[5 ] + count - };struct octeon_ethernet *priv =netdev_priv (dev); +struct sockaddr sa; +u64 mac = ((u64)(octeon_bootinfo->mac_addr_base[0 ] &0xff ) <<40 ) | + ((u64)(octeon_bootinfo->mac_addr_base[1 ] &0xff ) <<32 ) | + ((u64)(octeon_bootinfo->mac_addr_base[2 ] &0xff ) <<24 ) | + ((u64)(octeon_bootinfo->mac_addr_base[3 ] &0xff ) <<16 ) | + ((u64)(octeon_bootinfo->mac_addr_base[4 ] &0xff ) <<8 ) | + (u64)(octeon_bootinfo->mac_addr_base[5 ] &0xff ); + + mac += cvm_oct_mac_addr_offset; + sa.sa_data[0 ] = (mac >>40 ) &0xff ; + sa.sa_data[1 ] = (mac >>32 ) &0xff ; + sa.sa_data[2 ] = (mac >>24 ) &0xff ; + sa.sa_data[3 ] = (mac >>16 ) &0xff ; + sa.sa_data[4 ] = (mac >>8 ) &0xff ; + sa.sa_data[5 ] = mac &0xff ; + +if (cvm_oct_mac_addr_offset >= octeon_bootinfo->mac_addr_count) +printk (KERN_DEBUG "%s: Using MAC outside of the assigned range:" +" %02x:%02x:%02x:%02x:%02x:%02x\n" , dev->name, + sa.sa_data[0 ] &0xff , sa.sa_data[1 ] &0xff , + sa.sa_data[2 ] &0xff , sa.sa_data[3 ] &0xff , + sa.sa_data[4 ] &0xff , sa.sa_data[5 ] &0xff ); + cvm_oct_mac_addr_offset++;/* * Force the interface to use the POW send if always_use_pow
@@ -496,14 +520,12 @@ int cvm_oct_common_init(struct net_devicif (priv->queue !=-1 &&USE_HW_TCPUDP_CHECKSUM ) dev->features |=NETIF_F_IP_CSUM ; - count++; -/* We do our own locking, Linux doesn't need to */ dev->features |=NETIF_F_LLTX ;SET_ETHTOOL_OPS (dev, &cvm_oct_ethtool_ops);cvm_oct_mdio_setup_device (dev); - dev->netdev_ops->ndo_set_mac_address (dev, mac); + dev->netdev_ops->ndo_set_mac_address (dev, &sa); dev->netdev_ops->ndo_change_mtu (dev, dev->mtu);/*
@@ -620,6 +642,13 @@ static int __init cvm_oct_init_module(vopr_notice ("cavium-ethernet %s\n" ,OCTEON_ETHERNET_VERSION ); +if (OCTEON_IS_MODEL (OCTEON_CN52XX )) + cvm_oct_mac_addr_offset =2 ;/* First two are the mgmt ports. */ +else if (OCTEON_IS_MODEL (OCTEON_CN56XX )) + cvm_oct_mac_addr_offset =1 ;/* First one is the mgmt port. */ +else + cvm_oct_mac_addr_offset =0 ; +cvm_oct_proc_initialize ();cvm_oct_rx_initialize ();cvm_oct_configure_common_hw ();
PATCH 4/6 SPI: spi_txx9: Fix bit rate calculation
In reply to Ralf BaechleFrom: Atsushi Nemoto <[email protected]>
TXx9 SPI bit rate is calculated by:
fBR = (spi-baseclk) / (n + 1)
Fix calculation of min_speed_hz, max_speed_hz and n.
drivers/spi/spi_txx9.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/spi/spi_txx9.c +6 -7
@@ -29,6 +29,8 @@#define SPI_FIFO_SIZE 4 +#define SPI_MAX_DIVIDER 0xff/* Max. value for SPCR1.SER */ +#define SPI_MIN_DIVIDER 1/* Min. value for SPCR1.SER */ #define TXx9_SPMCR 0x00#define TXx9_SPCR0 0x04
@@ -193,11 +195,8 @@ static void txx9spi_work_one(struct txx9if (prev_speed_hz != speed_hz || prev_bits_per_word != bits_per_word) { -u32 n = (c->baseclk + speed_hz -1 ) / speed_hz; -if (n <1 ) - n =1 ; -else if (n >0xff ) - n =0xff ; +int n =DIV_ROUND_UP (c->baseclk, speed_hz) -1 ; + n =clamp (n,SPI_MIN_DIVIDER ,SPI_MAX_DIVIDER );/* enter config mode */ txx9spi_wr (c, mcr | TXx9_SPMCR_CONFIG | TXx9_SPMCR_BCLR, TXx9_SPMCR);
@@ -370,8 +369,8 @@ static int __init txx9spi_probe(struct p goto exit; } c->baseclk =clk_get_rate (c->clk); - c->min_speed_hz = (c->baseclk +0xff -1 ) /0xff ; - c->max_speed_hz = c->baseclk; + c->min_speed_hz =DIV_ROUND_UP (c->baseclk,SPI_MAX_DIVIDER +1 ); + c->max_speed_hz = c->baseclk / (SPI_MIN_DIVIDER +1 ); res =platform_get_resource (dev,IORESOURCE_MEM ,0 );if (!res)
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july
PATCH 5/6 VIDEO: Correct use of request_region/request_mem_region
In reply to Ralf BaechleFrom: Julia Lawall <[email protected]>
Geert Uytterhoeven pointed out that in the case of drivers/video/gbefb.c, the problem is actually the other way around; request_mem_region should be used instead of request_region.
The semantic patch that finds/fixes this problem is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@r1@
expression start;
@@
request_region(start,...)
@b1@
expression r1.start;
@@
request_mem_region(start,...)
@depends on !b1@
expression r1.start;
expression E;
@@
- release_mem_region
+ release_region
(start,E)
// </smpl>
drivers/video/gbefb.c | 2 +- drivers/video/tdfxfb.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/video/gbefb.c +1 -1
@@ -1147,7 +1147,7 @@ static int __init gbefb_probe(struct plagbefb_setup (options);#endif -if (!request_region (GBE_BASE ,sizeof (struct sgi_gbe ),"GBE" )) { +if (!request_mem_region (GBE_BASE ,sizeof (struct sgi_gbe ),"GBE" )) {printk (KERN_ERR "gbefb: couldn't reserve mmio region\n" ); ret = -EBUSY ; goto out_release_framebuffer;
drivers/video/tdfxfb.c +2 -2
@@ -1571,8 +1571,8 @@ out_err_iobase:if (default_par->mtrr_handle >=0 )mtrr_del (default_par->mtrr_handle, info->fix.smem_start, info->fix.smem_len); -release_mem_region (pci_resource_start (pdev,2 ), -pci_resource_len (pdev,2 )); +release_region (pci_resource_start (pdev,2 ), +pci_resource_len (pdev,2 )); out_err_screenbase:if (info->screen_base)iounmap (info->screen_base);
PATCH 6/6 SERIAL: BCM63xx: Fix serial driver compile breakage.
In reply to Ralf BaechleFrom: Maxime Bizon <[email protected]>
The driver missed an API change.
drivers/serial/bcm63xx_uart.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/serial/bcm63xx_uart.c +2 -2
@@ -242,7 +242,7 @@ static void bcm_uart_do_rx(struct uart_p* higher than fifo size anyway since we're much faster than * serial port */ max_count =32 ; - tty = port->info->port.tty; + tty = port->state->port.tty; do { unsigned int iestat, c, cstat; char flag;
@@ -318,7 +318,7 @@ static void bcm_uart_do_tx(struct uart_preturn ; } - xmit = &port->info->xmit; + xmit = &port->state->xmit;if (uart_circ_empty (xmit)) goto txq_empty;