Patch "cxl: use correct operator when writing pcie config space values" has been added to the 4.4-stable tree

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

cxl: use correct operator when writing pcie config space values

to the 4.4-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:
cxl-use-correct-operator-when-writing-pcie-config-space-values.patch
and it can be found in the queue-4.4 subdirectory.

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

From: Andrew Donnellan <[email protected]>
Date: Wed, 4 Nov 2015 13:24:09 +1100
Subject: cxl: use correct operator when writing pcie config space values

From: Andrew Donnellan <[email protected]>

commit 48f0f6b717e314a30be121b67e1d044f6d311d66 upstream.

When writing a value to config space, cxl_pcie_write_config() calls cxl_pcie_config_info() to obtain a mask and shift value, shifts the new value accordingly, then uses the mask to combine the shifted value with the existing value at the address as part of a read-modify-write pattern.

Currently, we use a logical OR operator rather than a bitwise OR operator, which means any use of this function results in an incorrect value being written. Replace the logical OR operator with a bitwise OR operator so the value is written correctly.

---
 drivers/misc/cxl/vphb.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

@@ -203,7 +203,7 @@ static int cxl_pcie_write_config(struct
 	mask <<= shift;
 	val <<= shift;
 
-	v = (in_le32(ioaddr) & ~mask) || (val & mask);
+	v = (in_le32(ioaddr) & ~mask) | (val & mask);
 
 	out_le32(ioaddr, v);
 	return PCIBIOS_SUCCESSFUL;

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

queue-4.4/cxl-use-correct-operator-when-writing-pcie-config-space-values.patch