Commit graph

10,494 commits

Author SHA1 Message Date
Cai YiWei
7a96133c00 media: rockchip: isp: add fpn function
Change-Id: Ibe5424a6edcc7cf41859bdd7e51a76d17418cb8e
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2024-09-27 14:08:47 +08:00
Chen Shunqing
de3d3362d4 media: i2c: rk628: add interface for setting edid by version
Signed-off-by: Chen Shunqing <csq@rock-chips.com>
Change-Id: I1d07d025a60e3ddbd0d77cba885c501b6b8a245d
2024-09-06 11:27:27 +08:00
Cai YiWei
51a075438d media: rockchip: isp: version v2.6.1
Change-Id: I9af0f89f94548912ec03654fdabcfd016d8a6907
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2024-08-22 16:23:59 +08:00
Tao Huang
b453658077 This is the 6.1.84 stable release
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmYNV6cACgkQONu9yGCS
 aT4HvBAAmblOq7LuUZQ7GdoPH6huJC4Znm0zLYcWZEhIFssA0Xm8lt57VEDrsJft
 DYpNCNWOo42v2Ml15fTVEzeWHjcNWbewIBESJYaOSuRHt+6hihteoMu1ad2lM+aR
 +CXE3PJjAipunnKtbdyS0z+g4WHuIVG/EgjvRdTzonznGODOiTz6D2KiRcIJo9kR
 T+HwkPw/S+1N8yICGuMfJQzj9lF+NJpvFBxwFsm62RPXGD/xI2Q93upPoXdBlxXX
 aWoR3HmkZ1EVXqkEIzFVviRn2QI22uKUGE942R38Wg5xdZcTrOeI5to0fX7rr+oA
 sJVLQzmrnwaJWiBMXtiGbtwn1PdtIaZbMMrxJa471/plVv3aQW+fTNLOPW9wzPDV
 8Aap29bgvI0lDhbP5yK2uCCbpvN570cKWgk/xFmIGq7USfZNUOKXrg2uuHAC6BLo
 U8PycpD2OvL/t0Y8gA/twjPsqqpoNPZuywUEWbfaWPvpnKPh0UweKXi1syqv41Th
 //HQDrSzJxQuraWCoYvmG1R1jlOSOp7tiHNmnBCmbjJw1wEC9XOMwQ2frrVrRj1n
 g4IDY04jcOQmbrgVqBkIRa1ZFFFpepZlDwnyYpmFpo8szPr+1YvJ8h/w/olcH11Q
 2VDenFG4E3nY/fjWclp4PmkVlmpXYMlciV89pDhOn/FVl8Adhp0=
 =maia
 -----END PGP SIGNATURE-----

Merge tag 'v6.1.84'

This is the 6.1.84 stable release

* tag 'v6.1.84': (1865 commits)
  Linux 6.1.84
  tools/resolve_btfids: fix build with musl libc
  USB: core: Fix deadlock in usb_deauthorize_interface()
  x86/sev: Skip ROM range scans and validation for SEV-SNP guests
  scsi: libsas: Fix disk not being scanned in after being removed
  scsi: libsas: Add a helper sas_get_sas_addr_and_dev_type()
  scsi: lpfc: Correct size for wqe for memset()
  scsi: lpfc: Correct size for cmdwqe/rspwqe for memset()
  tls: fix use-after-free on failed backlog decryption
  x86/cpu: Enable STIBP on AMD if Automatic IBRS is enabled
  scsi: qla2xxx: Delay I/O Abort on PCI error
  scsi: qla2xxx: Change debug message during driver unload
  scsi: qla2xxx: Fix double free of fcport
  scsi: qla2xxx: Fix command flush on cable pull
  scsi: qla2xxx: NVME|FCP prefer flag not being honored
  scsi: qla2xxx: Update manufacturer detail
  scsi: qla2xxx: Split FCE|EFT trace control
  scsi: qla2xxx: Fix N2N stuck connection
  scsi: qla2xxx: Prevent command send on chip reset
  usb: typec: ucsi: Clear UCSI_CCI_RESET_COMPLETE before reset
  ...

