Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4dbedf43 authored by Nathan Williams's avatar Nathan Williams Committed by David Woodhouse
Browse files

solos: support new FPGA RAM layout



Buffer sizes have been changed to 2048 bytes.
Flash upgrades use a dedicated RAM block.
Add support for daughterboard.

Signed-off-by: default avatarNathan Williams <nathan@traverse.com.au>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 1329f455
Loading
Loading
Loading
Loading
+62 −9
Original line number Original line Diff line number Diff line
@@ -59,21 +59,29 @@
#define RX_DMA_ADDR(port)	(0x30 + (4 * (port)))
#define RX_DMA_ADDR(port)	(0x30 + (4 * (port)))


#define DATA_RAM_SIZE	32768
#define DATA_RAM_SIZE	32768
#define BUF_SIZE	4096
#define BUF_SIZE	2048
#define OLD_BUF_SIZE	4096 /* For FPGA versions <= 2*/
#define FPGA_PAGE	528 /* FPGA flash page size*/
#define FPGA_PAGE	528 /* FPGA flash page size*/
#define SOLOS_PAGE	512 /* Solos flash page size*/
#define SOLOS_PAGE	512 /* Solos flash page size*/
#define FPGA_BLOCK	(FPGA_PAGE * 8) /* FPGA flash block size*/
#define FPGA_BLOCK	(FPGA_PAGE * 8) /* FPGA flash block size*/
#define SOLOS_BLOCK	(SOLOS_PAGE * 8) /* Solos flash block size*/
#define SOLOS_BLOCK	(SOLOS_PAGE * 8) /* Solos flash block size*/


#define RX_BUF(card, nr) ((card->buffers) + (nr)*BUF_SIZE*2)
#define RX_BUF(card, nr) ((card->buffers) + (nr)*(card->buffer_size)*2)
#define TX_BUF(card, nr) ((card->buffers) + (nr)*BUF_SIZE*2 + BUF_SIZE)
#define TX_BUF(card, nr) ((card->buffers) + (nr)*(card->buffer_size)*2 + (card->buffer_size))
#define FLASH_BUF ((card->buffers) + 4*(card->buffer_size)*2)


#define RX_DMA_SIZE	2048
#define RX_DMA_SIZE	2048


#define FPGA_VERSION(a,b) (((a) << 8) + (b))
#define LEGACY_BUFFERS	2
#define DMA_SUPPORTED	4

static int reset = 0;
static int reset = 0;
static int atmdebug = 0;
static int atmdebug = 0;
static int firmware_upgrade = 0;
static int firmware_upgrade = 0;
static int fpga_upgrade = 0;
static int fpga_upgrade = 0;
static int db_firmware_upgrade = 0;
static int db_fpga_upgrade = 0;


struct pkt_hdr {
struct pkt_hdr {
	__le16 size;
	__le16 size;
@@ -116,6 +124,8 @@ struct solos_card {
	wait_queue_head_t param_wq;
	wait_queue_head_t param_wq;
	wait_queue_head_t fw_wq;
	wait_queue_head_t fw_wq;
	int using_dma;
	int using_dma;
	int fpga_version;
	int buffer_size;
};
};




@@ -136,10 +146,14 @@ MODULE_PARM_DESC(reset, "Reset Solos chips on startup");
MODULE_PARM_DESC(atmdebug, "Print ATM data");
MODULE_PARM_DESC(atmdebug, "Print ATM data");
MODULE_PARM_DESC(firmware_upgrade, "Initiate Solos firmware upgrade");
MODULE_PARM_DESC(firmware_upgrade, "Initiate Solos firmware upgrade");
MODULE_PARM_DESC(fpga_upgrade, "Initiate FPGA upgrade");
MODULE_PARM_DESC(fpga_upgrade, "Initiate FPGA upgrade");
MODULE_PARM_DESC(db_firmware_upgrade, "Initiate daughter board Solos firmware upgrade");
MODULE_PARM_DESC(db_fpga_upgrade, "Initiate daughter board FPGA upgrade");
module_param(reset, int, 0444);
module_param(reset, int, 0444);
module_param(atmdebug, int, 0644);
module_param(atmdebug, int, 0644);
module_param(firmware_upgrade, int, 0444);
module_param(firmware_upgrade, int, 0444);
module_param(fpga_upgrade, int, 0444);
module_param(fpga_upgrade, int, 0444);
module_param(db_firmware_upgrade, int, 0444);
module_param(db_fpga_upgrade, int, 0444);


static void fpga_queue(struct solos_card *card, int port, struct sk_buff *skb,
static void fpga_queue(struct solos_card *card, int port, struct sk_buff *skb,
		       struct atm_vcc *vcc);
		       struct atm_vcc *vcc);
@@ -517,9 +531,31 @@ static int flash_upgrade(struct solos_card *card, int chip)
	if (chip == 0) {
	if (chip == 0) {
		fw_name = "solos-FPGA.bin";
		fw_name = "solos-FPGA.bin";
		blocksize = FPGA_BLOCK;
		blocksize = FPGA_BLOCK;
	} 
	
	if (chip == 1) {
		fw_name = "solos-Firmware.bin";
		blocksize = SOLOS_BLOCK;
	}
	
	if (chip == 2){
		if (card->fpga_version > LEGACY_BUFFERS){
			fw_name = "solos-db-FPGA.bin";
			blocksize = FPGA_BLOCK;
		} else {
		} else {
			dev_info(&card->dev->dev, "FPGA version doesn't support daughter board upgrades\n");
			return -EPERM;
		}
	}
	
	if (chip == 3){
		if (card->fpga_version > LEGACY_BUFFERS){
			fw_name = "solos-Firmware.bin";
			fw_name = "solos-Firmware.bin";
			blocksize = SOLOS_BLOCK;
			blocksize = SOLOS_BLOCK;
		} else {
		dev_info(&card->dev->dev, "FPGA version doesn't support daughter board upgrades\n");
		return -EPERM;
		}
	}
	}


	if (request_firmware(&fw, fw_name, &card->dev->dev))
	if (request_firmware(&fw, fw_name, &card->dev->dev))
@@ -536,8 +572,10 @@ static int flash_upgrade(struct solos_card *card, int chip)
	data32 = ioread32(card->config_regs + FPGA_MODE); 
	data32 = ioread32(card->config_regs + FPGA_MODE); 


	/* Set mode to Chip Erase */
	/* Set mode to Chip Erase */
	dev_info(&card->dev->dev, "Set FPGA Flash mode to %s Chip Erase\n",
	if(chip == 0 || chip == 2)
		 chip?"Solos":"FPGA");
		dev_info(&card->dev->dev, "Set FPGA Flash mode to FPGA Chip Erase\n");
	if(chip == 1 || chip == 3)
		dev_info(&card->dev->dev, "Set FPGA Flash mode to Solos Chip Erase\n");
	iowrite32((chip * 2), card->config_regs + FLASH_MODE);
	iowrite32((chip * 2), card->config_regs + FLASH_MODE);




@@ -557,6 +595,9 @@ static int flash_upgrade(struct solos_card *card, int chip)
		/* Copy block to buffer, swapping each 16 bits */
		/* Copy block to buffer, swapping each 16 bits */
		for(i = 0; i < blocksize; i += 4) {
		for(i = 0; i < blocksize; i += 4) {
			uint32_t word = swahb32p((uint32_t *)(fw->data + offset + i));
			uint32_t word = swahb32p((uint32_t *)(fw->data + offset + i));
			if(card->fpga_version > LEGACY_BUFFERS)
				iowrite32(word, FLASH_BUF + i);
			else
				iowrite32(word, RX_BUF(card, 3) + i);
				iowrite32(word, RX_BUF(card, 3) + i);
		}
		}


@@ -1094,12 +1135,18 @@ static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id)
	fpga_ver = (data32 & 0x0000FFFF);
	fpga_ver = (data32 & 0x0000FFFF);
	major_ver = ((data32 & 0xFF000000) >> 24);
	major_ver = ((data32 & 0xFF000000) >> 24);
	minor_ver = ((data32 & 0x00FF0000) >> 16);
	minor_ver = ((data32 & 0x00FF0000) >> 16);
	card->fpga_version = FPGA_VERSION(major_ver,minor_ver);
	if (card->fpga_version > LEGACY_BUFFERS)
		card->buffer_size = BUF_SIZE;
	else
		card->buffer_size = OLD_BUF_SIZE;
	dev_info(&dev->dev, "Solos FPGA Version %d.%02d svn-%d\n",
	dev_info(&dev->dev, "Solos FPGA Version %d.%02d svn-%d\n",
		 major_ver, minor_ver, fpga_ver);
		 major_ver, minor_ver, fpga_ver);


	if (0 && fpga_ver > 27)
	if (card->fpga_version >= DMA_SUPPORTED){
		card->using_dma = 1;
		card->using_dma = 1;
	else {
	} else {
		card->using_dma = 0;
		/* Set RX empty flag for all ports */
		/* Set RX empty flag for all ports */
		iowrite32(0xF0, card->config_regs + FLAGS_ADDR);
		iowrite32(0xF0, card->config_regs + FLAGS_ADDR);
	}
	}
@@ -1131,6 +1178,12 @@ static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id)
	if (firmware_upgrade)
	if (firmware_upgrade)
		flash_upgrade(card, 1);
		flash_upgrade(card, 1);


	if (db_fpga_upgrade)
		flash_upgrade(card, 2);

	if (db_firmware_upgrade)
		flash_upgrade(card, 3);

	err = atm_init(card);
	err = atm_init(card);
	if (err)
	if (err)
		goto out_free_irq;
		goto out_free_irq;