You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
136 lines
4.5 KiB
Diff
136 lines
4.5 KiB
Diff
From 63079fbe20c954140f8eb61f858b0774890f301c Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.org>
|
|
Date: Mon, 17 Sep 2018 09:22:21 +0100
|
|
Subject: [PATCH] staging/vc04_services: Use correct cache line size
|
|
|
|
Use the compatible string in the DTB to select the correct cache line
|
|
size for the SoC - 32 for BCM2835, and 64 for BCM2836 and BCM2837.
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|
Tested-by: Stefan Wahren <stefan.wahren@i2se.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
.../interface/vchiq_arm/vchiq_2835_arm.c | 15 ++------
|
|
.../interface/vchiq_arm/vchiq_arm.c | 35 +++++++++++++------
|
|
.../interface/vchiq_arm/vchiq_arm.h | 5 +++
|
|
3 files changed, 33 insertions(+), 22 deletions(-)
|
|
|
|
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
|
|
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
|
|
@@ -117,7 +117,8 @@ free_pagelist(struct vchiq_pagelist_info
|
|
int vchiq_platform_init(struct platform_device *pdev, VCHIQ_STATE_T *state)
|
|
{
|
|
struct device *dev = &pdev->dev;
|
|
- struct rpi_firmware *fw = platform_get_drvdata(pdev);
|
|
+ struct vchiq_drvdata *drvdata = platform_get_drvdata(pdev);
|
|
+ struct rpi_firmware *fw = drvdata->fw;
|
|
VCHIQ_SLOT_ZERO_T *vchiq_slot_zero;
|
|
struct resource *res;
|
|
void *slot_mem;
|
|
@@ -135,17 +136,7 @@ int vchiq_platform_init(struct platform_
|
|
if (err < 0)
|
|
return err;
|
|
|
|
- /*
|
|
- * The tempting L1_CACHE_BYTES macro doesn't work in the case of
|
|
- * a kernel built with bcm2835_defconfig running on a BCM2836/7
|
|
- * processor, hence the need for a runtime check. The dcache line size
|
|
- * is encoded in one of the coprocessor registers, but there is no
|
|
- * convenient way to access it short of embedded assembler, hence
|
|
- * the use of read_cpuid_id(). The following test evaluates to true
|
|
- * on a BCM2835 showing that it is ARMv6-ish, whereas
|
|
- * cpu_architecture() will indicate that it is an ARMv7.
|
|
- */
|
|
- g_cache_line_size = ((read_cpuid_id() & 0x7f000) == 0x7b000) ? 32 : 64;
|
|
+ g_cache_line_size = drvdata->cache_line_size;
|
|
g_fragments_size = 2 * g_cache_line_size;
|
|
|
|
/* Allocate space for the channels in coherent memory */
|
|
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
|
|
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
|
|
@@ -173,6 +173,14 @@ static struct platform_device *bcm2835_c
|
|
static struct platform_device *bcm2835_codec;
|
|
static struct platform_device *vcsm_cma;
|
|
|
|
+static struct vchiq_drvdata bcm2835_drvdata = {
|
|
+ .cache_line_size = 32,
|
|
+};
|
|
+
|
|
+static struct vchiq_drvdata bcm2836_drvdata = {
|
|
+ .cache_line_size = 64,
|
|
+};
|
|
+
|
|
static const char *const ioctl_names[] = {
|
|
"CONNECT",
|
|
"SHUTDOWN",
|
|
@@ -3607,12 +3615,25 @@ vchiq_register_child(struct platform_dev
|
|
return new_dev;
|
|
}
|
|
|
|
+static const struct of_device_id vchiq_of_match[] = {
|
|
+ { .compatible = "brcm,bcm2835-vchiq", .data = &bcm2835_drvdata },
|
|
+ { .compatible = "brcm,bcm2836-vchiq", .data = &bcm2836_drvdata },
|
|
+ {},
|
|
+};
|
|
+MODULE_DEVICE_TABLE(of, vchiq_of_match);
|
|
+
|
|
static int vchiq_probe(struct platform_device *pdev)
|
|
{
|
|
struct device_node *fw_node;
|
|
- struct rpi_firmware *fw;
|
|
+ const struct of_device_id *of_id;
|
|
+ struct vchiq_drvdata *drvdata;
|
|
int err;
|
|
|
|
+ of_id = of_match_node(vchiq_of_match, pdev->dev.of_node);
|
|
+ drvdata = (struct vchiq_drvdata *)of_id->data;
|
|
+ if (!drvdata)
|
|
+ return -EINVAL;
|
|
+
|
|
fw_node = of_find_compatible_node(NULL, NULL,
|
|
"raspberrypi,bcm2835-firmware");
|
|
if (!fw_node) {
|
|
@@ -3620,12 +3641,12 @@ static int vchiq_probe(struct platform_d
|
|
return -ENOENT;
|
|
}
|
|
|
|
- fw = rpi_firmware_get(fw_node);
|
|
+ drvdata->fw = rpi_firmware_get(fw_node);
|
|
of_node_put(fw_node);
|
|
- if (!fw)
|
|
+ if (!drvdata->fw)
|
|
return -EPROBE_DEFER;
|
|
|
|
- platform_set_drvdata(pdev, fw);
|
|
+ platform_set_drvdata(pdev, drvdata);
|
|
|
|
err = vchiq_platform_init(pdev, &g_state);
|
|
if (err != 0)
|
|
@@ -3703,12 +3724,6 @@ static int vchiq_remove(struct platform_
|
|
return 0;
|
|
}
|
|
|
|
-static const struct of_device_id vchiq_of_match[] = {
|
|
- { .compatible = "brcm,bcm2835-vchiq", },
|
|
- {},
|
|
-};
|
|
-MODULE_DEVICE_TABLE(of, vchiq_of_match);
|
|
-
|
|
static struct platform_driver vchiq_driver = {
|
|
.driver = {
|
|
.name = "bcm2835_vchiq",
|
|
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
|
|
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
|
|
@@ -123,6 +123,11 @@ typedef struct vchiq_arm_state_struct {
|
|
|
|
} VCHIQ_ARM_STATE_T;
|
|
|
|
+struct vchiq_drvdata {
|
|
+ const unsigned int cache_line_size;
|
|
+ struct rpi_firmware *fw;
|
|
+};
|
|
+
|
|
extern int vchiq_arm_log_level;
|
|
extern int vchiq_susp_log_level;
|
|
|