* [patch added to 3.12-stable] MIPS: ip27: Disable qlge driver in defconfig
[not found] <20170322155753.23556-1-jslaby@suse.cz>
@ 2017-03-22 15:57 ` Jiri Slaby
2017-03-22 15:57 ` [patch added to 3.12-stable] MIPS: ip22: Fix ip28 build for modern gcc Jiri Slaby
2017-03-22 15:57 ` [patch added to 3.12-stable] MIPS: ralink: Cosmetic change to prom_init() Jiri Slaby
2 siblings, 0 replies; 3+ messages in thread
From: Jiri Slaby @ 2017-03-22 15:57 UTC (permalink / raw)
To: stable
Cc: Arnd Bergmann, Ralf Baechle, linux-mips, linux-kernel,
James Hogan, Jiri Slaby
From: Arnd Bergmann <arnd@arndb.de>
This patch has been added to the 3.12 stable tree. If you have any
objections, please let us know.
===============
commit b617649468390713db1515ea79fc772d2eb897a8 upstream.
One of the last remaining failures in kernelci.org is for a gcc bug:
drivers/net/ethernet/qlogic/qlge/qlge_main.c:4819:1: error: insn does not satisfy its constraints:
drivers/net/ethernet/qlogic/qlge/qlge_main.c:4819:1: internal compiler error: in extract_constrain_insn, at recog.c:2190
This is apparently broken in gcc-6 but fixed in gcc-7, and I cannot
reproduce the problem here. However, it is clear that ip27_defconfig
does not actually need this driver as the platform has only PCI-X but
not PCIe, and the qlge adapter in turn is PCIe-only.
The driver was originally enabled in 2010 along with lots of other
drivers.
Fixes: 59d302b342e5 ("MIPS: IP27: Make defconfig useful again.")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/15197/
Signed-off-by: James Hogan <james.hogan@imgtec.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
arch/mips/configs/ip27_defconfig | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig
index 0e36abcd39cc..7446284dd7b3 100644
--- a/arch/mips/configs/ip27_defconfig
+++ b/arch/mips/configs/ip27_defconfig
@@ -206,7 +206,6 @@ CONFIG_MLX4_EN=m
# CONFIG_MLX4_DEBUG is not set
CONFIG_TEHUTI=m
CONFIG_BNX2X=m
-CONFIG_QLGE=m
CONFIG_SFC=m
CONFIG_BE2NET=m
CONFIG_LIBERTAS_THINFIRM=m
--
2.12.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [patch added to 3.12-stable] MIPS: ip22: Fix ip28 build for modern gcc
[not found] <20170322155753.23556-1-jslaby@suse.cz>
2017-03-22 15:57 ` [patch added to 3.12-stable] MIPS: ip27: Disable qlge driver in defconfig Jiri Slaby
@ 2017-03-22 15:57 ` Jiri Slaby
2017-03-22 15:57 ` [patch added to 3.12-stable] MIPS: ralink: Cosmetic change to prom_init() Jiri Slaby
2 siblings, 0 replies; 3+ messages in thread
From: Jiri Slaby @ 2017-03-22 15:57 UTC (permalink / raw)
To: stable; +Cc: Arnd Bergmann, linux-mips, linux-kernel, Ralf Baechle, Jiri Slaby
From: Arnd Bergmann <arnd@arndb.de>
This patch has been added to the 3.12 stable tree. If you have any
objections, please let us know.
===============
commit 23ca9b522383d3b9b7991d8586db30118992af4a upstream.
kernelci reports a failure of the ip28_defconfig build after upgrading its
gcc version:
arch/mips/sgi-ip22/Platform:29: *** gcc doesn't support needed option -mr10k-cache-barrier=store. Stop.
The problem apparently is that the -mr10k-cache-barrier=store option is now
rejected for CPUs other than r10k. Explicitly including the CPU in the
check fixes this and is safe because both options were introduced in
gcc-4.4.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/15049/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
arch/mips/sgi-ip22/Platform | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/mips/sgi-ip22/Platform b/arch/mips/sgi-ip22/Platform
index b7a4b7e04c38..e8f6b3a42a48 100644
--- a/arch/mips/sgi-ip22/Platform
+++ b/arch/mips/sgi-ip22/Platform
@@ -25,7 +25,7 @@ endif
# Simplified: what IP22 does at 128MB+ in ksegN, IP28 does at 512MB+ in xkphys
#
ifdef CONFIG_SGI_IP28
- ifeq ($(call cc-option-yn,-mr10k-cache-barrier=store), n)
+ ifeq ($(call cc-option-yn,-march=r10000 -mr10k-cache-barrier=store), n)
$(error gcc doesn't support needed option -mr10k-cache-barrier=store)
endif
endif
--
2.12.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [patch added to 3.12-stable] MIPS: ralink: Cosmetic change to prom_init().
[not found] <20170322155753.23556-1-jslaby@suse.cz>
2017-03-22 15:57 ` [patch added to 3.12-stable] MIPS: ip27: Disable qlge driver in defconfig Jiri Slaby
2017-03-22 15:57 ` [patch added to 3.12-stable] MIPS: ip22: Fix ip28 build for modern gcc Jiri Slaby
@ 2017-03-22 15:57 ` Jiri Slaby
2 siblings, 0 replies; 3+ messages in thread
From: Jiri Slaby @ 2017-03-22 15:57 UTC (permalink / raw)
To: stable; +Cc: John Crispin, linux-mips, Ralf Baechle, Jiri Slaby
From: John Crispin <john@phrozen.org>
This patch has been added to the 3.12 stable tree. If you have any
objections, please let us know.
===============
commit 9c48568b3692f1a56cbf1935e4eea835e6b185b1 upstream.
Over the years the code has been changed various times leading to
argc/argv being defined in a different function to where we actually
use the variables. Clean this up by moving them to prom_init_cmdline().
Signed-off-by: John Crispin <john@phrozen.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/14902/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
arch/mips/ralink/prom.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/arch/mips/ralink/prom.c b/arch/mips/ralink/prom.c
index 9c64f029d047..87312dfcee38 100644
--- a/arch/mips/ralink/prom.c
+++ b/arch/mips/ralink/prom.c
@@ -24,8 +24,10 @@ const char *get_system_type(void)
return soc_info.sys_type;
}
-static __init void prom_init_cmdline(int argc, char **argv)
+static __init void prom_init_cmdline(void)
{
+ int argc;
+ char **argv;
int i;
pr_debug("prom: fw_arg0=%08x fw_arg1=%08x fw_arg2=%08x fw_arg3=%08x\n",
@@ -54,14 +56,11 @@ static __init void prom_init_cmdline(int argc, char **argv)
void __init prom_init(void)
{
- int argc;
- char **argv;
-
prom_soc_init(&soc_info);
pr_info("SoC Type: %s\n", get_system_type());
- prom_init_cmdline(argc, argv);
+ prom_init_cmdline();
}
void __init prom_free_prom_memory(void)
--
2.12.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-03-22 15:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20170322155753.23556-1-jslaby@suse.cz>
2017-03-22 15:57 ` [patch added to 3.12-stable] MIPS: ip27: Disable qlge driver in defconfig Jiri Slaby
2017-03-22 15:57 ` [patch added to 3.12-stable] MIPS: ip22: Fix ip28 build for modern gcc Jiri Slaby
2017-03-22 15:57 ` [patch added to 3.12-stable] MIPS: ralink: Cosmetic change to prom_init() Jiri Slaby
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).