From patchwork Mon Oct 11 13:45:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 515609 Delivered-To: patch@linaro.org Received: by 2002:ac0:b5cc:0:0:0:0:0 with SMTP id x12csp4459873ime; Mon, 11 Oct 2021 06:49:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz07R5GNxo7x44Q3Yxs0go2vmf1nHXqIMMiub25LZhTC0FDNwHrRLOEokoPChYn0x9JtxIK X-Received: by 2002:a17:90a:b117:: with SMTP id z23mr14900837pjq.74.1633960158122; Mon, 11 Oct 2021 06:49:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633960158; cv=none; d=google.com; s=arc-20160816; b=xSpzAczG1Fq4Ut0bxpuCDs117hOKE1tB8KmJSexqXl1jClGA+zeEBfbnLnln91CWwu /XLRTELswgAH8daxztOK+eYWICbN8lSbDoYP0Re4awqLRe6cYaGNicZLMbyqLkksw/FH FEEt8JWfGDQTADHMD34EDh9Mrtmef04OpAbkc66OuP97oSS+6L46EjBicdE7cyv3RHV9 +zjGUHMtdzvMv25DMQU92BkVNabvGU8aREtxJuIziV12N2HKA+t10RCKLU0x81EYCf6L ikZp/ZfyVmIUvt+in8XxbI/mX3EGEhhuCsC28sK55431EG65RY3HBeqg/LxKUE/gkbnt RGWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=55OBnEyr6APERzhIulQ+OwuOO3gX/H/0j2j5ZkCt91E=; b=yok3n9XZd0LkHfiq8HX8OmI/hUCymShjdElbQs0swoFY8W7wrqI+qKyponk1NTyjNw zq+UZehmmksvR2duO22EP/SQrgP/w6pkrOfQ00LfnsxP8o0IBVXuZV0JgG2ImVrrr/Vw wIiiuluEd59e5u+c3WZFiM7kzcUAJD1aTwycAwwg0CIRMKX5XScge6KMf5MIBX5Dps1t p5crTMzrcxRLSnhBU2nyCRDshbELP9MYNFNBmW8qw6Il5mSp2m6OG2fezhihzQQnDbTj zHnVkFI3pP9UNntaaUQNwjcbbP/4OjojwGk2YAmlFFF/ifDJb/zt+rCUJg2fIGiEtFnO jP3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=KAOTO1Uy; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g20si10383736pgi.568.2021.10.11.06.49.17; Mon, 11 Oct 2021 06:49:18 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=KAOTO1Uy; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237391AbhJKNvQ (ORCPT + 11 others); Mon, 11 Oct 2021 09:51:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:38572 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236249AbhJKNuD (ORCPT ); Mon, 11 Oct 2021 09:50:03 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 349E460C49; Mon, 11 Oct 2021 13:48:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1633960082; bh=KatlpQaVe2Tnj8+hKldMj+ZI/hitDdpstM/2v3SlcLM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KAOTO1UyIYzWXHc7AunJKD7Acei4qglXqHvYFk+UCRxhRF+b8xPqGF43jvfWq+9xf k8iqYO8ku7f095tB4G6u9x1jFcMhbWGofEsodjjVM/6LA+AoSQEDCg3B4f66KQ5h+V M3JS240KQ18uc1GBtP7/xaTKJ2iQRrBx6aZwlzno= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shawn Guo , Marijn Suijten , Bjorn Andersson , Sasha Levin Subject: [PATCH 5.4 17/52] soc: qcom: mdt_loader: Drop PT_LOAD check on hash segment Date: Mon, 11 Oct 2021 15:45:46 +0200 Message-Id: <20211011134504.297813804@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211011134503.715740503@linuxfoundation.org> References: <20211011134503.715740503@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Shawn Guo [ Upstream commit 833d51d7c66d6708abbc02398892b96b950167b9 ] PT_LOAD type denotes that the segment should be loaded into the final firmware memory region. Hash segment is not one such, because it's only needed for PAS init and shouldn't be in the final firmware memory region. That's why mdt_phdr_valid() explicitly reject non PT_LOAD segment and hash segment. This actually makes the hash segment type check in qcom_mdt_read_metadata() unnecessary and redundant. For a hash segment, it won't be loaded into firmware memory region anyway, due to the QCOM_MDT_TYPE_HASH check in mdt_phdr_valid(), even if it has a PT_LOAD type for some reason (misusing or abusing?). Some firmware files on Sony phones are such examples, e.g WCNSS firmware of Sony Xperia M4 Aqua phone. The type of hash segment is just PT_LOAD. Drop the unnecessary hash segment type check in qcom_mdt_read_metadata() to fix firmware loading failure on these phones, while hash segment is still kept away from the final firmware memory region. Fixes: 498b98e93900 ("soc: qcom: mdt_loader: Support loading non-split images") Signed-off-by: Shawn Guo Reviewed-by: Marijn Suijten Signed-off-by: Bjorn Andersson Link: https://lore.kernel.org/r/20210828070202.7033-1-shawn.guo@linaro.org Signed-off-by: Sasha Levin --- drivers/soc/qcom/mdt_loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.33.0 diff --git a/drivers/soc/qcom/mdt_loader.c b/drivers/soc/qcom/mdt_loader.c index eba7f76f9d61..6034cd8992b0 100644 --- a/drivers/soc/qcom/mdt_loader.c +++ b/drivers/soc/qcom/mdt_loader.c @@ -98,7 +98,7 @@ void *qcom_mdt_read_metadata(const struct firmware *fw, size_t *data_len) if (ehdr->e_phnum < 2) return ERR_PTR(-EINVAL); - if (phdrs[0].p_type == PT_LOAD || phdrs[1].p_type == PT_LOAD) + if (phdrs[0].p_type == PT_LOAD) return ERR_PTR(-EINVAL); if ((phdrs[1].p_flags & QCOM_MDT_TYPE_MASK) != QCOM_MDT_TYPE_HASH) From patchwork Mon Oct 11 13:45:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 515608 Delivered-To: patch@linaro.org Received: by 2002:ac0:b5cc:0:0:0:0:0 with SMTP id x12csp4459804ime; Mon, 11 Oct 2021 06:49:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxC5kL662KvAgG4K54AITLtJrlErMe6RtyGLjcrTfqWI3p3wA5iyIw07Ggvy5mTdPkntcvC X-Received: by 2002:a17:902:b696:b0:13a:7871:55f5 with SMTP id c22-20020a170902b69600b0013a787155f5mr24923650pls.60.1633960151884; Mon, 11 Oct 2021 06:49:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633960151; cv=none; d=google.com; s=arc-20160816; b=BbpWZu06qWBuqwKkK7ADwk/DvQnj5tJYujPnHXLTE/FASDmQtcOmM2klN1SWcDNkI1 cK2iAp7dHQ/jV9pW6ig9rI5GBwCw+b3GulGjbE2VOdNNOOKA2vLjGOez18hQYSxQlRIo lBH1JQ1AIB+scf971xNXTapP3oIOePVyE3dD67xVn76+4ND6F6crAdV8RgbTNwNKkEnU AQsUGZ31remm2NnD85u5AtcfD0TEnWvieXhnGyvfVEUYd9N9+zCUZBB6iYKtnybX0k3j 8YP73ZZ/uDAC+4urcCrKL2Hlih1fOxXrgwR+zJRyJk+xxClFj4JXYjtC7aP5Kk1LPy2z qraw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=j5eTDrKnZJePcQ/d+Ka4VvAdyjGyJlAnqFT1r1qzgog=; b=BnWX6wM2/cYbcfHknlhYUZjkLKkb/uXTkbu388cDFqrBIlNwZkvccw1ATgohbTm134 6DGZTKVVY0fdiCimAu9Otzl7VjrTKpsaXHwGHhf9+VswqS3m2FIrICuE8O7WDh/s9JNM xZZO+so93LVkyYx2QJcd2n7+6hL4MAc6+v/9BF9LacNdQvuGHO6bMYvye/RbhooEu4vx MJedi7YwCweDImeZdiZ2Ho0kehJQmq/NpOiAqTWBP9ttgKqDgZgG+EQit/qa4m8eijle SwILo0DyXgYRqsgaoXwoWMgFRDKHMzLyn3SDB4spFKQPJjQ7Xa7l+EasRaQXRemGuDiX RDPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=08g6Fnyb; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id e25si12327619pgv.264.2021.10.11.06.49.11; Mon, 11 Oct 2021 06:49:11 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=08g6Fnyb; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237362AbhJKNvJ (ORCPT + 11 others); Mon, 11 Oct 2021 09:51:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:38814 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237267AbhJKNuf (ORCPT ); Mon, 11 Oct 2021 09:50:35 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2DE7560C49; Mon, 11 Oct 2021 13:48:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1633960098; bh=8ONFg95LliFF9rhvvPc91wX+jKgOeD/T0OVaYdnI56M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=08g6Fnyb0cXGxSLR+LzhKtB2SJhsFoXONmoHbRRF6Jc7zffT3X5w51l3g7Zvjg0RR tXz5viN9WLg66NCoMtqt5kg0dKEYbMQXXqiKgj9WMzOjuJjiKzHojgvxddONy4QZDK eN49PP61IgXRpjbRjB2fYjASeq24wWY4+fLYfmhE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dmitry Baryshkov , Amit Pundir , Bjorn Andersson , Sasha Levin Subject: [PATCH 5.4 20/52] arm64: dts: qcom: pm8150: use qcom, pm8998-pon binding Date: Mon, 11 Oct 2021 15:45:49 +0200 Message-Id: <20211011134504.411578450@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211011134503.715740503@linuxfoundation.org> References: <20211011134503.715740503@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Dmitry Baryshkov [ Upstream commit a153d317168aa3d61a204fadc85bac3995381d33 ] Change pm8150 to use the qcom,pm8998-pon compatible string for the pon in order to pass reboot mode properly. Fixes: 5101f22a5c37 ("arm64: dts: qcom: pm8150: Add base dts file") Signed-off-by: Dmitry Baryshkov Tested-by: Amit Pundir Signed-off-by: Bjorn Andersson Link: https://lore.kernel.org/r/20210916151341.1797512-1-dmitry.baryshkov@linaro.org Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/qcom/pm8150.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.33.0 diff --git a/arch/arm64/boot/dts/qcom/pm8150.dtsi b/arch/arm64/boot/dts/qcom/pm8150.dtsi index c0b197458665..6f7dfcb8c042 100644 --- a/arch/arm64/boot/dts/qcom/pm8150.dtsi +++ b/arch/arm64/boot/dts/qcom/pm8150.dtsi @@ -17,7 +17,7 @@ #size-cells = <0>; pon: power-on@800 { - compatible = "qcom,pm8916-pon"; + compatible = "qcom,pm8998-pon"; reg = <0x0800>; pwrkey { compatible = "qcom,pm8941-pwrkey"; From patchwork Mon Oct 11 13:46:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 515610 Delivered-To: patch@linaro.org Received: by 2002:ac0:b5cc:0:0:0:0:0 with SMTP id x12csp4460408ime; Mon, 11 Oct 2021 06:49:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxmqLH4MzqARuDduL/7aYSTF4UjrnCbFyxqR3aV4iALJgBcsMD4/bhm91k8eTXkwUVeF4Yr X-Received: by 2002:a63:f356:: with SMTP id t22mr18134931pgj.18.1633960199737; Mon, 11 Oct 2021 06:49:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633960199; cv=none; d=google.com; s=arc-20160816; b=TkIHTiY/fYrgpFAL361i3CAhBlnZz3g1DOv9aCwC+zh6LUN6dmIFENtq/D919RDjtw kSisSKUohvEuuPo+kyMATjnh+Q6gNzEq/UJUO0LxC2k8eS3si4m0g3+H+q8HgWFWRetz 9HurCdduP4cYatVuUvWhK5TmiMroG1B1cl3lLZ4K2vy67MAzjYhlkGgj1lGMG0ITM9O+ /pGH2cPUD9ZAxP+KrcIbmEtyqhWeETvZp36OPHAcPAldXD36h9VTBdb3yS1oZNt9DZX/ 2LrSZ99baUWTPVAchoWsuSm9BKTOLELabv1hG7f3c1azebBtOwWAxttcQOK3ZAIqJxJa 388A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=eKFQlOT1vVH9Zj63dH8r13WvAateyFUCWxSz+5+mUd4=; b=DPgmijiv/+aZ4jxigorEY27MxHmHImYFTnT9RtAvkb0hWADsPmcOmDkfvqfo39BHP0 arxQ6bdP4q4ufrxF8M8RLWq7UsNmLp9pnD3GMzTCDaKf1R73hL3vDmgFrn/tdyxvsMbg xcgybdbVeXmJ4vU8HDiimoILLoIfulpNniNrFy4JkDw0B2FyaaVyGRRdZMOvhktkf6+s X+4mUrMwgx1KJxpxQM62bg70+1JZAs5KcLxUDjolgwaVIVmTJaTz+qL4Y49j9cYL3/al JO4bWGZbTdEz1NsOd4tkqmfAzGWaaGnwjaxv3HPr60p8jykD1RYhH4DSix9P2VbqrbNd 4ynQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=jXr2HJgO; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id x186si10828287pgd.220.2021.10.11.06.49.59; Mon, 11 Oct 2021 06:49:59 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=jXr2HJgO; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237547AbhJKNv5 (ORCPT + 11 others); Mon, 11 Oct 2021 09:51:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:39616 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237244AbhJKNvS (ORCPT ); Mon, 11 Oct 2021 09:51:18 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9622A60F35; Mon, 11 Oct 2021 13:49:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1633960158; bh=DIKbTr8e1RTc/i8t3FrYOmPO9hOCRDp49BJBEkBr198=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jXr2HJgOBpygUlLbWfpSITF+uamAHtrBDsDQFx5S8BbsaFuVXHiQfDvD2eCKO1IbN Bq30LjHfZjyMFa5kSIc2dtXl1ImmMwHsT0Dxk8HB5XruEsCX8AMovvv6HWm89Rk7Tg hbtl2Y+ysKmE+HIW7RaxBNOSqC118Ay2YenuQ1c4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mark Brown , Bartlomiej Zolnierkiewicz , Daniel Vetter , Maarten Lankhorst , Sasha Levin Subject: [PATCH 5.4 38/52] video: fbdev: gbefb: Only instantiate device when built for IP32 Date: Mon, 11 Oct 2021 15:46:07 +0200 Message-Id: <20211011134505.032226388@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211011134503.715740503@linuxfoundation.org> References: <20211011134503.715740503@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Mark Brown [ Upstream commit 11b8e2bb986d23157e82e267fb8cc6b281dfdee9 ] The gbefb driver not only registers a driver but also the device for that driver. This is all well and good when run on the IP32 machines that are supported by the driver but since the driver supports building with COMPILE_TEST we might also be building on other platforms which do not have this hardware and will crash instantiating the driver. Add an IS_ENABLED() check so we compile out the device registration if we don't have the Kconfig option for the machine enabled. Fixes: 552ccf6b259d290c0c ("video: fbdev: gbefb: add COMPILE_TEST support") Signed-off-by: Mark Brown Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Daniel Vetter Link: https://patchwork.freedesktop.org/patch/msgid/20210921212102.30803-1-broonie@kernel.org Signed-off-by: Maarten Lankhorst Signed-off-by: Sasha Levin --- drivers/video/fbdev/gbefb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.33.0 diff --git a/drivers/video/fbdev/gbefb.c b/drivers/video/fbdev/gbefb.c index b9f6a82a0495..6fdc6ab3ceb8 100644 --- a/drivers/video/fbdev/gbefb.c +++ b/drivers/video/fbdev/gbefb.c @@ -1269,7 +1269,7 @@ static struct platform_device *gbefb_device; static int __init gbefb_init(void) { int ret = platform_driver_register(&gbefb_driver); - if (!ret) { + if (IS_ENABLED(CONFIG_SGI_IP32) && !ret) { gbefb_device = platform_device_alloc("gbefb", 0); if (gbefb_device) { ret = platform_device_add(gbefb_device);