Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 289079
b: refs/heads/master
c: ab8ef35
h: refs/heads/master
i:
  289077: 6a77f33
  289075: 80b5659
  289071: 4aeb64f
v: v3
  • Loading branch information
Mark A. Allyn authored and Greg Kroah-Hartman committed Feb 10, 2012
1 parent 5c5f4a5 commit 2c21627
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ecd0cb003fda30702c6c1f007a58bef885f5cb42
refs/heads/master: ab8ef35131ee42963abe87b2b1d2911bda4a8a48
15 changes: 11 additions & 4 deletions trunk/drivers/staging/sep/sep_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
/* #define SEP_PERF_DEBUG */

#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/miscdevice.h>
#include <linux/fs.h>
Expand Down Expand Up @@ -197,9 +198,9 @@ static int sep_allocate_dmatables_region(struct sep_device *sep,
struct sep_dma_context *dma_ctx,
const u32 table_count)
{
const size_t new_len = table_count *
sizeof(struct sep_lli_entry) *
SEP_DRIVER_ENTRIES_PER_TABLE_IN_SEP;
const size_t new_len =
SYNCHRONIC_DMA_TABLES_AREA_SIZE_BYTES - 1;

void *tmp_region = NULL;

dev_dbg(&sep->pdev->dev, "[PID%d] dma_ctx = 0x%p\n",
Expand Down Expand Up @@ -230,6 +231,7 @@ static int sep_allocate_dmatables_region(struct sep_device *sep,
if (*dmatables_region) {
memcpy(tmp_region, *dmatables_region, dma_ctx->dmatables_len);
kfree(*dmatables_region);
*dmatables_region = NULL;
}

*dmatables_region = tmp_region;
Expand Down Expand Up @@ -342,11 +344,12 @@ static void _sep_dump_message(struct sep_device *sep)

u32 *p = sep->shared_addr;

for (count = 0; count < 40 * 4; count += 4)
for (count = 0; count < 10 * 4; count += 4)
dev_dbg(&sep->pdev->dev,
"[PID%d] Word %d of the message is %x\n",
current->pid, count/4, *p++);
}

#endif

/**
Expand Down Expand Up @@ -384,6 +387,8 @@ static void sep_unmap_and_free_shared_area(struct sep_device *sep)
sep->shared_addr, sep->shared_bus);
}

#ifdef DEBUG

/**
* sep_shared_bus_to_virt - convert bus/virt addresses
* @sep: pointer to struct sep_device
Expand All @@ -398,6 +403,8 @@ static void *sep_shared_bus_to_virt(struct sep_device *sep,
return sep->shared_addr + (bus_address - sep->shared_bus);
}

#endif

/**
* sep_open - device open method
* @inode: inode of SEP device
Expand Down

0 comments on commit 2c21627

Please sign in to comment.