Change-Id: If6edd552c88012d97f5eefc5e1d97a4f1683f171

Conflicts:
	drivers/gpu/drm/bridge/sii902x.c
	drivers/gpu/drm/rockchip/rockchip_lvds.c
	drivers/media/i2c/imx335.c
	drivers/usb/dwc3/gadget.c
	drivers/usb/host/xhci-plat.c
	sound/soc/rockchip/rockchip_i2s_tdm.c
2024-08-17 17:42:29 +08:00
Cai YiWei
7976d8fed9 media: rockchip: isp: isp39 aiisp offline mode default
Change-Id: I6e3b3809089d331b371cab3e3d879a68a8abf7e7
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2024-08-15 19:43:22 +08:00
Cai YiWei
a07115527b media: rockchip: isp: isp39 add api to get params
enable CONFIG_VIDEO_ROCKCHIP_ISP_VERSION_V39_DBG in kernel config
to enable api, disable default

Change-Id: I37aafc3f10023ab4cf2791de34bb5ad8855fe1f3
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2024-08-12 11:06:05 +08:00
Jianwei Fan
ae0bee6029 media: i2c: rk628: fix user set csc color range
Change-Id: Ibc35c8bbbc54c9b4de4977d9500083afa2857b36
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
2024-08-08 16:42:55 +08:00
Mingwei Yan
b3b89be50d media: rockchip: vpss: offline support 8k
Signed-off-by: Mingwei Yan <mingwei.yan@rock-chips.com>
Change-Id: Ida1b1d32570bdbdade6d7dc1bd216da6d21c5248
2024-06-14 16:49:04 +08:00
Tao Huang
fce55f8eb2 This is the 6.1.75 stable release
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmWy7o0ACgkQONu9yGCS
 aT76JA/9Gh3VNSLG35LaLyq3xGd827N6DPsMzeFHi+MGSyPVg0auE77QkHD/gZl9
 KynmBmz2+9DSoFxymWAS9oEPM8d/vw87AMuSTTct3GKkjEeUcj9lbeOEzgZydXX8
 cJSXvcCeKE3FESU/YbQKxo0N+r7tUDmnCR0edss5/FpYni3jPdg7jdESzGhiCHXj
 r5rjrTE6h7Z/d+2kaKqlheL4o4OkV0YwnFnU2gC3MOOvLmgvXdOVQQsyaZ+WgSAN
 0JS0Q6Xk1xyYWx8iFaLGWIs1pUsQPKxIiRG3N/1KmXITopf2Pu68Yy7ST+YryDkO
 nLcNrr3gsQxrM6MYnEhLzlxs3H1KuAVxJ4Y/dNqJnDxn0OJjcY3repwempz5Sxtk
 0OLDOsCICAiMHeF8rYIGhm09WdowLz0EH+sqadIGqWKzW/BcXqD+r9mpF1lwk1ZL
 FJLgLmtOaG4amI46lEUHQ6ujN7Oad3gLYzudq2zKLeqonSIjm1TuDoMRvHWFsspO
 5i9I0x7Vlo3PqCl7kkKVL9PvVHx6BXJGFShABJqa9ao/oHxkOWuIt26pxUoLUN3P
 7Wa5WnfdlDd9nR3VGHcVe2ncuRmEfuriYpXvItJ7/KJKyIPkGoPehAh+vbZMoEy0
 DwhtD9PPsTlnUufbcZdHavYA1E4y/uXDMOIGB+ERpsTdXh9DwEo=
 =2XHn
 -----END PGP SIGNATURE-----

Merge tag 'v6.1.75'

This is the 6.1.75 stable release

