raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 18:09:56 +00:00
Code Issues Projects Releases Wiki Activity

vchiq_arm: ARCH_BCM2835 compatibility

Browse Source 
Use virt_to_dma (not ideal, I know) to calculate the virt-to-bus
offset. This will make use of the "dma-ranges" property, if
present.
This commit is contained in:
Phil Elwell
2015-06-04 16:16:08 +01:00
committed by popcornmix
parent c712b42d06
commit aa05d1fe61
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
View File

@@ -46,7 +46,7 @@
#define TOTAL_SLOTS (VCHIQ_SLOT_ZERO_SLOTS + 2 * 32) #define TOTAL_SLOTS (VCHIQ_SLOT_ZERO_SLOTS + 2 * 32)
#define VCHIQ_ARM_ADDRESS(x) ((void *)__virt_to_bus((unsigned)x)) #define VCHIQ_ARM_ADDRESS(x) ((void *)((char *)x + g_virt_to_bus_offset))
#include "vchiq_arm.h" #include "vchiq_arm.h"
#include "vchiq_2835.h" #include "vchiq_2835.h"
@@ -66,7 +66,8 @@ typedef struct vchiq_2835_state_struct {
static void __iomem *g_regs; static void __iomem *g_regs;
static FRAGMENTS_T *g_fragments_base; static FRAGMENTS_T *g_fragments_base;
static FRAGMENTS_T *g_free_fragments; static FRAGMENTS_T *g_free_fragments;
struct semaphore g_free_fragments_sema; static struct semaphore g_free_fragments_sema;
static unsigned long g_virt_to_bus_offset;
extern int vchiq_arm_log_level; extern int vchiq_arm_log_level;
@@ -92,6 +93,8 @@ int vchiq_platform_init(struct platform_device *pdev, VCHIQ_STATE_T *state)
int slot_mem_size, frag_mem_size; int slot_mem_size, frag_mem_size;
int err, irq, i; int err, irq, i;
g_virt_to_bus_offset = virt_to_dma(dev, (void *)0);
/* Allocate space for the channels in coherent memory */ /* Allocate space for the channels in coherent memory */
slot_mem_size = PAGE_ALIGN(TOTAL_SLOTS * VCHIQ_SLOT_SIZE); slot_mem_size = PAGE_ALIGN(TOTAL_SLOTS * VCHIQ_SLOT_SIZE);
frag_mem_size = PAGE_ALIGN(sizeof(FRAGMENTS_T) * MAX_FRAGMENTS); frag_mem_size = PAGE_ALIGN(sizeof(FRAGMENTS_T) * MAX_FRAGMENTS);