Commit graph

1,233,579 commits

Author SHA1 Message Date
Ankit Nautiyal
5ad1ab30ac drm/display/dp: Fix the DP DSC Receiver cap size
DP DSC Receiver Capabilities are exposed via DPCD 60h-6Fh.
Fix the DSC RECEIVER CAP SIZE accordingly.

Fixes: ffddc4363c ("drm/dp: Add DP DSC DPCD receiver capability size define and missing SHIFT")
Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
Cc: Manasi Navare <manasi.d.navare@intel.com>
Cc: <stable@vger.kernel.org> # v5.0+

Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Reviewed-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230818044436.177806-1-ankit.k.nautiyal@intel.com
2023-08-22 10:52:11 +03:00
Bartosz Golaszewski
9ce4ed5b4d gpiolib: provide and use gpiod_line_state_notify()
Wrap the calls to blocking_notifier_call_chain() for the line state
notifier with a helper that allows us to use fewer lines of code and
simpler syntax.

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
2023-08-22 09:37:46 +02:00
Biju Das
9aab92bc3a mfd: mc13xxx: Simplify device data fetching in probe()
Simplify probe() by replacing of_match_device() and ID lookup
for retrieving match data by i2c_get_match_data().

Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Link: https://lore.kernel.org/r/20230819183155.22335-1-biju.das.jz@bp.renesas.com
Signed-off-by: Lee Jones <lee@kernel.org>
2023-08-22 08:07:52 +01:00
Biju Das
d92df6fb81 mfd: rz-mtu3: Replace raw_spin_lock->spin_lock()
As per kernel documentation, use raw_spinlock_t only in real critical core
code, low-level interrupt handling, and places where disabling preemption
or interrupts is required. Here the lock is for concurrent register access
from different drivers, hence spin_lock() is sufficient.

Reported-by: Pavel Machek <pavel@denx.de>
Closes: https://lore.kernel.org/all/ZIL%2FitcJvV5s3Bnf@duo.ucw.cz/
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: Pavel Machek <pavel@denx.de>
Link: https://lore.kernel.org/r/20230815073445.9579-3-biju.das.jz@bp.renesas.com
Signed-off-by: Lee Jones <lee@kernel.org>
2023-08-22 08:07:52 +01:00
Biju Das
a160d1286b mfd: rz-mtu3: Reduce critical sections
Reduce critical sections on rz_mtu3_start_stop_ch() and
rz_mtu3_is_enabled() by moving offset and bitpos computation
outside the critical section and drop the 'ret' variable on
rz_mtu3_is_enabled() and return 'tstr & BIT(bitpos)' directly.

Reported-by: Pavel Machek <pavel@denx.de>
Closes: https://lore.kernel.org/all/ZIMAse1ikTuycJ02@duo.ucw.cz/
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: Pavel Machek <pavel@denx.de>
Link: https://lore.kernel.org/r/20230815073445.9579-2-biju.das.jz@bp.renesas.com
Signed-off-by: Lee Jones <lee@kernel.org>
2023-08-22 08:07:52 +01:00
Krzysztof Kozlowski
367124ebb3 mfd: mxs-lradc: Fix Wvoid-pointer-to-enum-cast warning
'soc' is an enum, thus cast of pointer on 64-bit compile test with W=1
causes:

  mxs-lradc.c:145:15: error: cast to smaller integer type 'enum mxs_lradc_id' from 'const void *' [-Werror,-Wvoid-pointer-to-enum-cast]

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20230810095849.123321-9-krzysztof.kozlowski@linaro.org
Signed-off-by: Lee Jones <lee@kernel.org>
2023-08-22 08:07:52 +01:00
Krzysztof Kozlowski
4e57d1425c mfd: wm31x: Fix Wvoid-pointer-to-enum-cast warning
'type' is an enum, thus cast of pointer on 64-bit compile test with
W=1 causes:

  wm831x-spi.c:36:10: error: cast to smaller integer type 'enum wm831x_parent' from 'const void *' [-Werror,-Wvoid-pointer-to-enum-cast]

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20230810095849.123321-8-krzysztof.kozlowski@linaro.org
Signed-off-by: Lee Jones <lee@kernel.org>
2023-08-22 08:07:52 +01:00
Krzysztof Kozlowski
5033fb9779 mfd: wm8994: Fix Wvoid-pointer-to-enum-cast warning
'type' is an enum, thus cast of pointer on 64-bit compile test with W=1
causes:

  wm8994-core.c:631:19: error: cast to smaller integer type 'enum wm8994_type' from 'const void *' [-Werror,-Wvoid-pointer-to-enum-cast]

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20230810095849.123321-7-krzysztof.kozlowski@linaro.org
Signed-off-by: Lee Jones <lee@kernel.org>
2023-08-22 08:07:52 +01:00
Krzysztof Kozlowski
a2ce000265 mfd: tc3589: Fix Wvoid-pointer-to-enum-cast warning
'version' is an enum, thus cast of pointer on 64-bit compile test with
W=1 causes:

  tc3589x.c:343:13: error: cast to smaller integer type 'enum tc3589x_version' from 'const void *' [-Werror,-Wvoid-pointer-to-enum-cast]

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20230810095849.123321-6-krzysztof.kozlowski@linaro.org
Signed-off-by: Lee Jones <lee@kernel.org>
2023-08-22 08:07:52 +01:00
Krzysztof Kozlowski
aad6c588bd mfd: lp87565: Fix Wvoid-pointer-to-enum-cast warning
'dev_type' is an enum, thus cast of pointer on 64-bit compile test with
W=1 causes:

  lp87565.c:95:23: error: cast to smaller integer type 'enum lp87565_device_type' from 'const void *' [-Werror,-Wvoid-pointer-to-enum-cast]

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20230810095849.123321-5-krzysztof.kozlowski@linaro.org
Signed-off-by: Lee Jones <lee@kernel.org>
2023-08-22 08:07:51 +01:00
Krzysztof Kozlowski
b2ee6a378d mfd: hi6421-pmic: Fix Wvoid-pointer-to-enum-cast warning
'type' is an enum, thus cast of pointer on 64-bit compile test with W=1
causes:

  hi6421-pmic-core.c:62:9: error: cast to smaller integer type 'enum hi6421_type' from 'const void *' [-Werror,-Wvoid-pointer-to-enum-cast]

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20230810095849.123321-4-krzysztof.kozlowski@linaro.org
Signed-off-by: Lee Jones <lee@kernel.org>
2023-08-22 08:07:51 +01:00
Krzysztof Kozlowski
b1da99664b mfd: max77541: Fix Wvoid-pointer-to-enum-cast warning
'id' is an enum, thus cast of pointer on 64-bit compile test with W=1
causes:

  max77541.c:176:18: error: cast to smaller integer type 'enum max7754x_ids' from 'const void *' [-Werror,-Wvoid-pointer-to-enum-cast]

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20230810095849.123321-3-krzysztof.kozlowski@linaro.org
Signed-off-by: Lee Jones <lee@kernel.org>
2023-08-22 08:07:51 +01:00
Krzysztof Kozlowski
0f28379e3a mfd: max14577: Fix Wvoid-pointer-to-enum-cast warning
'dev_type' is an enum, thus cast of pointer on 64-bit compile test with
W=1 causes:

  max14577.c:406:5: error: cast to smaller integer type 'enum maxim_device_type' from 'const void *' [-Werror,-Wvoid-pointer-to-enum-cast]

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com>
Link: https://lore.kernel.org/r/20230810095849.123321-2-krzysztof.kozlowski@linaro.org
Signed-off-by: Lee Jones <lee@kernel.org>
2023-08-22 08:07:51 +01:00
Krzysztof Kozlowski
4db65f45e0 mfd: stmpe: Fix Wvoid-pointer-to-enum-cast warning
'partnum' is an enum, thus cast of pointer on 64-bit compile test with W=1
causes:

