From: Sasha Levin Date: Sun, 6 Jun 2021 22:38:37 +0000 (-0400) Subject: Drop i2c-qcom-geni-add-shutdown-callback-for-i2c.patch from 4.19 X-Git-Tag: v4.4.272~83 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5d2559e62e06a40b94af4f397a984a1d962878f0;p=thirdparty%2Fkernel%2Fstable-queue.git Drop i2c-qcom-geni-add-shutdown-callback-for-i2c.patch from 4.19 Signed-off-by: Sasha Levin --- diff --git a/queue-4.19/i2c-qcom-geni-add-shutdown-callback-for-i2c.patch b/queue-4.19/i2c-qcom-geni-add-shutdown-callback-for-i2c.patch deleted file mode 100644 index cd1262cde8c..00000000000 --- a/queue-4.19/i2c-qcom-geni-add-shutdown-callback-for-i2c.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 778d2dbcd1ba25c871b61834f428edc522520cd7 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 25 May 2021 18:40:50 +0530 -Subject: i2c: qcom-geni: Add shutdown callback for i2c - -From: Roja Rani Yarubandi - -[ Upstream commit 9f78c607600ce4f2a952560de26534715236f612 ] - -If the hardware is still accessing memory after SMMU translation -is disabled (as part of smmu shutdown callback), then the -IOVAs (I/O virtual address) which it was using will go on the bus -as the physical addresses which will result in unknown crashes -like NoC/interconnect errors. - -So, implement shutdown callback for i2c driver to suspend the bus -during system "reboot" or "shutdown". - -Fixes: 37692de5d523 ("i2c: i2c-qcom-geni: Add bus driver for the Qualcomm GENI I2C controller") -Signed-off-by: Roja Rani Yarubandi -Reviewed-by: Stephen Boyd -Signed-off-by: Wolfram Sang -Signed-off-by: Sasha Levin ---- - drivers/i2c/busses/i2c-qcom-geni.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/drivers/i2c/busses/i2c-qcom-geni.c b/drivers/i2c/busses/i2c-qcom-geni.c -index d7329177b0ea..12f4dd273755 100644 ---- a/drivers/i2c/busses/i2c-qcom-geni.c -+++ b/drivers/i2c/busses/i2c-qcom-geni.c -@@ -615,6 +615,14 @@ static int geni_i2c_remove(struct platform_device *pdev) - return 0; - } - -+static void geni_i2c_shutdown(struct platform_device *pdev) -+{ -+ struct geni_i2c_dev *gi2c = platform_get_drvdata(pdev); -+ -+ /* Make client i2c transfers start failing */ -+ i2c_mark_adapter_suspended(&gi2c->adap); -+} -+ - static int __maybe_unused geni_i2c_runtime_suspend(struct device *dev) - { - int ret; -@@ -675,6 +683,7 @@ MODULE_DEVICE_TABLE(of, geni_i2c_dt_match); - static struct platform_driver geni_i2c_driver = { - .probe = geni_i2c_probe, - .remove = geni_i2c_remove, -+ .shutdown = geni_i2c_shutdown, - .driver = { - .name = "geni_i2c", - .pm = &geni_i2c_pm_ops, --- -2.30.2 - diff --git a/queue-4.19/series b/queue-4.19/series index b427c90cd41..9f75887dd1e 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -15,4 +15,3 @@ netfilter-nfnetlink_cthelper-hit-ebusy-on-updates-if.patch ieee802154-fix-error-return-code-in-ieee802154_add_i.patch ieee802154-fix-error-return-code-in-ieee802154_llsec.patch ixgbevf-add-correct-exception-tracing-for-xdp.patch -i2c-qcom-geni-add-shutdown-callback-for-i2c.patch