lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "PCI: Reduce warnings on possible RW1C corruption"

Browse Source 
This reverts commit 10705a4305 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 <gregkh@google.com>
Change-Id: I9007b22dfaf5a30528fb2da8b8e8fb5515a18d3b
This commit is contained in:
Greg Kroah-Hartman 2022-04-19 13:24:05 +02:00
parent 023cd1cf3f
commit ebb848e772
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/pci/access.c
View File

@ -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 * write happen to have any RW1C (write-one-to-clear) bits set, we
* just inadvertently cleared something we shouldn't have. * just inadvertently cleared something we shouldn't have.
*/ */
if (!bus->unsafe_warn) { dev_warn_ratelimited(&bus->dev, "%d-byte config write to %04x:%02x:%02x.%d offset %#x may corrupt adjacent RW1C bits\n",
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,
size, pci_domain_nr(bus), bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn), where);
PCI_SLOT(devfn), PCI_FUNC(devfn), where);
bus->unsafe_warn = 1;
}
mask = ~(((1 << (size * 8)) - 1) << ((where & 0x3) * 8)); mask = ~(((1 << (size * 8)) - 1) << ((where & 0x3) * 8));
tmp = readl(addr) & mask; tmp = readl(addr) & mask;

1
include/linux/pci.h
View File

@ -609,7 +609,6 @@ struct pci_bus {
struct bin_attribute *legacy_io; /* Legacy I/O for this bus */ struct bin_attribute *legacy_io; /* Legacy I/O for this bus */
struct bin_attribute *legacy_mem; /* Legacy mem */ struct bin_attribute *legacy_mem; /* Legacy mem */
unsigned int is_added:1; unsigned int is_added:1;
unsigned int unsafe_warn:1; /* warned about RW1C config write */
ANDROID_KABI_RESERVE(1); ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2); ANDROID_KABI_RESERVE(2);