* tag 'v6.1.75': (2623 commits)
  Linux 6.1.75
  Revert "Revert "md/raid5: Wait for MD_SB_CHANGE_PENDING in raid5d""
  arm64: dts: armada-3720-turris-mox: set irq type for RTC
  Revert "KEYS: encrypted: Add check for strsep"
  riscv: Fix wrong usage of lm_alias() when splitting a huge linear mapping
  block: Remove special-casing of compound pages
  i2c: s3c24xx: fix transferring more than one message in polling mode
  i2c: s3c24xx: fix read transfers in polling mode
  ipv6: mcast: fix data-race in ipv6_mc_down / mld_ifc_work
  selftests: mlxsw: qos_pfc: Adjust the test to support 8 lanes
  mlxsw: spectrum_acl_erp: Fix error flow of pool allocation failure
  loop: fix the the direct I/O support check when used on top of block devices
  ethtool: netlink: Add missing ethnl_ops_begin/complete
  kdb: Fix a potential buffer overflow in kdb_local()
  ipvs: avoid stat macros calls from preemptible context
  netfilter: nf_tables: reject NFT_SET_CONCAT with not field length description
  netfilter: nf_tables: skip dead set elements in netlink dump
  netfilter: nf_tables: do not allow mismatch field size and set key length
  netfilter: bridge: replace physindev with physinif in nf_bridge_info
  netfilter: propagate net to nf_bridge_get_physindev
  ...

Conflicts:
	drivers/clk/rockchip/clk-rk3568.c
	drivers/devfreq/event/rockchip-dfi.c
	drivers/gpu/drm/rockchip/rockchip_drm_vop.c
	drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
	drivers/i2c/busses/i2c-rk3x.c
	drivers/i2c/i2c-core-base.c
	drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
	drivers/nvme/host/nvme.h

Change-Id: I9649ece83925659bca59cced0be24f0bd165822a
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2024-05-08 11:14:32 +08:00
Cai YiWei
33a1957772 media: rockchip: isp: fix dmatx config
Change-Id: I34eb6118a64f13754d57bfd58e0d7a760380d243
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2024-04-30 18:12:52 +08:00
Cai YiWei
70df1f6919 media: rockchip: isp: version v2.6.0
Change-Id: I350aaf2188344c16b318a87820ecbba6296e261f
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2024-04-22 15:19:10 +08:00
Cai YiWei
d0797df513 media: rockchip: isp: update gic and check params for isp39
Change-Id: I623d2f9474d744d576f919547778962891b08fa4
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2024-04-22 15:19:10 +08:00
Zefa Chen
25ef1c071c include: rkcif-config: add command for one to multi camera mode
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I59737ea5e9061e41963511578246c11a2c5a0f1c
2024-04-12 18:40:24 +08:00
Zefa Chen
38624894a9 media: rockchip: vicap support restart capture one frame with aov sinngle frame mode
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I1ce89f84d568b14fc59bd0ace774310c3d4b3a98
2024-04-12 18:40:24 +08:00
Jianwei Fan
80647eb888 media: i2c: rk628: fix csc process mode and add range switch by user
1.support set output range by user
2.fix csc process color space and range config
3.add adobe YUV/RGB and 2020 YUV/RGB support

Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
Change-Id: I02ce6ae17c94f51b44d5b6096e1185e1fbb3e3e9
2024-04-12 15:58:34 +08:00
Cai YiWei
1aef9b5255 media: rockchip: isp: aiisp two buf
bay3d iir_buf->read->NN->write->aiisp_buf->isp

Change-Id: I5bfd944f84a9a01639bb9488926e41468b0173ec
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2024-04-09 09:24:30 +08:00
Mingwei Yan
71940785b8 media: rockchip: vpss: support tile and rotate
Signed-off-by: Mingwei Yan <mingwei.yan@rock-chips.com>
Change-Id: I7ed9bf1cb9791c6ed42ad64b861a276bd75959cf
2024-03-22 14:51:15 +08:00
Rimon Xu
d0fc27f1d9 media: rockchip: vpss: support rb/uv swap pixel format
Signed-off-by: Rimon Xu <rimon.xu@rock-chips.com>
Change-Id: I8068109353656a3dce0e663b696dc2e1cdce47d7
2024-03-22 14:51:15 +08:00
Wangqiang Guo
e0cfe1fa23 media: i2c: rk628: add color_range/color_space interface.
Change-Id: I9f2633f8ff4f9f2b3e9d6c02b3865eff125f30a5
Signed-off-by: Wangqiang Guo <kay.guo@rock-chips.com>
2024-03-21 09:43:32 +08:00
Jianwei Fan
7d65dab0e2 media: platform: vicap: get dsi cmd or video mode from sensor
Change-Id: I8a436399932468a0b4135c8fc27e3b9aacfe059e
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
2024-03-20 21:17:50 +08:00
Cai YiWei
2ee9ce1196 media: rockchip: isp: dpcc border for isp39
Change-Id: I080fb9f62e7f11d2bb9bbe2ebeecd80910d4a0c3
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2024-03-19 19:05:30 +08:00
Mingwei Yan
7614b638e9 media: rockchip: vpss: optimize module set
1: add module_get
2: module can't be changed dynamically

