merge originkernel-5.2.0-0.rc1.git1.1.vanilla.knurd.1.fc31kernel-5.2.0-0.rc1.git1.1.vanilla.knurd.1.fc30kernel-5.2.0-0.rc1.git1.1.vanilla.knurd.1.fc29kernel-5.2.0-0.rc1.git1.1.vanilla.knurd.1.fc28

20 files changed, 361 insertions, 10 deletions

diff --git a/configs/fedora/generic/arm/CONFIG_BMA180 b/configs/fedora/generic/arm/CONFIG_BMA180
new file mode 100644
index 000000000..493e120ac
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_BMA180
@@ -0,0 +1 @@
+CONFIG_BMA180=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_BATTERY_BQ27XXX b/configs/fedora/generic/arm/aarch64/CONFIG_BATTERY_BQ27XXX
new file mode 100644
index 000000000..70c971363
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_BATTERY_BQ27XXX
@@ -0,0 +1 @@
+CONFIG_BATTERY_BQ27XXX=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM b/configs/fedora/generic/arm/aarch64/CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM
new file mode 100644
index 000000000..13f2e3d86
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM
@@ -0,0 +1 @@
+# CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM is not set
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_BATTERY_BQ27XXX_HDQ b/configs/fedora/generic/arm/aarch64/CONFIG_BATTERY_BQ27XXX_HDQ
new file mode 100644
index 000000000..aca89e5df
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_BATTERY_BQ27XXX_HDQ
@@ -0,0 +1 @@
+# CONFIG_BATTERY_BQ27XXX_HDQ is not set
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_BATTERY_BQ27XXX_I2C b/configs/fedora/generic/arm/aarch64/CONFIG_BATTERY_BQ27XXX_I2C
new file mode 100644
index 000000000..574be81f5
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_BATTERY_BQ27XXX_I2C
@@ -0,0 +1 @@
+CONFIG_BATTERY_BQ27XXX_I2C=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_MAX98357A b/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_MAX98357A
new file mode 100644
index 000000000..bcf5b6da4
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_MAX98357A
@@ -0,0 +1 @@
+CONFIG_SND_SOC_MAX98357A=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_NAU8825 b/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_NAU8825
new file mode 100644
index 000000000..a1454e04a
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_NAU8825
@@ -0,0 +1 @@
+CONFIG_SND_SOC_NAU8825=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_RT5677 b/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_RT5677
new file mode 100644
index 000000000..56536df16
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_RT5677
@@ -0,0 +1 @@
+CONFIG_SND_SOC_RT5677=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_RT5677_SPI b/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_RT5677_SPI
new file mode 100644
index 000000000..439952c49
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_RT5677_SPI
@@ -0,0 +1 @@
+CONFIG_SND_SOC_RT5677_SPI=m
diff --git a/gitrev b/gitrev
index d9cd28f30..95f1e9f56 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-0ef0fd351550130129bbdb77362488befd7b69d2
+9c7db5004280767566e91a33445bf93aa479ef02
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 7f757d740..301a4fef5 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -528,7 +528,10 @@ CONFIG_BATMAN_ADV_NC=y
 CONFIG_BATMAN_ADV_SYSFS=y
 CONFIG_BATMAN_ADV_TRACING=y
 CONFIG_BATTERY_AXP20X=m
-# CONFIG_BATTERY_BQ27XXX is not set
+# CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM is not set
+# CONFIG_BATTERY_BQ27XXX_HDQ is not set
+CONFIG_BATTERY_BQ27XXX_I2C=m
+CONFIG_BATTERY_BQ27XXX=m
 # CONFIG_BATTERY_DS2760 is not set
 # CONFIG_BATTERY_DS2780 is not set
 # CONFIG_BATTERY_DS2781 is not set
@@ -628,7 +631,7 @@ CONFIG_BLK_DEV_ZONED=y
 CONFIG_BLK_SED_OPAL=y
 CONFIG_BLK_WBT_MQ=y
 CONFIG_BLK_WBT=y
