Skip to content

Commit 4d3f1a6

Browse files
misaka36graysky2
misaka36
and
graysky2
authored
kernel: bump 5.10 to 5.10.143 (#10138)
* kernel: bump 5.10 to 5.10.143 All patches automatically rebased. Signed-off-by: John Audia <[email protected]> * kernel: refresh 5.10 patches All patches automatically rebased. Signed-off-by: Linhui Liu <[email protected]> Signed-off-by: John Audia <[email protected]> Signed-off-by: Linhui Liu <[email protected]> Co-authored-by: John Audia <[email protected]>
1 parent 40de02b commit 4d3f1a6

File tree

53 files changed

+134
-163
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+134
-163
lines changed

‎include/kernel-5.10

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.10 = .142
2-
LINUX_KERNEL_HASH-5.10.142 = 3f47ebdb9afe152a0c32c1157336ef13fa5cc08ac6d884dfc1f6ddc2b7dba268
1+
LINUX_VERSION-5.10 = .143
2+
LINUX_KERNEL_HASH-5.10.143 = fa2c9edef272d39dca52e057e1d41433cf1b6ab6a00d24a00333c0b735054e91

‎target/linux/apm821xx/patches-5.10/802-usb-xhci-force-msi-renesas-xhci.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ produce a noisy warning.
4343
hcd->msi_enabled = 1;
4444
--- a/drivers/usb/host/xhci.h
4545
+++ b/drivers/usb/host/xhci.h
46-
@@ -1892,6 +1892,7 @@ struct xhci_hcd {
46+
@@ -1895,6 +1895,7 @@ struct xhci_hcd {
4747
struct xhci_hub usb2_rhub;
4848
struct xhci_hub usb3_rhub;
4949
/* support xHCI 1.0 spec USB2 hardware LPM */

‎target/linux/ath79/patches-5.10/0003-leds-add-reset-controller-based-driver.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ Signed-off-by: John Crispin <[email protected]>
1313

1414
--- a/drivers/leds/Kconfig
1515
+++ b/drivers/leds/Kconfig
16-
@@ -931,6 +931,17 @@ config LEDS_ACER_A500
17-
18-
source "drivers/leds/blink/Kconfig"
16+
@@ -929,6 +929,17 @@ config LEDS_ACER_A500
17+
This option enables support for the Power Button LED of
18+
Acer Iconia Tab A500.
1919

2020
+config LEDS_RESET
2121
+ tristate "LED support for reset-controller API"

‎target/linux/ath79/patches-5.10/0052-mtd-spi-nor-use-4-bit-locking-for-MX25L12805D.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Signed-off-by: David Bauer <[email protected]>
2121

2222
--- a/drivers/mtd/spi-nor/macronix.c
2323
+++ b/drivers/mtd/spi-nor/macronix.c
24-
@@ -51,7 +51,8 @@ static const struct flash_info macronix_
24+
@@ -50,7 +50,8 @@ static const struct flash_info macronix_
2525
{ "mx25u4035", INFO(0xc22533, 0, 64 * 1024, 8, SECT_4K) },
2626
{ "mx25u8035", INFO(0xc22534, 0, 64 * 1024, 16, SECT_4K) },
2727
{ "mx25u6435f", INFO(0xc22537, 0, 64 * 1024, 128, SECT_4K) },

‎target/linux/ath79/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ Signed-off-by: Abhimanyu Vishwakarma <[email protected]>
1010

1111
--- a/drivers/mtd/spi-nor/core.c
1212
+++ b/drivers/mtd/spi-nor/core.c
13-
@@ -3156,6 +3156,7 @@ int spi_nor_scan(struct spi_nor *nor, co
13+
@@ -3150,6 +3150,7 @@ int spi_nor_scan(struct spi_nor *nor, co
1414
struct device *dev = nor->dev;
1515
struct mtd_info *mtd = &nor->mtd;
1616
struct device_node *np = spi_nor_get_flash_node(nor);
1717
+ const char __maybe_unused *of_mtd_name = NULL;
1818
int ret;
1919
int i;
2020

21-
@@ -3210,7 +3211,12 @@ int spi_nor_scan(struct spi_nor *nor, co
21+
@@ -3204,7 +3205,12 @@ int spi_nor_scan(struct spi_nor *nor, co
2222
if (ret)
2323
return ret;
2424

‎target/linux/ath79/patches-5.10/408-mtd-redboot_partition_scan.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/drivers/mtd/parsers/redboot.c
22
+++ b/drivers/mtd/parsers/redboot.c
3-
@@ -90,12 +90,18 @@ static int parse_redboot_partitions(stru
3+
@@ -91,12 +91,18 @@ static int parse_redboot_partitions(stru
44

55
parse_redboot_of(master);
66

@@ -19,7 +19,7 @@
1919
return -EIO;
2020
}
2121
offset -= master->erasesize;
22-
@@ -108,10 +114,6 @@ static int parse_redboot_partitions(stru
22+
@@ -109,10 +115,6 @@ static int parse_redboot_partitions(stru
2323
goto nogood;
2424
}
2525
}
@@ -30,7 +30,7 @@
3030

3131
printk(KERN_NOTICE "Searching for RedBoot partition table in %s at offset 0x%lx\n",
3232
master->name, offset);
33-
@@ -184,6 +186,11 @@ static int parse_redboot_partitions(stru
33+
@@ -185,6 +187,11 @@ static int parse_redboot_partitions(stru
3434
}
3535
if (i == numslots) {
3636
/* Didn't find it */

‎target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -682,7 +682,7 @@
682682
struct fib6_info *fib6_info_alloc(gfp_t gfp_flags, bool with_fib6_nh)
683683
--- a/net/netfilter/nf_conntrack_proto_tcp.c
684684
+++ b/net/netfilter/nf_conntrack_proto_tcp.c
685-
@@ -415,7 +415,7 @@ static void tcp_sack(const struct sk_buf
685+
@@ -423,7 +423,7 @@ static void tcp_sack(const struct sk_buf
686686

687687
/* Fast path for timestamp-only option */
688688
if (length == TCPOLEN_TSTAMP_ALIGNED
@@ -706,7 +706,7 @@
706706
EXPORT_SYMBOL(xfrm_parse_spi);
707707
--- a/net/ipv4/tcp_input.c
708708
+++ b/net/ipv4/tcp_input.c
709-
@@ -4116,14 +4116,16 @@ static bool tcp_parse_aligned_timestamp(
709+
@@ -4127,14 +4127,16 @@ static bool tcp_parse_aligned_timestamp(
710710
{
711711
const __be32 *ptr = (const __be32 *)(th + 1);
712712

‎target/linux/ath79/patches-5.10/920-mikrotik-rb4xx.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
menu "SPI GPIO expanders"
4343
--- a/drivers/gpio/Makefile
4444
+++ b/drivers/gpio/Makefile
45-
@@ -121,6 +121,7 @@ obj-$(CONFIG_GPIO_PL061) += gpio-pl061.
45+
@@ -120,6 +120,7 @@ obj-$(CONFIG_GPIO_PL061) += gpio-pl061.
4646
obj-$(CONFIG_GPIO_PMIC_EIC_SPRD) += gpio-pmic-eic-sprd.o
4747
obj-$(CONFIG_GPIO_PXA) += gpio-pxa.o
4848
obj-$(CONFIG_GPIO_RASPBERRYPI_EXP) += gpio-raspberrypi-exp.o

‎target/linux/ath79/patches-5.10/939-mikrotik-rb91x.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@
2727
depends on MFD_SYSCON
2828
--- a/drivers/gpio/Makefile
2929
+++ b/drivers/gpio/Makefile
30-
@@ -73,6 +73,7 @@ obj-$(CONFIG_GPIO_IT87) += gpio-it87.o
30+
@@ -72,6 +72,7 @@ obj-$(CONFIG_GPIO_IT87) += gpio-it87.o
3131
obj-$(CONFIG_GPIO_IXP4XX) += gpio-ixp4xx.o
3232
obj-$(CONFIG_GPIO_JANZ_TTL) += gpio-janz-ttl.o
3333
obj-$(CONFIG_GPIO_KEMPLD) += gpio-kempld.o
3434
+obj-$(CONFIG_GPIO_LATCH) += gpio-latch.o
3535
obj-$(CONFIG_GPIO_LOGICVC) += gpio-logicvc.o
3636
obj-$(CONFIG_GPIO_LOONGSON1) += gpio-loongson1.o
3737
obj-$(CONFIG_GPIO_LOONGSON) += gpio-loongson.o
38-
@@ -122,6 +123,7 @@ obj-$(CONFIG_GPIO_PMIC_EIC_SPRD) += gpio
38+
@@ -121,6 +122,7 @@ obj-$(CONFIG_GPIO_PMIC_EIC_SPRD) += gpio
3939
obj-$(CONFIG_GPIO_PXA) += gpio-pxa.o
4040
obj-$(CONFIG_GPIO_RASPBERRYPI_EXP) += gpio-raspberrypi-exp.o
4141
obj-$(CONFIG_GPIO_RB4XX) += gpio-rb4xx.o

‎target/linux/bcm63xx/patches-5.10/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
1414

1515
--- a/arch/mips/Kconfig
1616
+++ b/arch/mips/Kconfig
17-
@@ -317,6 +317,9 @@ config BCM63XX
17+
@@ -319,6 +319,9 @@ config BCM63XX
1818
select SYNC_R4K
1919
select DMA_NONCOHERENT
2020
select IRQ_MIPS_CPU

‎target/linux/generic/backport-5.10/350-v5.12-NFSv4_2-SSC-helper-should-use-its-own-config.patch

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Signed-off-by: Chuck Lever <[email protected]>
3434
source "fs/cifs/Kconfig"
3535
--- a/fs/nfs/nfs4file.c
3636
+++ b/fs/nfs/nfs4file.c
37-
@@ -422,7 +422,9 @@ static const struct nfs4_ssc_client_ops nfs4_ssc_clnt_ops_tbl = {
37+
@@ -430,7 +430,9 @@ static const struct nfs4_ssc_client_ops
3838
*/
3939
void nfs42_ssc_register_ops(void)
4040
{
@@ -44,7 +44,7 @@ Signed-off-by: Chuck Lever <[email protected]>
4444
}
4545

4646
/**
47-
@@ -433,7 +435,9 @@ void nfs42_ssc_register_ops(void)
47+
@@ -441,7 +443,9 @@ void nfs42_ssc_register_ops(void)
4848
*/
4949
void nfs42_ssc_unregister_ops(void)
5050
{
@@ -56,7 +56,7 @@ Signed-off-by: Chuck Lever <[email protected]>
5656

5757
--- a/fs/nfs/super.c
5858
+++ b/fs/nfs/super.c
59-
@@ -86,9 +86,11 @@ const struct super_operations nfs_sops = {
59+
@@ -86,9 +86,11 @@ const struct super_operations nfs_sops =
6060
};
6161
EXPORT_SYMBOL_GPL(nfs_sops);
6262

@@ -112,7 +112,7 @@ Signed-off-by: Chuck Lever <[email protected]>
112112

113113
--- a/fs/nfs_common/Makefile
114114
+++ b/fs/nfs_common/Makefile
115-
@@ -7,4 +7,4 @@ obj-$(CONFIG_NFS_ACL_SUPPORT) += nfs_acl.o
115+
@@ -7,4 +7,4 @@ obj-$(CONFIG_NFS_ACL_SUPPORT) += nfs_acl
116116
nfs_acl-objs := nfsacl.o
117117

118118
obj-$(CONFIG_GRACE_PERIOD) += grace.o

‎target/linux/generic/backport-5.10/351-v5.13-NFSv4_2-Remove-ifdef-CONFIG_NFSD-from-client-SSC.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Signed-off-by: Trond Myklebust <[email protected]>
3232
source "fs/ceph/Kconfig"
3333
--- a/fs/nfs/nfs4file.c
3434
+++ b/fs/nfs/nfs4file.c
35-
@@ -422,9 +422,7 @@ static const struct nfs4_ssc_client_ops nfs4_ssc_clnt_ops_tbl = {
35+
@@ -430,9 +430,7 @@ static const struct nfs4_ssc_client_ops
3636
*/
3737
void nfs42_ssc_register_ops(void)
3838
{
@@ -42,7 +42,7 @@ Signed-off-by: Trond Myklebust <[email protected]>
4242
}
4343

4444
/**
45-
@@ -435,9 +433,7 @@ void nfs42_ssc_register_ops(void)
45+
@@ -443,9 +441,7 @@ void nfs42_ssc_register_ops(void)
4646
*/
4747
void nfs42_ssc_unregister_ops(void)
4848
{

‎target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
7070
nft_trans_table_update(trans) = true;
7171
list_add_tail(&trans->list, &ctx->net->nft.commit_list);
7272
return 0;
73-
@@ -7919,11 +7923,10 @@ static int nf_tables_commit(struct net *
73+
@@ -7921,11 +7925,10 @@ static int nf_tables_commit(struct net *
7474
switch (trans->msg_type) {
7575
case NFT_MSG_NEWTABLE:
7676
if (nft_trans_table_update(trans)) {
@@ -86,7 +86,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
8686
} else {
8787
nft_clear(net, trans->ctx.table);
8888
}
89-
@@ -8137,11 +8140,9 @@ static int __nf_tables_abort(struct net
89+
@@ -8139,11 +8142,9 @@ static int __nf_tables_abort(struct net
9090
switch (trans->msg_type) {
9191
case NFT_MSG_NEWTABLE:
9292
if (nft_trans_table_update(trans)) {

‎target/linux/generic/backport-5.10/610-v5.18-netfilter-flowtable-move-dst_check-to-packet-path.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
2020

2121
--- a/net/netfilter/nf_flow_table_core.c
2222
+++ b/net/netfilter/nf_flow_table_core.c
23-
@@ -433,33 +433,12 @@ nf_flow_table_iterate(struct nf_flowtabl
23+
@@ -429,33 +429,12 @@ nf_flow_table_iterate(struct nf_flowtabl
2424
return err;
2525
}
2626

‎target/linux/generic/hack-5.10/204-module_strip.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
104104
config MODULES_TREE_LOOKUP
105105
--- a/kernel/module.c
106106
+++ b/kernel/module.c
107-
@@ -3247,9 +3247,11 @@ static int setup_load_info(struct load_i
107+
@@ -3251,9 +3251,11 @@ static int setup_load_info(struct load_i
108108

109109
static int check_modinfo(struct module *mod, struct load_info *info, int flags)
110110
{
@@ -117,7 +117,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
117117
if (flags & MODULE_INIT_IGNORE_VERMAGIC)
118118
modmagic = NULL;
119119

120-
@@ -3270,6 +3272,7 @@ static int check_modinfo(struct module *
120+
@@ -3274,6 +3276,7 @@ static int check_modinfo(struct module *
121121
mod->name);
122122
add_taint_module(mod, TAINT_OOT_MODULE, LOCKDEP_STILL_OK);
123123
}

‎target/linux/generic/hack-5.10/640-bridge-only-accept-EAP-locally.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Signed-off-by: Etienne Champetier <[email protected]>
1212

1313
--- a/net/bridge/br_input.c
1414
+++ b/net/bridge/br_input.c
15-
@@ -107,10 +107,14 @@ int br_handle_frame_finish(struct net *n
15+
@@ -114,10 +114,14 @@ int br_handle_frame_finish(struct net *n
1616
}
1717
}
1818

‎target/linux/generic/hack-5.10/661-use_fq_codel_by_default.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
1414

1515
--- a/include/net/sch_generic.h
1616
+++ b/include/net/sch_generic.h
17-
@@ -625,12 +625,13 @@ extern struct Qdisc_ops noop_qdisc_ops;
17+
@@ -611,12 +611,13 @@ extern struct Qdisc_ops noop_qdisc_ops;
1818
extern struct Qdisc_ops pfifo_fast_ops;
1919
extern struct Qdisc_ops mq_qdisc_ops;
2020
extern struct Qdisc_ops noqueue_qdisc_ops;
@@ -83,7 +83,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
8383
EXPORT_SYMBOL(default_qdisc_ops);
8484

8585
static void qdisc_maybe_clear_missed(struct Qdisc *q,
86-
@@ -1062,12 +1062,12 @@ static void attach_one_default_qdisc(str
86+
@@ -1077,12 +1077,12 @@ static void attach_one_default_qdisc(str
8787
void *_unused)
8888
{
8989
struct Qdisc *qdisc;

‎target/linux/generic/hack-5.10/952-net-conntrack-events-support-multiple-registrant.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ Signed-off-by: Zhi Chen <[email protected]>
9898
#if defined(CONFIG_NF_CONNTRACK_LABELS)
9999
--- a/net/netfilter/Kconfig
100100
+++ b/net/netfilter/Kconfig
101-
@@ -136,6 +136,14 @@ config NF_CONNTRACK_EVENTS
101+
@@ -135,6 +135,14 @@ config NF_CONNTRACK_EVENTS
102102

103103
If unsure, say `N'.
104104

‎target/linux/generic/hack-5.10/953-net-patch-linux-kernel-to-support-shortcut-fe.patch

+4-4
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
struct net_bridge_port *p;
8181
--- a/net/core/dev.c
8282
+++ b/net/core/dev.c
83-
@@ -3584,9 +3584,17 @@ static int xmit_one(struct sk_buff *skb,
83+
@@ -3650,9 +3650,17 @@ static int xmit_one(struct sk_buff *skb,
8484
{
8585
unsigned int len;
8686
int rc;
@@ -99,7 +99,7 @@
9999

100100
#ifdef CONFIG_ETHERNET_PACKET_MANGLE
101101
if (dev->eth_mangle_tx && !(skb = dev->eth_mangle_tx(dev, skb)))
102-
@@ -5214,6 +5222,11 @@ void netdev_rx_handler_unregister(struct
102+
@@ -5204,6 +5212,11 @@ void netdev_rx_handler_unregister(struct
103103
}
104104
EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister);
105105

@@ -111,7 +111,7 @@
111111
/*
112112
* Limit the use of PFMEMALLOC reserves to those protocols that implement
113113
* the special handling of PFMEMALLOC skbs.
114-
@@ -5262,6 +5275,10 @@ static int __netif_receive_skb_core(stru
114+
@@ -5252,6 +5265,10 @@ static int __netif_receive_skb_core(stru
115115
int ret = NET_RX_DROP;
116116
__be16 type;
117117

@@ -122,7 +122,7 @@
122122
net_timestamp_check(!READ_ONCE(netdev_tstamp_prequeue), skb);
123123

124124
trace_netif_receive_skb(skb);
125-
@@ -5299,6 +5316,15 @@ another_round:
125+
@@ -5291,6 +5308,15 @@ another_round:
126126
goto out;
127127
}
128128

‎target/linux/generic/hack-5.10/993-export-dev-set-dev-symbol.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/net/core/dev.c
22
+++ b/net/core/dev.c
3-
@@ -6900,6 +6900,7 @@
3+
@@ -6903,6 +6903,7 @@ int dev_set_threaded(struct net_device *
44

55
return err;
66
}

‎target/linux/generic/hack-5.10/994-mhi-use-irq-flags.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/drivers/bus/mhi/core/init.c
22
+++ b/drivers/bus/mhi/core/init.c
3-
@@ -148,12 +148,17 @@ int mhi_init_irq_setup(struct mhi_controller *mhi_cntrl)
3+
@@ -148,12 +148,17 @@ int mhi_init_irq_setup(struct mhi_contro
44
{
55
struct mhi_event *mhi_event = mhi_cntrl->mhi_event;
66
struct device *dev = &mhi_cntrl->mhi_dev->dev;
@@ -19,7 +19,7 @@
1919
"bhi", mhi_cntrl);
2020
if (ret)
2121
return ret;
22-
@@ -171,7 +176,7 @@ int mhi_init_irq_setup(struct mhi_controller *mhi_cntrl)
22+
@@ -171,7 +176,7 @@ int mhi_init_irq_setup(struct mhi_contro
2323

2424
ret = request_irq(mhi_cntrl->irq[mhi_event->irq],
2525
mhi_irq_handler,

‎target/linux/generic/hack-5.10/995-add-support-for-forced-PM-resume.patch

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/drivers/bus/mhi/core/pm.c
22
+++ b/drivers/bus/mhi/core/pm.c
3-
@@ -767,7 +767,7 @@ int mhi_pm_suspend(struct mhi_controller *mhi_cntrl)
3+
@@ -767,7 +767,7 @@ int mhi_pm_suspend(struct mhi_controller
44
}
55
EXPORT_SYMBOL_GPL(mhi_pm_suspend);
66

@@ -9,7 +9,7 @@
99
{
1010
struct mhi_chan *itr, *tmp;
1111
struct device *dev = &mhi_cntrl->mhi_dev->dev;
12-
@@ -783,6 +783,13 @@
12+
@@ -783,6 +783,13 @@ int mhi_pm_resume(struct mhi_controller
1313

1414
if (MHI_PM_IN_ERROR_STATE(mhi_cntrl->pm_state))
1515
return -EIO;
@@ -23,7 +23,7 @@
2323

2424
/* Notify clients about exiting LPM */
2525
list_for_each_entry_safe(itr, tmp, &mhi_cntrl->lpm_chans, node) {
26-
@@ -823,8 +830,19 @@ int mhi_pm_resume(struct mhi_controller *mhi_cntrl)
26+
@@ -823,8 +830,19 @@ int mhi_pm_resume(struct mhi_controller
2727

2828
return 0;
2929
}
@@ -45,7 +45,7 @@
4545
int ret;
4646
--- a/drivers/net/wireless/ath/ath11k/mhi.c
4747
+++ b/drivers/net/wireless/ath/ath11k/mhi.c
48-
@@ -415,6 +415,11 @@
48+
@@ -415,6 +415,11 @@ static int ath11k_mhi_set_state(struct a
4949
case ATH11K_MHI_SUSPEND:
5050
break;
5151
case ATH11K_MHI_RESUME:
@@ -59,11 +59,10 @@
5959
ret = mhi_force_rddm_mode(ab_pci->mhi_ctrl);
6060
--- a/include/linux/mhi.h
6161
+++ b/include/linux/mhi.h
62-
@@ -646,6 +646,19 @@ int mhi_pm_suspend(struct mhi_controller *mhi_cntrl);
63-
*/
62+
@@ -647,6 +647,19 @@ int mhi_pm_suspend(struct mhi_controller
6463
int mhi_pm_resume(struct mhi_controller *mhi_cntrl);
6564

66-
+/**
65+
/**
6766
+ * mhi_pm_resume_force - Force resume MHI from suspended state
6867
+ * @mhi_cntrl: MHI controller
6968
+ *
@@ -76,6 +75,7 @@
7675
+ */
7776
+int mhi_pm_resume_force(struct mhi_controller *mhi_cntrl);
7877
+
79-
/**
78+
+/**
8079
* mhi_download_rddm_img - Download ramdump image from device for
8180
* debugging purpose.
81+
* @mhi_cntrl: MHI controller

0 commit comments

Comments
 (0)