Signed-off-by: Mingwei Yan <mingwei.yan@rock-chips.com>
Change-Id: I4b7c6c5a8b3b600908a796224ab5fceaab6c995b
2024-03-18 11:30:52 +08:00
Mingwei Yan
35845f0bce media: rockchip: vpss: offline support rkfbcd input
Signed-off-by: Mingwei Yan <mingwei.yan@rock-chips.com>
Change-Id: Id537c4426f1251c620d2a5795728c44d0aa6f70b
2024-03-12 17:23:23 +08:00
Martynas Pumputis
2d7ebcb5d8 bpf: Derive source IP addr via bpf_*_fib_lookup()
commit dab4e1f06c upstream.

Extend the bpf_fib_lookup() helper by making it to return the source
IPv4/IPv6 address if the BPF_FIB_LOOKUP_SRC flag is set.

For example, the following snippet can be used to derive the desired
source IP address:

    struct bpf_fib_lookup p = { .ipv4_dst = ip4->daddr };

    ret = bpf_skb_fib_lookup(skb, p, sizeof(p),
            BPF_FIB_LOOKUP_SRC | BPF_FIB_LOOKUP_SKIP_NEIGH);
    if (ret != BPF_FIB_LKUP_RET_SUCCESS)
        return TC_ACT_SHOT;

    /* the p.ipv4_src now contains the source address */

The inability to derive the proper source address may cause malfunctions
in BPF-based dataplanes for hosts containing netdevs with more than one
routable IP address or for multi-homed hosts.

For example, Cilium implements packet masquerading in BPF. If an
egressing netdev to which the Cilium's BPF prog is attached has
multiple IP addresses, then only one [hardcoded] IP address can be used for
masquerading. This breaks connectivity if any other IP address should have
been selected instead, for example, when a public and private addresses
are attached to the same egress interface.

The change was tested with Cilium [1].

Nikolay Aleksandrov helped to figure out the IPv6 addr selection.

[1]: https://github.com/cilium/cilium/pull/28283

Signed-off-by: Martynas Pumputis <m@lambda.lt>
Link: https://lore.kernel.org/r/20231007081415.33502-2-m@lambda.lt
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2024-03-06 14:45:20 +00:00
Louis DeLosSantos
5fafd8254a bpf: Add table ID to bpf_fib_lookup BPF helper
commit 8ad77e72ca upstream.

Add ability to specify routing table ID to the `bpf_fib_lookup` BPF
helper.

A new field `tbid` is added to `struct bpf_fib_lookup` used as
parameters to the `bpf_fib_lookup` BPF helper.

When the helper is called with the `BPF_FIB_LOOKUP_DIRECT` and
`BPF_FIB_LOOKUP_TBID` flags the `tbid` field in `struct bpf_fib_lookup`
will be used as the table ID for the fib lookup.

If the `tbid` does not exist the fib lookup will fail with
`BPF_FIB_LKUP_RET_NOT_FWDED`.

The `tbid` field becomes a union over the vlan related output fields
in `struct bpf_fib_lookup` and will be zeroed immediately after usage.

This functionality is useful in containerized environments.

For instance, if a CNI wants to dictate the next-hop for traffic leaving
a container it can create a container-specific routing table and perform
a fib lookup against this table in a "host-net-namespace-side" TC program.

This functionality also allows `ip rule` like functionality at the TC
layer, allowing an eBPF program to pick a routing table based on some
aspect of the sk_buff.

As a concrete use case, this feature will be used in Cilium's SRv6 L3VPN
datapath.

