Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebb848e7 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "PCI: Reduce warnings on possible RW1C corruption" 



This reverts commit 10705a43 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: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I9007b22dfaf5a30528fb2da8b8e8fb5515a18d3b
parent 023cd1cf

drivers/pci/access.c

+3 −6
Original line number Diff line number Diff line
@@ -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",

	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);

		bus->unsafe_warn = 1;

	}



	mask = ~(((1 << (size * 8)) - 1) << ((where & 0x3) * 8));

	tmp = readl(addr) & mask;

include/linux/pci.h

+0 −1
Original line number Diff line number Diff line
@@ -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);