Commit graph

1059881 commits

Author SHA1 Message Date
Namjae Jeon
621be84a9d ksmbd: throttle session setup failures to avoid dictionary attacks
To avoid dictionary attacks (repeated session setups rapidly sent) to
connect to server, ksmbd make a delay of a 5 seconds on session setup
failure to make it harder to send enough random connection requests
to break into a server if a user insert the wrong password 10 times
in a row.

Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
2021-10-20 00:07:10 -05:00
Hyunchul Lee
34061d6b76 ksmbd: validate OutputBufferLength of QUERY_DIR, QUERY_INFO, IOCTL requests
Validate OutputBufferLength of QUERY_DIR, QUERY_INFO, IOCTL requests and
check the free size of response buffer for these requests.

Acked-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Hyunchul Lee <hyc.lee@gmail.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
2021-10-20 00:07:10 -05:00
Meng Li
dc7e5940aa soc: fsl: dpio: use the combined functions to protect critical zone
In orininal code, use 2 function spin_lock() and local_irq_save() to
protect the critical zone. But when enable the kernel debug config,
there are below inconsistent lock state detected.
================================
WARNING: inconsistent lock state
5.10.63-yocto-standard #1 Not tainted
--------------------------------
inconsistent {SOFTIRQ-ON-W} -> {IN-SOFTIRQ-W} usage.
lock_torture_wr/226 [HC0[0]:SC1[5]:HE1:SE0] takes:
ffff002005b2dd80 (&p->access_spinlock){+.?.}-{3:3}, at: qbman_swp_enqueue_multiple_mem_back+0x44/0x270
{SOFTIRQ-ON-W} state was registered at:
  lock_acquire.part.0+0xf8/0x250
  lock_acquire+0x68/0x84
  _raw_spin_lock+0x68/0x90
  qbman_swp_enqueue_multiple_mem_back+0x44/0x270
  ......
  cryptomgr_test+0x38/0x60
  kthread+0x158/0x164
  ret_from_fork+0x10/0x38
irq event stamp: 4498
hardirqs last  enabled at (4498): [<ffff800010fcf980>] _raw_spin_unlock_irqrestore+0x90/0xb0
hardirqs last disabled at (4497): [<ffff800010fcffc4>] _raw_spin_lock_irqsave+0xd4/0xe0
softirqs last  enabled at (4458): [<ffff8000100108c4>] __do_softirq+0x674/0x724
softirqs last disabled at (4465): [<ffff80001005b2a4>] __irq_exit_rcu+0x190/0x19c

other info that might help us debug this:
 Possible unsafe locking scenario:
       CPU0
       ----
  lock(&p->access_spinlock);
  <Interrupt>
    lock(&p->access_spinlock);
 *** DEADLOCK ***

So, in order to avoid deadlock, use the combined functions
spin_lock_irqsave/spin_unlock_irqrestore() to protect critical zone.

Fixes: 3b2abda7d2 ("soc: fsl: dpio: Replace QMAN array mode with ring mode enqueue")
Cc: stable@vger.kernel.org
Signed-off-by: Meng Li <Meng.Li@windriver.com>
Signed-off-by: Li Yang <leoyang.li@nxp.com>
2021-10-19 20:47:14 -05:00
Meng Li
e775eb9fc2 soc: fsl: dpio: replace smp_processor_id with raw_smp_processor_id
When enable debug kernel configs,there will be calltrace as below:

BUG: using smp_processor_id() in preemptible [00000000] code: swapper/0/1
caller is debug_smp_processor_id+0x20/0x30
CPU: 6 PID: 1 Comm: swapper/0 Not tainted 5.10.63-yocto-standard #1
Hardware name: NXP Layerscape LX2160ARDB (DT)
Call trace:
 dump_backtrace+0x0/0x1a0
 show_stack+0x24/0x30
 dump_stack+0xf0/0x13c
 check_preemption_disabled+0x100/0x110
 debug_smp_processor_id+0x20/0x30
 dpaa2_io_query_fq_count+0xdc/0x154
 dpaa2_eth_stop+0x144/0x314
 __dev_close_many+0xdc/0x160
 __dev_change_flags+0xe8/0x220
 dev_change_flags+0x30/0x70
 ic_close_devs+0x50/0x78
 ip_auto_config+0xed0/0xf10
 do_one_initcall+0xac/0x460
 kernel_init_freeable+0x30c/0x378
 kernel_init+0x20/0x128
 ret_from_fork+0x10/0x38

Based on comment in the context, it doesn't matter whether
preemption is disable or not. So, replace smp_processor_id()
with raw_smp_processor_id() to avoid above call trace.

Fixes: c89105c9b3 ("staging: fsl-mc: Move DPIO from staging to drivers/soc/fsl")
Cc: stable@vger.kernel.org
Signed-off-by: Meng Li <Meng.Li@windriver.com>
Signed-off-by: Li Yang <leoyang.li@nxp.com>
2021-10-19 20:35:17 -05:00
Russ Weight
f09f6dfef8
spi: altera: Change to dynamic allocation of spi id
The spi-altera driver has two flavors: platform and dfl. I'm seeing
a case where I have both device types in the same machine, and they
are conflicting on the SPI ID:

... kernel: couldn't get idr
... kernel: WARNING: CPU: 28 PID: 912 at drivers/spi/spi.c:2920 spi_register_controller.cold+0x84/0xc0a

Both the platform and dfl drivers use the parent's driver ID as the SPI
ID. In the error case, the parent devices are dfl_dev.4 and
subdev_spi_altera.4.auto. When the second spi-master is created, the
failure occurs because the SPI ID of 4 has already been allocated.

Change the ID allocation to dynamic (by initializing bus_num to -1) to
avoid duplicate SPI IDs.

