From patchwork Mon Oct 11 13:45:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 515620 Delivered-To: patch@linaro.org Received: by 2002:ac0:b5cc:0:0:0:0:0 with SMTP id x12csp4474373ime; Mon, 11 Oct 2021 07:05:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzVjVYUAPCrYXhFoesusJCJOeShWJ/7JXv/SpiEEmKbMsOvFPTztlxnex89NPWijDpmatVV X-Received: by 2002:a17:906:3859:: with SMTP id w25mr25976014ejc.550.1633961153574; Mon, 11 Oct 2021 07:05:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633961153; cv=none; d=google.com; s=arc-20160816; b=YssGIZOyk9QNqW7LS0a00qj+fZ0jxW33vKha64oYc9NfmlKBI37fx7ljJ3qS2Zi7iI 9E71do0OdhtO5N1yzhXiHnVmWQobRAAkhJLHRCQ2surKT4kAsR/ZA3vTTCnSzpoVx59E 8wkOpoIa0xAG+VNe/0pCcZ2mEh2gO88/eFOqu6DCA5dG8VjKkIftWNWlJmjrTylPcvy1 Ix9PTXcnIF2SQfoQA0Fw3hzU61OB1+aD+0OaLLNOswtHX+btvVvPBmSJ0cJYiozIzMoP E/bKlkDzkJqRztsMwQVECTm47OspqgQ2J+WzVu3dRshj40Y0208fHM2Mc6W6ZPpVcRm6 q5Iw== 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=w5fc6R9Peo3iFRM0t/aC3ACJprqVBjER6P5U6r5VtRrEsBI/DvOISc5JfSqDD/iNqX A7oh+DZCTX3GfAHKEAyC7XN/vDoGkGa0usk2VJr2oclmTxIoFT3+qQKqPuL7amdAxEVA 4AXaUHy5olY3Ble0jBMoDGU/cIv7f2Unsl4L0eS+3IHCjk+kfujjsyUvPA00HZuvvL+K j10sbrqXJMcYi4Sh9WyxIv+brnKNy0KPij/VV2lRNqA2bKgV8/SzmC95eL8uoFHxVpmj neDJr2iORHzAXawGl0aV6JIo3q/E1TBy8M6aanuvWQJowODE8BqN0ogh6uZQy4TsuC9L yCzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=FxLjYP+J; 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 x96si10422048ede.219.2021.10.11.07.05.53; Mon, 11 Oct 2021 07:05:53 -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=FxLjYP+J; 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 S238286AbhJKOHr (ORCPT + 11 others); Mon, 11 Oct 2021 10:07:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:56462 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238214AbhJKOFk (ORCPT ); Mon, 11 Oct 2021 10:05:40 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0A0CC60F35; Mon, 11 Oct 2021 13:59:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1633960795; bh=KatlpQaVe2Tnj8+hKldMj+ZI/hitDdpstM/2v3SlcLM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FxLjYP+JhgpgP/5fujnopGtocmJFKcvL/yQxEEQ7bzSFHSsnsxF4Sn2nOHds0hBU5 pPo1RuOe+p/rGQNvAxvs2ZqtBefusCgsHcUf3LA5uySjxXyNGJ/UZ7hgGi3mN72+Vu OrmlUtl6e5Jk9SzifZdhepuWjMYLYhmzQFWzbCsQ= 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.14 042/151] soc: qcom: mdt_loader: Drop PT_LOAD check on hash segment Date: Mon, 11 Oct 2021 15:45:14 +0200 Message-Id: <20211011134519.213747184@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211011134517.833565002@linuxfoundation.org> References: <20211011134517.833565002@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:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 515617 Delivered-To: patch@linaro.org Received: by 2002:ac0:b5cc:0:0:0:0:0 with SMTP id x12csp4472192ime; Mon, 11 Oct 2021 07:03:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzXIDi1AE6UMQ5UIfJtyW79RwQ2MzEsGnc+GOBUya898l5CEgVa2S4bod96SmCyHVxXlHAX X-Received: by 2002:a05:6402:4387:: with SMTP id o7mr18404370edc.77.1633961028450; Mon, 11 Oct 2021 07:03:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633961028; cv=none; d=google.com; s=arc-20160816; b=ioQ3eOgAGNhPyw5F20KWoYcaQE5dAQWxhKuZ96mTv1XD+dBEuTbn9yMuR/bjwyqoWF dU2J9wj9EgnEJ8cCC6FRW7gFVZR8MAjx1mWN09R1n248JYQX7EvJoN6rQCuEnYytNZQJ 7FNK7T0D7KaIFx1/9Y1VBrCSSlRz1rHOTJdxCa7hEOgTOlyqfZmeaC6G0Py97KrEOhTx pEtgbVhunAIWHuOSw01Ga5nphHsu5AQd113zKM58taRPvgvmdKgGAB4+3WUz2Q/eBsZ5 KAW/bOqF4sRD/lAtR4pAWi3RhZXcFWcli4YEs97/au6eokQJZmxr3fH8T3nj4MwE1r8q lk2g== 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=Yhsy5XwK8neTF18v9IFgm8ZYyhPTKMZJDF8cS6VkRx0=; b=gEOFEpy+5gPwTHX57dX5SMI6GVYg2ZMgyyeSBtC3Xb2OqhyFgwZNEZoYVvnaM8tPTW MmGgxEEFRa2qaVY0raBDUKR+8tOPtxbWnxKWaU5lFKehalYP7YE+6atSO+KY7X61cV/k 6rNv6twHcW+fkCyF4z9FnRq7ioiKtdXq4ACNaQAemGXd6MKJ/fRat70BvYuBh/0DGqbS voNwEZP2nVdERrkLaKOyOcq46Iq8Kt/boCnGvzIDRBXLWRBuZ7U57nDWxpeoyzMCR/dt RDbwtLjzPyYQGtwhCMUxNviRZhm6JHmtjO5OU7Bhwt6fEKGeLwghonYnVKMX1F/rBLjC tn0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=zYCMsXes; 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 a9si11316589ejj.255.2021.10.11.07.03.48; Mon, 11 Oct 2021 07:03:48 -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=zYCMsXes; 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 S237890AbhJKOEz (ORCPT + 11 others); Mon, 11 Oct 2021 10:04:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:55468 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238069AbhJKOCl (ORCPT ); Mon, 11 Oct 2021 10:02:41 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4D1DD60F38; Mon, 11 Oct 2021 13:58:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1633960689; bh=4FxJVdVhKieCEydt0c2Cf/EXCXYWRYaRt97o9ypkH2o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zYCMsXescROLJpzkY5ytXkfEB3zf5E9gt7kBN1vlFCAZIhiqCGix/IgFtQEPrHnVl WhJlmLoXrqHFq+EsU/00cFktx0zjHLtUnqZcomfsdbWp68vsAve7CtCBcBB3WuNv1a QyzBXapwa9b2RGON3oUlyNLlUoyeF09aczaieY24= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Kalle Valo , Sasha Levin Subject: [PATCH 5.14 047/151] ath5k: fix building with LEDS=m Date: Mon, 11 Oct 2021 15:45:19 +0200 Message-Id: <20211011134519.364261890@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211011134517.833565002@linuxfoundation.org> References: <20211011134517.833565002@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ Upstream commit fb8c3a3c52400512fc8b3b61150057b888c30b0d ] Randconfig builds still show a failure for the ath5k driver, similar to the one that was fixed for ath9k earlier: WARNING: unmet direct dependencies detected for MAC80211_LEDS Depends on [n]: NET [=y] && WIRELESS [=y] && MAC80211 [=y] && (LEDS_CLASS [=m]=y || LEDS_CLASS [=m]=MAC80211 [=y]) Selected by [m]: - ATH5K [=m] && NETDEVICES [=y] && WLAN [=y] && WLAN_VENDOR_ATH [=y] && (PCI [=y] || ATH25) && MAC80211 [=y] net/mac80211/led.c: In function 'ieee80211_alloc_led_names': net/mac80211/led.c:34:22: error: 'struct led_trigger' has no member named 'name' 34 | local->rx_led.name = kasprintf(GFP_KERNEL, "%srx", | ^ Copying the same logic from my ath9k patch makes this one work as well, stubbing out the calls to the LED subsystem. Fixes: b64acb28da83 ("ath9k: fix build error with LEDS_CLASS=m") Fixes: 72cdab808714 ("ath9k: Do not select MAC80211_LEDS by default") Fixes: 3a078876caee ("ath5k: convert LED code to use mac80211 triggers") Link: https://lore.kernel.org/all/20210722105501.1000781-1-arnd@kernel.org/ Signed-off-by: Arnd Bergmann Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/20210920122359.353810-1-arnd@kernel.org Signed-off-by: Sasha Levin --- drivers/net/wireless/ath/ath5k/Kconfig | 4 +--- drivers/net/wireless/ath/ath5k/led.c | 10 ++++++---- 2 files changed, 7 insertions(+), 7 deletions(-) -- 2.33.0 diff --git a/drivers/net/wireless/ath/ath5k/Kconfig b/drivers/net/wireless/ath/ath5k/Kconfig index f35cd8de228e..6914b37bb0fb 100644 --- a/drivers/net/wireless/ath/ath5k/Kconfig +++ b/drivers/net/wireless/ath/ath5k/Kconfig @@ -3,9 +3,7 @@ config ATH5K tristate "Atheros 5xxx wireless cards support" depends on (PCI || ATH25) && MAC80211 select ATH_COMMON - select MAC80211_LEDS - select LEDS_CLASS - select NEW_LEDS + select MAC80211_LEDS if LEDS_CLASS=y || LEDS_CLASS=MAC80211 select ATH5K_AHB if ATH25 select ATH5K_PCI if !ATH25 help diff --git a/drivers/net/wireless/ath/ath5k/led.c b/drivers/net/wireless/ath/ath5k/led.c index 6a2a16856763..33e9928af363 100644 --- a/drivers/net/wireless/ath/ath5k/led.c +++ b/drivers/net/wireless/ath/ath5k/led.c @@ -89,7 +89,8 @@ static const struct pci_device_id ath5k_led_devices[] = { void ath5k_led_enable(struct ath5k_hw *ah) { - if (test_bit(ATH_STAT_LEDSOFT, ah->status)) { + if (IS_ENABLED(CONFIG_MAC80211_LEDS) && + test_bit(ATH_STAT_LEDSOFT, ah->status)) { ath5k_hw_set_gpio_output(ah, ah->led_pin); ath5k_led_off(ah); } @@ -104,7 +105,8 @@ static void ath5k_led_on(struct ath5k_hw *ah) void ath5k_led_off(struct ath5k_hw *ah) { - if (!test_bit(ATH_STAT_LEDSOFT, ah->status)) + if (!IS_ENABLED(CONFIG_MAC80211_LEDS) || + !test_bit(ATH_STAT_LEDSOFT, ah->status)) return; ath5k_hw_set_gpio(ah, ah->led_pin, !ah->led_on); } @@ -146,7 +148,7 @@ ath5k_register_led(struct ath5k_hw *ah, struct ath5k_led *led, static void ath5k_unregister_led(struct ath5k_led *led) { - if (!led->ah) + if (!IS_ENABLED(CONFIG_MAC80211_LEDS) || !led->ah) return; led_classdev_unregister(&led->led_dev); ath5k_led_off(led->ah); @@ -169,7 +171,7 @@ int ath5k_init_leds(struct ath5k_hw *ah) char name[ATH5K_LED_MAX_NAME_LEN + 1]; const struct pci_device_id *match; - if (!ah->pdev) + if (!IS_ENABLED(CONFIG_MAC80211_LEDS) || !ah->pdev) return 0; #ifdef CONFIG_ATH5K_AHB From patchwork Mon Oct 11 13:45:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 515619 Delivered-To: patch@linaro.org Received: by 2002:ac0:b5cc:0:0:0:0:0 with SMTP id x12csp4472829ime; Mon, 11 Oct 2021 07:04:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzea8D2s6VvVvtX0oEWOHcQV3mRe6h4H1JoGo0fWhX+8E7dafao1Im61eeYEpX5WyTh2lhT X-Received: by 2002:a05:6402:35cb:: with SMTP id z11mr43512630edc.342.1633961064334; Mon, 11 Oct 2021 07:04:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633961064; cv=none; d=google.com; s=arc-20160816; b=C0d6pYSKbu7N6VBYbusy+hTsRYI/ZAQ5/e2uwuupidE1M9dGturtDHUL68bMy4A4GE 5pJ1Toccgdy+uLAxtaskRrn7GHPHBQp0CnmNDgZUv2NVV9JRtj9cNYqXvIm678JNsktE xkFzSgy1SJh6sXEWnfgpIIHfOV263xUQ+7dsiY8f4tCF9HJEHUgI/AvQcakliAl6znbv HXC7SLKEb7XDP5TNWiZDY+0IKnQP4tVmQMXa+WF8RL4ptyFtFh/Ftg4eQQXD3IAUZL51 CBhMXz88OgFw1oq082yP+WuiDgRywOn5GbmiGmRGjQLQ+WSlVAh71HoKJBjvwhIa4Q30 mvSg== 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=Slqf28ZYh0Tls+vz1ijlAuKhk3yZmkhP3qrPN7+EkhM=; b=BiddKP6rJrPZKYbrJzXaBnjn1ezvHhkIib2WndkLf0icvGqYqfNBKhYMkY8R/RPJcp mxl+mvH4vDej8PnJATHnn05JnT8JIZw+Rw33dw+rVWokHkdqfPlqWtxqKxEhLsyIA2Sj GEgdZI0PFARxaZ8hSxhq97qfnj+HUJ9C1Hd/wSdnSRLq/nZvcRnQwSZCezWQWW7b5Nqr Xzrm6PVZy0x1ItV1ROhHPxybDNUx7Jl1T78ZyirhiOcvr6eAp00DX21wPq+8WF0Lengu 4bNFTnU6iqewh1nw65O4gx/eGowSf436o3q7QGPOrfKybQsJpAOl0AXO0Olc/oD3SUJZ JpFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=JfFLa9zj; 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 a9si11316589ejj.255.2021.10.11.07.04.23; Mon, 11 Oct 2021 07:04:24 -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=JfFLa9zj; 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 S238073AbhJKOF0 (ORCPT + 11 others); Mon, 11 Oct 2021 10:05:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:50128 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238866AbhJKOCr (ORCPT ); Mon, 11 Oct 2021 10:02:47 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1417C611CB; Mon, 11 Oct 2021 13:58:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1633960692; bh=X8ehpy2hqD6Uxj2TLvKFaiT5ztLUWN5OZb3Oso6ewLw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JfFLa9zj/5cSs1MOHdaUVWvYWABqgIkDyi5lJGTJyoKirBdB5imVOm/Ah0WO8KtvR j9nHnQx6gesMASYgNsg0A0oUevfXiR2ULWsntIq+iiFfbXV35YXw7yM5qO53SwxiBh raOCyMYHGa8UWbOtea5+09gNcqocPkSIH8WYifQ8= 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.14 048/151] arm64: dts: qcom: pm8150: use qcom, pm8998-pon binding Date: Mon, 11 Oct 2021 15:45:20 +0200 Message-Id: <20211011134519.401522123@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211011134517.833565002@linuxfoundation.org> References: <20211011134517.833565002@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 c566a64b1373..00385b1fd358 100644 --- a/arch/arm64/boot/dts/qcom/pm8150.dtsi +++ b/arch/arm64/boot/dts/qcom/pm8150.dtsi @@ -48,7 +48,7 @@ #size-cells = <0>; pon: power-on@800 { - compatible = "qcom,pm8916-pon"; + compatible = "qcom,pm8998-pon"; reg = <0x0800>; pon_pwrkey: pwrkey { From patchwork Mon Oct 11 13:45:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 515618 Delivered-To: patch@linaro.org Received: by 2002:ac0:b5cc:0:0:0:0:0 with SMTP id x12csp4472273ime; Mon, 11 Oct 2021 07:03:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyDBzGKL9Ta9k3GGBnVPYqSuHrJDokfimgLp1COffAnIx1G4ZFwXnQZGS3/CMBlLwO8btcb X-Received: by 2002:a05:6512:22c3:: with SMTP id g3mr21550655lfu.404.1633961032525; Mon, 11 Oct 2021 07:03:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633961032; cv=none; d=google.com; s=arc-20160816; b=EgtPr26UqB2a3Rl2mkf0LcdiXw0n5jScVBWhVHySuHDGr7BH0BfdMxqKjQXzNEFbGh fHOVldW3yCBiupmKHFnPULFKEghUKPtW2WdRQ1lICSgnWj3Abw0O3X2ptowApooqVxhz Vo3R4tk+qpbO94RBSu66QCiMDOIE8+mkHa0v/rSbQkYUpHLsnxsUTGgTmQPNR1PUfqTn BrrjKCOUCsoU3Cg6j+NgGUfrB+OnoUtWkmSAFWlTKvZ2zq8PbY/ExafEW81AYVu2a8le YaGnXfCtC7TRrDG6GkX8JKKc4bXXoO6Rchhi2nbqoRIeowvk5ZRdrbMeM3zFTdc7WGsv NopA== 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=xcfVb5WdqUxbMcx+ru0lolNUEVn/YDlcXYeWtQE1f6I=; b=yMgyLMrPGxGR+gr5ck2oY3LvdqdfqUwQBBypwXVERYfeF3twr4YOjK3W1LlxhdtuiF FV3WS7USbMpuB2BagzAoz44hcLupbRlaZcEDPiIOHB6B7HU2hcA37ueaC2d2VklKIVCO DDc10RNzVvgk/vprS19IlqRHtR68I88UGpQwhjRAko4OXJS8wcnB5Vat80JiUygCUyph Fy5O0AX918RIBqHwYub31f0d04290KHnroRncoKcRsEEJ/jiG6lBNMIGmMLH+HZD5/5R 1LUY5tnBEh2VC/qqqsq09W/ryf38N1W4TWeoDaJWyt9bvTBXJHHXN15NMz9SVF56nGH9 Mwvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Ip9FGpB1; 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 a9si11316589ejj.255.2021.10.11.07.03.52; Mon, 11 Oct 2021 07:03:52 -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=Ip9FGpB1; 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 S238609AbhJKOFB (ORCPT + 11 others); Mon, 11 Oct 2021 10:05:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:50200 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238978AbhJKODD (ORCPT ); Mon, 11 Oct 2021 10:03:03 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 52E4961105; Mon, 11 Oct 2021 13:58:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1633960701; bh=Pku8DfNofgD/9nn8GK4dVAJ1vjxgTaghmHMfrhrYFqA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ip9FGpB1afomX6UJJZ7mQgLwJUlAySUS6pD6EpkSTTxJCaF00kpMRdpcw8qRE8oo3 /n4mGjCN7JUHNLzWCDV5uhzUDrkQPy6P4El53QfbDRTPgGVsrufi6STsCZzHUtZzId QspKu+OjeFvVaJhLOTkcbsI5wiOdIkSLkwSC/8Mg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Julien Wajsberg , Vladimir Zapolskiy , Luca Coelho , Kalle Valo , Sasha Levin Subject: [PATCH 5.14 051/151] iwlwifi: pcie: add configuration of a Wi-Fi adapter on Dell XPS 15 Date: Mon, 11 Oct 2021 15:45:23 +0200 Message-Id: <20211011134519.503458400@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211011134517.833565002@linuxfoundation.org> References: <20211011134517.833565002@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Vladimir Zapolskiy [ Upstream commit fe5c735d0d47b495be6753d6aea4f8f78c909a0a ] There is a Killer AX1650 2x2 Wi-Fi 6 and Bluetooth 5.1 wireless adapter found on Dell XPS 15 (9510) laptop, its configuration was present on Linux v5.7, however accidentally it has been removed from the list of supported devices, let's add it back. The problem is manifested on driver initialization: Intel(R) Wireless WiFi driver for Linux iwlwifi 0000:00:14.3: enabling device (0000 -> 0002) iwlwifi: No config found for PCI dev 43f0/1651, rev=0x354, rfid=0x10a100 iwlwifi: probe of 0000:00:14.3 failed with error -22 Bug: https://bugzilla.kernel.org/show_bug.cgi?id=213939 Fixes: 3f910a25839b ("iwlwifi: pcie: convert all AX101 devices to the device tables") Cc: Julien Wajsberg Signed-off-by: Vladimir Zapolskiy Acked-by: Luca Coelho Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/20210924122154.2376577-1-vladimir.zapolskiy@linaro.org Signed-off-by: Sasha Levin --- drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.33.0 diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c index 6f49950a5f6d..be3ad4281353 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c @@ -547,6 +547,8 @@ static const struct iwl_dev_info iwl_dev_info_table[] = { IWL_DEV_INFO(0x43F0, 0x0074, iwl_ax201_cfg_qu_hr, NULL), IWL_DEV_INFO(0x43F0, 0x0078, iwl_ax201_cfg_qu_hr, NULL), IWL_DEV_INFO(0x43F0, 0x007C, iwl_ax201_cfg_qu_hr, NULL), + IWL_DEV_INFO(0x43F0, 0x1651, killer1650s_2ax_cfg_qu_b0_hr_b0, iwl_ax201_killer_1650s_name), + IWL_DEV_INFO(0x43F0, 0x1652, killer1650i_2ax_cfg_qu_b0_hr_b0, iwl_ax201_killer_1650i_name), IWL_DEV_INFO(0x43F0, 0x2074, iwl_ax201_cfg_qu_hr, NULL), IWL_DEV_INFO(0x43F0, 0x4070, iwl_ax201_cfg_qu_hr, NULL), IWL_DEV_INFO(0xA0F0, 0x0070, iwl_ax201_cfg_qu_hr, NULL), From patchwork Mon Oct 11 13:46:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 515621 Delivered-To: patch@linaro.org Received: by 2002:ac0:b5cc:0:0:0:0:0 with SMTP id x12csp4476418ime; Mon, 11 Oct 2021 07:07:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzPAAatBvpCp9Y/9wX3LelkLQu1yyzdiUIBAFaopWW3fT2WsjWHT3aIO2Rpwc6TSJwSGNZr X-Received: by 2002:a17:906:69d6:: with SMTP id g22mr25332993ejs.429.1633961275962; Mon, 11 Oct 2021 07:07:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633961275; cv=none; d=google.com; s=arc-20160816; b=MuHpiFV7eXiQJUUCkz1Z5tnlejLc4zV7BW6xFh4PqAu0JR/JDvIxWmCfQvE732OEOd 2r5FDV5Fl0v6WDR/AFbd4WwbQSc+cqY8J3O8zfHbTXZHRTZUj5Iv0Z00uHMr3CSYlak/ 10XMxb7K33w7H0zwt2cyhblCiNIakUsfhY4Bs2zHIG+NfKkEJdWYzU9QE5BdvMEMAzz6 dKOa/gc1q2ofofTBNjnfZNF/JlUSPOeNjtGuq3cinVe7RhIFbZjTjuWhe+OoLsAQB7s2 zD0aoy5JBmHyiPN4CkgjPYpG4NCsxC6Aw3KaMj93mHIfCBoAGBRx09kog29bhxxk5fnm oucg== 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=hrRyqQ36goLHljdszl9oONWK7/vxmsqBlLqrlhRoA5o=; b=JT/iZwqb/VZWp2BldlnE3etpnfANoNmCO5y6TR8S6yzUFVcTDPRIPGTrlFL1pSu2+6 e8iLaXKjHr+6ON/xYK4us4uPYb7577ZJc4ErigzOblQVR7HFlQfYvTsFH0tr5tIF3f81 5sW66Ht7qnqIsGnPgXJo7OYfTw3LEm6QGdsRXtOouq2PhAovSZ/ssXc2ki0VLeV74yvO zK37Z+iUQ9gznpk7GKxCv8EiPGlSAvVpvFsJVdqn3IW58UiD0bwz5zzSLkuFYm/bulRg KnQX7Ewnh6iLHOu5QZpZ+ZFA8Pu2MwVqt18ammUP4TYEiXkYwmrNzchSSGZRT9dEX7Vy iLcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=yJnoLOUh; 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 q26si9624396edi.67.2021.10.11.07.07.55; Mon, 11 Oct 2021 07:07:55 -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=yJnoLOUh; 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 S239749AbhJKOJu (ORCPT + 11 others); Mon, 11 Oct 2021 10:09:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:56458 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238508AbhJKOHi (ORCPT ); Mon, 11 Oct 2021 10:07:38 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6665F61208; Mon, 11 Oct 2021 14:00:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1633960854; bh=EGHYuQ7iTgfF1v16raV76dUZqXn7lsF3sBDsTlOfT8k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yJnoLOUhtlSmoCUuO+m0LzGv9vMWlfS7OMNaXCGoaRSDWIxr9XFmDhgn3yb3PHdI1 IAC+zOruKnKxqIvK1FRsrQqt8yRvY6VcHC5GTIt5W/r30qgMA45d8sL5KG0htCtaf0 x+PK8X4MGyoR1IXCDEfEqQL8nJdriyzNqV5cAlnw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Linus Walleij , Kees Cook , Arnd Bergmann , Sasha Levin Subject: [PATCH 5.14 094/151] ARM: defconfig: gemini: Restore framebuffer Date: Mon, 11 Oct 2021 15:46:06 +0200 Message-Id: <20211011134520.866697589@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211011134517.833565002@linuxfoundation.org> References: <20211011134517.833565002@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Linus Walleij [ Upstream commit a6949059318a064880050c76a9d8fb070156385f ] The framebuffer is gone on the D-Link DIR-685, restore it. Fixes: f611b1e7624c ("drm: Avoid circular dependencies for CONFIG_FB") Signed-off-by: Linus Walleij Cc: Kees Cook Link: https://lore.kernel.org/r/20210922200933.1825752-1-linus.walleij@linaro.org' Signed-off-by: Arnd Bergmann Signed-off-by: Sasha Levin --- arch/arm/configs/gemini_defconfig | 1 + 1 file changed, 1 insertion(+) -- 2.33.0 diff --git a/arch/arm/configs/gemini_defconfig b/arch/arm/configs/gemini_defconfig index d2d5f1cf815f..e6ff844821cf 100644 --- a/arch/arm/configs/gemini_defconfig +++ b/arch/arm/configs/gemini_defconfig @@ -76,6 +76,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_DRM=y CONFIG_DRM_PANEL_ILITEK_IL9322=y CONFIG_DRM_TVE200=y +CONFIG_FB=y CONFIG_LOGO=y CONFIG_USB=y CONFIG_USB_MON=y From patchwork Mon Oct 11 13:46:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 515622 Delivered-To: patch@linaro.org Received: by 2002:ac0:b5cc:0:0:0:0:0 with SMTP id x12csp4477005ime; Mon, 11 Oct 2021 07:08:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxbq6NsZ1MZZLwKmVvtjJ+8+7LuCWAefPJLeiy8sjV952CBEBJ5PR0zbidITv/x8mXX9/CV X-Received: by 2002:a1c:6a11:: with SMTP id f17mr13551338wmc.132.1633961315446; Mon, 11 Oct 2021 07:08:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633961315; cv=none; d=google.com; s=arc-20160816; b=N2Q/DJrl4flUCoXn9KqCftaU7ARYFE/VCJPhqPgm9WCVzkDKGOoHJz+FYv4FJ7glfr B4ConchJov2E/HSos9QeBRwM3pTmiBjA2/piYTc9uLVAz8GccV0ksSCZA1acsFMgTJt9 4XdojkX3UKLDkCQsBHG7XH2G72vuLJAfIOmH4yf0FiBxeQNwRfr6J+Y2lHw9daPsdsQb uCWfZ7UdMXcVDC2hjBkmn1sTrBqAMLeSku/LCPBk4Kiy0YFDSZqjsyl/doFrSNOrfMc3 WEJfSmTK3trE2Um1B1i6O+qJu+6CZURLF7IjV17ml9G7Ojy1qOWbkr6zCV6jqmcPPyqN 9biw== 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=mYjRLAZ7HEMoahrmPa09nAGc/F4K3W2PyytzI0lVMB4=; b=A5WGnTGuPIatG04Aal8o7Y80Az5cwJogVuV27hYCioDlwAiSiKLkqxT3JKbIDltuKq F6XG7n+LW+rQxLOsCauZCIwKcm7W7ENOcF6ZtZO3iJIqtfCj9gkS14Pq6PYdF+imXXkG rSNWmbu3QCZQXvYdnoJZQan8FIjHoIpA4wgbA8U69BGc1OIEwe61TVmucKatDOnlET1Q iqoXk+f85i6yB8Skckx5Z/dOx7KDnos4Io+Ycdlkcyn8lkvQmhA1luJL1TtsXXIOAPsr dXstpRvCoVJDqKUsDNwBbEHXBRvYYnHDE0THqRXIoPphFJPDiAsH+zC/7yH5LdlHoOiV B6QA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=u3dRrIyT; 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 b13si19360482ede.572.2021.10.11.07.08.34; Mon, 11 Oct 2021 07:08:35 -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=u3dRrIyT; 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 S241074AbhJKOKc (ORCPT + 11 others); Mon, 11 Oct 2021 10:10:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:33434 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241864AbhJKOIb (ORCPT ); Mon, 11 Oct 2021 10:08:31 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D2BC66124F; Mon, 11 Oct 2021 14:01:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1633960886; bh=tx2s8Vfs7vROGq+0y/pyfaiNWVs4C19XcKOE+UM9Gyg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u3dRrIyTAt4HimuDon5do5OZMvd0yZuanquUlqjd3lGlyLb3t22cSOmeFR7cDNaqA hG/d1NMjwZaEPVHYEwXyZkwh2ZDTzGipBg6QPHIY8pTJe3Mtnyh4vFOKi8XYHP2Hfy KObmsesJCYxNQ/Tya+jYDxhhHy0aIjuiWvNmr7Wc= 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.14 102/151] video: fbdev: gbefb: Only instantiate device when built for IP32 Date: Mon, 11 Oct 2021 15:46:14 +0200 Message-Id: <20211011134521.113118342@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211011134517.833565002@linuxfoundation.org> References: <20211011134517.833565002@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 c5b99a4861e8..6b4d5a7f3e15 100644 --- a/drivers/video/fbdev/gbefb.c +++ b/drivers/video/fbdev/gbefb.c @@ -1267,7 +1267,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);