From 562c3bd65c1ca08a2122c5c54198cc9066bb71b4 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 19 Apr 2022 17:29:41 +0200 Subject: [PATCH] Revert "PCI: Reduce warnings on possible RW1C corruption" This reverts commit 9ec698984db29d86c4e6cb256ca2810c613da2d2. It breaks the abi and is not needed for Android devices so it can be dropped. Bug: 161946584 Signed-off-by: Greg Kroah-Hartman Change-Id: I57dd45b267a7dcab774d92bc79f991502695e491 --- 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 8d0d1f61c650..46935695cfb9 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 1c30f4a68439..9d9c198be7d0 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -648,7 +648,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);