When egress traffic leaves a Pod an eBPF program attached by Cilium will
determine which VRF the egress traffic should target, and then perform a
FIB lookup in a specific table representing this VRF's FIB.

Signed-off-by: Louis DeLosSantos <louis.delos.devel@gmail.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20230505-bpf-add-tbid-fib-lookup-v2-1-0a31c22c748c@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2024-03-06 14:45:20 +00:00
Justin Iurman
aa58972326 uapi: in6: replace temporary label with rfc9486
[ Upstream commit 6a20086419 ]

Not really a fix per se, but IPV6_TLV_IOAM is still tagged as "TEMPORARY
IANA allocation for IOAM", while RFC 9486 is available for some time
now. Just update the reference.

Fixes: 9ee11f0fff ("ipv6: ioam: Data plane support for Pre-allocated Trace")
Signed-off-by: Justin Iurman <justin.iurman@uliege.be>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://lore.kernel.org/r/20240226124921.9097-1-justin.iurman@uliege.be
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2024-03-06 14:45:07 +00:00
Cai YiWei
aae52d34ed media: rockchip: vpss: init driver for rk3576
Change-Id: I8fd1af91d055d0ebd30bd9898db6305a51fd7dda
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2024-03-05 15:03:39 +08:00
Cai YiWei
04928950a5 media: rockchip: isp: aiisp for isp39
Change-Id: Ibcbcfd1865fb8a20f1fe190e09b8bd91133c4b98
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2024-03-03 11:09:44 +08:00
Cai YiWei
4d27e391e5 media: rockchip: isp: add isp39
Change-Id: I5711f268db07523ef3cf2541dacbb9016760d6c3
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2024-03-03 11:09:44 +08:00
Zefa Chen
3d5034018f media: rockchip: vicap support rk3576
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ib8b9f4cb13df750712459383fc643ada6c43734d
2024-03-03 11:09:43 +08:00
Tao Huang
7f72922db0 Merge commit 'ecf409630c'
* commit 'ecf409630c':
  media: i2c: add sc3336p sensor driver
  dt-bindings: soc: rockchip-amp: remove CPU_GET_AFFINITY() to dtsi file
  ARM: dts: rockchip: add rv1106g-evb2-v12-spi-nand-tb.dts
  arm64: dts: rockchip: rk3562-amp: define CPU_GET_AFFINITY
  arm64: dts: rockchip: rk3308-amp: define CPU_GET_AFFINITY
  soc: rockchip: amp: support init gpio group irqs for amp
  irqchip/gicv3: support config amp os irqs
  media: rockchip: isp: version v2.5.0

Change-Id: I2e5beffb8875efbbc3736fc3d38770340faabefd
2024-02-29 18:26:53 +08:00
Cai YiWei
0713900194 media: rockchip: isp: add ioctl to get bay3d buf
Change-Id: Id65390eab9f1dc2d64405def56e854078ceba037
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2024-02-29 18:23:18 +08:00
Tao Huang
b70dfeba02 Merge commit 'c4c06227b0'
* commit 'c4c06227b0':
  media: rockchip: isp: add RKISP_CMD_SET_TB_HEAD_V32 API
  clk: rockchip: rv1106: optimize calibrate step for cru pvtpll
  ARM: rockchip: rv1106_pm: optimize pvtpll save/restore process flow
  UPSTREAM: gpio: rockchip: Reset int_bothedge when changing trigger
  ARM: dts: rockchip: rv1106-evb-dual-cam add sc530ai
  media: rockchip: isp: fix mp wrap buf from rockit no output
  mfd: display-serdes: fix building error

Change-Id: Ifa823804017620c5297d002598dc87a3388e2dcd
2024-02-29 18:21:46 +08:00
Cai YiWei
bd99973c0a media: rockchip: isp: version v2.5.0
Change-Id: Ic885032c2e177a714cacfb0609032366e66aac3c
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2024-02-21 12:13:49 +08:00
Cai YiWei
c4c06227b0 media: rockchip: isp: add RKISP_CMD_SET_TB_HEAD_V32 API
Change-Id: I07ae10d69ae977ff5932c377e24eefbd48387946
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2024-02-21 10:25:17 +08:00
Cai YiWei
e84d9bd50a media: rockchip: isp: add ioctl to get bay3d buf
Change-Id: Id65390eab9f1dc2d64405def56e854078ceba037
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2024-02-21 10:25:17 +08:00
Pablo Neira Ayuso
8762bcc927 netfilter: nft_compat: reject unused compat flag
[ Upstream commit 292781c3c5 ]

