From 75fed581f6cea7756711a5453489d805d5576563 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 6 Jan 2020 17:51:19 +0100 Subject: [PATCH 01/11] Make the MFD Intel LPSS driver builtin, some devices require this to be available early during boot (rhbz#1787997) --- configs/fedora/generic/x86/CONFIG_MFD_INTEL_LPSS_ACPI | 2 +- configs/fedora/generic/x86/CONFIG_MFD_INTEL_LPSS_PCI | 2 +- kernel-i686-debug-fedora.config | 4 ++-- kernel-i686-fedora.config | 4 ++-- kernel-x86_64-debug-fedora.config | 4 ++-- kernel-x86_64-fedora.config | 4 ++-- kernel.spec | 4 ++++ 7 files changed, 14 insertions(+), 10 deletions(-) diff --git a/configs/fedora/generic/x86/CONFIG_MFD_INTEL_LPSS_ACPI b/configs/fedora/generic/x86/CONFIG_MFD_INTEL_LPSS_ACPI index 7be3065fc..6c9f11d2e 100644 --- a/configs/fedora/generic/x86/CONFIG_MFD_INTEL_LPSS_ACPI +++ b/configs/fedora/generic/x86/CONFIG_MFD_INTEL_LPSS_ACPI @@ -1 +1 @@ -CONFIG_MFD_INTEL_LPSS_ACPI=m +CONFIG_MFD_INTEL_LPSS_ACPI=y diff --git a/configs/fedora/generic/x86/CONFIG_MFD_INTEL_LPSS_PCI b/configs/fedora/generic/x86/CONFIG_MFD_INTEL_LPSS_PCI index 93a430846..89c6ed411 100644 --- a/configs/fedora/generic/x86/CONFIG_MFD_INTEL_LPSS_PCI +++ b/configs/fedora/generic/x86/CONFIG_MFD_INTEL_LPSS_PCI @@ -1 +1 @@ -CONFIG_MFD_INTEL_LPSS_PCI=m +CONFIG_MFD_INTEL_LPSS_PCI=y diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index 1b0be4a65..bfc34e075 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -3096,8 +3096,8 @@ CONFIG_MFD_CS5535=y # CONFIG_MFD_DA9150 is not set # CONFIG_MFD_DLN2 is not set # CONFIG_MFD_HI6421_PMIC is not set -CONFIG_MFD_INTEL_LPSS_ACPI=m -CONFIG_MFD_INTEL_LPSS_PCI=m +CONFIG_MFD_INTEL_LPSS_ACPI=y +CONFIG_MFD_INTEL_LPSS_PCI=y # CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set # CONFIG_MFD_JANZ_CMODIO is not set # CONFIG_MFD_KEMPLD is not set diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 14098ba19..203183ff0 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -3077,8 +3077,8 @@ CONFIG_MFD_CS5535=y # CONFIG_MFD_DA9150 is not set # CONFIG_MFD_DLN2 is not set # CONFIG_MFD_HI6421_PMIC is not set -CONFIG_MFD_INTEL_LPSS_ACPI=m -CONFIG_MFD_INTEL_LPSS_PCI=m +CONFIG_MFD_INTEL_LPSS_ACPI=y +CONFIG_MFD_INTEL_LPSS_PCI=y # CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set # CONFIG_MFD_JANZ_CMODIO is not set # CONFIG_MFD_KEMPLD is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 36bd621d6..aa0b8b9ad 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -3144,8 +3144,8 @@ CONFIG_MFD_CROS_EC_DEV=m # CONFIG_MFD_DA9150 is not set # CONFIG_MFD_DLN2 is not set # CONFIG_MFD_HI6421_PMIC is not set -CONFIG_MFD_INTEL_LPSS_ACPI=m -CONFIG_MFD_INTEL_LPSS_PCI=m +CONFIG_MFD_INTEL_LPSS_ACPI=y +CONFIG_MFD_INTEL_LPSS_PCI=y # CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set # CONFIG_MFD_JANZ_CMODIO is not set # CONFIG_MFD_KEMPLD is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 1fd145a4e..6f410b9fc 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -3125,8 +3125,8 @@ CONFIG_MFD_CROS_EC_DEV=m # CONFIG_MFD_DA9150 is not set # CONFIG_MFD_DLN2 is not set # CONFIG_MFD_HI6421_PMIC is not set -CONFIG_MFD_INTEL_LPSS_ACPI=m -CONFIG_MFD_INTEL_LPSS_PCI=m +CONFIG_MFD_INTEL_LPSS_ACPI=y +CONFIG_MFD_INTEL_LPSS_PCI=y # CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set # CONFIG_MFD_JANZ_CMODIO is not set # CONFIG_MFD_KEMPLD is not set diff --git a/kernel.spec b/kernel.spec index 084ff5861..dccffbe8f 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2889,6 +2889,10 @@ fi # # %changelog +* Mon Jan 06 2020 Hans de Goede +- Make the MFD Intel LPSS driver builtin, some devices require this to be + available early during boot (rhbz#1787997) + * Mon Jan 06 2020 Justin M. Forbes - 5.5.0-0.rc5.git0.1 - Linux v5.5-rc5 From 7530f0b047b364dee250495361f455fb5550f6fc Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 8 Jan 2020 02:52:40 +0000 Subject: [PATCH 02/11] Update to latest upstream bcm2711 thermal driver series --- ...e-thermal-support-for-Raspberry-Pi-4.patch | 814 +++++++++--------- 1 file changed, 408 insertions(+), 406 deletions(-) diff --git a/ARM-Enable-thermal-support-for-Raspberry-Pi-4.patch b/ARM-Enable-thermal-support-for-Raspberry-Pi-4.patch index 5037e4ae4..86824875b 100644 --- a/ARM-Enable-thermal-support-for-Raspberry-Pi-4.patch +++ b/ARM-Enable-thermal-support-for-Raspberry-Pi-4.patch @@ -1,29 +1,29 @@ -From patchwork Fri Nov 1 13:42:26 2019 +From patchwork Tue Jan 7 18:15:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren -X-Patchwork-Id: 11223139 +X-Patchwork-Id: 11321573 Return-Path: - + Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) - by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 25958912 + by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6D8381398 for ; - Fri, 1 Nov 2019 13:43:36 +0000 (UTC) + Tue, 7 Jan 2020 18:16:25 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) - by mail.kernel.org (Postfix) with ESMTPS id 0354C21734 + by mail.kernel.org (Postfix) with ESMTPS id 0478120848 for ; - Fri, 1 Nov 2019 13:43:35 +0000 (UTC) + Tue, 7 Jan 2020 18:16:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org - header.i=@lists.infradead.org header.b="l8dmcZ4O"; + header.i=@lists.infradead.org header.b="SQ2gKFhN"; dkim=fail reason="signature verification failed" (1024-bit key) - header.d=gmx.net header.i=@gmx.net header.b="As2ICfrZ" -DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0354C21734 + header.d=gmx.net header.i=@gmx.net header.b="BJDhWiM+" +DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0478120848 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=gmx.net Authentication-Results: mail.kernel.org; @@ -36,91 +36,91 @@ DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; In-Reply-To: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:List-Owner; - bh=c553bi9c8ccy4Xb4RZAhcD9oXhxMAMMma01ciH8nrbE=; b=l8dmcZ4OIM4LRvrQV8nAqf/cEN - +QTMQzLLqaDx7FuBl8XmaPgLhVM/FWeQe60+ubaBi8aGI1rNRGwn4CNMDzqUlrx5lbDZDvZvGb+5Y - l0rtabELmj4C3jCoHdCQaQQhGbh/Bmom6X5D4bRVaRQthgiB48nMna7e/dnBonNqcVNLXDngknyf0 - y/qawzEw29xDFvsejsnG4RM1tGgaxnBcPf9GqIVng58kzvv6JY/J8us3Ae3b2clgT04pbKe7xw4Wp - /TrgYscCkKMVSWa3ij7yt4bUcXAn8neXJkbftA0UFT/HNaOZiWjsZ+cJJk3t2yEXKPy93jX1YVnTs - IUNZR0Vw==; + bh=YkqzhAYhCTWbi2xiP7xxu+Dn8Q8DmCRb4IJ4Bu0zhz8=; b=SQ2gKFhNqib/g5IS6Ax5bJ6+91 + NnToAV0XRtMvD+Mv//d/rvzEQuagdTXc7G1qFGgWXJVH3dbQAnlgt/iNOwtDxAT/4PcAn4h5HFAag + 66kkhMcZAbA7JExXlnqfMil9fKX3gFJPxRophEP+3IPQkJpQyaYcSgCT7q1qWI0ea7WoySKITupFB + /zqJdAB1FovALLqUMblrq+3yz5V5mtmXHbZ9XlaH2vZivUkozyl7y2lTwVupfEMEOX3tMsZKKw7kO + 3zP1295r9jZD5AxI56MIxKUhe09ZgdaStZfRckzxKLVvphRbmbdj/a5lDLwebJ01BvFOZMnhxpSiD + oPP03MfQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) - id 1iQXDC-0004vG-LO; Fri, 01 Nov 2019 13:43:34 +0000 -Received: from mout.gmx.net ([212.227.17.21]) + id 1iotOw-00044e-SA; Tue, 07 Jan 2020 18:16:22 +0000 +Received: from mout.gmx.net ([212.227.15.19]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) - id 1iQXD1-0004iV-5W - for linux-arm-kernel@lists.infradead.org; Fri, 01 Nov 2019 13:43:25 +0000 + id 1iotOo-0003u6-Ni + for linux-arm-kernel@lists.infradead.org; Tue, 07 Jan 2020 18:16:16 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; - s=badeba3b8450; t=1572615790; - bh=G2JQYHldnl50zbZW3JMKhp0c1cNsuaONpIMkrJ/KY1A=; + s=badeba3b8450; t=1578420965; + bh=u7twVNjh2D9zy5OC10Di3QMaWd8qSsrGW9KSWjAYn3g=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; - b=As2ICfrZ6dP9svRVq3VYkJZapZIuGCT4dfGp5jepvxoPepDqUZ7/GdEBLYOLczpsD - YLwzcIZprxLKFy/Nhj09ng2eCZ4lIzOZ+l3eilNnBHSDdG++8nSUZ36bZh0lmjtGq+ - Gd23zG9lwzpFh5cZkQtrvgLf+X0N0VGPAuQyWiOQ= + b=BJDhWiM+5P9ZadhIRk4bTNFKVwW+JTvjQQxBte6Z9/lEi/hUMLjX6X6wI0UsdG/9q + F4Cwa0tCAECdod5u4KiSRbsYOd1o4Z/dYru23Wk+v5LX/L1GSxqimU6Rt6Y750q8m7 + H8qhNz2GpltKbfQYfiCht8+4Noq2Ir1n+/dUhyGU= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c -Received: from localhost.localdomain ([37.4.249.112]) by mail.gmx.com - (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id - 1N8GMq-1hvtKY0FqS-0148Tw; Fri, 01 Nov 2019 14:43:10 +0100 +Received: from localhost.localdomain ([37.4.249.154]) by mail.gmx.com + (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id + 1M6llE-1im9Zy3f6U-008MHP; Tue, 07 Jan 2020 19:16:05 +0100 From: Stefan Wahren -To: Zhang Rui , Eduardo Valentin , +To: Zhang Rui , Daniel Lezcano , Amit Kucheria , Rob Herring , Mark Rutland , - Eric Anholt , Florian Fainelli , - Catalin Marinas , Will Deacon , - Markus Mayer -Subject: [PATCH 1/4] dt-bindings: Add BCM2711 thermal -Date: Fri, 1 Nov 2019 14:42:26 +0100 -Message-Id: <1572615749-9524-2-git-send-email-wahrenst@gmx.net> + Nicolas Saenz Julienne , + Florian Fainelli , + Catalin Marinas , Will Deacon +Subject: [PATCH V3 1/4] dt-bindings: Add Broadcom AVS RO thermal +Date: Tue, 7 Jan 2020 19:15:54 +0100 +Message-Id: <1578420957-32229-2-git-send-email-wahrenst@gmx.net> X-Mailer: git-send-email 2.7.4 -In-Reply-To: <1572615749-9524-1-git-send-email-wahrenst@gmx.net> -References: <1572615749-9524-1-git-send-email-wahrenst@gmx.net> -X-Provags-ID: V03:K1:XnyeRi2jiPspsf4cwaVjO7Sm9iumAfDgEuhhWAzWuUTyzpkYTrn - BZ4zqBog/lv978dQiAbhvrQjw18T1QuN0sYetKc4U8LKMDUfOQy8viOFMaPkuyQrzg2eoM9 - AFlppBpsz+22+a2Xt0WGqS+MpsOQXB9B9kJrBbw6ou+lIoIn19T7tcZVYbzk8FpdRc9xp4G - ICQ+A5ANyQLuqvaacA29A== +In-Reply-To: <1578420957-32229-1-git-send-email-wahrenst@gmx.net> +References: <1578420957-32229-1-git-send-email-wahrenst@gmx.net> +X-Provags-ID: V03:K1:JNoVLD/m7l4v/En9GYWWvMF90Sn/VtIIReEvqeT1ahKtoJ1LkyQ + iAtYBYTb+NwFUEidrSbyieU8GW35aLLzyYQnuJTNqPmnSbG2PnoXvhwHuDsxvWSwUy6mkwH + 8ZEA1Til7h0N3jLmIx+k620EBhcirK4sOEO1dRoCyQ0YuU8w1s6WymV1wzmIWI654AscZ9o + J8IrwX+k75qsiQ2SovoOg== X-Spam-Flag: NO -X-UI-Out-Filterresults: notjunk:1;V03:K0:eb27wEqko/8=:dZYolVj9YmOQf1lyukuXK+ - wbcZ6wQJnr8dEEwvs2blpP12a8QH1sc9E+o6QUjCEsLP0/+OhWW0OsHaammYuVbloP7QwkNJc - dboo9BfdAPBZXckhXFdBK5U/DA5v35KL+2Ax4lj50NzOOd5GD5GqPslbMgyLfp92Qpt9wW49t - utMfXvQFK0HqT5Lkljnlmzbt/869k2GU1AcedKK8kPvJDhgLry5EkDtSGY8uCtZk9Tzj8k2vm - XiTIn0ZBkR10CcS9r+rovHe9JxiWm2X91v4d4D9L9Lx4ed/pbh1eAIaW1P1gmlavpIND/gHVA - 1q9tw+c0HBOhR5BoXT/ZRMoUCQN2JvgkiEUmC+DkFgP8uJUdZha4qLmEtrpv+FzYNAPI4l6Ed - R943ngFB90lWQIkr+98iv6YO1uDvcCbrXRmywEBX478vpJlfqDvmo6CiPxKGI1ZL960CbKevO - YgJXxhCPjVcdbLkVJ6TVT2mxT7fJkmDNCv7/ClL7YGjdyOBEikXORb6qx5PTXi4xBZ8VKqKj0 - zy5JFc4WfKrBgT/m6DnI5EY6KvzYV6QyH7C87WaON1ujpuPuK8P3v395S7kJBLAJtBltpEqUg - W1CmvJwx9M+C8j9h+RGyc/4vC3xm5gBQFZCDqOtaeln5n7BuQxKQ/nf570AqhuG+Z+RCKESrb - p6FJmB0YyIawSi8JDmjZV0cEaKl9XfNCuzZufjr8izFLxn+qE6rKINp+BRIp8rvhwejNabMWf - MySojlAt7i37Jd4vFvz8LEhXVzOuTH99ovxQv6+mQgIxeqJnU4BG8umOPwDzlhd06+TT/3Fd3 - xLCq+L0F/4Lj3SwtoM36OWQR6dMFBaffsTOzAsfmpLUon748NF5x4r2v3wkM33ME3pLmNa20m - CKEq+5lyOJALTjZY1DATbsp1UdHhRF7GFZsxgnvIyptEKGFAkoB1ftCzo3OKJ+MpW+huCc3+F - xGM05bpv9RYy8pcKOZDq1lYndf/tmNFSMnSGWCBoIF48NsgjJImwfrB1eWEldlWtWbpxaQEiH - uqmbyEZ5cBFiPwqR/zW2GdShItd22ARYL1HPYJWq0sgv8BOCGZWYepVDuCctnlA3u++xQlkF9 - Ex2fjYWes3671H9njr/6zGKkblMzxsEe74SSasSavXt94OvdnGjhwZjUMyJ/2J6Q+apEQfHby - na0b7n11ecULFE6C+saJKfYggBtullLsEemT53BJx3h1Df1yCbM8wGETtoMilj79pu7p28nG1 - 8UICQTetG56wX0DWfQu8EmdKuIt3ardik89PYRA== +X-UI-Out-Filterresults: notjunk:1;V03:K0:1m7ABTNKeYs=:dwivK5EisaHNhkVyhbAPYp + kvAhhRRErs0LcQc8ZbpEAx/yq5NZ5xne4VViuO86ljYW/FoCw48Pz8APxSxRAFasQ5XgUJLP5 + TwCvRfPRrdfLO3tE5KvLJTW7FJPetXyuRGB9vpPgp8f7UmdUL542Li3JvUZ33oouVIjMEPek6 + eJ7EymgiCWO2bamuE79cyu30HsDd1LGBBQrzvFwQleMU8BbbLmaiQtIfSxdPKqyjHm+bvLtDP + uK/ei0MTgAsXPpgIdHoGsb71RQ0HY5PtjoLmMsNb3Nvcu9FNWgu+ybES1IfFGXvrkd1C8fgCB + Q5VlqL1b7kUD0EHnh7rjg8rGKBiaqdQCE0rsj3GJDHLnhxpSblechYL1CIMYh0+YmL8VtDREe + qzbJ3wdWDTKF1F8njEuuvjb05/C/4X6IzbpEWS5uxJ9wVdqWX2b6MpQQ7x7H4B88IHb0/IU+D + vdYY8z+R3R5MkQzZJngkBLWIif2N/omDDhmHv+9TJcHmvbZJaDpHIfZ0rdtGe50zbA3DaQjjs + bDwDylhHw0I+Hc8nBJUH7PN84Fiiime6VMByUd9PFiy9cpm2bP6AwEi1Mwefb1URWcmgwnYEe + JmxWZoJ8JfGcW8ITKWyEuka8Ux5E2Ci1R82cWYUo5brxrZvFcYg2pUnUwpOysMZzLKCUWy2FL + QwuEZfTk676yMpqbF1y0Xsuf+c9Q9pOvwzC3N+VKiDm3UOdnS5kmkaDAtRFJVCderrdeMv11a + S2iZm2wNIvmHXsogK8savP05nVqWUbyf8h2vR0jlTRBz2kAyQmtZrJyPLBjww/6Vrx7SeElxk + alcdmtEi3tdo6eMkRsFebFaCUPqItnfbJbHbXJ4udFSh4fsjduS3UppT4JbCCzqm+XNGVrUqR + BT9vCmRbySk5wIT3D0Eg76wFeIZv4OSRzQguvVF9jkBp1Rpg++L8ryT16Wlox17PM5Er2T8Hn + DvtQYG2N0H4cY1aJW/zPeQBWHH1uSqJfAew37CAL+skNaSTa0vFcZ767XBCfg6RLfXyKh85qm + Gt8gRY7Js2eGw9uR74OlrgJ4TIun187UAelKzqsGADORGyoHo1fMJuk0Mdiowqu+iX5qn3+cE + hCcZPwE2VuH0H9J8fUNRrotICpKdurbLvl40ubrd7Ke2b80dNLZfLbLnOKHSQyYy7TFJ8FgZ0 + eSlGh0KXP7kZU1n2gIGKqpYdthjTXDHyHw9QqRUStYpd/WtcY5d4gxnomwYCghPPhaIzjeHkD + ifQLPwagP2YYxjG2ZH8f8ZQSh3kEP4r9bbTGpIw== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 -X-CRM114-CacheID: sfid-20191101_064323_502874_2D867005 -X-CRM114-Status: GOOD ( 12.05 ) -X-Spam-Score: -0.9 (/) +X-CRM114-CacheID: sfid-20200107_101615_067475_AF11981B +X-CRM114-Status: GOOD ( 11.10 ) +X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: - Content analysis details: (-0.9 points) + Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- - -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, - low trust [212.227.17.21 listed in list.dnswl.org] - 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record + -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, + no trust [212.227.15.19 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (wahrenst[at]gmx.net) -0.0 SPF_PASS SPF: sender matches SPF record - -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from - author's domain - -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature + 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record + -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from + envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid - -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from - envelope-from domain + -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from + author's domain + -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list @@ -134,99 +134,107 @@ List-Help: List-Subscribe: , -Cc: devicetree@vger.kernel.org, linux-pm@vger.kernel.org, - bcm-kernel-feedback-list@broadcom.com, Stefan Wahren , - Chen-Yu Tsai , linux-arm-kernel@lists.infradead.org +Cc: devicetree@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, + Stefan Wahren , linux-arm-kernel@lists.infradead.org, + linux-pm@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Since the BCM2711 doesn't have a AVS TMON block, the thermal information -must be retrieved from the AVS ring oscillator block. So add a new -suitable binding. +must be retrieved from the AVS ring oscillator block. This block is part +of the AVS monitor which contains a bunch of raw sensors. Signed-off-by: Stefan Wahren +Reviewed-by: Rob Herring +Reviewed-by: Nicolas Saenz Julienne --- - .../bindings/thermal/brcm,bcm2711-thermal.txt | 39 ++++++++++++++++++++++ - 1 file changed, 39 insertions(+) - create mode 100644 Documentation/devicetree/bindings/thermal/brcm,bcm2711-thermal.txt + .../bindings/thermal/brcm,avs-ro-thermal.yaml | 45 ++++++++++++++++++++++ + 1 file changed, 45 insertions(+) + create mode 100644 Documentation/devicetree/bindings/thermal/brcm,avs-ro-thermal.yaml -- 2.7.4 -diff --git a/Documentation/devicetree/bindings/thermal/brcm,bcm2711-thermal.txt b/Documentation/devicetree/bindings/thermal/brcm,bcm2711-thermal.txt +diff --git a/Documentation/devicetree/bindings/thermal/brcm,avs-ro-thermal.yaml b/Documentation/devicetree/bindings/thermal/brcm,avs-ro-thermal.yaml new file mode 100644 -index 0000000..5531d3f +index 0000000..98e7b57 --- /dev/null -+++ b/Documentation/devicetree/bindings/thermal/brcm,bcm2711-thermal.txt -@@ -0,0 +1,39 @@ -+Binding for Thermal Sensor driver for BCM2711 SoCs. ++++ b/Documentation/devicetree/bindings/thermal/brcm,avs-ro-thermal.yaml +@@ -0,0 +1,45 @@ ++# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) ++%YAML 1.2 ++--- ++$id: http://devicetree.org/schemas/thermal/brcm,avs-ro-thermal.yaml# ++$schema: http://devicetree.org/meta-schemas/core.yaml# + -+Required properties: -+- compatible: must be: "brcm,bcm2711-thermal" -+- reg: Address range of the thermal registers. -+- clocks: Phandle of the clock used by the thermal sensor. -+- #thermal-sensor-cells: should be 0 (see thermal.txt) ++title: Broadcom AVS ring oscillator thermal + -+Example: ++maintainers: ++ - Stefan Wahren + -+thermal-zones { -+ cpu_thermal: cpu-thermal { -+ polling-delay-passive = <0>; -+ polling-delay = <1000>; ++description: |+ ++ The thermal node should be the child of a syscon node with the ++ required property: + -+ thermal-sensors = <&thermal>; ++ - compatible: Should be one of the following: ++ "brcm,bcm2711-avs-monitor", "syscon", "simple-mfd" + -+ trips { -+ cpu-crit { -+ temperature = <80000>; -+ hysteresis = <0>; -+ type = "critical"; -+ }; -+ }; ++ Refer to the the bindings described in ++ Documentation/devicetree/bindings/mfd/syscon.txt + -+ coefficients = <(-487) 410040>; ++properties: ++ compatible: ++ const: brcm,bcm2711-thermal + -+ cooling-maps { -+ }; -+ }; -+}; ++ reg: ++ maxItems: 1 + -+thermal@7d5d2200 { -+ compatible = "brcm,bcm2711-thermal"; -+ reg = <0x7d5d2200 0x4>; -+ clocks = <&clocks BCM2835_CLOCK_TSENS>; -+ #thermal-sensor-cells = <0>; -+}; ++required: ++ - compatible ++ - reg + ++examples: ++ - | ++ avs-monitor@7d5d2000 { ++ compatible = "brcm,bcm2711-avs-monitor", ++ "syscon", "simple-mfd"; ++ reg = <0x7d5d2000 0xf00>; ++ ++ thermal: thermal { ++ compatible = "brcm,bcm2711-thermal"; ++ #thermal-sensor-cells = <0>; ++ }; ++ }; ++... -From patchwork Fri Nov 1 13:42:27 2019 +From patchwork Tue Jan 7 18:15:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren -X-Patchwork-Id: 11223155 +X-Patchwork-Id: 11321579 Return-Path: - + Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) - by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 21D0914E5 + by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4EEC4138D for ; - Fri, 1 Nov 2019 13:44:29 +0000 (UTC) + Tue, 7 Jan 2020 18:17:14 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) - by mail.kernel.org (Postfix) with ESMTPS id F346C21734 + by mail.kernel.org (Postfix) with ESMTPS id 1A18F20848 for ; - Fri, 1 Nov 2019 13:44:28 +0000 (UTC) + Tue, 7 Jan 2020 18:17:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org - header.i=@lists.infradead.org header.b="DlnwOVOn"; + header.i=@lists.infradead.org header.b="WN1BmRCI"; dkim=fail reason="signature verification failed" (1024-bit key) - header.d=gmx.net header.i=@gmx.net header.b="KnOtTbab" -DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F346C21734 + header.d=gmx.net header.i=@gmx.net header.b="JbSBDGbs" +DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1A18F20848 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=gmx.net Authentication-Results: mail.kernel.org; @@ -239,91 +247,91 @@ DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; In-Reply-To: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:List-Owner; - bh=lJEKrpjNRi+jilpB6d9pgEucgNPnvokICNLsI7x/YRI=; b=DlnwOVOnKeSBYHceZjrW8yEwhB - 5vQTVS3NxtZk6sAO3jcFlnpibwuPdUiQz8SSLj1MtgyMYv8U3kNEXyPmkPrFNCVcMdwA/IePdpPB7 - OSzQecj0v4u58Qw2ORqK6IgGOD21cRepqkGTlOSw0iaU29Eqk+lfMR3+qq9ypXiTGWK8xVEY4I33I - axqNmfDxXVzRagfJX7Z6KCwoSuaA/Do3+8jf0QIEX/uBATO8CTNhdSX07bJmIluLEzkNaHDOsehbq - tf0/ZXE8tqYuNIuc0biNbRZCFfI/+AYBNE0R297E9NlkiXPwdJj4sEVf5UdzgPC239AMmMUZtpE3F - VFecleTg==; + bh=rd33uxZir356e7wb2uZqLp6zepYzCUaWcTH20TBa6Qk=; b=WN1BmRCI/FB6C4+ssKo3wCeIYT + 5K0oT/RSBHeB2bGbPVTr2hxGUgjDDUXvnyAUw5RMItV3h54Q8JS41AP+v6VpB99bd0X+8HrC3rHa9 + ZD6AcP0l8Qovx8Tk427GW5beomc7Z0mUK9NY2xfcEc81gfGAOa0+cOMBAoj7OSqAe3qXB4e/X0uWO + Z8MrJvtd7wZzzvsXaEKac7C+gzrIZbm108W/rSS2205m8+TdzBCWB1PK23JgnqLZDzWt2Z0bfBI+W + Yy4G5buoin/9QXdofS3uI/23A833iKxHljZL12/xWtwCy70/sqWVvTv13U3aKNh5SzqQ2zBi4nT+1 + ed+Q4ktg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) - id 1iQXDx-00061u-Dj; Fri, 01 Nov 2019 13:44:21 +0000 -Received: from mout.gmx.net ([212.227.17.20]) + id 1iotPk-0004my-Pu; Tue, 07 Jan 2020 18:17:12 +0000 +Received: from mout.gmx.net ([212.227.15.18]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) - id 1iQXD3-0004jQ-Ht - for linux-arm-kernel@lists.infradead.org; Fri, 01 Nov 2019 13:43:27 +0000 + id 1iotOp-0003ud-1M + for linux-arm-kernel@lists.infradead.org; Tue, 07 Jan 2020 18:16:18 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; - s=badeba3b8450; t=1572615791; - bh=ZvRbobq/A3o7unOYL01pPMgbwSptuQGi8SXTyWvKFeA=; + s=badeba3b8450; t=1578420965; + bh=4mbXLn8R9HTqHSqjDYTVnf33y1TLbPgq1QZsQUXuORI=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; - b=KnOtTbabCVnfy4poWpfEZJkcZ9+w/nuj9kY6riio9Ce1xjqo5hpHq9b4bOPsJB/vw - Lq9VIy6y0E7dJJHxdzfCQPSCfdItlHGJmFdJbWxIjtAaFYI0xtuJ3zxAtbsTWQEmV2 - 7NgBe1a3JYhynoVgNun823x2v9ULOCB2aSSPfSFI= + b=JbSBDGbsT0C/YiJLKHHclDX+IekngU601r/NZUXbm7pEwIYsEG9Fpom2kM2knFKu6 + P8bgl9yGKGMF3bKRLNYwPzCNgXdBIDyzI8MsZOrBpZG4jgG62ofrIuBWMuCDJ2if7S + 9nt5L4RoIxNX7cPNA8tE7jX2d15dzT534YUlWCzQ= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c -Received: from localhost.localdomain ([37.4.249.112]) by mail.gmx.com - (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id - 1MGz1f-1iE6jl2up9-00E5nH; Fri, 01 Nov 2019 14:43:10 +0100 +Received: from localhost.localdomain ([37.4.249.154]) by mail.gmx.com + (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id + 1M7sDg-1il3eJ1VuE-0053xL; Tue, 07 Jan 2020 19:16:05 +0100 From: Stefan Wahren -To: Zhang Rui , Eduardo Valentin , +To: Zhang Rui , Daniel Lezcano , Amit Kucheria , Rob Herring , Mark Rutland , - Eric Anholt , Florian Fainelli , - Catalin Marinas , Will Deacon , - Markus Mayer -Subject: [PATCH 2/4] thermal: Add BCM2711 thermal driver -Date: Fri, 1 Nov 2019 14:42:27 +0100 -Message-Id: <1572615749-9524-3-git-send-email-wahrenst@gmx.net> + Nicolas Saenz Julienne , + Florian Fainelli , + Catalin Marinas , Will Deacon +Subject: [PATCH V3 2/4] thermal: Add BCM2711 thermal driver +Date: Tue, 7 Jan 2020 19:15:55 +0100 +Message-Id: <1578420957-32229-3-git-send-email-wahrenst@gmx.net> X-Mailer: git-send-email 2.7.4 -In-Reply-To: <1572615749-9524-1-git-send-email-wahrenst@gmx.net> -References: <1572615749-9524-1-git-send-email-wahrenst@gmx.net> -X-Provags-ID: V03:K1:W8Y8TrjXv7DBI+UOhPg3H+lw+29ji7fbc4oPSb9Y3kLSajZq+F9 - 6vM7vUP/2p2NtXAKA2x7TYf7cz4NIx5plmG/lt0WoIQ6YzvBQ4uI6kfZtgGRgXw9KIbGYRv - I4oY9GWGsh+DpA2G/kpO3HD8T65yvclzGp1X4l89ioeqC2FzIN0OzeYVma2iw32Wk8VhU8w - GemtnKn3nrc7/xc2FKbTQ== +In-Reply-To: <1578420957-32229-1-git-send-email-wahrenst@gmx.net> +References: <1578420957-32229-1-git-send-email-wahrenst@gmx.net> +X-Provags-ID: V03:K1:yFvB7JDgtfyjUut8k1Chkrb/ErSVsg3EvQyWqLPXb8cBJL7dcQK + dsv56Ee8bmn70zRFQcp+ZxoKnJOLsQX8yr4SSStLpZInOQB1eFljwNlqO1yvOMTchBW9aNV + 8K/3K5y1XYvkIucOrqA4mcg/Abn6C2HRj+YX30kIzWXSZJYVPfGO7BlReGxXXeOS3RN/0+v + AxjdzIeF7ITk0B2E8IlXg== X-Spam-Flag: NO -X-UI-Out-Filterresults: notjunk:1;V03:K0:5XyeTRLrFlY=:k9mMXgNrcwECxFFK5SlcSE - oxFZ6rUMIuMoCArq1DyGiUJ+p8h5lQC5APjN1djYpWuJfyRgOlFtrqdpkGzrVVJg5CFu3xKK6 - /vUyLSRvGQvPmJpExxXaLX9idFGxc6y7JvWAwcZzkbi0NtsYYXVFxsEB9UlUQclyMLxmpE9kD - RA9aUY97ChtHxmZ99IhZw/DTvnqDroXyqXBrv5DdCkSGH8gFRmciL5BsPK5au+wa1xuuEiu1M - fbbK7+SPPIJM6DToFRjoAb/jhi2wn7Lqwpo+ImugKFNfhaJLvUZYDZ2TSbvwr+59P7vQJbC8L - ek8wCUhjlC96gJCxyM6+XCXk2QcPTW+A7DOfZ8IwPyLKJvVKi/lG3f7UuEnpSakYS/JrgFmGU - GBI0WwfjslQ972Z60zAaojDaoaAbtQXIFdBcPR7vbIH+KozMO3QRlnufiTSD7jnWlq1aZMllK - GYOYVatHhWjr7eY6L6GzuqReABJvz2npL7HTD4vkg3RzickB4EKEssSOql8x/P0jTL2ROvBmy - pKqoVc2I5QqjoCm6rmS/WsfeiY6hncROSZq35UhPBpQm0BlZ9TQf3E6HgFBwH7b5gp66NY1K1 - aVmwxqIwVcqWEnTni6C4L3BeOci1fqxmKzHfNOSCjen6Ft/tYMGh5WJfjteA67as/LMk7VWxR - uW6vPdbhVmMMFOfCuteuRmoigFyjOs0+H2BWo57hFY33aWiJwY8+MZvvRymy1H0xP/Eie59rk - QNllDA0F/odNpWS0IGayHYaASN0HR3puh2ZKnnUtPLJmM4doSGZFRPs6owIWQDixV3CtdED5O - VFWwYeBlymygBbrlh/nqHVRRktT+9F9IAjdY2yil3j/FUJvLViq2545Ydk2SmiRcS9tssdLUF - E0DZDovQKyiAt/YOqQVKhtUIPlEWuFIrzLTZYEFcKEJc9P8MWGlv0sVGC3CfCdMA4vzeAycnD - 8PszgrSa36aXyxy5kGxZOC5RsWwcyAkHqIcCZhCYjzUAHAKS4VAlsBtNgtbkyFKbkpW1jawBH - LbzE4WKyrnfZyImtd71ZjHEHk0/S48y65Slh1NAtdS6qzEWB2jjAMTb7Bu+LopV82/VFvvLZj - puH3eT4AN48C1WagFBaxOXKVLLBXzkvy9M3eZoG2GNs5bhr/9ufWLuogjSi/ltHUufP+hseMi - g+BL/aUe5vCAKYNmHXk9xF78eQrZ0aa+JYVN4JuXRF+HoaFMjN6OvDye5r9rm6dhwvhBreEu/ - fdMdt3V6InXvHbD8q5sULbKt9eSvRdXpGA57d0Q== +X-UI-Out-Filterresults: notjunk:1;V03:K0:jTzlGkSo9bo=:dlU7pPc0rf9QUy9ZULoDP9 + 8GSLL1VdjzaySpcK+jGdXJmnrTtTdrwOVCM13Yj+OFiXY9BhB02v3Y1/GACb0zByQF6m5R+HY + E9rP1h/ZotZ106drpf22Cq8qEcdAIN5naIaEYooguO0tmeziCzo2zdEeRvJQpiw0XPxJzNMRM + 6r/2TRXgeXb53bBysAa4tCjXgXGwqtbF0WKTAsWBjogBF/6lwK2AgGFC8X4mY7XOv8GZOq+EO + eCr92WcgDG5MIwJF7G+Q/SWbTCV+S7Fs8D52Iy3YYtdNKYJa8Mq2PmZs+zx2feLAmwfSxGctw + EuEMw9cv1bA2tVzuUn7GiFQYGlJpxGvvCrxvU6F99yw9ECI3c3zIOHKmsXPlWMBQo9AuD/0rF + P//MLHaS7rzJds2En+JKdP/bAR2XxC/qCtHnF7VIxMkbrXUU69CYWVTAz5gaxFv5CtBY5kqmi + /AkDqAJimergmP6IIVtmEpgO5aE2KcbFFWtqt8e+OshhR/JDJ6JP8+kZUnbV9e0nY2cUJQqeT + n30n/BPVfHDvMlXeHpI//Eo90SBCEVY9BRd90Q/9tmyRckXcLt+mK9USdZAkyrq7X+eXNlB2b + QPHkn7XPbEso/0K2GzZCEO+kh5IKoYf4o53VM++6q7SDY48oU7MGG29P36RlK40W4wxgYcnbQ + G6ofOpVasFvQlsfoWZAy3tMP3h7pzSXTMzfb+oBl+20O/5R32GpSWt/jO/Rfhyk+Ho+MGiQwA + TqHZK+xG6BWesd9jIKv+A0n/NnxbHfylDpSRa0x4Al27WH1GQcN70HE+B91a58+3NmNd8cl1u + nR++5B6h+UhxHjwY3mJFn6JaJE9tzHZYUcYYH6JeUq03cFXZC9Fxdns96ofekPi24KiO9T49q + byceV+B8w4shzosvTwbuExqTP6JvIQU0VGVNzFhWlFvoMardYHn0PWKlIy16TPVaRXEL7yl2U + +TRzGy2pXi4g1TkFMGGmRU17UYWsREIKw3+RqOSuq8riGSWZrUgVbk2wJLp/0kS4pLMUzaF/a + QMemNPTBJfdX15J9IiNHnOMDGmEdpRucbFs9HYRn4HhWDMl1TskP5nyUiG8p+7ET3PLjS+r4K + IFzT7g2tghwbdcDkMOjwK1CFXVblw2fUa5gjZoLCAb+psUornL0pyskLONpUQDgX+FONMdu5C + gXIa+nu2CgDmi+mxoDIx4hSim5yfx1eGeryexRr5UiX4wdT0jXDx3nyfK+z9DTgBbIwY0D0qM + gN5jbjyZRfDrlBl1cMJHAWyDEdL42xvNhWkeV0Q== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 -X-CRM114-CacheID: sfid-20191101_064325_913111_DD88EB91 -X-CRM114-Status: GOOD ( 18.24 ) -X-Spam-Score: -0.9 (/) +X-CRM114-CacheID: sfid-20200107_101615_404914_F8328398 +X-CRM114-Status: GOOD ( 17.41 ) +X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: - Content analysis details: (-0.9 points) + Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- - -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, - low trust [212.227.17.20 listed in list.dnswl.org] - 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record + -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, + no trust [212.227.15.18 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (wahrenst[at]gmx.net) -0.0 SPF_PASS SPF: sender matches SPF record - -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from - author's domain - -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature + 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record + -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from + envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid - -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from - envelope-from domain + -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from + author's domain + -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list @@ -337,9 +345,9 @@ List-Help: List-Subscribe: , -Cc: devicetree@vger.kernel.org, linux-pm@vger.kernel.org, - bcm-kernel-feedback-list@broadcom.com, Stefan Wahren , - Chen-Yu Tsai , linux-arm-kernel@lists.infradead.org +Cc: devicetree@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, + Stefan Wahren , linux-arm-kernel@lists.infradead.org, + linux-pm@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: @@ -350,27 +358,29 @@ which is placed on the Raspberry Pi 4. The driver only provides SoC temperature reading so far. Signed-off-by: Stefan Wahren +Reviewed-by: Florian Fainelli +Reviewed-by: Nicolas Saenz Julienne +Tested-by: Nicolas Saenz Julienne --- - drivers/thermal/broadcom/Kconfig | 8 ++ + drivers/thermal/broadcom/Kconfig | 7 ++ drivers/thermal/broadcom/Makefile | 1 + - drivers/thermal/broadcom/bcm2711_thermal.c | 146 +++++++++++++++++++++++++++++ - 3 files changed, 155 insertions(+) + drivers/thermal/broadcom/bcm2711_thermal.c | 129 +++++++++++++++++++++++++++++ + 3 files changed, 137 insertions(+) create mode 100644 drivers/thermal/broadcom/bcm2711_thermal.c -- 2.7.4 diff --git a/drivers/thermal/broadcom/Kconfig b/drivers/thermal/broadcom/Kconfig -index cf43e15..b970295 100644 +index cf43e15..061f1db 100644 --- a/drivers/thermal/broadcom/Kconfig +++ b/drivers/thermal/broadcom/Kconfig -@@ -1,4 +1,12 @@ +@@ -1,4 +1,11 @@ # SPDX-License-Identifier: GPL-2.0-only +config BCM2711_THERMAL + tristate "Broadcom AVS RO thermal sensor driver" + depends on ARCH_BCM2835 || COMPILE_TEST -+ depends on HAS_IOMEM -+ depends on THERMAL_OF ++ depends on THERMAL_OF && MFD_SYSCON + help + Support for thermal sensors on Broadcom BCM2711 SoCs. + @@ -389,17 +399,17 @@ index 490ab1f..c917b24 100644 obj-$(CONFIG_BCM_NS_THERMAL) += ns-thermal.o diff --git a/drivers/thermal/broadcom/bcm2711_thermal.c b/drivers/thermal/broadcom/bcm2711_thermal.c new file mode 100644 -index 0000000..214a305 +index 0000000..b1d3c4d --- /dev/null +++ b/drivers/thermal/broadcom/bcm2711_thermal.c -@@ -0,0 +1,146 @@ +@@ -0,0 +1,129 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Broadcom AVS RO thermal sensor driver + * + * based on brcmstb_thermal + * -+ * Copyright (C) 2019 Stefan Wahren ++ * Copyright (C) 2020 Stefan Wahren + */ + +#include @@ -408,21 +418,22 @@ index 0000000..214a305 +#include +#include +#include ++#include +#include +#include +#include ++#include +#include + +#include "../thermal_hwmon.h" + -+#define AVS_RO_TEMP_STATUS 0x00 ++#define AVS_RO_TEMP_STATUS 0x200 + #define AVS_RO_TEMP_STATUS_valid_msk (BIT(16) | BIT(10)) + #define AVS_RO_TEMP_STATUS_data_msk GENMASK(9, 0) + +struct bcm2711_thermal_priv { -+ void __iomem *base; ++ struct regmap *regmap; + struct device *dev; -+ struct clk *clk; + struct thermal_zone_device *thermal; +}; + @@ -432,9 +443,12 @@ index 0000000..214a305 + int slope = thermal_zone_get_slope(priv->thermal); + int offset = thermal_zone_get_offset(priv->thermal); + u32 val; ++ int ret; + long t; + -+ val = __raw_readl(priv->base + AVS_RO_TEMP_STATUS); ++ ret = regmap_read(priv->regmap, AVS_RO_TEMP_STATUS, &val); ++ if (ret) ++ return ret; + + if (!(val & AVS_RO_TEMP_STATUS_valid_msk)) { + dev_err(priv->dev, "reading not valid\n"); @@ -467,39 +481,33 @@ index 0000000..214a305 +{ + struct thermal_zone_device *thermal; + struct bcm2711_thermal_priv *priv; -+ struct resource *res; ++ struct device *dev = &pdev->dev; ++ struct device_node *parent; ++ struct regmap *regmap; + int ret; + -+ priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); ++ priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + -+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0); -+ priv->base = devm_ioremap_resource(&pdev->dev, res); -+ if (IS_ERR(priv->base)) -+ return PTR_ERR(priv->base); -+ -+ priv->clk = devm_clk_get(&pdev->dev, NULL); -+ if (IS_ERR(priv->clk)) { -+ ret = PTR_ERR(priv->clk); -+ if (ret != -EPROBE_DEFER) -+ dev_err(&pdev->dev, "could not get clk: %d\n", ret); ++ /* get regmap from syscon node */ ++ parent = of_get_parent(dev->of_node); /* parent should be syscon node */ ++ regmap = syscon_node_to_regmap(parent); ++ of_node_put(parent); ++ if (IS_ERR(regmap)) { ++ ret = PTR_ERR(regmap); ++ dev_err(dev, "failed to get regmap: %d\n", ret); + return ret; + } ++ priv->regmap = regmap; ++ priv->dev = dev; + -+ ret = clk_prepare_enable(priv->clk); -+ if (ret) -+ return ret; -+ -+ priv->dev = &pdev->dev; -+ platform_set_drvdata(pdev, priv); -+ -+ thermal = devm_thermal_zone_of_sensor_register(&pdev->dev, 0, priv, ++ thermal = devm_thermal_zone_of_sensor_register(dev, 0, priv, + &bcm2711_thermal_of_ops); + if (IS_ERR(thermal)) { + ret = PTR_ERR(thermal); -+ dev_err(&pdev->dev, "could not register sensor: %d\n", ret); -+ goto err_clk; ++ dev_err(dev, "could not register sensor: %d\n", ret); ++ return ret; + } + + priv->thermal = thermal; @@ -510,25 +518,10 @@ index 0000000..214a305 + return ret; + + return 0; -+ -+err_clk: -+ clk_disable_unprepare(priv->clk); -+ -+ return ret; -+} -+ -+static int bcm2711_thermal_remove(struct platform_device *pdev) -+{ -+ struct bcm2711_thermal_priv *priv = platform_get_drvdata(pdev); -+ -+ clk_disable_unprepare(priv->clk); -+ -+ return 0; +} + +static struct platform_driver bcm2711_thermal_driver = { + .probe = bcm2711_thermal_probe, -+ .remove = bcm2711_thermal_remove, + .driver = { + .name = "bcm2711_thermal", + .of_match_table = bcm2711_thermal_id_table, @@ -540,32 +533,32 @@ index 0000000..214a305 +MODULE_AUTHOR("Stefan Wahren"); +MODULE_DESCRIPTION("Broadcom AVS RO thermal sensor driver"); -From patchwork Fri Nov 1 13:42:28 2019 +From patchwork Tue Jan 7 18:15:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren -X-Patchwork-Id: 11223143 +X-Patchwork-Id: 11321577 Return-Path: - + Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) - by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 015CA14E5 + by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1E3DA138D for ; - Fri, 1 Nov 2019 13:43:48 +0000 (UTC) + Tue, 7 Jan 2020 18:17:03 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) - by mail.kernel.org (Postfix) with ESMTPS id BA6D621734 + by mail.kernel.org (Postfix) with ESMTPS id D9D1920848 for ; - Fri, 1 Nov 2019 13:43:47 +0000 (UTC) + Tue, 7 Jan 2020 18:17:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org - header.i=@lists.infradead.org header.b="tl6Mjaq9"; + header.i=@lists.infradead.org header.b="ik3qMsDb"; dkim=fail reason="signature verification failed" (1024-bit key) - header.d=gmx.net header.i=@gmx.net header.b="PtVBxoI/" -DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BA6D621734 + header.d=gmx.net header.i=@gmx.net header.b="dq7Bd9O5" +DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D9D1920848 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=gmx.net Authentication-Results: mail.kernel.org; @@ -578,91 +571,91 @@ DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; In-Reply-To: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:List-Owner; - bh=wnYyL8a6VneArt156UwHBToso93o9avXZYJflc1oMdw=; b=tl6Mjaq9CAf1E2h7lihLGNwrGG - B+3MUMEijPkBYoQE3bJIebRx2nLo/PRrx2gYSPfZAb3FtPO6c6JVvTW/ca5bA4OuHgRRB2dWwquOK - +GhNYNWuVAw8DvBzNuqnF8oadndGwlmbH73DAHsdUsA1YN1WFEtxW4ujPp6nXJeWfNhH0OhMw3rgr - Ez6ToB+k3TlJujHF09e7dR0gBAmlRwOLM4Pm3eJn2Hfzt2pT8HAelyFP4qAjWT0Yc30DpS36xgyWb - w8xvVGnyoq5yi5dDU00MLFJycnhyHmJYbe+PN3pDSe/yVHPJeILXsQefwMOpb4TXrjh2mUehQgZ9o - 5O4zbnVQ==; + bh=3Jmn1DTkt6iHJo4nKs/bZbMCywPz9fpkSPNvdSNQuD0=; b=ik3qMsDbyY7oIjPW5+6nccv1h7 + oTVZ+0E3fy/IjWBwKY5FfojiU4G096Dur2GDb1EeYQdJPYEusJkMhhogib+k9m2wcU+Ho8h2EZeKF + Jll43seK5zjOJwQO8N/Jv0wOd2UqlWswRCLEoAUgGbDEU5gYR8Ue2MPlCFqJMBEeZ8KC3SeWIfYgi + fLTUD74gERNQ7YL6u8uEq8Nx6BUgyW0/HUQ3Km8r9DMV7NbRoKm07M+5sKldGxSqxMRWUkW1aq9YV + cQW+XybMtNHLfcTOJYOvyQApYP0CK8q+I+xtd4SM150gTyCKEhDUAk+UFEUnJ9pDgTeh6yGqQqv5I + BmWUq8aQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) - id 1iQXDP-0005AI-3Y; Fri, 01 Nov 2019 13:43:47 +0000 -Received: from mout.gmx.net ([212.227.17.22]) + id 1iotPZ-0004bP-3J; Tue, 07 Jan 2020 18:17:01 +0000 +Received: from mout.gmx.net ([212.227.15.18]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) - id 1iQXD2-0004ir-Fz - for linux-arm-kernel@lists.infradead.org; Fri, 01 Nov 2019 13:43:26 +0000 + id 1iotOp-0003ue-1N + for linux-arm-kernel@lists.infradead.org; Tue, 07 Jan 2020 18:16:18 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; - s=badeba3b8450; t=1572615791; - bh=mEh+x+3L1b8hpI6ZWmfCju/bOUL39/Dd9BRJ+2nObT4=; + s=badeba3b8450; t=1578420966; + bh=aWglA2PfdwtIHtm2mDExM6LOMnFuWnZiRAiujdoAMW8=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; - b=PtVBxoI/SK+6xEvg1ZZo/HuF/tuOPnLqu+thDi7KHYnTfE9x/4eInk6cMQd4lEZ7V - m+V75PmzVlo9uufNrv5J58RhefcWg/iH0h59JzkDg01rWu78kGrGlTo5i02717NE2p - UHHY3NQdytJWTHahI+5F1E9c8yVBNmQHmA0xeBIE= + b=dq7Bd9O5pRIoP35pWiEbr3vIwPVUIZdztKslWibSe4sYkKnlLAbn2Tly+3mecxMX4 + plidbchinnJHsr1byo3468d32bXORW9ghvyBGxOn50Zs4URcLnZ6Mj9sUeBhkRs9yz + afE9G4bQQvpFS9Aa/ELtd1yj+QyiHuLkxDC5oxSA= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c -Received: from localhost.localdomain ([37.4.249.112]) by mail.gmx.com - (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id - 1M8hZJ-1iMOTe1cET-004mP3; Fri, 01 Nov 2019 14:43:11 +0100 +Received: from localhost.localdomain ([37.4.249.154]) by mail.gmx.com + (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id + 1MoO2E-1jUaw13WDg-00onqT; Tue, 07 Jan 2020 19:16:05 +0100 From: Stefan Wahren -To: Zhang Rui , Eduardo Valentin , +To: Zhang Rui , Daniel Lezcano , Amit Kucheria , Rob Herring , Mark Rutland , - Eric Anholt , Florian Fainelli , - Catalin Marinas , Will Deacon , - Markus Mayer -Subject: [PATCH 3/4] ARM: dts: bcm2711: Enable thermal -Date: Fri, 1 Nov 2019 14:42:28 +0100 -Message-Id: <1572615749-9524-4-git-send-email-wahrenst@gmx.net> + Nicolas Saenz Julienne , + Florian Fainelli , + Catalin Marinas , Will Deacon +Subject: [PATCH V3 3/4] ARM: dts: bcm2711: Enable thermal +Date: Tue, 7 Jan 2020 19:15:56 +0100 +Message-Id: <1578420957-32229-4-git-send-email-wahrenst@gmx.net> X-Mailer: git-send-email 2.7.4 -In-Reply-To: <1572615749-9524-1-git-send-email-wahrenst@gmx.net> -References: <1572615749-9524-1-git-send-email-wahrenst@gmx.net> -X-Provags-ID: V03:K1:ViqU/VzUpFCBeYdz3DMy0XjDhbi83+YFTtFiwdUEVCrb12y0xJG - JHSeurEL6x2c0xITdynQuAUktcS2actjWiIcNA9LKW6tSgbU4IhAqr/yb80wmiiZXDdkkxU - RtaDv6oRxWUJAIbdWQfDHlrNwKOTXsQFLGnYK7ocTLyLfIIfqYH0GRhzLYCHKV4Go2SCjyw - iKXWGy7Va5HhUkYZWj9vg== +In-Reply-To: <1578420957-32229-1-git-send-email-wahrenst@gmx.net> +References: <1578420957-32229-1-git-send-email-wahrenst@gmx.net> +X-Provags-ID: V03:K1:nnCaGh26y5WZ7Y+Du8wo80ycqs5dd0zUOiU8IyxmRBut3vh+kbS + hWpSdRT6jUdGy0zdQC4p0GWbndKZlE8PcisuGyj1O6JS+PZF0lvHyqMgg93jy1GqVcINVAT + m9kwkGNF9DR+OKHvvajSgRYV5gRp3BIZpN7jBioSwAr2xEZCwI3aFYzZL0/nM1tdwZi08do + f9kojNp6jUr4vT/oaeL8g== X-Spam-Flag: NO -X-UI-Out-Filterresults: notjunk:1;V03:K0:MjkymLFkrhU=:1Ws8atzNbDZdaq1V4d/LKk - v2eazIzDsKJlqd4spVvQ/fNN8dFUjNONZGSxKKSajuNU+hi6m1/Z0ZMTXsHhktDhj1vYKHdr1 - 8AvacTavjC2bmm74rP292jyJc0sEpUwSII4vRfMtr0xSjftUBuF2A1g1hp4gT2Fg/EaCBviA1 - 0dVn5FRaQkRHilVQ71NtftEPpZtX7wKhxfYUI0BGmVTuXPjL+nV28FLte84HJZcMwvjtcV701 - jq0ZmBZVt1uISeZNouLQRKpy3D1JR9iGbRegmrbfiVCFRDQHpBVg+HBjrN6O8gAH/jztdBUVc - vMDoM6/F2Y8gb1gyTpJVleVsfeJaWYgLs53duUvmADHitN/mlU8WqmDBEV6DBf+lWP7Qe4xqc - KvaClEpno6dNx7SO7gDwrxuVZWUd2wMmoun+hu44juAusckaDREliL3tlxeXDObtJF/XTdFlV - Dke/fzIrAl5LkM7utm9FZHGfQ50hjTo5dS/rrOgJDGyYpxhUwvXt9Cm/g6hw69KOdAx+giiTg - LBuTuDBRTCQG+rB9TOT3fac5pSdvubD+OCSc+Jvaaz+lgMH9teTg/WcEe3OgYteiEEDPDYcib - I9C6zN4KL7/2mtHvjuXfT2IKDp9WQcCbPkL9nzpNLmEdQLHxlCRJjg+36y0nlIMmhayuTbbmf - 4yTVOJAUumLulA1ZvR5MLYJ15TIVFQXQZEvP0kF/5xKe3tW5GUJDYnTwoiQ3EscYCGOQP3GCB - DIJlVjZX9luHL2/SdwBqCvrxm1GZ83sidrinQAdc3z8ldM1hIQOvId0b9EHZ0HCgq2OQvXw3j - h8odivHAkN9wLj1eW//NTO14VC0mQt4FsXt0Boi7oGecLLnd3c8vWPHCsWE4zfqVyXHlD10Qe - 4ee/D/Cno3QBz4We1PKvlfMsj5ezI/uSLxe7vLfQAJEXlVcvAgl4tajfDQcaSyhuYVFQuLuit - eq+MbaCn41hcG7a2D/ZdCiu0qYw7zPJf2G+fbSzdIuROxfjCaMmiDGbzYQmGuwX+7d4PfyHMx - 9CngQ3dspgHJGQwxxdHJ5CWjkDYSBajueTHBrvWNgV1pUScO+USCwW4NAi/5jla0R5ppV1FhQ - J02uoOPYATV1xXlblla1F8YueZWT5CYkwdcyCg6zkjm5DbHXztkNCkJ3erEpju/qRxUbmRl/A - qw2f6wijiiNORLjJDsekKtUegmWjWrgQUzVoihKPe6qfwXiZ/CdZ8kJ+qdPlsnceZxRKiqM+t - zivh29+ZZwvMkagY80nc5iVJzCURgwZfAVwHe6A== +X-UI-Out-Filterresults: notjunk:1;V03:K0:eypfnYKWbbQ=:3vD1OpSV55xSk4yzLYUc8F + ss17pikWe3sKTkGoI3BFvSL2dMCJntwyDYvcMBefgSpGcgd2z3eK3CjpAhx5Z35UkdK7cr6ep + lsMn51ut2iKyCZ1FGpPY5mDJroBPqJFUDxNCh0BAQJn/Vyd5aWvtIStBX8vhSZeSLwOpkgYtq + INAm+O2AD+nw7gqpqya1+fc2pMPvW9S2I6sYSLCuOP1gqJraZSDDgUp8hn2DbLlhVPgD5MSet + VUMc8Crizcnnhu+3dx1SJtxS/Vykaw4X0YVr5/sV3mNPI9sqSWpndRywGkJfhs6ruCBSTZPqD + lR/PwjRR58iwZ2J2O3oBfahA9dQYEQNQqxsQxIcJ296R7AyEpq8PePDjT6Z0qKPaIP1KiR9/8 + bq+HA6Be/peO7fvhwDxJNy0yQSnXJDjLqu8Gop7ybALxiK+c+alVEtyBJwd7wL+FCdL3hNnHi + gGsohKQNAHfMWgJXcnYBqr/mcSjQf07IYNuidrfs7biH4SIVMneDFBM+bDyXpPKaHrAf3f8AJ + 6RwAQAuSBoGRrR6lOKFx63o3tmAI4R/vfyosXbLXm8nheUTCB3tmW+/J++QiCrafqCA8rzZCF + eZgIaNncjMxPxyUmV608AjOWEnE6xf0cXC57Cw6mOq19oVtp3qesCkDvbyaAskyCX2IXZJ7hp + R4RpokH33Uhu6IaIyGV2LuP3GZK9YmAOG1CZc6l5u7se8WRN7N1n2HkLLe2u6DM/WjZmdT7HR + uOAbQn7NWoke1DXdnj57eY3h0Y+OJlYvhkdh7pWVUiWRLRqOOnD+ME2CRRRqD6RlKuSilEpeu + qvPT2/eJFvIL4pejhNNrPB2C3RiHhHmyeUbQo+2Na5X/sLn3vwhfDac57ev5NKIeD7FPGPgzr + 4YF/E/rSQhXylqhqwomJMyE77jIsa09OD73gY0UYIW38Z3bfj1MlNpM3Dzq68Uy7ILcunYJgS + JYdohNePZWLE8JBRj3z04HdTs4ogtDQLrJZEoPqWJwyYXpIblHXV3hcEm99M6ZiBCVeJQz2st + narTYNER7iY19YC1Bc/z0ahz5Y/DiKEZI1KwPjmqzwl9DtgiFpahgvJ/htv/UFTl6UZHKBM9g + k/uJbVQbreofaRz730uheNJu0ruz6QvWSAMa21Ge+vl84CGbcDOtC2ydUXhbjpVYa12n5Eg5A + pQS244oqQTS3hWqK8xrFNm4jmBcCDAPGv3xVBW1Jg6pRqybLzta5jN+FfPaMbWh0yVV5VO6qu + tKLGAzCzdsJVRK3ly7+y1msAZ7D0THx91qoghfQ== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 -X-CRM114-CacheID: sfid-20191101_064324_824333_1E1D2142 -X-CRM114-Status: GOOD ( 10.94 ) -X-Spam-Score: -0.9 (/) +X-CRM114-CacheID: sfid-20200107_101615_402374_8C4F49A4 +X-CRM114-Status: GOOD ( 10.05 ) +X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: - Content analysis details: (-0.9 points) + Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- - -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, - low trust [212.227.17.22 listed in list.dnswl.org] - 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (wahrenst[at]gmx.net) + -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, + no trust [212.227.15.18 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record - -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from - author's domain - -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature + 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record + -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from + envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid - -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from - envelope-from domain + -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from + author's domain + -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list @@ -676,44 +669,50 @@ List-Help: List-Subscribe: , -Cc: devicetree@vger.kernel.org, linux-pm@vger.kernel.org, - bcm-kernel-feedback-list@broadcom.com, Stefan Wahren , - Chen-Yu Tsai , linux-arm-kernel@lists.infradead.org +Cc: devicetree@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, + Stefan Wahren , linux-arm-kernel@lists.infradead.org, + linux-pm@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org -This enables thermal for the BCM2711 and the Raspberry Pi 4. +This enables thermal for the BCM2711 (used on Raspberry Pi 4) by adding +the AVS monitor and a subnode for the thermal part. Signed-off-by: Stefan Wahren +Reviewed-by: Nicolas Saenz Julienne +Tested-by: Nicolas Saenz Julienne --- - arch/arm/boot/dts/bcm2711.dtsi | 9 +++++++++ - 1 file changed, 9 insertions(+) + arch/arm/boot/dts/bcm2711.dtsi | 12 ++++++++++++ + 1 file changed, 12 insertions(+) -- 2.7.4 diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi -index ac83dac..950e43f 100644 +index 961bed8..96f341d 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi -@@ -46,6 +46,14 @@ +@@ -66,6 +66,17 @@ IRQ_TYPE_LEVEL_HIGH)>; }; -+ thermal: thermal@7d5d2200 { -+ compatible = "brcm,bcm2711-thermal"; -+ reg = <0x7d5d2200 0x4>; -+ clocks = <&clocks BCM2835_CLOCK_TSENS>; -+ #thermal-sensor-cells = <0>; -+ status = "okay"; ++ avs_monitor: avs-monitor@7d5d2000 { ++ compatible = "brcm,bcm2711-avs-monitor", ++ "syscon", "simple-mfd"; ++ reg = <0x7d5d2000 0xf00>; ++ ++ thermal: thermal { ++ compatible = "brcm,bcm2711-thermal"; ++ #thermal-sensor-cells = <0>; ++ }; + }; + dma: dma@7e007000 { compatible = "brcm,bcm2835-dma"; reg = <0x7e007000 0xb00>; -@@ -317,6 +325,7 @@ +@@ -363,6 +374,7 @@ &cpu_thermal { coefficients = <(-487) 410040>; @@ -722,32 +721,32 @@ index ac83dac..950e43f 100644 &dsi0 { -From patchwork Fri Nov 1 13:42:29 2019 +From patchwork Tue Jan 7 18:15:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren -X-Patchwork-Id: 11223135 +X-Patchwork-Id: 11321575 Return-Path: - + Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) - by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4370814E5 + by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E84E3138D for ; - Fri, 1 Nov 2019 13:43:33 +0000 (UTC) + Tue, 7 Jan 2020 18:16:44 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) - by mail.kernel.org (Postfix) with ESMTPS id 215D921734 + by mail.kernel.org (Postfix) with ESMTPS id C25C220848 for ; - Fri, 1 Nov 2019 13:43:33 +0000 (UTC) + Tue, 7 Jan 2020 18:16:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org - header.i=@lists.infradead.org header.b="LTwM1baN"; + header.i=@lists.infradead.org header.b="EHM8n8KN"; dkim=fail reason="signature verification failed" (1024-bit key) - header.d=gmx.net header.i=@gmx.net header.b="X9MZO549" -DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 215D921734 + header.d=gmx.net header.i=@gmx.net header.b="Idmw230V" +DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C25C220848 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=gmx.net Authentication-Results: mail.kernel.org; @@ -760,91 +759,91 @@ DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; In-Reply-To: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:List-Owner; - bh=/b5jrH3i3GiJVupvOuNS9I/+ADNELhI/Q/omvvlDyAg=; b=LTwM1baNGt/7a9nZKTacydJfK6 - s0zyIwjJW9NxWoogDuLqBtWwaeMvwrnaa70eJ1To780FW18U+LXdiA5/+8ko/6W3Psl8wzSShNDhy - 2VyMw5/Jo5GK/DQu5ES8bUCx2HkHta7ZWbVyaFYZH/1a6jZ/ezCCw7va9w6wBiN6F345roWgWHzsT - Sh4DmmVyIBDu54rF6JNl6dggjHoKz2xzVvZTBDISoLOdlAav37tWEl+eYlkXtk+Mrsdjl8vGhHHRj - u2cB0WIJUNV/bXxbz72dLGw2agaXe/038QZojHUQLdyJiajlPOvi3hLC2CxW/bNnEfCxKOiukRB5d - 4TK4jqeg==; + bh=FI3zHZWFfRXQ5XfvKcNW0c7MrnTDIP/1CsQtLlw0qhk=; b=EHM8n8KNF/sE/U53eeci7J27D/ + L6VFKJctUZqFEOfeRIf3CEPuX3Pk7huocVD4K/yvqJnuSIC9Sje4gjYORUjtz0xEW8CKjxjf5sbo4 + iYEtnBsDYtEQWwTsMvpNbOtR9yZQiY7fMcQK8nhC4R5A9vtv43ytxgkV84YVL5SLBHhGZjzUmuRb9 + FKBtltjzocTcD8mbcVN6Lvjcu/a4J5A+/LHRH7nzuQ7ChaJ9Mw/y7zJHcaBuEOhba/3Dzd9+03jLD + oOExZgjTpNtAXsLye/WHt/BTHen3PFAjAAMLvLPE6fEStapg1ZuOa2ueopvmsCSgQ7KMmBHUkX5NX + 8kfsNepQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) - id 1iQXD4-0004kH-GJ; Fri, 01 Nov 2019 13:43:26 +0000 -Received: from mout.gmx.net ([212.227.17.21]) + id 1iotPH-0004Mo-B2; Tue, 07 Jan 2020 18:16:43 +0000 +Received: from mout.gmx.net ([212.227.15.19]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) - id 1iQXD0-0004iT-QV - for linux-arm-kernel@lists.infradead.org; Fri, 01 Nov 2019 13:43:24 +0000 + id 1iotOo-0003u5-Ni + for linux-arm-kernel@lists.infradead.org; Tue, 07 Jan 2020 18:16:16 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; - s=badeba3b8450; t=1572615792; - bh=fOvzyTqdzRPJH9OPOKinIdqeCZlBTTjHLrFlxGo7twE=; + s=badeba3b8450; t=1578420966; + bh=ywvSvkZtxIFgQK2uzodzJ55BZghcFbFAXSLbAwo36wY=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; - b=X9MZO549TJZ3vLpsTN53oZPmrRiVr6QEhE+a8tJ0Vozj/4p8GngNCsMNBWi/HHAQF - d0u4qpBcTg6lLFDQuuzcz3tdFsHTD1R8t2vxGKcKvBRsDYlZ+m7v6+yHlqt8F60ZMk - SdZduKccraRWC8etr/ne1T5gzHczUiJDg70n+HXM= + b=Idmw230VWPBhZW2v+dAYw62P6JElxPEL/uqCuoHO0gDvDK3VOnfVdcv9d1ALNkZ2+ + Y+8kPpr9BiXxUfm8bw+Xmjv/SzBxlFpg2EK/a8Hg1b+OzEQC+AII1OlGsc5FjmhCdA + PYd0h0yBiUAl3qCFDZaEL6GR5SqLeAQ2sKdGgVLY= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c -Received: from localhost.localdomain ([37.4.249.112]) by mail.gmx.com - (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id - 1MtfNf-1i6fdQ4C7D-00v7fj; Fri, 01 Nov 2019 14:43:12 +0100 +Received: from localhost.localdomain ([37.4.249.154]) by mail.gmx.com + (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id + 1M1HZo-1irdDo1LiM-002s6V; Tue, 07 Jan 2020 19:16:06 +0100 From: Stefan Wahren -To: Zhang Rui , Eduardo Valentin , +To: Zhang Rui , Daniel Lezcano , Amit Kucheria , Rob Herring , Mark Rutland , - Eric Anholt , Florian Fainelli , - Catalin Marinas , Will Deacon , - Markus Mayer -Subject: [PATCH 4/4] ARM: configs: Build BCM2711 thermal as module -Date: Fri, 1 Nov 2019 14:42:29 +0100 -Message-Id: <1572615749-9524-5-git-send-email-wahrenst@gmx.net> + Nicolas Saenz Julienne , + Florian Fainelli , + Catalin Marinas , Will Deacon +Subject: [PATCH V3 4/4] ARM: configs: Build BCM2711 thermal as module +Date: Tue, 7 Jan 2020 19:15:57 +0100 +Message-Id: <1578420957-32229-5-git-send-email-wahrenst@gmx.net> X-Mailer: git-send-email 2.7.4 -In-Reply-To: <1572615749-9524-1-git-send-email-wahrenst@gmx.net> -References: <1572615749-9524-1-git-send-email-wahrenst@gmx.net> -X-Provags-ID: V03:K1:TbKDFSyoLz5kGUMLh2sdMchsMi8B7ywabIQ029/PvKMAKErCJPq - LaV4eY+9A6wMG6XJAq+AzVhHdeDbWKCIQ2SdpxaHQVJDnPz05KWwr/zYmz4qRItRUAmMueQ - 52bZwE1KDdhZw19Aa3Vn6hRMebJFvpX727zxqEUbD6e5Il680xV+/xuwUvFKrOLUtnTXGr9 - eM4jtb+KLzwTZf5GlyVCA== +In-Reply-To: <1578420957-32229-1-git-send-email-wahrenst@gmx.net> +References: <1578420957-32229-1-git-send-email-wahrenst@gmx.net> +X-Provags-ID: V03:K1:KgT8/xCsDfTXBG/ZvIRxjN+W6EAwuQgL8jv7F25Vy4z+LXj8G1P + FvRXVhgSwOlulZ964d6rnvX7HL7dcwoY5KFt4EhM20cYoQ7YJ90EDHTamYirCxIqbox1UqU + ONycfR3lNn3uKEv5yBZAPy3RJBy/loio9XdwmoBs6tYkYaaVTtIztndrmforVufG7I03eQv + W3OI55XFGJevmqp5FLjsQ== X-Spam-Flag: NO -X-UI-Out-Filterresults: notjunk:1;V03:K0:MkaZ/3lmt58=:nz5UCjGMivPj91VNzCwyFe - 6eTbZupEK6tkHD/UlTaZguPibR6Acl9YFic3AY75LQk2NoG51Ex7boMYU+seMx6ZfqRW6CoKr - 82zvdUtskysVkSwIFg01uXDzcuS75oaF7e2SOArQNIU6sMCgbB1T7UI3M21LqHQw/XikjB5bg - Q7FLOawvCLmPPc0vGqhtvxOtC/HWrmfORZqcmpVNyU94muqiEX7XutEIIq8LlxBSXUs2Ith+5 - q5YzU1OWw7G/gzg/iSw4hlhWoLvkmkjNAXbTf7GuB8u3EaPtjKTaQWacZ0FoqMVJpQuCy83bR - tHeOzjRMGwYaGjJ/7NlW6yLsxr+GPypkXEivylBTPBJDKdl9Sl+mDIDYjvt0cG2yBqFJqG44s - 2CbRHr6clzj7fYcOSZgS7AlymGiKuFKVNlFYteTaksqTMoZ+ikGoBared5E/tGt06dxRzHmcG - J6yAg53kzjL7gwq5087VkC95YdYT1ukWME6yqugRfaOOtZUANg6uIeWGq57ufCRCciYjncoF5 - HR3Ah4IBy/h5HZSx55vtBkX5m6kKrJAzUgcE/UOmMNQZ6qwXZETpwB1G3ghmauLKVsLsMz+OS - vigD293HSdqK0UJ/QpbAUoVlKTETu616J4lWurFMBaUcrRED3YQCniCMIsPI61yvICXrHP188 - 2LnqqwvqvJ+mTxARSP3h7/YAPes5o13PDlG+gUA+2U6AgQfBhoxALznXemfcWAuRxcD0YHMoB - Z/4cce5K/gaKIBXapRxP41P10j9ZX3TmUhrs93PMlDGGFv60tBJpb3TCnL3/Kfo+0fjnboGkJ - o9NQ3J6gVe2/05QpLi3BQEvuhyQbE8KHXTrJnKqH7OG8XnePT8LbHza1HkX1ZRRA5XsMo9BiF - S2eeWhpw35peMp9UiyI7N5jFDyeBOgYtqoO3+uv64HPL9I8qKqTlLlsk3ReNsQGP85331SXAZ - 87IojnVd41AxiBEGU5Qjz4rGCqnJqbQo8S9ox50/0VDxDl2TwF5kaNERTIcL5kRod62nvTSSm - nP0j/C3mLORpdWUnWkE53uyjSXcpFP7q5gKDPBn3GlIu7409OCcBi4mqPWwGuGqejVGegoR/0 - /aUTIpuslWS/e0MRk2Ilba/FqKbra8O6GpLnyw3V1LaNy54d5X04ge+lWrFGRCt//R9QOCnWt - fBwFYpy2gNB+0M41/3elbVdwJ6u6roVi12SysrxoTFP+P4PFWPZSGN2ZVaGAJq2k3Pl6eeMQr - G4ozsyV4gPkFnB+7uOCXTVn7bktCAG7C+pHQRlA== +X-UI-Out-Filterresults: notjunk:1;V03:K0:XO0bOe0Ep8o=:kSgMi1gYunuPgzCu/XiJe8 + 55cXkb2VEpp+0ZB7lgktyFvshluW/8SnuuoMm0yhsBOUju5moUy3EZx62VduAycSWKQ78+NnI + nuuYaeMimJEZFIkXd/bIo8qA7TQgY5Ai7wFwAtnufeOK6yhqeXld+O6drS9SE7OUPwiRaFLvX + a4z3zZIJ/WSdgxfIjZJl+1A8tbqJu7QHtc7BvlrnNqu0L7T9RP/4wKZFs+iqJxgb56ONYX6aW + eJEAdrGioHnjoWK1N2opYc6mYPThXU7WIGI67W1LEp4sdfzemZwQzCuEX4itQkAnL2DeCQ5Ga + TB3twKe/JfrKyCgWbB1LzE4zIekmdDkNCLP1O1ry0t5+zdTGCZqjgF0aW1XQwp7nUNAKqvnkR + oGFH00fcZrTjP7GTsAHM1SFbj/j8S4XbS2KGdNqEc+X3ozKoe941uA4inBhtY+DCHFbDc82RB + saG1XiaXGsPKwjXuAqFoy+XoGrMHnHWh5g9mP7Zd8K8eY9UW2y2qLVLlIfRct6viL+vCIg5bq + bBOs7WNQuQK66Q8JwSFVNkWe5cjQ4sjCurxBOCJu6414eyACNqp75abbUH3UXbZ1ZWeQB05gV + pAQjr6XZtxFBUpzRIscP1mp92bxLC60clMvMwMY7L3J2tmJzvf+8KaEZ46/AXpMn/5UHILhV8 + RHgsmsQOZtPYbgegdxdoBc4kR22+31P9QayG4NNZpKN6TEFlqDfoNUbNez4dIJleG22IlSiAm + HnfbzPvVXjeK2JiZBcfGTDhAuoGbB8Fj+2eQ26gxDe6zKM6e+8/ggitNae4Dbbw0frlGYT/H6 + Wawodx5tZYYdi+XZ6h7xR7gVz+qUtDxU3/g+269QUGswvjIS+a6z7lzkEuyK7V6ieV8u7Eh4X + sN1khUObrdWcgax2sqRsD0RD05hMRw3yVlf9xuWpUo/SWo+mVR/rXK6YkXDiRCL5kmMzaJ/ZF + b4PktMNM1fUynsV780QqPYKWWfAdvMlDCWnofVBqBUPHArgmZeAkiFzfCcecwEBz+jAxwUZmE + ANzUWQENqeKB/qYYpxtBwoBTpfvKT9aAuk83/Xxf8kHjFo2JE0BLWXqe+/i6FQUtXR4VmNd2G + UVWlOQJHCJCaXerv7dUwcdFH2tluzwimauf3xv9Suhg06gzqG2AzZefj6DSqfSFAESG+a1r9m + u1k2ZLky+lFSekVHbbxsc5W/2rXnl7YvbHVJ1NqvR0HhNJjn7ISBZGvzeJz7kFQCKjXZiQA76 + XprBZmCVmQkyOoIyjE6h4g5xdzecqsXUyniZ7MA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 -X-CRM114-CacheID: sfid-20191101_064323_190072_5D749E54 -X-CRM114-Status: GOOD ( 10.86 ) -X-Spam-Score: -0.9 (/) +X-CRM114-CacheID: sfid-20200107_101615_064044_029A3653 +X-CRM114-Status: GOOD ( 10.12 ) +X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: - Content analysis details: (-0.9 points) + Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- - -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, - low trust [212.227.17.21 listed in list.dnswl.org] - 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (wahrenst[at]gmx.net) -0.0 SPF_PASS SPF: sender matches SPF record - -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from - author's domain - -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature + 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record + -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, + no trust [212.227.15.19 listed in list.dnswl.org] + -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from + envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid - -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from - envelope-from domain + -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from + author's domain + -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list @@ -858,9 +857,9 @@ List-Help: List-Subscribe: , -Cc: devicetree@vger.kernel.org, linux-pm@vger.kernel.org, - bcm-kernel-feedback-list@broadcom.com, Stefan Wahren , - Chen-Yu Tsai , linux-arm-kernel@lists.infradead.org +Cc: devicetree@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, + Stefan Wahren , linux-arm-kernel@lists.infradead.org, + linux-pm@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: @@ -869,6 +868,9 @@ Errors-To: This builds the BCM2711 thermal driver as module for the Raspberry Pi 4. Signed-off-by: Stefan Wahren +Reviewed-by: Florian Fainelli +Reviewed-by: Nicolas Saenz Julienne +Tested-by: Nicolas Saenz Julienne --- arch/arm/configs/multi_v7_defconfig | 1 + arch/arm64/configs/defconfig | 1 + @@ -878,10 +880,10 @@ Signed-off-by: Stefan Wahren 2.7.4 diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig -index 13ba532..441b795 100644 +index 3f1b96d..f5d19cc 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig -@@ -487,6 +487,7 @@ CONFIG_IMX_THERMAL=y +@@ -496,6 +496,7 @@ CONFIG_IMX_THERMAL=y CONFIG_ROCKCHIP_THERMAL=y CONFIG_RCAR_THERMAL=y CONFIG_ARMADA_THERMAL=y @@ -890,10 +892,10 @@ index 13ba532..441b795 100644 CONFIG_BRCMSTB_THERMAL=m CONFIG_ST_THERMAL_MEMMAP=y diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig -index 8e05c39..0a52987 100644 +index 6a83ba2..b2f6673 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig -@@ -444,6 +444,7 @@ CONFIG_ROCKCHIP_THERMAL=m +@@ -442,6 +442,7 @@ CONFIG_ROCKCHIP_THERMAL=m CONFIG_RCAR_THERMAL=y CONFIG_RCAR_GEN3_THERMAL=y CONFIG_ARMADA_THERMAL=y From 131070b110d157fb9a8ff3cffee22be0fbe77768 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 8 Jan 2020 05:45:46 +0000 Subject: [PATCH 03/11] enable CRYPTO_DEV_ATMEL_ECC driver, it's used in a number of devices across a few architectures --- configs/fedora/generic/CONFIG_CRYPTO_DEV_ATMEL_ECC | 2 +- kernel-aarch64-debug-fedora.config | 2 +- kernel-aarch64-fedora.config | 2 +- kernel-armv7hl-debug-fedora.config | 2 +- kernel-armv7hl-fedora.config | 2 +- kernel-armv7hl-lpae-debug-fedora.config | 2 +- kernel-armv7hl-lpae-fedora.config | 2 +- kernel-i686-debug-fedora.config | 2 +- kernel-i686-fedora.config | 2 +- kernel-ppc64le-debug-fedora.config | 2 +- kernel-ppc64le-fedora.config | 2 +- kernel-s390x-debug-fedora.config | 2 +- kernel-s390x-fedora.config | 2 +- kernel-x86_64-debug-fedora.config | 2 +- kernel-x86_64-fedora.config | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/configs/fedora/generic/CONFIG_CRYPTO_DEV_ATMEL_ECC b/configs/fedora/generic/CONFIG_CRYPTO_DEV_ATMEL_ECC index cc0194c3c..aa846488a 100644 --- a/configs/fedora/generic/CONFIG_CRYPTO_DEV_ATMEL_ECC +++ b/configs/fedora/generic/CONFIG_CRYPTO_DEV_ATMEL_ECC @@ -1 +1 @@ -# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set +CONFIG_CRYPTO_DEV_ATMEL_ECC=m diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 295fa689b..bf9a0d55e 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -1154,7 +1154,7 @@ CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_DEV_ALLWINNER=y # CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG is not set CONFIG_CRYPTO_DEV_AMLOGIC_GXL=y -# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set +CONFIG_CRYPTO_DEV_ATMEL_ECC=m # CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set CONFIG_CRYPTO_DEV_CAVIUM_ZIP=m CONFIG_CRYPTO_DEV_CCP_CRYPTO=m diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index b0b11eaa8..74e908e98 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -1154,7 +1154,7 @@ CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_DEV_ALLWINNER=y # CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG is not set CONFIG_CRYPTO_DEV_AMLOGIC_GXL=y -# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set +CONFIG_CRYPTO_DEV_ATMEL_ECC=m # CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set CONFIG_CRYPTO_DEV_CAVIUM_ZIP=m CONFIG_CRYPTO_DEV_CCP_CRYPTO=m diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 2d665bad1..58c1a8307 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -1141,7 +1141,7 @@ CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_DEV_ALLWINNER=y # CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG is not set CONFIG_CRYPTO_DEV_AMLOGIC_GXL=y -# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set +CONFIG_CRYPTO_DEV_ATMEL_ECC=m # CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set # CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set CONFIG_CRYPTO_DEV_CCREE=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index da2420ab5..bd9e28bbf 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -1141,7 +1141,7 @@ CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_DEV_ALLWINNER=y # CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG is not set CONFIG_CRYPTO_DEV_AMLOGIC_GXL=y -# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set +CONFIG_CRYPTO_DEV_ATMEL_ECC=m # CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set # CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set CONFIG_CRYPTO_DEV_CCREE=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 6e50a3bc4..149f26ea6 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -1112,7 +1112,7 @@ CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_DEV_ALLWINNER=y # CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG is not set CONFIG_CRYPTO_DEV_AMLOGIC_GXL=y -# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set +CONFIG_CRYPTO_DEV_ATMEL_ECC=m # CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set # CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set CONFIG_CRYPTO_DEV_CCREE=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index b74888936..cc4ba4664 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -1112,7 +1112,7 @@ CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_DEV_ALLWINNER=y # CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG is not set CONFIG_CRYPTO_DEV_AMLOGIC_GXL=y -# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set +CONFIG_CRYPTO_DEV_ATMEL_ECC=m # CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set # CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set CONFIG_CRYPTO_DEV_CCREE=m diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index bfc34e075..397274244 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -929,7 +929,7 @@ CONFIG_CRYPTO_CURVE25519=m CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_DES=m # CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set -# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set +CONFIG_CRYPTO_DEV_ATMEL_ECC=m # CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set CONFIG_CRYPTO_DEV_CCP_CRYPTO=m CONFIG_CRYPTO_DEV_CCP_DD=m diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 203183ff0..ce340607f 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -928,7 +928,7 @@ CONFIG_CRYPTO_CURVE25519=m CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_DES=m # CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set -# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set +CONFIG_CRYPTO_DEV_ATMEL_ECC=m # CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set CONFIG_CRYPTO_DEV_CCP_CRYPTO=m CONFIG_CRYPTO_DEV_CCP_DD=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index beff88b06..aa137d2e6 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -862,7 +862,7 @@ CONFIG_CRYPTO_CURVE25519=m CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_DES=m # CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set -# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set +CONFIG_CRYPTO_DEV_ATMEL_ECC=m # CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set # CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set # CONFIG_CRYPTO_DEV_CCREE is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 4c5afe68a..d98f09ea4 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -861,7 +861,7 @@ CONFIG_CRYPTO_CURVE25519=m CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_DES=m # CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set -# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set +CONFIG_CRYPTO_DEV_ATMEL_ECC=m # CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set # CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set # CONFIG_CRYPTO_DEV_CCREE is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 1dba5c354..adfce9782 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -870,7 +870,7 @@ CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_DES_S390=m # CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set -# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set +CONFIG_CRYPTO_DEV_ATMEL_ECC=m # CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set # CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set # CONFIG_CRYPTO_DEV_CCREE is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index a4f28e711..f12457f57 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -869,7 +869,7 @@ CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_DES_S390=m # CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set -# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set +CONFIG_CRYPTO_DEV_ATMEL_ECC=m # CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set # CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set # CONFIG_CRYPTO_DEV_CCREE is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index aa0b8b9ad..40b2c22b9 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -957,7 +957,7 @@ CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_DES3_EDE_X86_64=m CONFIG_CRYPTO_DES=m # CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set -# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set +CONFIG_CRYPTO_DEV_ATMEL_ECC=m # CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set CONFIG_CRYPTO_DEV_CCP_CRYPTO=m CONFIG_CRYPTO_DEV_CCP_DD=m diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 6f410b9fc..20b7c51ed 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -956,7 +956,7 @@ CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_DES3_EDE_X86_64=m CONFIG_CRYPTO_DES=m # CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set -# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set +CONFIG_CRYPTO_DEV_ATMEL_ECC=m # CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set CONFIG_CRYPTO_DEV_CCP_CRYPTO=m CONFIG_CRYPTO_DEV_CCP_DD=m From f4c04a343a2f8811f26fd83a3b0253ef94a44ac8 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 8 Jan 2020 05:53:59 +0000 Subject: [PATCH 04/11] enable CRYPTO_DEV_ATMEL_SHA204A driver, it's used in a number of devices across a few architectures --- configs/fedora/generic/CONFIG_CRYPTO_DEV_ATMEL_SHA204A | 2 +- kernel-aarch64-debug-fedora.config | 2 +- kernel-aarch64-fedora.config | 2 +- kernel-armv7hl-debug-fedora.config | 2 +- kernel-armv7hl-fedora.config | 2 +- kernel-armv7hl-lpae-debug-fedora.config | 2 +- kernel-armv7hl-lpae-fedora.config | 2 +- kernel-i686-debug-fedora.config | 2 +- kernel-i686-fedora.config | 2 +- kernel-ppc64le-debug-fedora.config | 2 +- kernel-ppc64le-fedora.config | 2 +- kernel-s390x-debug-fedora.config | 2 +- kernel-s390x-fedora.config | 2 +- kernel-x86_64-debug-fedora.config | 2 +- kernel-x86_64-fedora.config | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/configs/fedora/generic/CONFIG_CRYPTO_DEV_ATMEL_SHA204A b/configs/fedora/generic/CONFIG_CRYPTO_DEV_ATMEL_SHA204A index c2d37b3da..520db3b0d 100644 --- a/configs/fedora/generic/CONFIG_CRYPTO_DEV_ATMEL_SHA204A +++ b/configs/fedora/generic/CONFIG_CRYPTO_DEV_ATMEL_SHA204A @@ -1 +1 @@ -# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set +CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index bf9a0d55e..abaa7be5b 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -1155,7 +1155,7 @@ CONFIG_CRYPTO_DEV_ALLWINNER=y # CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG is not set CONFIG_CRYPTO_DEV_AMLOGIC_GXL=y CONFIG_CRYPTO_DEV_ATMEL_ECC=m -# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set +CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m CONFIG_CRYPTO_DEV_CAVIUM_ZIP=m CONFIG_CRYPTO_DEV_CCP_CRYPTO=m CONFIG_CRYPTO_DEV_CCP_DD=m diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 74e908e98..cca6b1044 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -1155,7 +1155,7 @@ CONFIG_CRYPTO_DEV_ALLWINNER=y # CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG is not set CONFIG_CRYPTO_DEV_AMLOGIC_GXL=y CONFIG_CRYPTO_DEV_ATMEL_ECC=m -# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set +CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m CONFIG_CRYPTO_DEV_CAVIUM_ZIP=m CONFIG_CRYPTO_DEV_CCP_CRYPTO=m CONFIG_CRYPTO_DEV_CCP_DD=m diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 58c1a8307..6e1533d41 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -1142,7 +1142,7 @@ CONFIG_CRYPTO_DEV_ALLWINNER=y # CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG is not set CONFIG_CRYPTO_DEV_AMLOGIC_GXL=y CONFIG_CRYPTO_DEV_ATMEL_ECC=m -# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set +CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m # CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set CONFIG_CRYPTO_DEV_CCREE=m CONFIG_CRYPTO_DEV_CHELSIO=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index bd9e28bbf..a125864d4 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -1142,7 +1142,7 @@ CONFIG_CRYPTO_DEV_ALLWINNER=y # CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG is not set CONFIG_CRYPTO_DEV_AMLOGIC_GXL=y CONFIG_CRYPTO_DEV_ATMEL_ECC=m -# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set +CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m # CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set CONFIG_CRYPTO_DEV_CCREE=m CONFIG_CRYPTO_DEV_CHELSIO=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 149f26ea6..1b1aa2a5d 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -1113,7 +1113,7 @@ CONFIG_CRYPTO_DEV_ALLWINNER=y # CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG is not set CONFIG_CRYPTO_DEV_AMLOGIC_GXL=y CONFIG_CRYPTO_DEV_ATMEL_ECC=m -# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set +CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m # CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set CONFIG_CRYPTO_DEV_CCREE=m CONFIG_CRYPTO_DEV_CHELSIO=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index cc4ba4664..c89cc0c23 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -1113,7 +1113,7 @@ CONFIG_CRYPTO_DEV_ALLWINNER=y # CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG is not set CONFIG_CRYPTO_DEV_AMLOGIC_GXL=y CONFIG_CRYPTO_DEV_ATMEL_ECC=m -# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set +CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m # CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set CONFIG_CRYPTO_DEV_CCREE=m CONFIG_CRYPTO_DEV_CHELSIO=m diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index 397274244..4cadd5b3c 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -930,7 +930,7 @@ CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_DES=m # CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set CONFIG_CRYPTO_DEV_ATMEL_ECC=m -# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set +CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m CONFIG_CRYPTO_DEV_CCP_CRYPTO=m CONFIG_CRYPTO_DEV_CCP_DD=m # CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index ce340607f..dcd44528b 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -929,7 +929,7 @@ CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_DES=m # CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set CONFIG_CRYPTO_DEV_ATMEL_ECC=m -# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set +CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m CONFIG_CRYPTO_DEV_CCP_CRYPTO=m CONFIG_CRYPTO_DEV_CCP_DD=m # CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index aa137d2e6..01a13d8c4 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -863,7 +863,7 @@ CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_DES=m # CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set CONFIG_CRYPTO_DEV_ATMEL_ECC=m -# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set +CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m # CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set # CONFIG_CRYPTO_DEV_CCREE is not set CONFIG_CRYPTO_DEV_CHELSIO=m diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index d98f09ea4..92f68e4c6 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -862,7 +862,7 @@ CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_DES=m # CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set CONFIG_CRYPTO_DEV_ATMEL_ECC=m -# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set +CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m # CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set # CONFIG_CRYPTO_DEV_CCREE is not set CONFIG_CRYPTO_DEV_CHELSIO=m diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index adfce9782..0cf5397dc 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -871,7 +871,7 @@ CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_DES_S390=m # CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set CONFIG_CRYPTO_DEV_ATMEL_ECC=m -# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set +CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m # CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set # CONFIG_CRYPTO_DEV_CCREE is not set CONFIG_CRYPTO_DEV_CHELSIO=m diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index f12457f57..b5da410cb 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -870,7 +870,7 @@ CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_DES_S390=m # CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set CONFIG_CRYPTO_DEV_ATMEL_ECC=m -# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set +CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m # CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set # CONFIG_CRYPTO_DEV_CCREE is not set CONFIG_CRYPTO_DEV_CHELSIO=m diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 40b2c22b9..38bafb00d 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -958,7 +958,7 @@ CONFIG_CRYPTO_DES3_EDE_X86_64=m CONFIG_CRYPTO_DES=m # CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set CONFIG_CRYPTO_DEV_ATMEL_ECC=m -# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set +CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m CONFIG_CRYPTO_DEV_CCP_CRYPTO=m CONFIG_CRYPTO_DEV_CCP_DD=m # CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 20b7c51ed..b5a79015f 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -957,7 +957,7 @@ CONFIG_CRYPTO_DES3_EDE_X86_64=m CONFIG_CRYPTO_DES=m # CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set CONFIG_CRYPTO_DEV_ATMEL_ECC=m -# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set +CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m CONFIG_CRYPTO_DEV_CCP_CRYPTO=m CONFIG_CRYPTO_DEV_CCP_DD=m # CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set From 7b24f02e10c73c3517836f3596ff68fce4c88cae Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 8 Jan 2020 16:33:55 -0600 Subject: [PATCH 05/11] Linux v5.5-rc5-41-gb07f636fca1c --- gitrev | 2 +- kernel.spec | 8 ++++++-- sources | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gitrev b/gitrev index a52e6238c..8c65ace7f 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -c79f46a282390e0f5b306007bf7b11a46d529538 +b07f636fca1c8fbba124b0082487c0b3890a0e0c diff --git a/kernel.spec b/kernel.spec index dccffbe8f..f8efa23b7 100644 --- a/kernel.spec +++ b/kernel.spec @@ -104,7 +104,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 5 # The git snapshot level -%define gitrev 0 +%define gitrev 1 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -197,7 +197,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 %if 0%{?fedora} # Kernel headers are being split out into a separate package @@ -2889,6 +2889,10 @@ fi # # %changelog +* Wed Jan 08 2020 Justin M. Forbes - 5.5.0-0.rc5.git1.1 +- Linux v5.5-rc5-41-gb07f636fca1c +- Reenable debugging options. + * Mon Jan 06 2020 Hans de Goede - Make the MFD Intel LPSS driver builtin, some devices require this to be available early during boot (rhbz#1787997) diff --git a/sources b/sources index f74f4ee63..2f94522b3 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (linux-5.4.tar.xz) = 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f SHA512 (patch-5.5-rc5.xz) = 846bc529a7f05a130fd2f02e429f8f8818cb47a9b9074060203e1f2b533e31a6d4edc42163b27091a26774449a51823c3f44c2d50b55abef5c059b5382be86a7 +SHA512 (patch-5.5-rc5-git1.xz) = 8ddc78672146a7ea68334bd5c9dd494362aefe017955ef2ec9fa7c921450382f0d0f00f0761adc38f979d8fab288fb224bf65bc636d4529fe12d957295adb721 From 490fa4af43c5df980cfd0029aec8e028b10529cd Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Thu, 9 Jan 2020 11:15:35 -0600 Subject: [PATCH 06/11] Enable EROFS as it has been promoted from staging --- configs/fedora/generic/CONFIG_EROFS_FS | 2 +- configs/fedora/generic/CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT | 1 + configs/fedora/generic/CONFIG_EROFS_FS_DEBUG | 1 + configs/fedora/generic/CONFIG_EROFS_FS_POSIX_ACL | 1 + configs/fedora/generic/CONFIG_EROFS_FS_SECURITY | 1 + configs/fedora/generic/CONFIG_EROFS_FS_XATTR | 1 + configs/fedora/generic/CONFIG_EROFS_FS_ZIP | 1 + kernel-aarch64-debug-fedora.config | 8 +++++++- kernel-aarch64-fedora.config | 8 +++++++- kernel-armv7hl-debug-fedora.config | 8 +++++++- kernel-armv7hl-fedora.config | 8 +++++++- kernel-armv7hl-lpae-debug-fedora.config | 8 +++++++- kernel-armv7hl-lpae-fedora.config | 8 +++++++- kernel-i686-debug-fedora.config | 8 +++++++- kernel-i686-fedora.config | 8 +++++++- kernel-ppc64le-debug-fedora.config | 8 +++++++- kernel-ppc64le-fedora.config | 8 +++++++- kernel-s390x-debug-fedora.config | 8 +++++++- kernel-s390x-fedora.config | 8 +++++++- kernel-x86_64-debug-fedora.config | 8 +++++++- kernel-x86_64-fedora.config | 8 +++++++- 21 files changed, 105 insertions(+), 15 deletions(-) create mode 100644 configs/fedora/generic/CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT create mode 100644 configs/fedora/generic/CONFIG_EROFS_FS_DEBUG create mode 100644 configs/fedora/generic/CONFIG_EROFS_FS_POSIX_ACL create mode 100644 configs/fedora/generic/CONFIG_EROFS_FS_SECURITY create mode 100644 configs/fedora/generic/CONFIG_EROFS_FS_XATTR create mode 100644 configs/fedora/generic/CONFIG_EROFS_FS_ZIP diff --git a/configs/fedora/generic/CONFIG_EROFS_FS b/configs/fedora/generic/CONFIG_EROFS_FS index 4bdace556..0394e57c2 100644 --- a/configs/fedora/generic/CONFIG_EROFS_FS +++ b/configs/fedora/generic/CONFIG_EROFS_FS @@ -1 +1 @@ -# CONFIG_EROFS_FS is not set +CONFIG_EROFS_FS=m diff --git a/configs/fedora/generic/CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT b/configs/fedora/generic/CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT new file mode 100644 index 000000000..585602e4a --- /dev/null +++ b/configs/fedora/generic/CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT @@ -0,0 +1 @@ +CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1 diff --git a/configs/fedora/generic/CONFIG_EROFS_FS_DEBUG b/configs/fedora/generic/CONFIG_EROFS_FS_DEBUG new file mode 100644 index 000000000..5363c0f0a --- /dev/null +++ b/configs/fedora/generic/CONFIG_EROFS_FS_DEBUG @@ -0,0 +1 @@ +# CONFIG_EROFS_FS_DEBUG is not set diff --git a/configs/fedora/generic/CONFIG_EROFS_FS_POSIX_ACL b/configs/fedora/generic/CONFIG_EROFS_FS_POSIX_ACL new file mode 100644 index 000000000..fe4f9a826 --- /dev/null +++ b/configs/fedora/generic/CONFIG_EROFS_FS_POSIX_ACL @@ -0,0 +1 @@ +CONFIG_EROFS_FS_POSIX_ACL=y diff --git a/configs/fedora/generic/CONFIG_EROFS_FS_SECURITY b/configs/fedora/generic/CONFIG_EROFS_FS_SECURITY new file mode 100644 index 000000000..f24b07262 --- /dev/null +++ b/configs/fedora/generic/CONFIG_EROFS_FS_SECURITY @@ -0,0 +1 @@ +CONFIG_EROFS_FS_SECURITY=y diff --git a/configs/fedora/generic/CONFIG_EROFS_FS_XATTR b/configs/fedora/generic/CONFIG_EROFS_FS_XATTR new file mode 100644 index 000000000..751034acd --- /dev/null +++ b/configs/fedora/generic/CONFIG_EROFS_FS_XATTR @@ -0,0 +1 @@ +CONFIG_EROFS_FS_XATTR=y diff --git a/configs/fedora/generic/CONFIG_EROFS_FS_ZIP b/configs/fedora/generic/CONFIG_EROFS_FS_ZIP new file mode 100644 index 000000000..fe558502b --- /dev/null +++ b/configs/fedora/generic/CONFIG_EROFS_FS_ZIP @@ -0,0 +1 @@ +CONFIG_EROFS_FS_ZIP=y diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index abaa7be5b..2400460c1 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -1779,7 +1779,13 @@ CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m CONFIG_EPOLL=y CONFIG_EQUALIZER=m -# CONFIG_EROFS_FS is not set +CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1 +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS=m +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +CONFIG_EROFS_FS_XATTR=y +CONFIG_EROFS_FS_ZIP=y CONFIG_ET131X=m CONFIG_ETHERNET=y CONFIG_ETHOC=m diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index cca6b1044..354c2978a 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -1771,7 +1771,13 @@ CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m CONFIG_EPOLL=y CONFIG_EQUALIZER=m -# CONFIG_EROFS_FS is not set +CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1 +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS=m +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +CONFIG_EROFS_FS_XATTR=y +CONFIG_EROFS_FS_ZIP=y CONFIG_ET131X=m CONFIG_ETHERNET=y CONFIG_ETHOC=m diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 6e1533d41..ff057c577 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -1805,7 +1805,13 @@ CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m CONFIG_EPOLL=y CONFIG_EQUALIZER=m -# CONFIG_EROFS_FS is not set +CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1 +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS=m +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +CONFIG_EROFS_FS_XATTR=y +CONFIG_EROFS_FS_ZIP=y CONFIG_ET131X=m CONFIG_ETHERNET=y CONFIG_ETHOC=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index a125864d4..33c099088 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -1798,7 +1798,13 @@ CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m CONFIG_EPOLL=y CONFIG_EQUALIZER=m -# CONFIG_EROFS_FS is not set +CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1 +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS=m +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +CONFIG_EROFS_FS_XATTR=y +CONFIG_EROFS_FS_ZIP=y CONFIG_ET131X=m CONFIG_ETHERNET=y CONFIG_ETHOC=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 1b1aa2a5d..f9d290319 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -1757,7 +1757,13 @@ CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m CONFIG_EPOLL=y CONFIG_EQUALIZER=m -# CONFIG_EROFS_FS is not set +CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1 +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS=m +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +CONFIG_EROFS_FS_XATTR=y +CONFIG_EROFS_FS_ZIP=y CONFIG_ET131X=m CONFIG_ETHERNET=y CONFIG_ETHOC=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index c89cc0c23..c2df2bb7f 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -1750,7 +1750,13 @@ CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m CONFIG_EPOLL=y CONFIG_EQUALIZER=m -# CONFIG_EROFS_FS is not set +CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1 +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS=m +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +CONFIG_EROFS_FS_XATTR=y +CONFIG_EROFS_FS_ZIP=y CONFIG_ET131X=m CONFIG_ETHERNET=y CONFIG_ETHOC=m diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index 4cadd5b3c..1e283b782 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -1515,7 +1515,13 @@ CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m CONFIG_EPOLL=y CONFIG_EQUALIZER=m -# CONFIG_EROFS_FS is not set +CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1 +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS=m +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +CONFIG_EROFS_FS_XATTR=y +CONFIG_EROFS_FS_ZIP=y CONFIG_ET131X=m CONFIG_ETHERNET=y CONFIG_ETHOC=m diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index dcd44528b..7fac39dc3 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -1506,7 +1506,13 @@ CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m CONFIG_EPOLL=y CONFIG_EQUALIZER=m -# CONFIG_EROFS_FS is not set +CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1 +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS=m +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +CONFIG_EROFS_FS_XATTR=y +CONFIG_EROFS_FS_ZIP=y CONFIG_ET131X=m CONFIG_ETHERNET=y CONFIG_ETHOC=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 01a13d8c4..11e4e59bd 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -1376,7 +1376,13 @@ CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m CONFIG_EPOLL=y CONFIG_EQUALIZER=m -# CONFIG_EROFS_FS is not set +CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1 +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS=m +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +CONFIG_EROFS_FS_XATTR=y +CONFIG_EROFS_FS_ZIP=y CONFIG_ET131X=m CONFIG_ETHERNET=y CONFIG_ETHOC=m diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 92f68e4c6..08e26c67c 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -1367,7 +1367,13 @@ CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m CONFIG_EPOLL=y CONFIG_EQUALIZER=m -# CONFIG_EROFS_FS is not set +CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1 +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS=m +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +CONFIG_EROFS_FS_XATTR=y +CONFIG_EROFS_FS_ZIP=y CONFIG_ET131X=m CONFIG_ETHERNET=y CONFIG_ETHOC=m diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 0cf5397dc..3ea9bba6a 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -1384,7 +1384,13 @@ CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m CONFIG_EPOLL=y CONFIG_EQUALIZER=m -# CONFIG_EROFS_FS is not set +CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1 +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS=m +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +CONFIG_EROFS_FS_XATTR=y +CONFIG_EROFS_FS_ZIP=y CONFIG_ET131X=m CONFIG_ETHERNET=y # CONFIG_ETHOC is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index b5da410cb..8fa117548 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -1375,7 +1375,13 @@ CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m CONFIG_EPOLL=y CONFIG_EQUALIZER=m -# CONFIG_EROFS_FS is not set +CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1 +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS=m +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +CONFIG_EROFS_FS_XATTR=y +CONFIG_EROFS_FS_ZIP=y CONFIG_ET131X=m CONFIG_ETHERNET=y # CONFIG_ETHOC is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 38bafb00d..05d5e24c7 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -1555,7 +1555,13 @@ CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m CONFIG_EPOLL=y CONFIG_EQUALIZER=m -# CONFIG_EROFS_FS is not set +CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1 +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS=m +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +CONFIG_EROFS_FS_XATTR=y +CONFIG_EROFS_FS_ZIP=y CONFIG_ET131X=m CONFIG_ETHERNET=y CONFIG_ETHOC=m diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index b5a79015f..270c227d5 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -1546,7 +1546,13 @@ CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m CONFIG_EPOLL=y CONFIG_EQUALIZER=m -# CONFIG_EROFS_FS is not set +CONFIG_EROFS_FS_CLUSTER_PAGE_LIMIT=1 +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS=m +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +CONFIG_EROFS_FS_XATTR=y +CONFIG_EROFS_FS_ZIP=y CONFIG_ET131X=m CONFIG_ETHERNET=y CONFIG_ETHOC=m From ec5e1b2e89c4ec941b263bf53b6573131ae23e33 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Thu, 9 Jan 2020 14:17:52 -0600 Subject: [PATCH 07/11] Linux v5.5-rc5-134-ge69ec487b2c7 --- gitrev | 2 +- kernel.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gitrev b/gitrev index 8c65ace7f..39d1e5b7b 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -b07f636fca1c8fbba124b0082487c0b3890a0e0c +e69ec487b2c7c82ef99b4b15122f58a2a99289a3 diff --git a/kernel.spec b/kernel.spec index f8efa23b7..e1904402c 100644 --- a/kernel.spec +++ b/kernel.spec @@ -104,7 +104,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 5 # The git snapshot level -%define gitrev 1 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -2889,6 +2889,9 @@ fi # # %changelog +* Thu Jan 09 2020 Justin M. Forbes - 5.5.0-0.rc5.git2.1 +- Linux v5.5-rc5-134-ge69ec487b2c7 + * Wed Jan 08 2020 Justin M. Forbes - 5.5.0-0.rc5.git1.1 - Linux v5.5-rc5-41-gb07f636fca1c - Reenable debugging options. diff --git a/sources b/sources index 2f94522b3..7ae60f6dd 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (linux-5.4.tar.xz) = 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f SHA512 (patch-5.5-rc5.xz) = 846bc529a7f05a130fd2f02e429f8f8818cb47a9b9074060203e1f2b533e31a6d4edc42163b27091a26774449a51823c3f44c2d50b55abef5c059b5382be86a7 -SHA512 (patch-5.5-rc5-git1.xz) = 8ddc78672146a7ea68334bd5c9dd494362aefe017955ef2ec9fa7c921450382f0d0f00f0761adc38f979d8fab288fb224bf65bc636d4529fe12d957295adb721 +SHA512 (patch-5.5-rc5-git2.xz) = 7c3ce522361c174fd6702bf992b17032473da5aa92ffb903916e2eb12d18a2e56fc202187b0357180f74f0bd7f6089474a1896c4897ece071d0543165f1a7bf4 From 7cc57104b020e1c48963c932f95e94b671cc280e Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Fri, 10 Jan 2020 14:44:56 -0600 Subject: [PATCH 08/11] Linux v5.5-rc5-215-g4e4cd21c64da --- gitrev | 2 +- kernel.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gitrev b/gitrev index 39d1e5b7b..2f349d277 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -e69ec487b2c7c82ef99b4b15122f58a2a99289a3 +4e4cd21c64dadc608e569a15b56e86eb85137fc9 diff --git a/kernel.spec b/kernel.spec index e1904402c..a33925077 100644 --- a/kernel.spec +++ b/kernel.spec @@ -104,7 +104,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 5 # The git snapshot level -%define gitrev 2 +%define gitrev 3 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -2889,6 +2889,9 @@ fi # # %changelog +* Fri Jan 10 2020 Justin M. Forbes - 5.5.0-0.rc5.git3.1 +- Linux v5.5-rc5-215-g4e4cd21c64da + * Thu Jan 09 2020 Justin M. Forbes - 5.5.0-0.rc5.git2.1 - Linux v5.5-rc5-134-ge69ec487b2c7 diff --git a/sources b/sources index 7ae60f6dd..44c615f8b 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (linux-5.4.tar.xz) = 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f SHA512 (patch-5.5-rc5.xz) = 846bc529a7f05a130fd2f02e429f8f8818cb47a9b9074060203e1f2b533e31a6d4edc42163b27091a26774449a51823c3f44c2d50b55abef5c059b5382be86a7 -SHA512 (patch-5.5-rc5-git2.xz) = 7c3ce522361c174fd6702bf992b17032473da5aa92ffb903916e2eb12d18a2e56fc202187b0357180f74f0bd7f6089474a1896c4897ece071d0543165f1a7bf4 +SHA512 (patch-5.5-rc5-git3.xz) = 379bc817dd4dc31c731be53b51fe3452a8538b26f54c8f4250c9e8e637fbbaba0f00be5519a2ccfbd6991baedf2c6ede9759b49bacb5effe506e3956298eb735 From 59eca17780f89bf7b5637b4b7e87f1516c272733 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Fri, 10 Jan 2020 12:39:19 -0500 Subject: [PATCH 09/11] Pull in the s390 auto-lockdown patch RHEL had a patch to automatically lock down s390 which never made its way up to Fedora. Signed-off-by: Jeremy Cline --- kernel.spec | 2 + ...he-kernel-when-the-IPL-secure-flag-i.patch | 66 +++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch diff --git a/kernel.spec b/kernel.spec index a33925077..fe4163860 100644 --- a/kernel.spec +++ b/kernel.spec @@ -802,6 +802,8 @@ Patch204: efi-secureboot.patch Patch205: lift-lockdown-sysrq.patch +Patch206: s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch + # 300 - ARM patches Patch300: arm64-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch diff --git a/s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch b/s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch new file mode 100644 index 000000000..0779418b4 --- /dev/null +++ b/s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch @@ -0,0 +1,66 @@ +From eaa12998810bd9db85dec71f0da55fd5aae73d0f Mon Sep 17 00:00:00 2001 +From: Jeremy Cline +Date: Wed, 30 Oct 2019 14:37:49 +0000 +Subject: [PATCH] s390: Lock down the kernel when the IPL secure flag is set + +Automatically lock down the kernel to LOCKDOWN_CONFIDENTIALITY_MAX if +the IPL secure flag is set. + +Suggested-by: Philipp Rudo +Signed-off-by: Jeremy Cline +--- + arch/s390/include/asm/ipl.h | 1 + + arch/s390/kernel/ipl.c | 5 +++++ + arch/s390/kernel/setup.c | 4 ++++ + 3 files changed, 10 insertions(+) + +diff --git a/arch/s390/include/asm/ipl.h b/arch/s390/include/asm/ipl.h +index 084e71b7272a..1d1b5ec7357b 100644 +--- a/arch/s390/include/asm/ipl.h ++++ b/arch/s390/include/asm/ipl.h +@@ -109,6 +109,7 @@ int ipl_report_add_component(struct ipl_report *report, struct kexec_buf *kbuf, + unsigned char flags, unsigned short cert); + int ipl_report_add_certificate(struct ipl_report *report, void *key, + unsigned long addr, unsigned long len); ++bool ipl_get_secureboot(void); + + /* + * DIAG 308 support +diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c +index 6837affc19e8..2d3f3d00e05c 100644 +--- a/arch/s390/kernel/ipl.c ++++ b/arch/s390/kernel/ipl.c +@@ -1842,3 +1842,8 @@ int ipl_report_free(struct ipl_report *report) + } + + #endif ++ ++bool ipl_get_secureboot(void) ++{ ++ return !!ipl_secure_flag; ++} +diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c +index 9cbf490fd162..0510ecdfc3f6 100644 +--- a/arch/s390/kernel/setup.c ++++ b/arch/s390/kernel/setup.c +@@ -49,6 +49,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -1096,6 +1097,9 @@ void __init setup_arch(char **cmdline_p) + + log_component_list(); + ++ if (ipl_get_secureboot()) ++ security_lock_kernel_down("Secure IPL mode", LOCKDOWN_CONFIDENTIALITY_MAX); ++ + /* Have one command line that is parsed and saved in /proc/cmdline */ + /* boot_command_line has been already set up in early.c */ + *cmdline_p = boot_command_line; +-- +2.24.1 + From 8d287956c5f26a3bfa31820fc746ade9c0942e56 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 13 Jan 2020 11:02:44 -0600 Subject: [PATCH 10/11] Disable debugging options. --- kernel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel.spec b/kernel.spec index fe4163860..ca8265d47 100644 --- a/kernel.spec +++ b/kernel.spec @@ -197,7 +197,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 0 +%define debugbuildsenabled 1 %if 0%{?fedora} # Kernel headers are being split out into a separate package @@ -2891,6 +2891,9 @@ fi # # %changelog +* Mon Jan 13 2020 Justin M. Forbes +- Disable debugging options. + * Fri Jan 10 2020 Justin M. Forbes - 5.5.0-0.rc5.git3.1 - Linux v5.5-rc5-215-g4e4cd21c64da From a52dd9cf80dd69978157745ec023e13ecf5c0fb9 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 13 Jan 2020 12:26:11 -0600 Subject: [PATCH 11/11] Linux v5.5-rc6 --- alsa-5.6.patch | 390 +++++++++++++++++++++++++++++++++++++++++++++++++ gitrev | 2 +- kernel.spec | 10 +- sources | 3 +- 4 files changed, 400 insertions(+), 5 deletions(-) create mode 100644 alsa-5.6.patch diff --git a/alsa-5.6.patch b/alsa-5.6.patch new file mode 100644 index 000000000..b128cc7e6 --- /dev/null +++ b/alsa-5.6.patch @@ -0,0 +1,390 @@ +From 4ef91c45a5a283dc8899402bc68adfe0aa9a026d Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Wed, 4 Dec 2019 15:15:44 -0600 +Subject: [PATCH 1/4] ASoC: intel/skl/hda - export number of digital + microphones via control components + +It is required for the auto-detection in the user space (for UCM). + +Signed-off-by: Jaroslav Kysela +Signed-off-by: Pierre-Louis Bossart +Cc: Mark Brown +Link: https://lore.kernel.org/r/20191204211556.12671-2-pierre-louis.bossart@linux.intel.com +Signed-off-by: Mark Brown + +Signed-off-by: Jaroslav Kysela +(cherry picked from commit 8cd9956f61c65022209ce6d1e55ed12aea12357d) +Bugzilla: 1772498 +--- + sound/soc/intel/boards/skl_hda_dsp_generic.c | 8 ++++++++ + sound/soc/sof/intel/hda.c | 3 ++- + 2 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/sound/soc/intel/boards/skl_hda_dsp_generic.c b/sound/soc/intel/boards/skl_hda_dsp_generic.c +index 4e45901e3a2f..11eaee9ae41f 100644 +--- a/sound/soc/intel/boards/skl_hda_dsp_generic.c ++++ b/sound/soc/intel/boards/skl_hda_dsp_generic.c +@@ -100,6 +100,8 @@ static struct snd_soc_card hda_soc_card = { + .late_probe = skl_hda_card_late_probe, + }; + ++static char hda_soc_components[30]; ++ + #define IDISP_DAI_COUNT 3 + #define HDAC_DAI_COUNT 2 + #define DMIC_DAI_COUNT 2 +@@ -183,6 +185,12 @@ static int skl_hda_audio_probe(struct platform_device *pdev) + hda_soc_card.dev = &pdev->dev; + snd_soc_card_set_drvdata(&hda_soc_card, ctx); + ++ if (mach->mach_params.dmic_num > 0) { ++ snprintf(hda_soc_components, sizeof(hda_soc_components), ++ "cfg-dmics:%d", mach->mach_params.dmic_num); ++ hda_soc_card.components = hda_soc_components; ++ } ++ + return devm_snd_soc_register_card(&pdev->dev, &hda_soc_card); + } + +diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c +index 91bd88fddac7..eea01f75d23d 100644 +--- a/sound/soc/sof/intel/hda.c ++++ b/sound/soc/sof/intel/hda.c +@@ -351,7 +351,7 @@ static int hda_init_caps(struct snd_sof_dev *sdev) + const char *tplg_filename; + const char *idisp_str; + const char *dmic_str; +- int dmic_num; ++ int dmic_num = 0; + int codec_num = 0; + int i; + #endif +@@ -472,6 +472,7 @@ static int hda_init_caps(struct snd_sof_dev *sdev) + mach_params->codec_mask = bus->codec_mask; + mach_params->platform = dev_name(sdev->dev); + mach_params->common_hdmi_codec_drv = hda_codec_use_common_hdmi; ++ mach_params->dmic_num = dmic_num; + } + + /* create codec instances */ +-- +2.20.1 + + +From 89be5f69889f7e9aeab05279869bba3e9e0d2002 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Wed, 4 Dec 2019 15:15:45 -0600 +Subject: [PATCH 2/4] ASoC: Intel - use control components to describe card + config + +Use the control interface (field 'components' in the info structure) +to pass the I/O configuration details. The goal is to replace +the card long name with this. + +Signed-off-by: Jaroslav Kysela +Signed-off-by: Pierre-Louis Bossart +Cc: Mark Brown +Link: https://lore.kernel.org/r/20191204211556.12671-3-pierre-louis.bossart@linux.intel.com +Signed-off-by: Mark Brown + +Signed-off-by: Jaroslav Kysela +(cherry picked from commit 0d5c8187562848b619a35f2ffc5e18ce703e9f3d) +Bugzilla: 1772498 +--- + sound/soc/intel/boards/bytcht_es8316.c | 9 ++++++++- + sound/soc/intel/boards/bytcr_rt5640.c | 6 ++++++ + sound/soc/intel/boards/bytcr_rt5651.c | 18 +++++++++++------- + 3 files changed, 25 insertions(+), 8 deletions(-) + +diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c +index 46612331f5ea..efa33f30dcac 100644 +--- a/sound/soc/intel/boards/bytcht_es8316.c ++++ b/sound/soc/intel/boards/bytcht_es8316.c +@@ -361,6 +361,7 @@ static struct snd_soc_dai_link byt_cht_es8316_dais[] = { + /* SoC card */ + static char codec_name[SND_ACPI_I2C_ID_LEN]; + static char long_name[50]; /* = "bytcht-es8316-*-spk-*-mic" */ ++static char components_string[32]; /* = "cfg-spk:* cfg-mic:* */ + + static int byt_cht_es8316_suspend(struct snd_soc_card *card) + { +@@ -572,11 +573,17 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev) + } + } + +- /* register the soc card */ ++ snprintf(components_string, sizeof(components_string), ++ "cfg-spk:%s cfg-mic:%s", ++ (quirk & BYT_CHT_ES8316_MONO_SPEAKER) ? "1" : "2", ++ mic_name[BYT_CHT_ES8316_MAP(quirk)]); ++ byt_cht_es8316_card.components = components_string; + snprintf(long_name, sizeof(long_name), "bytcht-es8316-%s-spk-%s-mic", + (quirk & BYT_CHT_ES8316_MONO_SPEAKER) ? "mono" : "stereo", + mic_name[BYT_CHT_ES8316_MAP(quirk)]); + byt_cht_es8316_card.long_name = long_name; ++ ++ /* register the soc card */ + snd_soc_card_set_drvdata(&byt_cht_es8316_card, priv); + + ret = devm_snd_soc_register_card(dev, &byt_cht_es8316_card); +diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c +index dd2b5ad08659..7bc6d3cec94c 100644 +--- a/sound/soc/intel/boards/bytcr_rt5640.c ++++ b/sound/soc/intel/boards/bytcr_rt5640.c +@@ -1083,6 +1083,7 @@ static char byt_rt5640_codec_name[SND_ACPI_I2C_ID_LEN]; + static char byt_rt5640_codec_aif_name[12]; /* = "rt5640-aif[1|2]" */ + static char byt_rt5640_cpu_dai_name[10]; /* = "ssp[0|2]-port" */ + static char byt_rt5640_long_name[40]; /* = "bytcr-rt5640-*-spk-*-mic" */ ++static char byt_rt5640_components[32]; /* = "cfg-spk:* cfg-mic:*" */ + + static int byt_rt5640_suspend(struct snd_soc_card *card) + { +@@ -1305,6 +1306,11 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev) + } + } + ++ snprintf(byt_rt5640_components, sizeof(byt_rt5640_components), ++ "cfg-spk:%s cfg-mic:%s", ++ (byt_rt5640_quirk & BYT_RT5640_MONO_SPEAKER) ? "1" : "2", ++ map_name[BYT_RT5640_MAP(byt_rt5640_quirk)]); ++ byt_rt5640_card.components = byt_rt5640_components; + snprintf(byt_rt5640_long_name, sizeof(byt_rt5640_long_name), + "bytcr-rt5640-%s-spk-%s-mic", + (byt_rt5640_quirk & BYT_RT5640_MONO_SPEAKER) ? +diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c +index 4606f6f582d6..80a5674ddb1b 100644 +--- a/sound/soc/intel/boards/bytcr_rt5651.c ++++ b/sound/soc/intel/boards/bytcr_rt5651.c +@@ -798,6 +798,7 @@ static char byt_rt5651_codec_name[SND_ACPI_I2C_ID_LEN]; + static char byt_rt5651_codec_aif_name[12]; /* = "rt5651-aif[1|2]" */ + static char byt_rt5651_cpu_dai_name[10]; /* = "ssp[0|2]-port" */ + static char byt_rt5651_long_name[50]; /* = "bytcr-rt5651-*-spk-*-mic[-swapped-hp]" */ ++static char byt_rt5651_components[50]; /* = "cfg-spk:* cfg-mic:*" */ + + static int byt_rt5651_suspend(struct snd_soc_card *card) + { +@@ -876,7 +877,6 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) + const char *platform_name; + struct acpi_device *adev; + struct device *codec_dev; +- const char *hp_swapped; + bool is_bytcr = false; + int ret_val = 0; + int dai_index = 0; +@@ -1080,16 +1080,20 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) + } + } + +- if (byt_rt5651_quirk & BYT_RT5651_HP_LR_SWAPPED) +- hp_swapped = "-hp-swapped"; +- else +- hp_swapped = ""; +- ++ snprintf(byt_rt5651_components, sizeof(byt_rt5651_components), ++ "cfg-spk:%s cfg-mic:%s%s", ++ (byt_rt5651_quirk & BYT_RT5651_MONO_SPEAKER) ? "1" : "2", ++ mic_name[BYT_RT5651_MAP(byt_rt5651_quirk)], ++ (byt_rt5651_quirk & BYT_RT5651_HP_LR_SWAPPED) ? ++ " cfg-hp:lrswap" : ""); ++ byt_rt5651_card.components = byt_rt5651_components; + snprintf(byt_rt5651_long_name, sizeof(byt_rt5651_long_name), + "bytcr-rt5651-%s-spk-%s-mic%s", + (byt_rt5651_quirk & BYT_RT5651_MONO_SPEAKER) ? + "mono" : "stereo", +- mic_name[BYT_RT5651_MAP(byt_rt5651_quirk)], hp_swapped); ++ mic_name[BYT_RT5651_MAP(byt_rt5651_quirk)], ++ (byt_rt5651_quirk & BYT_RT5651_HP_LR_SWAPPED) ? ++ "-hp-swapped" : ""); + byt_rt5651_card.long_name = byt_rt5651_long_name; + + /* override plaform name, if required */ +-- +2.20.1 + + +From 36c175e19e9cbb685708519d41e27cd803206737 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Wed, 4 Dec 2019 15:15:46 -0600 +Subject: [PATCH 3/4] ASoC: Intel - do not describe I/O configuration in the + long card name + +The long card name might be used in GUI. This information should be hidden. + +Add CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES configuration option. + +Signed-off-by: Jaroslav Kysela +Signed-off-by: Pierre-Louis Bossart +Cc: Mark Brown +Link: https://lore.kernel.org/r/20191204211556.12671-4-pierre-louis.bossart@linux.intel.com +Signed-off-by: Mark Brown + +Signed-off-by: Jaroslav Kysela +(cherry picked from commit b5706f8ec29fb461571d25e3e813ede121fe31cd) +Bugzilla: 1772498 +--- + sound/soc/intel/boards/Kconfig | 13 +++++++++++++ + sound/soc/intel/boards/bytcht_es8316.c | 4 ++++ + sound/soc/intel/boards/bytcr_rt5640.c | 4 ++++ + sound/soc/intel/boards/bytcr_rt5651.c | 4 ++++ + 4 files changed, 25 insertions(+) + +diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig +index ef20316e83d1..145eb55bd691 100644 +--- a/sound/soc/intel/boards/Kconfig ++++ b/sound/soc/intel/boards/Kconfig +@@ -13,6 +13,19 @@ menuconfig SND_SOC_INTEL_MACH + + if SND_SOC_INTEL_MACH + ++config SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES ++ bool "Use more user friendly long card names" ++ help ++ Some drivers report the I/O configuration to userspace through the ++ soundcard's long card name in the control user space AP. An unfortunate ++ side effect is that this long name may also be used by the GUI, ++ confusing users with information they don't need. ++ This option prevents the long name from being modified, and the I/O ++ configuration will be provided through a different component interface. ++ Select Y if userspace like UCM (Use Case Manager) uses the component ++ interface. ++ If unsure select N. ++ + if SND_SOC_INTEL_HASWELL + + config SND_SOC_INTEL_HASWELL_MACH +diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c +index efa33f30dcac..12a1c5255484 100644 +--- a/sound/soc/intel/boards/bytcht_es8316.c ++++ b/sound/soc/intel/boards/bytcht_es8316.c +@@ -360,7 +360,9 @@ static struct snd_soc_dai_link byt_cht_es8316_dais[] = { + + /* SoC card */ + static char codec_name[SND_ACPI_I2C_ID_LEN]; ++#if !IS_ENABLED(CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES) + static char long_name[50]; /* = "bytcht-es8316-*-spk-*-mic" */ ++#endif + static char components_string[32]; /* = "cfg-spk:* cfg-mic:* */ + + static int byt_cht_es8316_suspend(struct snd_soc_card *card) +@@ -578,10 +580,12 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev) + (quirk & BYT_CHT_ES8316_MONO_SPEAKER) ? "1" : "2", + mic_name[BYT_CHT_ES8316_MAP(quirk)]); + byt_cht_es8316_card.components = components_string; ++#if !IS_ENABLED(CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES) + snprintf(long_name, sizeof(long_name), "bytcht-es8316-%s-spk-%s-mic", + (quirk & BYT_CHT_ES8316_MONO_SPEAKER) ? "mono" : "stereo", + mic_name[BYT_CHT_ES8316_MAP(quirk)]); + byt_cht_es8316_card.long_name = long_name; ++#endif + + /* register the soc card */ + snd_soc_card_set_drvdata(&byt_cht_es8316_card, priv); +diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c +index 7bc6d3cec94c..648fcc1d07b5 100644 +--- a/sound/soc/intel/boards/bytcr_rt5640.c ++++ b/sound/soc/intel/boards/bytcr_rt5640.c +@@ -1082,7 +1082,9 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = { + static char byt_rt5640_codec_name[SND_ACPI_I2C_ID_LEN]; + static char byt_rt5640_codec_aif_name[12]; /* = "rt5640-aif[1|2]" */ + static char byt_rt5640_cpu_dai_name[10]; /* = "ssp[0|2]-port" */ ++#if !IS_ENABLED(CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES) + static char byt_rt5640_long_name[40]; /* = "bytcr-rt5640-*-spk-*-mic" */ ++#endif + static char byt_rt5640_components[32]; /* = "cfg-spk:* cfg-mic:*" */ + + static int byt_rt5640_suspend(struct snd_soc_card *card) +@@ -1311,12 +1313,14 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev) + (byt_rt5640_quirk & BYT_RT5640_MONO_SPEAKER) ? "1" : "2", + map_name[BYT_RT5640_MAP(byt_rt5640_quirk)]); + byt_rt5640_card.components = byt_rt5640_components; ++#if !IS_ENABLED(CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES) + snprintf(byt_rt5640_long_name, sizeof(byt_rt5640_long_name), + "bytcr-rt5640-%s-spk-%s-mic", + (byt_rt5640_quirk & BYT_RT5640_MONO_SPEAKER) ? + "mono" : "stereo", + map_name[BYT_RT5640_MAP(byt_rt5640_quirk)]); + byt_rt5640_card.long_name = byt_rt5640_long_name; ++#endif + + /* override plaform name, if required */ + platform_name = mach->mach_params.platform; +diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c +index 80a5674ddb1b..c0d322a859f7 100644 +--- a/sound/soc/intel/boards/bytcr_rt5651.c ++++ b/sound/soc/intel/boards/bytcr_rt5651.c +@@ -797,7 +797,9 @@ static struct snd_soc_dai_link byt_rt5651_dais[] = { + static char byt_rt5651_codec_name[SND_ACPI_I2C_ID_LEN]; + static char byt_rt5651_codec_aif_name[12]; /* = "rt5651-aif[1|2]" */ + static char byt_rt5651_cpu_dai_name[10]; /* = "ssp[0|2]-port" */ ++#if !IS_ENABLED(CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES) + static char byt_rt5651_long_name[50]; /* = "bytcr-rt5651-*-spk-*-mic[-swapped-hp]" */ ++#endif + static char byt_rt5651_components[50]; /* = "cfg-spk:* cfg-mic:*" */ + + static int byt_rt5651_suspend(struct snd_soc_card *card) +@@ -1087,6 +1089,7 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) + (byt_rt5651_quirk & BYT_RT5651_HP_LR_SWAPPED) ? + " cfg-hp:lrswap" : ""); + byt_rt5651_card.components = byt_rt5651_components; ++#if !IS_ENABLED(CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES) + snprintf(byt_rt5651_long_name, sizeof(byt_rt5651_long_name), + "bytcr-rt5651-%s-spk-%s-mic%s", + (byt_rt5651_quirk & BYT_RT5651_MONO_SPEAKER) ? +@@ -1095,6 +1098,7 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) + (byt_rt5651_quirk & BYT_RT5651_HP_LR_SWAPPED) ? + "-hp-swapped" : ""); + byt_rt5651_card.long_name = byt_rt5651_long_name; ++#endif + + /* override plaform name, if required */ + platform_name = mach->mach_params.platform; +-- +2.20.1 + + +From 9aa9b367e35494f2d02112ca440a78908f645a04 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Fri, 22 Nov 2019 09:31:03 +0100 +Subject: [PATCH 4/4] ASoC: SOF - topology - do not change the link triger + order for old firmare + +This is patch for SOF v1.3 firmware. The DSP firmware will crash +without this patch. The 1.4.1 firmare has this issue fixed. + +BugLink: https://github.com/thesofproject/sof/issues/2102 +Signed-off-by: Jaroslav Kysela +--- + sound/soc/sof/topology.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c +index d82ab981e840..cbbbf96416ef 100644 +--- a/sound/soc/sof/topology.c ++++ b/sound/soc/sof/topology.c +@@ -2971,6 +2971,7 @@ static int sof_link_load(struct snd_soc_component *scomp, int index, + struct snd_soc_tplg_private *private = &cfg->priv; + struct sof_ipc_dai_config config; + struct snd_soc_tplg_hw_config *hw_config; ++ struct sof_ipc_fw_version *v = &sdev->fw_ready.version; + int num_hw_configs; + int ret; + int i = 0; +@@ -2988,9 +2989,12 @@ static int sof_link_load(struct snd_soc_component *scomp, int index, + if (!link->no_pcm) { + link->nonatomic = true; + +- /* set trigger order */ +- link->trigger[0] = SND_SOC_DPCM_TRIGGER_POST; +- link->trigger[1] = SND_SOC_DPCM_TRIGGER_POST; ++ /* this causes DSP panic on firmware v1.3 */ ++ if (SOF_ABI_VER(v->major, v->minor, v->micro) > SOF_ABI_VER(3, 7, 0)) { ++ /* set trigger order */ ++ link->trigger[0] = SND_SOC_DPCM_TRIGGER_POST; ++ link->trigger[1] = SND_SOC_DPCM_TRIGGER_POST; ++ } + + /* nothing more to do for FE dai links */ + return 0; +-- +2.20.1 + diff --git a/gitrev b/gitrev index 2f349d277..a981d1c4e 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -4e4cd21c64dadc608e569a15b56e86eb85137fc9 +b3a987b0264d3ddbb24293ebff10eddfc472f653 diff --git a/kernel.spec b/kernel.spec index ca8265d47..cddff0af5 100644 --- a/kernel.spec +++ b/kernel.spec @@ -102,9 +102,9 @@ Summary: The Linux kernel # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%global rcrev 5 +%global rcrev 6 # The git snapshot level -%define gitrev 3 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -856,6 +856,9 @@ Patch505: ARM-fix-__get_user_check-in-case-uaccess_-calls-are-not-inlined.patch # CVE-2019-14897 rhbz 1774879 1776146 Patch526: libertas-Fix-two-buffer-overflows-at-parsing-bss-descriptor.patch +# ALSA code from v5.6 (Intel ASoC Sound Open Firmware driver support) +Patch527: alsa-5.6.patch + # END OF PATCH DEFINITIONS %endif @@ -2891,6 +2894,9 @@ fi # # %changelog +* Mon Jan 13 2020 Justin M. Forbes - 5.5.0-0.rc6.git0.1 +- Linux v5.5-rc6 + * Mon Jan 13 2020 Justin M. Forbes - Disable debugging options. diff --git a/sources b/sources index 44c615f8b..aaa409541 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ SHA512 (linux-5.4.tar.xz) = 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f -SHA512 (patch-5.5-rc5.xz) = 846bc529a7f05a130fd2f02e429f8f8818cb47a9b9074060203e1f2b533e31a6d4edc42163b27091a26774449a51823c3f44c2d50b55abef5c059b5382be86a7 -SHA512 (patch-5.5-rc5-git3.xz) = 379bc817dd4dc31c731be53b51fe3452a8538b26f54c8f4250c9e8e637fbbaba0f00be5519a2ccfbd6991baedf2c6ede9759b49bacb5effe506e3956298eb735 +SHA512 (patch-5.5-rc6.xz) = 3e14b02a2bfaa1cc2b994079c6ae1e20cece2d72184c3b64c9c399a621cdaca77d623204fd35780ccadc23a942a6e8d54a4977423a119771dcbfb3233c09edf2