This is a note to let you know that I've just added the patch titled
PCI: pci-bridge-emul: Make expansion ROM Base Address register read-only
to the 5.16-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:
pci-pci-bridge-emul-make-expansion-rom-base-address-register-read-only.patch
and it can be found in the queue-5.16 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 1c1a3b4d3e86b997a313ffb297c1129540882859 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali@xxxxxxxxxx>
Date: Wed, 24 Nov 2021 16:59:39 +0100
Subject: PCI: pci-bridge-emul: Make expansion ROM Base Address register read-only
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Pali Rohár <pali@xxxxxxxxxx>
commit 1c1a3b4d3e86b997a313ffb297c1129540882859 upstream.
If expansion ROM is unsupported (which is the case of pci-bridge-emul.c
driver) then ROM Base Address register must be implemented as read-only
register that return 0 when read, same as for unused Base Address
registers.
Link: https://lore.kernel.org/r/20211124155944.1290-2-pali@xxxxxxxxxx
Fixes: 23a5fba4d941 ("PCI: Introduce PCI bridge emulated config space common logic")
Signed-off-by: Pali Rohár <pali@xxxxxxxxxx>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@xxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/pci/pci-bridge-emul.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
--- a/drivers/pci/pci-bridge-emul.c
+++ b/drivers/pci/pci-bridge-emul.c
@@ -139,8 +139,13 @@ struct pci_bridge_reg_behavior pci_regs_
.ro = GENMASK(7, 0),
},
+ /*
+ * If expansion ROM is unsupported then ROM Base Address register must
+ * be implemented as read-only register that return 0 when read, same
+ * as for unused Base Address registers.
+ */
[PCI_ROM_ADDRESS1 / 4] = {
- .rw = GENMASK(31, 11) | BIT(0),
+ .ro = ~0,
},
/*
Patches currently in stable-queue which might be from pali@xxxxxxxxxx are
queue-5.16/pci-pci-bridge-emul-make-expansion-rom-base-address-register-read-only.patch
queue-5.16/pci-mvebu-fix-support-for-pci_bridge_ctl_bus_reset-o.patch
queue-5.16/pci-pci-bridge-emul-fix-definitions-of-reserved-bits.patch
queue-5.16/pci-mvebu-setup-pcie-controller-to-root-complex-mode.patch
queue-5.16/pci-pci-bridge-emul-correctly-set-pcie-capabilities.patch
queue-5.16/pci-mvebu-fix-support-for-pci_exp_devctl-on-emulated.patch
queue-5.16/pci-mvebu-do-not-modify-pci-io-type-bits-in-conf_wri.patch
queue-5.16/pci-mvebu-check-for-errors-from-pci_bridge_emul_init.patch
queue-5.16/pci-pci-bridge-emul-properly-mark-reserved-pcie-bits-in-pci-config-space.patch
queue-5.16/pci-pci-bridge-emul-set-pci_status_cap_list-for-pcie-device.patch
queue-5.16/pci-aardvark-fix-checking-for-mem-resource-type.patch
queue-5.16/arm-dts-armada-38x-add-generic-compatible-to-uart-no.patch
queue-5.16/pci-mvebu-fix-configuring-secondary-bus-of-pcie-root.patch
queue-5.16/pci-mvebu-fix-support-for-pci_exp_rtsta-on-emulated-.patch
queue-5.16/pci-mvebu-fix-support-for-bus-mastering-and-pci_comm.patch
queue-5.16/pci-mvebu-fix-support-for-devcap2-devctl2-and-lnkctl.patch
