forked from luck/tmp_suning_uos_patched
19a8d6b760
04c81c7293("MIPS: PCI: Replace pci_fixup_irqs() call with host bridge IRQ mapping hooks") moved the PCI IRQ fixup to the new host bridge map/swizzle_irq() hooks mechanism. Those hooks can also be called after boot, when all the __init/__initdata/__initconst sections have been freed. Therefore, functions called by them (and the data they refer to) must not be marked as __init/__initdata/__initconst lest compilation trigger section mismatch warnings. Fix all the board files map_irq() hooks by simply removing the respective __init/__initdata/__initconst section markers and by adding another persistent hook IRQ map for the txx9 board files. Fixes:04c81c7293("MIPS: PCI: Replace pci_fixup_irqs() call with host bridge IRQ mapping hooks") Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Arnd Bergmann <arnd@arndb.de> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Steve French <smfrench@gmail.com>
143 lines
4.0 KiB
C
143 lines
4.0 KiB
C
/*
|
|
* Based on linux/arch/mips/txx9/rbtx4938/setup.c,
|
|
* and RBTX49xx patch from CELF patch archive.
|
|
*
|
|
* Copyright 2001, 2003-2005 MontaVista Software Inc.
|
|
* Copyright (C) 2004 by Ralf Baechle (ralf@linux-mips.org)
|
|
* (C) Copyright TOSHIBA CORPORATION 2000-2001, 2004-2007
|
|
*
|
|
* This file is subject to the terms and conditions of the GNU General Public
|
|
* License. See the file "COPYING" in the main directory of this archive
|
|
* for more details.
|
|
*/
|
|
#include <linux/init.h>
|
|
#include <linux/pci.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/interrupt.h>
|
|
#include <asm/txx9/generic.h>
|
|
#include <asm/txx9/tx4938.h>
|
|
|
|
int __init tx4938_report_pciclk(void)
|
|
{
|
|
int pciclk = 0;
|
|
|
|
pr_info("PCIC --%s PCICLK:",
|
|
(__raw_readq(&tx4938_ccfgptr->ccfg) & TX4938_CCFG_PCI66) ?
|
|
" PCI66" : "");
|
|
if (__raw_readq(&tx4938_ccfgptr->pcfg) & TX4938_PCFG_PCICLKEN_ALL) {
|
|
u64 ccfg = __raw_readq(&tx4938_ccfgptr->ccfg);
|
|
switch ((unsigned long)ccfg &
|
|
TX4938_CCFG_PCIDIVMODE_MASK) {
|
|
case TX4938_CCFG_PCIDIVMODE_4:
|
|
pciclk = txx9_cpu_clock / 4; break;
|
|
case TX4938_CCFG_PCIDIVMODE_4_5:
|
|
pciclk = txx9_cpu_clock * 2 / 9; break;
|
|
case TX4938_CCFG_PCIDIVMODE_5:
|
|
pciclk = txx9_cpu_clock / 5; break;
|
|
case TX4938_CCFG_PCIDIVMODE_5_5:
|
|
pciclk = txx9_cpu_clock * 2 / 11; break;
|
|
case TX4938_CCFG_PCIDIVMODE_8:
|
|
pciclk = txx9_cpu_clock / 8; break;
|
|
case TX4938_CCFG_PCIDIVMODE_9:
|
|
pciclk = txx9_cpu_clock / 9; break;
|
|
case TX4938_CCFG_PCIDIVMODE_10:
|
|
pciclk = txx9_cpu_clock / 10; break;
|
|
case TX4938_CCFG_PCIDIVMODE_11:
|
|
pciclk = txx9_cpu_clock / 11; break;
|
|
}
|
|
pr_cont("Internal(%u.%uMHz)",
|
|
(pciclk + 50000) / 1000000,
|
|
((pciclk + 50000) / 100000) % 10);
|
|
} else {
|
|
pr_cont("External");
|
|
pciclk = -1;
|
|
}
|
|
pr_cont("\n");
|
|
return pciclk;
|
|
}
|
|
|
|
void __init tx4938_report_pci1clk(void)
|
|
{
|
|
__u64 ccfg = __raw_readq(&tx4938_ccfgptr->ccfg);
|
|
unsigned int pciclk =
|
|
txx9_gbus_clock / ((ccfg & TX4938_CCFG_PCI1DMD) ? 4 : 2);
|
|
|
|
pr_info("PCIC1 -- %sPCICLK:%u.%uMHz\n",
|
|
(ccfg & TX4938_CCFG_PCI1_66) ? "PCI66 " : "",
|
|
(pciclk + 50000) / 1000000,
|
|
((pciclk + 50000) / 100000) % 10);
|
|
}
|
|
|
|
int __init tx4938_pciclk66_setup(void)
|
|
{
|
|
int pciclk;
|
|
|
|
/* Assert M66EN */
|
|
tx4938_ccfg_set(TX4938_CCFG_PCI66);
|
|
/* Double PCICLK (if possible) */
|
|
if (__raw_readq(&tx4938_ccfgptr->pcfg) & TX4938_PCFG_PCICLKEN_ALL) {
|
|
unsigned int pcidivmode = 0;
|
|
u64 ccfg = __raw_readq(&tx4938_ccfgptr->ccfg);
|
|
pcidivmode = (unsigned long)ccfg &
|
|
TX4938_CCFG_PCIDIVMODE_MASK;
|
|
switch (pcidivmode) {
|
|
case TX4938_CCFG_PCIDIVMODE_8:
|
|
case TX4938_CCFG_PCIDIVMODE_4:
|
|
pcidivmode = TX4938_CCFG_PCIDIVMODE_4;
|
|
pciclk = txx9_cpu_clock / 4;
|
|
break;
|
|
case TX4938_CCFG_PCIDIVMODE_9:
|
|
case TX4938_CCFG_PCIDIVMODE_4_5:
|
|
pcidivmode = TX4938_CCFG_PCIDIVMODE_4_5;
|
|
pciclk = txx9_cpu_clock * 2 / 9;
|
|
break;
|
|
case TX4938_CCFG_PCIDIVMODE_10:
|
|
case TX4938_CCFG_PCIDIVMODE_5:
|
|
pcidivmode = TX4938_CCFG_PCIDIVMODE_5;
|
|
pciclk = txx9_cpu_clock / 5;
|
|
break;
|
|
case TX4938_CCFG_PCIDIVMODE_11:
|
|
case TX4938_CCFG_PCIDIVMODE_5_5:
|
|
default:
|
|
pcidivmode = TX4938_CCFG_PCIDIVMODE_5_5;
|
|
pciclk = txx9_cpu_clock * 2 / 11;
|
|
break;
|
|
}
|
|
tx4938_ccfg_change(TX4938_CCFG_PCIDIVMODE_MASK,
|
|
pcidivmode);
|
|
pr_debug("PCICLK: ccfg:%08lx\n",
|
|
(unsigned long)__raw_readq(&tx4938_ccfgptr->ccfg));
|
|
} else
|
|
pciclk = -1;
|
|
return pciclk;
|
|
}
|
|
|
|
int tx4938_pcic1_map_irq(const struct pci_dev *dev, u8 slot)
|
|
{
|
|
if (get_tx4927_pcicptr(dev->bus->sysdata) == tx4938_pcic1ptr) {
|
|
switch (slot) {
|
|
case TX4927_PCIC_IDSEL_AD_TO_SLOT(31):
|
|
if (__raw_readq(&tx4938_ccfgptr->pcfg) &
|
|
TX4938_PCFG_ETH0_SEL)
|
|
return TXX9_IRQ_BASE + TX4938_IR_ETH0;
|
|
break;
|
|
case TX4927_PCIC_IDSEL_AD_TO_SLOT(30):
|
|
if (__raw_readq(&tx4938_ccfgptr->pcfg) &
|
|
TX4938_PCFG_ETH1_SEL)
|
|
return TXX9_IRQ_BASE + TX4938_IR_ETH1;
|
|
break;
|
|
}
|
|
return 0;
|
|
}
|
|
return -1;
|
|
}
|
|
|
|
void __init tx4938_setup_pcierr_irq(void)
|
|
{
|
|
if (request_irq(TXX9_IRQ_BASE + TX4938_IR_PCIERR,
|
|
tx4927_pcierr_interrupt,
|
|
0, "PCI error",
|
|
(void *)TX4927_PCIC_REG))
|
|
pr_warn("Failed to request irq for PCIERR\n");
|
|
}
|