[PATCH] powerpc/powermac/low_i2c: Fix refcount leak bug in kw_i2c_probe()
We should call of_node_put() for the reference 'parent' returned by
of_get_parent() which has increased the refcount.
Fixes: 730745a5c450 ("[PATCH] 1/5 powerpc: Rework PowerMac i2c part 1")
Signed-off-by: Liang He
---
arch/powerpc/platforms/powermac/low_i2c.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/powerpc/platforms/powermac/low_i2c.c
b/arch/powerpc/platforms/powermac/low_i2c.c
index c1c430c66dc9..40f3aa432fba 100644
--- a/arch/powerpc/platforms/powermac/low_i2c.c
+++ b/arch/powerpc/platforms/powermac/low_i2c.c
@@ -627,6 +627,7 @@ static void __init kw_i2c_probe(void)
if (parent == NULL)
continue;
chans = parent->name[0] == 'u' ? 2 : 1;
+ of_node_put(parent);
for (i = 0; i < chans; i++)
kw_i2c_add(host, np, np, i);
} else {
--
2.25.1
[PATCH] powerpc/powermac/pfunc_base: Fix refcount leak bug in macio_gpio_init_one()
We should call of_node_put() for the reference 'gparent' escaped
out of the for_each_child_of_node() as it has increased the refcount.
Fixes: 5b9ca526917b ("[PATCH] 3/5 powerpc: Add platform functions interpreter")
Signed-off-by: Liang He
---
arch/powerpc/platforms/powermac/pfunc_base.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/powerpc/platforms/powermac/pfunc_base.c
b/arch/powerpc/platforms/powermac/pfunc_base.c
index 9c2947a3edd5..085e0ad20eba 100644
--- a/arch/powerpc/platforms/powermac/pfunc_base.c
+++ b/arch/powerpc/platforms/powermac/pfunc_base.c
@@ -136,6 +136,8 @@ static void __init macio_gpio_init_one(struct macio_chip
*macio)
for_each_child_of_node(gparent, gp)
pmf_do_functions(gp, NULL, 0, PMF_FLAGS_ON_INIT, NULL);
+ of_node_put(gparent);
+
/* Note: We do not at this point implement the "at sleep" or "at wake"
* functions. I yet to find any for GPIOs anyway
*/
--
2.25.1
[PATCH] powerpc/powermac/udbg_scc: Fix refcount leak bug in udbg_scc_init()
During the iteration of for_each_child_of_node(), we need to call
of_node_put() for the old references stored in to 'ch_def' and 'ch_a'
as their refcounters have been increased in last iteration.
Fixes: 51d3082fe6e5 ("[PATCH] powerpc: Unify udbg (#2)")
Signed-off-by: Liang He
---
arch/powerpc/platforms/powermac/udbg_scc.c | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/platforms/powermac/udbg_scc.c
b/arch/powerpc/platforms/powermac/udbg_scc.c
index 734df5a32f99..1b7c39e841ee 100644
--- a/arch/powerpc/platforms/powermac/udbg_scc.c
+++ b/arch/powerpc/platforms/powermac/udbg_scc.c
@@ -81,10 +81,14 @@ void __init udbg_scc_init(int force_scc)
if (path != NULL)
stdout = of_find_node_by_path(path);
for_each_child_of_node(escc, ch) {
- if (ch == stdout)
+ if (ch == stdout) {
+ of_node_put(ch_def);
ch_def = of_node_get(ch);
- if (of_node_name_eq(ch, "ch-a"))
+ }
+ if (of_node_name_eq(ch, "ch-a")) {
+ of_node_put(ch_a);
ch_a = of_node_get(ch);
+ }
}
if (ch_def == NULL && !force_scc)
goto bail;
--
2.25.1
Re: [PATCH v7 21/25] Kbuild: add Rust support
On Mon, May 23, 2022 at 11:04 AM Miguel Ojeda wrote: > > Having all the new files in place, we now enable Rust support > in the build system, including `Kconfig` entries related to Rust, > the Rust configuration printer, the target specification > generation script, the version detection script and a few > other bits. > > Co-developed-by: Alex Gaynor > Signed-off-by: Alex Gaynor > Co-developed-by: Finn Behrens > Signed-off-by: Finn Behrens > Co-developed-by: Adam Bratschi-Kaye > Signed-off-by: Adam Bratschi-Kaye > Co-developed-by: Wedson Almeida Filho > Signed-off-by: Wedson Almeida Filho > Co-developed-by: Michael Ellerman > Signed-off-by: Michael Ellerman > Co-developed-by: Sven Van Asbroeck > Signed-off-by: Sven Van Asbroeck > Co-developed-by: Gary Guo > Signed-off-by: Gary Guo > Co-developed-by: Boris-Chengbiao Zhou > Signed-off-by: Boris-Chengbiao Zhou > Co-developed-by: Boqun Feng > Signed-off-by: Boqun Feng > Co-developed-by: Douglas Su > Signed-off-by: Douglas Su > Co-developed-by: Dariusz Sosnowski > Signed-off-by: Dariusz Sosnowski > Co-developed-by: Antonio Terceiro > Signed-off-by: Antonio Terceiro > Co-developed-by: Daniel Xu > Signed-off-by: Daniel Xu > Co-developed-by: Miguel Cano > Signed-off-by: Miguel Cano > Co-developed-by: David Gow > Signed-off-by: David Gow > Signed-off-by: Miguel Ojeda > --- > +# Rust targets > +# --- > + > +# "Is Rust available?" target > +PHONY += rustavailable > +rustavailable: > + $(Q)$(CONFIG_SHELL) $(srctree)/scripts/rust-is-available.sh -v && > echo >&2 "Rust is available!" > + Is it intentional to print the successful message to stderr? -- Best Regards Masahiro Yamada
Re: [PATCH v7 21/25] Kbuild: add Rust support
Hi Masahiro, On Sat, Jul 16, 2022 at 10:23 AM Masahiro Yamada wrote: > > Is it intentional to print the successful message to stderr? I think it makes sense to change it to `stdout`, given the message is the main point of running `rustavailable` for normal users, and those that just want the status code may ignore it. Thanks for taking a look again! Cheers, Miguel
Re: [PATCH v2 1/2] powerpc/pci: Add config option for using OF 'reg' for PCI domain
On Friday 15 July 2022 15:32:56 Guilherme G. Piccoli wrote: > On 15/07/2022 14:11, Pali Rohár wrote: > > [...] > >> > >> I found this sentence a bit weird, "in the similar way like it is doing > >> kernel for other architectures", but other than that: > > > > If you have some idea how to improve commit description, let me know and > > I can change it. > > > > Oh, for example: "in similar way the kernel is doing for other > architectures". The sentence idea is perfectly fine, it's just that it's > a bit oddly constructed IMHO heh > > Cheers! Ou, sorry. English is not my first nor second language. Michael, should I resend this patch series with Guilherme's suggestion for changing working in commit description? Or will you adjust it manually?
Re: [PATCH v7 00/25] Rust support
Hi Conor, On Sat, Jul 16, 2022 at 2:42 PM Conor Dooley wrote: > > Maybe I am just missing something blatantly obvious here, but trying > to build rust support in -next fails for me. I am using ClangBuiltLinux > clang version 15.0.0 5b0788fef86ed7008a11f6ee19b9d86d42b6fcfa and LLD > 15.0.0. Is it just expected that building -next with rust support is > not a good idea? Please see https://github.com/Rust-for-Linux/linux/issues/795 for details about the maple tree issue. I will update the `rust-next` branch next week with the new version of the patches; but if you are interested in developing, please use the development `rust` branch instead in GitHub for the moment. Cheers, Miguel
Re: [PATCH v7 00/25] Rust support
On Sat, Jul 16, 2022 at 3:51 PM wrote: > > Ah right, sorry for the noise so. I checked the ml but didn't see a > report there. No apologies needed -- thanks to you for the report, instead! :) > Thanks Miguel, good to know! I'll just wait around for a new version. > Just been trying to get my CI etc in order for when rust support lands, > but it sounds like I should be okay as it's a known problem & not some > only-broken-on-riscv thing. Yeah, it is a simple `bindgen` issue. Thanks a lot for making the effort to prepare your CI in advance! Cheers, Miguel
Re: [PATCH v7 00/25] Rust support
Hey,
Maybe I am just missing something blatantly obvious here, but trying
to build rust support in -next fails for me. I am using ClangBuiltLinux
clang version 15.0.0 5b0788fef86ed7008a11f6ee19b9d86d42b6fcfa and LLD
15.0.0. Is it just expected that building -next with rust support is
not a good idea?
My defconfig is the default RISC-V one plus:
CONFIG_RUST=y
CONFIG_SAMPLES=y
CONFIG_SAMPLES_RUST=y
CONFIG_SAMPLE_RUST_MINIMAL=y
Thanks,
Conor.
Fail log:
UPD rust/target.json
BINDGEN rust/bindings_generated.rs
BINDGEN rust/bindings_helpers_generated.rs
RUSTC L rust/core.o
EXPORTS rust/exports_core_generated.h
RUSTC P rust/libmacros.so
RUSTC L rust/compiler_builtins.o
RUSTC L rust/alloc.o
RUSTC L rust/build_error.o
EXPORTS rust/exports_alloc_generated.h
RUSTC L rust/kernel.o
error[E0428]: the name `maple_enode` is defined multiple times
--> linux/rust/bindings_generated.rs:18009:1
|
18006 | pub struct maple_enode {
| -- previous definition of the type `maple_enode`
here
...
18009 | pub type maple_enode = *mut maple_enode;
| `maple_enode` redefined here
|
= note: `maple_enode` must be defined only once in the type namespace of
this module
error[E0428]: the name `maple_pnode` is defined multiple times
--> linux/rust/bindings_generated.rs:18015:1
|
18012 | pub struct maple_pnode {
| -- previous definition of the type `maple_pnode`
here
...
18015 | pub type maple_pnode = *mut maple_pnode;
| `maple_pnode` redefined here
|
= note: `maple_pnode` must be defined only once in the type namespace of
this module
error[E0391]: cycle detected when expanding type alias
`bindings::bindings_raw::maple_pnode`
--> linux/rust/bindings_generated.rs:18015:29
|
18015 | pub type maple_pnode = *mut maple_pnode;
| ^^^
|
= note: ...which immediately requires expanding type alias
`bindings::bindings_raw::maple_pnode` again
= note: type aliases cannot be recursive
= help: consider using a struct, enum, or union instead to break the cycle
= help: see
for more
information
note: cycle used when computing type of
`bindings::bindings_raw::maple_range_64::parent`
--> linux/rust/bindings_generated.rs:18058:22
|
18058 | pub parent: *mut maple_pnode,
| ^^^
error[E0391]: cycle detected when expanding type alias
`bindings::bindings_raw::maple_enode`
--> linux/rust/bindings_generated.rs:18009:29
|
18009 | pub type maple_enode = *mut maple_enode;
| ^^^
|
= note: ...which immediately requires expanding type alias
`bindings::bindings_raw::maple_enode` again
= note: type aliases cannot be recursive
= help: consider using a struct, enum, or union instead to break the cycle
= help: see
for more
information
note: cycle used when computing type of
`bindings::bindings_raw::maple_topiary::next`
--> linux/rust/bindings_generated.rs:18340:20
|
18340 | pub next: *mut maple_enode,
|^^^
error[E0117]: only traits defined in the current crate can be implemented for
arbitrary types
--> linux/rust/bindings_generated.rs:18005:10
|
18005 | #[derive(Copy, Clone)]
|
| |
| impl doesn't use only types from inside the current crate
| `*mut [type error]` is not defined in the current crate
|
= note: define and implement a trait or new type instead
= note: this error originates in the derive macro `Copy` (in Nightly
builds, run with -Z macro-backtrace for more info)
error[E0117]: only traits defined in the current crate can be implemented for
arbitrary types
--> linux/rust/bindings_generated.rs:18011:10
|
18011 | #[derive(Copy, Clone)]
|
| |
| impl doesn't use only types from inside the current crate
| `*mut [type error]` is not defined in the current crate
|
= note: define and implement a trait or new type instead
= note: this error originates in the derive macro `Copy` (in Nightly
builds, run with -Z macro-backtrace for more info)
error[E0117]: only traits defined in the current crate can be implemented for
arbitrary types
--> linux/rust/bindings_generated.rs:18005:16
|
18005 | #[derive(Copy, Clone)]
|^
||
|impl doesn't use only types from inside the current crate
|`*mut [type error]` is not defined in the current crate
|
= note: define and implement a
[PATCH] kvm:remove the unexpected word "that" in comments
delete the repeated word "that" in comments Signed-off-by: shaom Deng --- arch/powerpc/kvm/book3s_64_mmu_hv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/kvm/book3s_64_mmu_hv.c b/arch/powerpc/kvm/book3s_64_mmu_hv.c index 514fd45c1994..73c6db20cd8a 100644 --- a/arch/powerpc/kvm/book3s_64_mmu_hv.c +++ b/arch/powerpc/kvm/book3s_64_mmu_hv.c @@ -1601,7 +1601,7 @@ long kvm_vm_ioctl_resize_hpt_commit(struct kvm *kvm, * is valid, it is written to the HPT as if an H_ENTER with the * exact flag set was done. When the invalid count is non-zero * in the header written to the stream, the kernel will make - * sure that that many HPTEs are invalid, and invalidate them + * sure that many HPTEs are invalid, and invalidate them * if not. */ -- 2.34.1
[PATCH] cyrpto:delete the rebundant word "block" in comments
there is rebundant word "block" in comments, so remove it Signed-off-by: shaom Deng --- arch/powerpc/crypto/aes-spe-glue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/crypto/aes-spe-glue.c b/arch/powerpc/crypto/aes-spe-glue.c index e8dfe9fb0266..efab78a3a8f6 100644 --- a/arch/powerpc/crypto/aes-spe-glue.c +++ b/arch/powerpc/crypto/aes-spe-glue.c @@ -28,7 +28,7 @@ * instructions per clock cycle using one 32/64 bit unit (SU1) and one 32 * bit unit (SU2). One of these can be a memory access that is executed via * a single load and store unit (LSU). XTS-AES-256 takes ~780 operations per - * 16 byte block block or 25 cycles per byte. Thus 768 bytes of input data + * 16 byte block or 25 cycles per byte. Thus 768 bytes of input data * will need an estimated maximum of 20,000 cycles. Headroom for cache misses * included. Even with the low end model clocked at 667 MHz this equals to a * critical time window of less than 30us. The value has been chosen to -- 2.34.1
next-20220715 build fail due to 579b9239c1f386 (powerpc, ps3_defconfig, GCC 12.1.0)
Hi everyone,
I built next-20220715 tree, using powerpc64-unknown-linux-gnu-gcc
(GCC 12.1.0) and ps3_defconfig. The build errored on W=1 build
(-Werror=missing-prototypes):
CC arch/powerpc/mm/book3s64/pgtable.o
CC arch/powerpc/kernel/process.o
arch/powerpc/mm/book3s64/pgtable.c:478:5: error: no previous prototype for
'pmd_move_must_withdraw' [-Werror=missing-prototypes]
478 | int pmd_move_must_withdraw(struct spinlock *new_pmd_ptl,
| ^~
cc1: all warnings being treated as errors
The errored line is introduced by commit 579b9239c1f386 ("powerpc/radix: Fix
kernel crash with mremap()")
Looking at the commit, it seems like GCC didn't see the prototype which had
already been given, or am I missing something?
Thanks.
--
An old man doll... just what I always wanted! - Clara
[PATCH v2 1/2] asm-generic: Remove pci.h copying remaining code to x86
The generic pci.h header now only provides a definition of
pci_get_legacy_ide_irq which is used by architectures that support PNP.
Of the architectures that use asm-generic/pci.h this is only x86.
This patch removes the old pci.h in order to make room for a new
pci.h to be used by arm64, riscv, openrisc, etc.
The existing code in pci.h is moved out to x86. On other architectures
we clean up any outstanding references.
Suggested-by: Arnd Bergmann
Link:
https://lore.kernel.org/lkml/CAK8P3a0JmPeczfmMBE__vn=Jbvf=nkbpvazcycyv40pzncj...@mail.gmail.com/
Signed-off-by: Stafford Horne
---
arch/alpha/include/asm/pci.h | 1 -
arch/ia64/include/asm/pci.h| 1 -
arch/m68k/include/asm/pci.h| 7 +--
arch/powerpc/include/asm/pci.h | 1 -
arch/s390/include/asm/pci.h| 1 -
arch/sparc/include/asm/pci.h | 9 -
arch/x86/include/asm/pci.h | 6 --
arch/xtensa/include/asm/pci.h | 3 ---
include/asm-generic/pci.h | 17 -
9 files changed, 9 insertions(+), 37 deletions(-)
delete mode 100644 include/asm-generic/pci.h
diff --git a/arch/alpha/include/asm/pci.h b/arch/alpha/include/asm/pci.h
index cf6bc1e64d66..8ac5af0fc4da 100644
--- a/arch/alpha/include/asm/pci.h
+++ b/arch/alpha/include/asm/pci.h
@@ -56,7 +56,6 @@ struct pci_controller {
/* IOMMU controls. */
-/* TODO: integrate with include/asm-generic/pci.h ? */
static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
{
return channel ? 15 : 14;
diff --git a/arch/ia64/include/asm/pci.h b/arch/ia64/include/asm/pci.h
index 8c163d1d0189..218412d963c2 100644
--- a/arch/ia64/include/asm/pci.h
+++ b/arch/ia64/include/asm/pci.h
@@ -63,7 +63,6 @@ static inline int pci_proc_domain(struct pci_bus *bus)
return (pci_domain_nr(bus) != 0);
}
-#define HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ
static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
{
return channel ? isa_irq_to_vector(15) : isa_irq_to_vector(14);
diff --git a/arch/m68k/include/asm/pci.h b/arch/m68k/include/asm/pci.h
index 5a4bc223743b..0c272ff515cc 100644
--- a/arch/m68k/include/asm/pci.h
+++ b/arch/m68k/include/asm/pci.h
@@ -2,11 +2,14 @@
#ifndef _ASM_M68K_PCI_H
#define _ASM_M68K_PCI_H
-#include
-
#definepcibios_assign_all_busses() 1
#definePCIBIOS_MIN_IO 0x0100
#definePCIBIOS_MIN_MEM 0x0200
+static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
+{
+ return channel ? 15 : 14;
+}
+
#endif /* _ASM_M68K_PCI_H */
diff --git a/arch/powerpc/include/asm/pci.h b/arch/powerpc/include/asm/pci.h
index 915d6ee4b40a..f9da506751bb 100644
--- a/arch/powerpc/include/asm/pci.h
+++ b/arch/powerpc/include/asm/pci.h
@@ -39,7 +39,6 @@
#define pcibios_assign_all_busses() \
(pci_has_flag(PCI_REASSIGN_ALL_BUS))
-#define HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ
static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
{
if (ppc_md.pci_get_legacy_ide_irq)
diff --git a/arch/s390/include/asm/pci.h b/arch/s390/include/asm/pci.h
index fdb9745ee998..5889ddcbc374 100644
--- a/arch/s390/include/asm/pci.h
+++ b/arch/s390/include/asm/pci.h
@@ -6,7 +6,6 @@
#include
#include
#include
-#include
#include
#include
#include
diff --git a/arch/sparc/include/asm/pci.h b/arch/sparc/include/asm/pci.h
index 4deddf430e5d..0c58f65bd172 100644
--- a/arch/sparc/include/asm/pci.h
+++ b/arch/sparc/include/asm/pci.h
@@ -40,13 +40,4 @@ static inline int pci_proc_domain(struct pci_bus *bus)
#define get_pci_unmapped_area get_fb_unmapped_area
#endif /* CONFIG_SPARC64 */
-#if defined(CONFIG_SPARC64) || defined(CONFIG_LEON_PCI)
-static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
-{
- return PCI_IRQ_NONE;
-}
-#else
-#include
-#endif
-
#endif /* ___ASM_SPARC_PCI_H */
diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
index f3fd5928bcbb..7da27f665cfe 100644
--- a/arch/x86/include/asm/pci.h
+++ b/arch/x86/include/asm/pci.h
@@ -105,8 +105,10 @@ static inline void early_quirks(void) { }
extern void pci_iommu_alloc(void);
-/* generic pci stuff */
-#include
+static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
+{
+ return channel ? 15 : 14;
+}
#ifdef CONFIG_NUMA
/* Returns the node based on pci bus */
diff --git a/arch/xtensa/include/asm/pci.h b/arch/xtensa/include/asm/pci.h
index 8e2b48a268db..b56de9635b6c 100644
--- a/arch/xtensa/include/asm/pci.h
+++ b/arch/xtensa/include/asm/pci.h
@@ -43,7 +43,4 @@
#define ARCH_GENERIC_PCI_MMAP_RESOURCE 1
#define arch_can_pci_mmap_io() 1
-/* Generic PCI */
-#include
-
#endif /* _XTENSA_PCI_H */
diff --git a/include/asm-generic/pci.h b/include/asm-generic/pci.h
deleted file mode 100644
index 6bb3cd3d695a..
--- a/include/asm-generic/pci.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * linux/include/asm-generic/pci.h
- *
- * Copyright (C) 2003
Re: next-20220715 build fail due to 579b9239c1f386 (powerpc, ps3_defconfig, GCC 12.1.0)
On 7/17/22 10:27, Bagas Sanjaya wrote: > Hi everyone, > > I built next-20220715 tree, using powerpc64-unknown-linux-gnu-gcc > (GCC 12.1.0) and ps3_defconfig. The build errored on W=1 build > (-Werror=missing-prototypes): > > CC arch/powerpc/mm/book3s64/pgtable.o > CC arch/powerpc/kernel/process.o > arch/powerpc/mm/book3s64/pgtable.c:478:5: error: no previous prototype for > 'pmd_move_must_withdraw' [-Werror=missing-prototypes] > 478 | int pmd_move_must_withdraw(struct spinlock *new_pmd_ptl, > | ^~ > cc1: all warnings being treated as errors > Oops, I forget to attach the full build log. -- An old man doll... just what I always wanted! - Clara powerpc.log.gz Description: application/gzip