stmpe-i2c.c:90:13: error: cast to smaller integer type 'enum stmpe_partnum' from 'const void *' [-Werror,-Wvoid-pointer-to-enum-cast]

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20230810095849.123321-1-krzysztof.kozlowski@linaro.org
Signed-off-by: Lee Jones <lee@kernel.org>
2023-08-22 08:07:51 +01:00
Zhu Wang
59cf381f12 mfd: rn5t618: Remove redundant of_match_ptr()
The driver depends on CONFIG_OF, so it is not necessary to use
of_match_ptr() here. We remove of_match_ptr() here.

Signed-off-by: Zhu Wang <wangzhu9@huawei.com>
Link: https://lore.kernel.org/r/20230808130023.202700-9-wangzhu9@huawei.com
Signed-off-by: Lee Jones <lee@kernel.org>
2023-08-22 08:07:51 +01:00
Zhu Wang
d20642ad4f mfd: lochnagar-i2c: Remove redundant of_match_ptr()
The driver depends on CONFIG_OF, so it is not necessary to use
of_match_ptr() here. We remove of_match_ptr() here.

Signed-off-by: Zhu Wang <wangzhu9@huawei.com>
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20230808130023.202700-8-wangzhu9@huawei.com
Signed-off-by: Lee Jones <lee@kernel.org>
2023-08-22 08:07:51 +01:00
Zhu Wang
9425f72ad3 mfd: stpmic1: Remove redundant of_match_ptr()
The driver depends on CONFIG_OF, so it is not necessary to use
of_match_ptr() here. We remove of_match_ptr() here.

Signed-off-by: Zhu Wang <wangzhu9@huawei.com>
Link: https://lore.kernel.org/r/20230808130023.202700-6-wangzhu9@huawei.com
Signed-off-by: Lee Jones <lee@kernel.org>
2023-08-22 08:07:51 +01:00
Zhu Wang
0003732302 mfd: act8945a: Remove redundant of_match_ptr()
The driver depends on CONFIG_OF, so it is not necessary to use
of_match_ptr() here. We remove of_match_ptr() here.

Signed-off-by: Zhu Wang <wangzhu9@huawei.com>
Link: https://lore.kernel.org/r/20230808130023.202700-5-wangzhu9@huawei.com
Signed-off-by: Lee Jones <lee@kernel.org>
2023-08-22 08:07:50 +01:00
Zhu Wang
6192a8a179 mfd: rsmu_spi: Remove redundant of_match_ptr()
The driver depends on CONFIG_OF, so it is not necessary to use
of_match_ptr() here. We remove of_match_ptr() here.

Signed-off-by: Zhu Wang <wangzhu9@huawei.com>
Link: https://lore.kernel.org/r/20230808130023.202700-4-wangzhu9@huawei.com
Signed-off-by: Lee Jones <lee@kernel.org>
2023-08-22 08:07:50 +01:00
Zhu Wang
23fa9421f8 mfd: altera-a10sr: Remove redundant of_match_ptr()
The driver depends on CONFIG_OF, so it is not necessary to use
of_match_ptr() here. We remove of_match_ptr() here.

Signed-off-by: Zhu Wang <wangzhu9@huawei.com>
Link: https://lore.kernel.org/r/20230808130023.202700-3-wangzhu9@huawei.com
Signed-off-by: Lee Jones <lee@kernel.org>
2023-08-22 08:07:50 +01:00
Zhu Wang
e158e08a76 mfd: rsmu_i2c: Remove redundant of_match_ptr()
The driver depends on CONFIG_OF, so it is not necessary to use
of_match_ptr() here. We remove of_match_ptr() here.

Signed-off-by: Zhu Wang <wangzhu9@huawei.com>
Link: https://lore.kernel.org/r/20230808130023.202700-2-wangzhu9@huawei.com
Signed-off-by: Lee Jones <lee@kernel.org>
2023-08-22 08:07:50 +01:00
Ruan Jinjie
8e922937a7 mfd: tc3589x: Remove redundant of_match_ptr()
The driver depends on CONFIG_OF, it is not necessary to use
of_match_ptr() here.

Signed-off-by: Ruan Jinjie <ruanjinjie@huawei.com>
Link: https://lore.kernel.org/r/20230808130003.4076702-1-ruanjinjie@huawei.com
Signed-off-by: Lee Jones <lee@kernel.org>
2023-08-22 08:07:50 +01:00
Li Zetao
87ea8c7e2d mfd: ipaq-micro: Remove unused variable i in micro_rx_msg()
There is a warning reported by kernel test robot:

drivers/mfd/ipaq-micro.c:81:6: warning: unused variable ‘i’ [-Wunused-variable]

