From patchwork Mon Oct 11 13:45:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 515611 Delivered-To: patch@linaro.org Received: by 2002:ac0:b5cc:0:0:0:0:0 with SMTP id x12csp4463277ime; Mon, 11 Oct 2021 06:53:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwKxjla1A8jTD4mtnI4PbUpVW0VWXiW9A2SE+iGAge+i5LF3GT06T93bMuUOe6CXrN4dgmW X-Received: by 2002:a62:6541:0:b0:44c:2988:7d9d with SMTP id z62-20020a626541000000b0044c29887d9dmr25701570pfb.50.1633960427160; Mon, 11 Oct 2021 06:53:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633960427; cv=none; d=google.com; s=arc-20160816; b=KiN2xOUwAukSaMri7iZ4QGiNJqjzqQM5ofU8Nav0gQ1ncM+16Fk3ekSJUlo5nQ78vj 3GQHb6ojPnRfuSgABzvw1nBaPvypMk5w6RHBFqPcTViAcd66GufelcN/7Xd/ynuNdA8n AcNsXdMSTscsL9y1O8bjLfvgJ+c5C+WE5QGK4ghsK4o0XFWmdUDTuFoaLaAL930o0J5P hvqvjfhAKGjsONt23PzQ+xmD3Zr+/Y7lzqRMLLDP0J9wYZNH9KMsjIdSDhpCbPLVOh7w QsJ4FEXkHeznfjpjwZCwE59IcCtqRUqiHO14r6jlTRezjDJ8tjlM0Y/OAhzBRHzHGB9t bioQ== 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=IY8ILXBryJlshB1jknNAUgF/SZUBR3lC9y1yd3jbKhr8vqOqL7Wk20ixwoFjf6ktGl PuqUg9Giu+zD7uIa9bps7oKidhKzkZXKFE3RXCh4HZF+Sne6yQPUdyqlLUMpoKEdr9QL 6dzUWtJVphtyy63tax0PAdgQ1CxfKbPvsUWnPxtKAvLjo4SDzyjbUYkvFWdcDygzHprp KpMTlY4AvaRNyzCOq/zPpfrRmLi8Pf2JePgLVFgaQOgjusqBB0aZNpWdvY9kE8vdakU3 5+8QTYWbL9U5onM22fJsQ5KCLYwOSgPPaq+lvCDlLWfPIFVrymDPehHbxWvW7BG2PdYG q+7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=iKuDDeIK; 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 v1si5806259pfb.272.2021.10.11.06.53.46; Mon, 11 Oct 2021 06:53:47 -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=iKuDDeIK; 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 S237575AbhJKNzq (ORCPT + 11 others); Mon, 11 Oct 2021 09:55:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:39898 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237403AbhJKNxt (ORCPT ); Mon, 11 Oct 2021 09:53:49 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id CD89560E8B; Mon, 11 Oct 2021 13:51:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1633960309; bh=KatlpQaVe2Tnj8+hKldMj+ZI/hitDdpstM/2v3SlcLM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iKuDDeIKAvFvidDG+WYEXnIquVBNsvKxX+LXu5HWQXB/o96vRiXjB2Iwj/H5+e/gw npFPrKJpDHCXA4+bxeIP5crTFEs35McKleOMWo+DNnd+8yIxaL0b/qm2NzUNKeNg9I cb+zDyZLfzihZRWYnOSKi05JbbDB7/ZHz6O/rOq8= 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.10 25/83] soc: qcom: mdt_loader: Drop PT_LOAD check on hash segment Date: Mon, 11 Oct 2021 15:45:45 +0200 Message-Id: <20211011134509.230620469@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211011134508.362906295@linuxfoundation.org> References: <20211011134508.362906295@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:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 515612 Delivered-To: patch@linaro.org Received: by 2002:ac0:b5cc:0:0:0:0:0 with SMTP id x12csp4463782ime; Mon, 11 Oct 2021 06:54:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwJttUzPOLgvBH3QhOIjMsk2wDc/cvuiHFJ1M8AFBC6TtfLZghopbcru4sYWcletVFSAAB9 X-Received: by 2002:a17:90b:33cb:: with SMTP id lk11mr23703678pjb.0.1633960471119; Mon, 11 Oct 2021 06:54:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633960471; cv=none; d=google.com; s=arc-20160816; b=IVxS8v+ANQgBXlvI2KDOZeF5gC6jCYdDGNVtvq05IpLVWzcYg9nBiMZky/QgZdRik/ u5BEYo6Ui4/R20Qisrd0sl8q3+pOpAnSm+jeaVEmQcFGDGek4iDs7vVnvrC+0tLwDdei not2jlabuPLkWCJw7Ypkx0MlETAn94OHa50VSLTjAIYGmCdBJ/by3bNasElyQ9r9Z+ju /G8jOjfnPYvYUcbwHEWCZQu/xn2lC8MPhdn1+0ay1xozMESE+lNGXoCUHYaISNtD/ceN n3UUQpt+Sbhit6V/WZ8UmLcCo21IZmSEjLngyQWEmmx4PVR/IOJ1haVt1C7sGTnf/L1v M2EQ== 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=ThYyMvelwKSNSGDxdCtaQDyATpGNVcOH9Kvn5v+1AaDIMAkzMveDb9C6bm9pOA9wUy y43t2Dzd6s7FfgKzgG80k0nsXR9iBx1ojLzJ86pAqjlauWaX6IVI4bC4GcnxpkQtwwet thf7tKW6K3FnLbG6p/8bTWk4HTxkwI7iaDxIDX3VJybDNHKOlHLZAtK/ZWWGwUJSNTv0 /Z86bh+uzqBGuMyKAWO/ENNiMWLqGYX8Dx5e+WGpYzf6Y3AhxUleGyUWW3SU3ztOyDkd Gb+vySquDqBS2EcxxPm6WZa4mjuCeuHTqZskusdBtXWq4D+D+f0CjCH+ntXw+BZUTpi6 AKNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=UquVYUaO; 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 o2si11612477pfh.133.2021.10.11.06.54.30; Mon, 11 Oct 2021 06:54:31 -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=UquVYUaO; 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 S237742AbhJKN43 (ORCPT + 11 others); Mon, 11 Oct 2021 09:56:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:39364 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235476AbhJKNyb (ORCPT ); Mon, 11 Oct 2021 09:54:31 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5E0BF60F11; Mon, 11 Oct 2021 13:52:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1633960336; bh=4FxJVdVhKieCEydt0c2Cf/EXCXYWRYaRt97o9ypkH2o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UquVYUaOQmHcLnF5KBgzHXBCdMFyJUJ/x/CtfnTlfac7Af/jmS9pdJ9iFIEKNMzSh VKfhLUrtRYL9AliEngTQaWTBFOSdPfBepJbykN28eOudKl+hUkY+//s52DiiaqjXU4 gTiGRp467Q7g4J+LRff8jEXFY4ZfH8IN/5PpmfDk= 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.10 30/83] ath5k: fix building with LEDS=m Date: Mon, 11 Oct 2021 15:45:50 +0200 Message-Id: <20211011134509.408152192@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211011134508.362906295@linuxfoundation.org> References: <20211011134508.362906295@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:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 515613 Delivered-To: patch@linaro.org Received: by 2002:ac0:b5cc:0:0:0:0:0 with SMTP id x12csp4463837ime; Mon, 11 Oct 2021 06:54:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxx/N3l+SLC1t6cTlfq7VqMD4xvKv7PKhuQK3bsOgFUMQ2Q1MfDZ4LJHotoF9loVlz1HjCl X-Received: by 2002:a17:90a:6289:: with SMTP id d9mr31742070pjj.110.1633960475709; Mon, 11 Oct 2021 06:54:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633960475; cv=none; d=google.com; s=arc-20160816; b=RVWw/4oWo2pNz1UmmfVQZ8uydK/zc3y78lRdqShG372nLOb460Fbf4NpN2LRiL+EWj wmWQFi1bYuw03X6gISeyY6irMIdQWn3t5LW5yMOfqXqAW03OVheIyfpO1JGO4xUCt9TJ ugwH+YHkZiDs6Iw+gi2UviB/FzZjQELY8vz2qp5LhsQpebZhB5CuVkSA24w+C6o5TYgw sHv7dp1YMH6BJb4/v2gSCBWbeW1BmZl/e3MvW46lhj1lLVVLNqY0ttGd72rf2fBQySZe xYBCTNvhIYAcq+koOwJcMRxmIC5xcN01GpoZY4ep6i+2kDi4oLBA5/JWjc1CXUNWxATX O8Bg== 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=u2wa/EPlabqEOz04Tl1yhQ9HRK7mga30CMk9DWb4ODs=; b=a04vlPEC151Eykb2kZna1cLPd4f3W9Xd/IlgTSWWUSWacGkEddW7W9ZXsCXvV08Z6n z0y4e3Ai1B3yGlMjQ1gm3K6j1P8M0u0l9wf6qtO5Rlchnf6SFG4DZmU+hYuKPFj5m7ZK Zr5fFx6RWnU1v+sSYrQKW0lLUTf6mkYkUSJs9xkTglSE99gwzqoNNEeuPehCluja8uVO Euo2jRyVC/fgL1F8DBPiz/cL232BMgjboiGRwoZCbnwgzV498yzkKha1Xd8+9sOF1qRy sj5SRYDOKgWAPZwRSkTO2aFvyN96RwVcy//IQjp1W7XPXz5uL1BRC2oyLZGIkDBinotN 3XnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="UOI7aj/y"; 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 82si11178264pge.62.2021.10.11.06.54.35; Mon, 11 Oct 2021 06:54: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="UOI7aj/y"; 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 S237766AbhJKN4c (ORCPT + 11 others); Mon, 11 Oct 2021 09:56:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:40390 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237862AbhJKNye (ORCPT ); Mon, 11 Oct 2021 09:54:34 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 568C6610CC; Mon, 11 Oct 2021 13:52:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1633960340; bh=6hvihozSgGjPmz/3nASpO5tEwLMVh+jlhT5AeGs0SEM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UOI7aj/yHOdtnCzVjsoVO3SrUfd5PoQi9K/AvB58xWuWYnketvNnSfsL1VAF8uYdY 9X8Ph8Pu6QRjo6KKENw+z7pVuKmDRfB0Mbafgrpykzq3sF6WUqOmOfCHYri8w9Th8p NSq2vDFgZtA+v7DZ7iwyKjaYNeoXRy7ePfWDXbbg= 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.10 31/83] arm64: dts: qcom: pm8150: use qcom, pm8998-pon binding Date: Mon, 11 Oct 2021 15:45:51 +0200 Message-Id: <20211011134509.440004522@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211011134508.362906295@linuxfoundation.org> References: <20211011134508.362906295@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 1b6406927509..82edcd74ce98 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>; pwrkey { compatible = "qcom,pm8941-pwrkey"; From patchwork Mon Oct 11 13:45:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 515614 Delivered-To: patch@linaro.org Received: by 2002:ac0:b5cc:0:0:0:0:0 with SMTP id x12csp4464274ime; Mon, 11 Oct 2021 06:55:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzNA9ojbf6ehbU5r+C9AJP+8w/AeeNjFa/+jSRRS19epEYwBhb2Ss4rcdztAsTbD3zbxiJE X-Received: by 2002:a17:902:8a8c:b0:13e:45bc:e9a9 with SMTP id p12-20020a1709028a8c00b0013e45bce9a9mr25053560plo.11.1633960518416; Mon, 11 Oct 2021 06:55:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633960518; cv=none; d=google.com; s=arc-20160816; b=OxNfinEf4ser88x/LjHmoS/2xwvDCDQ1/0++7Y7br51BqqgMUXf03m3K3GQGdW0bmG vynj4OV1n23QWLlxI0j1TMY5mh5sxZYhsB4f5fZLT7O4YwEBbOXL2yfcVjo7/WD43H4S gkQyb77kR5p8rTBAaXhsPNxjw+a5XlrTC3rsoGutxHv8dORkRDeEpbadmMgUdMb48FUv zCzvuv6EwMyUBWhSyt9PY6Y3bApJT1hGOQaF7dksUBHopknrXOh43C0fDHjr/yGV72zs OU2/S7ExT1zbTgrQv7uZakwi4Uogaf89DIQIktNUbPJRbCg6by7ny4pX4pV1OEUocCar gXRg== 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=rvCDfyxMH54cr2hGSFMKFO7AdzDJnOdVTqNCtkVLHKs=; b=OSHsJIQiL4uX/FR+Zfmq20tFjt/ko+4wkhVUpwSxkk4zC9Z6KoOdsYBtOldSpbOUvL AFzWnyuL4ib6FvzVxWbgEmGi1T4neDC6xM7UAj7muZLmsSLlG1b8CHNf+k1qXPbzqSYr f0X5vNaz2BnuD9pXdIOHBDhYlEHBWx12T7eac4mU5HLmIZLAaLk1WGR5KhuUmGb9od0H hyJc2Wbj8BBTuNWYsnA40z9VWLBEuKV2e8J+Rlc8nBTeYcsM1aQT9RghrZLG/uDwDSCn RYBtpSlZjMNzEDJ2WyvqgzEC8oPKBdKPL+023NhwcDa6ifiiRG2n41FiFp7EGbf6dfes P3kA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=PmUcX48S; 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 t1si9702181pjq.59.2021.10.11.06.55.18; Mon, 11 Oct 2021 06:55: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=PmUcX48S; 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 S238156AbhJKN5P (ORCPT + 11 others); Mon, 11 Oct 2021 09:57:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:41094 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237597AbhJKNzS (ORCPT ); Mon, 11 Oct 2021 09:55:18 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A1B8360F38; Mon, 11 Oct 2021 13:52:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1633960374; bh=KuuUbflSFXcPofwMhlJG78JEDAaw5jkVWvFcGVVhLVQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PmUcX48S0pqWL269bs5oNWJkIymvJRG6+W8EDLwIixhyIHqaHfNxPaYPm5paBtr2K 7yggzp3XN8dKZ2oxbpnLah6spsppkzqU49dU4UM6t8ZAjXk23oLtVdMjZdwTuPwqKJ GhbiU1vnmSBl35QTxWc+e40SJE3G0M4BdV9tQ9TU= 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.10 34/83] iwlwifi: pcie: add configuration of a Wi-Fi adapter on Dell XPS 15 Date: Mon, 11 Oct 2021 15:45:54 +0200 Message-Id: <20211011134509.554087872@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211011134508.362906295@linuxfoundation.org> References: <20211011134508.362906295@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 90b12e201795..4e43efd5d1ea 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c @@ -635,6 +635,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:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 515616 Delivered-To: patch@linaro.org Received: by 2002:ac0:b5cc:0:0:0:0:0 with SMTP id x12csp4465796ime; Mon, 11 Oct 2021 06:57:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy580g6YeWwEr/JThgpp276qhXXbZ2sgV8R3NmM4/E7B5PalrQMPHISAfjIgMu/zLitNzU1 X-Received: by 2002:a17:902:a385:b0:13e:99e9:17f3 with SMTP id x5-20020a170902a38500b0013e99e917f3mr24564818pla.65.1633960634086; Mon, 11 Oct 2021 06:57:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633960634; cv=none; d=google.com; s=arc-20160816; b=mbWLVvTq7Kcjs2iHmGNhWSELsYPXQG/uvEOFaFdkRsAOe+7dBUaOYOCwgAqYmA5ywF 0TlkHXAzH+oyd2GQAEH/H+utjJzc2x2gSclfFgiIbghvjb6Vt83AELx0S74j47x/BaeS E/7Wt94iNafHMIyVsC411zU0T1DPDrfo9XCLJhVoiLxjz/p2CwCmZ2j7Tu+jzNNOcJ2I 9V8+2snpydxf5Budacaam1ZEyfCfa3gY9aPjjMuauseU60LB61Tm6pjSI5Bzlwq7ieZg X2hHbqgGQtKuvhKTLB7oa4NLqfcTsnQkIufkCK/OAI1qlVL1/SzKUHPrnASPojqZ5xkx Bs4g== 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=Ie6S63KLzNfY9bd3LpZyUkylEEaa/5aai+wcWnW1o6w=; b=swHeANha9o33eVmMKxNiMskq87TjjeMbXBl2F0cTOqq3jv34zxWyQiLmZ/cLkT8a5u 12P9BVO8JIkQka5AeOT2k7yId3UVPYyrTpzej6Gxg+vDbEevN/oId+jbTUko1nGAaicL bxu5MtR5rCEI6y45LuhYQkOlk1EK+ngMgqTHZsdSGQVBMzyDgYnNrJHuCV8L9HcpTi16 VsPxZmXv0lmdT0nqF8tuIxlVbVD6XdJaioIfwbe3GFt6pQlWNuc6fh3lv8ic8SVbDNgn LQlgK11XuQc6j5RbCR61XArwAABNuQi9yPAFF4pyRYgv8j7tSZKX8Sx1RU4ffIHAf3CZ SKAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=urY4GRHt; 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 o15si12361563pgb.47.2021.10.11.06.57.13; Mon, 11 Oct 2021 06:57:14 -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=urY4GRHt; 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 S237070AbhJKN6y (ORCPT + 11 others); Mon, 11 Oct 2021 09:58:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:40614 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237863AbhJKN4l (ORCPT ); Mon, 11 Oct 2021 09:56:41 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E12866113D; Mon, 11 Oct 2021 13:53:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1633960422; bh=sb6Z8opnOOKio5yqaSbWt+6ANeHcv8rWixoNds1Tfiw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=urY4GRHtyoJ7QOTq+Rkd/nehRMGt6uYU/gJUd6of+2clYBdaGTtIFk/mv1DhkQv4d 6RTkJI+h9QjfL9jonO0aooO2GhamUWJTcL7KmiUUvBem8IKhIbAVbdw+B03i8AkIJo whAUOLcHVqJo/3JmtiRHKybxB587/HzmoWSqVSv4= 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.10 55/83] video: fbdev: gbefb: Only instantiate device when built for IP32 Date: Mon, 11 Oct 2021 15:46:15 +0200 Message-Id: <20211011134510.290610197@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211011134508.362906295@linuxfoundation.org> References: <20211011134508.362906295@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 31270a8986e8..8f8ca1f88fe2 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);