f90bb153b1
This patch reworks the way IRQs are fixed up on PCI for arch powerpc. It makes pci_read_irq_line() called by default in the PCI code for devices that are probed, and add an optional per-device fixup in ppc_md for platforms that really need to correct what they obtain from pci_read_irq_line(). It also removes ppc_md.irq_bus_setup which was only used by pSeries and should not be needed anymore. I've also removed the pSeries s7a workaround as it can't work with the current interrupt code anyway. I'm trying to get one of these machines working so I can test a proper fix for that problem. I also haven't updated the old-style fixup code from 85xx_cds.c because it's actually buggy :) It assigns pci_dev->irq hard coded numbers which is no good with the new IRQ mapping code. It should at least use irq_create_mapping(NULL, hard_coded_number); and possibly also set_irq_type() to set them as level low. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
105 lines
2.9 KiB
C
105 lines
2.9 KiB
C
/*
|
|
* Copyright (C) 2001 Dave Engebretsen, IBM Corporation
|
|
* Copyright (C) 2003 Anton Blanchard <anton@au.ibm.com>, IBM
|
|
*
|
|
* pSeries specific routines for PCI.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*/
|
|
|
|
#include <linux/init.h>
|
|
#include <linux/ioport.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/pci.h>
|
|
#include <linux/string.h>
|
|
|
|
#include <asm/pci-bridge.h>
|
|
#include <asm/prom.h>
|
|
#include <asm/ppc-pci.h>
|
|
|
|
#if 0
|
|
void pcibios_name_device(struct pci_dev *dev)
|
|
{
|
|
struct device_node *dn;
|
|
|
|
/*
|
|
* Add IBM loc code (slot) as a prefix to the device names for service
|
|
*/
|
|
dn = pci_device_to_OF_node(dev);
|
|
if (dn) {
|
|
char *loc_code = get_property(dn, "ibm,loc-code", 0);
|
|
if (loc_code) {
|
|
int loc_len = strlen(loc_code);
|
|
if (loc_len < sizeof(dev->dev.name)) {
|
|
memmove(dev->dev.name+loc_len+1, dev->dev.name,
|
|
sizeof(dev->dev.name)-loc_len-1);
|
|
memcpy(dev->dev.name, loc_code, loc_len);
|
|
dev->dev.name[loc_len] = ' ';
|
|
dev->dev.name[sizeof(dev->dev.name)-1] = '\0';
|
|
}
|
|
}
|
|
}
|
|
}
|
|
DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pcibios_name_device);
|
|
#endif
|
|
|
|
static void __init pSeries_request_regions(void)
|
|
{
|
|
if (!isa_io_base)
|
|
return;
|
|
|
|
request_region(0x20,0x20,"pic1");
|
|
request_region(0xa0,0x20,"pic2");
|
|
request_region(0x00,0x20,"dma1");
|
|
request_region(0x40,0x20,"timer");
|
|
request_region(0x80,0x10,"dma page reg");
|
|
request_region(0xc0,0x20,"dma2");
|
|
}
|
|
|
|
void __init pSeries_final_fixup(void)
|
|
{
|
|
pSeries_request_regions();
|
|
|
|
pci_addr_cache_build();
|
|
}
|
|
|
|
/*
|
|
* Assume the winbond 82c105 is the IDE controller on a
|
|
* p610. We should probably be more careful in case
|
|
* someone tries to plug in a similar adapter.
|
|
*/
|
|
static void fixup_winbond_82c105(struct pci_dev* dev)
|
|
{
|
|
int i;
|
|
unsigned int reg;
|
|
|
|
if (!machine_is(pseries))
|
|
return;
|
|
|
|
printk("Using INTC for W82c105 IDE controller.\n");
|
|
pci_read_config_dword(dev, 0x40, ®);
|
|
/* Enable LEGIRQ to use INTC instead of ISA interrupts */
|
|
pci_write_config_dword(dev, 0x40, reg | (1<<11));
|
|
|
|
for (i = 0; i < DEVICE_COUNT_RESOURCE; ++i) {
|
|
/* zap the 2nd function of the winbond chip */
|
|
if (dev->resource[i].flags & IORESOURCE_IO
|
|
&& dev->bus->number == 0 && dev->devfn == 0x81)
|
|
dev->resource[i].flags &= ~IORESOURCE_IO;
|
|
}
|
|
}
|
|
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_WINBOND, PCI_DEVICE_ID_WINBOND_82C105,
|
|
fixup_winbond_82c105);
|