On Wed, Nov 20, 2019 at 11:18:28AM +0900, Nobuhiro Iwamatsu wrote: > Hi, > > On Tue, Nov 19, 2019 at 06:13:51AM +0100, Greg Kroah-Hartman wrote: > > From: Ard Biesheuvel <ard.biesheuvel@xxxxxxxxxx> > > > > [ Upstream commit db878f76b9ff7487da9bb0f686153f81829f1230 ] > > > > DT nodes may have a 'status' property which, if set to anything other > > than 'ok' or 'okay', indicates to the OS that the DT node should be > > treated as if it was not present. So add that missing logic to the > > OP-TEE driver. > > > > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@xxxxxxxxxx> > > Signed-off-by: Jens Wiklander <jens.wiklander@xxxxxxxxxx> > > Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx> > > This patch requires the following additional commit: > > commit c7c0d8df0b94a67377555a550b8d66ee2ad2f4ed > Author: Julia Lawall <Julia.Lawall@xxxxxxx> > Date: Sat Feb 23 14:20:36 2019 +0100 > > tee: optee: add missing of_node_put after of_device_is_available > > Add an of_node_put when a tested device node is not available. > > The semantic patch that fixes this problem is as follows > (http://coccinelle.lip6.fr): > > // <smpl> > @@ > identifier f; > local idexpression e; > expression x; > @@ > > e = f(...); > ... when != of_node_put(e) > when != x = e > when != e = x > when any > if (<+...of_device_is_available(e)...+>) { > ... when != of_node_put(e) > ( > return e; > | > + of_node_put(e); > return ...; > ) > } > // </smpl> > > Fixes: db878f76b9ff ("tee: optee: take DT status property into account") > Signed-off-by: Julia Lawall <Julia.Lawall@xxxxxxx> > Signed-off-by: Jens Wiklander <jens.wiklander@xxxxxxxxxx> > > Please apply this commit. And this is also required for 4.14.y. Now queued up, thanks! greg k-h
