Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch '4.14-fixes' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS fixes from Ralf Baechle:
"More MIPS fixes for 4.14:
- Loongson 1: Set the default number of RX and TX queues to
accomodate for recent changes of stmmac driver.
- BPF: Fix uninitialised target compiler error.
- Fix cmpxchg on 32 bit signed ints for 64 bit kernels with
!kernel_uses_llsc
- Fix generic-board-config.sh for builds using O=
- Remove pr_err() calls from fpu_emu() for a case which is not a
kernel error"
* '4.14-fixes' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
MIPS: math-emu: Remove pr_err() calls from fpu_emu()
MIPS: Fix generic-board-config.sh for builds using O=
MIPS: Fix cmpxchg on 32b signed ints for 64b kernel with !kernel_uses_llsc
MIPS: loongson1: set default number of rx and tx queues for stmmac
MIPS: bpf: Fix uninitialised target compiler error
+28
-26
+4
-2
arch/mips/include/asm/cmpxchg.h
+4
-2
arch/mips/include/asm/cmpxchg.h
···
155
155
return __cmpxchg_small(ptr, old, new, size);
156
156
157
157
case 4:
158
-
return __cmpxchg_asm("ll", "sc", (volatile u32 *)ptr, old, new);
158
+
return __cmpxchg_asm("ll", "sc", (volatile u32 *)ptr,
159
+
(u32)old, new);
159
160
160
161
case 8:
161
162
/* lld/scd are only available for MIPS64 */
162
163
if (!IS_ENABLED(CONFIG_64BIT))
163
164
return __cmpxchg_called_with_bad_pointer();
164
165
165
-
return __cmpxchg_asm("lld", "scd", (volatile u64 *)ptr, old, new);
166
+
return __cmpxchg_asm("lld", "scd", (volatile u64 *)ptr,
167
+
(u64)old, new);
166
168
167
169
default:
168
170
return __cmpxchg_called_with_bad_pointer();
+21
-17
arch/mips/loongson32/common/platform.c
+21
-17
arch/mips/loongson32/common/platform.c
···
183
183
}
184
184
185
185
static struct plat_stmmacenet_data ls1x_eth0_pdata = {
186
-
.bus_id = 0,
187
-
.phy_addr = -1,
186
+
.bus_id = 0,
187
+
.phy_addr = -1,
188
188
#if defined(CONFIG_LOONGSON1_LS1B)
189
-
.interface = PHY_INTERFACE_MODE_MII,
189
+
.interface = PHY_INTERFACE_MODE_MII,
190
190
#elif defined(CONFIG_LOONGSON1_LS1C)
191
-
.interface = PHY_INTERFACE_MODE_RMII,
191
+
.interface = PHY_INTERFACE_MODE_RMII,
192
192
#endif
193
-
.mdio_bus_data = &ls1x_mdio_bus_data,
194
-
.dma_cfg = &ls1x_eth_dma_cfg,
195
-
.has_gmac = 1,
196
-
.tx_coe = 1,
197
-
.init = ls1x_eth_mux_init,
193
+
.mdio_bus_data = &ls1x_mdio_bus_data,
194
+
.dma_cfg = &ls1x_eth_dma_cfg,
195
+
.has_gmac = 1,
196
+
.tx_coe = 1,
197
+
.rx_queues_to_use = 1,
198
+
.tx_queues_to_use = 1,
199
+
.init = ls1x_eth_mux_init,
198
200
};
199
201
200
202
static struct resource ls1x_eth0_resources[] = {
···
224
222
225
223
#ifdef CONFIG_LOONGSON1_LS1B
226
224
static struct plat_stmmacenet_data ls1x_eth1_pdata = {
227
-
.bus_id = 1,
228
-
.phy_addr = -1,
229
-
.interface = PHY_INTERFACE_MODE_MII,
230
-
.mdio_bus_data = &ls1x_mdio_bus_data,
231
-
.dma_cfg = &ls1x_eth_dma_cfg,
232
-
.has_gmac = 1,
233
-
.tx_coe = 1,
234
-
.init = ls1x_eth_mux_init,
225
+
.bus_id = 1,
226
+
.phy_addr = -1,
227
+
.interface = PHY_INTERFACE_MODE_MII,
228
+
.mdio_bus_data = &ls1x_mdio_bus_data,
229
+
.dma_cfg = &ls1x_eth_dma_cfg,
230
+
.has_gmac = 1,
231
+
.tx_coe = 1,
232
+
.rx_queues_to_use = 1,
233
+
.tx_queues_to_use = 1,
234
+
.init = ls1x_eth_mux_init,
235
235
};
236
236
237
237
static struct resource ls1x_eth1_resources[] = {
-2
arch/mips/math-emu/cp1emu.c
-2
arch/mips/math-emu/cp1emu.c
···
2558
2558
break;
2559
2559
default:
2560
2560
/* Reserved R6 ops */
2561
-
pr_err("Reserved MIPS R6 CMP.condn.S operation\n");
2562
2561
return SIGILL;
2563
2562
}
2564
2563
}
···
2718
2719
break;
2719
2720
default:
2720
2721
/* Reserved R6 ops */
2721
-
pr_err("Reserved MIPS R6 CMP.condn.D operation\n");
2722
2722
return SIGILL;
2723
2723
}
2724
2724
}
+1
-1
arch/mips/net/ebpf_jit.c
+1
-1
arch/mips/net/ebpf_jit.c
+2
-4
arch/mips/tools/generic-board-config.sh
+2
-4
arch/mips/tools/generic-board-config.sh
···
30
30
boards_origin="$5"
31
31
shift 5
32
32
33
-
cd "${srctree}"
34
-
35
33
# Only print Skipping... lines if the user explicitly specified BOARDS=. In the
36
34
# general case it only serves to obscure the useful output about what actually
37
35
# was included.
···
46
48
esac
47
49
48
50
for board in $@; do
49
-
board_cfg="arch/mips/configs/generic/board-${board}.config"
51
+
board_cfg="${srctree}/arch/mips/configs/generic/board-${board}.config"
50
52
if [ ! -f "${board_cfg}" ]; then
51
53
echo "WARNING: Board config '${board_cfg}' not found"
52
54
continue
···
82
84
done || continue
83
85
84
86
# Merge this board config fragment into our final config file
85
-
./scripts/kconfig/merge_config.sh \
87
+
${srctree}/scripts/kconfig/merge_config.sh \
86
88
-m -O ${objtree} ${cfg} ${board_cfg} \
87
89
| grep -Ev '^(#|Using)'
88
90
done