Signed-off-by: Russ Weight <russell.h.weight@intel.com>
Link: https://lore.kernel.org/r/20211019002401.24041-1-russell.h.weight@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
2021-10-20 01:53:15 +01:00
Rob Herring
07a6602bdc ARM: dts: gemini: Consolidate PCI interrupt-map properties
The Gemini PCI 'interrupt-map' does not vary by board, so let's move
the definition to a common location. This avoids having incomplete
interrupt properties (i.e. #interrupt-cells without interrupt-map).

Cc: Hans Ulli Kroll <ulli.kroll@googlemail.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2021-10-20 02:41:51 +02:00
Steven Rostedt (VMware)
8646698aef x86/ftrace: Remove fault protection code in prepare_ftrace_return
Removing the fault protection code when writing return_hooker
to stack. As Steven noted:

> That protection was there from the beginning due to being "paranoid",
> considering ftrace was bricking network cards. But that protection
> would not have even protected against that.

Link: https://lkml.kernel.org/r/20211008091336.33616-3-jolsa@kernel.org

Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
2021-10-19 20:33:21 -04:00
Jiri Olsa
1e85010e17 x86/ftrace: Remove extra orig rax move
There's identical move 2 lines earlier.

Link: https://lkml.kernel.org/r/20211008091336.33616-2-jolsa@kernel.org

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
2021-10-19 20:33:21 -04:00
Steven Rostedt (VMware)
91ebe8bcbf tracing/perf: Add interrupt_context_level() helper
Now that there are three different instances of doing the addition trick
to the preempt_count() and NMI_MASK, HARDIRQ_MASK and SOFTIRQ_OFFSET
macros, it deserves a helper function defined in the preempt.h header.

Add the interrupt_context_level() helper and replace the three instances
that do that logic with it.

Link: https://lore.kernel.org/all/20211015142541.4badd8a9@gandalf.local.home/

Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
2021-10-19 20:33:20 -04:00
Steven Rostedt (VMware)
9b84fadc44 tracing: Reuse logic from perf's get_recursion_context()
Instead of having branches that adds noise to the branch prediction, use
the addition logic to set the bit for the level of interrupt context that
the state is currently in. This copies the logic from perf's
get_recursion_context() function.

Link: https://lore.kernel.org/all/20211015161702.GF174703@worktop.programming.kicks-ass.net/

Suggested-by: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
2021-10-19 20:33:20 -04:00
Kalesh Singh
7ce1bb83a1 tracing/cfi: Fix cmp_entries_* functions signature mismatch
If CONFIG_CFI_CLANG=y, attempting to read an event histogram will cause
the kernel to panic due to failed CFI check.

    1. echo 'hist:keys=common_pid' >> events/sched/sched_switch/trigger
    2. cat events/sched/sched_switch/hist
    3. kernel panics on attempting to read hist

This happens because the sort() function expects a generic
int (*)(const void *, const void *) pointer for the compare function.
To prevent this CFI failure, change tracing map cmp_entries_* function
signatures to match this.

Also, fix the build error reported by the kernel test robot [1].

[1] https://lore.kernel.org/r/202110141140.zzi4dRh4-lkp@intel.com/

Link: https://lkml.kernel.org/r/20211014045217.3265162-1-kaleshsingh@google.com

Signed-off-by: Kalesh Singh <kaleshsingh@google.com>
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
2021-10-19 20:33:20 -04:00
Steven Rostedt (VMware)
34cdd18b8d tracing: Use linker magic instead of recasting ftrace_ops_list_func()
In an effort to enable -Wcast-function-type in the top-level Makefile to
support Control Flow Integrity builds, all function casts need to be
removed.

This means that ftrace_ops_list_func() can no longer be defined as
ftrace_ops_no_ops(). The reason for ftrace_ops_no_ops() is to use that when
an architecture calls ftrace_ops_list_func() with only two parameters
(called from assembly). And to make sure there's no C side-effects, those
archs call ftrace_ops_no_ops() which only has two parameters, as
ftrace_ops_list_func() has four parameters.

Instead of a typecast, use vmlinux.lds.h to define ftrace_ops_list_func() to
arch_ftrace_ops_list_func() that will define the proper set of parameters.

Link: https://lore.kernel.org/r/20200614070154.6039-1-oscar.carter@gmx.com
Link: https://lkml.kernel.org/r/20200617165616.52241bde@oasis.local.home
Link: https://lore.kernel.org/all/20211005053922.GA702049@embeddedor/

Requested-by: Oscar Carter <oscar.carter@gmx.com>
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
2021-10-19 20:33:12 -04:00
Rob Herring
3e70cee46c ARM: dts: ixp4xx: Group PCI interrupt properties together
Move the PCI 'interrupt-map-mask' and '#interrupt-cells' properties
alongside the 'interrupt-map' property in each board dts. This avoids
having incomplete set of interrupt properties which may fail validation.

Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Rob Herring <robh@kernel.org>
2021-10-20 02:31:22 +02:00
Ming Lei
e70feb8b3e blk-mq: support concurrent queue quiesce/unquiesce
blk_mq_quiesce_queue() has been used a bit wide now, so far we don't support
concurrent/nested quiesce. One biggest issue is that unquiesce can happen
unexpectedly in case that quiesce/unquiesce are run concurrently from
more than one context.

This patch introduces q->mq_quiesce_depth to deal concurrent quiesce,
and we only unquiesce queue when it is the last/outer-most one of all
contexts.

Several kernel panic issue has been reported[1][2][3] when running stress
quiesce test. And this patch has been verified in these reports.

[1] https://lore.kernel.org/linux-block/9b21c797-e505-3821-4f5b-df7bf9380328@huawei.com/T/#m1fc52431fad7f33b1ffc3f12c4450e4238540787
[2] https://lore.kernel.org/linux-block/9b21c797-e505-3821-4f5b-df7bf9380328@huawei.com/T/#m10ad90afeb9c8cc318334190a7c24c8b5c5e0722
[3] https://listman.redhat.com/archives/dm-devel/2021-September/msg00189.html

Signed-off-by: Ming Lei <ming.lei@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20211014081710.1871747-7-ming.lei@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
2021-10-19 18:27:58 -06:00
Ming Lei
1d35d519d8 nvme: loop: clear NVME_CTRL_ADMIN_Q_STOPPED after admin queue is reallocated
The nvme-loop's admin queue may be freed and reallocated, and we have to
reset the flag of NVME_CTRL_ADMIN_Q_STOPPED so that the flag can match
with the quiesce state of the admin queue.

nvme-loop is the only driver to reallocate request queue, and not see
such usage in other nvme drivers.

Signed-off-by: Ming Lei <ming.lei@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20211014081710.1871747-6-ming.lei@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
2021-10-19 18:27:58 -06:00
Ming Lei
9e6a6b1212 nvme: paring quiesce/unquiesce
The current blk_mq_quiesce_queue() and blk_mq_unquiesce_queue() always
stops and starts the queue unconditionally. And there can be concurrent
quiesce/unquiesce coming from different unrelated code paths, so
unquiesce may come unexpectedly and start queue too early.

Prepare for supporting concurrent quiesce/unquiesce from multiple
contexts, so that we can address the above issue.

NVMe has very complicated quiesce/unquiesce use pattern, add one atomic
bit for makeiing sure that blk-mq quiece/unquiesce is always called in
pair.

Signed-off-by: Ming Lei <ming.lei@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20211014081710.1871747-5-ming.lei@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
2021-10-19 18:27:58 -06:00
Ming Lei
ebc9b95260 nvme: prepare for pairing quiescing and unquiescing
Add two helpers so that we can prepare for pairing quiescing and
unquiescing which will be done in next patch.

Signed-off-by: Ming Lei <ming.lei@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20211014081710.1871747-4-ming.lei@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
2021-10-19 18:27:58 -06:00
Ming Lei
6ca1d9027e nvme: apply nvme API to quiesce/unquiesce admin queue
Apply the added two APIs to quiesce/unquiesce admin queue.

Signed-off-by: Ming Lei <ming.lei@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20211014081710.1871747-3-ming.lei@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
2021-10-19 18:27:58 -06:00
Ming Lei
a277654baf nvme: add APIs for stopping/starting admin queue
Add two APIs for stopping and starting admin queue.

Signed-off-by: Ming Lei <ming.lei@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20211014081710.1871747-2-ming.lei@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
2021-10-19 18:27:58 -06:00
Hao Xu
3b44b3712c io_uring: split logic of force_nonblock
Currently force_nonblock stands for three meanings:
 - nowait or not
 - in an io-worker or not(hold uring_lock or not)

Let's split the logic to two flags, IO_URING_F_NONBLOCK and
IO_URING_F_UNLOCKED for convenience of the next patch.

Suggested-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Hao Xu <haoxu@linux.alibaba.com>
Reviewed-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/20211018133431.103298-1-haoxu@linux.alibaba.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
2021-10-19 18:21:42 -06:00
Kumar Kartikeya Dwivedi
588cd7ef53 bpf: Silence Coverity warning for find_kfunc_desc_btf
The helper function returns a pointer that in the failure case encodes
an error in the struct btf pointer. The current code lead to Coverity
warning about the use of the invalid pointer:

 *** CID 1507963:  Memory - illegal accesses  (USE_AFTER_FREE)
 /kernel/bpf/verifier.c: 1788 in find_kfunc_desc_btf()
 1782                          return ERR_PTR(-EINVAL);
 1783                  }
 1784
 1785                  kfunc_btf = __find_kfunc_desc_btf(env, offset, btf_modp);
 1786                  if (IS_ERR_OR_NULL(kfunc_btf)) {
 1787                          verbose(env, "cannot find module BTF for func_id %u\n", func_id);
 >>>      CID 1507963:  Memory - illegal accesses  (USE_AFTER_FREE)
 >>>      Using freed pointer "kfunc_btf".
 1788                          return kfunc_btf ?: ERR_PTR(-ENOENT);
 1789                  }
 1790                  return kfunc_btf;
 1791          }
 1792          return btf_vmlinux ?: ERR_PTR(-ENOENT);
 1793     }

Daniel suggested the use of ERR_CAST so that the intended use is clear
to Coverity, but on closer look it seems that we never return NULL from
the helper. Andrii noted that since __find_kfunc_desc_btf already logs
errors for all cases except btf_get_by_fd, it is much easier to add
logging for that and remove the IS_ERR check altogether, returning
directly from it.

Suggested-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Kumar Kartikeya Dwivedi <memxor@gmail.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20211009040900.803436-1-memxor@gmail.com
2021-10-19 16:55:50 -07:00
Andrii Nakryiko
32fa0efab6 Merge branch 'fixes for bpftool's Makefile'
Quentin Monnet says:

====================

This set contains one fix for bpftool's Makefile, to make sure that the
headers internal to libbpf are installed properly even if we add more
headers to the relevant Makefile variable in the future (although we'd like
to avoid that if possible).

The other patches aim at cleaning up the output from the Makefile, in
particular when running the command "make" another time after bpftool is
built.
====================

Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
2021-10-19 16:41:59 -07:00
Quentin Monnet
062e1fc008 bpftool: Turn check on zlib from a phony target into a conditional error
One of bpftool's object files depends on zlib. To make sure we do not
attempt to build that object when the library is not available, commit
d66fa3c70e ("tools: bpftool: add feature check for zlib") introduced a
feature check to detect whether zlib is present.

This check comes as a rule for which the target ("zdep") is a
nonexistent file (phony target), which means that the Makefile always
attempts to rebuild it. It is mostly harmless. However, one side effect
is that, on running again once bpftool is already built, make considers
that "something" (the recipe for zdep) was executed, and does not print
the usual message "make: Nothing to be done for 'all'", which is a
user-friendly indicator that the build went fine.

Before, with some level of debugging information:

    $ make --debug=m
    [...]
    Reading makefiles...

    Auto-detecting system features:
    ...                        libbfd: [ on  ]
    ...        disassembler-four-args: [ on  ]
    ...                          zlib: [ on  ]
    ...                        libcap: [ on  ]
    ...               clang-bpf-co-re: [ on  ]

    Updating makefiles....
    Updating goal targets....
     File 'all' does not exist.
           File 'zdep' does not exist.
          Must remake target 'zdep'.
     File 'all' does not exist.
    Must remake target 'all'.
    Successfully remade target file 'all'.

After the patch:

    $ make --debug=m
    [...]

    Auto-detecting system features:
    ...                        libbfd: [ on  ]
    ...        disassembler-four-args: [ on  ]
    ...                          zlib: [ on  ]
    ...                        libcap: [ on  ]
    ...               clang-bpf-co-re: [ on  ]

    Updating makefiles....
    Updating goal targets....
     File 'all' does not exist.
    Must remake target 'all'.
    Successfully remade target file 'all'.
    make: Nothing to be done for 'all'.

