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

Commit 11949255 authored by Gary Hade's avatar Gary Hade Committed by Greg Kroah-Hartman
Browse files

PCI: modify PCI bridge control ISA flag for clarity 



Modify PCI Bridge Control ISA flag for clarity

This patch changes PCI_BRIDGE_CTL_NO_ISA to PCI_BRIDGE_CTL_ISA
and modifies it's clarifying comment and locations where used.
The change reduces the chance of future confusion since it makes
the set/unset meaning of the bit the same in both the bridge
control register and bridge_ctl field of the pci_bus struct.

Signed-off-by: default avatarGary Hade <garyhade@us.ibm.com>
Acked-by: default avatarLinas Vepstas <linas@austin.ibm.com>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 62f420f8

arch/x86/pci/i386.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static int 
skip_isa_ioresource_align(struct pci_dev *dev) {



	if ((pci_probe & PCI_CAN_SKIP_ISA_ALIGN) &&

	    (dev->bus->bridge_ctl & PCI_BRIDGE_CTL_NO_ISA))

	    !(dev->bus->bridge_ctl & PCI_BRIDGE_CTL_ISA))

		return 1;

	return 0;

}

drivers/pci/probe.c

+2 −2
Original line number Diff line number Diff line
@@ -543,7 +543,7 @@ int pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max, int pass 
			goto out;

		child->primary = buses & 0xFF;

		child->subordinate = (buses >> 16) & 0xFF;

		child->bridge_ctl = bctl ^ PCI_BRIDGE_CTL_NO_ISA;

		child->bridge_ctl = bctl;



		cmax = pci_scan_child_bus(child);

		if (cmax > max)
@@ -596,7 +596,7 @@ int pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max, int pass 
		pci_write_config_dword(dev, PCI_PRIMARY_BUS, buses);



		if (!is_cardbus) {

			child->bridge_ctl = bctl ^ PCI_BRIDGE_CTL_NO_ISA;

			child->bridge_ctl = bctl;

			/*

			 * Adjust subordinate busnr in parent buses.

			 * We do this before scanning for children because

include/linux/pci_regs.h

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ 
#define PCI_BRIDGE_CONTROL	0x3e

#define  PCI_BRIDGE_CTL_PARITY	0x01	/* Enable parity detection on secondary interface */

#define  PCI_BRIDGE_CTL_SERR	0x02	/* The same for SERR forwarding */

#define  PCI_BRIDGE_CTL_NO_ISA	0x04	/* Disable bridging of ISA ports */

#define  PCI_BRIDGE_CTL_ISA	0x04	/* Enable ISA mode */

#define  PCI_BRIDGE_CTL_VGA	0x08	/* Forward VGA addresses */

#define  PCI_BRIDGE_CTL_MASTER_ABORT	0x20  /* Report master aborts */

#define  PCI_BRIDGE_CTL_BUS_RESET	0x40	/* Secondary bus reset */