smc91x: request bus width using platform data
Subsystems (2)
cover smc91x: request bus width using platform data
These patches make it possible to request bus width in the platform data.
Instead of keep on updating smc91x.h with board specific configuration, use platform data to pass along bus width and irq flags to the driver. This change is designed to be backwards-compatible, so all boards configured in the header file should just work as usual.
[PATCH 01/04] smc91x: pass along private data [PATCH 02/04] smc91x: introduce platform data flags [PATCH 03/04] smc91x: make superh use default config [PATCH 04/04] smc91x: add insw/outsw to default config
Tested with and without platform data on a SuperH sh7722 MigoR board.
---
drivers/net/smc91x.c | 340 +++++++++++++++++++++++++----------------------- drivers/net/smc91x.h | 336 ++++++++++++++++++++++------------------------- include/linux/smc91x.h | 13 + 3 files changed, 353 insertions(+), 336 deletions(-)
PATCH 1/4 smc91x: pass along private data
Pass a private data pointer to macros and functions. This makes it easy to later on make run time decisions. This patch does not change any logic. These changes should be optimized away during compilation.
---
drivers/net/smc91x.c | 309 +++++++++++++++++++++++++------------------------- drivers/net/smc91x.h | 254 ++++++++++++++++++++--------------------- 2 files changed, 284 insertions(+), 279 deletions(-)
drivers/net/smc91x.c +155 -154
@@ -220,23 +220,23 @@ static void PRINT_PKT(u_char *buf, int l/* this enables an interrupt in the interrupt mask register */ -#define SMC_ENABLE_INT (x) do { \ +#define SMC_ENABLE_INT (priv, x) do { \ unsigned char mask; \ - spin_lock_irq(&lp->lock); \ - mask = SMC_GET_INT_MASK(); \ + spin_lock_irq(&priv->lock); \ + mask = SMC_GET_INT_MASK(priv); \ mask |= (x); \ - SMC_SET_INT_MASK(mask); \ - spin_unlock_irq(&lp->lock); \ + SMC_SET_INT_MASK(priv, mask); \ + spin_unlock_irq(&priv->lock); \ } while (0)/* this disables an interrupt from the interrupt mask register */ -#define SMC_DISABLE_INT (x) do { \ +#define SMC_DISABLE_INT (priv, x) do { \ unsigned char mask; \ - spin_lock_irq(&lp->lock); \ - mask = SMC_GET_INT_MASK(); \ + spin_lock_irq(&priv->lock); \ + mask = SMC_GET_INT_MASK(priv); \ mask &= ~(x); \ - SMC_SET_INT_MASK(mask); \ - spin_unlock_irq(&lp->lock); \ + SMC_SET_INT_MASK(priv, mask); \ + spin_unlock_irq(&priv->lock); \ } while (0)/*
@@ -244,10 +244,10 @@ static void PRINT_PKT(u_char *buf, int l* if at all, but let's avoid deadlocking the system if the hardware * decides to go south. */ -#define SMC_WAIT_MMU_BUSY () do { \ - if (unlikely(SMC_GET_MMU_CMD() & MC_BUSY)) { \ +#define SMC_WAIT_MMU_BUSY (priv) do { \ + if (unlikely(SMC_GET_MMU_CMD(priv) & MC_BUSY)) { \ unsigned long timeout = jiffies + 2; \ - while (SMC_GET_MMU_CMD() & MC_BUSY) { \ + while (SMC_GET_MMU_CMD(priv) & MC_BUSY) { \ if (time_after(jiffies, timeout)) { \ printk("%s: timeout %s line %d\n", \ dev->name, __FILE__, __LINE__); \
@@ -273,8 +273,8 @@ static void smc_reset(struct net_device/* Disable all interrupts, block TX tasklet */ spin_lock_irq (&lp->lock); -SMC_SELECT_BANK (2 ); -SMC_SET_INT_MASK (0 ); +SMC_SELECT_BANK (lp,2 ); +SMC_SET_INT_MASK (lp,0 ); pending_skb = lp->pending_tx_skb; lp->pending_tx_skb =NULL ;spin_unlock_irq (&lp->lock);
@@ -290,15 +290,15 @@ static void smc_reset(struct net_device* This resets the registers mostly to defaults, but doesn't * affect EEPROM. That seems unnecessary */ -SMC_SELECT_BANK (0 ); -SMC_SET_RCR (RCR_SOFTRST ); +SMC_SELECT_BANK (lp,0 ); +SMC_SET_RCR (lp,RCR_SOFTRST );/* * Setup the Configuration Register * This is necessary because the CONFIG_REG is not affected * by a soft reset */ -SMC_SELECT_BANK (1 ); +SMC_SELECT_BANK (lp,1 ); cfg =CONFIG_DEFAULT ;
@@ -316,7 +316,7 @@ static void smc_reset(struct net_device*/ cfg |=CONFIG_EPH_POWER_EN ; -SMC_SET_CONFIG (cfg); +SMC_SET_CONFIG (lp, cfg);/* this should pause enough for the chip to be happy */ /*
@@ -329,12 +329,12 @@ static void smc_reset(struct net_deviceudelay (1 );/* Disable transmit and receive functionality */ -SMC_SELECT_BANK (0 ); -SMC_SET_RCR (RCR_CLEAR ); -SMC_SET_TCR (TCR_CLEAR ); +SMC_SELECT_BANK (lp,0 ); +SMC_SET_RCR (lp,RCR_CLEAR ); +SMC_SET_TCR (lp,TCR_CLEAR ); -SMC_SELECT_BANK (1 ); - ctl =SMC_GET_CTL () |CTL_LE_ENABLE ; +SMC_SELECT_BANK (lp,1 ); + ctl =SMC_GET_CTL (lp) |CTL_LE_ENABLE ;/* * Set the control register to automatically release successfully
@@ -345,12 +345,12 @@ static void smc_reset(struct net_device ctl |=CTL_AUTO_RELEASE ; else ctl &= ~CTL_AUTO_RELEASE; -SMC_SET_CTL (ctl); +SMC_SET_CTL (lp, ctl);/* Reset the MMU */ -SMC_SELECT_BANK (2 ); -SMC_SET_MMU_CMD (MC_RESET ); -SMC_WAIT_MMU_BUSY (); +SMC_SELECT_BANK (lp,2 ); +SMC_SET_MMU_CMD (lp,MC_RESET ); +SMC_WAIT_MMU_BUSY (lp); }/*
@@ -365,19 +365,19 @@ static void smc_enable(struct net_deviceDBG (2 ,"%s: %s\n" , dev->name, __FUNCTION__);/* see the header file for options in TCR/RCR DEFAULT */ -SMC_SELECT_BANK (0 ); -SMC_SET_TCR (lp->tcr_cur_mode); -SMC_SET_RCR (lp->rcr_cur_mode); +SMC_SELECT_BANK (lp,0 ); +SMC_SET_TCR (lp, lp->tcr_cur_mode); +SMC_SET_RCR (lp, lp->rcr_cur_mode); -SMC_SELECT_BANK (1 ); -SMC_SET_MAC_ADDR (dev->dev_addr); +SMC_SELECT_BANK (lp,1 ); +SMC_SET_MAC_ADDR (lp, dev->dev_addr);/* now, enable interrupts */ mask =IM_EPH_INT |IM_RX_OVRN_INT |IM_RCV_INT ;if (lp->version >= (CHIP_91100 <<4 )) mask |=IM_MDINT ; -SMC_SELECT_BANK (2 ); -SMC_SET_INT_MASK (mask); +SMC_SELECT_BANK (lp,2 ); +SMC_SET_INT_MASK (lp, mask);/* * From this point the register bank must _NOT_ be switched away
@@ -400,8 +400,8 @@ static void smc_shutdown(struct net_devi/* no more interrupts for me */ spin_lock_irq (&lp->lock); -SMC_SELECT_BANK (2 ); -SMC_SET_INT_MASK (0 ); +SMC_SELECT_BANK (lp,2 ); +SMC_SET_INT_MASK (lp,0 ); pending_skb = lp->pending_tx_skb; lp->pending_tx_skb =NULL ;spin_unlock_irq (&lp->lock);
@@ -409,14 +409,14 @@ static void smc_shutdown(struct net_devidev_kfree_skb (pending_skb);/* and tell the card to stay away from that nasty outside world */ -SMC_SELECT_BANK (0 ); -SMC_SET_RCR (RCR_CLEAR ); -SMC_SET_TCR (TCR_CLEAR ); +SMC_SELECT_BANK (lp,0 ); +SMC_SET_RCR (lp,RCR_CLEAR ); +SMC_SET_TCR (lp,TCR_CLEAR );#ifdef POWER_DOWN /* finally, shut the chip down */ -SMC_SELECT_BANK (1 ); -SMC_SET_CONFIG (SMC_GET_CONFIG () & ~CONFIG_EPH_POWER_EN ); +SMC_SELECT_BANK (lp,1 ); +SMC_SET_CONFIG (lp,SMC_GET_CONFIG (lp) & ~CONFIG_EPH_POWER_EN );#endif }
@@ -431,17 +431,17 @@ static inline void smc_rcv(struct net_dDBG (3 ,"%s: %s\n" , dev->name, __FUNCTION__); - packet_number =SMC_GET_RXFIFO (); + packet_number =SMC_GET_RXFIFO (lp);if (unlikely (packet_number &RXFIFO_REMPTY )) {PRINTK ("%s: smc_rcv with nothing on FIFO.\n" , dev->name);return ; }/* read from start of packet */ -SMC_SET_PTR (PTR_READ |PTR_RCV |PTR_AUTOINC ); +SMC_SET_PTR (lp,PTR_READ |PTR_RCV |PTR_AUTOINC );/* First two words are status and packet length */ -SMC_GET_PKT_HDR (status, packet_len); +SMC_GET_PKT_HDR (lp, status, packet_len); packet_len &=0x07ff ;/* mask off top bits */ DBG(2, "%s: RX PNR 0x%x STATUS 0x%04x LENGTH 0x%04x (%d)\n", dev->name, packet_number, status,
@@ -460,8 +460,8 @@ static inline void smc_rcv(struct net_d dev->name, packet_len, status); status |=RS_TOOSHORT ; } -SMC_WAIT_MMU_BUSY (); -SMC_SET_MMU_CMD (MC_RELEASE ); +SMC_WAIT_MMU_BUSY (lp); +SMC_SET_MMU_CMD (lp,MC_RELEASE ); dev->stats.rx_errors++;if (status &RS_ALGNERR ) dev->stats.rx_frame_errors++;
@@ -490,8 +490,8 @@ static inline void smc_rcv(struct net_dif (unlikely (skb ==NULL )) {printk (KERN_NOTICE "%s: Low memory, packet dropped.\n" , dev->name); -SMC_WAIT_MMU_BUSY (); -SMC_SET_MMU_CMD (MC_RELEASE ); +SMC_WAIT_MMU_BUSY (lp); +SMC_SET_MMU_CMD (lp,MC_RELEASE ); dev->stats.rx_dropped++;return ; }
@@ -510,10 +510,10 @@ static inline void smc_rcv(struct net_d*/ data_len = packet_len - ((status &RS_ODDFRAME ) ?5 :6 ); data =skb_put (skb, data_len); -SMC_PULL_DATA (data, packet_len -4 ); +SMC_PULL_DATA (lp, data, packet_len -4 ); -SMC_WAIT_MMU_BUSY (); -SMC_SET_MMU_CMD (MC_RELEASE ); +SMC_WAIT_MMU_BUSY (lp); +SMC_SET_MMU_CMD (lp,MC_RELEASE );PRINT_PKT (data, packet_len -4 );
@@ -591,7 +591,7 @@ static void smc_hardware_send_pkt(unsign } lp->pending_tx_skb =NULL ; - packet_no =SMC_GET_AR (); + packet_no =SMC_GET_AR (lp);if (unlikely (packet_no &AR_FAILED )) {printk ("%s: Memory allocation failed.\n" , dev->name); dev->stats.tx_errors++;
@@ -601,8 +601,8 @@ static void smc_hardware_send_pkt(unsign }/* point to the beginning of the packet */ -SMC_SET_PN (packet_no); -SMC_SET_PTR (PTR_AUTOINC ); +SMC_SET_PN (lp, packet_no); +SMC_SET_PTR (lp,PTR_AUTOINC ); buf = skb->data; len = skb->len;
@@ -614,13 +614,13 @@ static void smc_hardware_send_pkt(unsign* Send the packet length (+6 for status words, length, and ctl. * The card will pad to 64 bytes with zeroes if packet is too small. */ -SMC_PUT_PKT_HDR (0 , len +6 ); +SMC_PUT_PKT_HDR (lp,0 , len +6 );/* send the actual data */ -SMC_PUSH_DATA (buf, len & ~1 ); +SMC_PUSH_DATA (lp, buf, len & ~1 );/* Send final ctl word with the last byte if there is one */ -SMC_outw (((len &1 ) ? (0x2000 | buf[len-1 ]) :0 ), ioaddr,DATA_REG ); +SMC_outw (((len &1 ) ? (0x2000 | buf[len-1 ]) :0 ), ioaddr,DATA_REG (lp));/* * If THROTTLE_TX_PKTS is set, we stop the queue here. This will
@@ -634,14 +634,14 @@ static void smc_hardware_send_pkt(unsignnetif_stop_queue (dev);/* queue the packet for TX */ -SMC_SET_MMU_CMD (MC_ENQUEUE ); +SMC_SET_MMU_CMD (lp,MC_ENQUEUE );smc_special_unlock (&lp->lock); dev->trans_start = jiffies; dev->stats.tx_packets++; dev->stats.tx_bytes += len; -SMC_ENABLE_INT (IM_TX_INT |IM_TX_EMPTY_INT ); +SMC_ENABLE_INT (lp,IM_TX_INT |IM_TX_EMPTY_INT ); done:if (!THROTTLE_TX_PKTS )netif_wake_queue (dev);
@@ -688,7 +688,7 @@ static int smc_hard_start_xmit(struct sksmc_special_lock (&lp->lock);/* now, try to allocate the memory */ -SMC_SET_MMU_CMD (MC_ALLOC | numPages); +SMC_SET_MMU_CMD (lp,MC_ALLOC | numPages);/* * Poll the chip for a short amount of time in case the
@@ -696,9 +696,9 @@ static int smc_hard_start_xmit(struct sk*/ poll_count =MEMORY_WAIT_TIME ;do { - status =SMC_GET_INT (); + status =SMC_GET_INT (lp);if (status &IM_ALLOC_INT ) { -SMC_ACK_INT (IM_ALLOC_INT ); +SMC_ACK_INT (lp,IM_ALLOC_INT );break ; } }while (--poll_count);
@@ -710,7 +710,7 @@ static int smc_hard_start_xmit(struct sk/* oh well, wait until the chip finds memory later */ netif_stop_queue (dev);DBG (2 ,"%s: TX memory allocation deferred.\n" , dev->name); -SMC_ENABLE_INT (IM_ALLOC_INT ); +SMC_ENABLE_INT (lp,IM_ALLOC_INT ); }else {/* * Allocation succeeded: push packet to the chip's own memory
@@ -736,19 +736,19 @@ static void smc_tx(struct net_device *deDBG (3 ,"%s: %s\n" , dev->name, __FUNCTION__);/* If the TX FIFO is empty then nothing to do */ - packet_no =SMC_GET_TXFIFO (); + packet_no =SMC_GET_TXFIFO (lp);if (unlikely (packet_no &TXFIFO_TEMPTY )) {PRINTK ("%s: smc_tx with nothing on FIFO.\n" , dev->name);return ; }/* select packet to read from */ - saved_packet =SMC_GET_PN (); -SMC_SET_PN (packet_no); + saved_packet =SMC_GET_PN (lp); +SMC_SET_PN (lp, packet_no);/* read the first word (status word) from this packet */ -SMC_SET_PTR (PTR_AUTOINC |PTR_READ ); -SMC_GET_PKT_HDR (tx_status, pkt_len); +SMC_SET_PTR (lp,PTR_AUTOINC |PTR_READ ); +SMC_GET_PKT_HDR (lp, tx_status, pkt_len);DBG (2 ,"%s: TX STATUS 0x%04x PNR 0x%02x\n" , dev->name, tx_status, packet_no);
@@ -771,17 +771,17 @@ static void smc_tx(struct net_device *de }/* kill the packet */ -SMC_WAIT_MMU_BUSY (); -SMC_SET_MMU_CMD (MC_FREEPKT ); +SMC_WAIT_MMU_BUSY (lp); +SMC_SET_MMU_CMD (lp,MC_FREEPKT );/* Don't restore Packet Number Reg until busy bit is cleared */ -SMC_WAIT_MMU_BUSY (); -SMC_SET_PN (saved_packet); +SMC_WAIT_MMU_BUSY (lp); +SMC_SET_PN (lp, saved_packet);/* re-enable transmit */ -SMC_SELECT_BANK (0 ); -SMC_SET_TCR (lp->tcr_cur_mode); -SMC_SELECT_BANK (2 ); +SMC_SELECT_BANK (lp,0 ); +SMC_SET_TCR (lp, lp->tcr_cur_mode); +SMC_SELECT_BANK (lp,2 ); }
@@ -793,7 +793,7 @@ static void smc_mii_out(struct net_devicvoid __iomem *ioaddr = lp->base;unsigned int mii_reg, mask; - mii_reg =SMC_GET_MII () & ~(MII_MCLK |MII_MDOE |MII_MDO ); + mii_reg =SMC_GET_MII (lp) & ~(MII_MCLK |MII_MDOE |MII_MDO ); mii_reg |=MII_MDOE ;for (mask =1 << (bits -1 ); mask; mask >>=1 ) {
@@ -802,9 +802,9 @@ static void smc_mii_out(struct net_devicelse mii_reg &= ~MII_MDO ; -SMC_SET_MII (mii_reg); +SMC_SET_MII (lp, mii_reg);udelay (MII_DELAY ); -SMC_SET_MII (mii_reg |MII_MCLK ); +SMC_SET_MII (lp, mii_reg |MII_MCLK );udelay (MII_DELAY ); } }
@@ -815,16 +815,16 @@ static unsigned int smc_mii_in(struct nevoid __iomem *ioaddr = lp->base;unsigned int mii_reg, mask, val; - mii_reg =SMC_GET_MII () & ~(MII_MCLK |MII_MDOE |MII_MDO ); -SMC_SET_MII (mii_reg); + mii_reg =SMC_GET_MII (lp) & ~(MII_MCLK |MII_MDOE |MII_MDO ); +SMC_SET_MII (lp, mii_reg);for (mask =1 << (bits -1 ), val =0 ; mask; mask >>=1 ) { -if (SMC_GET_MII () &MII_MDI ) +if (SMC_GET_MII (lp) &MII_MDI ) val |= mask; -SMC_SET_MII (mii_reg); +SMC_SET_MII (lp, mii_reg);udelay (MII_DELAY ); -SMC_SET_MII (mii_reg |MII_MCLK ); +SMC_SET_MII (lp, mii_reg |MII_MCLK );udelay (MII_DELAY ); }
@@ -840,7 +840,7 @@ static int smc_phy_read(struct net_devicvoid __iomem *ioaddr = lp->base;unsigned int phydata; -SMC_SELECT_BANK (3 ); +SMC_SELECT_BANK (lp,3 );/* Idle - 32 ones */ smc_mii_out (dev,0xffffffff ,32 );
@@ -852,12 +852,12 @@ static int smc_phy_read(struct net_devic phydata =smc_mii_in (dev,18 );/* Return to idle state */ -SMC_SET_MII (SMC_GET_MII () & ~(MII_MCLK |MII_MDOE |MII_MDO )); +SMC_SET_MII (lp,SMC_GET_MII (lp) & ~(MII_MCLK |MII_MDOE |MII_MDO ));DBG (3 ,"%s: phyaddr=0x%x, phyreg=0x%x, phydata=0x%x\n" , __FUNCTION__, phyaddr, phyreg, phydata); -SMC_SELECT_BANK (2 ); +SMC_SELECT_BANK (lp,2 );return phydata; }
@@ -870,7 +870,7 @@ static void smc_phy_write(struct net_devstruct smc_local *lp =netdev_priv (dev);void __iomem *ioaddr = lp->base; -SMC_SELECT_BANK (3 ); +SMC_SELECT_BANK (lp,3 );/* Idle - 32 ones */ smc_mii_out (dev,0xffffffff ,32 );
@@ -879,12 +879,12 @@ static void smc_phy_write(struct net_devsmc_mii_out (dev,5 <<28 | phyaddr <<23 | phyreg <<18 |2 <<16 | phydata,32 );/* Return to idle state */ -SMC_SET_MII (SMC_GET_MII () & ~(MII_MCLK |MII_MDOE |MII_MDO )); +SMC_SET_MII (lp,SMC_GET_MII (lp) & ~(MII_MCLK |MII_MDOE |MII_MDO ));DBG (3 ,"%s: phyaddr=0x%x, phyreg=0x%x, phydata=0x%x\n" , __FUNCTION__, phyaddr, phyreg, phydata); -SMC_SELECT_BANK (2 ); +SMC_SELECT_BANK (lp,2 ); }/*
@@ -957,9 +957,9 @@ static int smc_phy_fixed(struct net_devismc_phy_write (dev, phyaddr,MII_BMCR , bmcr);/* Re-Configure the Receive/Phy Control register */ -SMC_SELECT_BANK (0 ); -SMC_SET_RPC (lp->rpc_cur_mode); -SMC_SELECT_BANK (2 ); +SMC_SELECT_BANK (lp,0 ); +SMC_SET_RPC (lp, lp->rpc_cur_mode); +SMC_SELECT_BANK (lp,2 );return 1 ; }
@@ -1050,8 +1050,8 @@ static void smc_phy_check_media(struct n lp->tcr_cur_mode &= ~TCR_SWFDUP ; } -SMC_SELECT_BANK (0 ); -SMC_SET_TCR (lp->tcr_cur_mode); +SMC_SELECT_BANK (lp,0 ); +SMC_SET_TCR (lp, lp->tcr_cur_mode); } }
@@ -1100,8 +1100,8 @@ static void smc_phy_configure(struct wor PHY_INT_SPDDET | PHY_INT_DPLXDET);/* Configure the Receive/Phy Control register */ -SMC_SELECT_BANK (0 ); -SMC_SET_RPC (lp->rpc_cur_mode); +SMC_SELECT_BANK (lp,0 ); +SMC_SET_RPC (lp, lp->rpc_cur_mode);/* If the user requested no auto neg, then go set his request */ if (lp->mii.force_media) {
@@ -1158,7 +1158,7 @@ static void smc_phy_configure(struct worsmc_phy_check_media (dev,1 ); smc_phy_configure_exit: -SMC_SELECT_BANK (2 ); +SMC_SELECT_BANK (lp,2 );spin_unlock_irq (&lp->lock); lp->work_pending =0 ; }
@@ -1200,9 +1200,9 @@ static void smc_10bt_check_media(struct old_carrier =netif_carrier_ok (dev) ?1 :0 ; -SMC_SELECT_BANK (0 ); - new_carrier = (SMC_GET_EPH_STATUS () &ES_LINK_OK ) ?1 :0 ; -SMC_SELECT_BANK (2 ); +SMC_SELECT_BANK (lp,0 ); + new_carrier = (SMC_GET_EPH_STATUS (lp) &ES_LINK_OK ) ?1 :0 ; +SMC_SELECT_BANK (lp,2 );if (init || (old_carrier != new_carrier)) {if (!new_carrier) {
@@ -1224,11 +1224,11 @@ static void smc_eph_interrupt(struct netsmc_10bt_check_media (dev,0 ); -SMC_SELECT_BANK (1 ); - ctl =SMC_GET_CTL (); -SMC_SET_CTL (ctl & ~CTL_LE_ENABLE ); -SMC_SET_CTL (ctl); -SMC_SELECT_BANK (2 ); +SMC_SELECT_BANK (lp,1 ); + ctl =SMC_GET_CTL (lp); +SMC_SET_CTL (lp, ctl & ~CTL_LE_ENABLE ); +SMC_SET_CTL (lp, ctl); +SMC_SELECT_BANK (lp,2 ); }/*
@@ -1252,22 +1252,22 @@ static irqreturn_t smc_interrupt(int irq* ISR. */ SMC_INTERRUPT_PREAMBLE ; - saved_pointer =SMC_GET_PTR (); - mask =SMC_GET_INT_MASK (); -SMC_SET_INT_MASK (0 ); + saved_pointer =SMC_GET_PTR (lp); + mask =SMC_GET_INT_MASK (lp); +SMC_SET_INT_MASK (lp,0 );/* set a timeout value, so I don't stay here forever */ timeout =MAX_IRQ_LOOPS ; do { - status = SMC_GET_INT(); + status = SMC_GET_INT(lp); DBG(2, "%s: INT 0x%02x MASK 0x%02x MEM 0x%04x FIFO 0x%04x\n", dev->name, status, mask, - ({ int meminfo; SMC_SELECT_BANK(0); - meminfo = SMC_GET_MIR(); - SMC_SELECT_BANK(2); meminfo; }), - SMC_GET_FIFO()); + ({ int meminfo; SMC_SELECT_BANK(lp, 0); + meminfo = SMC_GET_MIR(lp); + SMC_SELECT_BANK(lp, 2); meminfo; }), + SMC_GET_FIFO(lp)); status &= mask; if (!status)
@@ -1277,7 +1277,7 @@ static irqreturn_t smc_interrupt(int irq/* do this before RX as it will free memory quickly */ DBG (3 ,"%s: TX int\n" , dev->name);smc_tx (dev); -SMC_ACK_INT (IM_TX_INT ); +SMC_ACK_INT (lp,IM_TX_INT );if (THROTTLE_TX_PKTS )netif_wake_queue (dev); }else if (status &IM_RCV_INT ) {
@@ -1292,9 +1292,9 @@ static irqreturn_t smc_interrupt(int irq mask &= ~IM_TX_EMPTY_INT ;/* update stats */ -SMC_SELECT_BANK (0 ); - card_stats =SMC_GET_COUNTER (); -SMC_SELECT_BANK (2 ); +SMC_SELECT_BANK (lp,0 ); + card_stats =SMC_GET_COUNTER (lp); +SMC_SELECT_BANK (lp,2 );/* single collisions */ dev->stats.collisions += card_stats &0xF ;
@@ -1304,26 +1304,26 @@ static irqreturn_t smc_interrupt(int irq dev->stats.collisions += card_stats &0xF ; }else if (status &IM_RX_OVRN_INT ) {DBG (1 ,"%s: RX overrun (EPH_ST 0x%04x)\n" , dev->name, - ({int eph_st;SMC_SELECT_BANK (0 ); - eph_st =SMC_GET_EPH_STATUS (); -SMC_SELECT_BANK (2 ); eph_st; }) ); -SMC_ACK_INT (IM_RX_OVRN_INT ); + ({int eph_st;SMC_SELECT_BANK (lp,0 ); + eph_st =SMC_GET_EPH_STATUS (lp); +SMC_SELECT_BANK (lp,2 ); eph_st; })); +SMC_ACK_INT (lp,IM_RX_OVRN_INT ); dev->stats.rx_errors++; dev->stats.rx_fifo_errors++; }else if (status &IM_EPH_INT ) {smc_eph_interrupt (dev); }else if (status &IM_MDINT ) { -SMC_ACK_INT (IM_MDINT ); +SMC_ACK_INT (lp,IM_MDINT );smc_phy_interrupt (dev); }else if (status &IM_ERCV_INT ) { -SMC_ACK_INT (IM_ERCV_INT ); +SMC_ACK_INT (lp,IM_ERCV_INT );PRINTK ("%s: UNSUPPORTED: ERCV INTERRUPT \n" , dev->name); } }while (--timeout);/* restore register states */ -SMC_SET_PTR (saved_pointer); -SMC_SET_INT_MASK (mask); +SMC_SET_PTR (lp, saved_pointer); +SMC_SET_INT_MASK (lp, mask);spin_unlock (&lp->lock);if (timeout ==MAX_IRQ_LOOPS )
@@ -1366,13 +1366,13 @@ static void smc_timeout(struct net_devicDBG (2 ,"%s: %s\n" , dev->name, __FUNCTION__);spin_lock_irq (&lp->lock); - status =SMC_GET_INT (); - mask =SMC_GET_INT_MASK (); - fifo =SMC_GET_FIFO (); -SMC_SELECT_BANK (0 ); - eph_st =SMC_GET_EPH_STATUS (); - meminfo =SMC_GET_MIR (); -SMC_SELECT_BANK (2 ); + status =SMC_GET_INT (lp); + mask =SMC_GET_INT_MASK (lp); + fifo =SMC_GET_FIFO (lp); +SMC_SELECT_BANK (lp,0 ); + eph_st =SMC_GET_EPH_STATUS (lp); + meminfo =SMC_GET_MIR (lp); +SMC_SELECT_BANK (lp,2 );spin_unlock_irq (&lp->lock); PRINTK( "%s: TX timeout (INT 0x%02x INTMASK 0x%02x " "MEM 0x%04x FIFO 0x%04x EPH_ST 0x%04x)\n",
@@ -1492,13 +1492,13 @@ static void smc_set_multicast_list(struc }spin_lock_irq (&lp->lock); -SMC_SELECT_BANK (0 ); -SMC_SET_RCR (lp->rcr_cur_mode); +SMC_SELECT_BANK (lp,0 ); +SMC_SET_RCR (lp, lp->rcr_cur_mode);if (update_multicast) { -SMC_SELECT_BANK (3 ); -SMC_SET_MCAST (multicast_table); +SMC_SELECT_BANK (lp,3 ); +SMC_SET_MCAST (lp, multicast_table); } -SMC_SELECT_BANK (2 ); +SMC_SELECT_BANK (lp,2 );spin_unlock_irq (&lp->lock); }
@@ -1702,8 +1702,9 @@ static const struct ethtool_ops smc_etht* I just deleted auto_irq.c, since it was never built... * --jgarzik */ -static int __init smc_findirq (void __iomem *ioaddr) +static int __init smc_findirq (struct smc_local *lp) { +void __iomem *ioaddr = lp->base;int timeout =20 ;unsigned long cookie;
@@ -1717,14 +1718,14 @@ static int __init smc_findirq(void __iom* when done. */ /* enable ALLOCation interrupts ONLY */ -SMC_SELECT_BANK (2 ); -SMC_SET_INT_MASK (IM_ALLOC_INT ); +SMC_SELECT_BANK (lp,2 ); +SMC_SET_INT_MASK (lp,IM_ALLOC_INT );/* * Allocate 512 bytes of memory. Note that the chip was just * reset so all the memory is available */ -SMC_SET_MMU_CMD (MC_ALLOC |1 ); +SMC_SET_MMU_CMD (lp,MC_ALLOC |1 );/* * Wait until positive that the interrupt has been generated
@@ -1732,7 +1733,7 @@ static int __init smc_findirq(void __iomdo {int int_status;udelay (10 ); - int_status =SMC_GET_INT (); + int_status =SMC_GET_INT (lp);if (int_status &IM_ALLOC_INT )break ;/* got the interrupt */ }while (--timeout);
@@ -1745,7 +1746,7 @@ static int __init smc_findirq(void __iom*/ /* and disable all interrupts again */ -SMC_SET_INT_MASK (0 ); +SMC_SET_INT_MASK (lp,0 );/* and return what I found */ return probe_irq_off (cookie);
@@ -1788,7 +1789,7 @@ static int __init smc_probe(struct net_dDBG (2 ,"%s: %s\n" ,CARDNAME , __FUNCTION__);/* First, see if the high byte is 0x33 */ - val =SMC_CURRENT_BANK (); + val =SMC_CURRENT_BANK (lp);DBG (2 ,"%s: bank signature probe returned 0x%04x\n" ,CARDNAME , val);if ((val &0xFF00 ) !=0x3300 ) {if ((val &0xFF ) ==0x33 ) {
@@ -1804,8 +1805,8 @@ static int __init smc_probe(struct net_d* The above MIGHT indicate a device, but I need to write to * further test this. */ -SMC_SELECT_BANK (0 ); - val =SMC_CURRENT_BANK (); +SMC_SELECT_BANK (lp,0 ); + val =SMC_CURRENT_BANK (lp);if ((val &0xFF00 ) !=0x3300 ) { retval = -ENODEV ; goto err_out;
@@ -1817,8 +1818,8 @@ static int __init smc_probe(struct net_d* register to bank 1, so I can access the base address * register */ -SMC_SELECT_BANK (1 ); - val =SMC_GET_BASE (); +SMC_SELECT_BANK (lp,1 ); + val =SMC_GET_BASE (lp); val = ((val &0x1F00 ) >>3 ) <<SMC_IO_SHIFT ;if (((unsigned int )ioaddr & (0x3e0 <<SMC_IO_SHIFT )) != val) { printk("%s: IOADDR %p doesn't match configuration (%x).\n",
@@ -1830,8 +1831,8 @@ static int __init smc_probe(struct net_d* recognize. These might need to be added to later, * as future revisions could be added. */ -SMC_SELECT_BANK (3 ); - revision_register =SMC_GET_REV (); +SMC_SELECT_BANK (lp,3 ); + revision_register =SMC_GET_REV (lp);DBG (2 ,"%s: revision = 0x%04x\n" ,CARDNAME , revision_register); version_string = chip_ids[ (revision_register >>4 ) &0xF ];if (!version_string || (revision_register &0xff00 ) !=0x3300 ) {
@@ -1855,8 +1856,8 @@ static int __init smc_probe(struct net_dspin_lock_init (&lp->lock);/* Get the MAC address */ -SMC_SELECT_BANK (1 ); -SMC_GET_MAC_ADDR (dev->dev_addr); +SMC_SELECT_BANK (lp,1 ); +SMC_GET_MAC_ADDR (lp, dev->dev_addr);/* now, reset the chip, and put it into a known state */ smc_reset (dev);
@@ -1881,7 +1882,7 @@ static int __init smc_probe(struct net_d trials =3 ;while (trials--) { - dev->irq =smc_findirq (ioaddr); + dev->irq =smc_findirq (lp);if (dev->irq)break ;/* kick the card and try again */
drivers/net/smc91x.h +129 -125
525 lines not on this page · raw message
Re: [PATCH 01/04] smc91x: pass along private data
Quoted 9 lines · Magnus Damm
Pass a private data pointer to macros and functions. This makes it easy to later on make run time decisions. This patch does not change any logic. These changes should be optimized away during compilation.
Signed-off-by Magnus Damm <[email protected]>---
drivers/net/smc91x.c static void PRINT_PKT(u_char *buf, int l · line 226
Quoted 10 lines
drivers/net/smc91x.c +3
-3@@ -220,23 +220,23 @@ static void PRINT_PKT(u_char *buf, int l/* this enables an interrupt in the interrupt mask register */ -#define SMC_ENABLE_INT (x) do { \ +#define SMC_ENABLE_INT (priv, x) do { \ unsigned char mask; \ - spin_lock_irq(&lp->lock); \ - mask = SMC_GET_INT_MASK(); \ + spin_lock_irq(&priv->lock); \ + mask = SMC_GET_INT_MASK(priv); \
Since "lp" is already used all over the place, could you simply use "lp" for the macro argument name as well instead of "priv"? This will make the code more uniform and reduce the patch size.
Nicolas
Re: [PATCH 01/04] smc91x: pass along private data
Quoted 14 lines · Nicolas Pitre
Quoted 12 lines · Magnus Damm
Pass a private data pointer to macros and functions. This makes it easy to later on make run time decisions. This patch does not change any logic. These changes should be optimized away during compilation.
Signed-off-by Magnus Damm <[email protected]>---
drivers/net/smc91x.c 2008-02-20 16:52:48.000000000 +0900 renamed from drivers/net/smc91x.c +0
-0@@ -220,23 +220,23 @@ static void PRINT_PKT(u_char *buf, int l
Quoted 12 lines
drivers/net/smc91x.c 2008-02-20 16:52:48.000000000 +0900 static void PRINT_PKT(u_char *buf, int l · line 226
Quoted 8 lines
drivers/net/smc91x.c 2008-02-20 16:52:48.000000000 +0900 renamed from drivers/net/smc91x.c +3
-3/* this enables an interrupt in the interrupt mask register */ -#define SMC_ENABLE_INT(x) do { \ +#define SMC_ENABLE_INT(priv, x) do { \ unsigned char mask; \ - spin_lock_irq(&lp->lock); \ - mask = SMC_GET_INT_MASK(); \ + spin_lock_irq(&priv->lock); \ + mask = SMC_GET_INT_MASK(priv); \Since "lp" is already used all over the place, could you simply use "lp" for the macro argument name as well instead of "priv"? This will make the code more uniform and reduce the patch size.
I used the name "priv" instead of "lp" intentionally to make sure I got compile errors if I missed something. Some variables like "ioaddr" are today not passed as arguments to the macros but simply assumed to be present as local variables. I wanted to avoid using the local "lp" variable by mistake. So the "priv" name is actually a feature. =)
I'd be happy to rewrite the patch to use "lp" though, but I have to confess that I don't see the point in redoing it. Anyway, please let me know what you prefer.
Thank you.
/ magnus
Re: [PATCH 01/04] smc91x: pass along private data
Quoted 28 lines · Magnus Damm
Quoted 14 lines · Nicolas Pitre
Quoted 12 lines · Magnus Damm
Pass a private data pointer to macros and functions. This makes it easy to later on make run time decisions. This patch does not change any logic. These changes should be optimized away during compilation.
Signed-off-by Magnus Damm <[email protected]>---
drivers/net/smc91x.c 2008-02-20 16:52:48.000000000 +0900 renamed from drivers/net/smc91x.c +0
-0@@ -220,23 +220,23 @@ static void PRINT_PKT(u_char *buf, int lQuoted 12 lines
drivers/net/smc91x.c 2008-02-20 16:52:48.000000000 +0900 static void PRINT_PKT(u_char *buf, int l · line 226
Quoted 8 lines
drivers/net/smc91x.c 2008-02-20 16:52:48.000000000 +0900 renamed from drivers/net/smc91x.c +3
-3/* this enables an interrupt in the interrupt mask register */ -#define SMC_ENABLE_INT(x) do { \ +#define SMC_ENABLE_INT(priv, x) do { \ unsigned char mask; \ - spin_lock_irq(&lp->lock); \ - mask = SMC_GET_INT_MASK(); \ + spin_lock_irq(&priv->lock); \ + mask = SMC_GET_INT_MASK(priv); \Since "lp" is already used all over the place, could you simply use "lp" for the macro argument name as well instead of "priv"? This will make the code more uniform and reduce the patch size.
Quoted 5 lines
I used the name "priv" instead of "lp" intentionally to make sure I got compile errors if I missed something. Some variables like "ioaddr" are today not passed as arguments to the macros but simply assumed to be present as local variables. I wanted to avoid using the local "lp" variable by mistake. So the "priv" name is actually a feature. =)
Well, you end up using the local lp variable in all cases anyway.
Quoted 3 lines
I'd be happy to rewrite the patch to use "lp" though, but I have to confess that I don't see the point in redoing it. Anyway, please let me know what you prefer.
I do prefer to have lp everywhere. But you simply have to search and replace "priv" with "lp" in the patch directly. Then just applying it and rediffing will take care of the simplification.
Nicolas
PATCH 2/4 smc91x: introduce platform data flags
In reply to Magnus DammThis patch introduces struct smc91x_platdata and modifies the driver so bus width is checked during run time using SMC_nBIT() instead of SMC_CAN_USE_nBIT.
---
drivers/net/smc91x.c | 31 ++++++++++++++++++++++++----- drivers/net/smc91x.h | 50 ++++++++++++++++++++++++++---------------------- include/linux/smc91x.h | 13 ++++++++++++ 3 files changed, 67 insertions(+), 27 deletions(-)
drivers/net/smc91x.c +26 -5
@@ -1997,6 +1997,8 @@ err_out:static int smc_enable_device (struct platform_device *pdev) { +struct net_device *ndev =platform_get_drvdata (pdev); +struct smc_local *lp =netdev_priv (ndev);unsigned long flags;unsigned char ecor, ecsr;void __iomem *addr;
@@ -2039,7 +2041,7 @@ static int smc_enable_device(struct plat* Set the appropriate byte/word mode. */ ecsr =readb (addr + (ECSR <<SMC_IO_SHIFT )) & ~ECSR_IOIS8 ; -if (!SMC_CAN_USE_16BIT ) +if (!SMC_16BIT (lp)) ecsr |=ECSR_IOIS8 ;writeb (ecsr, addr + (ECSR <<SMC_IO_SHIFT ));local_irq_restore (flags);
@@ -2124,10 +2126,11 @@ static void smc_release_datacs(struct pl*/ static int smc_drv_probe (struct platform_device *pdev) { +struct smc91x_platdata *pd = pdev->dev.platform_data; +struct smc_local *lp;struct net_device *ndev;struct resource *res, *ires;unsigned int __iomem *addr; -unsigned long irq_flags =SMC_IRQ_FLAGS ;int ret; res =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"smc91x-regs" );
@@ -2152,6 +2155,24 @@ static int smc_drv_probe(struct platform }SET_NETDEV_DEV (ndev, &pdev->dev); +/* get configuration from platform data, only allow use of +* bus width if both SMC_CAN_USE_xxx and SMC91X_USE_xxx are set. +*/ + + lp =netdev_priv (ndev); +if (pd) +memcpy (&lp->cfg, pd,sizeof (lp->cfg)); +else { + lp->cfg.flags =SMC91X_USE_8BIT ; + lp->cfg.flags |=SMC91X_USE_16BIT ; + lp->cfg.flags |=SMC91X_USE_32BIT ; + lp->cfg.irq_flags =SMC_IRQ_FLAGS ; + } + + lp->cfg.flags &= ~(SMC_CAN_USE_8BIT ?0 :SMC91X_USE_8BIT ); + lp->cfg.flags &= ~(SMC_CAN_USE_16BIT ?0 :SMC91X_USE_16BIT ); + lp->cfg.flags &= ~(SMC_CAN_USE_32BIT ?0 :SMC91X_USE_32BIT ); + ndev->dma = (unsigned char )-1 ; ires =platform_get_resource (pdev,IORESOURCE_IRQ ,0 );
@@ -2162,7 +2183,7 @@ static int smc_drv_probe(struct platform ndev->irq = ires->start;if (SMC_IRQ_FLAGS ==-1 ) - irq_flags = ires->flags &IRQF_TRIGGER_MASK ; + lp->cfg.irq_flags = ires->flags &IRQF_TRIGGER_MASK ; ret =smc_request_attrib (pdev);if (ret)
@@ -2170,6 +2191,7 @@ static int smc_drv_probe(struct platform#if defined(CONFIG_SA1100_ASSABET )NCR_0 |=NCR_ENET_OSC_EN ;#endif +platform_set_drvdata (pdev, ndev); ret =smc_enable_device (pdev);if (ret) goto out_release_attrib;
@@ -2188,8 +2210,7 @@ static int smc_drv_probe(struct platform }#endif -platform_set_drvdata (pdev, ndev); - ret =smc_probe (ndev, addr, irq_flags); + ret =smc_probe (ndev, addr, lp->cfg.irq_flags);if (ret !=0 ) goto out_iounmap;
drivers/net/smc91x.h +28 -22
161 lines not on this page · raw message
include/linux/smc91x.h new file +13 -0
@@ -0,0 +1,13 @@ +#ifndef __SMC91X_H__ +#define __SMC91X_H__ + +#define SMC91X_USE_8BIT (1 << 0) +#define SMC91X_USE_16BIT (1 << 1) +#define SMC91X_USE_32BIT (1 << 2) + +struct smc91x_platdata { +unsigned long flags; +unsigned long irq_flags;/* IRQF_... */ +}; + +#endif /* __SMC91X_H__ */
Nicolas Pitre
NAKRe: [PATCH 02/04] smc91x: introduce platform data flags
Quoted 6 lines · Magnus Damm
This patch introduces struct
smc91x_platdataand modifies the driver so bus width is checked during run time usingSMC_nBIT()instead ofSMC_CAN_USE_nBIT.Signed-off-by Magnus Damm <[email protected]>---
NAK.
The SMC91C111 (for example) is often used on devices which have a CPU clock barely higher than the network throughput, hence it is crutial for those devices to have the most efficient access possible to the chip or performance will suffer. This is the main reason behind the heavily macroized register access so things are always optimized for the data bus capabilities at compile time.
This patch introduces a runtimes test on lp->cfg.flags for every register access even on those platforms not using the platform data based bus configuration at all.
I think you should add a SMC_DYNAMIC_BUS_CONFIG and redefine SMC_nBITS() so they dereference cfg.flags only when it is defined.
Nicolas
Re: [PATCH 02/04] smc91x: introduce platform data flags
Quoted 9 lines · Nicolas Pitre
Quoted 6 lines · Magnus Damm
This patch introduces struct
smc91x_platdataand modifies the driver so bus width is checked during run time usingSMC_nBIT()instead ofSMC_CAN_USE_nBIT.Signed-off-by Magnus Damm <[email protected]>---
Quoted 8 lines
NAK.
The SMC91C111 (for example) is often used on devices which have a CPU clock barely higher than the network throughput, hence it is crutial for those devices to have the most efficient access possible to the chip or performance will suffer. This is the main reason behind the heavily macroized register access so things are always optimized for the data bus capabilities at compile time.
I understand that you want to keep the code as fast as possible. So do I. But I want to remove the need to modify smc91x.h for each board I want to support. It is much better in my opinion to have a wide range of boards supported but a little bit lower throughput compared to only a few boards supported and excellent performance... People can always modify the header file by themselves if they want to squeeze out that extra percent of performance. But maybe that's just me wanting to support more boards than I have time for. =)
Quoted 3 lines
This patch introduces a runtimes test on
lp->cfg.flagsfor every register access even on those platforms not using the platform data based bus configuration at all.
Right. It's kind of hard to avoid the check if you want to select the bus width using platform data though... =) I understand you want to keep the compile time optimization working well, and this patch is not so good in that regard.
Quoted 2 lines
I think you should add a
SMC_DYNAMIC_BUS_CONFIGand redefineSMC_nBITS()so they dereference cfg.flags only when it is defined.
Sure, good idea. I'll fix that. Do you mind if I make that the default behavior? So boards that doesn't have any hard coded configuration in smc91x.h can use the platform data flags method for configuration instead.
Thanks for your feedback!
/ magnus
Re: [PATCH 02/04] smc91x: introduce platform data flags
Quoted 19 lines · Magnus Damm
Quoted 9 lines · Nicolas Pitre
Quoted 6 lines · Magnus Damm
This patch introduces struct
smc91x_platdataand modifies the driver so bus width is checked during run time usingSMC_nBIT()instead ofSMC_CAN_USE_nBIT.Signed-off-by Magnus Damm <[email protected]>---
Quoted 8 lines
NAK.
The SMC91C111 (for example) is often used on devices which have a CPU clock barely higher than the network throughput, hence it is crutial for those devices to have the most efficient access possible to the chip or performance will suffer. This is the main reason behind the heavily macroized register access so things are always optimized for the data bus capabilities at compile time.
Quoted 7 lines
I understand that you want to keep the code as fast as possible. So do I. But I want to remove the need to modify
smc91x.hfor each board I want to support. It is much better in my opinion to have a wide range of boards supported but a little bit lower throughput compared to only a few boards supported and excellent performance... People can always modify the header file by themselves if they want to squeeze out that extra percent of performance.
Sure. That's perfectly fine for new boards. But existing setups should not regress due to this change.
Quoted 7 lines
Quoted 2 lines
I think you should add a
SMC_DYNAMIC_BUS_CONFIGand redefineSMC_nBITS()so they dereference cfg.flags only when it is defined.Sure, good idea. I'll fix that. Do you mind if I make that the default behavior? So boards that doesn't have any hard coded configuration in
smc91x.hcan use the platform data flags method for configuration instead.
Yes, that's fine.
Nicolas
PATCH 3/4 smc91x: make superh use default config
In reply to Magnus DammRemoves superh board specific configuration from the header file. These boards will instead be configured using platform data.
---
drivers/net/smc91x.h | 30 ------------------------------ 1 file changed, 30 deletions(-)
drivers/net/smc91x.h +0 -30
@@ -292,36 +292,6 @@ SMC_outw(u16 val, void __iomem *ioaddr,#define SMC_insw (a, r, p, l) insw((a) + (r), p, l)#define SMC_outsw (a, r, p, l) outsw((a) + (r), p, l) -#elif defined(CONFIG_SUPERH ) - -#ifdef CONFIG_SOLUTION_ENGINE -#define SMC_IRQ_FLAGS (0) -#define SMC_CAN_USE_8BIT 0 -#define SMC_CAN_USE_16BIT 1 -#define SMC_CAN_USE_32BIT 0 -#define SMC_IO_SHIFT 0 -#define SMC_NOWAIT 1 - -#define SMC_inw (a, r) inw((a) + (r)) -#define SMC_outw (v, a, r) outw(v, (a) + (r)) -#define SMC_insw (a, r, p, l) insw((a) + (r), p, l) -#define SMC_outsw (a, r, p, l) outsw((a) + (r), p, l) - -#else /* BOARDS */ - -#define SMC_CAN_USE_8BIT 1 -#define SMC_CAN_USE_16BIT 1 -#define SMC_CAN_USE_32BIT 0 - -#define SMC_inb (a, r) inb((a) + (r)) -#define SMC_inw (a, r) inw((a) + (r)) -#define SMC_outb (v, a, r) outb(v, (a) + (r)) -#define SMC_outw (v, a, r) outw(v, (a) + (r)) -#define SMC_insw (a, r, p, l) insw((a) + (r), p, l) -#define SMC_outsw (a, r, p, l) outsw((a) + (r), p, l) - -#endif /* BOARDS */ -#elif defined(CONFIG_M32R )#define SMC_CAN_USE_8BIT 0
PATCH 4/4 smc91x: add insw/outsw to default config
In reply to Magnus DammThis patch makes sure SMC_insw()/SMC_outsw() are defined for the default configuration. Without this change BUG()s will be triggered when using 16-bit only platform data and the default configuration.
---
drivers/net/smc91x.h | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/smc91x.h +2 -0
@@ -446,6 +446,8 @@ static inline void LPD7_SMC_outsw (unsig#define SMC_outb (v, a, r) writeb(v, (a) + (r))#define SMC_outw (v, a, r) writew(v, (a) + (r))#define SMC_outl (v, a, r) writel(v, (a) + (r)) +#define SMC_insw (a, r, p, l) readsw((a) + (r), p, l) +#define SMC_outsw (a, r, p, l) writesw((a) + (r), p, l)#define SMC_insl (a, r, p, l) readsl((a) + (r), p, l)#define SMC_outsl (a, r, p, l) writesl((a) + (r), p, l)
Re: [PATCH 04/04] smc91x: add insw/outsw to default config
Quoted 5 lines · Magnus Damm
This patch makes sure SMC_insw()/SMC_outsw() are defined for the default configuration. Without this change BUG()s will be triggered when using 16-bit only platform data and the default configuration.
Signed-off-by Magnus Damm <[email protected]>
You should have introduced this patch as 3/4 instead of 4/4 so to make sure the series won't create a non functional kernel between 3/4 and 4/4.
Nicolas
Re: [PATCH 04/04] smc91x: add insw/outsw to default config
Quoted 11 lines · Nicolas Pitre
Quoted 5 lines · Magnus Damm
This patch makes sure SMC_insw()/SMC_outsw() are defined for the default configuration. Without this change BUG()s will be triggered when using 16-bit only platform data and the default configuration.
Signed-off-by Magnus Damm <[email protected]>You should have introduced this patch as 3/4 instead of 4/4 so to make sure the series won't create a non functional kernel between 3/4 and 4/4.
Yes, you are right. At least in theory. =) In practice this doesn't matter so much since the boards modified by 3/4 are all in a half-assed state. I'm working on fixing that up though, and using platform data flags would be help a lot. =)
Speaking of smc91x and sh-boards, I guess the patch below is too late for 2.6.25? We have the rest of the board support bits in place already but no ethernet. I posted the smc91x patch below a bit too late unfortunately _and_ i forgot to CC you, so my bad.
http://www.mail-archive.com/[email protected]/msg61390.html
Thanks for your help!
/ magnus
Quoted 6 lines · Magnus Damm
These patches make it possible to request bus width in the platform data.
Instead of keep on updating
smc91x.hwith board specific configuration, use platform data to pass along bus width and irq flags to the driver. This change is designed to be backwards-compatible, so all boards configured in the header file should just work as usual.
Thank you for doing this work. I really meant to do it, and commit 09779c6df2dbe95483269d194b327d41fe2cc57e was the first step towards that goal, but as you can see we're nearly two years later and I didn't do it.
I have a few comments though. I will reply to those messages separately.
Nicolas
Quoted 9 lines · Nicolas Pitre
Quoted 6 lines · Magnus Damm
These patches make it possible to request bus width in the platform data.
Instead of keep on updating
smc91x.hwith board specific configuration, use platform data to pass along bus width and irq flags to the driver. This change is designed to be backwards-compatible, so all boards configured in the header file should just work as usual.
Quoted 4 lines
Thank you for doing this work. I really meant to do it, and commit
09779c6df2dbe95483269d194b327d41fe2cc57ewas the first step towards that goal, but as you can see we're nearly two years later and I didn't do it.
It's only a lot of boring search and replace work so I don't blame you for not doing it. =) I'm glad that you like the idea of keeping bus width flags with the platform data. Hopefully this will make it easier to support smc91x on a wide range of boards.
Quoted 2 lines
I have a few comments though. I will reply to those messages separately.
Great, thanks. Please let me know which way you think is the best and I'll rework the patches and repost.
Cheers,
/ magnus