diff options
| -rw-r--r-- | 0001-rtlwifi-Fix-potential-overflow-on-P2P-code.patch | 52 | ||||
| -rw-r--r-- | gpio-max77620-Use-correct-unit-for-debounce-times.patch | 586 | ||||
| -rw-r--r-- | iwlwifi-exclude-GEO-SAR-support-for-3168.patch | 47 | ||||
| -rw-r--r-- | kernel.spec | 13 | ||||
| -rw-r--r-- | sources | 2 |
5 files changed, 5 insertions, 695 deletions
diff --git a/0001-rtlwifi-Fix-potential-overflow-on-P2P-code.patch b/0001-rtlwifi-Fix-potential-overflow-on-P2P-code.patch deleted file mode 100644 index f8f40bd82..000000000 --- a/0001-rtlwifi-Fix-potential-overflow-on-P2P-code.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 5d6fc173fd2963e39be890667d5bf3b1fde351dd Mon Sep 17 00:00:00 2001 -From: Laura Abbott <labbott@redhat.com> -Date: Wed, 16 Oct 2019 16:45:48 -0400 -Subject: [PATCH v2] rtlwifi: Fix potential overflow on P2P code -To: Ping-Ke Shih <pkshih@realtek.com> -To: Kalle Valo <kvalo@codeaurora.org> -Cc: David S. Miller <davem@davemloft.net> -Cc: linux-wireless@vger.kernel.org -Cc: netdev@vger.kernel.org -Cc: linux-kernel@vger.kernel.org -Cc: Nicolas Waisman <nico@semmle.com> - -Nicolas Waisman noticed that even though noa_len is checked for -a compatible length it's still possible to overrun the buffers -of p2pinfo since there's no check on the upper bound of noa_num. -Bound noa_num against P2P_MAX_NOA_NUM. - -Reported-by: Nicolas Waisman <nico@semmle.com> -Signed-off-by: Laura Abbott <labbott@redhat.com> ---- -v2: Use P2P_MAX_NOA_NUM instead of erroring out. ---- - drivers/net/wireless/realtek/rtlwifi/ps.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/drivers/net/wireless/realtek/rtlwifi/ps.c b/drivers/net/wireless/realtek/rtlwifi/ps.c -index 70f04c2f5b17..fff8dda14023 100644 ---- a/drivers/net/wireless/realtek/rtlwifi/ps.c -+++ b/drivers/net/wireless/realtek/rtlwifi/ps.c -@@ -754,6 +754,9 @@ static void rtl_p2p_noa_ie(struct ieee80211_hw *hw, void *data, - return; - } else { - noa_num = (noa_len - 2) / 13; -+ if (noa_num > P2P_MAX_NOA_NUM) -+ noa_num = P2P_MAX_NOA_NUM; -+ - } - noa_index = ie[3]; - if (rtlpriv->psc.p2p_ps_info.p2p_ps_mode == -@@ -848,6 +851,9 @@ static void rtl_p2p_action_ie(struct ieee80211_hw *hw, void *data, - return; - } else { - noa_num = (noa_len - 2) / 13; -+ if (noa_num > P2P_MAX_NOA_NUM) -+ noa_num = P2P_MAX_NOA_NUM; -+ - } - noa_index = ie[3]; - if (rtlpriv->psc.p2p_ps_info.p2p_ps_mode == --- -2.21.0 - diff --git a/gpio-max77620-Use-correct-unit-for-debounce-times.patch b/gpio-max77620-Use-correct-unit-for-debounce-times.patch deleted file mode 100644 index bcf575fb8..000000000 --- a/gpio-max77620-Use-correct-unit-for-debounce-times.patch +++ /dev/null @@ -1,586 +0,0 @@ -From patchwork Wed Oct 2 12:28:23 2019 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Thierry Reding <thierry.reding@gmail.com> -X-Patchwork-Id: 1170631 -Return-Path: <linux-gpio-owner@vger.kernel.org> -X-Original-To: incoming@patchwork.ozlabs.org -Delivered-To: patchwork-incoming@bilbo.ozlabs.org -Authentication-Results: ozlabs.org; - spf=none (mailfrom) smtp.mailfrom=vger.kernel.org - (client-ip=209.132.180.67; helo=vger.kernel.org; - envelope-from=linux-gpio-owner@vger.kernel.org; - receiver=<UNKNOWN>) -Authentication-Results: ozlabs.org; - dmarc=pass (p=none dis=none) header.from=gmail.com -Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; - unprotected) header.d=gmail.com header.i=@gmail.com - header.b="Xe4ozWCs"; dkim-atps=neutral -Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) - by ozlabs.org (Postfix) with ESMTP id 46jwR31mYjz9sPl - for <incoming@patchwork.ozlabs.org>; - Wed, 2 Oct 2019 22:28:31 +1000 (AEST) -Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand - id S1725875AbfJBM2a (ORCPT <rfc822;incoming@patchwork.ozlabs.org>); - Wed, 2 Oct 2019 08:28:30 -0400 -Received: from mail-wr1-f67.google.com ([209.85.221.67]:42402 "EHLO - mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org - with ESMTP id S1725848AbfJBM23 (ORCPT - <rfc822; linux-gpio@vger.kernel.org>); Wed, 2 Oct 2019 08:28:29 -0400 -Received: by mail-wr1-f67.google.com with SMTP id n14so19415351wrw.9; - Wed, 02 Oct 2019 05:28:28 -0700 (PDT) -DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; - h=from:to:cc:subject:date:message-id:mime-version - :content-transfer-encoding; - bh=qP9mbplmTy0EguziRYmdZKFvmKZpgiY1goXlhQxV0/8=; - b=Xe4ozWCsxpb6DK1agUyM9eUxlP6G03BBFhI5g4JErak3F1hsMTKXmoyANoMKXxS+UF - OWRiAkrVC3cQOJczX/+7HhZQ8bMC3apl96os1jO6/JWJEP2BHZpDAF0bRyJQdbd0lmMA - afH1TDc/aCLYhrc6UF4IMSf4Noe9cSvoyQYpo0qgpxktdn7I/jv5ztIFWEVBOuEfDveP - hKAmMRuOGlokBd9/+TirOM307HbJYDWAZ8Wko3G+bYcw41RSULf9eN0mQPLmeF/+J9tC - XwaypBneeu3VeCmfU/DxP1duZ3pCcnwOu5nrzdHsS6ow28T2CVk8VvAAZGEU1cUIX4Z+ - +hkw== -X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; - d=1e100.net; s=20161025; - h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version - :content-transfer-encoding; - bh=qP9mbplmTy0EguziRYmdZKFvmKZpgiY1goXlhQxV0/8=; - b=akVGfKDGN9KlaS7GfDnHx98C2QeedcAeu8RIoCS8uh0twWVOZMZKbUY6M/2HaZKsPI - 38mOkZ2CRPyO1EzbpI9UU6hHXfohMTHuWX0pTdvkFXn+TfZPAxJa1fVRhHgOcknkhb/U - JBzse/qoFFdlsRK3kY6I+0R1YyyAD2SDlzfax4U6ew8DL0icpWegiNEXnIno/7b6sIt2 - 9u9PEHk+1AdQkgS/tVRAFdVg6rrYMbUFkh1JAYsEED71D2IR38JmdUfjsW0Bi1aohXuz - F8LOoB0G33BszHljgknOYlHF4tPGDitMVI+giV3UgwXEWHKFgimUJKOb1nyg+4fcVOLO - 2g1g== -X-Gm-Message-State: APjAAAX5YpK/Xf8BgNQ7EyD7TzARRLtN4fRfLcEXIT3fZkDHf5xGyxPi - jnbTBpi+UDekDgGOQiVnsoo= -X-Google-Smtp-Source: APXvYqw9HA6mSwE4O/MajE0OyTuT/xQaPqMRcrU+p/RXgMiP+Q297cH5ORneUFjHbOQpwrdgestsJw== -X-Received: by 2002:adf:fe05:: with SMTP id n5mr2716992wrr.355.1570019307315; - Wed, 02 Oct 2019 05:28:27 -0700 (PDT) -Received: from localhost (p2E5BE2CE.dip0.t-ipconnect.de. [46.91.226.206]) - by smtp.gmail.com with ESMTPSA id - e17sm5719759wma.15.2019.10.02.05.28.25 - (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); - Wed, 02 Oct 2019 05:28:26 -0700 (PDT) -From: Thierry Reding <thierry.reding@gmail.com> -To: Linus Walleij <linus.walleij@linaro.org>, - Bartosz Golaszewski <bgolaszewski@baylibre.com> -Cc: Timo Alho <talho@nvidia.com>, linux-gpio@vger.kernel.org, - linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org -Subject: [PATCH 1/3] gpio: max77620: Use correct unit for debounce times -Date: Wed, 2 Oct 2019 14:28:23 +0200 -Message-Id: <20191002122825.3948322-1-thierry.reding@gmail.com> -X-Mailer: git-send-email 2.23.0 -MIME-Version: 1.0 -Sender: linux-gpio-owner@vger.kernel.org -Precedence: bulk -List-ID: <linux-gpio.vger.kernel.org> -X-Mailing-List: linux-gpio@vger.kernel.org - -From: Thierry Reding <treding@nvidia.com> - -The gpiod_set_debounce() function takes the debounce time in -microseconds. Adjust the switch/case values in the MAX77620 GPIO to use -the correct unit. - -Signed-off-by: Thierry Reding <treding@nvidia.com> ---- - drivers/gpio/gpio-max77620.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/drivers/gpio/gpio-max77620.c b/drivers/gpio/gpio-max77620.c -index 47d05e357e61..faf86ea9c51a 100644 ---- a/drivers/gpio/gpio-max77620.c -+++ b/drivers/gpio/gpio-max77620.c -@@ -192,13 +192,13 @@ static int max77620_gpio_set_debounce(struct max77620_gpio *mgpio, - case 0: - val = MAX77620_CNFG_GPIO_DBNC_None; - break; -- case 1 ... 8: -+ case 1000 ... 8000: - val = MAX77620_CNFG_GPIO_DBNC_8ms; - break; -- case 9 ... 16: -+ case 9000 ... 16000: - val = MAX77620_CNFG_GPIO_DBNC_16ms; - break; -- case 17 ... 32: -+ case 17000 ... 32000: - val = MAX77620_CNFG_GPIO_DBNC_32ms; - break; - default: - -From patchwork Wed Oct 2 12:28:24 2019 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Thierry Reding <thierry.reding@gmail.com> -X-Patchwork-Id: 1170635 -Return-Path: <linux-gpio-owner@vger.kernel.org> -X-Original-To: incoming@patchwork.ozlabs.org -Delivered-To: patchwork-incoming@bilbo.ozlabs.org -Authentication-Results: ozlabs.org; - spf=none (mailfrom) smtp.mailfrom=vger.kernel.org - (client-ip=209.132.180.67; helo=vger.kernel.org; - envelope-from=linux-gpio-owner@vger.kernel.org; - receiver=<UNKNOWN>) -Authentication-Results: ozlabs.org; - dmarc=pass (p=none dis=none) header.from=gmail.com -Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; - unprotected) header.d=gmail.com header.i=@gmail.com - header.b="ZNLKx8UP"; dkim-atps=neutral -Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) - by ozlabs.org (Postfix) with ESMTP id 46jwRG4D1Dz9sPj - for <incoming@patchwork.ozlabs.org>; - Wed, 2 Oct 2019 22:28:42 +1000 (AEST) -Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand - id S1726684AbfJBM2d (ORCPT <rfc822;incoming@patchwork.ozlabs.org>); - Wed, 2 Oct 2019 08:28:33 -0400 -Received: from mail-wr1-f66.google.com ([209.85.221.66]:43919 "EHLO - mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org - with ESMTP id S1725848AbfJBM2c (ORCPT - <rfc822; linux-gpio@vger.kernel.org>); Wed, 2 Oct 2019 08:28:32 -0400 -Received: by mail-wr1-f66.google.com with SMTP id q17so19436519wrx.10; - Wed, 02 Oct 2019 05:28:30 -0700 (PDT) -DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; - h=from:to:cc:subject:date:message-id:in-reply-to:references - :mime-version:content-transfer-encoding; - bh=iB2sFoZ4x2KF5IYNHgeqY98wXl2bB2JULeTFtyoqdVY=; - b=ZNLKx8UP+ukUsboEbPQ9oqLgg5M+37mex1mpr0SgaI7zjToRbmdCJL/chPAEK2r7t8 - C+RcBU7oQnbO3L1hTZQh1VyMX84xXmn0x8g7AskW0bydPo29O2lwBgM9BeNJiMt7gaS7 - LtCbNGe/ttaTfoTsJSOmpLgAJLVJ7mpN5r3h18HtAYcsB5NqjcgFF1yFZ9FvmXOIhxAm - 1MxDJ7tO9pJbc4JQ8iR/yPEsCNibvlX1qtkuBUWdy6aJHG4CkqIbqb+V+84d3R5bsmoe - sDx7f/mMbJ6cF7dCarqOe47Quscz7UkGw/gZywhaYNS/7p6JBvKDCe0bbruzj3MEXMRy - 2tlw== -X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; - d=1e100.net; s=20161025; - h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to - :references:mime-version:content-transfer-encoding; - bh=iB2sFoZ4x2KF5IYNHgeqY98wXl2bB2JULeTFtyoqdVY=; - b=E8tcBQ6lyFYE0z3JyOT1cT/Bgc194gfYXxSrFLZnHENJjrNz2Ijr9mgmTvanMcmLgs - qvPIH6L5rKKzPpmhxkGCVNMunQuR3U4+g4lCHaJuDE3QikN/dAMpfidmgej7UBcnxYXq - c8yhdhWsg36bVdUYmTdrPVNYayH3WqNj6h3724+nRQnwGs5Y+emoWuhckIBZQR2fJd3Z - jEEmej1F2QBBv4/Cf7RoOd9BVX1DFI3LgOoGADQcGnuCW/+2clFWp860wnWLGdTGqPKI - KCaPoNOzFDkbQCyhebPt8recsiTexB8AmRdTCOszf/TYQwmlvVUUSVqdwY4/P2N0uAGO - 8kOA== -X-Gm-Message-State: APjAAAVWUbix6mCYosiAjDRWTB69Pz3baQGdU6UKJJJba2d6nCyRFzs3 - w1iyx5KVIbR84BwLezjxgUk= -X-Google-Smtp-Source: APXvYqylRlhdhO5L5gTZTUh+KEGBPZYsf15BqzctBqRpCy2v75DzIQkOOs8h+NZd8ePk6530OH8SlA== -X-Received: by 2002:adf:f112:: with SMTP id r18mr2493221wro.88.1570019309276; - Wed, 02 Oct 2019 05:28:29 -0700 (PDT) -Received: from localhost (p2E5BE2CE.dip0.t-ipconnect.de. [46.91.226.206]) - by smtp.gmail.com with ESMTPSA id - h17sm10777194wme.6.2019.10.02.05.28.28 - (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); - Wed, 02 Oct 2019 05:28:28 -0700 (PDT) -From: Thierry Reding <thierry.reding@gmail.com> -To: Linus Walleij <linus.walleij@linaro.org>, - Bartosz Golaszewski <bgolaszewski@baylibre.com> -Cc: Timo Alho <talho@nvidia.com>, linux-gpio@vger.kernel.org, - linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org -Subject: [PATCH 2/3] gpio: max77620: Do not allocate IRQs upfront -Date: Wed, 2 Oct 2019 14:28:24 +0200 -Message-Id: <20191002122825.3948322-2-thierry.reding@gmail.com> -X-Mailer: git-send-email 2.23.0 -In-Reply-To: <20191002122825.3948322-1-thierry.reding@gmail.com> -References: <20191002122825.3948322-1-thierry.reding@gmail.com> -MIME-Version: 1.0 -Sender: linux-gpio-owner@vger.kernel.org -Precedence: bulk -List-ID: <linux-gpio.vger.kernel.org> -X-Mailing-List: linux-gpio@vger.kernel.org - -From: Thierry Reding <treding@nvidia.com> - -regmap_add_irq_chip() will try to allocate all of the IRQ descriptors -upfront if passed a non-zero irq_base parameter. However, the intention -is to allocate IRQ descriptors on an as-needed basis if possible. Pass 0 -instead of -1 to fix that use-case. - -Signed-off-by: Thierry Reding <treding@nvidia.com> ---- - drivers/gpio/gpio-max77620.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/gpio/gpio-max77620.c b/drivers/gpio/gpio-max77620.c -index faf86ea9c51a..c58b56e5291e 100644 ---- a/drivers/gpio/gpio-max77620.c -+++ b/drivers/gpio/gpio-max77620.c -@@ -304,7 +304,7 @@ static int max77620_gpio_probe(struct platform_device *pdev) - } - - ret = devm_regmap_add_irq_chip(&pdev->dev, chip->rmap, gpio_irq, -- IRQF_ONESHOT, -1, -+ IRQF_ONESHOT, 0, - &max77620_gpio_irq_chip, - &chip->gpio_irq_data); - if (ret < 0) { - -From patchwork Wed Oct 2 12:28:25 2019 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Thierry Reding <thierry.reding@gmail.com> -X-Patchwork-Id: 1170633 -Return-Path: <linux-gpio-owner@vger.kernel.org> -X-Original-To: incoming@patchwork.ozlabs.org -Delivered-To: patchwork-incoming@bilbo.ozlabs.org -Authentication-Results: ozlabs.org; - spf=none (mailfrom) smtp.mailfrom=vger.kernel.org - (client-ip=209.132.180.67; helo=vger.kernel.org; - envelope-from=linux-gpio-owner@vger.kernel.org; - receiver=<UNKNOWN>) -Authentication-Results: ozlabs.org; - dmarc=pass (p=none dis=none) header.from=gmail.com -Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; - unprotected) header.d=gmail.com header.i=@gmail.com - header.b="TsA9TpB7"; dkim-atps=neutral -Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) - by ozlabs.org (Postfix) with ESMTP id 46jwRD5mmDz9sPq - for <incoming@patchwork.ozlabs.org>; - Wed, 2 Oct 2019 22:28:40 +1000 (AEST) -Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand - id S1727456AbfJBM2f (ORCPT <rfc822;incoming@patchwork.ozlabs.org>); - Wed, 2 Oct 2019 08:28:35 -0400 -Received: from mail-wm1-f66.google.com ([209.85.128.66]:34525 "EHLO - mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org - with ESMTP id S1726682AbfJBM2e (ORCPT - <rfc822; linux-gpio@vger.kernel.org>); Wed, 2 Oct 2019 08:28:34 -0400 -Received: by mail-wm1-f66.google.com with SMTP id y135so4823030wmc.1; - Wed, 02 Oct 2019 05:28:32 -0700 (PDT) -DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; - h=from:to:cc:subject:date:message-id:in-reply-to:references - :mime-version:content-transfer-encoding; - bh=CBafHZOcPLRsPg6HMh6RW3fmvKDiW2MODjit57xEepE=; - b=TsA9TpB72Q02EPmaBqcc4zzucsjsdc5mtjgAgTak5YrKh+mRT2HMioWeCxrLu5Cl+6 - 66PhcUzrRtOnct3yEqC1hueFX+K8TsDr1bJq2f3L5LqA9rYz5Hdk93jVmwyEKtrPUOa5 - DNgu/r4ppuWX/d9nuLpVLcFGOzWYjz/GSfyRm/B0MNSsiIFx/VfjsK6OQk48uN2gyMPf - LsirANA0HYZPyXaUFBkchtTE71HqGFSIzJGUSVGm12Z26puMZ9GiUid1l1XJjdDuFfhU - 3k9TQnvLEpZDHArb2G8JrwRI8fRZ/OBDLPyKvH/EEdDYa/FfJOzliZBqMgVFpXpXGTZ6 - 7YAw== -X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; - d=1e100.net; s=20161025; - h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to - :references:mime-version:content-transfer-encoding; - bh=CBafHZOcPLRsPg6HMh6RW3fmvKDiW2MODjit57xEepE=; - b=MVU3M5NDj2W8TitA2MM98hE9Vgb07UODtrRolwf9TaeTgf2XRMgYAWr9v5zaHvBU2q - 4q/HPqbn0WAW3OBfSQLW6CFcdiHOkjfR+r8tKHpNMNBbeDrj1DeeKE/A25plLXxg+Ypz - 1bKJe6DPvjIqLvrpVmPADaRtsAkgDFTt/h41ti2uTwS5xq4qEf1mwz6lFyJkGyf+Qjb5 - pnViJ3Lv89RLBvJwWj0j2t/EzzznPZn9xP663YkNrUNRYrAM7ZBauvK7kMyf8LnKo96E - +niJu7OV4PnRspOC8AS3PPM4DHGctXZl6QMcJ1LyPwBkd8EHJioV1iDJKqHQIbxew46f - AzCA== -X-Gm-Message-State: APjAAAWbRYKoHNSgs+vkRdoNeam2jbbuVKAFxN3ysahEdBul5DIjNFsz - JRjkPkilW+LPTwy2EmDLNUE= -X-Google-Smtp-Source: APXvYqyfSTFvcH9+iLVzVGJ5KDEauN0ssdr9eBfIIdRWe8prWnP7KBGuKItc0GAk8lMLMDzdLKlWtw== -X-Received: by 2002:a1c:7306:: with SMTP id d6mr2864027wmb.62.1570019311374; - Wed, 02 Oct 2019 05:28:31 -0700 (PDT) -Received: from localhost (p2E5BE2CE.dip0.t-ipconnect.de. [46.91.226.206]) - by smtp.gmail.com with ESMTPSA id - 90sm3179450wrr.1.2019.10.02.05.28.30 - (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); - Wed, 02 Oct 2019 05:28:30 -0700 (PDT) -From: Thierry Reding <thierry.reding@gmail.com> -To: Linus Walleij <linus.walleij@linaro.org>, - Bartosz Golaszewski <bgolaszewski@baylibre.com> -Cc: Timo Alho <talho@nvidia.com>, linux-gpio@vger.kernel.org, - linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org -Subject: [PATCH 3/3] gpio: max77620: Fix interrupt handling -Date: Wed, 2 Oct 2019 14:28:25 +0200 -Message-Id: <20191002122825.3948322-3-thierry.reding@gmail.com> -X-Mailer: git-send-email 2.23.0 -In-Reply-To: <20191002122825.3948322-1-thierry.reding@gmail.com> -References: <20191002122825.3948322-1-thierry.reding@gmail.com> -MIME-Version: 1.0 -Sender: linux-gpio-owner@vger.kernel.org -Precedence: bulk -List-ID: <linux-gpio.vger.kernel.org> -X-Mailing-List: linux-gpio@vger.kernel.org - -From: Timo Alho <talho@nvidia.com> - -The interrupt-related register fields on the MAX77620 GPIO controller -share registers with GPIO related fields. If the IRQ chip is implemented -with regmap-irq, this causes the IRQ controller code to overwrite fields -previously configured by the GPIO controller code. - -Two examples where this causes problems are the NVIDIA Jetson TX1 and -Jetson TX2 boards, where some of the GPIOs are used to enable vital -power regulators. The MAX77620 GPIO controller also provides the USB OTG -ID pin. If configured as an interrupt, this causes some of the -regulators to be powered off. - -Signed-off-by: Timo Alho <talho@nvidia.com> -Signed-off-by: Thierry Reding <treding@nvidia.com> ---- - drivers/gpio/gpio-max77620.c | 231 ++++++++++++++++++----------------- - 1 file changed, 117 insertions(+), 114 deletions(-) - -diff --git a/drivers/gpio/gpio-max77620.c b/drivers/gpio/gpio-max77620.c -index c58b56e5291e..c5b64a4ac172 100644 ---- a/drivers/gpio/gpio-max77620.c -+++ b/drivers/gpio/gpio-max77620.c -@@ -18,109 +18,115 @@ struct max77620_gpio { - struct gpio_chip gpio_chip; - struct regmap *rmap; - struct device *dev; -+ struct mutex buslock; /* irq_bus_lock */ -+ unsigned int irq_type[8]; -+ bool irq_enabled[8]; - }; - --static const struct regmap_irq max77620_gpio_irqs[] = { -- [0] = { -- .reg_offset = 0, -- .mask = MAX77620_IRQ_LVL2_GPIO_EDGE0, -- .type = { -- .type_rising_val = MAX77620_CNFG_GPIO_INT_RISING, -- .type_falling_val = MAX77620_CNFG_GPIO_INT_FALLING, -- .type_reg_mask = MAX77620_CNFG_GPIO_INT_MASK, -- .type_reg_offset = 0, -- .types_supported = IRQ_TYPE_EDGE_BOTH, -- }, -- }, -- [1] = { -- .reg_offset = 0, -- .mask = MAX77620_IRQ_LVL2_GPIO_EDGE1, -- .type = { -- .type_rising_val = MAX77620_CNFG_GPIO_INT_RISING, -- .type_falling_val = MAX77620_CNFG_GPIO_INT_FALLING, -- .type_reg_mask = MAX77620_CNFG_GPIO_INT_MASK, -- .type_reg_offset = 1, -- .types_supported = IRQ_TYPE_EDGE_BOTH, -- }, -- }, -- [2] = { -- .reg_offset = 0, -- .mask = MAX77620_IRQ_LVL2_GPIO_EDGE2, -- .type = { -- .type_rising_val = MAX77620_CNFG_GPIO_INT_RISING, -- .type_falling_val = MAX77620_CNFG_GPIO_INT_FALLING, -- .type_reg_mask = MAX77620_CNFG_GPIO_INT_MASK, -- .type_reg_offset = 2, -- .types_supported = IRQ_TYPE_EDGE_BOTH, -- }, -- }, -- [3] = { -- .reg_offset = 0, -- .mask = MAX77620_IRQ_LVL2_GPIO_EDGE3, -- .type = { -- .type_rising_val = MAX77620_CNFG_GPIO_INT_RISING, -- .type_falling_val = MAX77620_CNFG_GPIO_INT_FALLING, -- .type_reg_mask = MAX77620_CNFG_GPIO_INT_MASK, -- .type_reg_offset = 3, -- .types_supported = IRQ_TYPE_EDGE_BOTH, -- }, -- }, -- [4] = { -- .reg_offset = 0, -- .mask = MAX77620_IRQ_LVL2_GPIO_EDGE4, -- .type = { -- .type_rising_val = MAX77620_CNFG_GPIO_INT_RISING, -- .type_falling_val = MAX77620_CNFG_GPIO_INT_FALLING, -- .type_reg_mask = MAX77620_CNFG_GPIO_INT_MASK, -- .type_reg_offset = 4, -- .types_supported = IRQ_TYPE_EDGE_BOTH, -- }, -- }, -- [5] = { -- .reg_offset = 0, -- .mask = MAX77620_IRQ_LVL2_GPIO_EDGE5, -- .type = { -- .type_rising_val = MAX77620_CNFG_GPIO_INT_RISING, -- .type_falling_val = MAX77620_CNFG_GPIO_INT_FALLING, -- .type_reg_mask = MAX77620_CNFG_GPIO_INT_MASK, -- .type_reg_offset = 5, -- .types_supported = IRQ_TYPE_EDGE_BOTH, -- }, -- }, -- [6] = { -- .reg_offset = 0, -- .mask = MAX77620_IRQ_LVL2_GPIO_EDGE6, -- .type = { -- .type_rising_val = MAX77620_CNFG_GPIO_INT_RISING, -- .type_falling_val = MAX77620_CNFG_GPIO_INT_FALLING, -- .type_reg_mask = MAX77620_CNFG_GPIO_INT_MASK, -- .type_reg_offset = 6, -- .types_supported = IRQ_TYPE_EDGE_BOTH, -- }, -- }, -- [7] = { -- .reg_offset = 0, -- .mask = MAX77620_IRQ_LVL2_GPIO_EDGE7, -- .type = { -- .type_rising_val = MAX77620_CNFG_GPIO_INT_RISING, -- .type_falling_val = MAX77620_CNFG_GPIO_INT_FALLING, -- .type_reg_mask = MAX77620_CNFG_GPIO_INT_MASK, -- .type_reg_offset = 7, -- .types_supported = IRQ_TYPE_EDGE_BOTH, -- }, -- }, --}; -+static irqreturn_t max77620_gpio_irqhandler(int irq, void *data) -+{ -+ struct max77620_gpio *gpio = data; -+ unsigned int value, offset; -+ unsigned long pending; -+ int err; -+ -+ err = regmap_read(gpio->rmap, MAX77620_REG_IRQ_LVL2_GPIO, &value); -+ if (err < 0) { -+ dev_err(gpio->dev, "REG_IRQ_LVL2_GPIO read failed: %d\n", err); -+ return IRQ_NONE; -+ } -+ -+ pending = value; -+ -+ for_each_set_bit(offset, &pending, 8) { -+ unsigned int virq; -+ -+ virq = irq_find_mapping(gpio->gpio_chip.irq.domain, offset); -+ handle_nested_irq(virq); -+ } -+ -+ return IRQ_HANDLED; -+} -+ -+static void max77620_gpio_irq_mask(struct irq_data *data) -+{ -+ struct gpio_chip *chip = irq_data_get_irq_chip_data(data); -+ struct max77620_gpio *gpio = gpiochip_get_data(chip); -+ -+ gpio->irq_enabled[data->hwirq] = false; -+} - --static const struct regmap_irq_chip max77620_gpio_irq_chip = { -- .name = "max77620-gpio", -- .irqs = max77620_gpio_irqs, -- .num_irqs = ARRAY_SIZE(max77620_gpio_irqs), -- .num_regs = 1, -- .num_type_reg = 8, -- .irq_reg_stride = 1, -- .type_reg_stride = 1, -- .status_base = MAX77620_REG_IRQ_LVL2_GPIO, -- .type_base = MAX77620_REG_GPIO0, -+static void max77620_gpio_irq_unmask(struct irq_data *data) -+{ -+ struct gpio_chip *chip = irq_data_get_irq_chip_data(data); -+ struct max77620_gpio *gpio = gpiochip_get_data(chip); -+ -+ gpio->irq_enabled[data->hwirq] = true; -+} -+ -+static int max77620_gpio_set_irq_type(struct irq_data *data, unsigned int type) -+{ -+ struct gpio_chip *chip = irq_data_get_irq_chip_data(data); -+ struct max77620_gpio *gpio = gpiochip_get_data(chip); -+ unsigned int irq_type; -+ -+ switch (type) { -+ case IRQ_TYPE_EDGE_RISING: -+ irq_type = MAX77620_CNFG_GPIO_INT_RISING; -+ break; -+ -+ case IRQ_TYPE_EDGE_FALLING: -+ irq_type = MAX77620_CNFG_GPIO_INT_FALLING; -+ break; -+ -+ case IRQ_TYPE_EDGE_BOTH: -+ irq_type = MAX77620_CNFG_GPIO_INT_RISING | -+ MAX77620_CNFG_GPIO_INT_FALLING; -+ break; -+ -+ default: -+ return -EINVAL; -+ } -+ -+ gpio->irq_type[data->hwirq] = irq_type; -+ -+ return 0; -+} -+ -+static void max77620_gpio_bus_lock(struct irq_data *data) -+{ -+ struct gpio_chip *chip = irq_data_get_irq_chip_data(data); -+ struct max77620_gpio *gpio = gpiochip_get_data(chip); -+ -+ mutex_lock(&gpio->buslock); -+} -+ -+static void max77620_gpio_bus_sync_unlock(struct irq_data *data) -+{ -+ struct gpio_chip *chip = irq_data_get_irq_chip_data(data); -+ struct max77620_gpio *gpio = gpiochip_get_data(chip); -+ unsigned int value, offset = data->hwirq; -+ int err; -+ -+ value = gpio->irq_enabled[offset] ? gpio->irq_type[offset] : 0; -+ -+ err = regmap_update_bits(gpio->rmap, GPIO_REG_ADDR(offset), -+ MAX77620_CNFG_GPIO_INT_MASK, value); -+ if (err < 0) -+ dev_err(chip->parent, "failed to update interrupt mask: %d\n", -+ err); -+ -+ mutex_unlock(&gpio->buslock); -+} -+ -+static struct irq_chip max77620_gpio_irqchip = { -+ .name = "max77620-gpio", -+ .irq_mask = max77620_gpio_irq_mask, -+ .irq_unmask = max77620_gpio_irq_unmask, -+ .irq_set_type = max77620_gpio_set_irq_type, -+ .irq_bus_lock = max77620_gpio_bus_lock, -+ .irq_bus_sync_unlock = max77620_gpio_bus_sync_unlock, -+ .flags = IRQCHIP_MASK_ON_SUSPEND, - }; - - static int max77620_gpio_dir_input(struct gpio_chip *gc, unsigned int offset) -@@ -254,14 +260,6 @@ static int max77620_gpio_set_config(struct gpio_chip *gc, unsigned int offset, - return -ENOTSUPP; - } - --static int max77620_gpio_to_irq(struct gpio_chip *gc, unsigned int offset) --{ -- struct max77620_gpio *mgpio = gpiochip_get_data(gc); -- struct max77620_chip *chip = dev_get_drvdata(mgpio->dev->parent); -- -- return regmap_irq_get_virq(chip->gpio_irq_data, offset); --} -- - static int max77620_gpio_probe(struct platform_device *pdev) - { - struct max77620_chip *chip = dev_get_drvdata(pdev->dev.parent); -@@ -287,7 +285,6 @@ static int max77620_gpio_probe(struct platform_device *pdev) - mgpio->gpio_chip.direction_output = max77620_gpio_dir_output; - mgpio->gpio_chip.set = max77620_gpio_set; - mgpio->gpio_chip.set_config = max77620_gpio_set_config; -- mgpio->gpio_chip.to_irq = max77620_gpio_to_irq; - mgpio->gpio_chip.ngpio = MAX77620_GPIO_NR; - mgpio->gpio_chip.can_sleep = 1; - mgpio->gpio_chip.base = -1; -@@ -303,15 +300,21 @@ static int max77620_gpio_probe(struct platform_device *pdev) - return ret; - } - -- ret = devm_regmap_add_irq_chip(&pdev->dev, chip->rmap, gpio_irq, -- IRQF_ONESHOT, 0, -- &max77620_gpio_irq_chip, -- &chip->gpio_irq_data); -+ mutex_init(&mgpio->buslock); -+ -+ gpiochip_irqchip_add_nested(&mgpio->gpio_chip, &max77620_gpio_irqchip, -+ 0, handle_edge_irq, IRQ_TYPE_NONE); -+ -+ ret = request_threaded_irq(gpio_irq, NULL, max77620_gpio_irqhandler, -+ IRQF_ONESHOT, "max77620-gpio", mgpio); - if (ret < 0) { -- dev_err(&pdev->dev, "Failed to add gpio irq_chip %d\n", ret); -+ dev_err(&pdev->dev, "failed to request IRQ: %d\n", ret); - return ret; - } - -+ gpiochip_set_nested_irqchip(&mgpio->gpio_chip, &max77620_gpio_irqchip, -+ gpio_irq); -+ - return 0; - } - diff --git a/iwlwifi-exclude-GEO-SAR-support-for-3168.patch b/iwlwifi-exclude-GEO-SAR-support-for-3168.patch deleted file mode 100644 index 7578695a8..000000000 --- a/iwlwifi-exclude-GEO-SAR-support-for-3168.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 12e36d98d3e5acf5fc57774e0a15906d55f30cb9 Mon Sep 17 00:00:00 2001 -From: Luca Coelho <luciano.coelho@intel.com> -Date: Tue, 8 Oct 2019 13:10:53 +0300 -Subject: iwlwifi: exclude GEO SAR support for 3168 - -We currently support two NICs in FW version 29, namely 7265D and 3168. -Out of these, only 7265D supports GEO SAR, so adjust the function that -checks for it accordingly. - -Signed-off-by: Luca Coelho <luciano.coelho@intel.com> -Fixes: f5a47fae6aa3 ("iwlwifi: mvm: fix version check for GEO_TX_POWER_LIMIT support") -Signed-off-by: Luca Coelho <luciano.coelho@intel.com> ---- - drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 16 +++++++++------- - 1 file changed, 9 insertions(+), 7 deletions(-) - -diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c -index 0d2229319261..d9eb2b286438 100644 ---- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c -+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c -@@ -899,15 +899,17 @@ static bool iwl_mvm_sar_geo_support(struct iwl_mvm *mvm) - * firmware versions. Unfortunately, we don't have a TLV API - * flag to rely on, so rely on the major version which is in - * the first byte of ucode_ver. This was implemented -- * initially on version 38 and then backported to29 and 17. -- * The intention was to have it in 36 as well, but not all -- * 8000 family got this feature enabled. The 8000 family is -- * the only one using version 36, so skip this version -- * entirely. -+ * initially on version 38 and then backported to 17. It was -+ * also backported to 29, but only for 7265D devices. The -+ * intention was to have it in 36 as well, but not all 8000 -+ * family got this feature enabled. The 8000 family is the -+ * only one using version 36, so skip this version entirely. - */ - return IWL_UCODE_SERIAL(mvm->fw->ucode_ver) >= 38 || -- IWL_UCODE_SERIAL(mvm->fw->ucode_ver) == 29 || -- IWL_UCODE_SERIAL(mvm->fw->ucode_ver) == 17; -+ IWL_UCODE_SERIAL(mvm->fw->ucode_ver) == 17 || -+ (IWL_UCODE_SERIAL(mvm->fw->ucode_ver) == 29 && -+ ((mvm->trans->hw_rev & CSR_HW_REV_TYPE_MSK) == -+ CSR_HW_REV_TYPE_7265D)); - } - - int iwl_mvm_get_sar_geo_profile(struct iwl_mvm *mvm) --- -cgit 1.2-0.3.lf.el7 diff --git a/kernel.spec b/kernel.spec index 70748ad88..4d41afa7d 100644 --- a/kernel.spec +++ b/kernel.spec @@ -56,7 +56,7 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 8 +%define stable_update 9 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -562,8 +562,6 @@ Patch320: arm64-tegra-jetson-tx1-fixes.patch Patch321: arm64-tegra-Jetson-TX2-Allow-bootloader-to-configure.patch # https://patchwork.kernel.org/patch/11171225/ Patch322: mfd-max77620-Do-not-allocate-IRQs-upfront.patch -# https://patchwork.ozlabs.org/patch/1170631/ -Patch323: gpio-max77620-Use-correct-unit-for-debounce-times.patch # https://www.spinics.net/lists/linux-tegra/msg44216.html Patch324: arm64-tegra186-enable-USB-on-Jetson-TX2.patch # https://patchwork.kernel.org/patch/11224177/ @@ -598,17 +596,11 @@ Patch504: dwc3-fix.patch Patch509: PATCH-v2-selinux-allow-labeling-before-policy-is-loaded.patch -Patch510: iwlwifi-exclude-GEO-SAR-support-for-3168.patch - # it seems CONFIG_OPTIMIZE_INLINING has been forced now and is causing issues on ARMv7 # https://lore.kernel.org/patchwork/patch/1132459/ # https://lkml.org/lkml/2019/8/29/1772 Patch505: ARM-fix-__get_user_check-in-case-uaccess_-calls-are-not-inlined.patch -# CVE-2019-17666 -# rhbz 176362 -Patch506: 0001-rtlwifi-Fix-potential-overflow-on-P2P-code.patch - # END OF PATCH DEFINITIONS %endif @@ -1810,6 +1802,9 @@ fi # # %changelog +* Wed Nov 06 2019 Laura Abbott <labbott@redhat.com> - 5.3.9-300 +- Linux v5.3.9 + * Tue Oct 29 2019 Laura Abbott <labbott@redhat.com> - 5.3.8-300 - Linux v5.3.8 @@ -1,2 +1,2 @@ SHA512 (linux-5.3.tar.xz) = 6b5edef47c319a3fa7f6c20a3e0903a5acd89ec75e32dc5f99adcb60c9fe118ea312722d9c3d27e2e3900afa2455afb86e83a8b6bb131009bc79ddbe6fb0595d -SHA512 (patch-5.3.8.xz) = 870ccc19417fe56517ac13b0e2fc4cc48e21937af0a2291f57a252b60831c1fa41bf4af8c8b1613cde8d6410723dbab763fa58f1dc7ce8ba7a02c90523eba6bf +SHA512 (patch-5.3.9.xz) = b2bb836ad47e23b475bebeea06cce4ceb6feec0e5d2cf5e1d13fd788d2a9efddc22694806dd59413956f2c2baac9b01071f8fe5115cfe75d8750fe020825ee24 |