[PATCH 26/30] solos: Set RX empty flag at startup only for !dma mode

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: David Woodhouse
Date: Tuesday, March 17, 2009 - 2:29 pm

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
---
 drivers/atm/solos-pci.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
index df01682..7c26bd2 100644
--- a/drivers/atm/solos-pci.c
+++ b/drivers/atm/solos-pci.c
@@ -1090,8 +1090,6 @@ static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id)
 		iowrite32(0, card->config_regs + FPGA_MODE);
 		data32 = ioread32(card->config_regs + FPGA_MODE); 
 	}
-	//Set RX empty flags
-	iowrite32(0xF0, card->config_regs + FLAGS_ADDR);
 
 	data32 = ioread32(card->config_regs + FPGA_VER);
 	fpga_ver = (data32 & 0x0000FFFF);
@@ -1102,6 +1100,10 @@ static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id)
 
 	if (fpga_ver > 27)
 		card->using_dma = 1;
+	else {
+		/* Set RX empty flag for all ports */
+		iowrite32(0xF0, card->config_regs + FLAGS_ADDR);
+	}
 
 	card->nr_ports = 2; /* FIXME: Detect daughterboard */
 
-- 
1.6.0.6


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[GIT *] Solos PCI ADSL card update, David Woodhouse, (Tue Mar 17, 10:19 am)
Re: [GIT *] Solos PCI ADSL card update, David Miller, (Tue Mar 17, 12:23 pm)
Re: [GIT *] Solos PCI ADSL card update, Stephen Hemminger, (Tue Mar 17, 1:41 pm)
[PATCH 01/30] solos: Fix length header in FPGA transfers, David Woodhouse, (Tue Mar 17, 2:29 pm)
[PATCH 02/30] solos: Slight debugging improvements, David Woodhouse, (Tue Mar 17, 2:29 pm)
[PATCH 03/30] solos: FPGA and firmware update support., David Woodhouse, (Tue Mar 17, 2:29 pm)
[PATCH 04/30] solos: Clean up firmware loading code, David Woodhouse, (Tue Mar 17, 2:29 pm)
[PATCH 05/30] solos: Kill global 'opens' count., David Woodhouse, (Tue Mar 17, 2:29 pm)
[PATCH 07/30] solos: Add initial list of parameters, David Woodhouse, (Tue Mar 17, 2:29 pm)
[PATCH 10/30] solos: Reject non-AAL5 connections.... for now, David Woodhouse, (Tue Mar 17, 2:29 pm)
[PATCH 14/30] solos: First attempt at DMA support, David Woodhouse, (Tue Mar 17, 2:29 pm)
[PATCH 17/30] solos: Remove unused loopback debug stuff, David Woodhouse, (Tue Mar 17, 2:29 pm)
[PATCH 25/30] solos: Don't clear config registers at startup, David Woodhouse, (Tue Mar 17, 2:29 pm)
[PATCH 26/30] solos: Set RX empty flag at startup only for ..., David Woodhouse, (Tue Mar 17, 2:29 pm)
[PATCH 29/30] solos: Automatically determine number of ports, David Woodhouse, (Tue Mar 17, 2:29 pm)
Re: [GIT *] Solos PCI ADSL card update, David Woodhouse, (Tue Mar 17, 2:33 pm)
Re: [GIT *] Solos PCI ADSL card update, David Woodhouse, (Tue Mar 17, 2:36 pm)
Re: [PATCH 06/30] solos: Handle attribute show/store in ke ..., Stephen Hemminger, (Tue Mar 17, 3:44 pm)