Since the commit 92d82d76c842 ("mfd: ipaq-micro: Use %*ph for printing
hexdump of a small buffer"), the variable 'i' is unused. Remove it to
silence the warning.

Reported-by: kernelci.org bot <bot@kernelci.org>
Closes: https://lore.kernel.org/all/64c8aeac.170a0220.e3234.2745@mx.google.com/
Signed-off-by: Li Zetao <lizetao1@huawei.com>
Link: https://lore.kernel.org/r/20230817114505.1810920-1-lizetao1@huawei.com
Signed-off-by: Lee Jones <lee@kernel.org>
2023-08-22 08:07:50 +01:00
Fabio Estevam
7970744b1d dt-bindings: mfd: bd71847-pmic: Remove unneeded LED header
There is nothing from <dt-bindings/leds/common.h> that is needed by
the binding example.

Remove the unneeded inclusion.

Signed-off-by: Fabio Estevam <festevam@denx.de>
Acked-by: Conor Dooley <conor.dooley@microchip.com>
Reviewed-by: Matti Vaittinen <mazziesaccount@gmail.com>
Link: https://lore.kernel.org/r/20230804021657.190700-1-festevam@gmail.com
Signed-off-by: Lee Jones <lee@kernel.org>
2023-08-22 08:07:50 +01:00
Alexander Stein
7564efb373 MAINTAINERS: Add entry for TQ-Systems device trees and drivers
This includes the arm & arm64 module + board DT files as well as x86
platform GPIO drivers.

Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
Signed-off-by: Markus Niebel <Markus.Niebel@ew.tq-group.com>
Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
Link: https://lore.kernel.org/r/20230801085158.87735-1-alexander.stein@ew.tq-group.com
Signed-off-by: Lee Jones <lee@kernel.org>
2023-08-22 08:07:49 +01:00
Luís Henriques
64e86f632b ceph: add base64 endcoding routines for encrypted names
The base64url encoding used by fscrypt includes the '_' character, which
may cause problems in snapshot names (if the name starts with '_').
Thus, use the base64 encoding defined for IMAP mailbox names (RFC 3501),
which uses '+' and ',' instead of '-' and '_'.

Signed-off-by: Luís Henriques <lhenriques@suse.de>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-by: Milind Changire <mchangir@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2023-08-22 09:01:48 +02:00
Xiubo Li
b7b53361c8 ceph: make ioctl cmds more readable in debug log
ioctl file 0000000004e6b054 cmd 2148296211 arg 824635143532

The numerical cmd value in the ioctl debug log message is too hard to
understand even when you look at it in the code. Make it more readable.

[ idryomov: add missing _ in ceph_ioctl_cmd_name() ]

Signed-off-by: Xiubo Li <xiubli@redhat.com>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Reviewed-and-tested-by: Luís Henriques <lhenriques@suse.de>
Reviewed-by: Milind Changire <mchangir@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2023-08-22 09:01:48 +02:00
Jeff Layton
f061feda6c ceph: add fscrypt ioctls and ceph.fscrypt.auth vxattr
We gate most of the ioctls on MDS feature support. The exception is the
key removal and status functions that we still want to work if the MDS's
were to (inexplicably) lose the feature.

For the set_policy ioctl, we take Fs caps to ensure that nothing can
create files in the directory while the ioctl is running. That should
be enough to ensure that the "empty_dir" check is reliable.

The vxattr is read-only, added mostly for future debugging purposes.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-and-tested-by: Luís Henriques <lhenriques@suse.de>
Reviewed-by: Milind Changire <mchangir@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2023-08-22 09:01:48 +02:00
Jeff Layton
6b5717bd30 ceph: implement -o test_dummy_encryption mount option
Add support for the test_dummy_encryption mount option. This allows us
to test the encrypted codepaths in ceph without having to manually set
keys, etc.

[ lhenriques: fix potential fsc->fsc_dummy_enc_policy memory leak in
  ceph_real_mount() ]

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-and-tested-by: Luís Henriques <lhenriques@suse.de>
Reviewed-by: Milind Changire <mchangir@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2023-08-22 09:01:48 +02:00
Jeff Layton
2d332d5bc4 ceph: fscrypt_auth handling for ceph
Most fscrypt-enabled filesystems store the crypto context in an xattr,
but that's problematic for ceph as xatts are governed by the XATTR cap,
but we really want the crypto context as part of the AUTH cap.

Because of this, the MDS has added two new inode metadata fields:
fscrypt_auth and fscrypt_file. The former is used to hold the crypto
context, and the latter is used to track the real file size.

Parse new fscrypt_auth and fscrypt_file fields in inode traces. For now,
we don't use fscrypt_file, but fscrypt_auth is used to hold the fscrypt
context.

Allow the client to use a setattr request for setting the fscrypt_auth
field. Since this is not a standard setattr request from the VFS, we add
a new field to __ceph_setattr that carries ceph-specific inode attrs.

Have the set_context op do a setattr that sets the fscrypt_auth value,
and get_context just return the contents of that field (since it should
always be available).

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-and-tested-by: Luís Henriques <lhenriques@suse.de>
Reviewed-by: Milind Changire <mchangir@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2023-08-22 09:01:48 +02:00
Jeff Layton
4de77f25fd ceph: use osd_req_op_extent_osd_iter for netfs reads
The netfs layer has already pinned the pages involved before calling
issue_op, so we can just pass down the iter directly instead of calling
iov_iter_get_pages_alloc.

Instead of having to allocate a page array, use CEPH_MSG_DATA_ITER and
pass it the iov_iter directly to clone.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-and-tested-by: Luís Henriques <lhenriques@suse.de>
Reviewed-by: Milind Changire <mchangir@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2023-08-22 09:01:48 +02:00
Jeff Layton
dee0c5f834 libceph: add new iov_iter-based ceph_msg_data_type and ceph_osd_data_type
Add an iov_iter to the unions in ceph_msg_data and ceph_msg_data_cursor.
Instead of requiring a list of pages or bvecs, we can just use an
iov_iter directly, and avoid extra allocations.

We assume that the pages represented by the iter are pinned such that
they shouldn't incur page faults, which is the case for the iov_iters
created by netfs.

While working on this, Al Viro informed me that he was going to change
iov_iter_get_pages to auto-advance the iterator as that pattern is more
or less required for ITER_PIPE anyway. We emulate that here for now by
advancing in the _next op and tracking that amount in the "lastlen"
field.

In the event that _next is called twice without an intervening
_advance, we revert the iov_iter by the remaining lastlen before
calling iov_iter_get_pages.

Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-and-tested-by: Luís Henriques <lhenriques@suse.de>
Reviewed-by: Milind Changire <mchangir@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2023-08-22 09:01:48 +02:00
Jeff Layton
4c793d4c58 ceph: make ceph_msdc_build_path use ref-walk
Encryption potentially requires allocation, at which point we'll need to
be in a non-atomic context. Convert ceph_msdc_build_path to take dentry
spinlocks and references instead of using rcu_read_lock to walk the
path.

This is slightly less efficient, and we may want to eventually allow
using RCU when the leaf dentry isn't encrypted.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-and-tested-by: Luís Henriques <lhenriques@suse.de>
Reviewed-by: Milind Changire <mchangir@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2023-08-22 09:01:48 +02:00
Jeff Layton
ec9595c080 ceph: preallocate inode for ops that may create one
When creating a new inode, we need to determine the crypto context
before we can transmit the RPC. The fscrypt API has a routine for getting
a crypto context before a create occurs, but it requires an inode.

Change the ceph code to preallocate an inode in advance of a create of
any sort (open(), mknod(), symlink(), etc). Move the existing code that
generates the ACL and SELinux blobs into this routine since that's
mostly common across all the different codepaths.

In most cases, we just want to allow ceph_fill_trace to use that inode
after the reply comes in, so add a new field to the MDS request for it
(r_new_inode).

The async create codepath is a bit different though. In that case, we
want to hash the inode in advance of the RPC so that it can be used
before the reply comes in. If the call subsequently fails with
-EJUKEBOX, then just put the references and clean up the as_ctx. Note
that with this change, we now need to regenerate the as_ctx when this
occurs, but it's quite rare for it to happen.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-and-tested-by: Luís Henriques <lhenriques@suse.de>
Reviewed-by: Milind Changire <mchangir@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2023-08-22 09:01:47 +02:00
Jeff Layton
03bc06c7b0 ceph: add new mount option to enable sparse reads
Add a new mount option that has the client issue sparse reads instead of
normal ones. The callers now preallocate an sparse extent buffer that
the libceph receive code can populate and hand back after the operation
completes.

After a successful sparse read, we can't use the req->r_result value to
determine the amount of data "read", so instead we set the received
length to be from the end of the last extent in the buffer. Any
interstitial holes will have been filled by the receive code.

[ xiubli: fix a double free on req reported by Ilya ]

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-and-tested-by: Luís Henriques <lhenriques@suse.de>
Reviewed-by: Milind Changire <mchangir@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2023-08-22 09:01:47 +02:00
Jeff Layton
f628d79997 libceph: add sparse read support to OSD client
Have get_reply check for the presence of sparse read ops in the
request and set the sparse_read boolean in the msg. That will queue the
messenger layer to use the sparse read codepath instead of the normal
data receive.

Add a new sparse_read operation for the OSD client, driven by its own
state machine. The messenger will repeatedly call the sparse_read
operation, and it will pass back the necessary info to set up to read
the next extent of data, while zero-filling the sparse regions.

The state machine will stop at the end of the last extent, and will
attach the extent map buffer to the ceph_osd_req_op so that the caller
can use it.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-and-tested-by: Luís Henriques <lhenriques@suse.de>
Reviewed-by: Milind Changire <mchangir@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2023-08-22 09:01:47 +02:00
Jeff Layton
d396f89db3 libceph: add sparse read support to msgr1
Add 2 new fields to ceph_connection_v1_info to track the necessary info
in sparse reads. Skip initializing the cursor for a sparse read.

Break out read_partial_message_section into a wrapper around a new
read_partial_message_chunk function that doesn't zero out the crc first.

Add new helper functions to drive receiving into the destinations
provided by the sparse_read state machine.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-and-tested-by: Luís Henriques <lhenriques@suse.de>
Reviewed-by: Milind Changire <mchangir@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2023-08-22 09:01:47 +02:00
Jeff Layton
f36217e35c libceph: support sparse reads on msgr2 secure codepath
Add a new init_sgs_pages helper that populates the scatterlist from
an arbitrary point in an array of pages.

Change setup_message_sgs to take an optional pointer to an array of
pages. If that's set, then the scatterlist will be set using that
array instead of the cursor.

When given a sparse read on a secure connection, decrypt the data
in-place rather than into the final destination, by passing it the
in_enc_pages array.

After decrypting, run the sparse_read state machine in a loop, copying
data from the decrypted pages until it's complete.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-and-tested-by: Luís Henriques <lhenriques@suse.de>
Reviewed-by: Milind Changire <mchangir@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2023-08-22 09:01:47 +02:00
Jeff Layton
ec3bc567ea libceph: new sparse_read op, support sparse reads on msgr2 crc codepath
Add support for a new sparse_read ceph_connection operation. The idea is
that the client driver can define this operation use it to do special
handling for incoming reads.

The alloc_msg routine will look at the request and determine whether the
reply is expected to be sparse. If it is, then we'll dispatch to a
different set of state machine states that will repeatedly call the
driver's sparse_read op to get length and placement info for reading the
extent map, and the extents themselves.

This necessitates adding some new field to some other structs:

- The msg gets a new bool to track whether it's a sparse_read request.

- A new field is added to the cursor to track the amount remaining in the
current extent. This is used to cap the read from the socket into the
msg_data

- Handing a revoke with all of this is particularly difficult, so I've
added a new data_len_remain field to the v2 connection info, and then
use that to skip that much on a revoke. We may want to expand the use of
that to the normal read path as well, just for consistency's sake.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-and-tested-by: Luís Henriques <lhenriques@suse.de>
Reviewed-by: Milind Changire <mchangir@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2023-08-22 09:01:47 +02:00
Jeff Layton
a679e50f72 libceph: define struct ceph_sparse_extent and add some helpers
When the OSD sends back a sparse read reply, it contains an array of
these structures. Define the structure and add a couple of helpers for
dealing with them.

Also add a place in struct ceph_osd_req_op to store the extent buffer,
and code to free it if it's populated when the req is torn down.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-and-tested-by: Luís Henriques <lhenriques@suse.de>
Reviewed-by: Milind Changire <mchangir@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2023-08-22 09:01:47 +02:00
Jeff Layton
08b8a0440e libceph: add spinlock around osd->o_requests
In a later patch, we're going to need to search for a request in
the rbtree, but taking the o_mutex is inconvenient as we already
hold the con mutex at the point where we need it.

Add a new spinlock that we take when inserting and erasing entries from
the o_requests tree. Search of the rbtree can be done with either the
mutex or the spinlock, but insertion and removal requires both.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-and-tested-by: Luís Henriques <lhenriques@suse.de>
Reviewed-by: Milind Changire <mchangir@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2023-08-22 09:01:47 +02:00
Petr Pavlu
442466e04f xen/xenbus: Avoid a lockdep warning when adding a watch
The following lockdep warning appears during boot on a Xen dom0 system:

[   96.388794] ======================================================
[   96.388797] WARNING: possible circular locking dependency detected
[   96.388799] 6.4.0-rc5-default+ #8 Tainted: G            EL
[   96.388803] ------------------------------------------------------
[   96.388804] xenconsoled/1330 is trying to acquire lock:
[   96.388808] ffffffff82acdd10 (xs_watch_rwsem){++++}-{3:3}, at: register_xenbus_watch+0x45/0x140
[   96.388847]
               but task is already holding lock:
[   96.388849] ffff888100c92068 (&u->msgbuffer_mutex){+.+.}-{3:3}, at: xenbus_file_write+0x2c/0x600
[   96.388862]
               which lock already depends on the new lock.

[   96.388864]
               the existing dependency chain (in reverse order) is:
[   96.388866]
               -> #2 (&u->msgbuffer_mutex){+.+.}-{3:3}:
[   96.388874]        __mutex_lock+0x85/0xb30
[   96.388885]        xenbus_dev_queue_reply+0x48/0x2b0
[   96.388890]        xenbus_thread+0x1d7/0x950
[   96.388897]        kthread+0xe7/0x120
[   96.388905]        ret_from_fork+0x2c/0x50
[   96.388914]
               -> #1 (xs_response_mutex){+.+.}-{3:3}:
[   96.388923]        __mutex_lock+0x85/0xb30
[   96.388930]        xenbus_backend_ioctl+0x56/0x1c0
[   96.388935]        __x64_sys_ioctl+0x90/0xd0
[   96.388942]        do_syscall_64+0x5c/0x90
[   96.388950]        entry_SYSCALL_64_after_hwframe+0x72/0xdc
[   96.388957]
               -> #0 (xs_watch_rwsem){++++}-{3:3}:
[   96.388965]        __lock_acquire+0x1538/0x2260
[   96.388972]        lock_acquire+0xc6/0x2b0
[   96.388976]        down_read+0x2d/0x160
[   96.388983]        register_xenbus_watch+0x45/0x140
[   96.388990]        xenbus_file_write+0x53d/0x600
[   96.388994]        vfs_write+0xe4/0x490
[   96.389003]        ksys_write+0xb8/0xf0
[   96.389011]        do_syscall_64+0x5c/0x90
[   96.389017]        entry_SYSCALL_64_after_hwframe+0x72/0xdc
[   96.389023]
               other info that might help us debug this:

[   96.389025] Chain exists of:
                 xs_watch_rwsem --> xs_response_mutex --> &u->msgbuffer_mutex

[   96.413429]  Possible unsafe locking scenario:

[   96.413430]        CPU0                    CPU1
[   96.413430]        ----                    ----
[   96.413431]   lock(&u->msgbuffer_mutex);
[   96.413432]                                lock(xs_response_mutex);
[   96.413433]                                lock(&u->msgbuffer_mutex);
[   96.413434]   rlock(xs_watch_rwsem);
[   96.413436]
                *** DEADLOCK ***

[   96.413436] 1 lock held by xenconsoled/1330:
[   96.413438]  #0: ffff888100c92068 (&u->msgbuffer_mutex){+.+.}-{3:3}, at: xenbus_file_write+0x2c/0x600
[   96.413446]

An ioctl call IOCTL_XENBUS_BACKEND_SETUP (record #1 in the report)
results in calling xenbus_alloc() -> xs_suspend() which introduces
ordering xs_watch_rwsem --> xs_response_mutex. The xenbus_thread()
operation (record #2) creates xs_response_mutex --> &u->msgbuffer_mutex.
An XS_WATCH write to the xenbus file then results in a complain about
the opposite lock order &u->msgbuffer_mutex --> xs_watch_rwsem.

The dependency xs_watch_rwsem --> xs_response_mutex is spurious. Avoid
it and the warning by changing the ordering in xs_suspend(), first
acquire xs_response_mutex and then xs_watch_rwsem. Reverse also the
unlocking order in xs_suspend_cancel() for consistency, but keep
xs_resume() as is because it needs to have xs_watch_rwsem unlocked only
after exiting xs suspend and re-adding all watches.

Signed-off-by: Petr Pavlu <petr.pavlu@suse.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Link: https://lore.kernel.org/r/20230607123624.15739-1-petr.pavlu@suse.com
Signed-off-by: Juergen Gross <jgross@suse.com>
2023-08-22 08:04:59 +02:00
Arnd Bergmann
56fdaf48e7 This pull request contains Broadcom platforms updates for 6.6, please
pull the following:
 
 - Rob updates the Broadcom machine level code to use the correct DT
   includes
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEm+Rq3+YGJdiR9yuFh9CWnEQHBwQFAmTdOMkACgkQh9CWnEQH
 BwRkjQ/8Dl5BtkCe8xIx8rYbK+aghkbdf+YHYO9XLkfx3zhzORriwr2BvgMT2ZgO
 4jp2FVUI9xKax++FlU6qWmNRLuylMoieOiCFWNpmIMps0xAZYZkJT+4dD8eAOfLI
 bc9gac7MqlqnZjdsP/BXDNrUmVw4DABRDAYl2CDGsnmeW2vU/0HAsLFbsEK798RJ
 WGlaUa+guCLH48JYpNwauwXpUa1mUn+tgwJvgNWje8gYHI6ndVV7+6kTfXqMFNB5
 75y4slth/M+TEj0+IysBCV0yp8ERGmxA0Jggr6fRPHnR4bVCprJ9PDpVdKSkDLGv
 rAmihj1VM46nxMaj7Dugj4Q+1VjpovQuIf1VIvxWMb0OzsVq5YvzQRX5SsJAL4R5
 wP3NosSu8knOAmzQeP5q+apjRTGEYUzHtGgpbb00LjjrE0MNFZhhTD15KqdMiSvP
 N7farfxQtllu9zy2r2bNHwzFNLn4M4PZvmRtV2kuFI0XjaYlpk+kjfswk5pzPyuZ
 i9QAe6WIeGFEJydh8+TqGHQrA+l3NKjRixrLqbMws86wybm2ZuKU6yxSKwWPs9LV
 cbju4Gkj3mxLmjoexmAaJ+NqNi8D2O8+TnouPZTO8EAKxlvobNWarip7SEqMYBT2
 QXtQxA/SW/l639F4Y38jhVl8KCe2Q4uPaVGZqbUUW5aRbR0q4a4=
 =hHHi
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmTkGz0ACgkQYKtH/8kJ
 UicDBQ//WWTj6dTFup2EjQcTAXweRa6fCNLHPIjIDdR+/ybiUG7bL+NKbAmI9+Nl
 3f2Dt1pq50bzfswDH/GB0CsvIYzsdCVdIo/Ffi719fh/K6pa5m/+4/HILYMHHkkG
 FlZX5dFRL9cfiAHDS8pOffirr8x+bSBBfvkG/RCFWEi47IH9eez20HcgOtLFuIYN
 B7GlMTMrJJatS2pYRf/XokOt74uaz1m7f/BOoJe+Z7GlpJwBTMesJjd9PsPSUgOF
 D/JGpmIJCkWgQWs6fYBHLtoON8jzHpzh1JyGu0/qIW9Mw0vYtKLLe5HoAmCwJl5j
 qdi1Xp2G6kpSdUwGET/8VNW0WhVHO877kMV2GB9KCYv5c6mq73bF/l0G/Fc2aX1P
 IPwtF2CTjYarIYESJcB4+Vga1+KjvVdWq+mruzz7mdJFcW1fuowbKSJAKkBDdbKc
 A4r5CmKyf9J0EYnl10+jBfBLXwmVV7lqGnF0xWPo6h0vUMbIC3p5GFf3JxgdP1PU
 pDuphEw/k8A+cq+fCZIP6twY0u76CtB2hCDXInv/Be7ruV1vO0rSH+6EvuKuLcz1
 N9nNJIHG+cXlEUedb8jhPuHkYI7M7RnTLw3PWo4FFd6uQRBmZ8S9u03XBI91GUG9
 x2WLWK6sEBRfjDj5BCA9l6OUcsovt2kNOJqMiMXXoaX8DooZKHU=
 =bYKS
 -----END PGP SIGNATURE-----

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

This pull request contains Broadcom platforms updates for 6.6, please
pull the following:

- Rob updates the Broadcom machine level code to use the correct DT
  includes

* tag 'arm-soc/for-6.6/soc' of https://github.com/Broadcom/stblinux:
  ARM: bcm: Drop unused includes

Link: https://lore.kernel.org/r/20230818164539.2871539-4-florian.fainelli@broadcom.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2023-08-21 22:19:41 -04:00
Arnd Bergmann
a9d3965f76 This pull request contains Broadcom SoCs drivers changes for 6.6, please
pull the following:
 
 - Rob updates the Broadcom SoC drivers to use the correct DT includes
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEm+Rq3+YGJdiR9yuFh9CWnEQHBwQFAmTdOIkACgkQh9CWnEQH
 BwQE8RAAj7lBzrIXudZfyVUSteJeWF6BD1QTV4Mw2RbdtfdwGa2Vf/G/sQbBgMhU
 7AC1NFztHuVdch3L1/N+YAR5omqzASPI4sm34iwRLGBUUIhDO+MP4QfjapBLkqOr
 4cU1t13BA75Cyl6l6Ra8TQr5TW3qfSotHwZKvj/QgXhiLCiF8FvTLlxhRCzZrdnb
 9FdSGp5FTbFW833D0DS5EsTlk4kGV/+1bPJszStJBl5r3gqc/f9/c4Iq0oxWANFJ
 kEO1jNXxcx2wxcqgXUxux3VXdfY3fIhFBYXX6P3aMH0a6ItRcfnGDziizdI1jzuv
 NxdoJmXOCuj5c5z8R6ZFz7CITyd5hf9S4WMaxSd/2gR35PJka1oH7jrTEU3SjNex
 pnCwGNmXH/P61dVEiVKQdmN8Gz89nPSd+JlwGuNlXT8Fwe5ECTO1zNJKyrD5tyYN
 cKnOEsnn5DBWiQxVx7rMwES3Fv0iPNGX0uYU4l7gep6jS0YATA8FQksanr3AG3hX
 Bdd87JYeRiJHKhpaZbQsnm6RFs2MvI9wRJOzvYrDJu8NvwVDRdjfr3XT9T1bMjnm
 PZPdRQOV/PAp0HQP0x3wS35zMHhqQAaJE5zMbFbMrfTrTiwbgJ8mdEpHBP4H/94u
 htsFzGZQ4PcozuJTIU/5DiSDZzoU4ZnyvsPKLzQt+lX8ycS5cu0=
 =7rPB
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmTkGjIACgkQYKtH/8kJ
 Uids6RAArxRDa/VN0xX8p4xeN9mABu2gcHCPsNnyPMN60GRcm+T3OxEufFULCh4Y
 aA6YXyjcMtxuRRqPj6d1TRFv8UyK6vIlFA2Tdz6Dzts3CVcLVAZB/AS1dCY281MC
 yPDR3PguibOvI2E1r1ZNJ5nYtLRuS6ydHx/+ganYJLTR1rsdiTgc8BmM9RBKQibm
 7ziWTqTY3jrwmelZDIxwRaAE919gbYLT6EurEwH7ncmjHSocGkvvzaLXDOWFH2qI
 5sVbOkCGzD+mCuJk5C9Y2HpUAvsW3KAksSfPdzJ7wdq6Ky/DDsmOVTMB2tp2UVwd
 1zePefNw4fHX2dzlMHJvtHBv/+CIDnLa1shtSyTY5Nmycmj50v3k192m1IBjgV4D
 pbGzbmu+woIikLZHNwU0Oz17nfZ4b4XH/RNqBIDNiIW93pH/zOwkSQaioXHShq5z
 JLPSol54kdGUUOEZU/E+3rzxMZvYhs/PXaIJHH95Fy/tIRrva8WKFwQVjRSJnguL
 CAF8GAo1840JqkVH9kSCPVYcG+eEwyFH7q8tXKkwyNI13asi6N6TqJom3OUUx7hk
 i4AjzHuo47ijT4+H5krviEI8NFj9FfbrQp8RyQreGxxsRpiHA0l/Y8VK318XWvIa
 mYlDv4mstsvZZkmVBu0RwhHd7t4ZYVpSUqxEX3f2KvaKHnZXEHg=
 =m5rK
 -----END PGP SIGNATURE-----

Merge tag 'arm-soc/for-6.6/drivers' of https://github.com/Broadcom/stblinux into soc/drivers

This pull request contains Broadcom SoCs drivers changes for 6.6, please
pull the following:

- Rob updates the Broadcom SoC drivers to use the correct DT includes

* tag 'arm-soc/for-6.6/drivers' of https://github.com/Broadcom/stblinux:
  soc: bcm: Explicitly include correct DT includes

Link: https://lore.kernel.org/r/20230818164539.2871539-3-florian.fainelli@broadcom.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2023-08-21 22:15:14 -04:00
Kees Cook
99b415fe89 tg3: Use slab_build_skb() when needed
The tg3 driver will use kmalloc() under some conditions. Check the
frag_size and use slab_build_skb() when frag_size is 0. Silences
the warning introduced by commit ce098da149 ("skbuff: Introduce
slab_build_skb()"):

	Use slab_build_skb() instead
	...
	tg3_poll_work+0x638/0xf90 [tg3]

Fixes: ce098da149 ("skbuff: Introduce slab_build_skb()")
Reported-by: Fiona Ebner <f.ebner@proxmox.com>
Closes: https://lore.kernel.org/all/1bd4cb9c-4eb8-3bdb-3e05-8689817242d1@proxmox.com
Cc: Siva Reddy Kallam <siva.kallam@broadcom.com>
Cc: Prashant Sreedharan <prashant@broadcom.com>
Cc: Michael Chan <mchan@broadcom.com>
Cc: Bagas Sanjaya <bagasdotme@gmail.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Pavan Chebbi <pavan.chebbi@broadcom.com>
Link: https://lore.kernel.org/r/20230818175417.never.273-kees@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-08-21 19:11:58 -07:00
Daniel Golle
90308679c2 net: pcs: lynxi: implement pcs_disable op
When switching from 10GBase-R/5GBase-R/USXGMII to one of the interface
modes provided by mtk-pcs-lynxi we need to make sure to always perform
a full configuration of the PHYA.

Implement pcs_disable op which resets the stored interface mode to
PHY_INTERFACE_MODE_NA to trigger a full reconfiguration once the LynxI
PCS driver had previously been deselected in favor of another PCS
driver such as the to-be-added driver for the USXGMII PCS found in
MT7988.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Link: https://lore.kernel.org/r/f23d1a60d2c9d2fb72e32dcb0eaa5f7e867a3d68.1692327891.git.daniel@makrotopia.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-08-21 19:08:57 -07:00
Arnd Bergmann
924832b867 This pull request contains Broadcom ARM64-based Device Tree changes for
6.6, please pull the following:
 
 - Krzysztof adds missing spaces between node names/labels
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEm+Rq3+YGJdiR9yuFh9CWnEQHBwQFAmTdOFUACgkQh9CWnEQH
 BwTMSxAAqp53NDlGkR41/2uTc2jKtoVPM4gvvHsN3ZMK87IYKPAB+3zSgO5I5ZLh
 nrFUt9n3tNnm/WmHtLGri7j1HuHuwtvT2P1PbxYbYiu5HzkzkvsrnUDpyJcA+EDA
 n6BiNTlENZCiMkkb9pcRNKVbr1wmbSKvJ7gQCYFpaKM0P16c+lsKPX6DnkoctVK1
 44E/lkY4AbqLbPQhQMoZ/ER6x0aMfM5Foa/3fl5iT62ePsKzLk5Yqq7ioZmymGm/
 jGHC4nc1I8WrNnuJD2pBmmtQArCJEWT3ztrM8R4Wm1QNAfLpjOthh48jh2TorvKF
 Hp4gmxV9IVbu2cIla0rU6Zlq+T67+xHfvs3oq+5xfkZ72dOQixP9UNFHA/Smv/S1
 GsFsX35z1gqo6dBI/YKaB5kaR+cQ/YXMHx7/6rVoH6G3bLPSfVgyAxjVs+irwTYW
 QOk6YKKxaKqVDqi44yL2Y4RLgLSj51zY3n5075j+v3V1LP74et1oaXyqnRQjJoo6
 amQh46VQhv7r05yTT33lPN78vtzahy2nLU/tQd/yTCK63Rfnwlke35wbtlOSden/
 nPF0dCIznrUyF/KksOLId+ByeMfdK/ZjDlPghfy7wbyPQvUkQyf2IFqimaIX+mZs
 RoCM5r3wJ01u9R5RoASdy5OgzhnXc5S9aFhL0ts4OhKEjC3RoR8=
 =Wzyp
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIyBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmTkGH4ACgkQYKtH/8kJ
 Uid/SA/4q5n4l84xgPfDHjZeinRQuYq+2wwq6n6SiKS7c+6wyGWXGR5IUS6wP8Mv
 WlkrNFZeFp/0Ijw1oKCEbZB7ng/hVud6RHycYdvHU7aDvX1q2axpHH0kNpJl8D2I
 cZgfdWSt90K7kDz2F44lFqQSn8xK92D/Ojl7y7BKdOEIIKsqUPPTuHvWbqHJV12R
 skbhXfYtifmbViyCfTh9PYnECFtmM3WdS4ZLxcHVzIyKVaVcAvyteTJjGCxujdUc
 omCTDu0MCPtRgryvIuxtN8AxSOCW3fRDUpDpy3aPQQuAlfhfCcHrBRXwfOUdQZrh
 Un1HO/0jFBHbH8eHINGDj/MYgLmm8EpbHXw/3ZmlFYDGQoisgN/fRJuQhXoIwPkq
 W3xN7gtOhYibGlrOJf0Ii9LgHNMOPUT7UP8njTT/fmelpwT+MVhIg09vEUP7kZDu
 DVD9c+s7t7sTjk2hNkg1SJeCA9PKL990G5KY2MxnxQms+XoirCFJFypWfBzk7GIi
 IUb2HQkwXZIyqrcs113X5H3PTTkC8Szob22rb3+4bFjJ6TOYzez6g5vCQV3iqr8B
 vb2HCk4TD1FdeWHB84bxS0QKrDHDRiZfAjycomsAH3bMy0hJRKY+qDsab513km59
 Z2EracriKpe/zAEMIGzbMZAddGlTK7En4SrHcUpYeNrRcJehpg==
 =Hi61
 -----END PGP SIGNATURE-----

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

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

- Krzysztof adds missing spaces between node names/labels

* tag 'arm-soc/for-6.6/devicetree-arm64' of https://github.com/Broadcom/stblinux:
  arm64: dts: broadcom: add missing space before {

Link: https://lore.kernel.org/r/20230818164539.2871539-2-florian.fainelli@broadcom.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2023-08-21 22:07:57 -04:00
Hangbin Liu
be80942465 selftests: bonding: do not set port down before adding to bond
Before adding a port to bond, it need to be set down first. In the
lacpdu test the author set the port down specifically. But commit
a4abfa627c ("net: rtnetlink: Enslave device before bringing it up")
changed the operation order, the kernel will set the port down _after_
adding to bond. So all the ports will be down at last and the test failed.

In fact, the veth interfaces are already inactive when added. This
means there's no need to set them down again before adding to the bond.
Let's just remove the link down operation.

Fixes: a4abfa627c ("net: rtnetlink: Enslave device before bringing it up")
Reported-by: Zhengchao Shao <shaozhengchao@huawei.com>
Closes: https://lore.kernel.org/netdev/a0ef07c7-91b0-94bd-240d-944a330fcabd@huawei.com/
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Link: https://lore.kernel.org/r/20230817082459.1685972-1-liuhangbin@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-08-21 19:05:42 -07:00
GONG, Ruiqi
e332938e6f samples: ftrace: Replace bti assembly with hint for older compiler
When cross-building the arm64 kernel with allmodconfig using GCC 9.4,
the following error occurs on multiple files under samples/ftrace/:

/tmp/ccPC1ODs.s: Assembler messages:
/tmp/ccPC1ODs.s:8: Error: selected processor does not support `bti c'

Fix this issue by replacing `bti c` with `hint 34`, which is compatible
for the older compiler.

Link: https://lore.kernel.org/linux-trace-kernel/20230820111509.1470826-1-gongruiqi@huaweicloud.com

Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Florent Revest <revest@chromium.org>
Fixes: 8c3526fb86 ("arm64: ftrace: Add direct call trampoline samples support")
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: GONG, Ruiqi <gongruiqi1@huawei.com>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
2023-08-21 22:03:58 -04:00
Arnd Bergmann
44762a0c82 This pull request contains Broadcom ARM-based Device Tree changes for
6.6, please pull the following:
 
 - Arinc adds support for the Asus RT-AC3100 router based upon the
   BCM47094 SoC
 
 - Krzysztof splits interrupt properties per cell such that they are mode
   readable and adds missing spaces in front of node names/labels
 
 - Rafal updates the BCM5301X DTS to correct PCIe, SPI over GPIO
   properties. He describes the Ethernet links to internal switch ports
   and then updates the BCM53573 binding and Ethernet properties by
   declaring the BCM53125 external switch on port 5, add Ethernet links
 and
   disables the second Ethernet MAC on Luxul devices.
 
 - Dan describes the Wi-Fi regulatory mappings for Luxul devices
 
 - Stanislav updates the bcm28155 DTS to use node labels
 
 - Linus adds SEAMA compatible properties to MTD partitions
 
 - Aleksey updates the Linksys EA6500 v2 to have the full 256MiB of DRAM
   available
 
 - Stefan updates a number of BCM283x nodes to confirm to DTS schema:
   pinctrl, DMA controllers and PWM cells.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEm+Rq3+YGJdiR9yuFh9CWnEQHBwQFAmTdN44ACgkQh9CWnEQH
 BwQJ1w/8CZvX4GxA6avGC24VXYzOJ1jnahnp9Troi9XZ3E+yOIc8s/CXyOQJaEIk
 lAv0M7zc0UXubXmmH3ee8dHOunvs2KAPSin0JVDW/ybEZAAzPJCnz3lGT2Um2MEo
 hofiLXjcTGAIPHnyYif6K4U1UnABC+gXVCNgRZG2jkm9YUBkKWfs4drXzeagqm/k
 wrBuh2igB74zMhf+MihijqXSjJulVyuwUjT5d6siW7qSSw7HdRb0XrOqC2O9T9ou
 /qV2+EZSJuP0t6mB8nDOaMaLW8Xw1N9VsAXF0mY0BYwf9Om9rdqaUlGRs06Y3+VM
 INmp3kamh1Hcebr4U9PNt1I/VHQ7UQfAPJouslR9s/ZBdnCjVtzJ9gTmi3iZGlI7
 N7srjUuRrhfC0ClEX6OTKB6PEutw5MlptKUAQLRCp9o8b8jJASu7k/8WXi/y1P67
 JKbRri4/RdyxxPVSX922SeLj4iwoyibbiHrfs8xpzeqr99CoyXseVTqz+jf7jeE/
 vTv+isOPs+dbCxDmO7811Ky7jBnFjr6G7q7fV1DnsxroAiuzkDCmJGFzZ5kVzD54
 BfPPDyCRUTcJKLHENvJIS1mlXwviyIWpr2yEmvu0QKT0HptwGpBnWzfgT4lkJjDx
 zjGDn6RGKv4dDGqgt8ZZbINEvG4zjrPIE0zOyUU9DVJGWX5Arf0=
 =oQzu
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmTkFwcACgkQYKtH/8kJ
 Uif9SBAA42uEptTQi30DvBA2wlwm0B+usLO5sbbYNCBWg00q3THQHmdekiPjNIXH
 Vn948vXBtcfAOv73vmcv8j8JVsda8+qqM282FJymfS63BVwWWiDvVBoJS68Werxx
 w7GI8TLojiO3hkyrxQ48xeDLS1G8hEz8KHna7GVOXo9JEMzCpiEIhRAzSpYCpqmc
 y3OuCNsKmOvX7644SAj1v6S/ClRqJ79IluwPemSg8Z9R009chPr2c+wQUpFBUhX6
 CZqdShCuaA+qrFWMtKiBQ8WTZmBbnwJa7/IS1T51YCduuNH+4YxZzuWoYm0IfXp5
 /c4e3sZXuZD5M+cZo+l3u2/bPXyu7f8Nzw5Yioj288SbWP0K1m1j8VoytvWlJUxF
 AMiDc5wpAoCrfHoZTVcieVvYvWZW4y9RHFcmvJCgAEq+ID2J/C+D7tDfJEAr7RA0
 z7gy2Uy3xkXiubl4OIrSwfKD2QUUAqaw02GOywDPRK77xcpmmKDc9FHtZ6UnaxQn
 03i76CclUfdVTy6Az7HvJtuUZeB5JUGTVKyhSd829x80Ul3hy0vA1NNZKh7NN4nX
 PolybnJAHQXLTJswxPntrvu9NAJfBE3wQPk7nx/c+zQHPlDoNCIHpBFV4FqJTOmO
 W0DNY7qb0dmJdvkAJHfpm+jM0MELyoBwIsZq1TuFEr8lET6DeOI=
 =KAWz
 -----END PGP SIGNATURE-----

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

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

- Arinc adds support for the Asus RT-AC3100 router based upon the
  BCM47094 SoC

- Krzysztof splits interrupt properties per cell such that they are mode
  readable and adds missing spaces in front of node names/labels

- Rafal updates the BCM5301X DTS to correct PCIe, SPI over GPIO
  properties. He describes the Ethernet links to internal switch ports
  and then updates the BCM53573 binding and Ethernet properties by
  declaring the BCM53125 external switch on port 5, add Ethernet links
and
  disables the second Ethernet MAC on Luxul devices.

- Dan describes the Wi-Fi regulatory mappings for Luxul devices

- Stanislav updates the bcm28155 DTS to use node labels

- Linus adds SEAMA compatible properties to MTD partitions

- Aleksey updates the Linksys EA6500 v2 to have the full 256MiB of DRAM
  available

- Stefan updates a number of BCM283x nodes to confirm to DTS schema:
  pinctrl, DMA controllers and PWM cells.

* tag 'arm-soc/for-6.6/devicetree' of https://github.com/Broadcom/stblinux: (23 commits)
  ARM: dts: BCM5301X: Add DT for ASUS RT-AC3100
  dt-bindings: arm: bcm: add bindings for ASUS RT-AC3100
  ARM: dts: broadcom: split interrupts per cells
  ARM: dts: BCM53573: Disable second Ethernet on Luxul devices
  ARM: dts: BCM53573: Add Ethernet interfaces links
  ARM: dts: BCM53573: Add BCM53125 switch port 5
  ARM: dts: BCM53573: Describe BCM53125 switch ports in the main DTS
  ARM: dts: BCM53573: Fix Tenda AC9 switch CPU port
  ARM: dts: bcm28155-ap: use node labels
  ARM: dts: bcm5301x: Add SEAMA compatibles
  ARM: dts: BCM53573: Fix Ethernet info for Luxul devices
  ARM: dts: BCM5301X: Extend RAM to full 256MB for Linksys EA6500 V2
  dt-bindings: arm: bcm: add BCM53573 SoCs family binding
  ARM: dts: BCM53573: Use updated "spi-gpio" binding properties
  ARM: dts: BCM53573: Add cells sizes to PCIe node
  ARM: dts: BCM53573: Drop nonexistent #usb-cells
  ARM: dts: BCM53573: Drop nonexistent "default-off" LED trigger
  ARM: dts: BCM5301X: Add Ethernet interfaces links
  ARM: dts: BCM5301X: Add Wi-Fi regulatory mappings for Luxul devices
  ARM: dts: broadcom: add missing space before {
  ...

Link: https://lore.kernel.org/r/20230818164539.2871539-1-florian.fainelli@broadcom.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2023-08-21 22:01:43 -04:00