(Note the last line, which is not part of make's debug information.)

Signed-off-by: Quentin Monnet <quentin@isovalent.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Acked-by: John Fastabend <john.fastabend@gmail.com>
Link: https://lore.kernel.org/bpf/20211009210341.6291-4-quentin@isovalent.com
2021-10-19 16:41:50 -07:00
Quentin Monnet
ced846c65e bpftool: Do not FORCE-build libbpf
In bpftool's Makefile, libbpf has a FORCE dependency, to make sure we
rebuild it in case its source files changed. Let's instead make the
rebuild depend on the source files directly, through a call to the
"$(wildcard ...)" function. This avoids descending into libbpf's
directory if there is nothing to update.

Do the same for the bootstrap libbpf version.

This results in a slightly faster operation and less verbose output when
running make a second time in bpftool's directory.

Before:

    Auto-detecting system features:
    ...                        libbfd: [ on  ]
    ...        disassembler-four-args: [ on  ]
    ...                          zlib: [ on  ]
    ...                        libcap: [ on  ]
    ...               clang-bpf-co-re: [ on  ]

    make[1]: Entering directory '/root/dev/linux/tools/lib/bpf'
    make[1]: Entering directory '/root/dev/linux/tools/lib/bpf'
    make[1]: Nothing to be done for 'install_headers'.
    make[1]: Leaving directory '/root/dev/linux/tools/lib/bpf'
    make[1]: Leaving directory '/root/dev/linux/tools/lib/bpf'

After:

    Auto-detecting system features:
    ...                        libbfd: [ on  ]
    ...        disassembler-four-args: [ on  ]
    ...                          zlib: [ on  ]
    ...                        libcap: [ on  ]
    ...               clang-bpf-co-re: [ on  ]

Other ways to clean up the output could be to pass the "-s" option, or
to redirect the output to >/dev/null, when calling make recursively to
descend into libbpf's directory. However, this would suppress some
useful output if something goes wrong during the build. A better
alternative would be to pass "--no-print-directory" to the recursive
make, but that would still leave us with some noise for
"install_headers". Skipping the descent into libbpf's directory if no
source file has changed works best, and seems the most logical option
overall.

Reported-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Quentin Monnet <quentin@isovalent.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Acked-by: John Fastabend <john.fastabend@gmail.com>
Link: https://lore.kernel.org/bpf/20211009210341.6291-3-quentin@isovalent.com
2021-10-19 16:41:37 -07:00
Quentin Monnet
34e3ab1447 bpftool: Fix install for libbpf's internal header(s)
We recently updated bpftool's Makefile to make it install the headers
from libbpf, instead of pulling them directly from libbpf's directory.
There is also an additional header, internal to libbpf, that needs be
installed. The way that bpftool's Makefile installs that particular
header is currently correct, but would break if we were to modify
$(LIBBPF_INTERNAL_HDRS) to make it point to more than one header.

Use a static pattern rule instead, so that the Makefile can withstand
the addition of other headers to install.

The objective is simply to make the Makefile more robust. It should
_not_ be read as an invitation to import more internal headers from
libbpf into bpftool.

Fixes: f012ade10b ("bpftool: Install libbpf headers instead of including the dir")
Reported-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Quentin Monnet <quentin@isovalent.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Acked-by: John Fastabend <john.fastabend@gmail.com>
Link: https://lore.kernel.org/bpf/20211009210341.6291-2-quentin@isovalent.com
2021-10-19 16:40:42 -07:00
Quentin Monnet
d51b6b2287 libbpf: Remove Makefile warnings on out-of-sync netlink.h/if_link.h
Although relying on some definitions from the netlink.h and if_link.h
headers copied into tools/include/uapi/linux/, libbpf does not need
those headers to stay entirely up-to-date with their original versions,
and the warnings emitted by the Makefile when it detects a difference
are usually just noise. Let's remove those warnings.

Suggested-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Quentin Monnet <quentin@isovalent.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20211010002528.9772-1-quentin@isovalent.com
2021-10-19 16:33:10 -07:00
Maíra Canal
3340ec49ba
spi: at91-usart: replacing legacy gpio interface for gpiod
Removing dependency of linux/of_gpio.h and replacing it for
linux/gpio/consumer.h

Signed-off-by: Maíra Canal <maira.canal@usp.br>
Link: https://lore.kernel.org/r/YW8I5Emdc3t0cqhz@fedora
Signed-off-by: Mark Brown <broonie@kernel.org>
2021-10-20 00:23:21 +01:00
Mustafa Ismail
2dace185ca RDMA/irdma: Do not hold qos mutex twice on QP resume
When irdma_ws_add fails, irdma_ws_remove is used to cleanup the leaf node.
This lead to holding the qos mutex twice in the QP resume path. Fix this
by avoiding the call to irdma_ws_remove and unwinding the error in
irdma_ws_add. This skips the call to irdma_tc_in_use function which is not
needed in the error unwind cases.

Fixes: 3ae331c751 ("RDMA/irdma: Add QoS definitions")
Link: https://lore.kernel.org/r/20211019151654.1943-2-shiraz.saleem@intel.com
Signed-off-by: Mustafa Ismail <mustafa.ismail@intel.com>
Signed-off-by: Shiraz Saleem <shiraz.saleem@intel.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
2021-10-19 20:22:01 -03:00
Mustafa Ismail
cc07b73ef1 RDMA/irdma: Set VLAN in UD work completion correctly
Currently VLAN is reported in UD work completion when VLAN id is zero,
i.e. no VLAN case.

Report VLAN in UD work completion only when VLAN id is non-zero.

Fixes: b48c24c2d7 ("RDMA/irdma: Implement device supported verb APIs")
Link: https://lore.kernel.org/r/20211019151654.1943-1-shiraz.saleem@intel.com
Signed-off-by: Mustafa Ismail <mustafa.ismail@intel.com>
Signed-off-by: Shiraz Saleem <shiraz.saleem@intel.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
2021-10-19 20:22:01 -03:00
Aharon Landau
5508546631 RDMA/mlx5: Initialize the ODP xarray when creating an ODP MR
Normally the zero fill would hide the missing initialization, but an
errant set to desc_size in reg_create() causes a crash:

  BUG: unable to handle page fault for address: 0000000800000000
  PGD 0 P4D 0
  Oops: 0000 [#1] SMP PTI
  CPU: 5 PID: 890 Comm: ib_write_bw Not tainted 5.15.0-rc4+ #47
  Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.13.0-0-gf21b5a4aeb02-prebuilt.qemu.org 04/01/2014
  RIP: 0010:mlx5_ib_dereg_mr+0x14/0x3b0 [mlx5_ib]
  Code: 48 63 cd 4c 89 f7 48 89 0c 24 e8 37 30 03 e1 48 8b 0c 24 eb a0 90 0f 1f 44 00 00 41 56 41 55 41 54 55 53 48 89 fb 48 83 ec 30 <48> 8b 2f 65 48 8b 04 25 28 00 00 00 48 89 44 24 28 31 c0 8b 87 c8
  RSP: 0018:ffff88811afa3a60 EFLAGS: 00010286
  RAX: 000000000000001c RBX: 0000000800000000 RCX: 0000000000000000
  RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000800000000
  RBP: 0000000800000000 R08: 0000000000000000 R09: c0000000fffff7ff
  R10: ffff88811afa38f8 R11: ffff88811afa38f0 R12: ffffffffa02c7ac0
  R13: 0000000000000000 R14: ffff88811afa3cd8 R15: ffff88810772fa00
  FS:  00007f47b9080740(0000) GS:ffff88852cd40000(0000) knlGS:0000000000000000
  CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
  CR2: 0000000800000000 CR3: 000000010761e003 CR4: 0000000000370ea0
  DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
  DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
  Call Trace:
   mlx5_ib_free_odp_mr+0x95/0xc0 [mlx5_ib]
   mlx5_ib_dereg_mr+0x128/0x3b0 [mlx5_ib]
   ib_dereg_mr_user+0x45/0xb0 [ib_core]
   ? xas_load+0x8/0x80
   destroy_hw_idr_uobject+0x1a/0x50 [ib_uverbs]
   uverbs_destroy_uobject+0x2f/0x150 [ib_uverbs]
   uobj_destroy+0x3c/0x70 [ib_uverbs]
   ib_uverbs_cmd_verbs+0x467/0xb00 [ib_uverbs]
   ? uverbs_finalize_object+0x60/0x60 [ib_uverbs]
   ? ttwu_queue_wakelist+0xa9/0xe0
   ? pty_write+0x85/0x90
   ? file_tty_write.isra.33+0x214/0x330
   ? process_echoes+0x60/0x60
   ib_uverbs_ioctl+0xa7/0x110 [ib_uverbs]
   __x64_sys_ioctl+0x10d/0x8e0
   ? vfs_write+0x17f/0x260
   do_syscall_64+0x3c/0x80
   entry_SYSCALL_64_after_hwframe+0x44/0xae

Add the missing xarray initialization and remove the desc_size set.

Fixes: a639e66703 ("RDMA/mlx5: Zero out ODP related items in the mlx5_ib_mr")
Link: https://lore.kernel.org/r/a4846a11c9de834663e521770da895007f9f0d30.1634642730.git.leonro@nvidia.com
Signed-off-by: Aharon Landau <aharonl@nvidia.com>
Reviewed-by: Maor Gottlieb <maorg@nvidia.com>
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
2021-10-19 20:19:59 -03:00
Prabhakar Kushwaha
60fab10766 rdma/qedr: Fix crash due to redundant release of device's qp memory
Device's QP memory should only be allocated and released by IB layer.
This patch removes the redundant release of the device's qp memory and
uses completion APIs to make sure that .destroy_qp() only return, when qp
reference becomes 0.

Fixes: 514aee660d ("RDMA: Globally allocate and release QP memory")
Link: https://lore.kernel.org/r/20211019082212.7052-1-pkushwaha@marvell.com
Acked-by: Michal Kalderon <michal.kalderon@marvell.com>
Signed-off-by: Ariel Elior <aelior@marvell.com>
Signed-off-by: Shai Malin <smalin@marvell.com>
Signed-off-by: Alok Prasad <palok@marvell.com>
Signed-off-by: Prabhakar Kushwaha <pkushwaha@marvell.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
2021-10-19 20:17:44 -03:00
Pavel Begunkov
bc369921d6 io-wq: max_worker fixes
First, fix nr_workers checks against max_workers, with max_worker
registration, it may pretty easily happen that nr_workers > max_workers.

Also, synchronise writing to acct->max_worker with wqe->lock. It's not
an actual problem, but as we don't care about io_wqe_create_worker(),
it's better than WRITE_ONCE()/READ_ONCE().

Fixes: 2e480058dd ("io-wq: provide a way to limit max number of workers")
Reported-by: Beld Zhang <beldzhang@gmail.com>
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/11f90e6b49410b7d1a88f5d04fb8d95bb86b8cf3.1634671835.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
2021-10-19 17:09:34 -06:00
Christophe JAILLET
ba69fd9101 net: dsa: Fix an error handling path in 'dsa_switch_parse_ports_of()'
If we return before the end of the 'for_each_child_of_node()' iterator, the
reference taken on 'port' must be released.

Add the missing 'of_node_put()' calls.

Fixes: 83c0afaec7 ("net: dsa: Add new binding implementation")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/15d5310d1d55ad51c1af80775865306d92432e03.1634587046.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2021-10-19 15:41:16 -07:00
Jakub Kicinski
816219a86d Merge branch 'net-sched-fixes-after-recent-qdisc-running-changes'
Eric Dumazet says:

====================
net: sched: fixes after recent qdisc->running changes

First patch fixes a plain bug in qdisc_run_begin().
Second patch removes a pair of atomic operations, increasing performance.
====================

Link: https://lore.kernel.org/r/20211019003402.2110017-1-eric.dumazet@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2021-10-19 15:40:52 -07:00
Eric Dumazet
97604c65bc net: sched: remove one pair of atomic operations
__QDISC_STATE_RUNNING is only set/cleared from contexts owning qdisc lock.

Thus we can use less expensive bit operations, as we were doing
before commit f9eb8aea2a ("net_sched: transform qdisc running bit into a seqcount")

Fixes: 29cbcd8582 ("net: sched: Remove Qdisc::running sequence counter")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Ahmed S. Darwish <a.darwish@linutronix.de>
Acked-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Tested-by: Toke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2021-10-19 15:40:50 -07:00
Eric Dumazet
4c57e2fac4 net: sched: fix logic error in qdisc_run_begin()
For non TCQ_F_NOLOCK qdisc, qdisc_run_begin() tries to set
__QDISC_STATE_RUNNING and should return true if the bit was not set.

test_and_set_bit() returns old bit value, therefore we need to invert.

Fixes: 29cbcd8582 ("net: sched: Remove Qdisc::running sequence counter")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Ahmed S. Darwish <a.darwish@linutronix.de>
Tested-by: Ido Schimmel <idosch@nvidia.com>
Acked-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Tested-by: Toke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2021-10-19 15:40:50 -07:00
Arnd Bergmann
ef5dcb1bc2 STM32 DT for v5.16, round 1
Highlights:
 ----------
 
 - MPU:
  - ST boards:
   - Add new stm32mp135f-dk board. It embedds new STM32MP135 SoC,
     with 512 MB of DDR3. Several connections are available on this
     board:
     4*USB2.0, 1*USB2.0 typeC DRD, SDcard, 2*RJ45, HDMI,
     Combo Wifi/BT, ...
     Only SD card, uart4 (console) and watchdog IPs are enabled in
     this tag.
   - Change IRQ level for STUSB1600 on DKx boards.
   - Fix SAI subclocks range.
   - Add ck_usb0_48m clock in USB OHCI node device to match with
     STM32MP15 datasheet.
 
  - DH boards:
   - Reduce DHCOR SPI NOR frequency to 50 MHz to avoid sporadic issues.
   - Fix SAI pin muxing.
 
  - Odyssey:
   - Set DCMI pins.
 -----BEGIN PGP SIGNATURE-----
 
 iQJRBAABCgA7FiEEctl9+nxzUSUqdELdf5rJavIecIUFAmFplc0dHGFsZXhhbmRy
 ZS50b3JndWVAZm9zcy5zdC5jb20ACgkQf5rJavIecIXnkg/+NahYkMMEa73+Fm2K
 sXtu5B2Px6Vh7V5dkVgC21dQjlYyyRtNfGEGIhN9lcpVrvYU4txzUKPDAgGXhnHE
 hT2gbfjY4WUer+REP//Xr5/WkLwIIN3f9b2c/b2yJf59gqjg/omSYqlnqv//356J
 h/5HGxNfHvTtN+yCrfMzdP5wC+vuGh44H38E6lSLKF0yNDbbe3wlntBtWn4x+Z9x
 fezKSbdKMOmlZbpdutL2LJoQUUq3nXzeVcCRgmcQOnx+ZR7L6G0pQaGgN7XyC3lX
 GGRfwHWWSX7oeiVorNfXduDlsa743a3u2t0ubGmbakXtOcy8uUzsD2efhdHZrzce
 X51BpbRhDSFLl9aJy1/lBmEH3y2InMXK/0zZiGlvB+6AH6xnCHCPD1obhZO9mTCK
 wYvWT5r2k5VElss42C8adSd3/H/VzO/5kfDgAA2kVOSgdUOuPdgss8JdCq2vAZZi
 M70zKBxGbVMIFudGONCekrp7B76658IDpyZ5CU9PkUSnGWSDH2NTmQw1vExVG65d
 uEFNpyyE8P9nK0C3OIgt40Wliq+bOnu4tVDGL/XNsMYhCkJrYCLrfnIK1ydi7eZo
 lv3e/EFT0RL9Rl2ttl7MLpq94QL+8bIZy9ei8O84tQGK9oL2OpmROs0VwoOOZzDN
 uWQE0O4quEnWJGwOlEQSytAQrQk=
 =zn1y
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmFvQYgACgkQmmx57+YA
 GNmekg/+McCuYR1uxymciqrOcsBKxXbQb5FmaE5H21HsccisCup+uutmZ8kzi9+6
 jkqJRon1FPcLy/CuZ5+1+wIBGedwUD3AKE6rPnyiPNYTiRIlmzxF1UCe5hQBX0nN
 dWVJ0fMry0dZ0bJtwhtl5RXbo9mQOjxv8LFpZ7bDF1eQfJzqjKylY5H7nZVhP8dn
 EZbU5fy4PuzIwra/silLp4DDpD0dEgdM+8rBafxa98gX3WHqNgvrFMY6P9lpKD9p
 wt+lhEXXjcmKwyDNp6wPgarmTb6mr+27wTjnW1HbJoT3sPx0eA8VutbdmQ7f5oQq
 fPXAxz8XPkjAVcYQRFCZf8OnH0vSoLbpxUfsjWcFai7uTiirt7+chMGlP3dtubsz
 h9d90sNc/IJEW/wzevTNSGW/ayhio3JshpgYPvcOG0i0Fxuf7eEyj9dR7ZPvVr9v
 iHsPSSTqUysKXmRWiQKw0R9Mj2/4QFJwAsRjPUcnQAGyDGhwOhTaF9rdL2f6Rddr
 usyEIFRWXPrObF9cMU1lZ7CxVtlFiUNJCabAutv+khd/IxF1iZcEi0FydTY1dYen
 hWEI6lYDrGb/O88E9a6WR/GyWXI7jwsB/BvpXrg51k5p8Pvq2yn3m1xPh9BXPKwq
 +WRbk0YQ8la7/oSn0cC3g1NRA0B8+WCeQdTsO5eYahfFshu3Jao=
 =X4fu
 -----END PGP SIGNATURE-----

Merge tag 'stm32-dt-for-v5.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 into arm/dt

STM32 DT for v5.16, round 1

Highlights:
----------

- MPU:
 - ST boards:
  - Add new stm32mp135f-dk board. It embedds new STM32MP135 SoC,
    with 512 MB of DDR3. Several connections are available on this
    board:
    4*USB2.0, 1*USB2.0 typeC DRD, SDcard, 2*RJ45, HDMI,
    Combo Wifi/BT, ...
    Only SD card, uart4 (console) and watchdog IPs are enabled in
    this tag.
  - Change IRQ level for STUSB1600 on DKx boards.
  - Fix SAI subclocks range.
  - Add ck_usb0_48m clock in USB OHCI node device to match with
    STM32MP15 datasheet.

 - DH boards:
  - Reduce DHCOR SPI NOR frequency to 50 MHz to avoid sporadic issues.
  - Fix SAI pin muxing.

 - Odyssey:
  - Set DCMI pins.

* tag 'stm32-dt-for-v5.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32:
  ARM: dts: stm32: use usbphyc ck_usbo_48m as USBH OHCI clock on stm32mp151
  ARM: dts: stm32: fix AV96 board SAI2 pin muxing on stm32mp15
  ARM: dts: stm32: fix SAI sub nodes register range
  ARM: dts: stm32: fix STUSB1600 Type-C irq level on stm32mp15xx-dkx
  ARM: dts: stm32: set the DCMI pins on stm32mp157c-odyssey
  ARM: dts: stm32: Reduce DHCOR SPI NOR frequency to 50 MHz
  ARM: dts: stm32: add initial support of stm32mp135f-dk board
  dt-bindings: stm32: document stm32mp135f-dk board
  ARM: dts: stm32: add STM32MP13 SoCs support

Link: https://lore.kernel.org/r/9d52c3e2-a3b9-89f3-1896-7cd3560e7010@foss.st.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2021-10-20 00:07:03 +02:00
Arnd Bergmann
f97ee3e963 Renesas ARM DT updates for v5.16 (take two)
- SPI Multi I/O Bus, SDHI, and Ethernet support for the RZ/G2L SoC,
   - SPI Multi I/O Bus, camera, and video-on support for the R-Car V3U
     SoC,
   - SPI FLASH support for the Falcon development board,
   - eMMC, microSD, and Ethernet support for the RZ/G2L SMARC EVK
     development board,
   - 2 GHz High-Performance support for the R-Car H3e-2G, M3e-2G, and
     M3Ne-2G SoCs,
   - Miscellaneous fixes and improvements.
 -----BEGIN PGP SIGNATURE-----
 
 iHUEABYIAB0WIQQ9qaHoIs/1I4cXmEiKwlD9ZEnxcAUCYWljoAAKCRCKwlD9ZEnx
 cGxHAQDrT+JszN8OkMuwJ55OlOUsI1xXqWpWMmjC40gSn57piAD/QiRYaaSreWk6
 WSPxrweQ4uNSntSHmFdo+lYs0ueryAk=
 =XkNX
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmFvQRUACgkQmmx57+YA
 GNnmEg/9H029WrZEgrP9EIBqlPSg/dSvXMLv0aG2ry7A/jiw8Tz48EdpE4lSUk4g
 fn7pBUHlXKQhbiyLbTHJeSobc5UUFEhKNZJ9P6MU5vTTKveaSgLaf+4HyCNbQZRu
 MaHGIYZ0xHvlJKT8MiwJ4eXM+1BV/VOfdfWzos1OYPzgjgQwXc2+TWSmoveIDXrz
 wW7qbexKkSNudvDogZX6MUkw55sO4yWgaLTmW18UahhQWcJkkCVr30cw2+MhMo4Z
 hL/quEdUJJxeD6jAf12WckENcjUI0iR7ZHqtVZanlBlM+BUk8Ap3Wc14mVi5esBa
 NM6Mbh6RaKS3lkWchELC1XlPXBS47CALtSuzOxDIGyU83p7m4Zl08bGcwMTY/vqE
 z9YIVtNbOtt6ZrFP1m0TAVealnDueAuPwcxOf9NpzLe2WL0+IT51F5Ikz9YXsIX6
 KI5wdvVUH6QCJcZo8a+PlAaQvcdoG6bLO77b69QKgqAyFYYsj8aLG9ui+iTig1To
 n6lFLO/XfR/zQihAHQRJ9nq1pxs8IEwdcCnWT8svy9DMPQ8rry1ooNYX6fNM/ESp
 Fo++uNpHqpblv750RwmNjGCSDrV8Xia8KHkNDWplFYL9utTJpi42eJOuH8XPF6aM
 fBAX+4hdl38ngXmgrKb7OxGUX5ZdglmbyxxhX8xm8VjUCOH0sZ0=
 =kSIg
 -----END PGP SIGNATURE-----

Merge tag 'renesas-arm-dt-for-v5.16-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/dt

Renesas ARM DT updates for v5.16 (take two)

  - SPI Multi I/O Bus, SDHI, and Ethernet support for the RZ/G2L SoC,
  - SPI Multi I/O Bus, camera, and video-on support for the R-Car V3U
    SoC,
  - SPI FLASH support for the Falcon development board,
  - eMMC, microSD, and Ethernet support for the RZ/G2L SMARC EVK
    development board,
  - 2 GHz High-Performance support for the R-Car H3e-2G, M3e-2G, and
    M3Ne-2G SoCs,
  - Miscellaneous fixes and improvements.

* tag 'renesas-arm-dt-for-v5.16-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
  mailmap: Fix text encoding for Niklas Söderlund
  arm64: dts: renesas: rcar-gen3e: Add Cortex-A57 2 GHz opps
  arm64: dts: renesas: rzg2l-smarc-som: Enable Ethernet
  arm64: dts: renesas: r9a07g044: Add GbEthernet nodes
  arm64: dts: renesas: Add ports node to all adv7482 nodes
  arm64: dts: renesas: r8a779a0: Add and connect all CSI-2, ISP and VIN nodes
  arm64: dts: renesas: rzg2l-smarc: Enable microSD on SMARC platform
  arm64: dts: renesas: rzg2l-smarc-som: Enable eMMC on SMARC platform
  arm64: dts: renesas: r9a07g044: Add SDHI nodes
  arm64: dts: renesas: falcon-cpu: Add SPI flash via RPC
  arm64: dts: renesas: r8a779a0: Add RPC node
  arm64: dts: renesas: r9a07g044: Add SPI Multi I/O Bus controller node

Link: https://lore.kernel.org/r/cover.1634298094.git.geert+renesas@glider.be
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2021-10-20 00:05:09 +02:00
Arnd Bergmann
f6bfe01468 ASPEED device tree updates for 5.15
- New machines:
 
   * TYAN S7106 BMC, a x86 server from about four years ago
 
  - Descriptions for the AST2600 ADC, which now has an upstream driver
 
  - Lots of GPIO line names. The OpenBMC project has adopted a scheme for
    naming the lines, and new additions will follow this guide
 
  - New I2C devices for Rainier, Everest, EthanolX, Mt Jade
 
  - Fixes for fp5280g2 which has seen some recent development, including
    the addtion of a QEmu machine for testing
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE+nHMAt9PCBDH63wBa3ZZB4FHcJ4FAmFo/D8ACgkQa3ZZB4FH
 cJ4Clw//YJ3WSfsO2uAm2K49+2WS3h0Ern+YKY/sEWbQ/3YTNL1YGrtkXEMDoOUs
 zStOEpjVAuZ+3cdSZOrpB4CKSR1DaqF5PZ+jt5SnwXUzkkcIFeHfiiJHamJzMozx
 geZxaKOB16fJ2wadB08etdW9jidnSsROfqmOU94izb0jAilUEhngNy2jFf8T4wE6
 G20uPIdehV/+l8CNVm/8SEyFfYRxxPBHJXk96n81CWXvpoG0ZOPxIZQgjWwiWyNo
 m/wLoMLrkF9bNVxrBtvNtYG67SkIaG8U6suNwsx0X8a19ckq26c5lIto1AniRCKc
 tjq6z65yijj98VhE+Fnl/Jv7ZfhyN2qFfVPhCnTZjInkjexDmiM9oz47qy1xcgpY
 BSW6R61IR7bzIYg5gu8vzK1IwjM9xvzUSxM3CwYxxoZID1vpPpPq6NEAKeWNMmYp
 zQs8zYnZB7EeFF1TbcljMy6uu027PRgiErnjhEygXXem57YhYOEkkOpdifCaw/Gt
 7k5ei7Y7O0IoqFMmG8eq7ZAA0CQZ/+OboEsyxfkMtqIy0goiStdDwwtzLruDGX3I
 7qvZm5r4vHhMbJJvh0FNLp/H8dFx5DUteKRhfRRuw5zlEC3+0RgiisN9O/RbW/j9
 7/y1Azl0c0JDJTVVaD4LxVb1lvgC4/KRr47+EBicaD+KoL2Jd8U=
 =i5LZ
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmFvP5MACgkQmmx57+YA
 GNlaDA//ZsLiuV3uRDOTGvYJB71eHd7gIiYIyCF+FmbKsEkSLEq7tpUWJiinZbIU
 7tyHdq3+rL5lhv/HIoUUo+w0Y51V09g2dl+q1HuScDqL7Hr+QVp6xV6+LwS4UvuP
 I8JZji8mhxTho+sO4diYYnojAn4ZhPnmESL9NlptR49yxLfvKdf2AEcYKMbSisvo
 367NnmTcuCgpoVKlc93vXshCdtSn83Y9tC8UnjzEJPP90lRhSJ8/kf4wEyoDtKKs
 t87AmN0otdUrEtbkYQqZ6iJ/ZyZPYmbbAxf1crlEoHMMLjI2Mp/i0/4l6ZL4K03f
 Rd6AzWPwX5rdWJ4Rq76jey2I8fL/2ofhw7ZDA9g4K6HCbxMJ2oa1LqXcsDc+AFdz
 w2xgcrOT45TmSUI7+vIO8HZI1nJPKrySEKknXfLOVbP4B5X26CMNWMTPIF4Cph8i
 iTHX10DmsIMmAWdiujDBYXQNgVRh0/bR6zq1GT4n6r5yekYfohaVpJcv5ENI0DTE
 VsW1b4tlSQVKsrO2cR55UWx1fPRVA7rGtX7Ge7zRIPt41hRZ0cqu1koWmS4iqfU1
 Q38pV2jC5ov8h1bOwBNqHmJKQFAleNEboHoadnS5yHJLp/BfxQwliyHEWGLAtiLt
 plbbbieEcC8Odgfjp69ATU/txLwEy+s5egLnCq/fRKD7rFrQW+U=
 =6eyi
 -----END PGP SIGNATURE-----

Merge tag 'aspeed-5.16-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc into arm/dt

ASPEED device tree updates for 5.15

 - New machines:

  * TYAN S7106 BMC, a x86 server from about four years ago

 - Descriptions for the AST2600 ADC, which now has an upstream driver

 - Lots of GPIO line names. The OpenBMC project has adopted a scheme for
   naming the lines, and new additions will follow this guide

 - New I2C devices for Rainier, Everest, EthanolX, Mt Jade

 - Fixes for fp5280g2 which has seen some recent development, including
   the addtion of a QEmu machine for testing

* tag 'aspeed-5.16-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc:
  ARM: dts: aspeed: fp5280g2: Use the 64M layout
  ARM: dts: aspeed: Add TYAN S7106 BMC machine
  ARM: dts: aspeed: rainier: Add power-config-full-load gpio
  ARM: dts: aspeed: p10bmc: Define secure boot gpio
  ARM: dts: aspeed: mtjade: Add some gpios
  ARM: dts: aspeed: Add ADC for AST2600 and enable for Rainier and Everest
  ARM: dts: everest: Define name for gpio line B6
  ARM: dts: everest: Define name for gpio line Q2
  ARM: dts: rainier: Define name for gpio line Q2
  ARM: dts: everest: Add 'factory-reset-toggle' as GPIOF6
  ARM: dts: aspeed: everest: Add I2C bus 15 muxes
  ARM: dts: aspeed: rainier: Add system LEDs
  ARM: dts: aspeed: amd-ethanolx: Add FRU EEPROM
  ARM: dts: fp5280g2: Enable KCS 3 for MCTP binding

Link: https://lore.kernel.org/r/CACPK8XdrMzY9tzdof7KpzxKquTo7GcWW4N9Zqwtmmu73C7htXA@mail.gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2021-10-19 23:58:43 +02:00
Arnd Bergmann
6fa496fd7d ARM64: DT: HiSilicon ARM64 DT updates for 5.16
- Add SPMI PMIC support for the Hikey970 board
 - Correct the sp805 watchdog compatible string to match the document
 - Correct the operating-points table name to match the dtschema
 -----BEGIN PGP SIGNATURE-----
 
 iQJJBAABCgAzFiEEQeMYD8qOQTc1R/snC8hXbtmJZlwFAmFo5vkVHHh1d2VpNUBo
 aXNpbGljb24uY29tAAoJEAvIV27ZiWZc/48P/00Dx5XKqDIJKBnTJK07e69Mgusr
 VulJF4Dub7tqniEbFQLAjynvAR6mRR/ziasD8B/V7LLMm+RO9/KQ2UNm+08YSXd6
 1JYsoCj20BLsIMnmGMOPaylJoZyKRyKYDHjtegr+MNkKib4aGMGhG/klbyVTjV/Q
 rTi/J87W5WM8WhsBkdVpbI7+xA7lLA0vOWPRANtaej4pjIaUQ6ibtt+AziBRC0zj
 Ckec/TP/JHO6sDwpcWVgdWW4k9ofohuEvpFttialrmBVrIRn3lrQK8V+UIrBNVcA
 fneSWjgexxxRYemw07kAWrVZKVJCvSHosIcp7BzOYYdU+Vd3GRILvvuWEgbBjHCY
 tzve6uVw0UQMZPA6jYMlvA9bPBL3JWuXByWIjtKBH0C2QX3aqTbuoyL9aAVy7C0S
 RMpAWZ15ED8YNef0HykQK2+HE0G4p8WyN1zjmMCshjOsjXPQVEKX2bIZ05cF8KX2
 Q3zY6OdznV1H6PSlfVtRzbVM75B+158Pxw/SdTlIMiGiXjfxdIEYruEM6Ej8kxqU
 +QakyDIWjNSwaB6lt1x+bZe7O3GvMkRNb3HhKoqf9j7e4JhZH8hg3KyDdENgcPzb
 RLNVKN65Wwz0SyJZNlRKlF6IzDjeV6v5aXY7eLUkj75uIRT0vI6MYWJhxo4sx/PA
 kGPjXdKTEAsKUmsK
 =xa9d
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmFvO4cACgkQmmx57+YA
 GNlB3xAAsoHs6hQFzZmpeii7DKrchYSBUvoEorG4boHtPiAQ7mZTpAW2tIgO6F0S
 P+CugE0u7TGuApVCAB6TVDj1dxEZJBl5xf0Mug3m/cpc0DukJj28QSbMztfAAl9s
 /1w3AVSHM6heD39a09ePxSaHzRn7Bl+hyTAnDkZBH+OenkihpMgaBdGBOrqkS95V
 1HBB/wdCNF16hB8DyerZPlSpwwLR9zpd7Ncia4DbhIzfW9ppnIK4OdrQbZKDU0E2
 55Fsef33YJc+c1FMY5+MfV0U2jpL4ozvRpIvBEU9KqZStWntriV71TbWH2iooRbg
 +mGaGR+JjxND1UEe7/eNqVgV76qUW8j8+sWNfRwAOwgX/UnZBU2+0KBdvlC7XuhX
 idkBGgjrz4tsMfnSkwjuFs2LE9KerNKCBVIC6EDA2Gx3DROehSK5CBizidQuK6o4
 ap/GALZQHZhFGYHaQjtR5w5y9Ps5XS3LGWnsvftNvhb1ynqOHW1aknlfTQEH39D3
 g/7gclkti0dbwnRuoWE4W9DNol/THnaCoV7zCWerI7PlPWkf/WMWLlggdValpJch
 MBFxFVRsJl2od6AgDw1PzV7XhqxYWsL09RlqlhILAlfCf+QdmxlP/JtxYiCPYaBe
 KIPt1MU1Tdlt/kJ02sBM34N/02zTKJVUDgYTsi4tG3JhVo1pxls=
 =Z1IX
 -----END PGP SIGNATURE-----

Merge tag 'hisi-arm64-dt-for-5.16' of git://github.com/hisilicon/linux-hisi into arm/dt

ARM64: DT: HiSilicon ARM64 DT updates for 5.16

- Add SPMI PMIC support for the Hikey970 board
- Correct the sp805 watchdog compatible string to match the document
- Correct the operating-points table name to match the dtschema

* tag 'hisi-arm64-dt-for-5.16' of git://github.com/hisilicon/linux-hisi:
  arm64: dts: hisilicon: align operating-points table name with dtschema
  arm64: dts: hisilicon: fix arm,sp805 compatible string
  arm64: dts: hisilicon: Add support for Hikey 970 PMIC

Link: https://lore.kernel.org/r/6168EB53.60503@hisilicon.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2021-10-19 23:41:27 +02:00
Arnd Bergmann
514d507811 Ux500 DTS updates:
- Flag the janice SPI display lines properly for the right line
   semantics.
 - Fix some errors in the Skomer regulator configuration.
 - Fix some SD card pin configurations on Skomer.
 - Assign the Skomer SD card a 300 ms power-on delay.
 - Rewrite the battery nodes to use the standard binding
   "monitored-battery" as used in the updated bindings, and
   provide the right Samsung battery compatibles for the Samsung
   phones.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEElDRnuGcz/wPCXQWMQRCzN7AZXXMFAmFoXYYACgkQQRCzN7AZ
 XXNICw//a0/qDebSV6qekbcSK+2vAERZnmyoVT9Rw3slkpd1VYU4ubefZk8rsD14
 ZfRAy4ZR9/rYuE6oNrSH4SseRzrSc8hINjYjGJPw993p9yzBt+2wcTTN0jweqjzh
 xE2sPQTxT0Z0XsDThimELwG13ew2poh4xKx2qAq/BK9vEC1qDIIgAqDjOg66OFs9
 rbXj2OStwY00HeLIgG4wQkU1KMnUEUaAiUv89rsla1f3OrFvHbBwh848AkiT36NJ
 wELGrKXSDeAfWSj+3i015BHWMJqf6tPXtSusN9//X+LNDfWGHAMLQKabsZwqruRV
 GOUxsTPPcFSQi+ZMy764hSn9xBFlEup2A8At2An4Hd0C/IFGZWNImITmfRHWJNdY
 F1tqcPLV/w3OaAToLxV8lF2VcLSg+QKj+mDRmuVZxqPpjDm3fvwHzBkkQlbvDfYw
 5R0EkGR85uQuNkQ9sPIQqBu6ybXM9KSGJ56GyPM+oIX2a8Q4Oyey95kT+S7Pp8Bk
 SBIhrnHbBgaisCe1S8M5VsnZ39BAW1upFBeOCGCV2t4l1b7n624oJxGDgv354Y89
 evxGYJOEvevEqHOF2XW4lKYpcIT3sB+b9YB8sNQGhiEaphrO4gPSdEeDOkeOnN2E
 NHrEU43I6NxzYFGGc1NWBWQ9Ga/cPK9ZIyc6mDeHZdP9P0dzeC0=
 =VZoq
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmFvO1oACgkQmmx57+YA
 GNkS4w//fs7Pf4qZUHTEtPl3g2lIlCpo4TjHu7v7ulEBmR1TEFVkqTCbCs+RLs6k
 9oQKU4+TFml/SeNg091yv8qjEA5lcfyM58Y6RQhsTrkoTFE23p9T6L1RP6qxtwg1
 SC4TX8/UlsQnN7aevcbcROX1eVwPS6ePJLagPr8BrYbauF6QgUHZ9xK1InsGnfFF
 wLLaFrscQHk6Fyyx+qRNl45UsRbBMjOaHwbw9IXtUc7C7A5ZehlVuavh93yzNOJE
 eoaqJyXEwFp77y24z9VESiCjojgDIbURWWy1/zpwPO/C7UamGeEN+LA857m+wbvW
 lg5qqTIeHfzmBXrmwQ2Cn7qkn23alGfWWA3QOyTAyW968EGU8TqkQ8N6GPsgFVgL
 r60we/ddcYhOCyEsnO3ezS2pJ61TA1nvnLkxFU8wzbrSGIU4i6UALG1k3v0L2M7W
 KvwbMusFKcDS71+XKGhGnUF3sBDX1v/IJWtmagWd/gpekJ4wQbnH+/DyL6WVWodn
 Dd7N8QNJSoKwXRLpw3WCf7m7IZujYW/YyTb0Usbn0dI4NCtTJ1M+0vnWttVEQTrk
 z9+jcJ15SOu/7OCP2jcBNtDbXsJ+8aNmQ2l/dXBr/+ZPQH3Fw+QMByshH0izSNYy
 nYIrwf9LPJx5K8/ThjVJw2CCzasHBjrEr5bCO6gwA2F3mJ/+9jE=
 =vIcZ
 -----END PGP SIGNATURE-----

Merge tag 'ux500-dts-for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into arm/dt

Ux500 DTS updates:

- Flag the janice SPI display lines properly for the right line
  semantics.
- Fix some errors in the Skomer regulator configuration.
- Fix some SD card pin configurations on Skomer.
- Assign the Skomer SD card a 300 ms power-on delay.
- Rewrite the battery nodes to use the standard binding
  "monitored-battery" as used in the updated bindings, and
  provide the right Samsung battery compatibles for the Samsung
  phones.

* tag 'ux500-dts-for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
  ARM: dts: ux500: Switch battery nodes to standard
  ARM: dts: ux500: Skomer eMMC needs 300 ms power on
  ARM: dts: ux500: Fix up SD card pin config
  ARM: dts: ux500: Skomer regulator fixes
  ARM: dts: ux500: Tag Janice display SPI correct

Link: https://lore.kernel.org/r/CACRpkdYf5GwRvG1Gemk4mE+aw6UnAVTY8OudwsVNPQXThHXu6g@mail.gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2021-10-19 23:40:41 +02:00
Arnd Bergmann
4f0c2be3d1 This pull request contains Broadcom ARM64-based SoCs Device Tree changes
for 5.16, please pull the following:
 
 - Rafal updates the BCM4908 DTS files to produce fewer warnings by
 fixing the UART clock name, moving the reboot syscon node out of the bus
 node, and finally updating the NAND controller node names.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEm+Rq3+YGJdiR9yuFh9CWnEQHBwQFAmFlvZ4ACgkQh9CWnEQH
 BwQAig/+L8jeVcubM0PaiXUXp7qRPuKr8i7fF6DVwagMUSo2T9XWz0hOPv2qZL82
 d6zp+ZBr2kD092WB0zIGBSt1JYYvl1/CO+D8ksjn8TH+6NOFExzhnUzGlHPw1bsU
 Q6iUjKzFsKVwIe/qRNIieI0w991fJwU0UFcj858V3CB7kA/hki13w8WyPse9Fl6h
 qEgN5FZ/rb8OPUchZGqbrE5rYNnXWw8IpL12QLosOOhChspN/gTKxyyTA3w0YO0T
 mZ0JFQoW5mQVtjkG/G+3LfWCcRfmdiuaw50iJE7MUFZj566bKlEMyYnleQnTG3uS
 j+ukYzB1jL1EUCDU5dlBThHncRo146J+KFZ70f7Cx3o2lp412K9vnpZjoVsUiOOE
 CTpa8MUExiQ3gc4T38CEaue4x8LdAtXBLfwV1U6v02OVzexJOs8nbSoN6L85CsM2
 t4oi7ZVecogirmTkP7TzmDda3bIAWslrLO/BPOOeKirlGYaG5sSy2ohDXBtp2QgC
 MP7K26kcL/68SqeASJt4jl4vx0fByalYhS0ZbhoBtT/tG1wwY9J2krXnrM2koTVa
 XP6RoUPblUuNSgZqauzp1FR6epoVc4ox14j3gYLoEfCemAlHoF2YfhaO6KRZ7K8b
 7KAhW55X6gJBtyF7jpkDd6aAKJwHwD22QYEiPEIFrwRAgJKgcXM=
 =i+W/
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmFvOwUACgkQmmx57+YA
 GNnBnRAAi79rUBLoOxdvWrdTT5hJaMAPBSaeu6rPvM7VRPSGwUbFdE+oFhkw383P
 dxYsIw/fLapdWjPBUmknWjqspazB8MdUT0o8kpT1y7lJZ1T//W4ZG6nBAAbaeeI0
 3BciNN+xkF+7ksVWkRX6MJhG3qljN123oUdxZPT+X/W1fvFOs7RoGnRFpAxpVG9t
 qoTCXbLPODU+Ug9p+5HhUIMzWWtqF5xItD53GgTHKv0XLkgMinq/ye/8BH9Bps6J
 b908GCRvZKlgxSM/tX1wygJu+UDAHkjOgoZLtgtZPoVrLHx4QbyBa1Ut2U5RXe3f
 1YGSyaST1AuYtNpkn6Srn9yWH9ZsZ6QunHt4kYBKrjH7JeyLOcvPyCbh2gmyoD5W
 ftdTE49ggN69LVTsoWhnTHNE36zXWEgmu387fCo+ABKudZZfzzDRnk4tK4vmcDXC
 OnOkOXVagD7YMmyhmH2peCgbjMhH7cHUWBgw50SQvQAc4ueMfdogqGZcU21ogsLN
 +oAp0vwHsvS6a2Yv1ivUNRt0YiMB1PqENYR4zUvBAYmG5G9lQc2Szg/H3tK1KOJJ
 MUjT+9Cb/IUr9SUt7+Yj4TufeONQjvt+M3Q76fx/ziwLqjFDMjbVWCR5Th8OFp8R
 I7hVKCeXAgM/ttWMSnq8HRyrvWfjlLlm/FZvoj1o+lHpkzxKr6Q=
 =wvRL
 -----END PGP SIGNATURE-----

Merge tag 'arm-soc/for-5.16/devicetree-arm64' of https://github.com/Broadcom/stblinux into arm/dt

This pull request contains Broadcom ARM64-based SoCs Device Tree changes
for 5.16, please pull the following:

- Rafal updates the BCM4908 DTS files to produce fewer warnings by
fixing the UART clock name, moving the reboot syscon node out of the bus
node, and finally updating the NAND controller node names.

* tag 'arm-soc/for-5.16/devicetree-arm64' of https://github.com/Broadcom/stblinux:
  arm64: dts: broadcom: bcm4908: Fix UART clock name
  arm64: dts: broadcom: bcm4908: Move reboot syscon out of bus
  arm64: dts: broadcom: bcm4908: Fix NAND node name

Link: https://lore.kernel.org/r/20211013174016.831348-2-f.fainelli@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2021-10-19 23:39:16 +02:00
Arnd Bergmann
4d3e49a375 This pull request contains Broadcom ARM-based SoCs Device Tree changes
for 5.16, please pull the following:
 
 - Matthew provides a set of updates to the Northstar Plus Device Tree
 files to fix a number of warnings, and prepare the files to support the
 addition of the Cisco Meraki MX64/MX65 wireless controller devices and
 finally adds support for those boards.
 
 - Rafal continues to provide updates to the BCM5301X Device Tree files
 in order to fix warnings with the various node names, MDIO muxes and
 memory nodes. He also adds support for the external switches on the
 BCM53573 SoC and adds Tenda AC9 switch ports.
 
 - Christian provides the description of the Ethernet switch ports for
 the Cisco Meraki MR32 based on the 53016 SoC
 
 - Arinc adds support for the Asus RT-AC88U device based on the BCM4709
 and featuring 8 Ethernet ports over the integrated and the external
 Realtek switch (not supported yet)
 
 - Stefan adds support for the Raspberry Pi Compute Module 4 IO board and
 does a number of preparatory changes to get there to the Device Tree
 files before doing the actual addition
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEm+Rq3+YGJdiR9yuFh9CWnEQHBwQFAmFlvtQACgkQh9CWnEQH
 BwTOUA//bomocJlqdnsIyRRVrpAxDnaNKmFtEAIGb1okHeocweIy1HEXI4ssAmiR
 R+k74MpsgMyi9AP6zcJLAtkQCYw2xn01MjRfpidX42Qumvz8c/ZCKrlTd2YoUvGI
 IuhIjp2Mmb07Gte72tQ95WAP+86p4B7Q9P321hVv00ENXbI3tyO+ABjctLmFicFc
 YqQChdBMVQOBKS8xYxjLu8kJyYbuGIaA/3xhxx8y6PQ/TL8GQVwub79Yngg/XA6t
 1hG1Jw+yRQlX2nM7rdzuALKUR1JBgo14yBrStyboLzgHOOTvLYE4JSq0Q5eRZxvw
 nrNYuxV74Z3J88OluP6qVUcMfj14c88dwueQKlvoZuCuSbIk3r/dbb8sijfud4JU
 GoUx1/+grfn0BK30UyF4p3DFoAIC29YlfDi6VNAfNN7hOpT+yXSo/01J4/twQfG8
 0iruWA2dPVjL+4AMBW32fCx+6s59pLNS/psILgb0+BTeE9kqmmFgiPoiJOlWPztn
 loOjVH6eijfSUReUkExTMl0VU93Rgy3f45aM4HHWnHyy0/BlYaoQ0SjZVc0YMIhw
 lrfEutO/MXAik5Ga+BlG9e8OG7LHhcZmxt3NX1FLUpreLPdgz47aqjzbDxV2WSdg
 y0A6Lo/2tqCbljYOWgiNNw6XAg6z5e5Bb4DFkybsxUwHhVNL7zc=
 =KGAI
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmFvOiUACgkQmmx57+YA
 GNmQ/Q/+J2HunngXPMz68OysNCQ8tvT2eWRQo5Ju5KGiabXrF7QNeNPysxAwhvZv
 Wv0Bfg0aONEjfJgonub0ezKDd/GrsBxOaHdA/5VNcCGZyPvXfRRkvCkFggI3oQsO
 wWWX523kcsLyck59kixLOxJdHjplcwV/Hj6qW0+iGNCglVRDL73DoVzF5nqtUgMP
 WXcQl9L5YTjnCmRJwsQylqIZJzGIEhNwr5wYp/RtEVe9vdJ2uQ74PqLcZJZCPD1g
 WpMNgAS0w5ZocIbyRlvN5SmLI8gM7nwwmzp9Eq2q6bzpPKfBBcrSySPNEj3avTCc
 Fpb1GwlRECTlVc90eF1Om6garFkdO6xorxaagqQAebxSOZ5uWH5urzfUVSuKVBDv
 uTWUNXFghukjHVdnv1rblxfRlIzj5cFats/0lQTzjo/ankQMBs53vZ3720TV2uq7
 D5go3cd4V6ebVP0NoINYs+4iO2BaXA32g7SwGier8X6p2xPVKuZ8+18+wytE1RoY
 hobWTwdY5DbsfV1+z1cksNHrgY1NRXVlKEw6gkw5RXMf2GZ7XSO1CpzNEHsp7J4y
 S51bmO7LZqx8wSq+WCQjL0RzQbzSmls28ofyiEAlsGG0wzYdRWeLbdqU7UijgFRc
 r8B0ydAiKS/NH1r3hh+ht+j6TG2vCxm8G1KWYjZXOM3oJyGnbpQ=
 =Ptpv
 -----END PGP SIGNATURE-----

Merge tag 'arm-soc/for-5.16/devicetree' of https://github.com/Broadcom/stblinux into arm/dt

This pull request contains Broadcom ARM-based SoCs Device Tree changes
for 5.16, please pull the following:

- Matthew provides a set of updates to the Northstar Plus Device Tree
files to fix a number of warnings, and prepare the files to support the
addition of the Cisco Meraki MX64/MX65 wireless controller devices and
finally adds support for those boards.

- Rafal continues to provide updates to the BCM5301X Device Tree files
in order to fix warnings with the various node names, MDIO muxes and
memory nodes. He also adds support for the external switches on the
BCM53573 SoC and adds Tenda AC9 switch ports.

- Christian provides the description of the Ethernet switch ports for
the Cisco Meraki MR32 based on the 53016 SoC

- Arinc adds support for the Asus RT-AC88U device based on the BCM4709
and featuring 8 Ethernet ports over the integrated and the external
Realtek switch (not supported yet)

- Stefan adds support for the Raspberry Pi Compute Module 4 IO board and
does a number of preparatory changes to get there to the Device Tree
files before doing the actual addition

* tag 'arm-soc/for-5.16/devicetree' of https://github.com/Broadcom/stblinux: (31 commits)
  arm64: dts: broadcom: Add reference to RPi CM4 IO Board
  ARM: dts: Add Raspberry Pi Compute Module 4 IO Board
  ARM: dts: Add Raspberry Pi Compute Module 4
  dt-bindings: arm: bcm2835: Add Raspberry Pi Compute Module 4
  ARM: dts: bcm283x-rpi: Move Wifi/BT into separate dtsi
  dt-bindings: display: bcm2835: add optional property power-domains
  ARM: dts: BCM5301X: Add DT for Asus RT-AC88U
  ARM: BCM53016: MR32: get mac-address from nvmem
  ARM: BCM53016: Specify switch ports for Meraki MR32
  ARM: dts: BCM53573: Add Tenda AC9 switch ports
  ARM: dts: BCM53573: Describe on-SoC BCM53125 rev 4 switch
  ARM: dts: BCM5301X: Specify switch ports for more devices
  ARM: dts: NSP: Fix MX65 MDIO mux warnings
  ARM: dts: NSP: Fix MX64/MX65 eeprom node name
  ARM: dts: NSP: Fix MDIO mux node names
  ARM: dts: NSP: Fix mpcore, mmc node names
  ARM: dts: NSP: Add bcm958623hr board name to dts
  ARM: dts: BCM5301X: Fix memory nodes names
  ARM: dts: BCM5301X: Fix MDIO mux binding
  ARM: dts: BCM5301X: Fix nodes names
  ...

Link: https://lore.kernel.org/r/20211013174016.831348-1-f.fainelli@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2021-10-19 23:35:33 +02:00
Guchun Chen
dac35c4239 drm/amdgpu/discovery: parse hw_id_name for SDMA instance 2 and 3
Otherwise, hw_id_name string is NULL for SDMA 2 and 3 when dumping
ip version from VBIOS.

Signed-off-by: Guchun Chen <guchun.chen@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
2021-10-19 17:32:52 -04:00
Tao Zhou
42f88ab772 drm/amdgpu: output warning for unsupported ras error inject (v2)
Output a warning message if RAS TA returns UNSUPPORTED_ERROR_INJ status.

v2: implement it in psp_ras_ta_check_status function.

Signed-off-by: Tao Zhou <tao.zhou1@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
2021-10-19 17:32:52 -04:00
Tao Zhou
1b5254e8d9 drm/amdgpu: centralize checking for RAS TA status
Create new function to check status returned by RAS TA.

Signed-off-by: Tao Zhou <tao.zhou1@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
2021-10-19 17:32:52 -04:00
Agustin Gutierrez
c494e57992 Revert "drm/amd/display: Add helper for blanking all dp displays"
This reverts commit 1445d967fb.

This patch introduced a couple of dmesg warnings, this is not a valid
approach anymore. For this reason, we are reverting this patch, and we
need to revert the workaround patch.

v2: squash in unused variable removal (Alex)

Cc: Hanghong Ma <hanghong.ma@amd.com>
Cc: Mark Broadworth <mark.broadworth@amd.com>
Signed-off-by: Agustin Gutierrez <agustin.gutierrez@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
2021-10-19 17:32:51 -04:00
Agustin Gutierrez
e848c714db Revert "drm/amd/display: Fix error in dmesg at boot"
This reverts commit 4874ecf5fd.

Signed-off-by: Agustin Gutierrez <agustin.gutierrez@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
2021-10-19 17:32:51 -04:00
Anthony Koo
8098acd3dc drm/amd/display: [FW Promotion] Release 0.0.88
Acked-by: Agustin Gutierrez Sanchez <agustin.gutierrez@amd.com>
Signed-off-by: Anthony Koo <Anthony.Koo@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
2021-10-19 17:32:51 -04:00
Nevenko Stupar
69c86e6be3 drm/amd/display: Add bios parser support for latest firmware_info
[Why]
V3_4 is latest in use.

[How]
Add bios parser support for firmware_info_v3_4 along
with some relevant fields it is also retrieving from dce_info
and smu_info.

Reviewed-by: Jun Lei <Jun.Lei@amd.com>
Acked-by: Agustin Gutierrez Sanchez <agustin.gutierrez@amd.com>
Signed-off-by: Nevenko Stupar <Nevenko.Stupar@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
2021-10-19 17:32:51 -04:00