Changeset a676574 in mainline for kernel


Ignore:
Timestamp:
2011-01-09T12:18:00Z (15 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, topic/msim-upgrade, topic/simplify-dev-export
Children:
54de5ebd
Parents:
a3eeef45 (diff), 9d12059 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes.

Location:
kernel
Files:
18 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/amd64/include/interrupt.h

    ra3eeef45 ra676574  
    7474extern void (* enable_irqs_function)(uint16_t);
    7575extern void (* eoi_function)(void);
     76extern const char *irqs_info;
    7677
    7778extern void interrupt_init(void);

  • kernel/arch/amd64/src/amd64.c

    ra3eeef45 ra676574  
    235235#endif
    236236       
    237         /*
    238          * This nasty hack should also go away ASAP.
    239          */
    240         trap_virtual_enable_irqs(1 << IRQ_DP8390);
     237        if (irqs_info != NULL)
     238                sysinfo_set_item_val(irqs_info, NULL, true);
     239       
    241240        sysinfo_set_item_val("netif.dp8390.inr", NULL, IRQ_DP8390);
    242241}

  • kernel/arch/amd64/src/interrupt.c

    ra3eeef45 ra676574  
    6262void (* enable_irqs_function)(uint16_t irqmask) = NULL;
    6363void (* eoi_function)(void) = NULL;
     64const char *irqs_info = NULL;
    6465
    6566void istate_decode(istate_t *istate)

  • kernel/arch/ia32/include/interrupt.h

    ra3eeef45 ra676574  
    5555#define IRQ_PIC_SPUR  7
    5656#define IRQ_MOUSE     12
    57 #define IRQ_DP8390    9
     57#define IRQ_DP8390    5
    5858
    5959/* This one must have four least significant bits set to ones */
    … …  
    7474extern void (* enable_irqs_function)(uint16_t);
    7575extern void (* eoi_function)(void);
     76extern const char *irqs_info;
    7677
    7778extern void interrupt_init(void);

  • kernel/arch/ia32/src/drivers/i8259.c

    ra3eeef45 ra676574  
    8686        disable_irqs_function = pic_disable_irqs;
    8787        eoi_function = pic_eoi;
     88        irqs_info = "i8259";
    8889
    8990        pic_disable_irqs(0xffff);               /* disable all irq's */

  • kernel/arch/ia32/src/ia32.c

    ra3eeef45 ra676574  
    193193#endif
    194194       
    195         /*
    196          * This nasty hack should also go away ASAP.
    197          */
    198         trap_virtual_enable_irqs(1 << IRQ_DP8390);
     195        if (irqs_info != NULL)
     196                sysinfo_set_item_val(irqs_info, NULL, true);
     197       
    199198        sysinfo_set_item_val("netif.dp8390.inr", NULL, IRQ_DP8390);
    200199}

  • kernel/arch/ia32/src/interrupt.c

    ra3eeef45 ra676574  
    6262void (* enable_irqs_function)(uint16_t irqmask) = NULL;
    6363void (* eoi_function)(void) = NULL;
     64const char *irqs_info = NULL;
    6465
    6566void istate_decode(istate_t *istate)

  • kernel/arch/ia32/src/smp/apic.c

    ra3eeef45 ra676574  
    178178        disable_irqs_function = io_apic_disable_irqs;
    179179        eoi_function = l_apic_eoi;
     180        irqs_info = "apic";
    180181       
    181182        /*

  • kernel/generic/include/ddi/irq.h

    ra3eeef45 ra676574  
    5454        /** Read 4 bytes from the I/O space. */
    5555        CMD_PIO_READ_32,
     56       
    5657        /** Write 1 byte to the I/O space. */
    5758        CMD_PIO_WRITE_8,
    … …  
    6263       
    6364        /**
    64          * Perform a bit test on the source argument and store the result into
    65          * the destination argument.
     65         * Write 1 byte from the source argument
     66         * to the I/O space.
     67         */
     68        CMD_PIO_WRITE_A_8,
     69        /**
     70         * Write 2 bytes from the source argument
     71         * to the I/O space.
     72         */
     73        CMD_PIO_WRITE_A_16,
     74        /**
     75         * Write 4 bytes from the source argument
     76         * to the I/O space.
     77         */
     78        CMD_PIO_WRITE_A_32,
     79       
     80        /**
     81         * Perform a bit masking on the source argument
     82         * and store the result into the destination argument.
    6683         */
    6784        CMD_BTEST,
    6885       
    6986        /**
    70          * Predicate the execution of the following N commands by the boolean
    71          * value of the source argument.
     87         * Predicate the execution of the following
     88         * N commands by the boolean value of the source
     89         * argument.
    7290         */
    7391        CMD_PREDICATE,
    … …  
    7593        /** Accept the interrupt. */
    7694        CMD_ACCEPT,
     95       
    7796        /** Decline the interrupt. */
    7897        CMD_DECLINE,

  • kernel/generic/include/interrupt.h

    ra3eeef45 ra676574  
    6060extern void fault_if_from_uspace(istate_t *, const char *, ...)
    6161    PRINTF_ATTRIBUTE(2, 3);
     62extern istate_t *istate_get(thread_t *);
    6263extern iroutine_t exc_register(unsigned int, const char *, bool, iroutine_t);
    6364extern void exc_dispatch(unsigned int, istate_t *);

  • kernel/generic/include/proc/task.h

    ra3eeef45 ra676574  
    154154
    155155extern sysarg_t sys_task_set_name(const char *, size_t);
     156extern sysarg_t sys_task_kill(task_id_t *);
    156157
    157158#endif

  • kernel/generic/include/syscall/syscall.h

    ra3eeef45 ra676574  
    4747        SYS_TASK_GET_ID,
    4848        SYS_TASK_SET_NAME,
     49        SYS_TASK_KILL,
    4950        SYS_PROGRAM_SPAWN_LOADER,
    5051       

  • kernel/generic/src/interrupt/interrupt.c

    ra3eeef45 ra676574  
    209209}
    210210
     211/** Get istate structure of a thread.
     212 *
     213 * Get pointer to the istate structure at the bottom of the kernel stack.
     214 *
     215 * This function can be called in interrupt or user context. In interrupt
     216 * context the istate structure is created by the low-level exception
     217 * handler. In user context the istate structure is created by the
     218 * low-level syscall handler.
     219 */
     220istate_t *istate_get(thread_t *thread)
     221{
     222        /*
     223         * The istate structure should be right at the bottom of the kernel
     224         * stack.
     225         */
     226        return (istate_t *) ((uint8_t *) thread->kstack + THREAD_STACK_SIZE -
     227            sizeof(istate_t));
     228}
     229
    211230#ifdef CONFIG_KCONSOLE
    212231

  • kernel/generic/src/ipc/ipc.c

    ra3eeef45 ra676574  
    706706                                break;
    707707                        case IPC_PHONE_CONNECTED:
    708                                 printf("connected to: %p ",
    709                                     task->phones[i].callee);
     708                                printf("connected to: %p (%" PRIu64 ") ",
     709                                    task->phones[i].callee,
     710                                    task->phones[i].callee->task->taskid);
    710711                                break;
    711712                        case IPC_PHONE_SLAMMED:

  • kernel/generic/src/ipc/irq.c

    ra3eeef45 ra676574  
    404404                            (uint32_t) code->cmds[i].value);
    405405                        break;
     406                case CMD_PIO_WRITE_A_8:
     407                        if (srcarg) {
     408                                pio_write_8((ioport8_t *) code->cmds[i].addr,
     409                                    (uint8_t) scratch[srcarg]);
     410                        }
     411                        break;
     412                case CMD_PIO_WRITE_A_16:
     413                        if (srcarg) {
     414                                pio_write_16((ioport16_t *) code->cmds[i].addr,
     415                                    (uint16_t) scratch[srcarg]);
     416                        }
     417                        break;
     418                case CMD_PIO_WRITE_A_32:
     419                        if (srcarg) {
     420                                pio_write_32((ioport32_t *) code->cmds[i].addr,
     421                                    (uint32_t) scratch[srcarg]);
     422                        }
     423                        break;
    406424                case CMD_BTEST:
    407425                        if ((srcarg) && (dstarg)) {

  • kernel/generic/src/main/main.c

    ra3eeef45 ra676574  
    185185        LOG("\nconfig.base=%p config.kernel_size=%zu"
    186186            "\nconfig.stack_base=%p config.stack_size=%zu",
    187             config.base, config.kernel_size, config.stack_base,
    188             config.stack_size);
     187            (void *) config.base, config.kernel_size,
     188            (void *) config.stack_base, config.stack_size);
    189189       
    190190#ifdef CONFIG_KCONSOLE
    … …  
    242242                for (i = 0; i < init.cnt; i++)
    243243                        LOG("init[%zu].addr=%p, init[%zu].size=%zu",
    244                             i, init.tasks[i].addr, i, init.tasks[i].size);
     244                            i, (void *) init.tasks[i].addr, i, init.tasks[i].size);
    245245        } else
    246246                printf("No init binaries found.\n");

  • kernel/generic/src/proc/task.c

    ra3eeef45 ra676574  
    360360}
    361361
     362/** Syscall to forcefully terminate a task
     363 *
     364 * @param uspace_taskid Pointer to task ID in user space.
     365 *
     366 * @return 0 on success or an error code from @ref errno.h.
     367 *
     368 */
     369sysarg_t sys_task_kill(task_id_t *uspace_taskid)
     370{
     371        task_id_t taskid;
     372        int rc;
     373
     374        rc = copy_from_uspace(&taskid, uspace_taskid, sizeof(taskid));
     375        if (rc != 0)
     376                return (sysarg_t) rc;
     377
     378        return (sysarg_t) task_kill(taskid);
     379}
     380
    362381/** Find task structure corresponding to task ID.
    363382 *

  • kernel/generic/src/syscall/syscall.c

    ra3eeef45 ra676574  
    4545#include <debug.h>
    4646#include <ddi/device.h>
     47#include <interrupt.h>
    4748#include <ipc/sysipc.h>
    4849#include <synch/futex.h>
    … …  
    6667#ifdef CONFIG_UDEBUG
    6768        /*
     69         * An istate_t-compatible record was created on the stack by the
     70         * low-level syscall handler. This is the userspace space state
     71         * structure.
     72         */
     73        THREAD->udebug.uspace_state = istate_get(THREAD);
     74
     75        /*
    6876         * Early check for undebugged tasks. We do not lock anything as this
    6977         * test need not be precise in either direction.
    70          *
    7178         */
    7279        if (THREAD->udebug.active)
    … …  
    98105                udebug_stoppable_end();
    99106        }
     107
     108        /* Clear userspace state pointer */
     109        THREAD->udebug.uspace_state = NULL;
    100110#endif
    101111       
    … …  
    120130        (syshandler_t) sys_task_get_id,
    121131        (syshandler_t) sys_task_set_name,
     132        (syshandler_t) sys_task_kill,
    122133        (syshandler_t) sys_program_spawn_loader,
    123134       
Note: See TracChangeset for help on using the changeset viewer.