On 2/15/19 6:18 PM, Frank Rowand wrote:
> On 2/15/19 4:46 PM, Brendan Higgins wrote:
>> UML supports enabling OF, and is useful for running the device tree
>> tests, so add support for unflattening device tree blobs so we can
>> actually use it.
>>
>> Signed-off-by: Brendan Higgins <brendanhigg...@google.com>
>> ---
>> drivers/of/unittest.c | 3 +++
>> 1 file changed, 3 insertions(+)
>>
>> diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c
>> index 84427384654d5..6de34d5fa0e85 100644
>> --- a/drivers/of/unittest.c
>> +++ b/drivers/of/unittest.c
>> @@ -2527,6 +2527,9 @@ static int __init of_unittest(void)
>> }
>> of_node_put(np);
>>
>> + if (IS_ENABLED(CONFIG_UML))
>> + unittest_unflatten_overlay_base();
>> +
>
> This is still the wrong location. It should be at the top of the function.
>
> I'll try moving it to the top and see if it still works -- should only
> take me a few minutes.
Yep, see below.
> -Frank
>
>> pr_info("start of unittest - you will see error messages\n");
>> of_unittest_check_tree_linkage();
>> of_unittest_check_phandles();
>>
>
>
This is probably white space damaged because I used cut and paste,
but this is what I meant above.
Tested on 5.0-rc3.
Applied patches 1-14 of series:
[RFC v4 00/17] kunit: introduce KUnit, the Linux kernel unit testing
framework
booted uml, saw the expected 219 pass, 1 fail.
Applied the following patch, saw the expected 224 pass, 0 fail.
I did not apply patch 15 of the other series, but applying patch 15
should still result in errors on boot, as I reported in the mail
thread for that patch series.
---
drivers/of/unittest.c | 4 ++++
1 file changed, 4 insertions(+)
Index: b/drivers/of/unittest.c
===================================================================
--- a/drivers/of/unittest.c
+++ b/drivers/of/unittest.c
@@ -2514,6 +2514,10 @@ static int __init of_unittest(void)
int res;
/* adding data for unittest */
+
+ if (IS_ENABLED(CONFIG_UML))
+ unittest_unflatten_overlay_base();
+
res = unittest_data_add();
if (res)
return res;
