Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'sh-for-4.17-fixes' of git://git.libc.org/linux-sh
Pull arch/sh fixes from Rich Felker:
"Fixes for critical regressions and a build failure.
The regressions were introduced in 4.15 and 4.17-rc1 and prevented
booting on affected systems"
* tag 'sh-for-4.17-fixes' of git://git.libc.org/linux-sh:
sh: switch to NO_BOOTMEM
sh: mm: Fix unprotected access to struct device
sh: fix build failure for J2 cpu with SMP disabled
+19
-85
+1
arch/sh/Kconfig
+1
arch/sh/Kconfig
+4
arch/sh/kernel/cpu/sh2/probe.c
+4
arch/sh/kernel/cpu/sh2/probe.c
···
43
43
#endif
44
44
45
45
#if defined(CONFIG_CPU_J2)
46
+
#if defined(CONFIG_SMP)
46
47
unsigned cpu = hard_smp_processor_id();
48
+
#else
49
+
unsigned cpu = 0;
50
+
#endif
47
51
if (cpu == 0) of_scan_flat_dt(scan_cache, NULL);
48
52
if (j2_ccr_base) __raw_writel(0x80000303, j2_ccr_base + 4*cpu);
49
53
if (cpu != 0) return;
-1
arch/sh/kernel/setup.c
-1
arch/sh/kernel/setup.c
+8
-3
arch/sh/mm/consistent.c
+8
-3
arch/sh/mm/consistent.c
···
59
59
60
60
split_page(pfn_to_page(virt_to_phys(ret) >> PAGE_SHIFT), order);
61
61
62
-
*dma_handle = virt_to_phys(ret) - PFN_PHYS(dev->dma_pfn_offset);
62
+
*dma_handle = virt_to_phys(ret);
63
+
if (!WARN_ON(!dev))
64
+
*dma_handle -= PFN_PHYS(dev->dma_pfn_offset);
63
65
64
66
return ret_nocache;
65
67
}
···
71
69
unsigned long attrs)
72
70
{
73
71
int order = get_order(size);
74
-
unsigned long pfn = (dma_handle >> PAGE_SHIFT) + dev->dma_pfn_offset;
72
+
unsigned long pfn = dma_handle >> PAGE_SHIFT;
75
73
int k;
74
+
75
+
if (!WARN_ON(!dev))
76
+
pfn += dev->dma_pfn_offset;
76
77
77
78
for (k = 0; k < (1 << order); k++)
78
79
__free_pages(pfn_to_page(pfn + k), 0);
···
148
143
if (!memsize)
149
144
return 0;
150
145
151
-
buf = dma_alloc_coherent(NULL, memsize, &dma_handle, GFP_KERNEL);
146
+
buf = dma_alloc_coherent(&pdev->dev, memsize, &dma_handle, GFP_KERNEL);
152
147
if (!buf) {
153
148
pr_warning("%s: unable to allocate memory\n", name);
154
149
return -ENOMEM;
+6
-62
arch/sh/mm/init.c
+6
-62
arch/sh/mm/init.c
···
211
211
212
212
NODE_DATA(nid) = __va(phys);
213
213
memset(NODE_DATA(nid), 0, sizeof(struct pglist_data));
214
-
215
-
NODE_DATA(nid)->bdata = &bootmem_node_data[nid];
216
214
#endif
217
215
218
216
NODE_DATA(nid)->node_start_pfn = start_pfn;
219
217
NODE_DATA(nid)->node_spanned_pages = end_pfn - start_pfn;
220
218
}
221
219
222
-
static void __init bootmem_init_one_node(unsigned int nid)
223
-
{
224
-
unsigned long total_pages, paddr;
225
-
unsigned long end_pfn;
226
-
struct pglist_data *p;
227
-
228
-
p = NODE_DATA(nid);
229
-
230
-
/* Nothing to do.. */
231
-
if (!p->node_spanned_pages)
232
-
return;
233
-
234
-
end_pfn = pgdat_end_pfn(p);
235
-
236
-
total_pages = bootmem_bootmap_pages(p->node_spanned_pages);
237
-
238
-
paddr = memblock_alloc(total_pages << PAGE_SHIFT, PAGE_SIZE);
239
-
if (!paddr)
240
-
panic("Can't allocate bootmap for nid[%d]\n", nid);
241
-
242
-
init_bootmem_node(p, paddr >> PAGE_SHIFT, p->node_start_pfn, end_pfn);
243
-
244
-
free_bootmem_with_active_regions(nid, end_pfn);
245
-
246
-
/*
247
-
* XXX Handle initial reservations for the system memory node
248
-
* only for the moment, we'll refactor this later for handling
249
-
* reservations in other nodes.
250
-
*/
251
-
if (nid == 0) {
252
-
struct memblock_region *reg;
253
-
254
-
/* Reserve the sections we're already using. */
255
-
for_each_memblock(reserved, reg) {
256
-
reserve_bootmem(reg->base, reg->size, BOOTMEM_DEFAULT);
257
-
}
258
-
}
259
-
260
-
sparse_memory_present_with_active_regions(nid);
261
-
}
262
-
263
220
static void __init do_init_bootmem(void)
264
221
{
265
222
struct memblock_region *reg;
266
-
int i;
267
223
268
224
/* Add active regions with valid PFNs. */
269
225
for_each_memblock(memory, reg) {
···
235
279
236
280
plat_mem_setup();
237
281
238
-
for_each_online_node(i)
239
-
bootmem_init_one_node(i);
282
+
for_each_memblock(memory, reg) {
283
+
int nid = memblock_get_region_node(reg);
240
284
285
+
memory_present(nid, memblock_region_memory_base_pfn(reg),
286
+
memblock_region_memory_end_pfn(reg));
287
+
}
241
288
sparse_init();
242
289
}
243
290
···
281
322
{
282
323
unsigned long max_zone_pfns[MAX_NR_ZONES];
283
324
unsigned long vaddr, end;
284
-
int nid;
285
325
286
326
sh_mv.mv_mem_init();
287
327
···
335
377
kmap_coherent_init();
336
378
337
379
memset(max_zone_pfns, 0, sizeof(max_zone_pfns));
338
-
339
-
for_each_online_node(nid) {
340
-
pg_data_t *pgdat = NODE_DATA(nid);
341
-
unsigned long low, start_pfn;
342
-
343
-
start_pfn = pgdat->bdata->node_min_pfn;
344
-
low = pgdat->bdata->node_low_pfn;
345
-
346
-
if (max_zone_pfns[ZONE_NORMAL] < low)
347
-
max_zone_pfns[ZONE_NORMAL] = low;
348
-
349
-
printk("Node %u: start_pfn = 0x%lx, low = 0x%lx\n",
350
-
nid, start_pfn, low);
351
-
}
352
-
380
+
max_zone_pfns[ZONE_NORMAL] = max_low_pfn;
353
381
free_area_init_nodes(max_zone_pfns);
354
382
}
355
383
-19
arch/sh/mm/numa.c
-19
arch/sh/mm/numa.c
···
8
8
* for more details.
9
9
*/
10
10
#include <linux/module.h>
11
-
#include <linux/bootmem.h>
12
11
#include <linux/memblock.h>
13
12
#include <linux/mm.h>
14
13
#include <linux/numa.h>
···
25
26
*/
26
27
void __init setup_bootmem_node(int nid, unsigned long start, unsigned long end)
27
28
{
28
-
unsigned long bootmap_pages;
29
29
unsigned long start_pfn, end_pfn;
30
-
unsigned long bootmem_paddr;
31
30
32
31
/* Don't allow bogus node assignment */
33
32
BUG_ON(nid >= MAX_NUMNODES || nid <= 0);
···
45
48
SMP_CACHE_BYTES, end));
46
49
memset(NODE_DATA(nid), 0, sizeof(struct pglist_data));
47
50
48
-
NODE_DATA(nid)->bdata = &bootmem_node_data[nid];
49
51
NODE_DATA(nid)->node_start_pfn = start_pfn;
50
52
NODE_DATA(nid)->node_spanned_pages = end_pfn - start_pfn;
51
-
52
-
/* Node-local bootmap */
53
-
bootmap_pages = bootmem_bootmap_pages(end_pfn - start_pfn);
54
-
bootmem_paddr = memblock_alloc_base(bootmap_pages << PAGE_SHIFT,
55
-
PAGE_SIZE, end);
56
-
init_bootmem_node(NODE_DATA(nid), bootmem_paddr >> PAGE_SHIFT,
57
-
start_pfn, end_pfn);
58
-
59
-
free_bootmem_with_active_regions(nid, end_pfn);
60
-
61
-
/* Reserve the pgdat and bootmap space with the bootmem allocator */
62
-
reserve_bootmem_node(NODE_DATA(nid), start_pfn << PAGE_SHIFT,
63
-
sizeof(struct pglist_data), BOOTMEM_DEFAULT);
64
-
reserve_bootmem_node(NODE_DATA(nid), bootmem_paddr,
65
-
bootmap_pages << PAGE_SHIFT, BOOTMEM_DEFAULT);
66
53
67
54
/* It's up */
68
55
node_set_online(nid);