mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 17:18:59 +00:00
1343acc8cd
Deleted (upstreamed): bcm27xx/patches-5.10/950-0669-drm-vc4-hdmi-Make-sure-the-device-is-powered-with-CE.patch [1] bcm27xx/patches-5.10/950-0672-drm-vc4-hdmi-Move-initial-register-read-after-pm_run.patch [1] gemini/patches-5.10/0003-ARM-dts-gemini-NAS4220-B-fis-index-block-with-128-Ki.patch [2] Manually rebased: bcm27xx/patches-5.10/950-0675-drm-vc4-hdmi-Drop-devm-interrupt-handler-for-CEC-int.patch Manually reverted: generic/pending-5.10/860-Revert-ASoC-mediatek-Check-for-error-clk-pointer.patch [3] [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.94&id=55b10b88ac8654fc2f31518aa349a2e643b37f18 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.94&id=958a8819d41420d7a74ed922a09cacc0ba3a4218 [3] https://lore.kernel.org/all/trinity-2a727d96-0335-4d03-8f30-e22a0e10112d-1643363480085@3c-app-gmx-bap33/ Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> Signed-off-by: Daniel Golle <daniel@makrotopia.org>
45 lines
1.7 KiB
Diff
45 lines
1.7 KiB
Diff
From 9319230ac147067652b58fe849ffe0ceec098665 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali@kernel.org>
|
|
Date: Tue, 30 Nov 2021 18:29:03 +0100
|
|
Subject: [PATCH] PCI: pci-bridge-emul: Add description for class_revision
|
|
field
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
The current assignment to the class_revision member
|
|
|
|
class_revision |= cpu_to_le32(PCI_CLASS_BRIDGE_PCI << 16);
|
|
|
|
can make the reader think that class is at high 16 bits of the member and
|
|
revision at low 16 bits.
|
|
|
|
In reality, class is at high 24 bits, but the class for PCI Bridge Normal
|
|
Decode is PCI_CLASS_BRIDGE_PCI << 8.
|
|
|
|
Change the assignment and add a comment to make this clearer.
|
|
|
|
Link: https://lore.kernel.org/r/20211130172913.9727-2-kabel@kernel.org
|
|
Signed-off-by: Pali Rohár <pali@kernel.org>
|
|
Signed-off-by: Marek Behún <kabel@kernel.org>
|
|
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
|
|
---
|
|
drivers/pci/pci-bridge-emul.c | 6 +++++-
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/pci/pci-bridge-emul.c
|
|
+++ b/drivers/pci/pci-bridge-emul.c
|
|
@@ -284,7 +284,11 @@ int pci_bridge_emul_init(struct pci_brid
|
|
{
|
|
BUILD_BUG_ON(sizeof(bridge->conf) != PCI_BRIDGE_CONF_END);
|
|
|
|
- bridge->conf.class_revision |= cpu_to_le32(PCI_CLASS_BRIDGE_PCI << 16);
|
|
+ /*
|
|
+ * class_revision: Class is high 24 bits and revision is low 8 bit of this member,
|
|
+ * while class for PCI Bridge Normal Decode has the 24-bit value: PCI_CLASS_BRIDGE_PCI << 8
|
|
+ */
|
|
+ bridge->conf.class_revision |= cpu_to_le32((PCI_CLASS_BRIDGE_PCI << 8) << 8);
|
|
bridge->conf.header_type = PCI_HEADER_TYPE_BRIDGE;
|
|
bridge->conf.cache_line_size = 0x10;
|
|
bridge->conf.status = cpu_to_le16(PCI_STATUS_CAP_LIST);
|