Flag (1 << 0) is ignored is set, never used, reject it it with EINVAL
instead.

Fixes: 0ca743a559 ("netfilter: nf_tables: add compatibility layer for x_tables")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2024-02-16 19:06:28 +01:00
Tao Huang
f9ab55a3df Merge commit 'b65bb3bb00'
* commit 'b65bb3bb00':
  media: i2c: rk628: add private interface, compatible with hdmirx.
  media: i2c: rk628: fix display error caused by read resolution error
  media: i2c: rk628: fix display error in plugout
  mfd: display-serdes: add error detection and recovery function

Change-Id: I51b5cc47db20be0b80a7107eda6cd5d7d1e1e176
2024-02-05 19:09:12 +08:00
Wangqiang Guo
b65bb3bb00 media: i2c: rk628: add private interface, compatible with hdmirx.
Change-Id: I737dcb068bc830baccb932d985bdbede56b5d490
Signed-off-by: Wangqiang Guo <kay.guo@rock-chips.com>
2024-02-05 18:28:07 +08:00
Qu Wenruo
52e02f26d0 btrfs: defrag: reject unknown flags of btrfs_ioctl_defrag_range_args
commit 173431b274 upstream.

Add extra sanity check for btrfs_ioctl_defrag_range_args::flags.

This is not really to enhance fuzzing tests, but as a preparation for
future expansion on btrfs_ioctl_defrag_range_args.

In the future we're going to add new members, allowing more fine tuning
for btrfs defrag.  Without the -ENONOTSUPP error, there would be no way
to detect if the kernel supports those new defrag features.

CC: stable@vger.kernel.org # 4.14+
Reviewed-by: Filipe Manana <fdmanana@suse.com>
Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2024-01-31 16:17:07 -08:00
Jordan Rome
799a914e48 bpf: Add crosstask check to __bpf_get_stack
[ Upstream commit b8e3a87a62 ]

Currently get_perf_callchain only supports user stack walking for
the current task. Passing the correct *crosstask* param will return
0 frames if the task passed to __bpf_get_stack isn't the current
one instead of a single incorrect frame/address. This change
passes the correct *crosstask* param but also does a preemptive
check in __bpf_get_stack if the task is current and returns
-EOPNOTSUPP if it is not.

This issue was found using bpf_get_task_stack inside a BPF
iterator ("iter/task"), which iterates over all tasks.
bpf_get_task_stack works fine for fetching kernel stacks
but because get_perf_callchain relies on the caller to know
if the requested *task* is the current one (via *crosstask*)
it was failing in a confusing way.

It might be possible to get user stacks for all tasks utilizing
something like access_process_vm but that requires the bpf
program calling bpf_get_task_stack to be sleepable and would
therefore be a breaking change.

Fixes: fa28dcb82a ("bpf: Introduce helper bpf_get_task_stack()")
Signed-off-by: Jordan Rome <jordalgo@meta.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20231108112334.3433136-1-jordalgo@meta.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
2024-01-25 15:27:24 -08:00
Tao Huang
2a9c1e1a64 Merge commit 'ef84fb2dc9'
* commit 'ef84fb2dc9':
  UPSTREAM: sched/fair: Use all little CPUs for CPU-bound workloads
  drm/rockchip: vop2: remove ARGB2101010 support from VOP2
  drm/rockchip: vop2: hdisplay must roundup 2/4 when calc pre_scan_dly
  media: rockchip: vicap get_channel_info add param of field to cover value from get_fmt
  media: i2c: rk628: add hdmirxphy debugfs
  media: rockchip: vicap increase wake up cnt for rv1126/rk3568 monitor mode
  media: i2c: maxim: remote: record the status of the serializer
  misc: rk628: Fix `warning: `rk628_pin_iomux_groups` defined but not used`
  misc: rk628: Fix the NULL in .suspend/.resume helper when working on hdmi tx mode.
  arm64: dts: rockchip: add pd_perihp support for rk3399 usb2

