From: Alan Cox <alan@linux.intel.com>

Now we have it trimmed down a bit merge the two pieces so we can clean it up
properly. Code moves but no changes in functions.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
 drivers/staging/sep/Makefile                       |    2 +-
 .../staging/sep/{sep_main_mod.c => sep_driver.c}   |  411 +++++++++++++++++-
 drivers/staging/sep/sep_ext_with_pci_driver.c      |  460 --------------------
 3 files changed, 404 insertions(+), 469 deletions(-)
 rename drivers/staging/sep/{sep_main_mod.c => sep_driver.c} (87%)
 delete mode 100644 drivers/staging/sep/sep_ext_with_pci_driver.c

diff --git a/drivers/staging/sep/Makefile b/drivers/staging/sep/Makefile
index e2528e8..07b53c4 100644
--- a/drivers/staging/sep/Makefile
+++ b/drivers/staging/sep/Makefile
@@ -1,3 +1,3 @@
 EXTRA_CFLAGS += -DLITTLE__ENDIAN -DDX_CC5_SEP_PLAT -DCRYS_NO_EXT_IF_MODE_SUPPORT
 obj-$(CONFIG_DX_SEP) := sep_driver.o
-sep_driver-objs := sep_main_mod.o sep_ext_with_pci_driver.o
+
diff --git a/drivers/staging/sep/sep_main_mod.c b/drivers/staging/sep/sep_driver.c
similarity index 87%
rename from drivers/staging/sep/sep_main_mod.c
rename to drivers/staging/sep/sep_driver.c
index 372bd3a..60011b7 100644
--- a/drivers/staging/sep/sep_main_mod.c
+++ b/drivers/staging/sep/sep_driver.c
@@ -38,6 +38,8 @@
 #include <linux/mm.h>
 #include <linux/poll.h>
 #include <linux/wait.h>
+#include <linux/pci.h>
+#include <linux/firmware.h>
 #include <asm/ioctl.h>
 #include <linux/ioport.h>
 #include <asm/io.h>
@@ -50,18 +52,115 @@
 #include "sep_driver_ext_api.h"
 #include "sep_dev.h"
 
-/*----------------------------------------
-	DEFINES
------------------------------------------*/
+#if SEP_DRIVER_ARM_DEBUG_MODE
 
+#define  CRYS_SEP_ROM_length                  0x4000
+#define  CRYS_SEP_ROM_start_address           0x8000C000UL
+#define  CRYS_SEP_ROM_start_address_offset    0xC000UL
+#define  SEP_ROM_BANK_register                0x80008420UL
+#define  SEP_ROM_BANK_register_offset         0x8420UL
+#define SEP_RAR_IO_MEM_REGION_START_ADDRESS   0x82000000
 
-#define INT_MODULE_PARM(n, v) int n = v; module_param(n, int, 0)
+/*
+ * THESE 2 definitions are specific to the board - must be
+ * defined during integration
+ */
+#define SEP_RAR_IO_MEM_REGION_START_ADDRESS   0xFF0D0000
+
+/* 2M size */
+
+void sep_load_rom_code(void)
+{
+	/* Index variables */
+	unsigned long i, k, j;
+	unsigned long regVal;
+	unsigned long Error;
+	unsigned long warning;
+
+	/* Loading ROM from SEP_ROM_image.h file */
+	k = sizeof(CRYS_SEP_ROM);
+
+	edbg("SEP Driver: DX_CC_TST_SepRomLoader start\n");
+
+	edbg("SEP Driver: k is %lu\n", k);
+	edbg("SEP Driver: sep_dev->reg_base_address is %p\n", sep_dev->reg_base_address);
+	edbg("SEP Driver: CRYS_SEP_ROM_start_address_offset is %p\n", CRYS_SEP_ROM_start_address_offset);
+
+	for (i = 0; i < 4; i++) {
+		/* write bank */
+		sep_write_reg(sep_dev, SEP_ROM_BANK_register_offset, i);
+
+		for (j = 0; j < CRYS_SEP_ROM_length / 4; j++) {
+			sep_write_reg(sep_dev, CRYS_SEP_ROM_start_address_offset + 4 * j, CRYS_SEP_ROM[i * 0x1000 + j]);
+
+			k = k - 4;
+
+			if (k == 0) {
+				j = CRYS_SEP_ROM_length;
+				i = 4;
+			}
+		}
+	}
+
+	/* reset the SEP */
+	sep_write_reg(sep_dev, HW_HOST_SEP_SW_RST_REG_ADDR, 0x1);
+
+	/* poll for SEP ROM boot finish */
+	do {
+		retVal = sep_read_reg(sep_dev, HW_HOST_SEP_HOST_GPR3_REG_ADDR);
+	} while (!regVal);
+
+	edbg("SEP Driver: ROM polling ended\n");
+
+	switch (regVal) {
+	case 0x1:
+		/* fatal error - read erro status from GPRO */
+		Error = sep_read_reg(sep_dev, HW_HOST_SEP_HOST_GPR0_REG_ADDR);
+		edbg("SEP Driver: ROM polling case 1\n");
+		break;
+	case 0x2:
+		/* Boot First Phase ended  */
+		warning = sep_read_reg(sep_dev, HW_HOST_SEP_HOST_GPR0_REG_ADDR);
+		edbg("SEP Driver: ROM polling case 2\n");
+		break;
+	case 0x4:
+		/* Cold boot ended successfully  */
+		warning = sep_read_reg(sep_dev, HW_HOST_SEP_HOST_GPR0_REG_ADDR);
+		edbg("SEP Driver: ROM polling case 4\n");
+		Error = 0;
+		break;
+	case 0x8:
+		/* Warmboot ended successfully */
+		warning = sep_read_reg(sep_dev, HW_HOST_SEP_HOST_GPR0_REG_ADDR);
+		edbg("SEP Driver: ROM polling case 8\n");
+		Error = 0;
+		break;
+	case 0x10:
+		/* ColdWarm boot ended successfully */
+		warning = sep_read_reg(sep_dev, HW_HOST_SEP_HOST_GPR0_REG_ADDR);
+		edbg("SEP Driver: ROM polling case 16\n");
+		Error = 0;
+		break;
+	case 0x20:
+		edbg("SEP Driver: ROM polling case 32\n");
+		break;
+	}
+
+}
+
+#else
+void sep_load_rom_code(void) { }
+#endif				/* SEP_DRIVER_ARM_DEBUG_MODE */
 
