From 6ecf4c3c7d61b619a220a7cc862b814776cf0c8b Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Jan 09 2020 12:27:48 +0000 Subject: Update to 4.19.94 --- diff --git a/.kernel.metadata b/.kernel.metadata index daa9027..c5b55d0 100644 --- a/.kernel.metadata +++ b/.kernel.metadata @@ -1,2 +1,2 @@ 40f3e72192d59c0b7a4638cebd0ea55d35a782bb SOURCES/linux-4.19.tar.xz -59235c0167a890d8973d15b9b2a0d68456d6f646 SOURCES/patch-4.19.84.xz +43fea642156c0f69f5f73ff0f05d6be2bd848b29 SOURCES/patch-4.19.94.xz diff --git a/SOURCES/9999-centos-r40-v40-dts-update.patch b/SOURCES/9999-centos-r40-v40-dts-update.patch index 37badb5..cd8bd4e 100644 --- a/SOURCES/9999-centos-r40-v40-dts-update.patch +++ b/SOURCES/9999-centos-r40-v40-dts-update.patch @@ -333,53 +333,6 @@ index c488aaa..699579d 100644 -- 1.8.3.1 -From 0729b4af5753b65aa031f58c435da53dbbf56d19 Mon Sep 17 00:00:00 2001 -From: Rob Herring -Date: Thu, 13 Sep 2018 13:12:32 -0500 -Subject: ARM: dts: sunxi: Fix I2C bus warnings - -dtc has new checks for I2C buses. Fix the warnings in unit-addresses. - -arch/arm/boot/dts/sun8i-a23-gt90h-v4.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2ac00/touchscreen@0: I2C bus unit address format error, expected "40" -arch/arm/boot/dts/sun8i-a23-inet86dz.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2ac00/touchscreen@0: I2C bus unit address format error, expected "40" -arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2ac00/touchscreen@0: I2C bus unit address format error, expected "40" -arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2ac00/touchscreen@0: I2C bus unit address format error, expected "40" -arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2ac00/touchscreen@0: I2C bus unit address format error, expected "40" -arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2ac00/touchscreen@0: missing or empty reg property -arch/arm/boot/dts/sun8i-a33-ippo-q8h-v1.2.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2ac00/touchscreen@0: missing or empty reg property -arch/arm/boot/dts/sun8i-a33-q8-tablet.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2ac00/touchscreen@0: missing or empty reg property -arch/arm/boot/dts/sun5i-a13-utoo-p66.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2b000/touchscreen: I2C bus unit address format error, expected "40" -arch/arm/boot/dts/sun5i-a13-difrnce-dit4350.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2b000/touchscreen: missing or empty reg property -arch/arm/boot/dts/sun5i-a13-empire-electronix-m712.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2b000/touchscreen: missing or empty reg property -arch/arm/boot/dts/sun5i-a13-inet-98v-rev2.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2b000/touchscreen: missing or empty reg property -arch/arm/boot/dts/sun5i-a13-q8-tablet.dtb: Warning (i2c_bus_reg): /soc@1c00000/i2c@1c2b000/touchscreen: missing or empty reg property - -Cc: Maxime Ripard -Cc: Chen-Yu Tsai -Signed-off-by: Rob Herring -Signed-off-by: Chen-Yu Tsai ---- - arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -(limited to 'arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts') - -diff --git a/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts b/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts -index 35859d8f3267..bf97f6244c23 100644 ---- a/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts -+++ b/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts -@@ -95,7 +95,7 @@ - &i2c0 { - status = "okay"; - -- axp22x: pmic@68 { -+ axp22x: pmic@34 { - compatible = "x-powers,axp221"; - reg = <0x34>; - interrupt-parent = <&nmi_intc>; --- -cgit 1.2-0.3.lf.el7 - From 933ea7e9d143cee0c8c3bdc274afa69c91d91d61 Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Wed, 10 Apr 2019 18:59:25 -0300 diff --git a/SOURCES/cherrytrail-pwm-lpss-fixes.patch b/SOURCES/cherrytrail-pwm-lpss-fixes.patch index 958dd7e..036ff22 100644 --- a/SOURCES/cherrytrail-pwm-lpss-fixes.patch +++ b/SOURCES/cherrytrail-pwm-lpss-fixes.patch @@ -432,94 +432,3 @@ index 1a2575d25bea..3236be835bd9 100644 -- 2.19.1 -From f249418a3a4f123a37c389378f289a7baea95332 Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Fri, 12 Oct 2018 21:39:53 +0200 -Subject: [PATCH 7/7] pwm: lpss: Only set update bit if we are actually - changing the settings - -According to the datasheet the update bit must be set if the on-time-div -or the base-unit changes. - -Now that we properly order device resume on Cherry Trail so that the GFX0 -_PS0 method no longer exits with an error, we end up with a sequence of -events where we are writing the same values twice in a row. - -First the _PS0 method restores the duty cycle of 0% the GPU driver set -on suspend and then the GPU driver first updates just the enabled bit in -the pwm_state from 0 to 1, causing us to write the same values again, -before restoring the pre-suspend duty-cycle in a separate pwm_apply call. - -When writing the update bit the second time, without changing any of -the values the update bit clears immediately / instantly, instead of -staying 1 for a while as usual. After this the next setting of the update -bit seems to be ignored, causing the restoring of the pre-suspend -duty-cycle to not get applied. This makes the backlight come up with -a 0% dutycycle after suspend/resume. - -Any further brightness changes after this do work. - -This commit moves the setting of the update bit into pwm_lpss_prepare() -and only sets the bit if we have actually changed any of the values. - -This avoids the setting of the update bit the second time we configure -the PWM to 0% dutycycle, this fixes the backlight coming up with 0% -duty-cycle after a suspend/resume. - -Signed-off-by: Hans de Goede ---- - drivers/pwm/pwm-lpss.c | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -diff --git a/drivers/pwm/pwm-lpss.c b/drivers/pwm/pwm-lpss.c -index ea93ef9f3672..2ac3a2aa9e53 100644 ---- a/drivers/pwm/pwm-lpss.c -+++ b/drivers/pwm/pwm-lpss.c -@@ -88,7 +88,7 @@ static void pwm_lpss_prepare(struct pwm_lpss_chip *lpwm, struct pwm_device *pwm, - unsigned long long on_time_div; - unsigned long c = lpwm->info->clk_rate, base_unit_range; - unsigned long long base_unit, freq = NSEC_PER_SEC; -- u32 ctrl; -+ u32 orig_ctrl, ctrl; - - do_div(freq, period_ns); - -@@ -105,13 +105,17 @@ static void pwm_lpss_prepare(struct pwm_lpss_chip *lpwm, struct pwm_device *pwm, - do_div(on_time_div, period_ns); - on_time_div = 255ULL - on_time_div; - -- ctrl = pwm_lpss_read(pwm); -+ orig_ctrl = ctrl = pwm_lpss_read(pwm); - ctrl &= ~PWM_ON_TIME_DIV_MASK; - ctrl &= ~(base_unit_range << PWM_BASE_UNIT_SHIFT); - base_unit &= base_unit_range; - ctrl |= (u32) base_unit << PWM_BASE_UNIT_SHIFT; - ctrl |= on_time_div; -- pwm_lpss_write(pwm, ctrl); -+ -+ if (orig_ctrl != ctrl) { -+ pwm_lpss_write(pwm, ctrl); -+ pwm_lpss_write(pwm, ctrl | PWM_SW_UPDATE); -+ } - } - - static inline void pwm_lpss_cond_enable(struct pwm_device *pwm, bool cond) -@@ -135,7 +139,6 @@ static int pwm_lpss_apply(struct pwm_chip *chip, struct pwm_device *pwm, - return ret; - } - pwm_lpss_prepare(lpwm, pwm, state->duty_cycle, state->period); -- pwm_lpss_write(pwm, pwm_lpss_read(pwm) | PWM_SW_UPDATE); - pwm_lpss_cond_enable(pwm, lpwm->info->bypass == false); - ret = pwm_lpss_wait_for_update(pwm); - if (ret) { -@@ -148,7 +151,6 @@ static int pwm_lpss_apply(struct pwm_chip *chip, struct pwm_device *pwm, - if (ret) - return ret; - pwm_lpss_prepare(lpwm, pwm, state->duty_cycle, state->period); -- pwm_lpss_write(pwm, pwm_lpss_read(pwm) | PWM_SW_UPDATE); - return pwm_lpss_wait_for_update(pwm); - } - } else if (pwm_is_enabled(pwm)) { --- -2.19.1 - diff --git a/SOURCES/ena-fixes.patch b/SOURCES/ena-fixes.patch index bb42124..345785b 100644 --- a/SOURCES/ena-fixes.patch +++ b/SOURCES/ena-fixes.patch @@ -3644,38 +3644,6 @@ index 48ca97fbe7bc..04fcafcc059c 100644 -- 2.19.1 -From 6c2e2e6731d872a227226140780c8ecd9712bf4e Mon Sep 17 00:00:00 2001 -From: Netanel Belgazal -Date: Wed, 17 Oct 2018 10:04:21 +0000 -Subject: [PATCH 14/16] net: ena: Fix Kconfig dependency on X86 - -The Kconfig limitation of X86 is to too wide. -The ENA driver only requires a little endian dependency. - -Change the dependency to be on little endian CPU. - -Signed-off-by: Netanel Belgazal -Signed-off-by: David S. Miller ---- - drivers/net/ethernet/amazon/Kconfig | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/amazon/Kconfig b/drivers/net/ethernet/amazon/Kconfig -index 99b30353541a..9e87d7b8360f 100644 ---- a/drivers/net/ethernet/amazon/Kconfig -+++ b/drivers/net/ethernet/amazon/Kconfig -@@ -17,7 +17,7 @@ if NET_VENDOR_AMAZON - - config ENA_ETHERNET - tristate "Elastic Network Adapter (ENA) support" -- depends on (PCI_MSI && X86) -+ depends on PCI_MSI && !CPU_BIG_ENDIAN - ---help--- - This driver supports Elastic Network Adapter (ENA)" - --- -2.19.1 - From 628f8c52965bb8734f76bbeb2b24b20bc48d2180 Mon Sep 17 00:00:00 2001 From: Arthur Kiyanovski Date: Wed, 17 Oct 2018 15:33:23 +0300 diff --git a/SOURCES/raspberrypi-Fix-firmware-calls-with-large-buffers.patch b/SOURCES/raspberrypi-Fix-firmware-calls-with-large-buffers.patch deleted file mode 100644 index 79421d6..0000000 --- a/SOURCES/raspberrypi-Fix-firmware-calls-with-large-buffers.patch +++ /dev/null @@ -1,245 +0,0 @@ -From patchwork Fri Nov 16 14:39:07 2018 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: James Hughes -X-Patchwork-Id: 10686407 -Return-Path: - -Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org - [172.30.200.125]) - by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9BA9C3CF1 - for ; - Fri, 16 Nov 2018 14:40:20 +0000 (UTC) -Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) - by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 88C992D04D - for ; - Fri, 16 Nov 2018 14:40:20 +0000 (UTC) -Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) - id 7C6802D0B5; Fri, 16 Nov 2018 14:40:20 +0000 (UTC) -X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on - pdx-wl-mail.web.codeaurora.org -X-Spam-Level: -X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, - DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 -Received: from bombadil.infradead.org (bombadil.infradead.org - [198.137.202.133]) - (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) - (No client certificate requested) - by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 02F272D0B9 - for ; - Fri, 16 Nov 2018 14:40:19 +0000 (UTC) -DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; - d=lists.infradead.org; s=bombadil.20170209; h=Sender: - Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: - List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: - Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: - Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: - References:List-Owner; bh=q+rr6CTCNe7Aj9DWt6k8ZBDJfuNlw6LK4NEqho/OsL8=; b=slV - BxeOcHW4UYDgm2VXfNMIZb+/8LPmzjGPpBpBe5IaMR/NthCsM9AL2A1aGdlPRKp8j/Oimcml9ytBG - vy3/u46ZlKFd5bAYEl5veGalWXzUg1KN7UhADmXD9fmMOzkFD4fMChA8+g2qK83F6SfqDM0VS3i14 - /ubAQ9CUdaFi4Vr7F4EZtPdbPmSm76Rm9H8sWxWe6seIEmsL6VMpLVzRLAA0zvX5nslXgUPvDLEZj - uk7BIzGfdWU1oB15xwTu8kyp24WrC2Xd/DNCrrIlvBJ6Vn4lvfdqwPT+Xg59IAaibUhoj/fq1HNet - QenokEPTxg7SS3FsAKl96cR5mWeudtg==; -Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) - by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) - id 1gNfI9-0007DF-JA; Fri, 16 Nov 2018 14:40:17 +0000 -Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) - by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) - id 1gNfI4-00075P-2l - for linux-arm-kernel@bombadil.infradead.org; Fri, 16 Nov 2018 14:40:12 +0000 -DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; - d=infradead.org; s=casper.20170209; h=Message-Id:Date:Subject:Cc:To:From: - Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: - Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: - Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: - List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; - bh=0v+Gt0Sb75ntX3ncvTo0T5q/LQ9HrDko5y0UEkZ6WVk=; b=SCmdpUIYIRr3Gb8eXMDGHl/os - AVmLBMIQEbA1mUB4WPQJlUjz7NKtNXgtLQxSY+yiwIb+LrripAgbQ6yK1Vkn+4bmhtSkb97glmraT - bMOZKrRj/cPhxW5osOa0o2BJQRqWqignWxy8539dbxXbpAAKW+12jA+dOqrjOFUftFH7geD4Ttwis - y/j75BOi7ObkcK1mBDyJDNuSEt2CZutCNZ+A7v7/zqkxnhS3hS7Y9hUD81+J+cIu5x103POH6i7FC - 7JazaqnBZYtl66kXXPOs62v3HA96/QLz7CxmdsnNQvw28MNKsxLw5TKnXJUDJmDCybQ5FL6k6Xomg - T9PDZO9+g==; -Received: from mx08-00252a01.pphosted.com ([91.207.212.211]) - by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) - id 1gNfHz-0006AE-RY - for linux-arm-kernel@lists.infradead.org; Fri, 16 Nov 2018 14:40:09 +0000 -Received: from pps.filterd (m0102629.ppops.net [127.0.0.1]) - by mx08-00252a01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id - wAGEcLBT000897 - for ; Fri, 16 Nov 2018 14:39:55 GMT -DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.org; - h=from : to : cc : subject : date : message-id; s=pp; - bh=0v+Gt0Sb75ntX3ncvTo0T5q/LQ9HrDko5y0UEkZ6WVk=; - b=ynWh6Gt8VRIRTTbVy4Q9U7IsJWRMWYUNzTD1MYt8M2mcj01ElaCuktcZdGoRxGBJXjLU - CYJP75gWsuHHvbSWSSn2l+qpGuEHm+ddFXuMB4nxC5VmQokt/Z0KPScc4Na2IOOU1Ci/ - wUg2tPdhfupkGIPzTt32SXu3pQX4aAYqx0AEaeJ3ptU/223MOj2Z40HZui1SL0yHxdsT - 283+7DokK0bontWXs0j69cFVklLF+txi0untOXTxGuvtbzj0vu6uMErB9qhph6HVKlnH - kwaoGLPYrc0JnmZt1Kx7nmAQ+xxE3RaNA7E/IisHqX9m5C57JAMtN6WdWUTaLjWeIs8n 2Q== -Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com - [209.85.128.70]) - by mx08-00252a01.pphosted.com with ESMTP id 2nr7cnhbky-1 - (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=OK) - for ; Fri, 16 Nov 2018 14:39:55 +0000 -Received: by mail-wm1-f70.google.com with SMTP id d26-v6so24770633wmb.4 - for ; - Fri, 16 Nov 2018 06:39:55 -0800 (PST) -DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; - d=raspberrypi.org; s=google; - h=from:to:cc:subject:date:message-id; - bh=0v+Gt0Sb75ntX3ncvTo0T5q/LQ9HrDko5y0UEkZ6WVk=; - b=TFhWj6OD0WYvVWhFc0RE+UyQKaAMuO0Da2ahzvPlkfTJj3d26Mf15Ai4ipbfJy4x9d - RLlgEH8Vj457x2kK3QmlXDC5Cy+kzp6FiZi2aFSBinKjY06Dmt4LElzlaye8szk/IuJ/ - f6HdjG3Rmt6Ys/Kx8fct+p87NyvHNe/yfCGnUj5k1nz7+m2eApkvTkGxzYe5SXn5s1Jp - nv/30o4+CcPFK3SqAWo+GkWgD/Uae+4gCP38KxLx6dsYxCS7/kqIF46ac9WmAx9k44Jz - Wt18Pe1A7rIj38vRwLv2JuwUkZrOlAhav52EyDM/03QbgRKzEM9En5DYV2GFAqR1Xc3w - qLzw== -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; - bh=0v+Gt0Sb75ntX3ncvTo0T5q/LQ9HrDko5y0UEkZ6WVk=; - b=gFrGygir8lioHrOeF0abzZ3xbTuyQEnk7F/vaRJmx5SyMuxe5SQqcM/PozflvPaB4w - wHeng0ewo0t6S/xfZo9EpTKB19L5L5XnrxLoseo+tagkZJkCH2Bcw7dsBzALR2upGwrT - SfHywXMeCKH9fRAu3/Hj0W934lZDwMG3xqmWWebQ/wqDBE41Nk/dl9iHnGKp9QN61uee - Qv0jpp3sglzprI5CIEQqkElIXAF/jjnPqbknf+5nUyH4xUoe+CzTaEldVeHFc4iTerOZ - b48uPgriPJVTq7Gr7L8qWJ5yLZWqenG4sAIpLbanD8Mkw8ogaybVfIZyzrSKoTbtBiSa - oOEg== -X-Gm-Message-State: AA+aEWaOCOYCkmegm7N2wWsL8XdrnmJenH+HXps2b21WEUnrWH3tCofP - O07nsIq/s30FFJwtMB9dMCaWwCmc2iSWxn7hnqFhagZMyuYFYcJ1Zs5caqAV/LcSS/BBriTI4M7 - 4RALk0oVU/TiJvemnTTRSwFul6+hCHLFRxRM= -X-Received: by 2002:a1c:1cc4:: with SMTP id - c187-v6mr2937585wmc.75.1542379194749; - Fri, 16 Nov 2018 06:39:54 -0800 (PST) -X-Google-Smtp-Source: - AFSGD/XjyVsHsmDi+oKxMsFZ/hLG36TQdg1uDC2wO1upiuvyI+72rZz3AeAffzu3LWvkW8xxAI1e0w== -X-Received: by 2002:a1c:1cc4:: with SMTP id - c187-v6mr2937565wmc.75.1542379194454; - Fri, 16 Nov 2018 06:39:54 -0800 (PST) -Received: from jamesh-VirtualBox.pitowers.org - ([2a00:2381:fdf7:14:4419:8784:6076:3820]) - by smtp.gmail.com with ESMTPSA id a7sm26247594wrx.26.2018.11.16.06.39.53 - (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); - Fri, 16 Nov 2018 06:39:53 -0800 (PST) -From: James Hughes -To: eric@anholt.net, stefan.wahren@i2se.com, - linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org -Subject: [PATCH v3] firmware: raspberrypi: Fix firmware calls with large - buffers -Date: Fri, 16 Nov 2018 14:39:07 +0000 -Message-Id: <20181116143907.6149-1-james.hughes@raspberrypi.org> -X-Mailer: git-send-email 2.17.1 -X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , - definitions=2018-11-16_09:, , signatures=0 -X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 -X-CRM114-CacheID: sfid-20181116_144007_971248_9AC931E8 -X-CRM114-Status: GOOD ( 21.12 ) -X-BeenThere: linux-arm-kernel@lists.infradead.org -X-Mailman-Version: 2.1.21 -Precedence: list -List-Id: -List-Unsubscribe: - , - -List-Archive: -List-Post: -List-Help: -List-Subscribe: - , - -Cc: James Hughes -MIME-Version: 1.0 -Content-Type: text/plain; charset="us-ascii" -Sender: "linux-arm-kernel" -Errors-To: - linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org -X-Virus-Scanned: ClamAV using ClamSMTP - -Commit a1547e0bca51 ("firmware: raspberrypi: Remove VLA usage") -moved away from VLA's to a fixed maximum size for mailbox data. -However, some mailbox calls use larger data buffers -than the maximum allowed in that change. This fix therefor -moves from using fixed buffers to kmalloc to ensure all sizes -are catered for. - -There is some documentation, which is somewhat out of date, -on the mailbox calls here : -https://github.com/raspberrypi/firmware/wiki/Mailbox-property-interface - -Fixes: a1547e0bca51 ("firmware: raspberrypi: Remove VLA usage") - -Signed-off-by: James Hughes -Reviewed-by: Eric Anholt ---- - drivers/firmware/raspberrypi.c | 35 +++++++++++++++++----------------- - 1 file changed, 18 insertions(+), 17 deletions(-) - -v2: Changes to commit message and format only. No code change. -v3: Moved declaration of header back to original position - -diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c -index a200a2174611..44eb99807e33 100644 ---- a/drivers/firmware/raspberrypi.c -+++ b/drivers/firmware/raspberrypi.c -@@ -14,6 +14,7 @@ - #include - #include - #include -+#include - #include - - #define MBOX_MSG(chan, data28) (((data28) & ~0xf) | ((chan) & 0xf)) -@@ -21,8 +22,6 @@ - #define MBOX_DATA28(msg) ((msg) & ~0xf) - #define MBOX_CHAN_PROPERTY 8 - --#define MAX_RPI_FW_PROP_BUF_SIZE 32 -- - static struct platform_device *rpi_hwmon; - - struct rpi_firmware { -@@ -144,28 +143,30 @@ EXPORT_SYMBOL_GPL(rpi_firmware_property_list); - int rpi_firmware_property(struct rpi_firmware *fw, - u32 tag, void *tag_data, size_t buf_size) - { -- /* Single tags are very small (generally 8 bytes), so the -- * stack should be safe. -- */ -- u8 data[sizeof(struct rpi_firmware_property_tag_header) + -- MAX_RPI_FW_PROP_BUF_SIZE]; -- struct rpi_firmware_property_tag_header *header = -- (struct rpi_firmware_property_tag_header *)data; -+ struct rpi_firmware_property_tag_header *header; - int ret; - -- if (WARN_ON(buf_size > sizeof(data) - sizeof(*header))) -- return -EINVAL; -+ /* Some mailboxes can use over 1k bytes. Rather than checking -+ * size and using stack or kmalloc depending on requirements, -+ * just use kmalloc. Mailboxes don't get called enough to worry -+ * too much about the time taken in the allocation. -+ */ -+ void *data = kmalloc(sizeof(*header) + buf_size, GFP_KERNEL); - -+ if (!data) -+ return -ENOMEM; -+ -+ header = data; - header->tag = tag; - header->buf_size = buf_size; - header->req_resp_size = 0; -- memcpy(data + sizeof(struct rpi_firmware_property_tag_header), -- tag_data, buf_size); -+ memcpy(data + sizeof(*header), tag_data, buf_size); -+ -+ ret = rpi_firmware_property_list(fw, data, buf_size + sizeof(*header)); -+ -+ memcpy(tag_data, data + sizeof(*header), buf_size); - -- ret = rpi_firmware_property_list(fw, &data, buf_size + sizeof(*header)); -- memcpy(tag_data, -- data + sizeof(struct rpi_firmware_property_tag_header), -- buf_size); -+ kfree(data); - - return ret; - } diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index 97bc355..1bc377a 100644 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -54,7 +54,7 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 84 +%define stable_update 94 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -624,9 +624,6 @@ Patch310: arm64-rk3399-add-idle-states.patch Patch330: bcm2835-cpufreq-add-CPU-frequency-control-driver.patch -# https://patchwork.kernel.org/patch/10686407/ -Patch332: raspberrypi-Fix-firmware-calls-with-large-buffers.patch - # From 4.20, fix eth link/act lights on 3B+ Patch334: bcm2837-fix-eth-leds.patch @@ -2242,6 +2239,10 @@ fi # # %changelog +* Thu Jan 9 2020 Pablo Greco - 4.19.94-300 +- Linux v4.19.94 +- Remove upstreamed patches + * Sat Nov 16 2019 Pablo Greco - 4.19.84-300 - Linux v4.19.84