-# CONFIG_BMA180 is not set
+CONFIG_BMA180=m
 # CONFIG_BMA220 is not set
 CONFIG_BMC150_ACCEL=m
 # CONFIG_BMC150_MAGN_I2C is not set
@@ -5869,6 +5872,7 @@ CONFIG_SND_SOC_IMX_AUDMIX=m
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_MAX9759=m
 CONFIG_SND_SOC_MAX98088=m
+CONFIG_SND_SOC_MAX98357A=m
 CONFIG_SND_SOC_MAX98373=m
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
@@ -5884,6 +5888,7 @@ CONFIG_SND_SOC_MSM8996=m
 # CONFIG_SND_SOC_NAU8810 is not set
 # CONFIG_SND_SOC_NAU8822 is not set
 CONFIG_SND_SOC_NAU8824=m
+CONFIG_SND_SOC_NAU8825=m
 # CONFIG_SND_SOC_PCM1681 is not set
 CONFIG_SND_SOC_PCM1789_I2C=m
 # CONFIG_SND_SOC_PCM179X_I2C is not set
@@ -5913,6 +5918,8 @@ CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
 # CONFIG_SND_SOC_RT5631 is not set
 CONFIG_SND_SOC_RT5660=m
 CONFIG_SND_SOC_RT5663=m
+CONFIG_SND_SOC_RT5677=m
+CONFIG_SND_SOC_RT5677_SPI=m
 CONFIG_SND_SOC_SDM845=m
 CONFIG_SND_SOC_SGTL5000=m
 CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index ed167ee26..bcb3f8925 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -528,7 +528,10 @@ CONFIG_BATMAN_ADV_NC=y
 CONFIG_BATMAN_ADV_SYSFS=y
 CONFIG_BATMAN_ADV_TRACING=y
 CONFIG_BATTERY_AXP20X=m
-# CONFIG_BATTERY_BQ27XXX is not set
+# CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM is not set
+# CONFIG_BATTERY_BQ27XXX_HDQ is not set
+CONFIG_BATTERY_BQ27XXX_I2C=m
+CONFIG_BATTERY_BQ27XXX=m
 # CONFIG_BATTERY_DS2760 is not set
 # CONFIG_BATTERY_DS2780 is not set
 # CONFIG_BATTERY_DS2781 is not set
@@ -628,7 +631,7 @@ CONFIG_BLK_DEV_ZONED=y
 CONFIG_BLK_SED_OPAL=y
 CONFIG_BLK_WBT_MQ=y
 CONFIG_BLK_WBT=y
-# CONFIG_BMA180 is not set
+CONFIG_BMA180=m
 # CONFIG_BMA220 is not set
 CONFIG_BMC150_ACCEL=m
 # CONFIG_BMC150_MAGN_I2C is not set
@@ -5847,6 +5850,7 @@ CONFIG_SND_SOC_IMX_AUDMIX=m
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_MAX9759=m
 CONFIG_SND_SOC_MAX98088=m
+CONFIG_SND_SOC_MAX98357A=m
 CONFIG_SND_SOC_MAX98373=m
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
@@ -5862,6 +5866,7 @@ CONFIG_SND_SOC_MSM8996=m
 # CONFIG_SND_SOC_NAU8810 is not set
 # CONFIG_SND_SOC_NAU8822 is not set
 CONFIG_SND_SOC_NAU8824=m
+CONFIG_SND_SOC_NAU8825=m
 # CONFIG_SND_SOC_PCM1681 is not set
 CONFIG_SND_SOC_PCM1789_I2C=m
 # CONFIG_SND_SOC_PCM179X_I2C is not set
@@ -5891,6 +5896,8 @@ CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
 # CONFIG_SND_SOC_RT5631 is not set
 CONFIG_SND_SOC_RT5660=m
 CONFIG_SND_SOC_RT5663=m