-/*--------------------------------------
-  TYPEDEFS
-  -----------------------------------------*/
 
 
+/*----------------------------------------
+	DEFINES
+-----------------------------------------*/
+
+#define INT_MODULE_PARM(n, v) int n = v; module_param(n, int, 0)
+#define BASE_ADDRESS_FOR_SYSTEM 0xfffc0000
+#define SEP_RAR_IO_MEM_REGION_SIZE 0x40000
 
 /*--------------------------------------------
 	GLOBAL variables
@@ -71,6 +170,14 @@
 INT_MODULE_PARM(sepDebug, 0x0);
 MODULE_PARM_DESC(sepDebug, "Flag to enable SEP debug messages");
 
+/* Keep this a single static object for now to keep the conversion easy */
+
+static struct sep_device sep_instance;
+struct sep_device *sep_dev = &sep_instance;
+
+/* temporary */
+unsigned long jiffies_future;
+
 
 /*
   mutex for the access to the internals of the sep driver
@@ -288,6 +395,171 @@ static int sep_lock_user_pages(unsigned long app_virt_addr, unsigned long data_s
 -----------------------------------------------*/
 
 /*
+  This functions locks the area of the resisnd and cache sep code
+*/
+void sep_lock_cache_resident_area(void)
+{
+	return;
+}
+
+/*
+  This functions copies the cache and resident from their source location into
+  destination memory, which is external to Linux VM and is given as
+   physical address
+*/
+int sep_copy_cache_resident_to_area(unsigned long src_cache_addr, unsigned long cache_size_in_bytes, unsigned long src_resident_addr, unsigned long resident_size_in_bytes, unsigned long *dst_new_cache_addr_ptr, unsigned long *dst_new_resident_addr_ptr)
+{
+	unsigned long resident_addr;
+	unsigned long cache_addr;
+	const struct firmware *fw;
+
+	char *cache_name = "cache.image.bin";
+	char *res_name = "resident.image.bin";
+
+	/* error */
+	int error;
+
+	/*--------------------------------
+	    CODE
+	-------------------------------------*/
+	error = 0;
+
+	edbg("SEP Driver:rar_virtual is %p\n", sep_dev->rar_virtual_address);
+	edbg("SEP Driver:rar_physical is %08lx\n", sep_dev->rar_physical_address);
+
+	sep_dev->rar_region_addr = (unsigned long) sep_dev->rar_virtual_address;
+
+	sep_dev->cache_physical_address = sep_dev->rar_physical_address;
+	sep_dev->cache_virtual_address = sep_dev->rar_virtual_address;
+
+	/* load cache */
+	error = request_firmware(&fw, cache_name, &sep_dev->sep_pci_dev_ptr->dev);
+	if (error) {
+		edbg("SEP Driver:cant request cache fw\n");
+		goto end_function;
+	}
+
+	edbg("SEP Driver:cache data loc is %p\n", (void *) fw->data);
+	edbg("SEP Driver:cache data size is %08Zx\n", fw->size);
+
+	memcpy((void *) sep_dev->cache_virtual_address, (void *) fw->data, fw->size);
+
+	sep_dev->cache_size = fw->size;
+
+	cache_addr = (unsigned long) sep_dev->cache_virtual_address;
+
+	release_firmware(fw);
+
+	sep_dev->resident_physical_address = sep_dev->cache_physical_address + sep_dev->cache_size;
+	sep_dev->resident_virtual_address = sep_dev->cache_virtual_address + sep_dev->cache_size;
+
+	/* load resident */
+	error = request_firmware(&fw, res_name, &sep_dev->sep_pci_dev_ptr->dev);
+	if (error) {
+		edbg("SEP Driver:cant request res fw\n");
+		goto end_function;
+	}
+
+	edbg("SEP Driver:res data loc is %p\n", (void *) fw->data);
+	edbg("SEP Driver:res data size is %08Zx\n", fw->size);
+
+	memcpy((void *) sep_dev->resident_virtual_address, (void *) fw->data, fw->size);
+
+	sep_dev->resident_size = fw->size;
+
+	release_firmware(fw);
+
+	resident_addr = (unsigned long) sep_dev->resident_virtual_address;
+
+	edbg("SEP Driver:resident_addr (physical )is %08lx\n", sep_dev->resident_physical_address);
+	edbg("SEP Driver:cache_addr (physical) is %08lx\n", sep_dev->cache_physical_address);
+
+	edbg("SEP Driver:resident_addr (logical )is %08lx\n", resident_addr);
+	edbg("SEP Driver:cache_addr (logical) is %08lx\n", cache_addr);
+
+	edbg("SEP Driver:resident_size is %08lx\n", sep_dev->resident_size);
+	edbg("SEP Driver:cache_size is %08lx\n", sep_dev->cache_size);
+
+
+
+	/* physical addresses */
+	*dst_new_cache_addr_ptr = sep_dev->cache_physical_address;
+	*dst_new_resident_addr_ptr = sep_dev->resident_physical_address;
+end_function:
+	return error;
+}
+
+/*
+  This functions maps and allocates the
+  shared area on the  external RAM (device)
+  The input is shared_area_size - the size of the memory to
+  allocate. The outputs
+  are kernel_shared_area_addr_ptr - the kerenl
+  address of the mapped and allocated
+  shared area, and phys_shared_area_addr_ptr
+  - the physical address of the shared area
+*/
+int sep_map_and_alloc_shared_area(unsigned long shared_area_size, unsigned long *kernel_shared_area_addr_ptr, unsigned long *phys_shared_area_addr_ptr)
+{
+	// shared_virtual_address = ioremap_nocache(0xda00000,shared_area_size);
+	sep_dev->shared_virtual_address = kmalloc(shared_area_size, GFP_KERNEL);
+	if (!sep_dev->shared_virtual_address) {
+		edbg("sep_driver:shared memory kmalloc failed\n");
+		return -1;
+	}
+	/* FIXME */
+	sep_dev->shared_physical_address = __pa(sep_dev->shared_virtual_address);
+	/* shared_physical_address = 0xda00000; */
+	*kernel_shared_area_addr_ptr = (unsigned long) sep_dev->shared_virtual_address;
+	/* set the physical address of the shared area */
+	*phys_shared_area_addr_ptr = sep_dev->shared_physical_address;
+	edbg("SEP Driver:shared_virtual_address is %p\n", sep_dev->shared_virtual_address);
+	edbg("SEP Driver:shared_region_size is %08lx\n", shared_area_size);
+	edbg("SEP Driver:shared_physical_addr is %08lx\n", *phys_shared_area_addr_ptr);
+
+	return 0;
+}
+
+/*
+  This functions unmaps and deallocates the shared area
+  on the  external RAM (device)
+  The input is shared_area_size - the size of the memory to deallocate,kernel_
+  shared_area_addr_ptr - the kernel address of the mapped and allocated
+  shared area,phys_shared_area_addr_ptr - the physical address of
+  the shared area
+*/
+void sep_unmap_and_free_shared_area(unsigned long shared_area_size, unsigned long kernel_shared_area_addr, unsigned long phys_shared_area_addr)
+{
+	kfree((void *) kernel_shared_area_addr);
+}
+
+/*
+  This functions returns the physical address inside shared area according
+  to the virtual address. It can be either on the externa RAM device
+  (ioremapped), or on the system RAM
+  This implementation is for the external RAM
+*/
+unsigned long sep_shared_area_virt_to_phys(unsigned long virt_address)
+{
+	edbg("SEP Driver:sh virt to phys v %08lx\n", virt_address);
+	edbg("SEP Driver:sh virt to phys p %08lx\n", sep_dev->shared_physical_address + (virt_address - (unsigned long) sep_dev->shared_virtual_address));
+
+	return (unsigned long) sep_dev->shared_physical_address + (virt_address - (unsigned long) sep_dev->shared_virtual_address);
+}
+
+/*
+  This functions returns the virtual address inside shared area
+  according to the physical address. It can be either on the
+  externa RAM device (ioremapped), or on the system RAM This implementation
+  is for the external RAM
+*/
+unsigned long sep_shared_area_phys_to_virt(unsigned long phys_address)
+{
+	return (unsigned long) sep_dev->shared_virtual_address + (phys_address - sep_dev->shared_physical_address);
+}
+
+
+/*
   this function returns the address of the message shared area
 */
 void sep_map_shared_area(unsigned long *mappedAddr_ptr)
