History

Merge tag 'powerpc-4.20-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

Pull powerpc fixes from Michael Ellerman: "One notable fix for our change to split pt_regs between user/kernel, we forgot to update BPF to use the user-visible type which was an ABI break for BPF programs. A slightly ugly but minimal fix to do_syscall_trace_enter() so that we use tracehook_report_syscall_entry() properly. We'll rework the code in next to avoid the empty if body. Seven commits fixing bugs in the new papr_scm (Storage Class Memory) driver. The driver was finally able to be tested on the other hypervisor which exposed several bugs. The fixes are all fairly minimal at least. Fix a crash in our MSI code if an MSI-capable device is plugged into a non-MSI capable PHB, only seen on older hardware (MPC8378). Fix our legacy serial code to look for "stdout-path" since the device trees were updated to use that instead of "linux,stdout-path". A change to the COFF zImage code to fix booting old powermacs. A couple of minor build fixes. Thanks to: Benjamin Herrenschmidt, Daniel Axtens, Dmitry V. Levin, Elvira Khabirova, Oliver O'Halloran, Paul Mackerras, Radu Rendec, Rob Herring, Sandipan Das" * tag 'powerpc-4.20-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: powerpc/ptrace: replace ptrace_report_syscall() with a tracehook call powerpc/mm: Fallback to RAM if the altmap is unusable powerpc/papr_scm: Use ibm,unit-guid as the iset cookie powerpc/papr_scm: Fix DIMM device registration race powerpc/papr_scm: Remove endian conversions powerpc/papr_scm: Update DT properties powerpc/papr_scm: Fix resource end address powerpc/papr_scm: Use depend instead of select powerpc/bpf: Fix broken uapi for BPF_PROG_TYPE_PERF_EVENT powerpc/boot: Fix build failures with -j 1 powerpc: Look for "stdout-path" when setting up legacy consoles powerpc/msi: Fix NULL pointer access in teardown code powerpc/mm: Fix linux page tables build with some configs powerpc: Fix COFF zImage booting on old powermacs

Linus Torvalds committed 7 years ago

Commit 46454532 parents c19bf74 a225f1512 files · +80 −20Browse files

Unified · Split

12 files
  1. arch/powerpc/boot/Makefile +1 −1
  2. arch/powerpc/boot/crt0.S +3 −1
  3. arch/powerpc/include/asm/perf_event.h +2 −0
  4. arch/powerpc/include/uapi/asm/Kbuild +0 −1
  5. arch/powerpc/include/uapi/asm/bpf_perf_event.h +9 −0
  6. arch/powerpc/kernel/legacy_serial.c +5 −1
  7. arch/powerpc/kernel/msi.c +6 −1
  8. arch/powerpc/kernel/ptrace.c +6 −1
  9. arch/powerpc/mm/dump_linuxpagetables.c +1 −0
  10. arch/powerpc/mm/init_64.c +16 −3
  11. arch/powerpc/platforms/pseries/Kconfig +1 −2
  12. arch/powerpc/platforms/pseries/papr_scm.c +30 −9