+CONFIG_SND_SOC_RT5677=m
+CONFIG_SND_SOC_RT5677_SPI=m
 CONFIG_SND_SOC_SDM845=m
 CONFIG_SND_SOC_SGTL5000=m
 CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 7bfab7072..87e4aa94c 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -639,7 +639,7 @@ CONFIG_BLK_WBT_MQ=y
 CONFIG_BLK_WBT=y
 # CONFIG_BL_SWITCHER_DUMMY_IF is not set
 CONFIG_BL_SWITCHER=y
-# CONFIG_BMA180 is not set
+CONFIG_BMA180=m
 # CONFIG_BMA220 is not set
 CONFIG_BMC150_ACCEL=m
 # CONFIG_BMC150_MAGN_I2C is not set
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 2d8314e9f..8f2726a83 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -617,7 +617,7 @@ CONFIG_BLK_WBT_MQ=y
 CONFIG_BLK_WBT=y
 # CONFIG_BL_SWITCHER_DUMMY_IF is not set
 CONFIG_BL_SWITCHER=y
-# CONFIG_BMA180 is not set
+CONFIG_BMA180=m
 # CONFIG_BMA220 is not set
 CONFIG_BMC150_ACCEL=m
 # CONFIG_BMC150_MAGN_I2C is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 43a4426fe..8e5372822 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -617,7 +617,7 @@ CONFIG_BLK_WBT_MQ=y
 CONFIG_BLK_WBT=y
 # CONFIG_BL_SWITCHER_DUMMY_IF is not set
 CONFIG_BL_SWITCHER=y
-# CONFIG_BMA180 is not set
+CONFIG_BMA180=m
 # CONFIG_BMA220 is not set
 CONFIG_BMC150_ACCEL=m
 # CONFIG_BMC150_MAGN_I2C is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 581eee733..3eacebaca 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -639,7 +639,7 @@ CONFIG_BLK_WBT_MQ=y
 CONFIG_BLK_WBT=y
 # CONFIG_BL_SWITCHER_DUMMY_IF is not set
 CONFIG_BL_SWITCHER=y
-# CONFIG_BMA180 is not set
+CONFIG_BMA180=m
 # CONFIG_BMA220 is not set
 CONFIG_BMC150_ACCEL=m
 # CONFIG_BMC150_MAGN_I2C is not set
diff --git a/kernel.spec b/kernel.spec
index c4d6cc439..249c1604f 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 1
 # The git snapshot level
-%define gitrev 0
+%define gitrev 1
 # Set rpm version accordingly
 %define rpmversion 5.%{upstream_sublevel}.0
 %endif
@@ -595,6 +595,8 @@ Patch524: net-vhost_net-fix-possible-infinite-loop.patch
 
 # build fix
 Patch525: 0001-arm64-vdso-Explicitly-add-build-id-option.patch
+Patch526: s390-mark-__cpacf_check_opcode-and-cpacf_query_func-as-__always_inline.patch
+Patch527: v2-powerpc-mm-mark-more-tlb-functions-as-__always_inline.patch
 
 # END OF PATCH DEFINITIONS
 
@@ -1837,6 +1839,16 @@ fi
 #
 #
 %changelog
+* Tue May 21 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.2.0-0.rc1.git1.1
+- Linux v5.2-rc1-129-g9c7db5004280
+
+* Tue May 21 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.2.0-0.rc1.git0.2
+- Reenable debugging options.
+
+* Mon May 20 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.2.0-0.rc1.git0.1
+- Disable debugging options.
+- Linux V5.2-rc1
+
 * Sun May 19 2019 Peter Robinson <pbrobinson@fedoraproject.org>
 - Arm config updates
 