@@ -1860,7 +2132,6 @@ static int sep_start_handler(void)
 	if (reg_val == 0x1)
 		/* fatal error - read erro status from GPRO */
 		error = sep_read_reg(sep_dev, HW_HOST_SEP_HOST_GPR0_REG_ADDR);
-end_function:
 	dbg("SEP Driver:<-------- sep_start_handler end\n");
 	return error;
 }
@@ -2430,6 +2701,130 @@ static void sep_configure_dma_burst(void)
 
 }
 
+/*
+  function that is activaed on the succesfull probe of the SEP device
+*/
+static int __devinit sep_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+{
+	int error = 0;
+
+	edbg("Sep pci probe starting\n");
+
+	/* enable the device */
+	error = pci_enable_device(pdev);
+	if (error) {
+		edbg("error enabling pci device\n");
+		goto end_function;
+	}
+
+	/* set the pci dev pointer */
+	sep_dev->sep_pci_dev_ptr = pdev;
+
+	/* get the io memory start address */
+	sep_dev->io_memory_start_physical_address = pci_resource_start(pdev, 0);
+	if (!sep_dev->io_memory_start_physical_address) {
+		edbg("SEP Driver error pci resource start\n");
+		goto end_function;
+	}
+
+	/* get the io memory end address */
+	sep_dev->io_memory_end_physical_address = pci_resource_end(pdev, 0);
+	if (!sep_dev->io_memory_end_physical_address) {
+		edbg("SEP Driver error pci resource end\n");
+		goto end_function;
+	}
+
+	sep_dev->io_memory_size = sep_dev->io_memory_end_physical_address - sep_dev->io_memory_start_physical_address + 1;
+
+	edbg("SEP Driver:io_memory_start_physical_address is %08lx\n", sep_dev->io_memory_start_physical_address);
+
+	edbg("SEP Driver:io_memory_end_phyaical_address is %08lx\n", sep_dev->io_memory_end_physical_address);
+
+	edbg("SEP Driver:io_memory_size is %08lx\n", sep_dev->io_memory_size);
+
+	sep_dev->io_memory_start_virtual_address = ioremap_nocache(sep_dev->io_memory_start_physical_address, sep_dev->io_memory_size);
+	if (!sep_dev->io_memory_start_virtual_address) {
+		edbg("SEP Driver error ioremap of io memory\n");
+		goto end_function;
+	}
+
+	edbg("SEP Driver:io_memory_start_virtual_address is %p\n", sep_dev->io_memory_start_virtual_address);
+
+	sep_dev->reg_base_address = (void __iomem *) sep_dev->io_memory_start_virtual_address;
+
+
+	/* set up system base address and shared memory location */
+
+	sep_dev->rar_virtual_address = kmalloc(2 * SEP_RAR_IO_MEM_REGION_SIZE, GFP_KERNEL);
+
+	if (!sep_dev->rar_virtual_address) {
+		edbg("SEP Driver:cant kmalloc rar\n");
+		goto end_function;
+	}
+	/* FIXME */
+	sep_dev->rar_physical_address = __pa(sep_dev->rar_virtual_address);
+
+	edbg("SEP Driver:rar_physical is %08lx\n", sep_dev->rar_physical_address);
+	edbg("SEP Driver:rar_virtual is %p\n", sep_dev->rar_virtual_address);
+
+#if !SEP_DRIVER_POLLING_MODE
+
+	edbg("SEP Driver: about to write IMR and ICR REG_ADDR\n");
+
+	/* clear ICR register */
+	sep_write_reg(sep_dev, HW_HOST_ICR_REG_ADDR, 0xFFFFFFFF);
+
+	/* set the IMR register - open only GPR 2 */
+	sep_write_reg(sep_dev, HW_HOST_IMR_REG_ADDR, (~(0x1 << 13)));
+
+	/* figure out our irq */
+	/* FIXME: */
+	error = pci_read_config_byte(pdev, PCI_INTERRUPT_LINE, (u8 *) & sep_dev->sep_irq);
+
+	edbg("SEP Driver: my irq is %d\n", sep_irq);
+
+	edbg("SEP Driver: about to call request_irq\n");
+	/* get the interrupt line */
+	error = request_irq(sep_irq, sep_inthandler, IRQF_SHARED, "sep_driver", &sep_dev->reg_base_address);
+	if (error)
+		goto end_function;
+
+	goto end_function;
+	edbg("SEP Driver: about to write IMR REG_ADDR");
+
+	/* set the IMR register - open only GPR 2 */
+	sep_write_reg(sep_dev, HW_HOST_IMR_REG_ADDR, (~(0x1 << 13)));
+
+#endif				/* SEP_DRIVER_POLLING_MODE */
+end_function:
+	return error;
+}
+
+static struct pci_device_id sep_pci_id_tbl[] = {
+	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x080c)},
+	{0}
+};
+
+MODULE_DEVICE_TABLE(pci, sep_pci_id_tbl);
+
+/* field for registering driver to PCI device */
+static struct pci_driver sep_pci_driver = {
+	.name = "sep_sec_driver",
+	.id_table = sep_pci_id_tbl,
+	.probe = sep_probe
+};
+
+/*
+  this function registers th driver to
+  the device subsystem( either PCI, USB, etc)
+*/
+int sep_register_driver_to_device(void)
+{
+	return pci_register_driver(&sep_pci_driver);
+}
+
+
+
 /* major and minor device numbers */
 static dev_t sep_devno;
 
