Patch "staging: vchiq_2835_arm: Make cache-line-size a required DT property" has been added to the 4.9-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
staging: vchiq_2835_arm: Make cache-line-size a required DT property
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
staging-vchiq_2835_arm-make-cache-line-size-a-required-dt-property.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Thu Oct 19 15:04:02 CEST 2017
From: Michael Zoran <[email protected]>
Date: Sat, 18 Feb 2017 03:22:01 -0800
Subject: staging: vchiq_2835_arm: Make cache-line-size a required DT property
From: Michael Zoran <[email protected]>
[ Upstream commit 6cf1bf636a067eb308cb3a8322b9d6b1844a075d ]
The original github source allowed for the cache-line-size property to be missing. Since recent firmwares also require this property, it makes sense to always require it in the driver as well.
If the cache-line-size property is missing, then the driver probe should fail as no dev since the kernel and dt may be out of sync. The fix is to add a check for the return value of of_property_read_u32.
Changes V2:
1. Add error message if cache-line-size is missing.
2. Simple check for non-zero return value from of_property_read_u32.
--- drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c +7 -1
@@ -106,8 +106,14 @@ int vchiq_platform_init(struct platform_ g_virt_to_bus_offset =virt_to_dma (dev, (void *)0 ); - (void )of_property_read_u32 (dev->of_node,"cache-line-size" , + err =of_property_read_u32 (dev->of_node,"cache-line-size" , &g_cache_line_size); + +if (err) { +dev_err (dev,"Missing cache-line-size property\n" ); +return -ENODEV ; + } + g_fragments_size =2 * g_cache_line_size;/* Allocate space for the channels in coherent memory */
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/staging-vchiq_2835_arm-make-cache-line-size-a-required-dt-property.patch