diff --git a/s390-mark-__cpacf_check_opcode-and-cpacf_query_func-as-__always_inline.patch b/s390-mark-__cpacf_check_opcode-and-cpacf_query_func-as-__always_inline.patch
new file mode 100644
index 000000000..ef479dbee
--- /dev/null
+++ b/s390-mark-__cpacf_check_opcode-and-cpacf_query_func-as-__always_inline.patch
@@ -0,0 +1,105 @@
+From patchwork Fri May 17 06:54:24 2019
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+X-Patchwork-Submitter: Masahiro Yamada <yamada.masahiro@socionext.com>
+X-Patchwork-Id: 1075092
+Return-Path: <SRS0=M1fl=TR=vger.kernel.org=linux-kernel-owner@kernel.org>
+Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
+	by smtp.lore.kernel.org (Postfix) with ESMTP id 5FC95C04AB4
+	for <linux-kernel@archiver.kernel.org>; Fri, 17 May 2019 06:55:12 +0000 (UTC)
+Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
+	by mail.kernel.org (Postfix) with ESMTP id 3103B20848
+	for <linux-kernel@archiver.kernel.org>; Fri, 17 May 2019 06:55:12 +0000 (UTC)
+Authentication-Results: mail.kernel.org;
+	dkim=pass (2048-bit key) header.d=nifty.com header.i=@nifty.com
+ header.b="Q2VtVae6"
+Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
+        id S1728126AbfEQGzL (ORCPT
+        <rfc822;linux-kernel@archiver.kernel.org>);
+        Fri, 17 May 2019 02:55:11 -0400
+Received: from conuserg-12.nifty.com ([210.131.2.79]:40958 "EHLO
+        conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
+        with ESMTP id S1727694AbfEQGzK (ORCPT
+        <rfc822;linux-kernel@vger.kernel.org>);
+        Fri, 17 May 2019 02:55:10 -0400
+Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp
+ [153.142.97.92]) (authenticated)
+        by conuserg-12.nifty.com with ESMTP id x4H6sQI1006236;
+        Fri, 17 May 2019 15:54:26 +0900
+DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com x4H6sQI1006236
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com;
+        s=dec2015msa; t=1558076066;
+        bh=/BYTJ4zxnc9ql4xZQk+WJLrlDFM4qCpFxkd8pJzLb9c=;
+        h=From:To:Cc:Subject:Date:From;
+        b=Q2VtVae6Ee0HybhaWXSMg69y6q1arF8Sf/3u/XHMZTCPOpMB44H54BKHkbXrOYYN4
+         sTyqKSVgGlNw7oPey6yYOSC6lOjkiel9mhOBKa/MRcGpXQ1EeRKhiJD9ciFZUJU5lo
+         qG5n3KT7Slc5xaDZohnfycTLEiaOSVGvd85a6BlWsNry0dKe4AR1DBIFR3kjMMSag7
+         ZEesarqfo0ZgWtXj9pt5ZSerrlX1EaZCLvJ3hArzEcceGum0qQRT0+XWSGTEGlPjId
+         aZrU4OYTFZusbiPR43kGBDWduFx1qFAPX8BlT63J0EzHwxFepnxOG46QCvqob91ugR
+         QTZCX5d2BYNbA==
+X-Nifty-SrcIP: [153.142.97.92]
+From: Masahiro Yamada <yamada.masahiro@socionext.com>
+To: Martin Schwidefsky <schwidefsky@de.ibm.com>,
+        Heiko Carstens <heiko.carstens@de.ibm.com>,
+        linux-s390@vger.kernel.org
+Cc: Arnd Bergmann <arnd@arndb.de>, Laura Abbott <labbott@redhat.com>,
+        Masahiro Yamada <yamada.masahiro@socionext.com>,
+        linux-kernel@vger.kernel.org,
+        Andrew Morton <akpm@linux-foundation.org>
+Subject: [PATCH] s390: mark __cpacf_check_opcode() and cpacf_query_func() as
+ __always_inline
+Date: Fri, 17 May 2019 15:54:24 +0900
+Message-Id: <20190517065424.24453-1-yamada.masahiro@socionext.com>
+X-Mailer: git-send-email 2.17.1
+Sender: linux-kernel-owner@vger.kernel.org
+Precedence: bulk
+List-ID: <linux-kernel.vger.kernel.org>
+X-Mailing-List: linux-kernel@vger.kernel.org
+
+Commit e60fb8bf68d4 ("s390/cpacf: mark scpacf_query() as __always_inline")
+was not enough to make sure to meet the 'i' (immediate) constraint for the
+asm operands.
+
+With CONFIG_OPTIMIZE_INLINING enabled, Laura Abbott reported error
+with gcc 9.1.1:
+
+  In file included from arch/s390/crypto/prng.c:29:
+  ./arch/s390/include/asm/cpacf.h: In function 'cpacf_query_func':
+  ./arch/s390/include/asm/cpacf.h:170:2: warning: asm operand 3 probably doesn't match constraints
+    170 |  asm volatile(
+        |  ^~~
+  ./arch/s390/include/asm/cpacf.h:170:2: error: impossible constraint in 'asm'
+
+Add more __always_inline to force inlining.
+
+Fixes: 9012d011660e ("compiler: allow all arches to enable CONFIG_OPTIMIZE_INLINING")
+Reported-by: Laura Abbott <labbott@redhat.com>
+Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
+---
+
+ arch/s390/include/asm/cpacf.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arch/s390/include/asm/cpacf.h b/arch/s390/include/asm/cpacf.h
+index f316de40e51b..19459dfb4295 100644
+--- a/arch/s390/include/asm/cpacf.h
++++ b/arch/s390/include/asm/cpacf.h
+@@ -177,7 +177,7 @@ static inline void __cpacf_query(unsigned int opcode, cpacf_mask_t *mask)
+ 		: "cc");
+ }
+ 
+-static inline int __cpacf_check_opcode(unsigned int opcode)
++static __always_inline int __cpacf_check_opcode(unsigned int opcode)
+ {
+ 	switch (opcode) {
+ 	case CPACF_KMAC:
+@@ -217,7 +217,7 @@ static inline int cpacf_test_func(cpacf_mask_t *mask, unsigned int func)
+ 	return (mask->bytes[func >> 3] & (0x80 >> (func & 7))) != 0;
+ }
+ 
+-static inline int cpacf_query_func(unsigned int opcode, unsigned int func)
++static __always_inline int cpacf_query_func(unsigned int opcode, unsigned int func)
+ {
+ 	cpacf_mask_t mask;
+ 
diff --git a/sources b/sources
index ef85ab928..94040b5e9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 SHA512 (linux-5.1.tar.xz) = ae96f347badc95f1f3acf506c52b6cc23c0bd09ce8f4ce6705d4b4058b62593059bba1bc603c8d8b00a2f19131e7e56c31ac62b45883a346fa61d655e178f236
 SHA512 (patch-5.2-rc1.xz) = 771b53ee920488daf3e36bfa7a38d75b0ab165453d94137d289f4bab59da38251f7c94a63d2f5138bc226c3b4908a9153a3056f1aa19be5317cbe42d0ad4bd2a
+SHA512 (patch-5.2-rc1-git1.xz) = defa9c12a37761752d74b8ad235ae9322eddc54f9a36d8e5fe55138d4b759244e19875437be498075c537140eb0c25f41b8fdf5415973e8b06ea4c1237f946f7
diff --git a/v2-powerpc-mm-mark-more-tlb-functions-as-__always_inline.patch b/v2-powerpc-mm-mark-more-tlb-functions-as-__always_inline.patch
new file mode 100644
index 000000000..7ad869a3b
--- /dev/null
+++ b/v2-powerpc-mm-mark-more-tlb-functions-as-__always_inline.patch
@@ -0,0 +1,210 @@
+From patchwork Tue May 21 13:13:24 2019
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+X-Patchwork-Submitter: Masahiro Yamada <yamada.masahiro@socionext.com>
+X-Patchwork-Id: 1076877
+Return-Path: <SRS0=9PYC=TV=vger.kernel.org=linux-kernel-owner@kernel.org>
+Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
+	by smtp.lore.kernel.org (Postfix) with ESMTP id B6B6BC04AAF
+	for <linux-kernel@archiver.kernel.org>; Tue, 21 May 2019 13:15:35 +0000 (UTC)
+Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
+	by mail.kernel.org (Postfix) with ESMTP id 5C77920856
+	for <linux-kernel@archiver.kernel.org>; Tue, 21 May 2019 13:15:35 +0000 (UTC)
+Authentication-Results: mail.kernel.org;
+	dkim=pass (2048-bit key) header.d=nifty.com header.i=@nifty.com
+ header.b="byDN3URg"
+Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
+        id S1728192AbfEUNPe (ORCPT
+        <rfc822;linux-kernel@archiver.kernel.org>);
+        Tue, 21 May 2019 09:15:34 -0400
+Received: from conuserg-09.nifty.com ([210.131.2.76]:42776 "EHLO
+        conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
+        with ESMTP id S1726740AbfEUNPe (ORCPT
+        <rfc822;linux-kernel@vger.kernel.org>);
+        Tue, 21 May 2019 09:15:34 -0400
+Received: from grover.flets-west.jp (softbank126125154139.bbtec.net
+ [126.125.154.139]) (authenticated)
+        by conuserg-09.nifty.com with ESMTP id x4LDDYAd004855;
+        Tue, 21 May 2019 22:13:34 +0900
+DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com x4LDDYAd004855
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com;
+        s=dec2015msa; t=1558444415;
+        bh=ahqbC92DL/pM+EvNd4RugG8jQvrt9otxZH6g7EH9AdY=;
+        h=From:To:Cc:Subject:Date:From;
+        b=byDN3URgP1aFiKBf13O4eB3IcCRmRHdS4w/Vsk71gfIMjCTpQlM9x+pTrWYxKD6xD
+         V9VH0X04qL3lZtOUfsrhQBsiJk6csDQXXVUjQ5+uCPagVEG7fWaXK52ua2aETjKK0M
+         XJBCDyN1+HfIrqq14MuJoUdVthou2qSoYfOre6SZViNDt8nEYf7GoZg7rNW8Dw2tNh
+         YYah8oMxK2FXgGkEVEphUKIna2of4Et7E+xJuLal9Z4afYm3hMxjRQeL9FQlOvFsdX
+         svjA5A9a8iW0Z2C/nqYiS0rqRctgK33ezsq1t3T5mDDH55zWryW003qi4NZml1meAb
+         PH79Wg2BhesJA==
+X-Nifty-SrcIP: [126.125.154.139]
+From: Masahiro Yamada <yamada.masahiro@socionext.com>
+To: Michael Ellerman <mpe@ellerman.id.au>,
+        linuxppc-dev@lists.ozlabs.org
+Cc: Christophe Leroy <christophe.leroy@c-s.fr>,
+        Masahiro Yamada <yamada.masahiro@socionext.com>,
+        Benjamin Herrenschmidt <benh@kernel.crashing.org>,
+        Paul Mackerras <paulus@samba.org>,
+        "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>,
+        Nicholas Piggin <npiggin@gmail.com>,
+        Andrew Morton <akpm@linux-foundation.org>,
+        David Gibson <david@gibson.dropbear.id.au>,
+        Suraj Jitindar Singh <sjitindarsingh@gmail.com>,
+        linux-kernel@vger.kernel.org
+Subject: [PATCH v2] powerpc/mm: mark more tlb functions as __always_inline
+Date: Tue, 21 May 2019 22:13:24 +0900
+Message-Id: <1558444404-12254-1-git-send-email-yamada.masahiro@socionext.com>
+X-Mailer: git-send-email 2.7.4
+Sender: linux-kernel-owner@vger.kernel.org
+Precedence: bulk
+List-ID: <linux-kernel.vger.kernel.org>
+X-Mailing-List: linux-kernel@vger.kernel.org
+
+With CONFIG_OPTIMIZE_INLINING enabled, Laura Abbott reported error
+with gcc 9.1.1:
+
+  arch/powerpc/mm/book3s64/radix_tlb.c: In function '_tlbiel_pid':
+  arch/powerpc/mm/book3s64/radix_tlb.c:104:2: warning: asm operand 3 probably doesn't match constraints
+    104 |  asm volatile(PPC_TLBIEL(%0, %4, %3, %2, %1)
+        |  ^~~
+  arch/powerpc/mm/book3s64/radix_tlb.c:104:2: error: impossible constraint in 'asm'
+
+Fixing _tlbiel_pid() is enough to address the warning above, but I
+inlined more functions to fix all potential issues.
+
+To meet the "i" (immediate) constraint for the asm operands, functions
+propagating "ric" must be always inlined.
+
+Fixes: 9012d011660e ("compiler: allow all arches to enable CONFIG_OPTIMIZE_INLINING")
+Reported-by: Laura Abbott <labbott@redhat.com>
+Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
+Reviewed-by: Christophe Leroy <christophe.leroy@c-s.fr>
+---
+
+Changes in v2:
+  - Do not split lines
+
+ arch/powerpc/mm/book3s64/hash_native.c |  2 +-
+ arch/powerpc/mm/book3s64/radix_tlb.c   | 32 ++++++++++++++++----------------
+ 2 files changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/arch/powerpc/mm/book3s64/hash_native.c b/arch/powerpc/mm/book3s64/hash_native.c
+index aaa28fd..c854151 100644
+--- a/arch/powerpc/mm/book3s64/hash_native.c
++++ b/arch/powerpc/mm/book3s64/hash_native.c
+@@ -60,7 +60,7 @@ static inline void tlbiel_hash_set_isa206(unsigned int set, unsigned int is)
+  * tlbiel instruction for hash, set invalidation
+  * i.e., r=1 and is=01 or is=10 or is=11
+  */
+-static inline void tlbiel_hash_set_isa300(unsigned int set, unsigned int is,
++static __always_inline void tlbiel_hash_set_isa300(unsigned int set, unsigned int is,
+ 					unsigned int pid,
+ 					unsigned int ric, unsigned int prs)
+ {
+diff --git a/arch/powerpc/mm/book3s64/radix_tlb.c b/arch/powerpc/mm/book3s64/radix_tlb.c
+index 4d84136..4d3dc10 100644
+--- a/arch/powerpc/mm/book3s64/radix_tlb.c
++++ b/arch/powerpc/mm/book3s64/radix_tlb.c
+@@ -29,7 +29,7 @@
+  * tlbiel instruction for radix, set invalidation
+  * i.e., r=1 and is=01 or is=10 or is=11
+  */
+-static inline void tlbiel_radix_set_isa300(unsigned int set, unsigned int is,
++static __always_inline void tlbiel_radix_set_isa300(unsigned int set, unsigned int is,
+ 					unsigned int pid,
+ 					unsigned int ric, unsigned int prs)
+ {
+@@ -150,8 +150,8 @@ static __always_inline void __tlbie_lpid(unsigned long lpid, unsigned long ric)
+ 	trace_tlbie(lpid, 0, rb, rs, ric, prs, r);
+ }
+ 
+-static inline void __tlbiel_lpid_guest(unsigned long lpid, int set,
+-				unsigned long ric)
++static __always_inline void __tlbiel_lpid_guest(unsigned long lpid, int set,
++						unsigned long ric)
+ {
+ 	unsigned long rb,rs,prs,r;
+ 
+@@ -167,8 +167,8 @@ static inline void __tlbiel_lpid_guest(unsigned long lpid, int set,
+ }
+ 
+ 
+-static inline void __tlbiel_va(unsigned long va, unsigned long pid,
+-			       unsigned long ap, unsigned long ric)
++static __always_inline void __tlbiel_va(unsigned long va, unsigned long pid,
++					unsigned long ap, unsigned long ric)
+ {
+ 	unsigned long rb,rs,prs,r;
+ 
+@@ -183,8 +183,8 @@ static inline void __tlbiel_va(unsigned long va, unsigned long pid,
+ 	trace_tlbie(0, 1, rb, rs, ric, prs, r);
+ }
+ 
+-static inline void __tlbie_va(unsigned long va, unsigned long pid,
+-			      unsigned long ap, unsigned long ric)
++static __always_inline void __tlbie_va(unsigned long va, unsigned long pid,
++				       unsigned long ap, unsigned long ric)
+ {
+ 	unsigned long rb,rs,prs,r;
+ 
+@@ -199,8 +199,8 @@ static inline void __tlbie_va(unsigned long va, unsigned long pid,
+ 	trace_tlbie(0, 0, rb, rs, ric, prs, r);
+ }
+ 
+-static inline void __tlbie_lpid_va(unsigned long va, unsigned long lpid,
+-			      unsigned long ap, unsigned long ric)
++static __always_inline void __tlbie_lpid_va(unsigned long va, unsigned long lpid,
++					    unsigned long ap, unsigned long ric)
+ {
+ 	unsigned long rb,rs,prs,r;
+ 
+@@ -239,7 +239,7 @@ static inline void fixup_tlbie_lpid(unsigned long lpid)
+ /*
+  * We use 128 set in radix mode and 256 set in hpt mode.
+  */
+-static inline void _tlbiel_pid(unsigned long pid, unsigned long ric)
++static __always_inline void _tlbiel_pid(unsigned long pid, unsigned long ric)
+ {
+ 	int set;
+ 
+@@ -341,7 +341,7 @@ static inline void _tlbie_lpid(unsigned long lpid, unsigned long ric)
+ 	asm volatile("eieio; tlbsync; ptesync": : :"memory");
+ }
+ 
+-static inline void _tlbiel_lpid_guest(unsigned long lpid, unsigned long ric)
++static __always_inline void _tlbiel_lpid_guest(unsigned long lpid, unsigned long ric)
+ {
+ 	int set;
+ 
+@@ -381,8 +381,8 @@ static inline void __tlbiel_va_range(unsigned long start, unsigned long end,
+ 		__tlbiel_va(addr, pid, ap, RIC_FLUSH_TLB);
+ }
+ 
+-static inline void _tlbiel_va(unsigned long va, unsigned long pid,
+-			      unsigned long psize, unsigned long ric)
++static __always_inline void _tlbiel_va(unsigned long va, unsigned long pid,
++				       unsigned long psize, unsigned long ric)
+ {
+ 	unsigned long ap = mmu_get_ap(psize);
+ 
+@@ -413,8 +413,8 @@ static inline void __tlbie_va_range(unsigned long start, unsigned long end,
+ 		__tlbie_va(addr, pid, ap, RIC_FLUSH_TLB);
+ }
+ 
+-static inline void _tlbie_va(unsigned long va, unsigned long pid,
+-			      unsigned long psize, unsigned long ric)
++static __always_inline void _tlbie_va(unsigned long va, unsigned long pid,
++				      unsigned long psize, unsigned long ric)
+ {
+ 	unsigned long ap = mmu_get_ap(psize);
+ 
+@@ -424,7 +424,7 @@ static inline void _tlbie_va(unsigned long va, unsigned long pid,
+ 	asm volatile("eieio; tlbsync; ptesync": : :"memory");
+ }
+ 
+-static inline void _tlbie_lpid_va(unsigned long va, unsigned long lpid,
++static __always_inline void _tlbie_lpid_va(unsigned long va, unsigned long lpid,
+ 			      unsigned long psize, unsigned long ric)
+ {
+ 	unsigned long ap = mmu_get_ap(psize);