diff --git a/drivers/staging/sep/sep_ext_with_pci_driver.c b/drivers/staging/sep/sep_ext_with_pci_driver.c
deleted file mode 100644
index dfdbd01..0000000
--- a/drivers/staging/sep/sep_ext_with_pci_driver.c
+++ /dev/null
@@ -1,460 +0,0 @@
-/*
- *
- *  sep_ext_with_pci_driver.c - Security Processor Driver
- *  pci initialization functions
- *
- *  Copyright(c) 2009 Intel Corporation. All rights reserved.
- *  Copyright(c) 2009 Discretix. All rights reserved.
- *
- *  This program is free software; you can redistribute it and/or modify it
- *  under the terms of the GNU General Public License as published by the Free
- *  Software Foundation; either version 2 of the License, or (at your option)
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful, but WITHOUT
- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- *  more details.
- *
- *  You should have received a copy of the GNU General Public License along with
- *  this program; if not, write to the Free Software Foundation, Inc., 59
- *  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- *  CONTACTS:
- *
- *  Mark Allyn		mark.a.allyn@intel.com
- *
- *  CHANGES:
- *
- *  2009.06.26	Initial publish
- *
- */
-
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/fs.h>
-#include <linux/cdev.h>
-#include <linux/kdev_t.h>
-#include <linux/semaphore.h>
-#include <linux/mm.h>
-#include <linux/poll.h>
-#include <linux/wait.h>
-#include <linux/ioctl.h>
-#include <linux/ioport.h>
-#include <linux/io.h>
-#include <linux/interrupt.h>
-#include <linux/pagemap.h>
-#include <linux/pci.h>
-#include <linux/firmware.h>
-#include <linux/sched.h>
-#include "sep_driver_hw_defs.h"
-#include "sep_driver_config.h"
-#include "sep_driver_api.h"
-#include "sep_driver_ext_api.h"
-#include "sep_dev.h"
-
-#if SEP_DRIVER_ARM_DEBUG_MODE
-
-#define  CRYS_SEP_ROM_length                  0x4000
-#define  CRYS_SEP_ROM_start_address           0x8000C000UL
-#define  CRYS_SEP_ROM_start_address_offset    0xC000UL
-#define  SEP_ROM_BANK_register                0x80008420UL
-#define  SEP_ROM_BANK_register_offset         0x8420UL
-#define SEP_RAR_IO_MEM_REGION_START_ADDRESS   0x82000000
-
-/*
- * THESE 2 definitions are specific to the board - must be
- * defined during integration
- */
-#define SEP_RAR_IO_MEM_REGION_START_ADDRESS   0xFF0D0000
-
-/* 2M size */
-
-void sep_load_rom_code(void)
-{
-	/* Index variables */
-	unsigned long i, k, j;
-	unsigned long regVal;
-	unsigned long Error;
-	unsigned long warning;
-
-	/* Loading ROM from SEP_ROM_image.h file */
-	k = sizeof(CRYS_SEP_ROM);
-
-	edbg("SEP Driver: DX_CC_TST_SepRomLoader start\n");
-
-	edbg("SEP Driver: k is %lu\n", k);
-	edbg("SEP Driver: sep_dev->reg_base_address is %p\n", sep_dev->reg_base_address);
-	edbg("SEP Driver: CRYS_SEP_ROM_start_address_offset is %p\n", CRYS_SEP_ROM_start_address_offset);
-
-	for (i = 0; i < 4; i++) {
-		/* write bank */
-		sep_write_reg(sep_dev, SEP_ROM_BANK_register_offset, i);
-
-		for (j = 0; j < CRYS_SEP_ROM_length / 4; j++) {
-			sep_write_reg(sep_dev, CRYS_SEP_ROM_start_address_offset + 4 * j, CRYS_SEP_ROM[i * 0x1000 + j]);
-
-			k = k - 4;
-
-			if (k == 0) {
-				j = CRYS_SEP_ROM_length;
-				i = 4;
-			}
-		}
-	}
-
-	/* reset the SEP */
-	sep_write_reg(sep_dev, HW_HOST_SEP_SW_RST_REG_ADDR, 0x1);
-
-	/* poll for SEP ROM boot finish */
-	do {
-		retVal = sep_read_reg(sep_dev, HW_HOST_SEP_HOST_GPR3_REG_ADDR);
-	} while (!regVal);
-
-	edbg("SEP Driver: ROM polling ended\n");
-
-	switch (regVal) {
-	case 0x1:
-		/* fatal error - read erro status from GPRO */
-		Error = sep_read_reg(sep_dev, HW_HOST_SEP_HOST_GPR0_REG_ADDR);
-		edbg("SEP Driver: ROM polling case 1\n");
-		break;
-	case 0x2:
-		/* Boot First Phase ended  */
-		warning = sep_read_reg(sep_dev, HW_HOST_SEP_HOST_GPR0_REG_ADDR);
-		edbg("SEP Driver: ROM polling case 2\n");
-		break;
-	case 0x4:
-		/* Cold boot ended successfully  */
-		warning = sep_read_reg(sep_dev, HW_HOST_SEP_HOST_GPR0_REG_ADDR);
-		edbg("SEP Driver: ROM polling case 4\n");
-		Error = 0;
-		break;
-	case 0x8:
-		/* Warmboot ended successfully */
-		warning = sep_read_reg(sep_dev, HW_HOST_SEP_HOST_GPR0_REG_ADDR);
-		edbg("SEP Driver: ROM polling case 8\n");
-		Error = 0;
-		break;
-	case 0x10:
-		/* ColdWarm boot ended successfully */
-		warning = sep_read_reg(sep_dev, HW_HOST_SEP_HOST_GPR0_REG_ADDR);
-		edbg("SEP Driver: ROM polling case 16\n");
-		Error = 0;
-		break;
-	case 0x20:
-		edbg("SEP Driver: ROM polling case 32\n");
-		break;
-	}
-
-}
-
-#else
-void sep_load_rom_code(void) { }
-#endif				/* SEP_DRIVER_ARM_DEBUG_MODE */
-
-#define BASE_ADDRESS_FOR_SYSTEM 0xfffc0000
-#define SEP_RAR_IO_MEM_REGION_SIZE 0x40000
-
-irqreturn_t sep_inthandler(int irq, void *dev_id);
-
-/* Keep this a single static object for now to keep the conversion easy */
-
-static struct sep_device sep_instance;
-struct sep_device *sep_dev = &sep_instance;
-
-/* temporary */
-unsigned long jiffies_future;
-
-/*-----------------------------
-    private functions
---------------------------------*/
-
-/*
-  This functions locks the area of the resisnd and cache sep code
-*/
-void sep_lock_cache_resident_area(void)
-{
-	return;
-}
-
-/*
-  This functions copies the cache and resident from their source location into
-  destination memory, which is external to Linux VM and is given as
-   physical address
-*/
-int sep_copy_cache_resident_to_area(unsigned long src_cache_addr, unsigned long cache_size_in_bytes, unsigned long src_resident_addr, unsigned long resident_size_in_bytes, unsigned long *dst_new_cache_addr_ptr, unsigned long *dst_new_resident_addr_ptr)
-{
-	unsigned long resident_addr;
-	unsigned long cache_addr;
-	const struct firmware *fw;
-
-	char *cache_name = "cache.image.bin";
-	char *res_name = "resident.image.bin";
-
-	/* error */
-	int error;
-
-	/*--------------------------------
-	    CODE
-	-------------------------------------*/
-	error = 0;
-
-	edbg("SEP Driver:rar_virtual is %p\n", sep_dev->rar_virtual_address);
-	edbg("SEP Driver:rar_physical is %08lx\n", sep_dev->rar_physical_address);
-
-	sep_dev->rar_region_addr = (unsigned long) sep_dev->rar_virtual_address;
-
-	sep_dev->cache_physical_address = sep_dev->rar_physical_address;
-	sep_dev->cache_virtual_address = sep_dev->rar_virtual_address;
-
-	/* load cache */
-	error = request_firmware(&fw, cache_name, &sep_dev->sep_pci_dev_ptr->dev);
-	if (error) {
-		edbg("SEP Driver:cant request cache fw\n");
-		goto end_function;
-	}
-
-	edbg("SEP Driver:cache data loc is %p\n", (void *) fw->data);
-	edbg("SEP Driver:cache data size is %08Zx\n", fw->size);
-
-	memcpy((void *) sep_dev->cache_virtual_address, (void *) fw->data, fw->size);
-
-	sep_dev->cache_size = fw->size;
-
-	cache_addr = (unsigned long) sep_dev->cache_virtual_address;
-
-	release_firmware(fw);
-
-	sep_dev->resident_physical_address = sep_dev->cache_physical_address + sep_dev->cache_size;
-	sep_dev->resident_virtual_address = sep_dev->cache_virtual_address + sep_dev->cache_size;
-
-	/* load resident */
-	error = request_firmware(&fw, res_name, &sep_dev->sep_pci_dev_ptr->dev);
-	if (error) {
-		edbg("SEP Driver:cant request res fw\n");
-		goto end_function;
-	}
-
-	edbg("SEP Driver:res data loc is %p\n", (void *) fw->data);
-	edbg("SEP Driver:res data size is %08Zx\n", fw->size);
-
-	memcpy((void *) sep_dev->resident_virtual_address, (void *) fw->data, fw->size);
-
-	sep_dev->resident_size = fw->size;
-
-	release_firmware(fw);
-
-	resident_addr = (unsigned long) sep_dev->resident_virtual_address;
-
-	edbg("SEP Driver:resident_addr (physical )is %08lx\n", sep_dev->resident_physical_address);
-	edbg("SEP Driver:cache_addr (physical) is %08lx\n", sep_dev->cache_physical_address);
-
-	edbg("SEP Driver:resident_addr (logical )is %08lx\n", resident_addr);
-	edbg("SEP Driver:cache_addr (logical) is %08lx\n", cache_addr);
-
-	edbg("SEP Driver:resident_size is %08lx\n", sep_dev->resident_size);
-	edbg("SEP Driver:cache_size is %08lx\n", sep_dev->cache_size);
-
-
-
-	/* physical addresses */
-	*dst_new_cache_addr_ptr = sep_dev->cache_physical_address;
-	*dst_new_resident_addr_ptr = sep_dev->resident_physical_address;
-end_function:
-	return error;
-}
-
-/*
-  This functions maps and allocates the
-  shared area on the  external RAM (device)
-  The input is shared_area_size - the size of the memory to
-  allocate. The outputs
-  are kernel_shared_area_addr_ptr - the kerenl
-  address of the mapped and allocated
-  shared area, and phys_shared_area_addr_ptr
-  - the physical address of the shared area
-*/
-int sep_map_and_alloc_shared_area(unsigned long shared_area_size, unsigned long *kernel_shared_area_addr_ptr, unsigned long *phys_shared_area_addr_ptr)
-{
-	// shared_virtual_address = ioremap_nocache(0xda00000,shared_area_size);
-	sep_dev->shared_virtual_address = kmalloc(shared_area_size, GFP_KERNEL);
-	if (!sep_dev->shared_virtual_address) {
-		edbg("sep_driver:shared memory kmalloc failed\n");
-		return -1;
-	}
-	/* FIXME */
-	sep_dev->shared_physical_address = __pa(sep_dev->shared_virtual_address);
-	/* shared_physical_address = 0xda00000; */
-	*kernel_shared_area_addr_ptr = (unsigned long) sep_dev->shared_virtual_address;
-	/* set the physical address of the shared area */
-	*phys_shared_area_addr_ptr = sep_dev->shared_physical_address;
-	edbg("SEP Driver:shared_virtual_address is %p\n", sep_dev->shared_virtual_address);
-	edbg("SEP Driver:shared_region_size is %08lx\n", shared_area_size);
-	edbg("SEP Driver:shared_physical_addr is %08lx\n", *phys_shared_area_addr_ptr);
-
-	return 0;
-}
-
-/*
-  This functions unmaps and deallocates the shared area
-  on the  external RAM (device)
-  The input is shared_area_size - the size of the memory to deallocate,kernel_
-  shared_area_addr_ptr - the kernel address of the mapped and allocated
-  shared area,phys_shared_area_addr_ptr - the physical address of
-  the shared area
-*/
-void sep_unmap_and_free_shared_area(unsigned long shared_area_size, unsigned long kernel_shared_area_addr, unsigned long phys_shared_area_addr)
-{
-	kfree((void *) kernel_shared_area_addr);
-}
-
-/*
-  This functions returns the physical address inside shared area according
-  to the virtual address. It can be either on the externa RAM device
-  (ioremapped), or on the system RAM
-  This implementation is for the external RAM
-*/
-unsigned long sep_shared_area_virt_to_phys(unsigned long virt_address)
-{
-	edbg("SEP Driver:sh virt to phys v %08lx\n", virt_address);
-	edbg("SEP Driver:sh virt to phys p %08lx\n", sep_dev->shared_physical_address + (virt_address - (unsigned long) sep_dev->shared_virtual_address));
-
-	return (unsigned long) sep_dev->shared_physical_address + (virt_address - (unsigned long) sep_dev->shared_virtual_address);
-}
-
-/*
-  This functions returns the virtual address inside shared area
-  according to the physical address. It can be either on the
-  externa RAM device (ioremapped), or on the system RAM This implementation
-  is for the external RAM
-*/
-unsigned long sep_shared_area_phys_to_virt(unsigned long phys_address)
-{
-	return (unsigned long) sep_dev->shared_virtual_address + (phys_address - sep_dev->shared_physical_address);
-}
-
-
-/*
-  function that is activaed on the succesfull probe of the SEP device
-*/
-static int __devinit sep_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
-{
-	int error = 0;
-
-	edbg("Sep pci probe starting\n");
-
-	/* enable the device */
-	error = pci_enable_device(pdev);
-	if (error) {
-		edbg("error enabling pci device\n");
-		goto end_function;
-	}
-
-	/* set the pci dev pointer */
-	sep_dev->sep_pci_dev_ptr = pdev;
-
-	/* get the io memory start address */
-	sep_dev->io_memory_start_physical_address = pci_resource_start(pdev, 0);
-	if (!sep_dev->io_memory_start_physical_address) {
-		edbg("SEP Driver error pci resource start\n");
-		goto end_function;
-	}
-
-	/* get the io memory end address */
-	sep_dev->io_memory_end_physical_address = pci_resource_end(pdev, 0);
-	if (!sep_dev->io_memory_end_physical_address) {
-		edbg("SEP Driver error pci resource end\n");
-		goto end_function;
-	}
-
-	sep_dev->io_memory_size = sep_dev->io_memory_end_physical_address - sep_dev->io_memory_start_physical_address + 1;
-
-	edbg("SEP Driver:io_memory_start_physical_address is %08lx\n", sep_dev->io_memory_start_physical_address);
-
-	edbg("SEP Driver:io_memory_end_phyaical_address is %08lx\n", sep_dev->io_memory_end_physical_address);
-
-	edbg("SEP Driver:io_memory_size is %08lx\n", sep_dev->io_memory_size);
-
-	sep_dev->io_memory_start_virtual_address = ioremap_nocache(sep_dev->io_memory_start_physical_address, sep_dev->io_memory_size);
-	if (!sep_dev->io_memory_start_virtual_address) {
-		edbg("SEP Driver error ioremap of io memory\n");
-		goto end_function;
-	}
-
-	edbg("SEP Driver:io_memory_start_virtual_address is %p\n", sep_dev->io_memory_start_virtual_address);
-
-	sep_dev->reg_base_address = (void __iomem *) sep_dev->io_memory_start_virtual_address;
-
-
-	/* set up system base address and shared memory location */
-
-	sep_dev->rar_virtual_address = kmalloc(2 * SEP_RAR_IO_MEM_REGION_SIZE, GFP_KERNEL);
-
-	if (!sep_dev->rar_virtual_address) {
-		edbg("SEP Driver:cant kmalloc rar\n");
-		goto end_function;
-	}
-	/* FIXME */
-	sep_dev->rar_physical_address = __pa(sep_dev->rar_virtual_address);
-
-	edbg("SEP Driver:rar_physical is %08lx\n", sep_dev->rar_physical_address);
-	edbg("SEP Driver:rar_virtual is %p\n", sep_dev->rar_virtual_address);
-
-#if !SEP_DRIVER_POLLING_MODE
-
-	edbg("SEP Driver: about to write IMR and ICR REG_ADDR\n");
-
-	/* clear ICR register */
-	sep_write_reg(sep_dev, HW_HOST_ICR_REG_ADDR, 0xFFFFFFFF);
-
-	/* set the IMR register - open only GPR 2 */
-	sep_write_reg(sep_dev, HW_HOST_IMR_REG_ADDR, (~(0x1 << 13)));
-
-	/* figure out our irq */
-	/* FIXME: */
-	error = pci_read_config_byte(pdev, PCI_INTERRUPT_LINE, (u8 *) & sep_dev->sep_irq);
-
-	edbg("SEP Driver: my irq is %d\n", sep_irq);
-
-	edbg("SEP Driver: about to call request_irq\n");
-	/* get the interrupt line */
-	error = request_irq(sep_irq, sep_inthandler, IRQF_SHARED, "sep_driver", &sep_dev->reg_base_address);
-	if (error)
-		goto end_function;
-
-	goto end_function;
-	edbg("SEP Driver: about to write IMR REG_ADDR");
-
-	/* set the IMR register - open only GPR 2 */
-	sep_write_reg(sep_dev, HW_HOST_IMR_REG_ADDR, (~(0x1 << 13)));
-
-#endif				/* SEP_DRIVER_POLLING_MODE */
-end_function:
-	return error;
-}
-
-static struct pci_device_id sep_pci_id_tbl[] = {
-	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x080c)},
-	{0}
-};
-
-MODULE_DEVICE_TABLE(pci, sep_pci_id_tbl);
-
-/* field for registering driver to PCI device */
-static struct pci_driver sep_pci_driver = {
-	.name = "sep_sec_driver",
-	.id_table = sep_pci_id_tbl,
-	.probe = sep_probe
-};
-
-/*
-  this function registers th driver to
-  the device subsystem( either PCI, USB, etc)
-*/
-int sep_register_driver_to_device(void)
-{
-	return pci_register_driver(&sep_pci_driver);
-}
-
-
-- 
1.6.4.2

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel