tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

char serial: switch drivers to ioremap_nocache

Simple search/replace except for synclink.c where I noticed a real bug and
fixed it too. It was doing NULL + offset, then checking for NULL if the remap
failed.

Signed-off-by: Alan Cox <alan@redhat.com>
Cc: Paul Fulghum <paulkf@microgate.com>
Acked-by: Jiri Slaby <jirislaby@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Alan Cox and committed by
Linus Torvalds 24cb2335 a6fc819e

+25 -20
+2 -2
drivers/char/applicom.c
··· 199 199 if (pci_enable_device(dev)) 200 200 return -EIO; 201 201 202 - RamIO = ioremap(pci_resource_start(dev, 0), LEN_RAM_IO); 202 + RamIO = ioremap_nocache(pci_resource_start(dev, 0), LEN_RAM_IO); 203 203 204 204 if (!RamIO) { 205 205 printk(KERN_INFO "ac.o: Failed to ioremap PCI memory " ··· 254 254 /* Now try the specified ISA cards */ 255 255 256 256 for (i = 0; i < MAX_ISA_BOARD; i++) { 257 - RamIO = ioremap(mem + (LEN_RAM_IO * i), LEN_RAM_IO); 257 + RamIO = ioremap_nocache(mem + (LEN_RAM_IO * i), LEN_RAM_IO); 258 258 259 259 if (!RamIO) { 260 260 printk(KERN_INFO "ac.o: Failed to ioremap the ISA card's memory space (slot #%d)\n", i + 1);
+3 -3
drivers/char/istallion.c
··· 3257 3257 */ 3258 3258 EBRDINIT(brdp); 3259 3259 3260 - brdp->membase = ioremap(brdp->memaddr, brdp->memsize); 3260 + brdp->membase = ioremap_nocache(brdp->memaddr, brdp->memsize); 3261 3261 if (brdp->membase == NULL) { 3262 3262 retval = -ENOMEM; 3263 3263 goto err_reg; ··· 3414 3414 */ 3415 3415 EBRDINIT(brdp); 3416 3416 3417 - brdp->membase = ioremap(brdp->memaddr, brdp->memsize); 3417 + brdp->membase = ioremap_nocache(brdp->memaddr, brdp->memsize); 3418 3418 if (brdp->membase == NULL) { 3419 3419 retval = -ENOMEM; 3420 3420 goto err_reg; ··· 3665 3665 */ 3666 3666 for (i = 0; (i < stli_eisamempsize); i++) { 3667 3667 brdp->memaddr = stli_eisamemprobeaddrs[i]; 3668 - brdp->membase = ioremap(brdp->memaddr, brdp->memsize); 3668 + brdp->membase = ioremap_nocache(brdp->memaddr, brdp->memsize); 3669 3669 if (brdp->membase == NULL) 3670 3670 continue; 3671 3671
+2 -2
drivers/char/moxa.c
··· 937 937 goto err; 938 938 } 939 939 940 - board->basemem = ioremap(pci_resource_start(pdev, 2), 0x4000); 940 + board->basemem = ioremap_nocache(pci_resource_start(pdev, 2), 0x4000); 941 941 if (board->basemem == NULL) { 942 942 dev_err(&pdev->dev, "can't remap io space 2\n"); 943 943 goto err_reg; ··· 1042 1042 brd->numPorts = type[i] == MOXA_BOARD_C218_ISA ? 8 : 1043 1043 numports[i]; 1044 1044 brd->busType = MOXA_BUS_TYPE_ISA; 1045 - brd->basemem = ioremap(baseaddr[i], 0x4000); 1045 + brd->basemem = ioremap_nocache(baseaddr[i], 0x4000); 1046 1046 if (!brd->basemem) { 1047 1047 printk(KERN_ERR "MOXA: can't remap %lx\n", 1048 1048 baseaddr[i]);
+1 -1
drivers/char/nozomi.c
··· 1407 1407 /* Find out what card type it is */ 1408 1408 nozomi_get_card_type(dc); 1409 1409 1410 - dc->base_addr = ioremap(start, dc->card_type); 1410 + dc->base_addr = ioremap_nocache(start, dc->card_type); 1411 1411 if (!dc->base_addr) { 1412 1412 dev_err(&pdev->dev, "Unable to map card MMIO\n"); 1413 1413 ret = -ENODEV;
+5 -5
drivers/char/sx.c
··· 2540 2540 goto err_flag; 2541 2541 } 2542 2542 board->base2 = 2543 - board->base = ioremap(board->hw_base, SI2_EISA_WINDOW_LEN); 2543 + board->base = ioremap_nocache(board->hw_base, SI2_EISA_WINDOW_LEN); 2544 2544 if (!board->base) { 2545 2545 dev_err(dev, "can't remap memory\n"); 2546 2546 goto err_reg; ··· 2617 2617 2618 2618 pci_read_config_dword(pdev, PCI_BASE_ADDRESS_0, &hwbase); 2619 2619 hwbase &= PCI_BASE_ADDRESS_MEM_MASK; 2620 - rebase = ioremap(hwbase, 0x80); 2620 + rebase = ioremap_nocache(hwbase, 0x80); 2621 2621 t = readl(rebase + CNTRL_REG_OFFSET); 2622 2622 if (t != CNTRL_REG_GOODVALUE) { 2623 2623 printk(KERN_DEBUG "sx: performing cntrl reg fix: %08x -> " ··· 2761 2761 if (!request_region(board->hw_base, board->hw_len, "sx")) 2762 2762 continue; 2763 2763 board->base2 = 2764 - board->base = ioremap(board->hw_base, board->hw_len); 2764 + board->base = ioremap_nocache(board->hw_base, board->hw_len); 2765 2765 if (!board->base) 2766 2766 goto err_sx_reg; 2767 2767 board->flags &= ~SX_BOARD_TYPE; ··· 2785 2785 if (!request_region(board->hw_base, board->hw_len, "sx")) 2786 2786 continue; 2787 2787 board->base2 = 2788 - board->base = ioremap(board->hw_base, board->hw_len); 2788 + board->base = ioremap_nocache(board->hw_base, board->hw_len); 2789 2789 if (!board->base) 2790 2790 goto err_si_reg; 2791 2791 board->flags &= ~SX_BOARD_TYPE; ··· 2808 2808 if (!request_region(board->hw_base, board->hw_len, "sx")) 2809 2809 continue; 2810 2810 board->base2 = 2811 - board->base = ioremap(board->hw_base, board->hw_len); 2811 + board->base = ioremap_nocache(board->hw_base, board->hw_len); 2812 2812 if (!board->base) 2813 2813 goto err_si1_reg; 2814 2814 board->flags &= ~SX_BOARD_TYPE;
+5 -2
drivers/char/synclink.c
··· 4150 4150 } 4151 4151 info->lcr_mem_requested = true; 4152 4152 4153 - info->memory_base = ioremap(info->phys_memory_base,0x40000); 4153 + info->memory_base = ioremap_nocache(info->phys_memory_base, 4154 + 0x40000); 4154 4155 if (!info->memory_base) { 4155 4156 printk( "%s(%d):Cant map shared memory on device %s MemAddr=%08X\n", 4156 4157 __FILE__,__LINE__,info->device_name, info->phys_memory_base ); ··· 4164 4163 goto errout; 4165 4164 } 4166 4165 4167 - info->lcr_base = ioremap(info->phys_lcr_base,PAGE_SIZE) + info->lcr_offset; 4166 + info->lcr_base = ioremap_nocache(info->phys_lcr_base, 4167 + PAGE_SIZE); 4168 4168 if (!info->lcr_base) { 4169 4169 printk( "%s(%d):Cant map LCR memory on device %s MemAddr=%08X\n", 4170 4170 __FILE__,__LINE__,info->device_name, info->phys_lcr_base ); 4171 4171 goto errout; 4172 4172 } 4173 + info->lcr_base += info->lcr_offset; 4173 4174 4174 4175 } else { 4175 4176 /* claim DMA channel */
+6 -4
drivers/char/synclinkmp.c
··· 3643 3643 else 3644 3644 info->sca_statctrl_requested = true; 3645 3645 3646 - info->memory_base = ioremap(info->phys_memory_base,SCA_MEM_SIZE); 3646 + info->memory_base = ioremap_nocache(info->phys_memory_base, 3647 + SCA_MEM_SIZE); 3647 3648 if (!info->memory_base) { 3648 3649 printk( "%s(%d):%s Cant map shared memory, MemAddr=%08X\n", 3649 3650 __FILE__,__LINE__,info->device_name, info->phys_memory_base ); ··· 3652 3651 goto errout; 3653 3652 } 3654 3653 3655 - info->lcr_base = ioremap(info->phys_lcr_base,PAGE_SIZE); 3654 + info->lcr_base = ioremap_nocache(info->phys_lcr_base, PAGE_SIZE); 3656 3655 if (!info->lcr_base) { 3657 3656 printk( "%s(%d):%s Cant map LCR memory, MemAddr=%08X\n", 3658 3657 __FILE__,__LINE__,info->device_name, info->phys_lcr_base ); ··· 3661 3660 } 3662 3661 info->lcr_base += info->lcr_offset; 3663 3662 3664 - info->sca_base = ioremap(info->phys_sca_base,PAGE_SIZE); 3663 + info->sca_base = ioremap_nocache(info->phys_sca_base, PAGE_SIZE); 3665 3664 if (!info->sca_base) { 3666 3665 printk( "%s(%d):%s Cant map SCA memory, MemAddr=%08X\n", 3667 3666 __FILE__,__LINE__,info->device_name, info->phys_sca_base ); ··· 3670 3669 } 3671 3670 info->sca_base += info->sca_offset; 3672 3671 3673 - info->statctrl_base = ioremap(info->phys_statctrl_base,PAGE_SIZE); 3672 + info->statctrl_base = ioremap_nocache(info->phys_statctrl_base, 3673 + PAGE_SIZE); 3674 3674 if (!info->statctrl_base) { 3675 3675 printk( "%s(%d):%s Cant map SCA Status/Control memory, MemAddr=%08X\n", 3676 3676 __FILE__,__LINE__,info->device_name, info->phys_statctrl_base );