From: Greg Kroah-Hartman Date: Mon, 20 Mar 2023 13:36:32 +0000 (+0100) Subject: 4.19-stable patches X-Git-Tag: v4.14.311~18 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f70a9a2f3f43976c4a7cba54e6ac50f496103367;p=thirdparty%2Fkernel%2Fstable-queue.git 4.19-stable patches added patches: drm-i915-don-t-use-stolen-memory-for-ring-buffers-with-llc.patch serial-8250_em-fix-uart-port-type.patch --- diff --git a/queue-4.19/drm-i915-don-t-use-stolen-memory-for-ring-buffers-with-llc.patch b/queue-4.19/drm-i915-don-t-use-stolen-memory-for-ring-buffers-with-llc.patch new file mode 100644 index 00000000000..aab97951af3 --- /dev/null +++ b/queue-4.19/drm-i915-don-t-use-stolen-memory-for-ring-buffers-with-llc.patch @@ -0,0 +1,53 @@ +From 690e0ec8e63da9a29b39fedc6ed5da09c7c82651 Mon Sep 17 00:00:00 2001 +From: John Harrison +Date: Wed, 15 Feb 2023 17:11:00 -0800 +Subject: drm/i915: Don't use stolen memory for ring buffers with LLC +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: John Harrison + +commit 690e0ec8e63da9a29b39fedc6ed5da09c7c82651 upstream. + +Direction from hardware is that stolen memory should never be used for +ring buffer allocations on platforms with LLC. There are too many +caching pitfalls due to the way stolen memory accesses are routed. So +it is safest to just not use it. + +Signed-off-by: John Harrison +Fixes: c58b735fc762 ("drm/i915: Allocate rings from stolen") +Cc: Chris Wilson +Cc: Joonas Lahtinen +Cc: Jani Nikula +Cc: Rodrigo Vivi +Cc: Tvrtko Ursulin +Cc: intel-gfx@lists.freedesktop.org +Cc: # v4.9+ +Tested-by: Jouni Högander +Reviewed-by: Daniele Ceraolo Spurio +Link: https://patchwork.freedesktop.org/patch/msgid/20230216011101.1909009-2-John.C.Harrison@Intel.com +(cherry picked from commit f54c1f6c697c4297f7ed94283c184acc338a5cf8) +Signed-off-by: Jani Nikula +Signed-off-by: John Harrison +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/i915/intel_ringbuffer.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +--- a/drivers/gpu/drm/i915/intel_ringbuffer.c ++++ b/drivers/gpu/drm/i915/intel_ringbuffer.c +@@ -1132,10 +1132,11 @@ static struct i915_vma * + intel_ring_create_vma(struct drm_i915_private *dev_priv, int size) + { + struct i915_address_space *vm = &dev_priv->ggtt.vm; +- struct drm_i915_gem_object *obj; ++ struct drm_i915_gem_object *obj = NULL; + struct i915_vma *vma; + +- obj = i915_gem_object_create_stolen(dev_priv, size); ++ if (!HAS_LLC(dev_priv)) ++ obj = i915_gem_object_create_stolen(dev_priv, size); + if (!obj) + obj = i915_gem_object_create_internal(dev_priv, size); + if (IS_ERR(obj)) diff --git a/queue-4.19/serial-8250_em-fix-uart-port-type.patch b/queue-4.19/serial-8250_em-fix-uart-port-type.patch new file mode 100644 index 00000000000..1749b4f5887 --- /dev/null +++ b/queue-4.19/serial-8250_em-fix-uart-port-type.patch @@ -0,0 +1,38 @@ +From 32e293be736b853f168cd065d9cbc1b0c69f545d Mon Sep 17 00:00:00 2001 +From: Biju Das +Date: Mon, 27 Feb 2023 11:41:46 +0000 +Subject: serial: 8250_em: Fix UART port type + +From: Biju Das + +commit 32e293be736b853f168cd065d9cbc1b0c69f545d upstream. + +As per HW manual for EMEV2 "R19UH0040EJ0400 Rev.4.00", the UART +IP found on EMMA mobile SoC is Register-compatible with the +general-purpose 16750 UART chip. Fix UART port type as 16750 and +enable 64-bytes fifo support. + +Fixes: 22886ee96895 ("serial8250-em: Emma Mobile UART driver V2") +Cc: stable@vger.kernel.org +Signed-off-by: Biju Das +Link: https://lore.kernel.org/r/20230227114152.22265-2-biju.das.jz@bp.renesas.com +[biju: manually fixed the conflicts] +Signed-off-by: Biju Das +Signed-off-by: Greg Kroah-Hartman +--- + drivers/tty/serial/8250/8250_em.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/tty/serial/8250/8250_em.c ++++ b/drivers/tty/serial/8250/8250_em.c +@@ -102,8 +102,8 @@ static int serial8250_em_probe(struct pl + memset(&up, 0, sizeof(up)); + up.port.mapbase = regs->start; + up.port.irq = irq->start; +- up.port.type = PORT_UNKNOWN; +- up.port.flags = UPF_BOOT_AUTOCONF | UPF_FIXED_PORT | UPF_IOREMAP; ++ up.port.type = PORT_16750; ++ up.port.flags = UPF_FIXED_PORT | UPF_IOREMAP | UPF_FIXED_TYPE; + up.port.dev = &pdev->dev; + up.port.private_data = priv; + diff --git a/queue-4.19/series b/queue-4.19/series index c0c5d322674..ff8d30a4033 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -30,3 +30,5 @@ tracing-make-tracepoint-lockdep-check-actually-test-something.patch ftrace-fix-invalid-address-access-in-lookup_rec-when-index-is-0.patch fbdev-stifb-provide-valid-pixelclock-and-add-fb_check_var-checks.patch x86-mm-fix-use-of-uninitialized-buffer-in-sme_enable.patch +drm-i915-don-t-use-stolen-memory-for-ring-buffers-with-llc.patch +serial-8250_em-fix-uart-port-type.patch