Index: kernel/arch/sparc64/Makefile.inc =================================================================== --- kernel/arch/sparc64/Makefile.inc (revision 233af8c563ae6dbff256dbcf9920cbce40be88d0) +++ kernel/arch/sparc64/Makefile.inc (revision e2cc9a09d69ac8aab988fa3f12b67e7a42704641) @@ -101,5 +101,6 @@ arch/$(ARCH)/src/drivers/tick.c \ arch/$(ARCH)/src/drivers/kbd.c \ - arch/$(ARCH)/src/drivers/scr.c + arch/$(ARCH)/src/drivers/scr.c \ + arch/$(ARCH)/src/drivers/pci.c ifeq ($(CONFIG_SMP),y) Index: kernel/arch/sparc64/include/asm.h =================================================================== --- kernel/arch/sparc64/include/asm.h (revision 233af8c563ae6dbff256dbcf9920cbce40be88d0) +++ kernel/arch/sparc64/include/asm.h (revision e2cc9a09d69ac8aab988fa3f12b67e7a42704641) @@ -325,5 +325,5 @@ uint64_t v; - __asm__ volatile ("ldxa [%1] %2, %0\n" : "=r" (v) : "r" (va), "i" (asi)); + __asm__ volatile ("ldxa [%1] %2, %0\n" : "=r" (v) : "r" (va), "i" ((unsigned) asi)); return v; @@ -338,5 +338,5 @@ static inline void asi_u64_write(asi_t asi, uintptr_t va, uint64_t v) { - __asm__ volatile ("stxa %0, [%1] %2\n" : : "r" (v), "r" (va), "i" (asi) : "memory"); + __asm__ volatile ("stxa %0, [%1] %2\n" : : "r" (v), "r" (va), "i" ((unsigned) asi) : "memory"); } Index: kernel/arch/sparc64/include/drivers/ns16550.h =================================================================== --- kernel/arch/sparc64/include/drivers/ns16550.h (revision 233af8c563ae6dbff256dbcf9920cbce40be88d0) +++ kernel/arch/sparc64/include/drivers/ns16550.h (revision e2cc9a09d69ac8aab988fa3f12b67e7a42704641) @@ -39,7 +39,15 @@ #include +/* NS16550 registers */ #define RBR_REG 0 /** Receiver Buffer Register. */ #define IER_REG 1 /** Interrupt Enable Register. */ +#define IIR_REG 2 /** Interrupt Ident Register (read). */ +#define FCR_REG 2 /** FIFO control register (write). */ +#define LCR_REG 3 /** Line Control register. */ #define LSR_REG 5 /** Line Status Register. */ + +#define IER_ERBFI 0x01 /** Enable Receive Buffer Full Interrupt. */ + +#define LCR_DLAB 0x80 /** Divisor Latch Access bit. */ static inline uint8_t ns16550_rbr_read(void) @@ -58,4 +66,24 @@ } +static inline uint8_t ns16550_iir_read(void) +{ + return kbd_virt_address[IIR_REG]; +} + +static inline void ns16550_fcr_write(uint8_t v) +{ + kbd_virt_address[FCR_REG] = v; +} + +static inline uint8_t ns16550_lcr_read(void) +{ + return kbd_virt_address[LCR_REG]; +} + +static inline void ns16550_lcr_write(uint8_t v) +{ + kbd_virt_address[LCR_REG] = v; +} + static inline uint8_t ns16550_lsr_read(void) { Index: kernel/arch/sparc64/include/drivers/pci.h =================================================================== --- kernel/arch/sparc64/include/drivers/pci.h (revision e2cc9a09d69ac8aab988fa3f12b67e7a42704641) +++ kernel/arch/sparc64/include/drivers/pci.h (revision e2cc9a09d69ac8aab988fa3f12b67e7a42704641) @@ -0,0 +1,70 @@ +/* + * Copyright (C) 2006 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup sparc64 + * @{ + */ +/** @file + */ + +#ifndef KERN_sparc64_PCI_H_ +#define KERN_sparc64_PCI_H_ + +#include +#include +#include +#include + +typedef enum pci_model pci_model_t; +typedef struct pci pci_t; +typedef struct pci_operations pci_operations_t; + +enum pci_model { + PCI_UNKNOWN, + PCI_SABRE +}; + +struct pci_operations { + void (* enable_interrupt)(pci_t *pci, int inr); + void (* clear_interrupt)(pci_t *pci, int inr); +}; + +struct pci { + pci_model_t model; + pci_operations_t *op; + volatile uint64_t *reg; /**< Registers including interrupt registers. */ +}; + +extern pci_t *pci_init(ofw_tree_node_t *node); +extern void pci_enable_interrupt(pci_t *pci, int inr); +extern void pci_clear_interrupt(pci_t *pci, int inr); + +#endif + +/** @} + */ Index: kernel/arch/sparc64/include/trap/interrupt.h =================================================================== --- kernel/arch/sparc64/include/trap/interrupt.h (revision 233af8c563ae6dbff256dbcf9920cbce40be88d0) +++ kernel/arch/sparc64/include/trap/interrupt.h (revision e2cc9a09d69ac8aab988fa3f12b67e7a42704641) @@ -40,4 +40,12 @@ #include #include + +/* IMAP register bits */ +#define IGN_MASK 0x7c0 +#define INO_MASK 0x1f +#define IMAP_V_MASK (1ULL<<31) + +#define IGN_SHIFT 6 + /* Interrupt ASI registers. */ Index: kernel/arch/sparc64/src/drivers/kbd.c =================================================================== --- kernel/arch/sparc64/src/drivers/kbd.c (revision 233af8c563ae6dbff256dbcf9920cbce40be88d0) +++ kernel/arch/sparc64/src/drivers/kbd.c (revision e2cc9a09d69ac8aab988fa3f12b67e7a42704641) @@ -100,5 +100,5 @@ uintptr_t pa; size_t size; - int ino; + int inr; switch (kbd_type) { @@ -109,5 +109,5 @@ return; } - if (!ofw_fhc_map_interrupts(node->parent, ((ofw_fhc_reg_t *) prop->value), interrupts, &ino)) { + if (!ofw_fhc_map_interrupts(node->parent, ((ofw_fhc_reg_t *) prop->value), interrupts, &inr)) { printf("Failed to determine keyboard interrupts.\n"); return; @@ -120,5 +120,5 @@ return; } - if (!ofw_ebus_map_interrupts(node->parent, ((ofw_ebus_reg_t *) prop->value), interrupts, &ino)) { + if (!ofw_ebus_map_interrupts(node->parent, ((ofw_ebus_reg_t *) prop->value), interrupts, &inr)) { printf("Failed to determine keyboard interrupts.\n"); return; Index: kernel/arch/sparc64/src/drivers/pci.c =================================================================== --- kernel/arch/sparc64/src/drivers/pci.c (revision e2cc9a09d69ac8aab988fa3f12b67e7a42704641) +++ kernel/arch/sparc64/src/drivers/pci.c (revision e2cc9a09d69ac8aab988fa3f12b67e7a42704641) @@ -0,0 +1,157 @@ +/* + * Copyright (C) 2006 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup sparc64 + * @{ + */ +/** + * @file + * @brief PCI driver. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define PCI_SABRE_REGS_REG 0 + +#define PCI_SABRE_IMAP_BASE 0x200 +#define PCI_SABRE_ICLR_BASE 0x300 + +static pci_t *pci_sabre_init(ofw_tree_node_t *node); +static void pci_sabre_enable_interrupt(pci_t *pci, int inr); +static void pci_sabre_clear_interrupt(pci_t *pci, int inr); + +/** PCI operations for Sabre model. */ +static pci_operations_t pci_sabre_ops = { + .enable_interrupt = pci_sabre_enable_interrupt, + .clear_interrupt = pci_sabre_clear_interrupt +}; + +/** Initialize PCI controller (model Sabre). */ +pci_t *pci_sabre_init(ofw_tree_node_t *node) +{ + pci_t *pci; + ofw_tree_property_t *prop; + + /* + * Get registers. + */ + prop = ofw_tree_getprop(node, "reg"); + if (!prop || !prop->value) + return NULL; + + ofw_upa_reg_t *reg = prop->value; + count_t regs = prop->size / sizeof(ofw_upa_reg_t); + + if (regs < PCI_SABRE_REGS_REG + 1) + return NULL; + + uintptr_t paddr; + if (!ofw_upa_apply_ranges(node->parent, ®[PCI_SABRE_REGS_REG], &paddr)) + return NULL; + + pci = (pci_t *) malloc(sizeof(pci_t), FRAME_ATOMIC); + if (!pci) + return NULL; + + pci->model = PCI_SABRE; + pci->op = &pci_sabre_ops; + pci->reg = (uint64_t *) hw_map(paddr, reg[PCI_SABRE_REGS_REG].size); + + return pci; +} + +void pci_sabre_enable_interrupt(pci_t *pci, int inr) +{ + pci->reg[PCI_SABRE_ICLR_BASE + (inr & INO_MASK)] = 0; + pci->reg[PCI_SABRE_IMAP_BASE + (inr & INO_MASK)] |= IMAP_V_MASK; +} + +void pci_sabre_clear_interrupt(pci_t *pci, int inr) +{ + pci->reg[PCI_SABRE_ICLR_BASE + (inr & INO_MASK)] = 0; +} + +/** Initialize PCI controller. */ +pci_t *pci_init(ofw_tree_node_t *node) +{ + ofw_tree_property_t *prop; + + /* + * First, verify this is a PCI node. + */ + ASSERT(strcmp(ofw_tree_node_name(node), "pci") == 0); + + /* + * Determine PCI controller model. + */ + prop = ofw_tree_getprop(node, "model"); + if (!prop || !prop->value) + return NULL; + + if (strcmp(prop->value, "SUNW,sabre") == 0) { + /* + * PCI controller Sabre. + * This model is found on UltraSPARC IIi based machines. + */ + return pci_sabre_init(node); + } else { + /* + * Unsupported model. + */ + printf("Unsupported PCI controller model (%s).\n", prop->value); + } + + return NULL; +} + +void pci_enable_interrupt(pci_t *pci, int inr) +{ + ASSERT(pci->model); + ASSERT(pci->op && pci->op->enable_interrupt); + pci->op->enable_interrupt(pci, inr); +} + +void pci_clear_interrupt(pci_t *pci, int inr) +{ + ASSERT(pci->model); + ASSERT(pci->op && pci->op->clear_interrupt); + pci->op->clear_interrupt(pci, inr); +} + +/** @} + */