From: Sasha Levin Date: Tue, 16 Jul 2024 14:21:04 +0000 (-0400) Subject: Fixes for 5.15 X-Git-Tag: v4.19.318~18^2~3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b3c42f0695a9d16406c95da07d531c177f266897;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 5.15 Signed-off-by: Sasha Levin --- diff --git a/queue-5.15/i2c-mark-hostnotify-target-address-as-used.patch b/queue-5.15/i2c-mark-hostnotify-target-address-as-used.patch new file mode 100644 index 00000000000..ce4c6fba15f --- /dev/null +++ b/queue-5.15/i2c-mark-hostnotify-target-address-as-used.patch @@ -0,0 +1,39 @@ +From 0d8fce5070e81b63e47f290c6b3e38452ac6b1de Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 10 Jul 2024 10:55:07 +0200 +Subject: i2c: mark HostNotify target address as used + +From: Wolfram Sang + +[ Upstream commit bd9f5348089b65612e5ca976e2ae22f005340331 ] + +I2C core handles the local target for receiving HostNotify alerts. There +is no separate driver bound to that address. That means userspace can +access it if desired, leading to further complications if controllers +are not capable of reading their own local target. Bind the local target +to the dummy driver so it will be marked as "handled by the kernel" if +the HostNotify feature is used. That protects aginst userspace access +and prevents other drivers binding to it. + +Fixes: 2a71593da34d ("i2c: smbus: add core function handling SMBus host-notify") +Signed-off-by: Wolfram Sang +Signed-off-by: Sasha Levin +--- + drivers/i2c/i2c-core-base.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c +index 505eebbc98a09..dccd94ee138e2 100644 +--- a/drivers/i2c/i2c-core-base.c ++++ b/drivers/i2c/i2c-core-base.c +@@ -1041,6 +1041,7 @@ EXPORT_SYMBOL(i2c_find_device_by_fwnode); + + static const struct i2c_device_id dummy_id[] = { + { "dummy", 0 }, ++ { "smbus_host_notify", 0 }, + { }, + }; + +-- +2.43.0 + diff --git a/queue-5.15/i2c-rcar-add-r-car-gen4-support.patch b/queue-5.15/i2c-rcar-add-r-car-gen4-support.patch new file mode 100644 index 00000000000..2e0f5e2e711 --- /dev/null +++ b/queue-5.15/i2c-rcar-add-r-car-gen4-support.patch @@ -0,0 +1,40 @@ +From 7afd39f329219a36f11307c184fc9a2c78ae1abe Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 3 Feb 2022 15:33:17 +0100 +Subject: i2c: rcar: Add R-Car Gen4 support + +From: Geert Uytterhoeven + +[ Upstream commit ea01b71b07993d5c518496692f476a3c6b5d9786 ] + +Add support for the I2C Bus Interface on R-Car Gen4 SoCs (e.g. R-Car +S4-8) by matching on a family-specific compatible value. + +While I2C on R-Car Gen4 does support some extra features (Slave Clock +Stretch Select), for now it is treated the same as I2C on R-Car Gen3. + +Signed-off-by: Geert Uytterhoeven +Reviewed-by: Wolfram Sang +[wsa: removed incorrect "FM+" from commit message] +Signed-off-by: Wolfram Sang +Stable-dep-of: ea5ea84c9d35 ("i2c: rcar: ensure Gen3+ reset does not disturb local targets") +Signed-off-by: Sasha Levin +--- + drivers/i2c/busses/i2c-rcar.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c +index 97900fe0c3bcf..b25a8e7ea2d20 100644 +--- a/drivers/i2c/busses/i2c-rcar.c ++++ b/drivers/i2c/busses/i2c-rcar.c +@@ -1021,6 +1021,7 @@ static const struct of_device_id rcar_i2c_dt_ids[] = { + { .compatible = "renesas,rcar-gen1-i2c", .data = (void *)I2C_RCAR_GEN1 }, + { .compatible = "renesas,rcar-gen2-i2c", .data = (void *)I2C_RCAR_GEN2 }, + { .compatible = "renesas,rcar-gen3-i2c", .data = (void *)I2C_RCAR_GEN3 }, ++ { .compatible = "renesas,rcar-gen4-i2c", .data = (void *)I2C_RCAR_GEN3 }, + {}, + }; + MODULE_DEVICE_TABLE(of, rcar_i2c_dt_ids); +-- +2.43.0 + diff --git a/queue-5.15/i2c-rcar-bring-hardware-to-known-state-when-probing.patch b/queue-5.15/i2c-rcar-bring-hardware-to-known-state-when-probing.patch new file mode 100644 index 00000000000..28555cb5877 --- /dev/null +++ b/queue-5.15/i2c-rcar-bring-hardware-to-known-state-when-probing.patch @@ -0,0 +1,71 @@ +From f906b97e6d24d84d54ac206547db6d15bda3f4ce Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 7 Jul 2024 10:28:46 +0200 +Subject: i2c: rcar: bring hardware to known state when probing + +From: Wolfram Sang + +[ Upstream commit 4e36c0f20cb1c74c7bd7ea31ba432c1c4a989031 ] + +When probing, the hardware is not brought into a known state. This may +be a problem when a hypervisor restarts Linux without resetting the +hardware, leaving an old state running. Make sure the hardware gets +initialized, especially interrupts should be cleared and disabled. + +Reported-by: Dirk Behme +Reported-by: Geert Uytterhoeven +Closes: https://lore.kernel.org/r/20240702045535.2000393-1-dirk.behme@de.bosch.com +Fixes: 6ccbe607132b ("i2c: add Renesas R-Car I2C driver") +Signed-off-by: Wolfram Sang +Signed-off-by: Andi Shyti +Signed-off-by: Sasha Levin +--- + drivers/i2c/busses/i2c-rcar.c | 17 ++++++++++++----- + 1 file changed, 12 insertions(+), 5 deletions(-) + +diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c +index 2c016f0299fce..97900fe0c3bcf 100644 +--- a/drivers/i2c/busses/i2c-rcar.c ++++ b/drivers/i2c/busses/i2c-rcar.c +@@ -221,6 +221,14 @@ static void rcar_i2c_init(struct rcar_i2c_priv *priv) + + } + ++static void rcar_i2c_reset_slave(struct rcar_i2c_priv *priv) ++{ ++ rcar_i2c_write(priv, ICSIER, 0); ++ rcar_i2c_write(priv, ICSSR, 0); ++ rcar_i2c_write(priv, ICSCR, SDBS); ++ rcar_i2c_write(priv, ICSAR, 0); /* Gen2: must be 0 if not using slave */ ++} ++ + static int rcar_i2c_bus_barrier(struct rcar_i2c_priv *priv) + { + int ret; +@@ -959,11 +967,8 @@ static int rcar_unreg_slave(struct i2c_client *slave) + + /* ensure no irq is running before clearing ptr */ + disable_irq(priv->irq); +- rcar_i2c_write(priv, ICSIER, 0); +- rcar_i2c_write(priv, ICSSR, 0); ++ rcar_i2c_reset_slave(priv); + enable_irq(priv->irq); +- rcar_i2c_write(priv, ICSCR, SDBS); +- rcar_i2c_write(priv, ICSAR, 0); /* Gen2: must be 0 if not using slave */ + + priv->slave = NULL; + +@@ -1075,7 +1080,9 @@ static int rcar_i2c_probe(struct platform_device *pdev) + goto out_pm_disable; + } + +- rcar_i2c_write(priv, ICSAR, 0); /* Gen2: must be 0 if not using slave */ ++ /* Bring hardware to known state */ ++ rcar_i2c_init(priv); ++ rcar_i2c_reset_slave(priv); + + if (priv->devtype < I2C_RCAR_GEN3) { + irqflags |= IRQF_NO_THREAD; +-- +2.43.0 + diff --git a/queue-5.15/i2c-rcar-clear-no_rxdma-flag-after-resetting.patch b/queue-5.15/i2c-rcar-clear-no_rxdma-flag-after-resetting.patch new file mode 100644 index 00000000000..53d39495054 --- /dev/null +++ b/queue-5.15/i2c-rcar-clear-no_rxdma-flag-after-resetting.patch @@ -0,0 +1,39 @@ +From 0bf03308440dd56cda1c37ffd23bf9aceebb16ee Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 10 Jul 2024 13:03:00 +0200 +Subject: i2c: rcar: clear NO_RXDMA flag after resetting + +From: Wolfram Sang + +[ Upstream commit fea6b5ebb71a2830b042e42de7ae255017ac3ce8 ] + +We should allow RXDMA only if the reset was really successful, so clear +the flag after the reset call. + +Fixes: 0e864b552b23 ("i2c: rcar: reset controller is mandatory for Gen3+") +Signed-off-by: Wolfram Sang +Signed-off-by: Andi Shyti +Signed-off-by: Sasha Levin +--- + drivers/i2c/busses/i2c-rcar.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c +index e24ced623c9ad..1b5ea222f4c60 100644 +--- a/drivers/i2c/busses/i2c-rcar.c ++++ b/drivers/i2c/busses/i2c-rcar.c +@@ -835,10 +835,10 @@ static int rcar_i2c_master_xfer(struct i2c_adapter *adap, + + /* Gen3+ needs a reset. That also allows RXDMA once */ + if (priv->devtype >= I2C_RCAR_GEN3) { +- priv->flags &= ~ID_P_NO_RXDMA; + ret = rcar_i2c_do_reset(priv); + if (ret) + goto out; ++ priv->flags &= ~ID_P_NO_RXDMA; + } + + rcar_i2c_init(priv); +-- +2.43.0 + diff --git a/queue-5.15/i2c-rcar-ensure-gen3-reset-does-not-disturb-local-ta.patch b/queue-5.15/i2c-rcar-ensure-gen3-reset-does-not-disturb-local-ta.patch new file mode 100644 index 00000000000..b7f671ac0ea --- /dev/null +++ b/queue-5.15/i2c-rcar-ensure-gen3-reset-does-not-disturb-local-ta.patch @@ -0,0 +1,59 @@ +From 9ef788321321c7498d4fa83798f7357abd990ccc Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 11 Jul 2024 10:30:44 +0200 +Subject: i2c: rcar: ensure Gen3+ reset does not disturb local targets + +From: Wolfram Sang + +[ Upstream commit ea5ea84c9d3570dc06e8fc5ee2273eaa584aa3ac ] + +R-Car Gen3+ needs a reset before every controller transfer. That erases +configuration of a potentially in parallel running local target +instance. To avoid this disruption, avoid controller transfers if a +local target is running. Also, disable SMBusHostNotify because it +requires being a controller and local target at the same time. + +Fixes: 3b770017b03a ("i2c: rcar: handle RXDMA HW behaviour on Gen3") +Signed-off-by: Wolfram Sang +Signed-off-by: Andi Shyti +Signed-off-by: Sasha Levin +--- + drivers/i2c/busses/i2c-rcar.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c +index 1efc0230c2cba..e24ced623c9ad 100644 +--- a/drivers/i2c/busses/i2c-rcar.c ++++ b/drivers/i2c/busses/i2c-rcar.c +@@ -803,6 +803,10 @@ static int rcar_i2c_do_reset(struct rcar_i2c_priv *priv) + { + int ret; + ++ /* Don't reset if a slave instance is currently running */ ++ if (priv->slave) ++ return -EISCONN; ++ + ret = reset_control_reset(priv->rstc); + if (ret) + return ret; +@@ -1098,6 +1102,7 @@ static int rcar_i2c_probe(struct platform_device *pdev) + if (of_property_read_bool(dev->of_node, "smbus")) + priv->flags |= ID_P_HOST_NOTIFY; + ++ /* R-Car Gen3+ needs a reset before every transfer */ + if (priv->devtype >= I2C_RCAR_GEN3) { + priv->rstc = devm_reset_control_get_exclusive(&pdev->dev, NULL); + if (IS_ERR(priv->rstc)) +@@ -1106,6 +1111,9 @@ static int rcar_i2c_probe(struct platform_device *pdev) + ret = reset_control_status(priv->rstc); + if (ret < 0) + goto out_pm_put; ++ ++ /* hard reset disturbs HostNotify local target, so disable it */ ++ priv->flags &= ~ID_P_HOST_NOTIFY; + } + + ret = platform_get_irq(pdev, 0); +-- +2.43.0 + diff --git a/queue-5.15/i2c-rcar-introduce-gen4-devices.patch b/queue-5.15/i2c-rcar-introduce-gen4-devices.patch new file mode 100644 index 00000000000..62e441aa6a6 --- /dev/null +++ b/queue-5.15/i2c-rcar-introduce-gen4-devices.patch @@ -0,0 +1,77 @@ +From 1d114a3708b5a804642e63c2d14e030d42d58aea Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 14 Dec 2023 08:43:57 +0100 +Subject: i2c: rcar: introduce Gen4 devices + +From: Wolfram Sang + +[ Upstream commit 2b523c46e81ebd621515ab47117f95de197dfcbf ] + +So far, we treated Gen4 as Gen3. But we are soon adding FM+ as a Gen4 +specific feature, so prepare the code for the new devtype. + +Signed-off-by: Wolfram Sang +Reviewed-by: Geert Uytterhoeven +Reviewed-by: Andi Shyti +Signed-off-by: Wolfram Sang +Stable-dep-of: ea5ea84c9d35 ("i2c: rcar: ensure Gen3+ reset does not disturb local targets") +Signed-off-by: Sasha Levin +--- + drivers/i2c/busses/i2c-rcar.c | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c +index 5fd45a2402bc3..1efc0230c2cba 100644 +--- a/drivers/i2c/busses/i2c-rcar.c ++++ b/drivers/i2c/busses/i2c-rcar.c +@@ -116,6 +116,7 @@ enum rcar_i2c_type { + I2C_RCAR_GEN1, + I2C_RCAR_GEN2, + I2C_RCAR_GEN3, ++ I2C_RCAR_GEN4, + }; + + struct rcar_i2c_priv { +@@ -383,8 +384,8 @@ static void rcar_i2c_dma_unmap(struct rcar_i2c_priv *priv) + dma_unmap_single(chan->device->dev, sg_dma_address(&priv->sg), + sg_dma_len(&priv->sg), priv->dma_direction); + +- /* Gen3 can only do one RXDMA per transfer and we just completed it */ +- if (priv->devtype == I2C_RCAR_GEN3 && ++ /* Gen3+ can only do one RXDMA per transfer and we just completed it */ ++ if (priv->devtype >= I2C_RCAR_GEN3 && + priv->dma_direction == DMA_FROM_DEVICE) + priv->flags |= ID_P_NO_RXDMA; + +@@ -828,8 +829,8 @@ static int rcar_i2c_master_xfer(struct i2c_adapter *adap, + if (ret < 0) + goto out; + +- /* Gen3 needs a reset before allowing RXDMA once */ +- if (priv->devtype == I2C_RCAR_GEN3) { ++ /* Gen3+ needs a reset. That also allows RXDMA once */ ++ if (priv->devtype >= I2C_RCAR_GEN3) { + priv->flags &= ~ID_P_NO_RXDMA; + ret = rcar_i2c_do_reset(priv); + if (ret) +@@ -1019,7 +1020,7 @@ static const struct of_device_id rcar_i2c_dt_ids[] = { + { .compatible = "renesas,rcar-gen1-i2c", .data = (void *)I2C_RCAR_GEN1 }, + { .compatible = "renesas,rcar-gen2-i2c", .data = (void *)I2C_RCAR_GEN2 }, + { .compatible = "renesas,rcar-gen3-i2c", .data = (void *)I2C_RCAR_GEN3 }, +- { .compatible = "renesas,rcar-gen4-i2c", .data = (void *)I2C_RCAR_GEN3 }, ++ { .compatible = "renesas,rcar-gen4-i2c", .data = (void *)I2C_RCAR_GEN4 }, + {}, + }; + MODULE_DEVICE_TABLE(of, rcar_i2c_dt_ids); +@@ -1097,7 +1098,7 @@ static int rcar_i2c_probe(struct platform_device *pdev) + if (of_property_read_bool(dev->of_node, "smbus")) + priv->flags |= ID_P_HOST_NOTIFY; + +- if (priv->devtype == I2C_RCAR_GEN3) { ++ if (priv->devtype >= I2C_RCAR_GEN3) { + priv->rstc = devm_reset_control_get_exclusive(&pdev->dev, NULL); + if (IS_ERR(priv->rstc)) + goto out_pm_put; +-- +2.43.0 + diff --git a/queue-5.15/i2c-rcar-reset-controller-is-mandatory-for-gen3.patch b/queue-5.15/i2c-rcar-reset-controller-is-mandatory-for-gen3.patch new file mode 100644 index 00000000000..89ed44b056e --- /dev/null +++ b/queue-5.15/i2c-rcar-reset-controller-is-mandatory-for-gen3.patch @@ -0,0 +1,81 @@ +From d387d93f597b7d632e173e56bd77cee0bdd05a97 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 21 Sep 2023 14:53:49 +0200 +Subject: i2c: rcar: reset controller is mandatory for Gen3+ + +From: Wolfram Sang + +[ Upstream commit 0e864b552b2302e40b2277629ebac79544a5c433 ] + +Initially, we only needed a reset controller to make sure RXDMA works at +least once per transfer. Meanwhile, documentation has been updated. It +now says that a reset has to be performed prior every transaction, even +if it is non-DMA. So, make the reset controller a requirement instead of +being optional. And bail out if resetting fails. + +Signed-off-by: Wolfram Sang +Reviewed-by: Geert Uytterhoeven +Signed-off-by: Wolfram Sang +Stable-dep-of: ea5ea84c9d35 ("i2c: rcar: ensure Gen3+ reset does not disturb local targets") +Signed-off-by: Sasha Levin +--- + drivers/i2c/busses/i2c-rcar.c | 29 ++++++++++++++--------------- + 1 file changed, 14 insertions(+), 15 deletions(-) + +diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c +index b25a8e7ea2d20..5fd45a2402bc3 100644 +--- a/drivers/i2c/busses/i2c-rcar.c ++++ b/drivers/i2c/busses/i2c-rcar.c +@@ -830,12 +830,10 @@ static int rcar_i2c_master_xfer(struct i2c_adapter *adap, + + /* Gen3 needs a reset before allowing RXDMA once */ + if (priv->devtype == I2C_RCAR_GEN3) { +- priv->flags |= ID_P_NO_RXDMA; +- if (!IS_ERR(priv->rstc)) { +- ret = rcar_i2c_do_reset(priv); +- if (ret == 0) +- priv->flags &= ~ID_P_NO_RXDMA; +- } ++ priv->flags &= ~ID_P_NO_RXDMA; ++ ret = rcar_i2c_do_reset(priv); ++ if (ret) ++ goto out; + } + + rcar_i2c_init(priv); +@@ -1090,15 +1088,6 @@ static int rcar_i2c_probe(struct platform_device *pdev) + irqhandler = rcar_i2c_gen2_irq; + } + +- if (priv->devtype == I2C_RCAR_GEN3) { +- priv->rstc = devm_reset_control_get_exclusive(&pdev->dev, NULL); +- if (!IS_ERR(priv->rstc)) { +- ret = reset_control_status(priv->rstc); +- if (ret < 0) +- priv->rstc = ERR_PTR(-ENOTSUPP); +- } +- } +- + /* Stay always active when multi-master to keep arbitration working */ + if (of_property_read_bool(dev->of_node, "multi-master")) + priv->flags |= ID_P_PM_BLOCKED; +@@ -1108,6 +1097,16 @@ static int rcar_i2c_probe(struct platform_device *pdev) + if (of_property_read_bool(dev->of_node, "smbus")) + priv->flags |= ID_P_HOST_NOTIFY; + ++ if (priv->devtype == I2C_RCAR_GEN3) { ++ priv->rstc = devm_reset_control_get_exclusive(&pdev->dev, NULL); ++ if (IS_ERR(priv->rstc)) ++ goto out_pm_put; ++ ++ ret = reset_control_status(priv->rstc); ++ if (ret < 0) ++ goto out_pm_put; ++ } ++ + ret = platform_get_irq(pdev, 0); + if (ret < 0) + goto out_pm_put; +-- +2.43.0 + diff --git a/queue-5.15/i2c-testunit-avoid-re-issued-work-after-read-message.patch b/queue-5.15/i2c-testunit-avoid-re-issued-work-after-read-message.patch new file mode 100644 index 00000000000..421a6a85ca4 --- /dev/null +++ b/queue-5.15/i2c-testunit-avoid-re-issued-work-after-read-message.patch @@ -0,0 +1,44 @@ +From 12c3a2c591d5a3e700c6e1dd60c6c99e0e093387 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 11 Jul 2024 14:08:19 +0200 +Subject: i2c: testunit: avoid re-issued work after read message + +From: Wolfram Sang + +[ Upstream commit 119736c7af442ab398dbb806865988c98ef60d46 ] + +The to-be-fixed commit rightfully prevented that the registers will be +cleared. However, the index must be cleared. Otherwise a read message +will re-issue the last work. Fix it and add a comment describing the +situation. + +Fixes: c422b6a63024 ("i2c: testunit: don't erase registers after STOP") +Signed-off-by: Wolfram Sang +Reviewed-by: Andi Shyti +Signed-off-by: Wolfram Sang +Signed-off-by: Sasha Levin +--- + drivers/i2c/i2c-slave-testunit.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/drivers/i2c/i2c-slave-testunit.c b/drivers/i2c/i2c-slave-testunit.c +index cd0d87b089fec..bdb7d71dadbc4 100644 +--- a/drivers/i2c/i2c-slave-testunit.c ++++ b/drivers/i2c/i2c-slave-testunit.c +@@ -118,6 +118,13 @@ static int i2c_slave_testunit_slave_cb(struct i2c_client *client, + queue_delayed_work(system_long_wq, &tu->worker, + msecs_to_jiffies(10 * tu->regs[TU_REG_DELAY])); + } ++ ++ /* ++ * Reset reg_idx to avoid that work gets queued again in case of ++ * STOP after a following read message. But do not clear TU regs ++ * here because we still need them in the workqueue! ++ */ ++ tu->reg_idx = 0; + break; + + case I2C_SLAVE_WRITE_REQUESTED: +-- +2.43.0 + diff --git a/queue-5.15/kbuild-make-ld-version.sh-more-robust-against-versio.patch b/queue-5.15/kbuild-make-ld-version.sh-more-robust-against-versio.patch new file mode 100644 index 00000000000..d162177906a --- /dev/null +++ b/queue-5.15/kbuild-make-ld-version.sh-more-robust-against-versio.patch @@ -0,0 +1,73 @@ +From a519c638ed8c3bc561ac08d9cd6d6afa60d7652f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 7 Jul 2024 22:06:47 -0700 +Subject: kbuild: Make ld-version.sh more robust against version string changes + +From: Nathan Chancellor + +[ Upstream commit 9852f47ac7c993990317570ff125e30ad901e213 ] + +After [1] in upstream LLVM, ld.lld's version output became slightly +different when the cmake configuration option LLVM_APPEND_VC_REV is +disabled. + +Before: + + Debian LLD 19.0.0 (compatible with GNU linkers) + +After: + + Debian LLD 19.0.0, compatible with GNU linkers + +This results in ld-version.sh failing with + + scripts/ld-version.sh: 18: arithmetic expression: expecting EOF: "10000 * 19 + 100 * 0 + 0," + +because the trailing comma is included in the patch level part of the +expression. While [1] has been partially reverted in [2] to avoid this +breakage (as it impacts the configuration stage and it is present in all +LTS branches), it would be good to make ld-version.sh more robust +against such miniscule changes like this one. + +Use POSIX shell parameter expansion [3] to remove the largest suffix +after just numbers and periods, replacing of the current removal of +everything after a hyphen. ld-version.sh continues to work for a number +of distributions (Arch Linux, Debian, and Fedora) and the kernel.org +toolchains and no longer errors on a version of ld.lld with [1]. + +Fixes: 02aff8592204 ("kbuild: check the minimum linker version in Kconfig") +Link: https://github.com/llvm/llvm-project/commit/0f9fbbb63cfcd2069441aa2ebef622c9716f8dbb [1] +Link: https://github.com/llvm/llvm-project/commit/649cdfc4b6781a350dfc87d9b2a4b5a4c3395909 [2] +Link: https://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html [3] +Suggested-by: Fangrui Song +Reviewed-by: Fangrui Song +Signed-off-by: Nathan Chancellor +Reviewed-by: Nicolas Schier +Signed-off-by: Masahiro Yamada +Signed-off-by: Sasha Levin +--- + scripts/ld-version.sh | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/scripts/ld-version.sh b/scripts/ld-version.sh +index a78b804b680cf..b9513d224476f 100755 +--- a/scripts/ld-version.sh ++++ b/scripts/ld-version.sh +@@ -57,9 +57,11 @@ else + fi + fi + +-# Some distributions append a package release number, as in 2.34-4.fc32 +-# Trim the hyphen and any characters that follow. +-version=${version%-*} ++# There may be something after the version, such as a distribution's package ++# release number (like Fedora's "2.34-4.fc32") or punctuation (like LLD briefly ++# added before the "compatible with GNU linkers" string), so remove everything ++# after just numbers and periods. ++version=${version%%[!0-9.]*} + + cversion=$(get_canonical_version $version) + min_cversion=$(get_canonical_version $min_version) +-- +2.43.0 + diff --git a/queue-5.15/series b/queue-5.15/series index a31cf4632ac..33bd12dbe1f 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -130,3 +130,14 @@ ipv6-annotate-data-races-around-cnf.disable_ipv6.patch ipv6-prevent-null-dereference-in-ip6_output.patch bpf-allow-reads-from-uninit-stack.patch nilfs2-fix-kernel-bug-on-rename-operation-of-broken-directory.patch +i2c-rcar-bring-hardware-to-known-state-when-probing.patch +i2c-mark-hostnotify-target-address-as-used.patch +i2c-rcar-add-r-car-gen4-support.patch +i2c-rcar-reset-controller-is-mandatory-for-gen3.patch +i2c-rcar-introduce-gen4-devices.patch +i2c-rcar-ensure-gen3-reset-does-not-disturb-local-ta.patch +i2c-testunit-avoid-re-issued-work-after-read-message.patch +i2c-rcar-clear-no_rxdma-flag-after-resetting.patch +x86-entry-64-remove-obsolete-comment-on-tracing-vs.-.patch +x86-bhi-avoid-warning-in-db-handler-due-to-bhi-mitig.patch +kbuild-make-ld-version.sh-more-robust-against-versio.patch diff --git a/queue-5.15/x86-bhi-avoid-warning-in-db-handler-due-to-bhi-mitig.patch b/queue-5.15/x86-bhi-avoid-warning-in-db-handler-due-to-bhi-mitig.patch new file mode 100644 index 00000000000..f2b05d932a1 --- /dev/null +++ b/queue-5.15/x86-bhi-avoid-warning-in-db-handler-due-to-bhi-mitig.patch @@ -0,0 +1,106 @@ +From 455558194c2028e50074a09330d3de17880f39f4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 24 May 2024 09:04:59 +0200 +Subject: x86/bhi: Avoid warning in #DB handler due to BHI mitigation + +From: Alexandre Chartre + +[ Upstream commit ac8b270b61d48fcc61f052097777e3b5e11591e0 ] + +When BHI mitigation is enabled, if SYSENTER is invoked with the TF flag set +then entry_SYSENTER_compat() uses CLEAR_BRANCH_HISTORY and calls the +clear_bhb_loop() before the TF flag is cleared. This causes the #DB handler +(exc_debug_kernel()) to issue a warning because single-step is used outside the +entry_SYSENTER_compat() function. + +To address this issue, entry_SYSENTER_compat() should use CLEAR_BRANCH_HISTORY +after making sure the TF flag is cleared. + +The problem can be reproduced with the following sequence: + + $ cat sysenter_step.c + int main() + { asm("pushf; pop %ax; bts $8,%ax; push %ax; popf; sysenter"); } + + $ gcc -o sysenter_step sysenter_step.c + + $ ./sysenter_step + Segmentation fault (core dumped) + +The program is expected to crash, and the #DB handler will issue a warning. + +Kernel log: + + WARNING: CPU: 27 PID: 7000 at arch/x86/kernel/traps.c:1009 exc_debug_kernel+0xd2/0x160 + ... + RIP: 0010:exc_debug_kernel+0xd2/0x160 + ... + Call Trace: + <#DB> + ? show_regs+0x68/0x80 + ? __warn+0x8c/0x140 + ? exc_debug_kernel+0xd2/0x160 + ? report_bug+0x175/0x1a0 + ? handle_bug+0x44/0x90 + ? exc_invalid_op+0x1c/0x70 + ? asm_exc_invalid_op+0x1f/0x30 + ? exc_debug_kernel+0xd2/0x160 + exc_debug+0x43/0x50 + asm_exc_debug+0x1e/0x40 + RIP: 0010:clear_bhb_loop+0x0/0xb0 + ... + + + ? entry_SYSENTER_compat_after_hwframe+0x6e/0x8d + + + [ bp: Massage commit message. ] + +Fixes: 7390db8aea0d ("x86/bhi: Add support for clearing branch history at syscall entry") +Reported-by: Suman Maity +Signed-off-by: Alexandre Chartre +Signed-off-by: Borislav Petkov (AMD) +Reviewed-by: Andrew Cooper +Reviewed-by: Pawan Gupta +Reviewed-by: Josh Poimboeuf +Link: https://lore.kernel.org/r/20240524070459.3674025-1-alexandre.chartre@oracle.com +Signed-off-by: Sasha Levin +--- + arch/x86/entry/entry_64_compat.S | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +diff --git a/arch/x86/entry/entry_64_compat.S b/arch/x86/entry/entry_64_compat.S +index d03f0cfbcb1e8..4f67e01febc4f 100644 +--- a/arch/x86/entry/entry_64_compat.S ++++ b/arch/x86/entry/entry_64_compat.S +@@ -114,10 +114,6 @@ SYM_INNER_LABEL(entry_SYSENTER_compat_after_hwframe, SYM_L_GLOBAL) + + cld + +- IBRS_ENTER +- UNTRAIN_RET +- CLEAR_BRANCH_HISTORY +- + /* + * SYSENTER doesn't filter flags, so we need to clear NT and AC + * ourselves. To save a few cycles, we can check whether +@@ -141,6 +137,16 @@ SYM_INNER_LABEL(entry_SYSENTER_compat_after_hwframe, SYM_L_GLOBAL) + jnz .Lsysenter_fix_flags + .Lsysenter_flags_fixed: + ++ /* ++ * CPU bugs mitigations mechanisms can call other functions. They ++ * should be invoked after making sure TF is cleared because ++ * single-step is ignored only for instructions inside the ++ * entry_SYSENTER_compat function. ++ */ ++ IBRS_ENTER ++ UNTRAIN_RET ++ CLEAR_BRANCH_HISTORY ++ + movq %rsp, %rdi + call do_SYSENTER_32 + /* XEN PV guests always use IRET path */ +-- +2.43.0 + diff --git a/queue-5.15/x86-entry-64-remove-obsolete-comment-on-tracing-vs.-.patch b/queue-5.15/x86-entry-64-remove-obsolete-comment-on-tracing-vs.-.patch new file mode 100644 index 00000000000..d84105bbf75 --- /dev/null +++ b/queue-5.15/x86-entry-64-remove-obsolete-comment-on-tracing-vs.-.patch @@ -0,0 +1,65 @@ +From c7b2984127a226ee68d8bad2c7a8e07bf2af368c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 21 Jul 2023 12:10:12 -0400 +Subject: x86/entry/64: Remove obsolete comment on tracing vs. SYSRET + +From: Brian Gerst + +[ Upstream commit eb43c9b1517b48e2ff0d3a584aca197338987d7b ] + +This comment comes from a time when the kernel attempted to use SYSRET +on all returns to userspace, including interrupts and exceptions. Ever +since commit fffbb5dc ("Move opportunistic sysret code to syscall code +path"), SYSRET is only used for returning from system calls. The +specific tracing issue listed in this comment is not possible anymore. + +Signed-off-by: Brian Gerst +Signed-off-by: Ingo Molnar +Cc: Andy Lutomirski +Cc: Brian Gerst +Cc: Denys Vlasenko +Cc: H. Peter Anvin +Cc: Linus Torvalds +Cc: Peter Zijlstra +Cc: Thomas Gleixner +Cc: Josh Poimboeuf +Link: https://lore.kernel.org/r/20230721161018.50214-2-brgerst@gmail.com +Stable-dep-of: ac8b270b61d4 ("x86/bhi: Avoid warning in #DB handler due to BHI mitigation") +Signed-off-by: Sasha Levin +--- + arch/x86/entry/entry_64.S | 19 +++---------------- + 1 file changed, 3 insertions(+), 16 deletions(-) + +diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S +index 10d6888713d8b..f656c6e0e4588 100644 +--- a/arch/x86/entry/entry_64.S ++++ b/arch/x86/entry/entry_64.S +@@ -165,22 +165,9 @@ SYM_INNER_LABEL(entry_SYSCALL_64_after_hwframe, SYM_L_GLOBAL) + jne swapgs_restore_regs_and_return_to_usermode + + /* +- * SYSCALL clears RF when it saves RFLAGS in R11 and SYSRET cannot +- * restore RF properly. If the slowpath sets it for whatever reason, we +- * need to restore it correctly. +- * +- * SYSRET can restore TF, but unlike IRET, restoring TF results in a +- * trap from userspace immediately after SYSRET. This would cause an +- * infinite loop whenever #DB happens with register state that satisfies +- * the opportunistic SYSRET conditions. For example, single-stepping +- * this user code: +- * +- * movq $stuck_here, %rcx +- * pushfq +- * popq %r11 +- * stuck_here: +- * +- * would never get past 'stuck_here'. ++ * SYSRET cannot restore RF. It can restore TF, but unlike IRET, ++ * restoring TF results in a trap from userspace immediately after ++ * SYSRET. + */ + testq $(X86_EFLAGS_RF|X86_EFLAGS_TF), %r11 + jnz swapgs_restore_regs_and_return_to_usermode +-- +2.43.0 +