Skip to contentSkip to conversation

Patch "drm/i915: Fix CSR MMIO address check" has been added to the 4.2-stable tree

PATCH [email protected] 1 participant 1 message Sep 16, 2015

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

drm/i915: Fix CSR MMIO address check

to the 4.2-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
drm-i915-fix-csr-mmio-address-check.patch
and it can be found in the queue-4.2 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 982b0b2dd590c00f089fc6fe915bd0cb302a7f5c Mon Sep 17 00:00:00 2001

From: Takashi Iwai <[email protected]>
Date: Wed, 9 Sep 2015 16:52:09 +0200
Subject: drm/i915: Fix CSR MMIO address check
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From: Takashi Iwai <[email protected]>

commit 982b0b2dd590c00f089fc6fe915bd0cb302a7f5c upstream.

Fix a wrong logical AND (&&) used for the range check of CSR MMIO.

Spotted nicely by gcc -Wlogical-op flag:
drivers/gpu/drm/i915/intel_csr.c: In function ‘finish_csr_load’:
drivers/gpu/drm/i915/intel_csr.c:353:41: warning: logical ‘and’ of mutually exclusive tests is always false [-Wlogical-op]

Fixes eb805623d8b1 ('drm/i915/skl: Add support to load SKL CSR firmware.')
---
 drivers/gpu/drm/i915/intel_csr.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_csr.c +1 -1
@@ -350,7 +350,7 @@ static void finish_csr_load(const struct
 	}
 	csr->mmio_count = dmc_header->mmio_count;
 	for (i = 0; i < dmc_header->mmio_count; i++) {
-		if (dmc_header->mmioaddr[i] < CSR_MMIO_START_RANGE &&
+		if (dmc_header->mmioaddr[i] < CSR_MMIO_START_RANGE ||
 			dmc_header->mmioaddr[i] > CSR_MMIO_END_RANGE) {
 			DRM_ERROR(" Firmware has wrong mmio address 0x%x\n",
 						dmc_header->mmioaddr[i]);

Patches currently in stable-queue which might be from [email protected] are

queue-4.2/drm-i915-fix-csr-mmio-address-check.patch