Changeset f2bbe8c in mainline

Timestamp:

2012-02-12T22:57:16Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

472d813

Parents:

e777847

Message:

• Enforce PIO ranges no matter whether the address is in memory or in a

separate I/O space.

• Be more exact when checking whether the accessed PIO register fits within one PIO range.

File:

• kernel/generic/src/ipc/irq.c (modified) (2 diffs)

kernel/generic/src/ipc/irq.c

@@ -122 +122 @@
         for (i = 0; i < cmdcount; i++) {
                 uintptr_t addr;
+                size_t size;
 
                 /* Process only commands that use an address. */
                 switch (cmds[i].cmd) {
                 case CMD_PIO_READ_8:
+                case CMD_PIO_WRITE_8:
+                case CMD_PIO_WRITE_A_8:
+                        size = 1;
+                        break;
                 case CMD_PIO_READ_16:
+                case CMD_PIO_WRITE_16:
+                case CMD_PIO_WRITE_A_16:
+                        size = 2;
+                        break;
                 case CMD_PIO_READ_32:
-                case CMD_PIO_WRITE_8:
-                case CMD_PIO_WRITE_16:
                 case CMD_PIO_WRITE_32:
-                case CMD_PIO_WRITE_A_8:
-                case CMD_PIO_WRITE_A_16:
                 case CMD_PIO_WRITE_A_32:
+                        size = 4;
                         break;
                 default:
@@ -142 +148 @@
                 addr = (uintptr_t) cmds[i].addr;
                 
-                /* Process only memory mapped PIO addresses. */
-                if ((void *) addr < IO_SPACE_BOUNDARY)
-                        continue;
-
                 for (j = 0; j < rangecount; j++) {
 
                         /* Find the matching range. */
-                        if (!iswithin(pbase[j], ranges[j].size, addr, 1))
+                        if (!iswithin(pbase[j], ranges[j].size, addr, size))
                                 continue;