arch/powerpc/boot/Makefile+1−1
@@ -197,7 +197,7 @@ $(obj)/empty.c: · 196 unmodified lines
197197 $(obj)/zImage.coff.lds $(obj)/zImage.ps3.lds : $(obj)/%: $(srctree)/$(src)/%.S
198198 $(Q)cp $< $@
199199
200−$(obj)/serial.c: $(obj)/autoconf.h
200+$(srctree)/$(src)/serial.c: $(obj)/autoconf.h
201201
202202 $(obj)/autoconf.h: $(obj)/%: $(objtree)/include/generated/%
203203 $(Q)cp $< $@
arch/powerpc/boot/crt0.S+3−1
@@ -15,7 +15,7 @@ · 14 unmodified lines
1515 RELA = 7
1616 RELACOUNT = 0x6ffffff9
1717
18− .text
18+ .data
1919 /* A procedure descriptor used when booting this as a COFF file.
2020 * When making COFF, this comes first in the link and we're
2121 * linked at 0x500000.
@@ -23,6 +23,8 @@ RELACOUNT = 0x6ffffff9 · 1 unmodified line
2323 .globl _zimage_start_opd
2424 _zimage_start_opd:
2525 .long 0x500000, 0, 0, 0
26+ .text
27+ b _zimage_start
2628
2729 #ifdef __powerpc64__
2830 .balign 8
arch/powerpc/include/asm/perf_event.h+2−0
@@ -26,6 +26,8 @@ · 25 unmodified lines
2626 #include <asm/ptrace.h>
2727 #include <asm/reg.h>
2828
29+#define perf_arch_bpf_user_pt_regs(regs) &regs->user_regs
30+
2931 /*
3032 * Overload regs->result to specify whether we should use the MSR (result
3133 * is zero) or the SIAR (result is non zero).
arch/powerpc/include/uapi/asm/Kbuild+0−1
@@ -1,7 +1,6 @@
11 # UAPI Header export list
22 include include/uapi/asm-generic/Kbuild.asm
33
4−generic-y += bpf_perf_event.h
54 generic-y += param.h
65 generic-y += poll.h
76 generic-y += resource.h
arch/powerpc/include/uapi/asm/bpf_perf_event.h+9−0
@@ -0,0 +1,9 @@
1+/* SPDX-License-Identifier: GPL-2.0 */
2+#ifndef _UAPI__ASM_BPF_PERF_EVENT_H__
3+#define _UAPI__ASM_BPF_PERF_EVENT_H__
4+
5+#include <asm/ptrace.h>
6+
7+typedef struct user_pt_regs bpf_user_pt_regs_t;
8+
9+#endif /* _UAPI__ASM_BPF_PERF_EVENT_H__ */
arch/powerpc/kernel/legacy_serial.c+5−1
@@ -372,6 +372,8 @@ void __init find_legacy_serial_ports(void) · 371 unmodified lines
372372
373373 /* Now find out if one of these is out firmware console */
374374 path = of_get_property(of_chosen, "linux,stdout-path", NULL);
375+ if (path == NULL)
376+ path = of_get_property(of_chosen, "stdout-path", NULL);
375377 if (path != NULL) {
376378 stdout = of_find_node_by_path(path);
377379 if (stdout)
@@ -595,8 +597,10 @@ static int __init check_legacy_serial_console(void) · 217 unmodified lines
595597 /* We are getting a weird phandle from OF ... */
596598 /* ... So use the full path instead */
597599 name = of_get_property(of_chosen, "linux,stdout-path", NULL);
600+ if (name == NULL)
601+ name = of_get_property(of_chosen, "stdout-path", NULL);
598602 if (name == NULL) {
599− DBG(" no linux,stdout-path !\n");
603+ DBG(" no stdout-path !\n");
600604 return -ENODEV;
601605 }
602606 prom_stdout = of_find_node_by_path(name);
arch/powerpc/kernel/msi.c+6−1
@@ -34,5 +34,10 @@ void arch_teardown_msi_irqs(struct pci_dev *dev) · 33 unmodified lines
3434 {
3535 struct pci_controller *phb = pci_bus_to_host(dev->bus);
3636
37− phb->controller_ops.teardown_msi_irqs(dev);
37+ /*
38+ * We can be called even when arch_setup_msi_irqs() returns -ENOSYS,
39+ * so check the pointer again.
40+ */
41+ if (phb->controller_ops.teardown_msi_irqs)
42+ phb->controller_ops.teardown_msi_irqs(dev);
3843 }
arch/powerpc/kernel/ptrace.c+6−1
@@ -3266,12 +3266,17 @@ long do_syscall_trace_enter(struct pt_regs *regs) · 3265 unmodified lines
32663266 user_exit();
32673267
32683268 if (test_thread_flag(TIF_SYSCALL_EMU)) {
3269− ptrace_report_syscall(regs);
32703269 /*
3270+ * A nonzero return code from tracehook_report_syscall_entry()
3271+ * tells us to prevent the syscall execution, but we are not
3272+ * going to execute it anyway.
3273+ *
32713274 * Returning -1 will skip the syscall execution. We want to
32723275 * avoid clobbering any register also, thus, not 'gotoing'
32733276 * skip label.
32743277 */
3278+ if (tracehook_report_syscall_entry(regs))
3279+ ;
32753280 return -1;
32763281 }
32773282
arch/powerpc/mm/dump_linuxpagetables.c+1−0
@@ -19,6 +19,7 @@ · 18 unmodified lines
1919 #include <linux/hugetlb.h>
2020 #include <linux/io.h>
2121 #include <linux/mm.h>
22+#include <linux/highmem.h>
2223 #include <linux/sched.h>
2324 #include <linux/seq_file.h>
2425 #include <asm/fixmap.h>
arch/powerpc/mm/init_64.c+16−3
@@ -188,15 +188,20 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node, · 187 unmodified lines
188188 pr_debug("vmemmap_populate %lx..%lx, node %d\n", start, end, node);
189189
190190 for (; start < end; start += page_size) {
191− void *p;
191+ void *p = NULL;
192192 int rc;
193193
194194 if (vmemmap_populated(start, page_size))
195195 continue;
196196
197+ /*
198+ * Allocate from the altmap first if we have one. This may
199+ * fail due to alignment issues when using 16MB hugepages, so
200+ * fall back to system memory if the altmap allocation fail.
201+ */
197202 if (altmap)
198203 p = altmap_alloc_block_buf(page_size, altmap);
199− else
204+ if (!p)
200205 p = vmemmap_alloc_block_buf(page_size, node);
201206 if (!p)
202207 return -ENOMEM;
@@ -255,8 +260,15 @@ void __ref vmemmap_free(unsigned long start, unsigned long end, · 52 unmodified lines
255260 {
256261 unsigned long page_size = 1 << mmu_psize_defs[mmu_vmemmap_psize].shift;
257262 unsigned long page_order = get_order(page_size);
263+ unsigned long alt_start = ~0, alt_end = ~0;
264+ unsigned long base_pfn;
258265
259266 start = _ALIGN_DOWN(start, page_size);
267+ if (altmap) {
268+ alt_start = altmap->base_pfn;
269+ alt_end = altmap->base_pfn + altmap->reserve +
270+ altmap->free + altmap->alloc + altmap->align;
271+ }
260272
261273 pr_debug("vmemmap_free %lx...%lx\n", start, end);
262274
@@ -280,8 +292,9 @@ void __ref vmemmap_free(unsigned long start, unsigned long end, · 17 unmodified lines
280292 page = pfn_to_page(addr >> PAGE_SHIFT);
281293 section_base = pfn_to_page(vmemmap_section_start(start));
282294 nr_pages = 1 << page_order;
295+ base_pfn = PHYS_PFN(addr);
283296
284− if (altmap) {
297+ if (base_pfn >= alt_start && base_pfn < alt_end) {
285298 vmem_altmap_free(altmap, nr_pages);
286299 } else if (PageReserved(page)) {
287300 /* allocated from bootmem */
arch/powerpc/platforms/pseries/Kconfig+1−2
@@ -140,8 +140,7 @@ config IBMEBUS · 139 unmodified lines
140140 Bus device driver for GX bus based adapters.
141141
142142 config PAPR_SCM
143− depends on PPC_PSERIES && MEMORY_HOTPLUG
144− select LIBNVDIMM
143+ depends on PPC_PSERIES && MEMORY_HOTPLUG && LIBNVDIMM
145144 tristate "Support for the PAPR Storage Class Memory interface"
146145 help
147146 Enable access to hypervisor provided storage class memory.
arch/powerpc/platforms/pseries/papr_scm.c+30−9
@@ -55,7 +55,7 @@ static int drc_pmem_bind(struct papr_scm_priv *p) · 54 unmodified lines
5555 do {
5656 rc = plpar_hcall(H_SCM_BIND_MEM, ret, p->drc_index, 0,
5757 p->blocks, BIND_ANY_ADDR, token);
58− token = be64_to_cpu(ret[0]);
58+ token = ret[0];
5959 cond_resched();
6060 } while (rc == H_BUSY);
6161
@@ -64,7 +64,7 @@ static int drc_pmem_bind(struct papr_scm_priv *p) · 2 unmodified lines
6464 return -ENXIO;
6565 }
6666
67− p->bound_addr = be64_to_cpu(ret[1]);
67+ p->bound_addr = ret[1];
6868
6969 dev_dbg(&p->pdev->dev, "bound drc %x to %pR\n", p->drc_index, &p->res);
7070
@@ -82,7 +82,7 @@ static int drc_pmem_unbind(struct papr_scm_priv *p) · 11 unmodified lines
8282 do {
8383 rc = plpar_hcall(H_SCM_UNBIND_MEM, ret, p->drc_index,
8484 p->bound_addr, p->blocks, token);
85− token = be64_to_cpu(ret);
85+ token = ret[0];
8686 cond_resched();
8787 } while (rc == H_BUSY);
8888
@@ -223,6 +223,9 @@ static int papr_scm_nvdimm_init(struct papr_scm_priv *p) · 134 unmodified lines
223223 goto err;
224224 }
225225
226+ if (nvdimm_bus_check_dimm_count(p->bus, 1))
227+ goto err;
228+
226229 /* now add the region */
227230
228231 memset(&mapping, 0, sizeof(mapping));
@@ -257,9 +260,12 @@ err: nvdimm_bus_unregister(p->bus); · 28 unmodified lines
257260
258261 static int papr_scm_probe(struct platform_device *pdev)
259262 {
260− uint32_t drc_index, metadata_size, unit_cap[2];
261263 struct device_node *dn = pdev->dev.of_node;
264+ u32 drc_index, metadata_size;
265+ u64 blocks, block_size;
262266 struct papr_scm_priv *p;
267+ const char *uuid_str;
268+ u64 uuid[2];
263269 int rc;
264270
265271 /* check we have all the required DT properties */
@@ -268,8 +274,18 @@ static int papr_scm_probe(struct platform_device *pdev) · 2 unmodified lines
268274 return -ENODEV;
269275 }
270276
271− if (of_property_read_u32_array(dn, "ibm,unit-capacity", unit_cap, 2)) {
272− dev_err(&pdev->dev, "%pOF: missing unit-capacity!\n", dn);
277+ if (of_property_read_u64(dn, "ibm,block-size", &block_size)) {
278+ dev_err(&pdev->dev, "%pOF: missing block-size!\n", dn);
279+ return -ENODEV;
280+ }
281+
282+ if (of_property_read_u64(dn, "ibm,number-of-blocks", &blocks)) {
283+ dev_err(&pdev->dev, "%pOF: missing number-of-blocks!\n", dn);
284+ return -ENODEV;
285+ }
286+
287+ if (of_property_read_string(dn, "ibm,unit-guid", &uuid_str)) {
288+ dev_err(&pdev->dev, "%pOF: missing unit-guid!\n", dn);
273289 return -ENODEV;
274290 }
275291
@@ -282,8 +298,13 @@ static int papr_scm_probe(struct platform_device *pdev) · 6 unmodified lines
282298
283299 p->dn = dn;
284300 p->drc_index = drc_index;
285− p->block_size = unit_cap[0];
286− p->blocks = unit_cap[1];
301+ p->block_size = block_size;
302+ p->blocks = blocks;
303+
304+ /* We just need to ensure that set cookies are unique across */
305+ uuid_parse(uuid_str, (uuid_t *) uuid);
306+ p->nd_set.cookie1 = uuid[0];
307+ p->nd_set.cookie2 = uuid[1];
287308
288309 /* might be zero */
289310 p->metadata_size = metadata_size;
@@ -296,7 +317,7 @@ static int papr_scm_probe(struct platform_device *pdev) · 6 unmodified lines
296317
297318 /* setup the resource for the newly bound range */
298319 p->res.start = p->bound_addr;
299− p->res.end = p->bound_addr + p->blocks * p->block_size;
320+ p->res.end = p->bound_addr + p->blocks * p->block_size - 1;
300321 p->res.name = pdev->name;
301322 p->res.flags = IORESOURCE_MEM;
302323

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t