Change-Id: I74e34fdd098bb791609848cb634c204bc2b501cb
2024-01-25 20:31:06 +08:00
Zefa Chen
313e8b05f9 media: rockchip: vicap get_channel_info add param of field to cover value from get_fmt
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I552a42ccfa87e61a72b2ce9bd342e41d5e216a13
2024-01-25 10:44:34 +08:00
Tao Huang
b3471d8054 This is the 6.1.57 stable release
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmUlrb4ACgkQONu9yGCS
 aT4b+hAAgvFC6P+XmyyNXJ9ISHLkgSlcIAdatb+qeOCUtdiWHqfxIha13FdnCdhL
 WS2c/O9ORfAzjFwnYWF6LBwH8ArxRSkAXrGCMuCkEFBP3cG/j2HD+XLAAYEuBjjb
 sf1fw8e8VSgaPEOnwXie5rTfAY4VnZKEtZjAxjyIQnJKVVKfxQRb8CyaWDPzPD0Z
 tL/iABt7UWNHZayHTHsh0YhF2UhXtOjHinWigEarcZQEvOB2qRQtFl71cnqosi+t
 3ZRZzepH7/Fx3v6/H/6PNq+GSI/ZzhOiCQolVV5YcMGHXsW9cP6arjLUxco5pzpk
 pEg0vdMq47JOZYQ2pIewG4t7+NLmFIxCRFnKQVbxeFNSY9c1jhd8g5lhx9YEXwjT
 BzMtV5DnZoaoMdq2P1STw/+RVYrDI1Lm6jqfgw/D27b7LzQ13VsGM9BJ1rCs8Hm7
 UhWyjwFcgo0vhpfML1RF0RtT9Mo5SOnpGPfpbFdjg8jdXlGknNH0QsH+EY/BpF8l
 h77P5BvoNIjsIN3B1YunfXtFXhx3h0sI8zZrqHR+zhOeWGsXcqQ5mZ/lYdYKkKuH
 R8LRB7shPndF4xdRX0uRXwomcXhs+60eA5xEvE9u0CqqdpXfQN5oTwixfCm2C8MS
 O5Fc7hfvK11XtR3ja+y3KRhiNG3YsfW2PXnlOfZxMZ6iPqXtA/o=
 =5/pn
 -----END PGP SIGNATURE-----

Merge tag 'v6.1.57'

This is the 6.1.57 stable release

* tag 'v6.1.57': (2054 commits)
  Linux 6.1.57
  xen/events: replace evtchn_rwlock with RCU
  ipv6: remove one read_lock()/read_unlock() pair in rt6_check_neigh()
  btrfs: file_remove_privs needs an exclusive lock in direct io write
  netlink: remove the flex array from struct nlmsghdr
  btrfs: fix fscrypt name leak after failure to join log transaction
  btrfs: fix an error handling path in btrfs_rename()
  vrf: Fix lockdep splat in output path
  ipv6: remove nexthop_fib6_nh_bh()
  parisc: Restore __ldcw_align for PA-RISC 2.0 processors
  ksmbd: fix uaf in smb20_oplock_break_ack
  ksmbd: fix race condition between session lookup and expire
  x86/sev: Use the GHCB protocol when available for SNP CPUID requests
  RDMA/mlx5: Fix NULL string error
  RDMA/mlx5: Fix mutex unlocking on error flow for steering anchor creation
  RDMA/siw: Fix connection failure handling
  RDMA/srp: Do not call scsi_done() from srp_abort()
  RDMA/uverbs: Fix typo of sizeof argument
  RDMA/cma: Fix truncation compilation warning in make_cma_ports
  RDMA/cma: Initialize ib_sa_multicast structure to 0 when join
  ...

Change-Id: I79b925ca5822e02e0b9f497b1db93fef0e1dadd3

Conflicts:
	drivers/gpu/drm/rockchip/rockchip_drm_vop.c
	drivers/iommu/rockchip-iommu.c
	drivers/power/supply/rk817_charger.c
	drivers/scsi/sd.c
	include/linux/pci.h
