mirror of
https://github.com/torvalds/linux.git
synced 2026-11-20 13:03:48 +00:00
Merge tag 'mips-fixes_7.4_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
Pull MIPS fixes from Thomas Bogendoerfer: "Alchemy: - Fix /proc/interrups - Preserve ethernet address from PROM SGI: - IP27: Fix NMI dump - IP30: make defconfig more useful - IP32: added workarounds for crime revision 1.1 Others: - Fix compressed kernel linked with ld.lld - Fix IDE ports on Cobalt devices - Reject wrong affinity settings on SB1250 platforms" * tag 'mips-fixes_7.4_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: MIPS: SB1250: Validate and update IRQ affinity MIPS: Cobalt: Include legacy IDE ports in the PCI I/O window MIPS: sgi-ip32: Report the real CRIME revision MIPS: sgi-ip32: Leave MACE PCI control alone in config accesses MIPS: sgi-ip32: Mask MACE PCI interrupts in CRIME only MIPS: mm: Fix the cache error vector jump for XKPHYS kernels MIPS: Alchemy: Save the Ethernet address before reusing PROM memory MIPS: Alchemy: Register interrupt chips with the IRQ core MIPS: SGI-IP30: fix the defconfig defaults for the Bridge PROM and RTC MIPS: boot: compressed: fix the vmlinuz link with ld.lld MIPS: boot: compressed: place .rodata.* and discard .MIPS.abiflags MIPS: Avoid dead code/data elimination when using recordmcount MIPS: SGI-IP27: print the NMI dump on an nbcon console
This commit is contained in:
+1
-1
@@ -79,7 +79,7 @@ config MIPS
|
||||
select HAVE_IRQ_TIME_ACCOUNTING
|
||||
select HAVE_KPROBES
|
||||
select HAVE_KRETPROBES
|
||||
select HAVE_LD_DEAD_CODE_DATA_ELIMINATION
|
||||
select HAVE_LD_DEAD_CODE_DATA_ELIMINATION if !FTRACE_MCOUNT_USE_RECORDMCOUNT
|
||||
select HAVE_MOD_ARCH_SPECIFIC
|
||||
select HAVE_NMI
|
||||
select HAVE_PAGE_SIZE_4KB if !CPU_LOONGSON2EF && !CPU_LOONGSON64
|
||||
|
||||
@@ -892,15 +892,21 @@ static void __init au1000_init_irq(struct alchemy_irqmap *map)
|
||||
mips_cpu_irq_init();
|
||||
|
||||
/* register all 64 possible IC0+IC1 irq sources as type "none".
|
||||
* Register each chip with the IRQ core before setting its type so
|
||||
* the descriptors are included in interrupt enumeration.
|
||||
* Use set_irq_type() to set edge/level behaviour at runtime.
|
||||
*/
|
||||
for (irq_nr = AU1000_INTC0_INT_BASE;
|
||||
(irq_nr < AU1000_INTC0_INT_BASE + 32); irq_nr++)
|
||||
(irq_nr < AU1000_INTC0_INT_BASE + 32); irq_nr++) {
|
||||
irq_set_chip(irq_nr, &au1x_ic0_chip);
|
||||
au1x_ic_settype(irq_get_irq_data(irq_nr), IRQ_TYPE_NONE);
|
||||
}
|
||||
|
||||
for (irq_nr = AU1000_INTC1_INT_BASE;
|
||||
(irq_nr < AU1000_INTC1_INT_BASE + 32); irq_nr++)
|
||||
(irq_nr < AU1000_INTC1_INT_BASE + 32); irq_nr++) {
|
||||
irq_set_chip(irq_nr, &au1x_ic1_chip);
|
||||
au1x_ic_settype(irq_get_irq_data(irq_nr), IRQ_TYPE_NONE);
|
||||
}
|
||||
|
||||
/*
|
||||
* Initialize IC0, which is fixed per processor.
|
||||
@@ -947,6 +953,7 @@ static void __init alchemy_gpic_init_irq(const struct alchemy_irqmap *dints)
|
||||
|
||||
/* register an irq_chip for them, with 2nd highest priority */
|
||||
for (i = ALCHEMY_GPIC_INT_BASE; i <= ALCHEMY_GPIC_INT_LAST; i++) {
|
||||
irq_set_chip(i, &au1300_gpic);
|
||||
au1300_set_irq_priority(i, 1);
|
||||
au1300_gpic_settype(irq_get_irq_data(i), IRQ_TYPE_NONE);
|
||||
}
|
||||
|
||||
@@ -46,6 +46,11 @@ int prom_argc;
|
||||
char **prom_argv;
|
||||
char **prom_envp;
|
||||
|
||||
static char prom_ethaddr[6] __initdata;
|
||||
static bool prom_ethaddr_valid __initdata;
|
||||
|
||||
static void __init prom_init_ethernet_addr(void);
|
||||
|
||||
void __init prom_init_cmdline(void)
|
||||
{
|
||||
int i;
|
||||
@@ -95,6 +100,9 @@ void __init prom_init(void)
|
||||
if (!memsize_str || kstrtoul(memsize_str, 0, &memsize))
|
||||
memsize = SZ_64M; /* minimum memsize is 64MB RAM */
|
||||
|
||||
/* Save the MAC before the allocator can reuse the PROM environment. */
|
||||
prom_init_ethernet_addr();
|
||||
|
||||
memblock_add(0, memsize);
|
||||
}
|
||||
|
||||
@@ -125,7 +133,7 @@ static inline void str2eaddr(unsigned char *ea, unsigned char *str)
|
||||
}
|
||||
}
|
||||
|
||||
int __init prom_get_ethernet_addr(char *ethernet_addr)
|
||||
static void __init prom_init_ethernet_addr(void)
|
||||
{
|
||||
char *ethaddr_str;
|
||||
|
||||
@@ -135,12 +143,21 @@ int __init prom_get_ethernet_addr(char *ethernet_addr)
|
||||
/* Check command line */
|
||||
ethaddr_str = strstr(arcs_cmdline, "ethaddr=");
|
||||
if (!ethaddr_str)
|
||||
return -1;
|
||||
return;
|
||||
|
||||
ethaddr_str += strlen("ethaddr=");
|
||||
}
|
||||
|
||||
str2eaddr(ethernet_addr, ethaddr_str);
|
||||
str2eaddr(prom_ethaddr, ethaddr_str);
|
||||
prom_ethaddr_valid = true;
|
||||
}
|
||||
|
||||
int __init prom_get_ethernet_addr(char *ethernet_addr)
|
||||
{
|
||||
if (!prom_ethaddr_valid)
|
||||
return -1;
|
||||
|
||||
memcpy(ethernet_addr, prom_ethaddr, sizeof(prom_ethaddr));
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -96,12 +96,20 @@ VMLINUZ_LOAD_ADDRESS = $(shell $(obj)/calc_vmlinuz_load_addr \
|
||||
endif
|
||||
UIMAGE_LOADADDR = $(VMLINUZ_LOAD_ADDRESS)
|
||||
|
||||
# Like LINKER_LOAD_ADDRESS in arch/mips/Makefile: ld.lld cannot link a
|
||||
# 32-bit executable at a sign-extended address, so drop the upper 32 bits.
|
||||
ifdef CONFIG_64BIT
|
||||
VMLINUZ_LINK_ADDRESS = $(VMLINUZ_LOAD_ADDRESS)
|
||||
else
|
||||
VMLINUZ_LINK_ADDRESS = $(subst 0xffffffff,0x,$(VMLINUZ_LOAD_ADDRESS))
|
||||
endif
|
||||
|
||||
vmlinuzobjs-y += $(obj)/piggy.o
|
||||
|
||||
targets += ../../../../vmlinuz
|
||||
|
||||
quiet_cmd_zld = LD $@
|
||||
cmd_zld = $(LD) $(KBUILD_LDFLAGS) -Ttext $(VMLINUZ_LOAD_ADDRESS) -T $< $(vmlinuzobjs-y) -o $@
|
||||
cmd_zld = $(LD) $(KBUILD_LDFLAGS) -Ttext $(VMLINUZ_LINK_ADDRESS) -T $< $(vmlinuzobjs-y) -o $@
|
||||
quiet_cmd_strip = STRIP $@
|
||||
cmd_strip = $(STRIP) -s $@
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ SECTIONS
|
||||
/* . = VMLINUZ_LOAD_ADDRESS; */
|
||||
.text : {
|
||||
*(.text)
|
||||
*(.rodata)
|
||||
*(.rodata .rodata.*)
|
||||
}: text
|
||||
/* End of text section */
|
||||
|
||||
@@ -50,7 +50,9 @@ SECTIONS
|
||||
|
||||
/* Sections to be discarded */
|
||||
/DISCARD/ : {
|
||||
*(.MIPS.abiflags)
|
||||
*(.MIPS.options)
|
||||
*(.gnu.attributes)
|
||||
*(.options)
|
||||
*(.pdr)
|
||||
*(.reginfo)
|
||||
|
||||
@@ -14,6 +14,8 @@
|
||||
|
||||
#include <asm/gt64120.h>
|
||||
|
||||
#include <cobalt.h>
|
||||
|
||||
extern struct pci_ops gt64xxx_pci0_ops;
|
||||
|
||||
static struct resource cobalt_mem_resource = {
|
||||
@@ -24,7 +26,7 @@ static struct resource cobalt_mem_resource = {
|
||||
};
|
||||
|
||||
static struct resource cobalt_io_resource = {
|
||||
.start = 0x1000,
|
||||
.start = 0,
|
||||
.end = 0xffffffUL,
|
||||
.name = "PCI I/O",
|
||||
.flags = IORESOURCE_IO,
|
||||
@@ -38,11 +40,8 @@ static struct pci_controller cobalt_pci_controller = {
|
||||
.io_map_base = CKSEG1ADDR(GT_DEF_PCI0_IO_BASE),
|
||||
};
|
||||
|
||||
static int __init cobalt_pci_init(void)
|
||||
void __init cobalt_pci_init(void)
|
||||
{
|
||||
PCIBIOS_MIN_IO = 0x1000;
|
||||
register_pci_controller(&cobalt_pci_controller);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
arch_initcall(cobalt_pci_init);
|
||||
|
||||
@@ -83,9 +83,11 @@ void __init plat_mem_setup(void)
|
||||
/* I/O port resource */
|
||||
ioport_resource.end = 0x01ffffff;
|
||||
|
||||
cobalt_pci_init();
|
||||
|
||||
/* These resources have been reserved by VIA SuperI/O chip. */
|
||||
for (i = 0; i < ARRAY_SIZE(cobalt_reserved_resources); i++)
|
||||
request_resource(&ioport_resource, cobalt_reserved_resources + i);
|
||||
insert_resource(&ioport_resource, cobalt_reserved_resources + i);
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@@ -40,7 +40,6 @@ CONFIG_INET6_AH=m
|
||||
CONFIG_INET6_ESP=m
|
||||
CONFIG_INET6_IPCOMP=m
|
||||
CONFIG_IPV6_MIP6=m
|
||||
CONFIG_IPV6_SIT=m
|
||||
CONFIG_IPV6_SIT_6RD=y
|
||||
CONFIG_IPV6_TUNNEL=m
|
||||
CONFIG_IPV6_MULTIPLE_TABLES=y
|
||||
@@ -129,11 +128,14 @@ CONFIG_SERIAL_8250_IOC3=y
|
||||
CONFIG_NOZOMI=m
|
||||
CONFIG_HW_RANDOM_TIMERIOMEM=m
|
||||
# CONFIG_PTP_1588_CLOCK is not set
|
||||
CONFIG_W1=y
|
||||
CONFIG_W1_MASTER_SGI=y
|
||||
CONFIG_W1_SLAVE_DS250X=y
|
||||
# CONFIG_HWMON is not set
|
||||
CONFIG_THERMAL=y
|
||||
CONFIG_SGI_MFD_IOC3=y
|
||||
CONFIG_RTC_CLASS=y
|
||||
CONFIG_RTC_DRV_M48T35=y
|
||||
CONFIG_RTC_DRV_DS1685_FAMILY=y
|
||||
CONFIG_UIO=y
|
||||
CONFIG_UIO_AEC=m
|
||||
CONFIG_UIO_SERCOS3=m
|
||||
@@ -162,15 +164,12 @@ CONFIG_NFS_FS=y
|
||||
CONFIG_SECURITYFS=y
|
||||
CONFIG_CRYPTO_CRYPTD=m
|
||||
CONFIG_CRYPTO_BLOWFISH=m
|
||||
CONFIG_CRYPTO_CAMELLIA=m
|
||||
CONFIG_CRYPTO_CAST5=m
|
||||
CONFIG_CRYPTO_CAST6=m
|
||||
CONFIG_CRYPTO_SERPENT=m
|
||||
CONFIG_CRYPTO_TWOFISH=m
|
||||
CONFIG_CRYPTO_CTS=m
|
||||
CONFIG_CRYPTO_LRW=m
|
||||
CONFIG_CRYPTO_XTS=m
|
||||
CONFIG_CRYPTO_HMAC=y
|
||||
CONFIG_CRYPTO_MD4=m
|
||||
CONFIG_CRYPTO_RMD160=m
|
||||
CONFIG_CRYPTO_WP512=m
|
||||
|
||||
@@ -22,7 +22,7 @@ struct sgi_crime {
|
||||
#define CRIME_ID_MASK 0xff
|
||||
#define CRIME_ID_IDBITS 0xf0
|
||||
#define CRIME_ID_IDVALUE 0xa0
|
||||
#define CRIME_ID_REV 0x0f
|
||||
#define CRIME_ID_IDVALUE_B 0xb0
|
||||
#define CRIME_REV_PETTY 0x00
|
||||
#define CRIME_REV_11 0x11
|
||||
#define CRIME_REV_13 0x13
|
||||
|
||||
@@ -19,6 +19,7 @@ extern int cobalt_board_id;
|
||||
#define COBALT_BRD_ID_QUBE2 0x5
|
||||
#define COBALT_BRD_ID_RAQ2 0x6
|
||||
|
||||
void cobalt_pci_init(void);
|
||||
void cobalt_machine_halt(void);
|
||||
void cobalt_machine_restart(char *command);
|
||||
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
*
|
||||
* Cache error handler
|
||||
*/
|
||||
#include <asm/addrspace.h>
|
||||
#include <asm/asm.h>
|
||||
#include <asm/regdef.h>
|
||||
#include <asm/mipsregs.h>
|
||||
@@ -37,6 +38,21 @@
|
||||
nop
|
||||
nop
|
||||
|
||||
#if defined(CONFIG_64BIT) && VMLINUX_LOAD_ADDRESS >= XKPHYS && \
|
||||
VMLINUX_LOAD_ADDRESS < XKSEG
|
||||
/*
|
||||
* An XKPHYS kernel may lie outside the 256MB region a j from the
|
||||
* vector reaches, so jump to the handler's uncached XKPHYS address.
|
||||
*/
|
||||
PTR_LA k0, cache_parity_error
|
||||
PTR_LI k1, TO_PHYS_MASK
|
||||
and k0, k0, k1
|
||||
PTR_LI k1, UNCAC_BASE
|
||||
or k0, k0, k1
|
||||
jr k0
|
||||
nop
|
||||
#else
|
||||
j cache_parity_error
|
||||
nop
|
||||
#endif
|
||||
END(except_vec2_generic)
|
||||
|
||||
@@ -35,15 +35,27 @@ static inline int mkaddr(struct pci_bus *bus, unsigned int devfn,
|
||||
(reg & 0xfc);
|
||||
}
|
||||
|
||||
/*
|
||||
* On CRIME 1.1, a MACE PCI register read followed by two register writes
|
||||
* can hang the machine under DMA load, so every register write in this
|
||||
* file is followed by a read. Config cycles to empty slots end in a
|
||||
* master abort; ack it with interrupts still off so the bridge error
|
||||
* interrupt does not report it.
|
||||
*/
|
||||
static void mace_pci_ack_abort(void)
|
||||
{
|
||||
u32 error = mace->pci.error;
|
||||
|
||||
if (error & MACEPCI_ERROR_MASTER_ABORT) {
|
||||
mace->pci.error = error & ~MACEPCI_ERROR_MASTER_ABORT;
|
||||
mace->pci.error;
|
||||
}
|
||||
}
|
||||
|
||||
static int
|
||||
mace_pci_read_config(struct pci_bus *bus, unsigned int devfn,
|
||||
int reg, int size, u32 *val)
|
||||
{
|
||||
u32 control = mace->pci.control;
|
||||
|
||||
/* disable master aborts interrupts during config read */
|
||||
mace->pci.control = control & ~MACEPCI_CONTROL_MAR_INT;
|
||||
mace->pci.config_addr = mkaddr(bus, devfn, reg);
|
||||
switch (size) {
|
||||
case 1:
|
||||
@@ -56,9 +68,7 @@ mace_pci_read_config(struct pci_bus *bus, unsigned int devfn,
|
||||
*val = mace->pci.config_data.l;
|
||||
break;
|
||||
}
|
||||
/* ack possible master abort */
|
||||
mace->pci.error &= ~MACEPCI_ERROR_MASTER_ABORT;
|
||||
mace->pci.control = control;
|
||||
mace_pci_ack_abort();
|
||||
/*
|
||||
* someone forgot to set the ultra bit for the onboard
|
||||
* scsi chips; we fake it here
|
||||
@@ -77,6 +87,7 @@ mace_pci_write_config(struct pci_bus *bus, unsigned int devfn,
|
||||
int reg, int size, u32 val)
|
||||
{
|
||||
mace->pci.config_addr = mkaddr(bus, devfn, reg);
|
||||
mace->pci.error;
|
||||
switch (size) {
|
||||
case 1:
|
||||
mace->pci.config_data.b[(reg & 3) ^ 3] = val;
|
||||
@@ -88,6 +99,7 @@ mace_pci_write_config(struct pci_bus *bus, unsigned int devfn,
|
||||
mace->pci.config_data.l = val;
|
||||
break;
|
||||
}
|
||||
mace_pci_ack_abort();
|
||||
|
||||
DPRINTK("write%d: reg=%08x,val=%02x\n", size * 8, reg, val);
|
||||
|
||||
|
||||
@@ -77,6 +77,8 @@ static irqreturn_t macepci_error(int irq, void *dev)
|
||||
}
|
||||
|
||||
mace->pci.error = flags;
|
||||
/* follow the write with a read, see mace_pci_ack_abort() */
|
||||
mace->pci.error;
|
||||
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
@@ -125,10 +127,13 @@ static int __init mace_init(void)
|
||||
{
|
||||
PCIBIOS_MIN_IO = 0x1000;
|
||||
|
||||
/* Clear any outstanding errors and enable interrupts */
|
||||
/*
|
||||
* Clear any outstanding errors and enable interrupts. PCI interrupts
|
||||
* are masked in CRIME, so the per-slot enables stay on.
|
||||
*/
|
||||
mace->pci.error_addr = 0;
|
||||
mace->pci.error = 0;
|
||||
mace->pci.control = 0xff008500;
|
||||
mace->pci.control = 0xff0085ff;
|
||||
|
||||
printk("MACE PCI rev %d\n", mace->pci.rev);
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
// SPDX-License-Identifier: GPL-2.0
|
||||
#include <linux/console.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/mmzone.h>
|
||||
#include <linux/nodemask.h>
|
||||
@@ -183,6 +184,12 @@ static void nmi_dump(void)
|
||||
*/
|
||||
arch_spin_lock(&nmi_lock);
|
||||
|
||||
/*
|
||||
* No CPU leaves the NMI handler before the hub reset below, so an
|
||||
* nbcon console's printer thread would never print the dump.
|
||||
*/
|
||||
nbcon_cpu_emergency_enter();
|
||||
|
||||
#ifdef REAL_NMI_SIGNAL
|
||||
/*
|
||||
* Wait up to 15 seconds for the other cpus to respond to the NMI.
|
||||
@@ -227,5 +234,6 @@ static void nmi_dump(void)
|
||||
* Save the nmi cpu registers for all cpu in the eframe format.
|
||||
*/
|
||||
nmi_eframes_save();
|
||||
printk_trigger_flush();
|
||||
LOCAL_HUB_S(NI_PORT_RESET, NPR_PORTRESET | NPR_LOCALRESET);
|
||||
}
|
||||
|
||||
@@ -27,7 +27,9 @@ EXPORT_SYMBOL_GPL(mace);
|
||||
|
||||
void __init crime_init(void)
|
||||
{
|
||||
unsigned int id, rev;
|
||||
static const char * const revs[] = { "1.1", "1.3", "1.4" };
|
||||
const char *rev;
|
||||
u64 id;
|
||||
const int field = 2 * sizeof(unsigned long);
|
||||
|
||||
set_io_port_base((unsigned long) ioremap(MACEPCI_LOW_IO, 0x2000000));
|
||||
@@ -35,10 +37,24 @@ void __init crime_init(void)
|
||||
mace = ioremap(MACE_BASE, sizeof(struct sgi_mace));
|
||||
|
||||
id = crime->id;
|
||||
rev = id & CRIME_ID_REV;
|
||||
id = (id & CRIME_ID_IDBITS) >> 4;
|
||||
printk(KERN_INFO "CRIME id %1x rev %d at 0x%0*lx\n",
|
||||
id, rev, field, (unsigned long) CRIME_BASE);
|
||||
/* The revision of ID 0xa is in the upper word; 0xb is rev 1.5. */
|
||||
switch (id & CRIME_ID_IDBITS) {
|
||||
case CRIME_ID_IDVALUE:
|
||||
rev = revs[min_t(u64, id >> 32, ARRAY_SIZE(revs) - 1)];
|
||||
break;
|
||||
case CRIME_ID_IDVALUE_B:
|
||||
rev = "1.5";
|
||||
break;
|
||||
case 0x00:
|
||||
rev = "Petty";
|
||||
break;
|
||||
default:
|
||||
rev = "?";
|
||||
break;
|
||||
}
|
||||
pr_info("CRIME id %1x rev %s at 0x%0*lx\n",
|
||||
(unsigned int)(id & CRIME_ID_IDBITS) >> 4, rev, field,
|
||||
(unsigned long)CRIME_BASE);
|
||||
}
|
||||
|
||||
irqreturn_t crime_memerr_intr(int irq, void *dev_id)
|
||||
|
||||
@@ -160,38 +160,6 @@ static struct irq_chip crime_edge_interrupt = {
|
||||
.irq_unmask = crime_enable_irq,
|
||||
};
|
||||
|
||||
/*
|
||||
* This is for MACE PCI interrupts. We can decrease bus traffic by masking
|
||||
* as close to the source as possible. This also means we can take the
|
||||
* next chunk of the CRIME register in one piece.
|
||||
*/
|
||||
|
||||
static unsigned long macepci_mask;
|
||||
|
||||
static void enable_macepci_irq(struct irq_data *d)
|
||||
{
|
||||
macepci_mask |= MACEPCI_CONTROL_INT(d->irq - MACEPCI_SCSI0_IRQ);
|
||||
mace->pci.control = macepci_mask;
|
||||
crime_mask |= 1 << (d->irq - CRIME_IRQ_BASE);
|
||||
crime->imask = crime_mask;
|
||||
}
|
||||
|
||||
static void disable_macepci_irq(struct irq_data *d)
|
||||
{
|
||||
crime_mask &= ~(1 << (d->irq - CRIME_IRQ_BASE));
|
||||
crime->imask = crime_mask;
|
||||
flush_crime_bus();
|
||||
macepci_mask &= ~MACEPCI_CONTROL_INT(d->irq - MACEPCI_SCSI0_IRQ);
|
||||
mace->pci.control = macepci_mask;
|
||||
flush_mace_bus();
|
||||
}
|
||||
|
||||
static struct irq_chip ip32_macepci_interrupt = {
|
||||
.name = "IP32 MACE PCI",
|
||||
.irq_mask = disable_macepci_irq,
|
||||
.irq_unmask = enable_macepci_irq,
|
||||
};
|
||||
|
||||
/* This is used for MACE ISA interrupts. That means bits 4-6 in the
|
||||
* CRIME register.
|
||||
*/
|
||||
@@ -299,8 +267,8 @@ static struct irq_chip ip32_maceisa_edge_interrupt = {
|
||||
.irq_unmask = enable_maceisa_irq,
|
||||
};
|
||||
|
||||
/* This is used for regular non-ISA, non-PCI MACE interrupts. That means
|
||||
* bits 0-3 and 7 in the CRIME register.
|
||||
/* This is used for regular non-ISA MACE interrupts. That means bits 0-3
|
||||
* and 7-15 in the CRIME register.
|
||||
*/
|
||||
|
||||
static void enable_mace_irq(struct irq_data *d)
|
||||
@@ -436,20 +404,13 @@ void __init arch_init_irq(void)
|
||||
mips_cpu_irq_init();
|
||||
for (irq = CRIME_IRQ_BASE; irq <= IP32_IRQ_MAX; irq++) {
|
||||
switch (irq) {
|
||||
case MACE_VID_IN1_IRQ ... MACE_PCI_BRIDGE_IRQ:
|
||||
case MACE_VID_IN1_IRQ ... MACEPCI_SHARED2_IRQ:
|
||||
irq_set_chip_and_handler_name(irq,
|
||||
&ip32_mace_interrupt,
|
||||
handle_level_irq,
|
||||
"level");
|
||||
break;
|
||||
|
||||
case MACEPCI_SCSI0_IRQ ... MACEPCI_SHARED2_IRQ:
|
||||
irq_set_chip_and_handler_name(irq,
|
||||
&ip32_macepci_interrupt,
|
||||
handle_level_irq,
|
||||
"level");
|
||||
break;
|
||||
|
||||
case CRIME_CPUERR_IRQ:
|
||||
case CRIME_MEMERR_IRQ:
|
||||
irq_set_chip_and_handler_name(irq,
|
||||
|
||||
@@ -76,6 +76,8 @@ static int sb1250_set_affinity(struct irq_data *d, const struct cpumask *mask,
|
||||
unsigned long flags;
|
||||
|
||||
i = cpumask_first_and(mask, cpu_online_mask);
|
||||
if (i >= nr_cpu_ids)
|
||||
return -EINVAL;
|
||||
|
||||
/* Convert logical CPU to physical CPU */
|
||||
cpu = cpu_logical_map(i);
|
||||
@@ -103,6 +105,7 @@ static int sb1250_set_affinity(struct irq_data *d, const struct cpumask *mask,
|
||||
____raw_writeq(cur_ints, IOADDR(A_IMR_MAPPER(cpu) +
|
||||
R_IMR_INTERRUPT_MASK));
|
||||
}
|
||||
irq_data_update_effective_affinity(d, cpumask_of(i));
|
||||
raw_spin_unlock_irqrestore(&sb1250_imr_lock, flags);
|
||||
|
||||
return 0;
|
||||
|
||||
Reference in New Issue
Block a user