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

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

Revert "PCI: Reduce warnings on possible RW1C corruption" 



This reverts commit b0970057.  It breaks
the abi and is not needed by Android devices.

Bug: 161946584
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ie9720e66f0fe39bd640479fc7838cb926883d64e
parent ce7025b7

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
@@ -585,7 +585,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);