GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rewrite interrupt handling in coreboot to be more comprehensible and 

more flexible. Also some minore device allocator cleanups that sneaked 
in.

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Peter Stuge <peter@stuge.se>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4452 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Stefan Reinauer 2009-07-21 21:36:41 +00:00 committed by Stefan Reinauer
parent c366cd0650
commit 4d933dd2d6
5 changed files with 192 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
src/devices/pci_device.c
View File

@ -50,6 +50,10 @@
#if CONFIG_CARDBUS_PLUGIN_SUPPORT == 1 #if CONFIG_CARDBUS_PLUGIN_SUPPORT == 1
#include <device/cardbus.h> #include <device/cardbus.h>
#endif #endif
#define CONFIG_PC80_SYSTEM 1
#if CONFIG_PC80_SYSTEM == 1
#include <pc80/i8259.h>
#endif
u8 pci_moving_config8(struct device *dev, unsigned int reg) u8 pci_moving_config8(struct device *dev, unsigned int reg)
{ {
@ -110,10 +114,10 @@ u32 pci_moving_config32(struct device * dev, unsigned int reg)
unsigned pci_find_next_capability(struct device *dev, unsigned cap, unsigned pci_find_next_capability(struct device *dev, unsigned cap,
unsigned last) unsigned last)
{ {
unsigned pos; unsigned pos = 0;
unsigned status; unsigned status;
unsigned reps = 48; unsigned reps = 48;
pos = 0;
status = pci_read_config16(dev, PCI_STATUS); status = pci_read_config16(dev, PCI_STATUS);
if (!(status & PCI_STATUS_CAP_LIST)) { if (!(status & PCI_STATUS_CAP_LIST)) {
return 0; return 0;
@ -1193,86 +1197,62 @@ unsigned int pci_domain_scan_bus(device_t dev, unsigned int max)
return max; return max;
} }
#if CONFIG_PC80_SYSTEM == 1
/** /**
* Tell the EISA int controller this int must be level triggered.
* *
* THIS IS A KLUDGE -- sorry, this needs to get cleaned up. * @brief Assign IRQ numbers
*/ *
void pci_level_irq(unsigned char intNum) * This function assigns IRQs for all functions contained within the indicated
{ * device address. If the device does not exist or does not require interrupts
unsigned short intBits = inb(0x4d0) | (((unsigned)inb(0x4d1)) << 8); * then this function has no effect.
printk_spew("%s: current ints are 0x%x\n", __func__, intBits);
intBits |= (1 << intNum);
printk_spew("%s: try to set ints 0x%x\n", __func__, intBits);
/* Write new values. */
outb((unsigned char)intBits, 0x4d0);
outb((unsigned char)(intBits >> 8), 0x4d1);
/* This seems like an error but is not. */
if (inb(0x4d0) != (intBits & 0xff)) {
printk_err(
"%s: lower order bits are wrong: want 0x%x, got 0x%x\n",
__func__, intBits & 0xff, inb(0x4d0));
}
if (inb(0x4d1) != ((intBits >> 8) & 0xff)) {
printk_err(
"%s: lower order bits are wrong: want 0x%x, got 0x%x\n",
__func__, (intBits >> 8) & 0xff, inb(0x4d1));
}
}
/**
* This function assigns IRQs for all functions contained within the
* indicated device address. If the device does not exist or does not
* require interrupts then this function has no effect.
* *
* This function should be called for each PCI slot in your system. * This function should be called for each PCI slot in your system.
* *
* pIntAtoD is an array of IRQ #s that are assigned to PINTA through PINTD of * @param bus
* this slot. * @param slot
* * @param pIntAtoD is an array of IRQ #s that are assigned to PINTA through
* The particular irq #s that are passed in depend on the routing inside * PINTD of this slot. The particular irq #s that are passed in
* your southbridge and on your motherboard. * depend on the routing inside your southbridge and on your
* * motherboard.
* -kevinh@ispiri.com
*
*/ */
void pci_assign_irqs(unsigned bus, unsigned slot, void pci_assign_irqs(unsigned bus, unsigned slot,
const unsigned char pIntAtoD[4]) const unsigned char pIntAtoD[4])
{ {
unsigned functNum; unsigned int funct;
struct device *pdev; device_t pdev;
unsigned char line; u8 line;
unsigned char irq; u8 irq;
unsigned char readback; u8 readback;
/* Each slot may contain up to eight functions. */ /* Each slot may contain up to eight functions */
for (functNum = 0; functNum < 8; functNum++) { for (funct = 0; funct < 8; funct++) {
pdev = dev_find_slot(bus, (slot << 3) + functNum); pdev = dev_find_slot(bus, (slot << 3) + funct);
if (!pdev)
continue;
if (pdev) {
line = pci_read_config8(pdev, PCI_INTERRUPT_PIN); line = pci_read_config8(pdev, PCI_INTERRUPT_PIN);
/* PCI spec says all other values are reserved. */ // PCI spec says all values except 1..4 are reserved.
if ((line >= 1) && (line <= 4)) { if ((line < 1) || (line > 4))
continue;
irq = pIntAtoD[line - 1]; irq = pIntAtoD[line - 1];
printk_debug("Assigning IRQ %d to %d:%x.%d\n", printk_debug("Assigning IRQ %d to %d:%x.%d\n",
irq, bus, slot, functNum); irq, bus, slot, funct);
pci_write_config8(pdev, PCI_INTERRUPT_LINE, pci_write_config8(pdev, PCI_INTERRUPT_LINE,
pIntAtoD[line - 1]); pIntAtoD[line - 1]);
readback = #ifdef PARANOID_IRQ_ASSIGNMENTS
pci_read_config8(pdev, PCI_INTERRUPT_LINE); readback = pci_read_config8(pdev, PCI_INTERRUPT_LINE);
printk_debug(" Readback = %d\n", readback); printk_debug(" Readback = %d\n", readback);
#endif
// Change to level triggered. // Change to level triggered
pci_level_irq(pIntAtoD[line - 1]); i8259_configure_irq_trigger(pIntAtoD[line - 1], IRQ_LEVEL_TRIGGERED);
}
}
} }
} }
#endif

8
src/devices/pci_ops.c
View File

@ -27,24 +27,24 @@
static struct bus *get_pbus(device_t dev) static struct bus *get_pbus(device_t dev)
{ {
struct bus *pbus; struct bus *pbus = NULL;
if (!dev) if (!dev)
die("get_pbus: dev is NULL!\n"); die("get_pbus: dev is NULL!\n");
else
pbus = dev->bus; pbus = dev->bus;
while(pbus && pbus->dev && !ops_pci_bus(pbus)) { while(pbus && pbus->dev && !ops_pci_bus(pbus)) {
if (pbus == pbus->dev->bus) { if (pbus == pbus->dev->bus) {
printk_alert("%s in endless loop looking for a parent " printk_alert("%s in endless loop looking for a parent "
"bus with ops_pci_bus for %s, breaking out\n", "bus with ops_pci_bus for %s, breaking out.\n",
__func__, dev_path(dev)); __func__, dev_path(dev));
break; break;
} }
pbus = pbus->dev->bus; pbus = pbus->dev->bus;
} }
if (!pbus || !pbus->dev || !pbus->dev->ops || !pbus->dev->ops->ops_pci_bus) { if (!pbus || !pbus->dev || !pbus->dev->ops || !pbus->dev->ops->ops_pci_bus) {
printk_emerg("%s Cannot find pci bus operations\n", dev_path(dev)); printk_emerg("%s: Cannot find pci bus operations.\n", dev_path(dev));
die(""); die("");
} }
return pbus; return pbus;

2
src/include/device/pci.h
View File

@ -73,7 +73,7 @@ unsigned pci_find_capability(device_t dev, unsigned cap);
struct resource *pci_get_resource(struct device *dev, unsigned long index); struct resource *pci_get_resource(struct device *dev, unsigned long index);
void pci_dev_set_subsystem(device_t dev, unsigned vendor, unsigned device); void pci_dev_set_subsystem(device_t dev, unsigned vendor, unsigned device);
void pci_dev_init(struct device *dev); void pci_dev_init(struct device *dev);
void pci_level_irq(unsigned char intNum);
void pci_assign_irqs(unsigned bus, unsigned slot, void pci_assign_irqs(unsigned bus, unsigned slot,
const unsigned char pIntAtoD[4]); const unsigned char pIntAtoD[4]);

4
src/include/pc80/i8259.h
View File

@ -22,4 +22,8 @@
void setup_i8259(void); void setup_i8259(void);
#define IRQ_LEVEL_TRIGGERED 1
#define IRQ_EDGE_TRIGGERED 0
void i8259_configure_irq_trigger(int int_num, int is_level_triggered);
#endif /* PC80_I8259_H */ #endif /* PC80_I8259_H */

165
src/pc80/i8259.c
View File

@ -1,42 +1,141 @@
/*
* This file is part of the coreboot project.
*
* Copyright (C) 2009 coresystems GmbH
*
* 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; version 2 of the License.
*
* 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <arch/io.h> #include <arch/io.h>
#include <pc80/i8259.h> #include <pc80/i8259.h>
/* code taken from: #include <console/console.h>
!
! setup.S Copyright (C) 1991, 1992 Linus Torvalds #define MASTER_PIC_ICW1 0x20
! #define SLAVE_PIC_ICW1 0xa0
! setup.s is responsible for getting the system data from the BIOS, #define ICW_SELECT (1 << 4)
! and putting them into the appropriate places in system memory. #define OCW_SELECT (0 << 4)
! both setup.s and system has been loaded by the bootblock. #define ADI (1 << 2)
*/ #define SNGL (1 << 1)
/* we're getting screwed again and again by this problem of the 8259. #define IC4 (1 << 0)
* so we're going to leave this lying around for inclusion into
* crt0.S on an as-needed basis. #define MASTER_PIC_ICW2 0x21
! well, that went ok, I hope. Now we have to reprogram the interrupts :-( #define SLAVE_PIC_ICW2 0xa1
! we put them right after the intel-reserved hardware interrupts, at #define INT_VECTOR_MASTER 0x20
! int 0x20-0x2F. There they won't mess up anything. Sadly IBM really #define IRQ0 0x00
! messed this up with the original PC, and they haven't been able to #define IRQ1 0x01
! rectify it afterwards. Thus the bios puts interrupts at 0x08-0x0f, #define INT_VECTOR_SLAVE 0x28
! which is used for the internal hardware interrupts as well. We just #define IRQ8 0x00
! have to reprogram the 8259's, and it isn't fun. #define IRQ9 0x01
*/
#define MASTER_PIC_ICW3 0x21
#define CASCADED_PIC (1 << 2)
#define MASTER_PIC_ICW4 0x21
#define SLAVE_PIC_ICW4 0xa1
#define MICROPROCESSOR_MODE (1 << 0)
#define SLAVE_PIC_ICW3 0xa1
#define SLAVE_ID 0x02
#define MASTER_PIC_OCW1 0x21
#define SLAVE_PIC_OCW1 0xa1
#define IRQ2 (1 << 2)
#define ALL_IRQS 0xff
#define ELCR1 0x4d0
#define ELCR2 0x4d1
void setup_i8259(void) void setup_i8259(void)
{ {
outb(0x11, 0x20); /*! initialization sequence to 8259A-1*/ /* A write to ICW1 starts the Interrupt Controller Initialization
outb(0x11, 0xA0); /*! and to 8259A-2*/ * Sequence. This implicitly causes the following to happen:
outb(0x20, 0x21); /*! start of hardware int's (0x20)*/ * - Interrupt Mask register is cleared
outb(0x28, 0xA1); /*! start of hardware int's 2 (0x28)*/ * - Priority 7 is assigned to IRQ7 input
outb(0x04, 0x21); /*! 8259-1 is master*/ * - Slave mode address is set to 7
outb(0x02, 0xA1); /*! 8259-2 is slave*/ * - Special mask mode is cleared
outb(0x01, 0x21); /*! 8086 mode for both*/ *
outb(0x01, 0xA1); * We send the initialization sequence to both the master and
outb(0xFF, 0xA1); /*! mask off all interrupts for now*/ * slave i8259 controller.
outb(0xFB, 0x21); /*! mask all irq's but irq2 which is cascaded*/ */
outb(ICW_SELECT|IC4, MASTER_PIC_ICW1);
outb(ICW_SELECT|IC4, SLAVE_PIC_ICW1);
/* Now the interrupt controller expects us to write to ICW2. */
outb(INT_VECTOR_MASTER | IRQ0, MASTER_PIC_ICW2);
outb(INT_VECTOR_SLAVE | IRQ8, SLAVE_PIC_ICW2);
/* Now the interrupt controller expects us to write to ICW3.
*
* The normal scenario is to set up cascading on IRQ2 on the master
* i8259 and assign the slave ID 2 to the slave i8259.
*/
outb(CASCADED_PIC, MASTER_PIC_ICW3);
outb(SLAVE_ID, SLAVE_PIC_ICW3);
/* Now the interrupt controller expects us to write to ICW4.
*
* We switch both i8259 to microprocessor mode because they're
* operating as part of an x86 architecture based chipset
*/
outb(MICROPROCESSOR_MODE, MASTER_PIC_ICW2);
outb(MICROPROCESSOR_MODE, SLAVE_PIC_ICW2);
/* Now clear the interrupts through OCW1.
* First we mask off all interrupts on the slave interrupt controller
* then we mask off all interrupts but interrupt 2 on the master
* controller. This way the cascading stays alife.
*/
outb(ALL_IRQS, SLAVE_PIC_OCW1);
outb(ALL_IRQS & ~IRQ2, MASTER_PIC_OCW1);
} }
/* /**
* I like the way Linus says it: * @brief Configure IRQ triggering in the i8259 compatible Interrupt Controller.
! Well, that certainly wasn't fun :-(. Hopefully it works, and we don't *
! need no steenking BIOS anyway (except for the initial loading :-). * Switch a certain interrupt to be level / edge triggered.
*
* @param int_num legacy interrupt number (3-7, 9-15)
* @param is_level_triggered 1 for level triggered interrupt, 0 for edge
* triggered interrupt
*/ */
void i8259_configure_irq_trigger(int int_num, int is_level_triggered)
{
u16 int_bits = inb(ELCR1) | (((u16)inb(ELCR2)) << 8);
printk_spew("%s: current interrupts are 0x%x\n", __func__, int_bits);
if (is_level_triggered)
int_bits |= (1 << int_num);
else
int_bits &= ~(1 << int_num);
/* Write new values */
printk_spew("%s: try to set interrupts 0x%x\n", __func__, int_bits);
outb((u8)(int_bits & 0xff), ELCR1);
outb((u8)(int_bits >> 8), ELCR2);
#ifdef PARANOID_IRQ_TRIGGERS
/* Try reading back the new values. This seems like an error but is not ... */
if (inb(ELCR1) != (int_bits & 0xff)) {
printk_err("%s: lower order bits are wrong: want 0x%x, got 0x%x\n",
__func__, (int_bits & 0xff), inb(ELCR1));
}
if (inb(ELCR2) != (int_bits >> 8)) {
printk_err("%s: higher order bits are wrong: want 0x%x, got 0x%x\n",
__func__, (int_bits>>8), inb(ELCR2));
}
#endif
}