Skip to content

Commit

Permalink
Merge tag 'v6.1.119-rt45' into nilrt/master/6.1
Browse files Browse the repository at this point in the history 
Linux 6.1.119-rt45

[rajendra: fix trivial conflict with 85ca88f
("usb: dwc3: core: Fix system suspend on TI AM62 platforms")]
Signed-off-by: Rajendra Desai <[email protected]>
  • Loading branch information
@rajendra-desai-ni
rajendra-desai-ni committed Dec 6, 2024
2 parents 1953fb1 + 10c8fc9 commit 2fefcb3
Show file tree
Hide file tree
Showing 1,204 changed files with 18,266 additions and 14,002 deletions.
1 change: 0 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ GTAGS
# id-utils files
ID

*.orig
*~
\#*#

Expand Down
2 changes: 1 addition & 1 deletion Documentation/ABI/testing/sysfs-bus-iio-filter-admv8818
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ KernelVersion:
Contact: [email protected]
Description:
Reading this returns the valid values that can be written to the
on_altvoltage0_mode attribute:
filter_mode attribute:

- auto -> Adjust bandpass filter to track changes in input clock rate.
- manual -> disable/unregister the clock rate notifier / input clock tracking.
Expand Down
14 changes: 7 additions & 7 deletions Documentation/accounting/delay-accounting.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,17 +109,17 @@ Get sum of delays, since system boot, for all pids with tgid 5::
CPU count real total virtual total delay total delay average
8 7000000 6872122 3382277 0.423ms
IO count delay total delay average
0 0 0ms
0 0 0.000ms
SWAP count delay total delay average
0 0 0ms
0 0 0.000ms
RECLAIM count delay total delay average
0 0 0ms
0 0 0.000ms
THRASHING count delay total delay average
0 0 0ms
0 0 0.000ms
COMPACT count delay total delay average
0 0 0ms
WPCOPY count delay total delay average
0 0 0ms
0 0 0.000ms
WPCOPY count delay total delay average
0 0 0.000ms

Get IO accounting for pid 1, it works only with -p::

Expand Down
10 changes: 10 additions & 0 deletions Documentation/admin-guide/kernel-parameters.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4540,6 +4540,16 @@
printk.time= Show timing data prefixed to each printk message line
Format: <bool> (1/Y/y=enable, 0/N/n=disable)

proc_mem.force_override= [KNL]
Format: {always | ptrace | never}
Traditionally /proc/pid/mem allows memory permissions to be
overridden without restrictions. This option may be set to
restrict that. Can be one of:
- 'always': traditional behavior always allows mem overrides.
- 'ptrace': only allow mem overrides for active ptracers.
- 'never': never allow mem overrides.
If not specified, default is the CONFIG_PROC_MEM_* choice.

processor.max_cstate= [HW,ACPI]
Limit processor to maximum C-state
max_cstate=9 overrides any DMI blacklist limit.
Expand Down
4 changes: 4 additions & 0 deletions Documentation/arm64/silicon-errata.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,8 @@ stable kernels.
+----------------+-----------------+-----------------+-----------------------------+
| ARM | Cortex-A710 | #3324338 | ARM64_ERRATUM_3194386 |
+----------------+-----------------+-----------------+-----------------------------+
| ARM | Cortex-A715 | #3456084 | ARM64_ERRATUM_3194386 |
+----------------+-----------------+-----------------+-----------------------------+
| ARM | Cortex-A720 | #3456091 | ARM64_ERRATUM_3194386 |
+----------------+-----------------+-----------------+-----------------------------+
| ARM | Cortex-A725 | #3456106 | ARM64_ERRATUM_3194386 |
Expand Down Expand Up @@ -171,6 +173,8 @@ stable kernels.
+----------------+-----------------+-----------------+-----------------------------+
| ARM | Neoverse-N2 | #3324339 | ARM64_ERRATUM_3194386 |
+----------------+-----------------+-----------------+-----------------------------+
| ARM | Neoverse-N3 | #3456111 | ARM64_ERRATUM_3194386 |
+----------------+-----------------+-----------------+-----------------------------+
| ARM | Neoverse-V1 | #3324341 | ARM64_ERRATUM_3194386 |
+----------------+-----------------+-----------------+-----------------------------+
| ARM | Neoverse-V2 | #3324336 | ARM64_ERRATUM_3194386 |
Expand Down
1 change: 0 additions & 1 deletion Documentation/devicetree/bindings/iio/magnetometer/asahi-kasei,ak8975.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ properties:
- ak8963
- ak09911
- ak09912
- ak09916
deprecated: true

reg:
Expand Down
18 changes: 9 additions & 9 deletions Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,21 +102,21 @@ properties:
default: 2

