* [PATCH AUTOSEL 4.19 02/11] usb: usb251xb: add boost-up property support
2022-02-15 15:30 [PATCH AUTOSEL 4.19 01/11] ARM: OMAP2+: hwmod: Add of_node_put() before break Sasha Levin
@ 2022-02-15 15:30 ` Sasha Levin
2022-02-15 15:30 ` [PATCH AUTOSEL 4.19 03/11] irqchip/sifive-plic: Add missing thead,c900-plic match string Sasha Levin
` (8 subsequent siblings)
9 siblings, 0 replies; 15+ messages in thread
From: Sasha Levin @ 2022-02-15 15:30 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Tommaso Merciai, Richard Leitner, Greg Kroah-Hartman,
Sasha Levin, richard.leitner, linux-usb
From: Tommaso Merciai <tomm.merciai@gmail.com>
[ Upstream commit 5c2b9c61ae5d8ad0a196d33b66ce44543be22281 ]
Add support for boost-up register of usb251xb hub.
boost-up property control USB electrical drive strength
This register can be set:
- Normal mode -> 0x00
- Low -> 0x01
- Medium -> 0x10
- High -> 0x11
(Normal Default)
References:
- http://www.mouser.com/catalog/specsheets/2514.pdf p29
Reviewed-by: Richard Leitner <richard.leitner@linux.dev>
Signed-off-by: Tommaso Merciai <tomm.merciai@gmail.com>
Link: https://lore.kernel.org/r/20220128181713.96856-1-tomm.merciai@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/usb/misc/usb251xb.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/misc/usb251xb.c b/drivers/usb/misc/usb251xb.c
index 5f7734c729b1d..8444b92f9737f 100644
--- a/drivers/usb/misc/usb251xb.c
+++ b/drivers/usb/misc/usb251xb.c
@@ -510,6 +510,9 @@ static int usb251xb_get_ofdata(struct usb251xb *hub,
if (of_property_read_u16_array(np, "language-id", &hub->lang_id, 1))
hub->lang_id = USB251XB_DEF_LANGUAGE_ID;
+ if (of_property_read_u8(np, "boost-up", &hub->boost_up))
+ hub->boost_up = USB251XB_DEF_BOOST_UP;
+
cproperty_char = of_get_property(np, "manufacturer", NULL);
strlcpy(str, cproperty_char ? : USB251XB_DEF_MANUFACTURER_STRING,
sizeof(str));
@@ -543,7 +546,6 @@ static int usb251xb_get_ofdata(struct usb251xb *hub,
* may be as soon as needed.
*/
hub->bat_charge_en = USB251XB_DEF_BATTERY_CHARGING_ENABLE;
- hub->boost_up = USB251XB_DEF_BOOST_UP;
hub->boost_57 = USB251XB_DEF_BOOST_57;
hub->boost_14 = USB251XB_DEF_BOOST_14;
hub->port_swap = USB251XB_DEF_PORT_SWAP;
--
2.34.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH AUTOSEL 4.19 03/11] irqchip/sifive-plic: Add missing thead,c900-plic match string
2022-02-15 15:30 [PATCH AUTOSEL 4.19 01/11] ARM: OMAP2+: hwmod: Add of_node_put() before break Sasha Levin
2022-02-15 15:30 ` [PATCH AUTOSEL 4.19 02/11] usb: usb251xb: add boost-up property support Sasha Levin
@ 2022-02-15 15:30 ` Sasha Levin
2022-02-20 9:54 ` Pavel Machek
2022-02-15 15:30 ` [PATCH AUTOSEL 4.19 04/11] netfilter: conntrack: don't refresh sctp entries in closed state Sasha Levin
` (7 subsequent siblings)
9 siblings, 1 reply; 15+ messages in thread
From: Sasha Levin @ 2022-02-15 15:30 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Guo Ren, Anup Patel, Marc Zyngier, Palmer Dabbelt,
Samuel Holland, Thomas Gleixner, Sasha Levin, paul.walmsley, aou,
linux-riscv
From: Guo Ren <guoren@linux.alibaba.com>
[ Upstream commit 1d4df649cbb4b26d19bea38ecff4b65b10a1bbca ]
The thead,c900-plic has been used in opensbi to distinguish
PLIC [1]. Although PLICs have the same behaviors in Linux,
they are different hardware with some custom initializing in
firmware(opensbi).
Qute opensbi patch commit-msg by Samuel:
The T-HEAD PLIC implementation requires setting a delegation bit
to allow access from S-mode. Now that the T-HEAD PLIC has its own
compatible string, set this bit automatically from the PLIC driver,
instead of reaching into the PLIC's MMIO space from another driver.
[1]: https://github.com/riscv-software-src/opensbi/commit/78c2b19218bd62653b9fb31623a42ced45f38ea6
Signed-off-by: Guo Ren <guoren@linux.alibaba.com>
Cc: Anup Patel <anup@brainfault.org>
Cc: Marc Zyngier <maz@kernel.org>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Samuel Holland <samuel@sholland.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Samuel Holland <samuel@sholland.org>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20220130135634.1213301-3-guoren@kernel.org
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/irqchip/irq-sifive-plic.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/irqchip/irq-sifive-plic.c b/drivers/irqchip/irq-sifive-plic.c
index 532e9d68c7042..767cdd3f773bb 100644
--- a/drivers/irqchip/irq-sifive-plic.c
+++ b/drivers/irqchip/irq-sifive-plic.c
@@ -258,3 +258,4 @@ static int __init plic_init(struct device_node *node,
IRQCHIP_DECLARE(sifive_plic, "sifive,plic-1.0.0", plic_init);
IRQCHIP_DECLARE(riscv_plic0, "riscv,plic0", plic_init); /* for legacy systems */
+IRQCHIP_DECLARE(thead_c900_plic, "thead,c900-plic", plic_init); /* for firmware driver */
--
2.34.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH AUTOSEL 4.19 03/11] irqchip/sifive-plic: Add missing thead,c900-plic match string
2022-02-15 15:30 ` [PATCH AUTOSEL 4.19 03/11] irqchip/sifive-plic: Add missing thead,c900-plic match string Sasha Levin
@ 2022-02-20 9:54 ` Pavel Machek
2022-02-20 11:05 ` Marc Zyngier
0 siblings, 1 reply; 15+ messages in thread
From: Pavel Machek @ 2022-02-20 9:54 UTC (permalink / raw)
To: Sasha Levin
Cc: linux-kernel, stable, Guo Ren, Anup Patel, Marc Zyngier,
Palmer Dabbelt, Samuel Holland, Thomas Gleixner, paul.walmsley,
aou, linux-riscv
[-- Attachment #1: Type: text/plain, Size: 1135 bytes --]
Hi!
> [ Upstream commit 1d4df649cbb4b26d19bea38ecff4b65b10a1bbca ]
>
> The thead,c900-plic has been used in opensbi to distinguish
> PLIC [1]. Although PLICs have the same behaviors in Linux,
> they are different hardware with some custom initializing in
> firmware(opensbi).
>
> Qute opensbi patch commit-msg by Samuel:
>
> The T-HEAD PLIC implementation requires setting a delegation bit
> to allow access from S-mode. Now that the T-HEAD PLIC has its own
> compatible string, set this bit automatically from the PLIC driver,
> instead of reaching into the PLIC's MMIO space from another driver.
>
> [1]: https://github.com/riscv-software-src/opensbi/commit/78c2b19218bd62653b9fb31623a42ced45f38ea6
>
The "thead,c900-plic" string is added into single place in the
kernel. This means that a) it will probably not do anything useful in
-stable kernels and b) it is certainly missing documentation etc.
In mainline, string is documented in
Documentation/devicetree/bindings/interrupt-controller/sifive,plic-1.0.0.yaml
Best regards,
Pavel
--
http://www.livejournal.com/~pavelmachek
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH AUTOSEL 4.19 03/11] irqchip/sifive-plic: Add missing thead,c900-plic match string
2022-02-20 9:54 ` Pavel Machek
@ 2022-02-20 11:05 ` Marc Zyngier
0 siblings, 0 replies; 15+ messages in thread
From: Marc Zyngier @ 2022-02-20 11:05 UTC (permalink / raw)
To: Pavel Machek
Cc: Sasha Levin, linux-kernel, stable, Guo Ren, Anup Patel,
Palmer Dabbelt, Samuel Holland, Thomas Gleixner, paul.walmsley,
aou, linux-riscv
On 2022-02-20 09:54, Pavel Machek wrote:
> Hi!
>
>> [ Upstream commit 1d4df649cbb4b26d19bea38ecff4b65b10a1bbca ]
>>
>> The thead,c900-plic has been used in opensbi to distinguish
>> PLIC [1]. Although PLICs have the same behaviors in Linux,
>> they are different hardware with some custom initializing in
>> firmware(opensbi).
>>
>> Qute opensbi patch commit-msg by Samuel:
>>
>> The T-HEAD PLIC implementation requires setting a delegation bit
>> to allow access from S-mode. Now that the T-HEAD PLIC has its own
>> compatible string, set this bit automatically from the PLIC driver,
>> instead of reaching into the PLIC's MMIO space from another driver.
>>
>> [1]:
>> https://github.com/riscv-software-src/opensbi/commit/78c2b19218bd62653b9fb31623a42ced45f38ea6
>>
>
> The "thead,c900-plic" string is added into single place in the
> kernel. This means that a) it will probably not do anything useful in
> -stable kernels and b) it is certainly missing documentation etc.
>
> In mainline, string is documented in
> Documentation/devicetree/bindings/interrupt-controller/sifive,plic-1.0.0.yaml
(b) is certainly true. And to make the above comment useful, the missing
patch is 321a8be37e1a ("dt-bindings: update riscv plic compatible
string").
Regarding (a), the DT is provided by the firmware (as it should
be on any reasonable platform). As such, no need for this string to be
mentioned anywhere else but in the documentation.
Now, the real question is where there is any point in backporting
this to such an old kernel, as this HW is unlikely to ever run it.
M.
--
Jazz is not dead. It just smells funny...
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH AUTOSEL 4.19 04/11] netfilter: conntrack: don't refresh sctp entries in closed state
2022-02-15 15:30 [PATCH AUTOSEL 4.19 01/11] ARM: OMAP2+: hwmod: Add of_node_put() before break Sasha Levin
2022-02-15 15:30 ` [PATCH AUTOSEL 4.19 02/11] usb: usb251xb: add boost-up property support Sasha Levin
2022-02-15 15:30 ` [PATCH AUTOSEL 4.19 03/11] irqchip/sifive-plic: Add missing thead,c900-plic match string Sasha Levin
@ 2022-02-15 15:30 ` Sasha Levin
2022-02-15 15:30 ` [PATCH AUTOSEL 4.19 05/11] arm64: dts: meson-gx: add ATF BL32 reserved-memory region Sasha Levin
` (6 subsequent siblings)
9 siblings, 0 replies; 15+ messages in thread
From: Sasha Levin @ 2022-02-15 15:30 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Florian Westphal, Vivek Thrivikraman, Pablo Neira Ayuso,
Sasha Levin, kadlec, davem, kuba, netfilter-devel, coreteam,
netdev
From: Florian Westphal <fw@strlen.de>
[ Upstream commit 77b337196a9d87f3d6bb9b07c0436ecafbffda1e ]
Vivek Thrivikraman reported:
An SCTP server application which is accessed continuously by client
application.
When the session disconnects the client retries to establish a connection.
After restart of SCTP server application the session is not established
because of stale conntrack entry with connection state CLOSED as below.
(removing this entry manually established new connection):
sctp 9 CLOSED src=10.141.189.233 [..] [ASSURED]
Just skip timeout update of closed entries, we don't want them to
stay around forever.
Reported-and-tested-by: Vivek Thrivikraman <vivek.thrivikraman@est.tech>
Closes: https://bugzilla.netfilter.org/show_bug.cgi?id=1579
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
net/netfilter/nf_conntrack_proto_sctp.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/net/netfilter/nf_conntrack_proto_sctp.c b/net/netfilter/nf_conntrack_proto_sctp.c
index a937d4f75613f..8cb62805fd684 100644
--- a/net/netfilter/nf_conntrack_proto_sctp.c
+++ b/net/netfilter/nf_conntrack_proto_sctp.c
@@ -394,6 +394,15 @@ static int sctp_packet(struct nf_conn *ct,
pr_debug("Setting vtag %x for dir %d\n",
ih->init_tag, !dir);
ct->proto.sctp.vtag[!dir] = ih->init_tag;
+
+ /* don't renew timeout on init retransmit so
+ * port reuse by client or NAT middlebox cannot
+ * keep entry alive indefinitely (incl. nat info).
+ */
+ if (new_state == SCTP_CONNTRACK_CLOSED &&
+ old_state == SCTP_CONNTRACK_CLOSED &&
+ nf_ct_is_confirmed(ct))
+ ignore = true;
}
ct->proto.sctp.state = new_state;
--
2.34.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH AUTOSEL 4.19 05/11] arm64: dts: meson-gx: add ATF BL32 reserved-memory region
2022-02-15 15:30 [PATCH AUTOSEL 4.19 01/11] ARM: OMAP2+: hwmod: Add of_node_put() before break Sasha Levin
` (2 preceding siblings ...)
2022-02-15 15:30 ` [PATCH AUTOSEL 4.19 04/11] netfilter: conntrack: don't refresh sctp entries in closed state Sasha Levin
@ 2022-02-15 15:30 ` Sasha Levin
2022-02-15 15:30 ` [PATCH AUTOSEL 4.19 06/11] kconfig: let 'shell' return enough output for deep path names Sasha Levin
` (5 subsequent siblings)
9 siblings, 0 replies; 15+ messages in thread
From: Sasha Levin @ 2022-02-15 15:30 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Christian Hewitt, Mateusz Krzak, Neil Armstrong, Kevin Hilman,
Sasha Levin, robh+dt, devicetree, linux-arm-kernel,
linux-amlogic
From: Christian Hewitt <christianshewitt@gmail.com>
[ Upstream commit 76577c9137456febb05b0e17d244113196a98968 ]
Add an additional reserved memory region for the BL32 trusted firmware
present in many devices that boot from Amlogic vendor u-boot.
Suggested-by: Mateusz Krzak <kszaquitto@gmail.com>
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
Reviewed-by: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Link: https://lore.kernel.org/r/20220126044954.19069-2-christianshewitt@gmail.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
index b8dc4dbb391b6..4252119bfd901 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
@@ -41,6 +41,12 @@ secmon_reserved_alt: secmon@5000000 {
no-map;
};
+ /* 32 MiB reserved for ARM Trusted Firmware (BL32) */
+ secmon_reserved_bl32: secmon@5300000 {
+ reg = <0x0 0x05300000 0x0 0x2000000>;
+ no-map;
+ };
+
linux,cma {
compatible = "shared-dma-pool";
reusable;
--
2.34.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH AUTOSEL 4.19 06/11] kconfig: let 'shell' return enough output for deep path names
2022-02-15 15:30 [PATCH AUTOSEL 4.19 01/11] ARM: OMAP2+: hwmod: Add of_node_put() before break Sasha Levin
` (3 preceding siblings ...)
2022-02-15 15:30 ` [PATCH AUTOSEL 4.19 05/11] arm64: dts: meson-gx: add ATF BL32 reserved-memory region Sasha Levin
@ 2022-02-15 15:30 ` Sasha Levin
2022-02-20 10:01 ` Pavel Machek
2022-02-15 15:31 ` [PATCH AUTOSEL 4.19 07/11] ata: libata-core: Disable TRIM on M88V29 Sasha Levin
` (4 subsequent siblings)
9 siblings, 1 reply; 15+ messages in thread
From: Sasha Levin @ 2022-02-15 15:30 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Brenda Streiff, Masahiro Yamada, Sasha Levin, linux-kbuild
From: Brenda Streiff <brenda.streiff@ni.com>
[ Upstream commit 8a4c5b2a6d8ea079fa36034e8167de87ab6f8880 ]
The 'shell' built-in only returns the first 256 bytes of the command's
output. In some cases, 'shell' is used to return a path; by bumping up
the buffer size to 4096 this lets us capture up to PATH_MAX.
The specific case where I ran into this was due to commit 1e860048c53e
("gcc-plugins: simplify GCC plugin-dev capability test"). After this
change, we now use `$(shell,$(CC) -print-file-name=plugin)` to return
a path; if the gcc path is particularly long, then the path ends up
truncated at the 256 byte mark, which makes the HAVE_GCC_PLUGINS
depends test always fail.
Signed-off-by: Brenda Streiff <brenda.streiff@ni.com>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
scripts/kconfig/preprocess.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/kconfig/preprocess.c b/scripts/kconfig/preprocess.c
index 389814b02d06b..8c7e51a6273cc 100644
--- a/scripts/kconfig/preprocess.c
+++ b/scripts/kconfig/preprocess.c
@@ -138,7 +138,7 @@ static char *do_lineno(int argc, char *argv[])
static char *do_shell(int argc, char *argv[])
{
FILE *p;
- char buf[256];
+ char buf[4096];
char *cmd;
size_t nread;
int i;
--
2.34.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH AUTOSEL 4.19 06/11] kconfig: let 'shell' return enough output for deep path names
2022-02-15 15:30 ` [PATCH AUTOSEL 4.19 06/11] kconfig: let 'shell' return enough output for deep path names Sasha Levin
@ 2022-02-20 10:01 ` Pavel Machek
0 siblings, 0 replies; 15+ messages in thread
From: Pavel Machek @ 2022-02-20 10:01 UTC (permalink / raw)
To: Sasha Levin
Cc: linux-kernel, stable, Brenda Streiff, Masahiro Yamada, linux-kbuild
[-- Attachment #1: Type: text/plain, Size: 855 bytes --]
Hi!
> [ Upstream commit 8a4c5b2a6d8ea079fa36034e8167de87ab6f8880 ]
>
> The 'shell' built-in only returns the first 256 bytes of the command's
> output. In some cases, 'shell' is used to return a path; by bumping up
> the buffer size to 4096 this lets us capture up to PATH_MAX.
If the idea is to support up-to PATH_MAX, perhaps open-coded 4096
should be replaced by PATH_MAX in the code, too?
Best regards,
Pavel
> +++ b/scripts/kconfig/preprocess.c
> @@ -138,7 +138,7 @@ static char *do_lineno(int argc, char *argv[])
> static char *do_shell(int argc, char *argv[])
> {
> FILE *p;
> - char buf[256];
> + char buf[4096];
> char *cmd;
> size_t nread;
> int i;
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH AUTOSEL 4.19 07/11] ata: libata-core: Disable TRIM on M88V29
2022-02-15 15:30 [PATCH AUTOSEL 4.19 01/11] ARM: OMAP2+: hwmod: Add of_node_put() before break Sasha Levin
` (4 preceding siblings ...)
2022-02-15 15:30 ` [PATCH AUTOSEL 4.19 06/11] kconfig: let 'shell' return enough output for deep path names Sasha Levin
@ 2022-02-15 15:31 ` Sasha Levin
2022-02-15 15:31 ` [PATCH AUTOSEL 4.19 08/11] tracing: Fix tp_printk option related with tp_printk_stop_on_boot Sasha Levin
` (3 subsequent siblings)
9 siblings, 0 replies; 15+ messages in thread
From: Sasha Levin @ 2022-02-15 15:31 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Zoltán Böszörményi, Damien Le Moal,
Sasha Levin, linux-ide
From: Zoltán Böszörményi <zboszor@gmail.com>
[ Upstream commit c8ea23d5fa59f28302d4e3370c75d9c308e64410 ]
This device is a CF card, or possibly an SSD in CF form factor.
It supports NCQ and high speed DMA.
While it also advertises TRIM support, I/O errors are reported
when the discard mount option fstrim is used. TRIM also fails
when disabling NCQ and not just as an NCQ command.
TRIM must be disabled for this device.
Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/ata/libata-core.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 46eacba2613b8..33d3728f36222 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -4613,6 +4613,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
/* devices that don't properly handle TRIM commands */
{ "SuperSSpeed S238*", NULL, ATA_HORKAGE_NOTRIM, },
+ { "M88V29*", NULL, ATA_HORKAGE_NOTRIM, },
/*
* As defined, the DRAT (Deterministic Read After Trim) and RZAT
--
2.34.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH AUTOSEL 4.19 08/11] tracing: Fix tp_printk option related with tp_printk_stop_on_boot
2022-02-15 15:30 [PATCH AUTOSEL 4.19 01/11] ARM: OMAP2+: hwmod: Add of_node_put() before break Sasha Levin
` (5 preceding siblings ...)
2022-02-15 15:31 ` [PATCH AUTOSEL 4.19 07/11] ata: libata-core: Disable TRIM on M88V29 Sasha Levin
@ 2022-02-15 15:31 ` Sasha Levin
2022-02-15 15:31 ` [PATCH AUTOSEL 4.19 09/11] NFSD: Fix offset type in I/O trace points Sasha Levin
` (2 subsequent siblings)
9 siblings, 0 replies; 15+ messages in thread
From: Sasha Levin @ 2022-02-15 15:31 UTC (permalink / raw)
To: linux-kernel, stable
Cc: JaeSang Yoo, JaeSang Yoo, Steven Rostedt, Sasha Levin, mingo
From: JaeSang Yoo <js.yoo.5b@gmail.com>
[ Upstream commit 3203ce39ac0b2a57a84382ec184c7d4a0bede175 ]
The kernel parameter "tp_printk_stop_on_boot" starts with "tp_printk" which is
the same as another kernel parameter "tp_printk". If "tp_printk" setup is
called before the "tp_printk_stop_on_boot", it will override the latter
and keep it from being set.
This is similar to other kernel parameter issues, such as:
Commit 745a600cf1a6 ("um: console: Ignore console= option")
or init/do_mounts.c:45 (setup function of "ro" kernel param)
Fix it by checking for a "_" right after the "tp_printk" and if that
exists do not process the parameter.
Link: https://lkml.kernel.org/r/20220208195421.969326-1-jsyoo5b@gmail.com
Signed-off-by: JaeSang Yoo <jsyoo5b@gmail.com>
[ Fixed up change log and added space after if condition ]
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
kernel/trace/trace.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 17e337a22c239..19a6b088f1e72 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -232,6 +232,10 @@ __setup("trace_clock=", set_trace_boot_clock);
static int __init set_tracepoint_printk(char *str)
{
+ /* Ignore the "tp_printk_stop_on_boot" param */
+ if (*str == '_')
+ return 0;
+
if ((strcmp(str, "=0") != 0 && strcmp(str, "=off") != 0))
tracepoint_printk = 1;
return 1;
--
2.34.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH AUTOSEL 4.19 09/11] NFSD: Fix offset type in I/O trace points
2022-02-15 15:30 [PATCH AUTOSEL 4.19 01/11] ARM: OMAP2+: hwmod: Add of_node_put() before break Sasha Levin
` (6 preceding siblings ...)
2022-02-15 15:31 ` [PATCH AUTOSEL 4.19 08/11] tracing: Fix tp_printk option related with tp_printk_stop_on_boot Sasha Levin
@ 2022-02-15 15:31 ` Sasha Levin
2022-02-20 10:00 ` Pavel Machek
2022-02-15 15:31 ` [PATCH AUTOSEL 4.19 10/11] net: usb: qmi_wwan: Add support for Dell DW5829e Sasha Levin
2022-02-15 15:31 ` [PATCH AUTOSEL 4.19 11/11] net: macb: Align the dma and coherent dma masks Sasha Levin
9 siblings, 1 reply; 15+ messages in thread
From: Sasha Levin @ 2022-02-15 15:31 UTC (permalink / raw)
To: linux-kernel, stable; +Cc: Chuck Lever, Sasha Levin, linux-nfs
From: Chuck Lever <chuck.lever@oracle.com>
[ Upstream commit 6a4d333d540041d244b2fca29b8417bfde20af81 ]
NFSv3 and NFSv4 use u64 offset values on the wire. Record these values
verbatim without the implicit type case to loff_t.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
fs/nfsd/trace.h | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h
index 80933e4334d84..5b2ef30a8ac06 100644
--- a/fs/nfsd/trace.h
+++ b/fs/nfsd/trace.h
@@ -53,14 +53,14 @@ TRACE_EVENT(nfsd_compound_status,
DECLARE_EVENT_CLASS(nfsd_io_class,
TP_PROTO(struct svc_rqst *rqstp,
struct svc_fh *fhp,
- loff_t offset,
- unsigned long len),
+ u64 offset,
+ u32 len),
TP_ARGS(rqstp, fhp, offset, len),
TP_STRUCT__entry(
__field(u32, xid)
__field(u32, fh_hash)
- __field(loff_t, offset)
- __field(unsigned long, len)
+ __field(u64, offset)
+ __field(u32, len)
),
TP_fast_assign(
__entry->xid = be32_to_cpu(rqstp->rq_xid);
@@ -68,7 +68,7 @@ DECLARE_EVENT_CLASS(nfsd_io_class,
__entry->offset = offset;
__entry->len = len;
),
- TP_printk("xid=0x%08x fh_hash=0x%08x offset=%lld len=%lu",
+ TP_printk("xid=0x%08x fh_hash=0x%08x offset=%llu len=%u",
__entry->xid, __entry->fh_hash,
__entry->offset, __entry->len)
)
@@ -77,8 +77,8 @@ DECLARE_EVENT_CLASS(nfsd_io_class,
DEFINE_EVENT(nfsd_io_class, nfsd_##name, \
TP_PROTO(struct svc_rqst *rqstp, \
struct svc_fh *fhp, \
- loff_t offset, \
- unsigned long len), \
+ u64 offset, \
+ u32 len), \
TP_ARGS(rqstp, fhp, offset, len))
DEFINE_NFSD_IO_EVENT(read_start);
--
2.34.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH AUTOSEL 4.19 09/11] NFSD: Fix offset type in I/O trace points
2022-02-15 15:31 ` [PATCH AUTOSEL 4.19 09/11] NFSD: Fix offset type in I/O trace points Sasha Levin
@ 2022-02-20 10:00 ` Pavel Machek
0 siblings, 0 replies; 15+ messages in thread
From: Pavel Machek @ 2022-02-20 10:00 UTC (permalink / raw)
To: Sasha Levin; +Cc: linux-kernel, stable, Chuck Lever, linux-nfs
[-- Attachment #1: Type: text/plain, Size: 476 bytes --]
Hi!
> [ Upstream commit 6a4d333d540041d244b2fca29b8417bfde20af81 ]
>
> NFSv3 and NFSv4 use u64 offset values on the wire. Record these values
> verbatim without the implicit type case to loff_t.
AFAICT this is already in 4.19.X-stable queue, so it can be dropped
from AUTOSEL.
Best regards,
Pavel
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH AUTOSEL 4.19 10/11] net: usb: qmi_wwan: Add support for Dell DW5829e
2022-02-15 15:30 [PATCH AUTOSEL 4.19 01/11] ARM: OMAP2+: hwmod: Add of_node_put() before break Sasha Levin
` (7 preceding siblings ...)
2022-02-15 15:31 ` [PATCH AUTOSEL 4.19 09/11] NFSD: Fix offset type in I/O trace points Sasha Levin
@ 2022-02-15 15:31 ` Sasha Levin
2022-02-15 15:31 ` [PATCH AUTOSEL 4.19 11/11] net: macb: Align the dma and coherent dma masks Sasha Levin
9 siblings, 0 replies; 15+ messages in thread
From: Sasha Levin @ 2022-02-15 15:31 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Slark Xiao, Bjørn Mork, Jakub Kicinski, Sasha Levin, davem,
netdev, linux-usb
From: Slark Xiao <slark_xiao@163.com>
[ Upstream commit 8ecbb179286cbc91810c16caeb3396e06305cd0c ]
Dell DW5829e same as DW5821e except the CAT level.
DW5821e supports CAT16 but DW5829e supports CAT9.
Also, DW5829e includes normal and eSIM type.
Please see below test evidence:
T: Bus=04 Lev=01 Prnt=01 Port=01 Cnt=01 Dev#= 5 Spd=5000 MxCh= 0
D: Ver= 3.10 Cls=ef(misc ) Sub=02 Prot=01 MxPS= 9 #Cfgs= 1
P: Vendor=413c ProdID=81e6 Rev=03.18
S: Manufacturer=Dell Inc.
S: Product=DW5829e Snapdragon X20 LTE
S: SerialNumber=0123456789ABCDEF
C: #Ifs= 6 Cfg#= 1 Atr=a0 MxPwr=896mA
I: If#=0x0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan
I: If#=0x1 Alt= 0 #EPs= 1 Cls=03(HID ) Sub=00 Prot=00 Driver=usbhid
I: If#=0x2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
I: If#=0x3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
I: If#=0x4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
I: If#=0x5 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option
T: Bus=04 Lev=01 Prnt=01 Port=01 Cnt=01 Dev#= 7 Spd=5000 MxCh= 0
D: Ver= 3.10 Cls=ef(misc ) Sub=02 Prot=01 MxPS= 9 #Cfgs= 1
P: Vendor=413c ProdID=81e4 Rev=03.18
S: Manufacturer=Dell Inc.
S: Product=DW5829e-eSIM Snapdragon X20 LTE
S: SerialNumber=0123456789ABCDEF
C: #Ifs= 6 Cfg#= 1 Atr=a0 MxPwr=896mA
I: If#=0x0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan
I: If#=0x1 Alt= 0 #EPs= 1 Cls=03(HID ) Sub=00 Prot=00 Driver=usbhid
I: If#=0x2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
I: If#=0x3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
I: If#=0x4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
I: If#=0x5 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option
Signed-off-by: Slark Xiao <slark_xiao@163.com>
Acked-by: Bjørn Mork <bjorn@mork.no>
Link: https://lore.kernel.org/r/20220209024717.8564-1-slark_xiao@163.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/net/usb/qmi_wwan.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
index 54b37a30df18b..c2e872f926f1c 100644
--- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@ -1358,6 +1358,8 @@ static const struct usb_device_id products[] = {
{QMI_FIXED_INTF(0x413c, 0x81d7, 0)}, /* Dell Wireless 5821e */
{QMI_FIXED_INTF(0x413c, 0x81d7, 1)}, /* Dell Wireless 5821e preproduction config */
{QMI_FIXED_INTF(0x413c, 0x81e0, 0)}, /* Dell Wireless 5821e with eSIM support*/
+ {QMI_FIXED_INTF(0x413c, 0x81e4, 0)}, /* Dell Wireless 5829e with eSIM support*/
+ {QMI_FIXED_INTF(0x413c, 0x81e6, 0)}, /* Dell Wireless 5829e */
{QMI_FIXED_INTF(0x03f0, 0x4e1d, 8)}, /* HP lt4111 LTE/EV-DO/HSPA+ Gobi 4G Module */
{QMI_FIXED_INTF(0x03f0, 0x9d1d, 1)}, /* HP lt4120 Snapdragon X5 LTE */
{QMI_FIXED_INTF(0x22de, 0x9061, 3)}, /* WeTelecom WPD-600N */
--
2.34.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH AUTOSEL 4.19 11/11] net: macb: Align the dma and coherent dma masks
2022-02-15 15:30 [PATCH AUTOSEL 4.19 01/11] ARM: OMAP2+: hwmod: Add of_node_put() before break Sasha Levin
` (8 preceding siblings ...)
2022-02-15 15:31 ` [PATCH AUTOSEL 4.19 10/11] net: usb: qmi_wwan: Add support for Dell DW5829e Sasha Levin
@ 2022-02-15 15:31 ` Sasha Levin
9 siblings, 0 replies; 15+ messages in thread
From: Sasha Levin @ 2022-02-15 15:31 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Marc St-Amand, Harini Katakam, Nicolas Ferre, Conor Dooley,
David S . Miller, Sasha Levin, claudiu.beznea, kuba, netdev
From: Marc St-Amand <mstamand@ciena.com>
[ Upstream commit 37f7860602b5b2d99fc7465f6407f403f5941988 ]
Single page and coherent memory blocks can use different DMA masks
when the macb accesses physical memory directly. The kernel is clever
enough to allocate pages that fit into the requested address width.
When using the ARM SMMU, the DMA mask must be the same for single
pages and big coherent memory blocks. Otherwise the translation
tables turn into one big mess.
[ 74.959909] macb ff0e0000.ethernet eth0: DMA bus error: HRESP not OK
[ 74.959989] arm-smmu fd800000.smmu: Unhandled context fault: fsr=0x402, iova=0x3165687460, fsynr=0x20001, cbfrsynra=0x877, cb=1
[ 75.173939] macb ff0e0000.ethernet eth0: DMA bus error: HRESP not OK
[ 75.173955] arm-smmu fd800000.smmu: Unhandled context fault: fsr=0x402, iova=0x3165687460, fsynr=0x20001, cbfrsynra=0x877, cb=1
Since using the same DMA mask does not hurt direct 1:1 physical
memory mappings, this commit always aligns DMA and coherent masks.
Signed-off-by: Marc St-Amand <mstamand@ciena.com>
Signed-off-by: Harini Katakam <harini.katakam@xilinx.com>
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Tested-by: Conor Dooley <conor.dooley@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/net/ethernet/cadence/macb_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index d110aa616a957..f162ac7d74e59 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -4073,7 +4073,7 @@ static int macb_probe(struct platform_device *pdev)
#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT
if (GEM_BFEXT(DAW64, gem_readl(bp, DCFG6))) {
- dma_set_mask(&pdev->dev, DMA_BIT_MASK(44));
+ dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(44));
bp->hw_dma_cap |= HW_DMA_CAP_64B;
}
#endif
--
2.34.1
^ permalink raw reply related [flat|nested] 15+ messages in thread