aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorDavide Grohmann <davide.grohmann@arm.com>2021-06-17 09:59:40 +0200
committerKristofer Jonsson <kristofer.jonsson@arm.com>2021-08-13 09:56:16 +0000
commit40e23d12017ba8aa40bb15c9214cd7ac531a159e (patch)
tree232ce65c8998a746fa1d9b381388efd56d900bca /kernel
parent1c26baa1e8fde9f730c0ef472187937619d32471 (diff)
downloadethos-u-linux-driver-stack-40e23d12017ba8aa40bb15c9214cd7ac531a159e.tar.gz
Do not expose device specific hw config in capabilities21.08-rc1
Change-Id: Ia90e2d74c3e071c6e3de381cfada9a5a155d7529
Diffstat (limited to 'kernel')
-rw-r--r--kernel/ethosu_core_interface.h1
-rw-r--r--kernel/ethosu_device.c4
-rw-r--r--kernel/uapi/ethosu.h2
3 files changed, 1 insertions, 6 deletions
diff --git a/kernel/ethosu_core_interface.h b/kernel/ethosu_core_interface.h
index ad8311c..d5bcb54 100644
--- a/kernel/ethosu_core_interface.h
+++ b/kernel/ethosu_core_interface.h
@@ -154,7 +154,6 @@ struct ethosu_core_msg_capabilities_rsp {
uint32_t driver_major_rev;
uint32_t macs_per_cc;
uint32_t cmd_stream_version;
- uint32_t shram_size;
uint32_t custom_dma;
};
diff --git a/kernel/ethosu_device.c b/kernel/ethosu_device.c
index 7adc7a6..7617669 100644
--- a/kernel/ethosu_device.c
+++ b/kernel/ethosu_device.c
@@ -113,7 +113,6 @@ static int ethosu_capability_rsp(struct ethosu_device *edev,
capabilities->driver_major_rev = msg->driver_major_rev;
capabilities->hw_cfg.macs_per_cc = msg->macs_per_cc;
capabilities->hw_cfg.cmd_stream_version = msg->cmd_stream_version;
- capabilities->hw_cfg.shram_size = msg->shram_size;
capabilities->hw_cfg.custom_dma = msg->custom_dma;
complete(&cap->done);
@@ -212,7 +211,7 @@ static int ethosu_handle_msg(struct ethosu_device *edev)
}
dev_info(edev->dev,
- "Msg: Capabilities response ua%llx vs%hhu v%hhu.%hhu p%hhu av%hhu.%hhu.%hhu dv%hhu.%hhu.%hhu mcc%hhu csv%hhu ss%hhu cd%hhu\n",
+ "Msg: Capabilities response ua%llx vs%hhu v%hhu.%hhu p%hhu av%hhu.%hhu.%hhu dv%hhu.%hhu.%hhu mcc%hhu csv%hhu cd%hhu\n",
data.capabilities.user_arg,
data.capabilities.version_status,
data.capabilities.version_major,
@@ -226,7 +225,6 @@ static int ethosu_handle_msg(struct ethosu_device *edev)
data.capabilities.driver_patch_rev,
data.capabilities.macs_per_cc,
data.capabilities.cmd_stream_version,
- data.capabilities.shram_size,
data.capabilities.custom_dma);
ret = ethosu_capability_rsp(edev, &data.capabilities);
diff --git a/kernel/uapi/ethosu.h b/kernel/uapi/ethosu.h
index 3e4e7a3..3c0a983 100644
--- a/kernel/uapi/ethosu.h
+++ b/kernel/uapi/ethosu.h
@@ -149,13 +149,11 @@ struct ethosu_uapi_device_hw_id {
* struct ethosu_uapi_device_hw_cfg - Device hardware configuration
* @macs_per_cc: MACs per clock cycle
* @cmd_stream_version: NPU command stream version
- * @shram_size: SHRAM size
* @custom_dma: Custom DMA enabled
*/
struct ethosu_uapi_device_hw_cfg {
__u32 macs_per_cc;
__u32 cmd_stream_version;
- __u32 shram_size;
__u32 custom_dma;
};