interrupts:
anyOf:
- minItems: 1
items:
- description: TX interrupt
- description: RX interrupt
- items:
- description: common/combined interrupt
minItems: 1
maxItems: 2

interrupt-names:
oneOf:
- minItems: 1
- description: TX interrupt
const: tx
- description: RX interrupt
const: rx
- description: TX and RX interrupts
items:
- const: tx
- const: rx
- const: common
- description: Common/combined interrupt
const: common

fck_parent:
$ref: /schemas/types.yaml#/definitions/string
Expand Down
2 changes: 1 addition & 1 deletion Documentation/driver-api/ipmi.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,7 @@ at module load time (for a module) with::
alerts_broken

The addresses are normal I2C addresses. The adapter is the string
name of the adapter, as shown in /sys/class/i2c-adapter/i2c-<n>/name.
name of the adapter, as shown in /sys/bus/i2c/devices/i2c-<n>/name.
It is *NOT* i2c-<n> itself. Also, the comparison is done ignoring
spaces, so if the name is "This is an I2C chip" you can say
adapter_name=ThisisanI2cchip. This is because it's hard to pass in
Expand Down
97 changes: 62 additions & 35 deletions Documentation/networking/driver.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,19 @@
Softnet Driver Issues
=====================

Transmit path guidelines:
Transmit path guidelines
========================

1) The ndo_start_xmit method must not return NETDEV_TX_BUSY under
any normal circumstances. It is considered a hard error unless
there is no way your device can tell ahead of time when its
transmit function will become busy.
Stop queues in advance
----------------------

Instead it must maintain the queue properly. For example,
for a driver implementing scatter-gather this means::
The ndo_start_xmit method must not return NETDEV_TX_BUSY under
any normal circumstances. It is considered a hard error unless
there is no way your device can tell ahead of time when its
transmit function will become busy.

Instead it must maintain the queue properly. For example,
for a driver implementing scatter-gather this means::

static netdev_tx_t drv_hard_start_xmit(struct sk_buff *skb,
struct net_device *dev)
Expand Down Expand Up @@ -42,56 +46,79 @@ Transmit path guidelines:
return NETDEV_TX_OK;
}

And then at the end of your TX reclamation event handling::
And then at the end of your TX reclamation event handling::

if (netif_queue_stopped(dp->dev) &&
TX_BUFFS_AVAIL(dp) > (MAX_SKB_FRAGS + 1))
netif_wake_queue(dp->dev);

For a non-scatter-gather supporting card, the three tests simply become::
For a non-scatter-gather supporting card, the three tests simply become::

/* This is a hard error log it. */
if (TX_BUFFS_AVAIL(dp) <= 0)

and::
and::

if (TX_BUFFS_AVAIL(dp) == 0)

and::
and::

if (netif_queue_stopped(dp->dev) &&
TX_BUFFS_AVAIL(dp) > 0)
netif_wake_queue(dp->dev);

2) An ndo_start_xmit method must not modify the shared parts of a
cloned SKB.
Lockless queue stop / wake helper macros
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

.. kernel-doc:: include/net/netdev_queues.h
:doc: Lockless queue stopping / waking helpers.

No exclusive ownership
----------------------

An ndo_start_xmit method must not modify the shared parts of a
cloned SKB.

Timely completions
------------------

3) Do not forget that once you return NETDEV_TX_OK from your
ndo_start_xmit method, it is your driver's responsibility to free
up the SKB and in some finite amount of time.
Do not forget that once you return NETDEV_TX_OK from your
ndo_start_xmit method, it is your driver's responsibility to free
up the SKB and in some finite amount of time.

For example, this means that it is not allowed for your TX
mitigation scheme to let TX packets "hang out" in the TX
ring unreclaimed forever if no new TX packets are sent.
This error can deadlock sockets waiting for send buffer room
to be freed up.
For example, this means that it is not allowed for your TX
mitigation scheme to let TX packets "hang out" in the TX
ring unreclaimed forever if no new TX packets are sent.
This error can deadlock sockets waiting for send buffer room
to be freed up.

If you return NETDEV_TX_BUSY from the ndo_start_xmit method, you
must not keep any reference to that SKB and you must not attempt
to free it up.
If you return NETDEV_TX_BUSY from the ndo_start_xmit method, you
must not keep any reference to that SKB and you must not attempt
to free it up.

Probing guidelines:
Probing guidelines
==================

Address validation
------------------

Any hardware layer address you obtain for your device should
be verified. For example, for ethernet check it with
linux/etherdevice.h:is_valid_ether_addr()

Close/stop guidelines
=====================