2024-01-02 14:38:47 +08:00
Tao Huang
31ba856fa4 Merge commit '604cec4004'
* commit '604cec4004':
  soc: rockchip: rockchip_system_monitor: Fix opp_info NULL pointer
  media: rockchip: vicap fixes error of access NULL point when pm resume
  media: rockchip: vicap fixes error flags of devm_request_irq
  pwm: rockchip: support pwm version 4
  pwm: core: add oneshot_repeat and duty_offset attributes
  pwm: rockchip: support more features
  driver: rknpu: Fix passing 0 to PTR_ERR in rknpu_devfreq_init()
  media: rockchip: vicap fixes error of rk_csirx_irq1_handler
  media: rockchip: vicap fixes issue of resend the same buffer to isp
  media: rockchip: vicap fixes logic error of skip frame
  media: rockchip: vicap fixes rdbk buffer not send to isp with single frame mode
  arm/configs: rk3308bs_aarch32_mipi_display.config add gt911

Change-Id: I97a6c31ec3c250c7a83e8d85cf7d5e0124fc4dea
2023-12-29 18:03:45 +08:00
Zefa Chen
9f585815cc media: rockchip: vicap fixes logic error of skip frame
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ic1428169c8a60786decf3d8926bd86f2df7670e1
2023-12-27 16:02:04 +08:00
Tao Huang
b0615530ae Merge commit '435ab979d2'
* commit '435ab979d2':
  ARM: configs: rv1106-wakeup.config: enable CONFIG_INPUT_EVDEV
  PCI: rockchip: dw: Add debug info for device miss case
  drivers: rkflash: Change RK_SFTL dependent to RK_NANDC_NAND
  arm64/configs: rk3308bs_mipi_display.config add gt911
  input: touchscreen: fixed gt9xx compile error
  media: rockchip: isp: isp32 using ktime_get_boottime_ns
  media: rockchip: vicap: change irq state when start/stop stream
  media: rockchip: vicap: rv1106 use ktime_get_boottime_ns to get timestamp
  media: rockchip: vicap support skip frame
  dt-bindings: opp: rockchip: Add more properties for pvtm and pvtpll
  media: rockchip: vicap:fix oneframe switch to multiframe error
  media: rockchip: isp: fix 4k and dual_sensor pm oneframe error
  media: rockchip: vicap optimize buf rotation in thunderboot mode
  media: rockchip: vicap fixes logic error of get thundboot_resmem_head
  media: rockchip: vicap fixes some error for 4K with AOV

Change-Id: I437995aba6f4491b3896430547a382256034624b
2023-12-27 14:40:41 +08:00
Zefa Chen
e5ffdcf4c2 media: rockchip: vicap support skip frame
request by sensor driver

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I961223b9295dce1c8e133c6668e47e3d38e00d3c
2023-12-25 18:30:54 +08:00
Jeremy Sowden
0bfbfd9423 netfilter: nft_exthdr: add boolean DCCP option matching
[ Upstream commit b9f9a485fb ]

The xt_dccp iptables module supports the matching of DCCP packets based
on the presence or absence of DCCP options.  Extend nft_exthdr to add
this functionality to nftables.

Link: https://bugzilla.netfilter.org/show_bug.cgi?id=930
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
Signed-off-by: Florian Westphal <fw@strlen.de>
Stable-dep-of: 63331e37fb ("netfilter: nf_tables: fix 'exist' matching on bigendian arches")
Signed-off-by: Sasha Levin <sashal@kernel.org>
2023-12-13 18:39:10 +01:00
Tao Huang
8e7b38ba25 Merge commit '7f71d2776b'
* commit '7f71d2776b':
  PCI: rockchip: dw: Support IRQ user
  misc: rockchip: pcie-rkep: Change to use pci_request_irq apis.
  arm64: dts: rockchip: Covert ciu-drv to ciu-drive for matching the driver
  media: i2c: imx415: fix issues for thunderboot

Change-Id: I9f617a032a1c14ec377c93e05bb63fca5376d584
2023-12-12 17:50:44 +08:00