From ebb848e7724dd2183ff18cb15923fa890fe45a2c Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 19 Apr 2022 13:24:05 +0200 Subject: [PATCH] Revert "PCI: Reduce warnings on possible RW1C corruption" This reverts commit 10705a4305579518da06662c045a90a4bcdd15f7 which is commit 92c45b63ce22c8898aa41806e8d6692bcd577510 upstream. It breaks the kernel api and it's not anything that is needed for Android devices. Bug: 161946584 Signed-off-by: Greg Kroah-Hartman Change-Id: I9007b22dfaf5a30528fb2da8b8e8fb5515a18d3b --- drivers/pci/access.c | 9 +++------ include/linux/pci.h | 1 - 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/pci/access.c b/drivers/pci/access.c index c909c66a63e2..0914ddeae17f 100644 --- a/drivers/pci/access.c +++ b/drivers/pci/access.c @@ -160,12 +160,9 @@ int pci_generic_config_write32(struct pci_bus *bus, unsigned int devfn, * write happen to have any RW1C (write-one-to-clear) bits set, we * just inadvertently cleared something we shouldn't have. */ - if (!bus->unsafe_warn) { - dev_warn(&bus->dev, "%d-byte config write to %04x:%02x:%02x.%d offset %#x may corrupt adjacent RW1C bits\n", - size, pci_domain_nr(bus), bus->number, - PCI_SLOT(devfn), PCI_FUNC(devfn), where); - bus->unsafe_warn = 1; - } + dev_warn_ratelimited(&bus->dev, "%d-byte config write to %04x:%02x:%02x.%d offset %#x may corrupt adjacent RW1C bits\n", + size, pci_domain_nr(bus), bus->number, + PCI_SLOT(devfn), PCI_FUNC(devfn), where); mask = ~(((1 << (size * 8)) - 1) << ((where & 0x3) * 8)); tmp = readl(addr) & mask; diff --git a/include/linux/pci.h b/include/linux/pci.h index 92c417864cc5..989e3bdda5b6 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -609,7 +609,6 @@ struct pci_bus { struct bin_attribute *legacy_io; /* Legacy I/O for this bus */ struct bin_attribute *legacy_mem; /* Legacy mem */ unsigned int is_added:1; - unsigned int unsafe_warn:1; /* warned about RW1C config write */ ANDROID_KABI_RESERVE(1); ANDROID_KABI_RESERVE(2);