1) Any hardware layer address you obtain for your device should
be verified. For example, for ethernet check it with
linux/etherdevice.h:is_valid_ether_addr()
Quiescence
----------

Close/stop guidelines:
After the ndo_stop routine has been called, the hardware must
not receive or transmit any data. All in flight packets must
be aborted. If necessary, poll or wait for completion of
any reset commands.

1) After the ndo_stop routine has been called, the hardware must
not receive or transmit any data. All in flight packets must
be aborted. If necessary, poll or wait for completion of
any reset commands.
Auto-close
----------

2) The ndo_stop routine will be called by unregister_netdevice
if device is still UP.
The ndo_stop routine will be called by unregister_netdevice
if device is still UP.
17 changes: 10 additions & 7 deletions Documentation/translations/zh_CN/accounting/delay-accounting.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ a) 等待一个CPU（任务为可运行）
b) 完成由该任务发起的块I/O同步请求
c) 页面交换
d) 内存回收
e) 页缓存抖动
e) 抖动
f) 直接规整
g) 写保护复制

并将这些统计信息通过taskstats接口提供给用户空间。

Expand All @@ -42,7 +43,7 @@ f) 直接规整
include/uapi/linux/taskstats.h

其描述了延时计数相关字段。系统通常以计数器形式返回 CPU、同步块 I/O、交换、内存
回收、页缓存抖动、直接规整等的累积延时。
回收、页缓存抖动、直接规整、写保护复制等的累积延时。

取任务某计数器两个连续读数的差值，将得到任务在该时间间隔内等待对应资源的总延时。

Expand Down Expand Up @@ -91,15 +92,17 @@ getdelays命令的一般格式::
CPU count real total virtual total delay total delay average
8 7000000 6872122 3382277 0.423ms
IO count delay total delay average
0 0 0ms
0 0 0.000ms
SWAP count delay total delay average
0 0 0ms
0 0 0.000ms
RECLAIM count delay total delay average
0 0 0ms
0 0 0.000ms
THRASHING count delay total delay average
0 0 0ms
0 0 0.000ms
COMPACT count delay total delay average
0 0 0ms
0 0 0.000ms
WPCOPY count delay total delay average
0 0 0ms

获取pid为1的IO计数，它只和-p一起使用::
# ./getdelays -i -p 1
Expand Down
1 change: 1 addition & 0 deletions MAINTAINERS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4833,6 +4833,7 @@ S: Maintained
F: Documentation/admin-guide/module-signing.rst
F: certs/
F: scripts/sign-file.c
F: scripts/ssl-common.h
F: tools/certs/

CFAG12864B LCD DRIVER
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
VERSION = 6
PATCHLEVEL = 1
SUBLEVEL = 112
SUBLEVEL = 119
EXTRAVERSION =
NAME = Curry Ramen

Expand Down
2 changes: 0 additions & 2 deletions arch/alpha/include/asm/pgtable.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,8 +313,6 @@ extern inline pte_t mk_swap_pte(unsigned long type, unsigned long offset)
#define __pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) })
#define __swp_entry_to_pte(x) ((pte_t) { (x).val })

#define kern_addr_valid(addr) (1)

#define pte_ERROR(e) \
printk("%s:%d: bad pte %016lx.\n", __FILE__, __LINE__, pte_val(e))
#define pmd_ERROR(e) \
Expand Down
2 changes: 0 additions & 2 deletions arch/arc/include/asm/pgtable-bits-arcv2.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,6 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long address,
#define __pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) })
#define __swp_entry_to_pte(x) ((pte_t) { (x).val })

#define kern_addr_valid(addr) (1)

#ifdef CONFIG_TRANSPARENT_HUGEPAGE
#include <asm/hugepage.h>
#endif
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
};

&hdmi {
hpd-gpios = <&expgpio 1 GPIO_ACTIVE_LOW>;
hpd-gpios = <&expgpio 0 GPIO_ACTIVE_LOW>;
power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
status = "okay";
};
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/imx7d-zii-rmu2.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@

&iomuxc_lpsr {
pinctrl_enet1_phy_interrupt: enet1phyinterruptgrp {
fsl,phy = <
fsl,pins = <
MX7D_PAD_LPSR_GPIO1_IO02__GPIO1_IO2 0x08
>;
};
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/rk3036-kylin.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,8 +304,8 @@
&i2c2 {
status = "okay";

rt5616: rt5616@1b {
compatible = "rt5616";
rt5616: audio-codec@1b {
compatible = "realtek,rt5616";
reg = <0x1b>;
clocks = <&cru SCLK_I2S_OUT>;
clock-names = "mclk";
Expand Down
Loading

0 comments on commit 2fefcb3

Please sign in to comment.