Commit c256f4b9 authored by Anton Blanchard's avatar Anton Blanchard Committed by Paul Mackerras
Browse files

[PATCH] powerpc: remove io_page_mask 



Cleanup patch which removes the io_page_mask.  It fixes the reset on
some e1000 devices which is needed for clean kexec reboots.  The legacy
devices which broke with this patch (parallel port and PC speaker) have
now been fixed in Linus' tree.

Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Acked-by: default avatarMichael Neuling <mikey@neuling.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 81bbbe92

arch/powerpc/kernel/iomap.c

+0 −2
Original line number Diff line number Diff line
@@ -106,8 +106,6 @@ EXPORT_SYMBOL(iowrite32_rep); 


void __iomem *ioport_map(unsigned long port, unsigned int len)

{

	if (!_IO_IS_VALID(port))

		return NULL;

	return (void __iomem *) (port+pci_io_base);

}

arch/powerpc/kernel/pci_64.c

+3 −27
Original line number Diff line number Diff line
@@ -42,14 +42,6 @@ 
unsigned long pci_probe_only = 1;

int pci_assign_all_buses = 0;



/*

 * legal IO pages under MAX_ISA_PORT.  This is to ensure we don't touch

 * devices we don't have access to.

 */

unsigned long io_page_mask;



EXPORT_SYMBOL(io_page_mask);



#ifdef CONFIG_PPC_MULTIPLATFORM

static void fixup_resource(struct resource *res, struct pci_dev *dev);

static void do_bus_setup(struct pci_bus *bus);
@@ -1104,8 +1096,6 @@ void __init pci_setup_phb_io(struct pci_controller *hose, int primary) 
			pci_process_ISA_OF_ranges(isa_dn, hose->io_base_phys,

						hose->io_base_virt);

			of_node_put(isa_dn);

			/* Allow all IO */

			io_page_mask = -1;

		}

	}
@@ -1232,27 +1222,13 @@ static void phbs_remap_io(void) 
static void __devinit fixup_resource(struct resource *res, struct pci_dev *dev)

{

	struct pci_controller *hose = pci_bus_to_host(dev->bus);

	unsigned long start, end, mask, offset;

	unsigned long offset;



	if (res->flags & IORESOURCE_IO) {

		offset = (unsigned long)hose->io_base_virt - pci_io_base;



		start = res->start += offset;

		end = res->end += offset;



		/* Need to allow IO access to pages that are in the

		   ISA range */

		if (start < MAX_ISA_PORT) {

			if (end > MAX_ISA_PORT)

				end = MAX_ISA_PORT;



			start >>= PAGE_SHIFT;

			end >>= PAGE_SHIFT;



			/* get the range of pages for the map */

			mask = ((1 << (end+1)) - 1) ^ ((1 << start) - 1);

			io_page_mask |= mask;

		}

		res->start += offset;

		res->end += offset;

	} else if (res->flags & IORESOURCE_MEM) {

		res->start += hose->pci_mem_offset;

		res->end += hose->pci_mem_offset;

arch/powerpc/platforms/iseries/pci.c

+0 −3
Original line number Diff line number Diff line
@@ -45,8 +45,6 @@ 
#include "call_pci.h"

#include "iommu.h"



extern unsigned long io_page_mask;



/*

 * Forward declares of prototypes.

 */
@@ -277,7 +275,6 @@ void iSeries_pcibios_init(void) 
{

	iomm_table_initialize();

	find_and_init_phbs();

	io_page_mask = -1;

}



/*

arch/powerpc/platforms/maple/pci.c

+0 −3
Original line number Diff line number Diff line
@@ -437,9 +437,6 @@ void __init maple_pci_init(void) 


	/* Tell pci.c to not change any resource allocations.  */

	pci_probe_only = 1;

	

	/* Allow all IO */

	io_page_mask = -1;

}



int maple_pci_get_legacy_ide_irq(struct pci_dev *pdev, int channel)

arch/powerpc/platforms/powermac/pci.c

+0 −3
Original line number Diff line number Diff line
@@ -1068,9 +1068,6 @@ void __init pmac_pci_init(void) 
	/* Tell pci.c to not use the common resource allocation mechanism */

	pci_probe_only = 1;



	/* Allow all IO */

	io_page_mask = -1;



#else /* CONFIG_PPC64 */

	init_p2pbridge();

	fixup_nec_usb2();

CRA Git | Maintained and supported by SUSTech CRA and CCSE