remove ioremap_nocache and devm_ioremap_nocache
ioremap has provided non-cached semantics by default since the Linux 2.6 days, so remove the additional ioremap_nocache interface. Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
parent
d23cc63588
commit
4bdc0d676a
@ -313,7 +313,6 @@ IOMAP
|
||||
devm_ioport_map()
|
||||
devm_ioport_unmap()
|
||||
devm_ioremap()
|
||||
devm_ioremap_nocache()
|
||||
devm_ioremap_uc()
|
||||
devm_ioremap_wc()
|
||||
devm_ioremap_resource() : checks resource, requests memory region, ioremaps
|
||||
|
@ -1058,7 +1058,7 @@ and the allocation would be like below:
|
||||
return err;
|
||||
}
|
||||
chip->iobase_phys = pci_resource_start(pci, 0);
|
||||
chip->iobase_virt = ioremap_nocache(chip->iobase_phys,
|
||||
chip->iobase_virt = ioremap(chip->iobase_phys,
|
||||
pci_resource_len(pci, 0));
|
||||
|
||||
and the corresponding destructor would be:
|
||||
|
@ -44,8 +44,6 @@ address range to avoid any aliasing.
|
||||
+------------------------+----------+--------------+------------------+
|
||||
| ioremap_uc | -- | UC | UC |
|
||||
+------------------------+----------+--------------+------------------+
|
||||
| ioremap_nocache | -- | UC- | UC- |
|
||||
+------------------------+----------+--------------+------------------+
|
||||
| ioremap_wc | -- | -- | WC |
|
||||
+------------------------+----------+--------------+------------------+
|
||||
| ioremap_wt | -- | -- | WT |
|
||||
|
@ -283,14 +283,8 @@ static inline void __iomem *ioremap(unsigned long port, unsigned long size)
|
||||
return IO_CONCAT(__IO_PREFIX,ioremap) (port, size);
|
||||
}
|
||||
|
||||
static inline void __iomem * ioremap_nocache(unsigned long offset,
|
||||
unsigned long size)
|
||||
{
|
||||
return ioremap(offset, size);
|
||||
}
|
||||
|
||||
#define ioremap_wc ioremap_nocache
|
||||
#define ioremap_uc ioremap_nocache
|
||||
#define ioremap_wc ioremap
|
||||
#define ioremap_uc ioremap
|
||||
|
||||
static inline void iounmap(volatile void __iomem *addr)
|
||||
{
|
||||
|
@ -356,7 +356,6 @@ static inline void memcpy_toio(volatile void __iomem *to, const void *from,
|
||||
*
|
||||
* Function Memory type Cacheability Cache hint
|
||||
* ioremap() Device n/a n/a
|
||||
* ioremap_nocache() Device n/a n/a
|
||||
* ioremap_cache() Normal Writeback Read allocate
|
||||
* ioremap_wc() Normal Non-cacheable n/a
|
||||
* ioremap_wt() Normal Non-cacheable n/a
|
||||
@ -368,13 +367,6 @@ static inline void memcpy_toio(volatile void __iomem *to, const void *from,
|
||||
* - unaligned accesses are "unpredictable"
|
||||
* - writes may be delayed before they hit the endpoint device
|
||||
*
|
||||
* ioremap_nocache() is the same as ioremap() as there are too many device
|
||||
* drivers using this for device registers, and documentation which tells
|
||||
* people to use it for such for this to be any different. This is not a
|
||||
* safe fallback for memory-like mappings, or memory regions where the
|
||||
* compiler may generate unaligned accesses - eg, via inlining its own
|
||||
* memcpy.
|
||||
*
|
||||
* All normal memory mappings have the following properties:
|
||||
* - reads can be repeated with no side effects
|
||||
* - repeated reads return the last value written
|
||||
|
@ -105,7 +105,7 @@ static int nsp_write_lut(unsigned int cpu)
|
||||
if (!secondary_boot_addr)
|
||||
return -EINVAL;
|
||||
|
||||
sku_rom_lut = ioremap_nocache((phys_addr_t)secondary_boot_addr,
|
||||
sku_rom_lut = ioremap((phys_addr_t)secondary_boot_addr,
|
||||
sizeof(phys_addr_t));
|
||||
if (!sku_rom_lut) {
|
||||
pr_warn("unable to ioremap SKU-ROM LUT register for cpu %u\n", cpu);
|
||||
@ -174,7 +174,7 @@ static int kona_boot_secondary(unsigned int cpu, struct task_struct *idle)
|
||||
if (!secondary_boot_addr)
|
||||
return -EINVAL;
|
||||
|
||||
boot_reg = ioremap_nocache((phys_addr_t)secondary_boot_addr,
|
||||
boot_reg = ioremap((phys_addr_t)secondary_boot_addr,
|
||||
sizeof(phys_addr_t));
|
||||
if (!boot_reg) {
|
||||
pr_err("unable to map boot register for cpu %u\n", cpu_id);
|
||||
|
@ -34,7 +34,7 @@ void __iomem *davinci_sysmod_base;
|
||||
|
||||
void davinci_map_sysmod(void)
|
||||
{
|
||||
davinci_sysmod_base = ioremap_nocache(DAVINCI_SYSTEM_MODULE_BASE,
|
||||
davinci_sysmod_base = ioremap(DAVINCI_SYSTEM_MODULE_BASE,
|
||||
0x800);
|
||||
/*
|
||||
* Throw a bug since a lot of board initialization code depends
|
||||
|
@ -1008,7 +1008,7 @@ static void __init magician_init(void)
|
||||
pxa_set_udc_info(&magician_udc_info);
|
||||
|
||||
/* Check LCD type we have */
|
||||
cpld = ioremap_nocache(PXA_CS3_PHYS, 0x1000);
|
||||
cpld = ioremap(PXA_CS3_PHYS, 0x1000);
|
||||
if (cpld) {
|
||||
u8 board_id = __raw_readb(cpld + 0x14);
|
||||
|
||||
|
@ -189,7 +189,7 @@ static void apmu_init_cpu(struct resource *res, int cpu, int bit)
|
||||
if ((cpu >= ARRAY_SIZE(apmu_cpus)) || apmu_cpus[cpu].iomem)
|
||||
return;
|
||||
|
||||
apmu_cpus[cpu].iomem = ioremap_nocache(res->start, resource_size(res));
|
||||
apmu_cpus[cpu].iomem = ioremap(res->start, resource_size(res));
|
||||
apmu_cpus[cpu].bit = bit;
|
||||
|
||||
pr_debug("apmu ioremap %d %d %pr\n", cpu, bit, res);
|
||||
|
@ -103,7 +103,7 @@ map:
|
||||
iounmap(p);
|
||||
|
||||
/* setup reset vectors */
|
||||
p = ioremap_nocache(RST, 0x63);
|
||||
p = ioremap(RST, 0x63);
|
||||
bar = phys_to_sbar(res.start);
|
||||
if (has_a15) {
|
||||
writel_relaxed(bar, p + CA15BAR);
|
||||
|
@ -28,7 +28,7 @@ static void __init r8a7740_meram_workaround(void)
|
||||
{
|
||||
void __iomem *reg;
|
||||
|
||||
reg = ioremap_nocache(MEBUFCNTR, 4);
|
||||
reg = ioremap(MEBUFCNTR, 4);
|
||||
if (reg) {
|
||||
iowrite32(0x01600164, reg);
|
||||
iounmap(reg);
|
||||
@ -37,9 +37,9 @@ static void __init r8a7740_meram_workaround(void)
|
||||
|
||||
static void __init r8a7740_init_irq_of(void)
|
||||
{
|
||||
void __iomem *intc_prio_base = ioremap_nocache(0xe6900010, 0x10);
|
||||
void __iomem *intc_msk_base = ioremap_nocache(0xe6900040, 0x10);
|
||||
void __iomem *pfc_inta_ctrl = ioremap_nocache(0xe605807c, 0x4);
|
||||
void __iomem *intc_prio_base = ioremap(0xe6900010, 0x10);
|
||||
void __iomem *intc_msk_base = ioremap(0xe6900040, 0x10);
|
||||
void __iomem *pfc_inta_ctrl = ioremap(0xe605807c, 0x4);
|
||||
|
||||
irqchip_init();
|
||||
|
||||
|
@ -22,7 +22,7 @@
|
||||
|
||||
static void __init r8a7778_init_irq_dt(void)
|
||||
{
|
||||
void __iomem *base = ioremap_nocache(0xfe700000, 0x00100000);
|
||||
void __iomem *base = ioremap(0xfe700000, 0x00100000);
|
||||
|
||||
BUG_ON(!base);
|
||||
|
||||
|
@ -172,7 +172,6 @@ static inline void writel(u32 data, volatile void __iomem *addr)
|
||||
#define writel_relaxed __raw_writel
|
||||
|
||||
void __iomem *ioremap(unsigned long phys_addr, unsigned long size);
|
||||
#define ioremap_nocache ioremap
|
||||
#define ioremap_uc(X, Y) ioremap((X), (Y))
|
||||
|
||||
|
||||
|
@ -18,7 +18,7 @@
|
||||
extern unsigned long vga_console_iobase;
|
||||
extern unsigned long vga_console_membase;
|
||||
|
||||
#define VGA_MAP_MEM(x,s) ((unsigned long) ioremap_nocache(vga_console_membase + (x), s))
|
||||
#define VGA_MAP_MEM(x,s) ((unsigned long) ioremap(vga_console_membase + (x), s))
|
||||
|
||||
#define vga_readb(x) (*(x))
|
||||
#define vga_writeb(x,y) (*(y) = (x))
|
||||
|
@ -50,7 +50,7 @@ int __init init_cyclone_clock(void)
|
||||
|
||||
/* find base address */
|
||||
offset = (CYCLONE_CBAR_ADDR);
|
||||
reg = ioremap_nocache(offset, sizeof(u64));
|
||||
reg = ioremap(offset, sizeof(u64));
|
||||
if(!reg){
|
||||
printk(KERN_ERR "Summit chipset: Could not find valid CBAR"
|
||||
" register.\n");
|
||||
@ -68,7 +68,7 @@ int __init init_cyclone_clock(void)
|
||||
|
||||
/* setup PMCC */
|
||||
offset = (base + CYCLONE_PMCC_OFFSET);
|
||||
reg = ioremap_nocache(offset, sizeof(u64));
|
||||
reg = ioremap(offset, sizeof(u64));
|
||||
if(!reg){
|
||||
printk(KERN_ERR "Summit chipset: Could not find valid PMCC"
|
||||
" register.\n");
|
||||
@ -80,7 +80,7 @@ int __init init_cyclone_clock(void)
|
||||
|
||||
/* setup MPCS */
|
||||
offset = (base + CYCLONE_MPCS_OFFSET);
|
||||
reg = ioremap_nocache(offset, sizeof(u64));
|
||||
reg = ioremap(offset, sizeof(u64));
|
||||
if(!reg){
|
||||
printk(KERN_ERR "Summit chipset: Could not find valid MPCS"
|
||||
" register.\n");
|
||||
@ -92,7 +92,7 @@ int __init init_cyclone_clock(void)
|
||||
|
||||
/* map in cyclone_timer */
|
||||
offset = (base + CYCLONE_MPMC_OFFSET);
|
||||
cyclone_timer = ioremap_nocache(offset, sizeof(u32));
|
||||
cyclone_timer = ioremap(offset, sizeof(u32));
|
||||
if(!cyclone_timer){
|
||||
printk(KERN_ERR "Summit chipset: Could not find valid MPMC"
|
||||
" register.\n");
|
||||
|
@ -27,7 +27,6 @@ static inline void __iomem *ioremap(unsigned long physaddr, unsigned long size)
|
||||
return __ioremap(physaddr, size, IOMAP_NOCACHE_SER);
|
||||
}
|
||||
|
||||
#define ioremap_nocache ioremap
|
||||
#define ioremap_uc ioremap
|
||||
#define ioremap_wt ioremap_wt
|
||||
static inline void __iomem *ioremap_wt(unsigned long physaddr,
|
||||
|
@ -236,9 +236,9 @@ static void tnetd7300_set_clock(u32 shift, struct tnetd7300_clock *clock,
|
||||
|
||||
static void __init tnetd7300_init_clocks(void)
|
||||
{
|
||||
u32 *bootcr = (u32 *)ioremap_nocache(AR7_REGS_DCL, 4);
|
||||
u32 *bootcr = (u32 *)ioremap(AR7_REGS_DCL, 4);
|
||||
struct tnetd7300_clocks *clocks =
|
||||
ioremap_nocache(UR8_REGS_CLOCKS,
|
||||
ioremap(UR8_REGS_CLOCKS,
|
||||
sizeof(struct tnetd7300_clocks));
|
||||
|
||||
bus_clk.rate = tnetd7300_get_clock(BUS_PLL_SOURCE_SHIFT,
|
||||
@ -320,9 +320,9 @@ static int tnetd7200_get_clock_base(int clock_id, u32 *bootcr)
|
||||
|
||||
static void __init tnetd7200_init_clocks(void)
|
||||
{
|
||||
u32 *bootcr = (u32 *)ioremap_nocache(AR7_REGS_DCL, 4);
|
||||
u32 *bootcr = (u32 *)ioremap(AR7_REGS_DCL, 4);
|
||||
struct tnetd7200_clocks *clocks =
|
||||
ioremap_nocache(AR7_REGS_CLOCKS,
|
||||
ioremap(AR7_REGS_CLOCKS,
|
||||
sizeof(struct tnetd7200_clocks));
|
||||
int cpu_base, cpu_mul, cpu_prediv, cpu_postdiv;
|
||||
int dsp_base, dsp_mul, dsp_prediv, dsp_postdiv;
|
||||
|
@ -308,7 +308,7 @@ int __init ar7_gpio_init(void)
|
||||
size = 0x1f;
|
||||
}
|
||||
|
||||
gpch->regs = ioremap_nocache(AR7_REGS_GPIO, size);
|
||||
gpch->regs = ioremap(AR7_REGS_GPIO, size);
|
||||
if (!gpch->regs) {
|
||||
printk(KERN_ERR "%s: failed to ioremap regs\n",
|
||||
gpch->chip.label);
|
||||
|
@ -702,7 +702,7 @@ static int __init ar7_register_devices(void)
|
||||
pr_warn("unable to register usb slave: %d\n", res);
|
||||
|
||||
/* Register watchdog only if enabled in hardware */
|
||||
bootcr = ioremap_nocache(AR7_REGS_DCL, 4);
|
||||
bootcr = ioremap(AR7_REGS_DCL, 4);
|
||||
val = readl(bootcr);
|
||||
iounmap(bootcr);
|
||||
if (val & AR7_WDT_HW_ENA) {
|
||||
|
@ -262,7 +262,7 @@ void __init ar2315_plat_mem_setup(void)
|
||||
u32 config;
|
||||
|
||||
/* Detect memory size */
|
||||
sdram_base = ioremap_nocache(AR2315_SDRAMCTL_BASE,
|
||||
sdram_base = ioremap(AR2315_SDRAMCTL_BASE,
|
||||
AR2315_SDRAMCTL_SIZE);
|
||||
memcfg = __raw_readl(sdram_base + AR2315_MEM_CFG);
|
||||
memsize = 1 + ATH25_REG_MS(memcfg, AR2315_MEM_CFG_DATA_WIDTH);
|
||||
@ -272,7 +272,7 @@ void __init ar2315_plat_mem_setup(void)
|
||||
add_memory_region(0, memsize, BOOT_MEM_RAM);
|
||||
iounmap(sdram_base);
|
||||
|
||||
ar2315_rst_base = ioremap_nocache(AR2315_RST_BASE, AR2315_RST_SIZE);
|
||||
ar2315_rst_base = ioremap(AR2315_RST_BASE, AR2315_RST_SIZE);
|
||||
|
||||
/* Detect the hardware based on the device ID */
|
||||
devid = ar2315_rst_reg_read(AR2315_SREV) & AR2315_REV_CHIP;
|
||||
|
@ -185,7 +185,7 @@ static void __init ar5312_flash_init(void)
|
||||
void __iomem *flashctl_base;
|
||||
u32 ctl;
|
||||
|
||||
flashctl_base = ioremap_nocache(AR5312_FLASHCTL_BASE,
|
||||
flashctl_base = ioremap(AR5312_FLASHCTL_BASE,
|
||||
AR5312_FLASHCTL_SIZE);
|
||||
|
||||
ctl = __raw_readl(flashctl_base + AR5312_FLASHCTL0);
|
||||
@ -358,7 +358,7 @@ void __init ar5312_plat_mem_setup(void)
|
||||
u32 devid;
|
||||
|
||||
/* Detect memory size */
|
||||
sdram_base = ioremap_nocache(AR5312_SDRAMCTL_BASE,
|
||||
sdram_base = ioremap(AR5312_SDRAMCTL_BASE,
|
||||
AR5312_SDRAMCTL_SIZE);
|
||||
memcfg = __raw_readl(sdram_base + AR5312_MEM_CFG1);
|
||||
bank0_ac = ATH25_REG_MS(memcfg, AR5312_MEM_CFG1_AC0);
|
||||
@ -369,7 +369,7 @@ void __init ar5312_plat_mem_setup(void)
|
||||
add_memory_region(0, memsize, BOOT_MEM_RAM);
|
||||
iounmap(sdram_base);
|
||||
|
||||
ar5312_rst_base = ioremap_nocache(AR5312_RST_BASE, AR5312_RST_SIZE);
|
||||
ar5312_rst_base = ioremap(AR5312_RST_BASE, AR5312_RST_SIZE);
|
||||
|
||||
devid = ar5312_rst_reg_read(AR5312_REV);
|
||||
devid >>= AR5312_REV_WMAC_MIN_S;
|
||||
|
@ -111,7 +111,7 @@ int __init ath25_find_config(phys_addr_t base, unsigned long size)
|
||||
u8 *mac_addr;
|
||||
u32 offset;
|
||||
|
||||
flash_base = ioremap_nocache(base, size);
|
||||
flash_base = ioremap(base, size);
|
||||
flash_limit = flash_base + size;
|
||||
|
||||
ath25_board.config = NULL;
|
||||
|
@ -41,7 +41,7 @@ static void __iomem *ath79_ddr_pci_win_base;
|
||||
|
||||
void ath79_ddr_ctrl_init(void)
|
||||
{
|
||||
ath79_ddr_base = ioremap_nocache(AR71XX_DDR_CTRL_BASE,
|
||||
ath79_ddr_base = ioremap(AR71XX_DDR_CTRL_BASE,
|
||||
AR71XX_DDR_CTRL_SIZE);
|
||||
if (soc_is_ar913x() || soc_is_ar724x() || soc_is_ar933x()) {
|
||||
ath79_ddr_wb_flush_base = ath79_ddr_base + 0x7c;
|
||||
|
@ -226,9 +226,9 @@ void __init plat_mem_setup(void)
|
||||
else if (fw_passed_dtb)
|
||||
__dt_setup_arch((void *)KSEG0ADDR(fw_passed_dtb));
|
||||
|
||||
ath79_reset_base = ioremap_nocache(AR71XX_RESET_BASE,
|
||||
ath79_reset_base = ioremap(AR71XX_RESET_BASE,
|
||||
AR71XX_RESET_SIZE);
|
||||
ath79_pll_base = ioremap_nocache(AR71XX_PLL_BASE,
|
||||
ath79_pll_base = ioremap(AR71XX_PLL_BASE,
|
||||
AR71XX_PLL_SIZE);
|
||||
ath79_detect_sys_type();
|
||||
ath79_ddr_ctrl_init();
|
||||
|
@ -357,7 +357,7 @@ static void octeon_write_lcd(const char *s)
|
||||
{
|
||||
if (octeon_bootinfo->led_display_base_addr) {
|
||||
void __iomem *lcd_address =
|
||||
ioremap_nocache(octeon_bootinfo->led_display_base_addr,
|
||||
ioremap(octeon_bootinfo->led_display_base_addr,
|
||||
8);
|
||||
int i;
|
||||
for (i = 0; i < 8; i++, s++) {
|
||||
|
@ -51,7 +51,7 @@ static void __init ocelot_earlyprintk_init(void)
|
||||
{
|
||||
void __iomem *uart_base;
|
||||
|
||||
uart_base = ioremap_nocache(UART_UART, 0x20);
|
||||
uart_base = ioremap(UART_UART, 0x20);
|
||||
setup_8250_early_printk_port((unsigned long)uart_base, 2, 50000);
|
||||
}
|
||||
|
||||
|
@ -227,7 +227,6 @@ static inline void __iomem *ioremap_prot(phys_addr_t offset,
|
||||
*/
|
||||
#define ioremap(offset, size) \
|
||||
__ioremap_mode((offset), (size), _CACHE_UNCACHED)
|
||||
#define ioremap_nocache ioremap
|
||||
#define ioremap_uc ioremap
|
||||
|
||||
/*
|
||||
|
@ -194,7 +194,7 @@ static void mips_cm_probe_l2sync(void)
|
||||
write_gcr_l2_only_sync_base(addr | CM_GCR_L2_ONLY_SYNC_BASE_SYNCEN);
|
||||
|
||||
/* Map the region */
|
||||
mips_cm_l2sync_base = ioremap_nocache(addr, MIPS_CM_L2SYNC_SIZE);
|
||||
mips_cm_l2sync_base = ioremap(addr, MIPS_CM_L2SYNC_SIZE);
|
||||
}
|
||||
|
||||
int mips_cm_probe(void)
|
||||
@ -215,7 +215,7 @@ int mips_cm_probe(void)
|
||||
if (!addr)
|
||||
return -ENODEV;
|
||||
|
||||
mips_gcr_base = ioremap_nocache(addr, MIPS_CM_GCR_SIZE);
|
||||
mips_gcr_base = ioremap(addr, MIPS_CM_GCR_SIZE);
|
||||
if (!mips_gcr_base)
|
||||
return -ENXIO;
|
||||
|
||||
|
@ -78,7 +78,7 @@ int mips_cpc_probe(void)
|
||||
if (!addr)
|
||||
return -ENODEV;
|
||||
|
||||
mips_cpc_base = ioremap_nocache(addr, 0x8000);
|
||||
mips_cpc_base = ioremap(addr, 0x8000);
|
||||
if (!mips_cpc_base)
|
||||
return -ENXIO;
|
||||
|
||||
|
@ -221,16 +221,16 @@ void __init ltq_soc_init(void)
|
||||
res_sys[2].name) < 0))
|
||||
pr_err("Failed to request core resources");
|
||||
|
||||
status_membase = ioremap_nocache(res_status.start,
|
||||
status_membase = ioremap(res_status.start,
|
||||
resource_size(&res_status));
|
||||
ltq_ebu_membase = ioremap_nocache(res_ebu.start,
|
||||
ltq_ebu_membase = ioremap(res_ebu.start,
|
||||
resource_size(&res_ebu));
|
||||
|
||||
if (!status_membase || !ltq_ebu_membase)
|
||||
panic("Failed to remap core resources");
|
||||
|
||||
for (i = 0; i < 3; i++) {
|
||||
sysctl_membase[i] = ioremap_nocache(res_sys[i].start,
|
||||
sysctl_membase[i] = ioremap(res_sys[i].start,
|
||||
resource_size(&res_sys[i]));
|
||||
if (!sysctl_membase[i])
|
||||
panic("Failed to remap sysctrl resources");
|
||||
|
@ -349,7 +349,7 @@ int __init icu_of_init(struct device_node *node, struct device_node *parent)
|
||||
res.name))
|
||||
pr_err("Failed to request icu%i memory\n", vpe);
|
||||
|
||||
ltq_icu_membase[vpe] = ioremap_nocache(res.start,
|
||||
ltq_icu_membase[vpe] = ioremap(res.start,
|
||||
resource_size(&res));
|
||||
|
||||
if (!ltq_icu_membase[vpe])
|
||||
@ -402,7 +402,7 @@ int __init icu_of_init(struct device_node *node, struct device_node *parent)
|
||||
res.name))
|
||||
pr_err("Failed to request eiu memory");
|
||||
|
||||
ltq_eiu_membase = ioremap_nocache(res.start,
|
||||
ltq_eiu_membase = ioremap(res.start,
|
||||
resource_size(&res));
|
||||
if (!ltq_eiu_membase)
|
||||
panic("Failed to remap eiu memory");
|
||||
|
@ -431,10 +431,10 @@ void __init ltq_soc_init(void)
|
||||
res_ebu.name))
|
||||
pr_err("Failed to request core resources");
|
||||
|
||||
pmu_membase = ioremap_nocache(res_pmu.start, resource_size(&res_pmu));
|
||||
ltq_cgu_membase = ioremap_nocache(res_cgu.start,
|
||||
pmu_membase = ioremap(res_pmu.start, resource_size(&res_pmu));
|
||||
ltq_cgu_membase = ioremap(res_cgu.start,
|
||||
resource_size(&res_cgu));
|
||||
ltq_ebu_membase = ioremap_nocache(res_ebu.start,
|
||||
ltq_ebu_membase = ioremap(res_ebu.start,
|
||||
resource_size(&res_ebu));
|
||||
if (!pmu_membase || !ltq_cgu_membase || !ltq_ebu_membase)
|
||||
panic("Failed to remap core resources");
|
||||
|
@ -17,11 +17,11 @@
|
||||
static inline void loongson_reboot(void)
|
||||
{
|
||||
#ifndef CONFIG_CPU_JUMP_WORKAROUNDS
|
||||
((void (*)(void))ioremap_nocache(LOONGSON_BOOT_BASE, 4)) ();
|
||||
((void (*)(void))ioremap(LOONGSON_BOOT_BASE, 4)) ();
|
||||
#else
|
||||
void (*func)(void);
|
||||
|
||||
func = (void *)ioremap_nocache(LOONGSON_BOOT_BASE, 4);
|
||||
func = (void *)ioremap(LOONGSON_BOOT_BASE, 4);
|
||||
|
||||
__asm__ __volatile__(
|
||||
" .set noat \n"
|
||||
|
@ -26,13 +26,13 @@ void __init prom_init(void)
|
||||
memsize = DEFAULT_MEMSIZE;
|
||||
|
||||
if (strstr(arcs_cmdline, "console=ttyS3"))
|
||||
uart_base = ioremap_nocache(LS1X_UART3_BASE, 0x0f);
|
||||
uart_base = ioremap(LS1X_UART3_BASE, 0x0f);
|
||||
else if (strstr(arcs_cmdline, "console=ttyS2"))
|
||||
uart_base = ioremap_nocache(LS1X_UART2_BASE, 0x0f);
|
||||
uart_base = ioremap(LS1X_UART2_BASE, 0x0f);
|
||||
else if (strstr(arcs_cmdline, "console=ttyS1"))
|
||||
uart_base = ioremap_nocache(LS1X_UART1_BASE, 0x0f);
|
||||
uart_base = ioremap(LS1X_UART1_BASE, 0x0f);
|
||||
else
|
||||
uart_base = ioremap_nocache(LS1X_UART0_BASE, 0x0f);
|
||||
uart_base = ioremap(LS1X_UART0_BASE, 0x0f);
|
||||
setup_8250_early_printk_port((unsigned long)uart_base, 0, 0);
|
||||
}
|
||||
|
||||
|
@ -37,7 +37,7 @@ static void ls1x_power_off(void)
|
||||
|
||||
static int __init ls1x_reboot_setup(void)
|
||||
{
|
||||
wdt_reg_base = ioremap_nocache(LS1X_WDT_BASE, (SZ_4 + SZ_8));
|
||||
wdt_reg_base = ioremap(LS1X_WDT_BASE, (SZ_4 + SZ_8));
|
||||
if (!wdt_reg_base)
|
||||
panic("Failed to remap watchdog registers");
|
||||
|
||||
|
@ -49,7 +49,7 @@ static inline void ls1x_pwmtimer_restart(void)
|
||||
|
||||
void __init ls1x_pwmtimer_init(void)
|
||||
{
|
||||
timer_reg_base = ioremap_nocache(LS1X_TIMER_BASE, SZ_16);
|
||||
timer_reg_base = ioremap(LS1X_TIMER_BASE, SZ_16);
|
||||
if (!timer_reg_base)
|
||||
panic("Failed to remap timer registers");
|
||||
|
||||
|
@ -17,7 +17,7 @@
|
||||
|
||||
static inline void loongson_reboot(void)
|
||||
{
|
||||
((void (*)(void))ioremap_nocache(LOONGSON_BOOT_BASE, 4)) ();
|
||||
((void (*)(void))ioremap(LOONGSON_BOOT_BASE, 4)) ();
|
||||
}
|
||||
|
||||
static void loongson_restart(char *command)
|
||||
|
@ -240,7 +240,7 @@ static void __init remove_gic(void *fdt)
|
||||
* On systems using the RocIT system controller a GIC may be
|
||||
* present without a CM. Detect whether that is the case.
|
||||
*/
|
||||
biu_base = ioremap_nocache(MSC01_BIU_REG_BASE,
|
||||
biu_base = ioremap(MSC01_BIU_REG_BASE,
|
||||
MSC01_BIU_ADDRSPACE_SZ);
|
||||
sc_cfg = __raw_readl(biu_base + MSC01_SC_CFG_OFS);
|
||||
if (sc_cfg & MSC01_SC_CFG_GICPRES_MSK) {
|
||||
|
@ -409,7 +409,7 @@ static int alchemy_pci_probe(struct platform_device *pdev)
|
||||
goto out6;
|
||||
}
|
||||
|
||||
ctx->regs = ioremap_nocache(r->start, resource_size(r));
|
||||
ctx->regs = ioremap(r->start, resource_size(r));
|
||||
if (!ctx->regs) {
|
||||
dev_err(&pdev->dev, "cannot map pci regs\n");
|
||||
ret = -ENODEV;
|
||||
|
@ -441,7 +441,7 @@ static int ar2315_pci_probe(struct platform_device *pdev)
|
||||
apc->mem_res.flags = IORESOURCE_MEM;
|
||||
|
||||
/* Remap PCI config space */
|
||||
apc->cfg_mem = devm_ioremap_nocache(dev, res->start,
|
||||
apc->cfg_mem = devm_ioremap(dev, res->start,
|
||||
AR2315_PCI_CFG_SIZE);
|
||||
if (!apc->cfg_mem) {
|
||||
dev_err(dev, "failed to remap PCI config space\n");
|
||||
|
@ -221,7 +221,7 @@ static int __init bcm63xx_register_pci(void)
|
||||
* a spinlock for each io access, so this is currently kind of
|
||||
* broken on SMP.
|
||||
*/
|
||||
pci_iospace_start = ioremap_nocache(BCM_PCI_IO_BASE_PA, 4);
|
||||
pci_iospace_start = ioremap(BCM_PCI_IO_BASE_PA, 4);
|
||||
if (!pci_iospace_start)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -218,7 +218,7 @@ static int rt288x_pci_probe(struct platform_device *pdev)
|
||||
{
|
||||
void __iomem *io_map_base;
|
||||
|
||||
rt2880_pci_base = ioremap_nocache(RT2880_PCI_BASE, PAGE_SIZE);
|
||||
rt2880_pci_base = ioremap(RT2880_PCI_BASE, PAGE_SIZE);
|
||||
|
||||
io_map_base = ioremap(RT2880_PCI_IO_BASE, RT2880_PCI_IO_SIZE);
|
||||
rt2880_pci_controller.io_map_base = (unsigned long) io_map_base;
|
||||
|
@ -135,7 +135,7 @@ void __init fw_init_early_console(char port)
|
||||
char *arch_cmdline = pic32_getcmdline();
|
||||
int baud = -1;
|
||||
|
||||
uart_base = ioremap_nocache(PIC32_BASE_UART, 0xc00);
|
||||
uart_base = ioremap(PIC32_BASE_UART, 0xc00);
|
||||
|
||||
baud = get_baud_from_cmdline(arch_cmdline);
|
||||
if (port == -1)
|
||||
|
@ -122,7 +122,7 @@ static const struct
|
||||
|
||||
void pic32_pps_input(int function, int pin)
|
||||
{
|
||||
void __iomem *pps_base = ioremap_nocache(PPS_BASE, 0xF4);
|
||||
void __iomem *pps_base = ioremap(PPS_BASE, 0xF4);
|
||||
int i;
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(input_pin_reg); i++) {
|
||||
@ -252,7 +252,7 @@ static const struct
|
||||
|
||||
void pic32_pps_output(int function, int pin)
|
||||
{
|
||||
void __iomem *pps_base = ioremap_nocache(PPS_BASE, 0x170);
|
||||
void __iomem *pps_base = ioremap(PPS_BASE, 0x170);
|
||||
int i;
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(output_pin_reg); i++) {
|
||||
|
@ -105,7 +105,7 @@ void __init msp_serial_setup(void)
|
||||
|
||||
/* Initialize first serial port */
|
||||
up.mapbase = MSP_UART0_BASE;
|
||||
up.membase = ioremap_nocache(up.mapbase, MSP_UART_REG_LEN);
|
||||
up.membase = ioremap(up.mapbase, MSP_UART_REG_LEN);
|
||||
up.irq = MSP_INT_UART0;
|
||||
up.uartclk = uartclk;
|
||||
up.regshift = 2;
|
||||
@ -143,7 +143,7 @@ void __init msp_serial_setup(void)
|
||||
}
|
||||
|
||||
up.mapbase = MSP_UART1_BASE;
|
||||
up.membase = ioremap_nocache(up.mapbase, MSP_UART_REG_LEN);
|
||||
up.membase = ioremap(up.mapbase, MSP_UART_REG_LEN);
|
||||
up.irq = MSP_INT_UART1;
|
||||
up.line = 1;
|
||||
up.private_data = (void*)UART1_STATUS_REG;
|
||||
|
@ -165,7 +165,7 @@ static int __init intc_of_init(struct device_node *node,
|
||||
res.name))
|
||||
pr_err("Failed to request intc memory");
|
||||
|
||||
rt_intc_membase = ioremap_nocache(res.start,
|
||||
rt_intc_membase = ioremap(res.start,
|
||||
resource_size(&res));
|
||||
if (!rt_intc_membase)
|
||||
panic("Failed to remap intc memory");
|
||||
|
@ -43,7 +43,7 @@ __iomem void *plat_of_remap_node(const char *node)
|
||||
res.name))
|
||||
panic("Failed to request resources for %s", node);
|
||||
|
||||
return ioremap_nocache(res.start, resource_size(&res));
|
||||
return ioremap(res.start, resource_size(&res));
|
||||
}
|
||||
|
||||
void __init device_tree_init(void)
|
||||
|
@ -286,7 +286,7 @@ static int __init plat_setup_devices(void)
|
||||
nand_slot0_res[0].end = nand_slot0_res[0].start + 0x1000;
|
||||
|
||||
/* Read and map device controller 3 */
|
||||
dev3.base = ioremap_nocache(readl(IDT434_REG_BASE + DEV3BASE), 1);
|
||||
dev3.base = ioremap(readl(IDT434_REG_BASE + DEV3BASE), 1);
|
||||
|
||||
if (!dev3.base) {
|
||||
printk(KERN_ERR "rb532: cannot remap device controller 3\n");
|
||||
|
@ -192,7 +192,7 @@ int __init rb532_gpio_init(void)
|
||||
struct resource *r;
|
||||
|
||||
r = rb532_gpio_reg0_res;
|
||||
rb532_gpio_chip->regbase = ioremap_nocache(r->start, resource_size(r));
|
||||
rb532_gpio_chip->regbase = ioremap(r->start, resource_size(r));
|
||||
|
||||
if (!rb532_gpio_chip->regbase) {
|
||||
printk(KERN_ERR "rb532: cannot remap GPIO register 0\n");
|
||||
|
@ -110,7 +110,7 @@ void __init prom_init(void)
|
||||
phys_addr_t memsize;
|
||||
phys_addr_t ddrbase;
|
||||
|
||||
ddr = ioremap_nocache(ddr_reg[0].start,
|
||||
ddr = ioremap(ddr_reg[0].start,
|
||||
ddr_reg[0].end - ddr_reg[0].start);
|
||||
|
||||
if (!ddr) {
|
||||
|
@ -49,7 +49,7 @@ void __init plat_mem_setup(void)
|
||||
|
||||
set_io_port_base(KSEG1);
|
||||
|
||||
pci_reg = ioremap_nocache(pci0_res[0].start,
|
||||
pci_reg = ioremap(pci0_res[0].start,
|
||||
pci0_res[0].end - pci0_res[0].start);
|
||||
if (!pci_reg) {
|
||||
printk(KERN_ERR "Could not remap PCI registers\n");
|
||||
|
@ -399,10 +399,10 @@ void __init sni_rm200_i8259_irqs(void)
|
||||
{
|
||||
int i;
|
||||
|
||||
rm200_pic_master = ioremap_nocache(0x16000020, 4);
|
||||
rm200_pic_master = ioremap(0x16000020, 4);
|
||||
if (!rm200_pic_master)
|
||||
return;
|
||||
rm200_pic_slave = ioremap_nocache(0x160000a0, 4);
|
||||
rm200_pic_slave = ioremap(0x160000a0, 4);
|
||||
if (!rm200_pic_slave) {
|
||||
iounmap(rm200_pic_master);
|
||||
return;
|
||||
|
@ -128,9 +128,8 @@ static inline void gsc_writeq(unsigned long long val, unsigned long addr)
|
||||
* The standard PCI ioremap interfaces
|
||||
*/
|
||||
void __iomem *ioremap(unsigned long offset, unsigned long size);
|
||||
#define ioremap_nocache(off, sz) ioremap((off), (sz))
|
||||
#define ioremap_wc ioremap_nocache
|
||||
#define ioremap_uc ioremap_nocache
|
||||
#define ioremap_wc ioremap
|
||||
#define ioremap_uc ioremap
|
||||
|
||||
extern void iounmap(const volatile void __iomem *addr);
|
||||
|
||||
|
@ -792,7 +792,7 @@ static int perf_write_image(uint64_t *memaddr)
|
||||
return -1;
|
||||
}
|
||||
|
||||
runway = ioremap_nocache(cpu_device->hpa.start, 4096);
|
||||
runway = ioremap(cpu_device->hpa.start, 4096);
|
||||
if (!runway) {
|
||||
pr_err("perf_write_image: ioremap failed!\n");
|
||||
return -ENOMEM;
|
||||
|
@ -691,8 +691,6 @@ static inline void iosync(void)
|
||||
* * ioremap_prot allows to specify the page flags as an argument and can
|
||||
* also be hooked by the platform via ppc_md.
|
||||
*
|
||||
* * ioremap_nocache is identical to ioremap
|
||||
*
|
||||
* * ioremap_wc enables write combining
|
||||
*
|
||||
* * ioremap_wt enables write through
|
||||
@ -715,7 +713,6 @@ extern void __iomem *ioremap_prot(phys_addr_t address, unsigned long size,
|
||||
extern void __iomem *ioremap_wc(phys_addr_t address, unsigned long size);
|
||||
void __iomem *ioremap_wt(phys_addr_t address, unsigned long size);
|
||||
void __iomem *ioremap_coherent(phys_addr_t address, unsigned long size);
|
||||
#define ioremap_nocache(addr, size) ioremap((addr), (size))
|
||||
#define ioremap_uc(addr, size) ioremap((addr), (size))
|
||||
#define ioremap_cache(addr, size) \
|
||||
ioremap_prot((addr), (size), pgprot_val(PAGE_KERNEL))
|
||||
|
@ -341,7 +341,7 @@ static void __init sh7785lcr_setup(char **cmdline_p)
|
||||
pm_power_off = sh7785lcr_power_off;
|
||||
|
||||
/* sm501 DRAM configuration */
|
||||
sm501_reg = ioremap_nocache(SM107_REG_ADDR, SM501_DRAM_CONTROL);
|
||||
sm501_reg = ioremap(SM107_REG_ADDR, SM501_DRAM_CONTROL);
|
||||
if (!sm501_reg) {
|
||||
printk(KERN_ERR "%s: ioremap error.\n", __func__);
|
||||
return;
|
||||
|
@ -137,7 +137,7 @@ void init_cayman_irq(void)
|
||||
{
|
||||
int i;
|
||||
|
||||
epld_virt = (unsigned long)ioremap_nocache(EPLD_BASE, 1024);
|
||||
epld_virt = (unsigned long)ioremap(EPLD_BASE, 1024);
|
||||
if (!epld_virt) {
|
||||
printk(KERN_ERR "Cayman IRQ: Unable to remap EPLD\n");
|
||||
return;
|
||||
|
@ -99,7 +99,7 @@ static int __init smsc_superio_setup(void)
|
||||
{
|
||||
unsigned char devid, devrev;
|
||||
|
||||
smsc_superio_virt = (unsigned long)ioremap_nocache(SMSC_SUPERIO_BASE, 1024);
|
||||
smsc_superio_virt = (unsigned long)ioremap(SMSC_SUPERIO_BASE, 1024);
|
||||
if (!smsc_superio_virt) {
|
||||
panic("Unable to remap SMSC SuperIO\n");
|
||||
}
|
||||
|
@ -32,7 +32,7 @@ static void __iomem *sdk7786_fpga_probe(void)
|
||||
* is reserved.
|
||||
*/
|
||||
for (area = PA_AREA0; area < PA_AREA7; area += SZ_64M) {
|
||||
base = ioremap_nocache(area + FPGA_REGS_OFFSET, FPGA_REGS_SIZE);
|
||||
base = ioremap(area + FPGA_REGS_OFFSET, FPGA_REGS_SIZE);
|
||||
if (!base) {
|
||||
/* Failed to remap this area, move along. */
|
||||
continue;
|
||||
|
@ -96,7 +96,7 @@ static int heartbeat_drv_probe(struct platform_device *pdev)
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
hd->base = ioremap_nocache(res->start, resource_size(res));
|
||||
hd->base = ioremap(res->start, resource_size(res));
|
||||
if (unlikely(!hd->base)) {
|
||||
dev_err(&pdev->dev, "ioremap failed\n");
|
||||
|
||||
|
@ -115,12 +115,12 @@ static int __init sh5pci_init(void)
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
pcicr_virt = (unsigned long)ioremap_nocache(SH5PCI_ICR_BASE, 1024);
|
||||
pcicr_virt = (unsigned long)ioremap(SH5PCI_ICR_BASE, 1024);
|
||||
if (!pcicr_virt) {
|
||||
panic("Unable to remap PCICR\n");
|
||||
}
|
||||
|
||||
PCI_IO_AREA = (unsigned long)ioremap_nocache(SH5PCI_IO_BASE, 0x10000);
|
||||
PCI_IO_AREA = (unsigned long)ioremap(SH5PCI_IO_BASE, 0x10000);
|
||||
if (!PCI_IO_AREA) {
|
||||
panic("Unable to remap PCIIO\n");
|
||||
}
|
||||
|
@ -367,7 +367,6 @@ static inline void ioremap_fixed_init(void) { }
|
||||
static inline int iounmap_fixed(void __iomem *addr) { return -EINVAL; }
|
||||
#endif
|
||||
|
||||
#define ioremap_nocache ioremap
|
||||
#define ioremap_uc ioremap
|
||||
|
||||
/*
|
||||
|
@ -124,7 +124,7 @@ void __init plat_irq_setup(void)
|
||||
unsigned long reg;
|
||||
int i;
|
||||
|
||||
intc_virt = (unsigned long)ioremap_nocache(INTC_BASE, 1024);
|
||||
intc_virt = (unsigned long)ioremap(INTC_BASE, 1024);
|
||||
if (!intc_virt) {
|
||||
panic("Unable to remap INTC\n");
|
||||
}
|
||||
|
@ -88,8 +88,8 @@ static void j2_start_cpu(unsigned int cpu, unsigned long entry_point)
|
||||
if (!np) return;
|
||||
|
||||
if (of_property_read_u32_array(np, "cpu-release-addr", regs, 2)) return;
|
||||
release = ioremap_nocache(regs[0], sizeof(u32));
|
||||
initpc = ioremap_nocache(regs[1], sizeof(u32));
|
||||
release = ioremap(regs[0], sizeof(u32));
|
||||
initpc = ioremap(regs[1], sizeof(u32));
|
||||
|
||||
__raw_writel(entry_point, initpc);
|
||||
__raw_writel(1, release);
|
||||
|
@ -68,7 +68,7 @@ static struct sh_clk_ops *sh5_clk_ops[] = {
|
||||
|
||||
void __init arch_init_clk_ops(struct sh_clk_ops **ops, int idx)
|
||||
{
|
||||
cprc_base = (unsigned long)ioremap_nocache(CPRC_BASE, 1024);
|
||||
cprc_base = (unsigned long)ioremap(CPRC_BASE, 1024);
|
||||
BUG_ON(!cprc_base);
|
||||
|
||||
if (idx < ARRAY_SIZE(sh5_clk_ops))
|
||||
|
@ -28,7 +28,7 @@ void *arch_dma_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle,
|
||||
arch_sync_dma_for_device(virt_to_phys(ret), size,
|
||||
DMA_BIDIRECTIONAL);
|
||||
|
||||
ret_nocache = (void __force *)ioremap_nocache(virt_to_phys(ret), size);
|
||||
ret_nocache = (void __force *)ioremap(virt_to_phys(ret), size);
|
||||
if (!ret_nocache) {
|
||||
free_pages((unsigned long)ret, order);
|
||||
return NULL;
|
||||
|
@ -406,7 +406,6 @@ static inline void __iomem *ioremap(unsigned long offset, unsigned long size)
|
||||
return (void __iomem *)offset;
|
||||
}
|
||||
|
||||
#define ioremap_nocache(X,Y) ioremap((X),(Y))
|
||||
#define ioremap_uc(X,Y) ioremap((X),(Y))
|
||||
#define ioremap_wc(X,Y) ioremap((X),(Y))
|
||||
#define ioremap_wt(X,Y) ioremap((X),(Y))
|
||||
|
@ -31,7 +31,6 @@ extern void __uc32_iounmap(volatile void __iomem *addr);
|
||||
*
|
||||
*/
|
||||
#define ioremap(cookie, size) __uc32_ioremap(cookie, size)
|
||||
#define ioremap_nocache(cookie, size) __uc32_ioremap(cookie, size)
|
||||
#define iounmap(cookie) __uc32_iounmap(cookie)
|
||||
|
||||
#define readb_relaxed readb
|
||||
|
@ -95,7 +95,7 @@ static inline void apbt_set_mapping(void)
|
||||
printk(KERN_WARNING "No timer base from SFI, use default\n");
|
||||
apbt_address = APBT_DEFAULT_BASE;
|
||||
}
|
||||
apbt_virt_address = ioremap_nocache(apbt_address, APBT_MMAP_SIZE);
|
||||
apbt_virt_address = ioremap(apbt_address, APBT_MMAP_SIZE);
|
||||
if (!apbt_virt_address) {
|
||||
pr_debug("Failed mapping APBT phy address at %lu\n",\
|
||||
(unsigned long)apbt_address);
|
||||
|
@ -84,7 +84,7 @@ static inline void hpet_writel(unsigned int d, unsigned int a)
|
||||
|
||||
static inline void hpet_set_mapping(void)
|
||||
{
|
||||
hpet_virt_address = ioremap_nocache(hpet_address, HPET_MMAP_SIZE);
|
||||
hpet_virt_address = ioremap(hpet_address, HPET_MMAP_SIZE);
|
||||
}
|
||||
|
||||
static inline void hpet_clear_mapping(void)
|
||||
|
@ -110,7 +110,7 @@ static void ich_force_enable_hpet(struct pci_dev *dev)
|
||||
}
|
||||
|
||||
/* use bits 31:14, 16 kB aligned */
|
||||
rcba_base = ioremap_nocache(rcba, 0x4000);
|
||||
rcba_base = ioremap(rcba, 0x4000);
|
||||
if (rcba_base == NULL) {
|
||||
dev_printk(KERN_DEBUG, &dev->dev, "ioremap failed; "
|
||||
"cannot force enable HPET\n");
|
||||
|
@ -354,7 +354,7 @@ static ssize_t tboot_log_read(struct file *file, char __user *user_buf, size_t c
|
||||
void *kbuf;
|
||||
int ret = -EFAULT;
|
||||
|
||||
log_base = ioremap_nocache(TBOOT_SERIAL_LOG_ADDR, TBOOT_SERIAL_LOG_SIZE);
|
||||
log_base = ioremap(TBOOT_SERIAL_LOG_ADDR, TBOOT_SERIAL_LOG_SIZE);
|
||||
if (!log_base)
|
||||
return ret;
|
||||
|
||||
|
@ -79,7 +79,7 @@ static void do_read_far_test(void __iomem *p)
|
||||
|
||||
static void do_test(unsigned long size)
|
||||
{
|
||||
void __iomem *p = ioremap_nocache(mmio_address, size);
|
||||
void __iomem *p = ioremap(mmio_address, size);
|
||||
if (!p) {
|
||||
pr_err("could not ioremap, aborting.\n");
|
||||
return;
|
||||
@ -104,7 +104,7 @@ static void do_test_bulk_ioremapping(void)
|
||||
int i;
|
||||
|
||||
for (i = 0; i < 10; ++i) {
|
||||
p = ioremap_nocache(mmio_address, PAGE_SIZE);
|
||||
p = ioremap(mmio_address, PAGE_SIZE);
|
||||
if (p)
|
||||
iounmap(p);
|
||||
}
|
||||
|
@ -105,7 +105,7 @@ static void __iomem *mcfg_ioremap(struct pci_mmcfg_region *cfg)
|
||||
start = cfg->address + PCI_MMCFG_BUS_OFFSET(cfg->start_bus);
|
||||
num_buses = cfg->end_bus - cfg->start_bus + 1;
|
||||
size = PCI_MMCFG_BUS_OFFSET(num_buses);
|
||||
addr = ioremap_nocache(start, size);
|
||||
addr = ioremap(start, size);
|
||||
if (addr)
|
||||
addr -= PCI_MMCFG_BUS_OFFSET(cfg->start_bus);
|
||||
return addr;
|
||||
|
@ -104,7 +104,7 @@ static void lpit_update_residency(struct lpit_residency_info *info,
|
||||
|
||||
info->gaddr = lpit_native->residency_counter;
|
||||
if (info->gaddr.space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) {
|
||||
info->iomem_addr = ioremap_nocache(info->gaddr.address,
|
||||
info->iomem_addr = ioremap(info->gaddr.address,
|
||||
info->gaddr.bit_width / 8);
|
||||
if (!info->iomem_addr)
|
||||
return;
|
||||
|
@ -824,7 +824,7 @@ static int arasan_cf_probe(struct platform_device *pdev)
|
||||
quirk |= CF_BROKEN_MWDMA | CF_BROKEN_UDMA;
|
||||
|
||||
acdev->pbase = res->start;
|
||||
acdev->vbase = devm_ioremap_nocache(&pdev->dev, res->start,
|
||||
acdev->vbase = devm_ioremap(&pdev->dev, res->start,
|
||||
resource_size(res));
|
||||
if (!acdev->vbase) {
|
||||
dev_warn(&pdev->dev, "ioremap fail\n");
|
||||
|
@ -891,7 +891,7 @@ static int octeon_cf_probe(struct platform_device *pdev)
|
||||
of_node_put(dma_node);
|
||||
return -EINVAL;
|
||||
}
|
||||
cf_port->dma_base = (u64)devm_ioremap_nocache(&pdev->dev, res_dma->start,
|
||||
cf_port->dma_base = (u64)devm_ioremap(&pdev->dev, res_dma->start,
|
||||
resource_size(res_dma));
|
||||
if (!cf_port->dma_base) {
|
||||
of_node_put(dma_node);
|
||||
@ -909,7 +909,7 @@ static int octeon_cf_probe(struct platform_device *pdev)
|
||||
if (!res_cs1)
|
||||
return -EINVAL;
|
||||
|
||||
cs1 = devm_ioremap_nocache(&pdev->dev, res_cs1->start,
|
||||
cs1 = devm_ioremap(&pdev->dev, res_cs1->start,
|
||||
resource_size(res_cs1));
|
||||
if (!cs1)
|
||||
return rv;
|
||||
@ -925,7 +925,7 @@ static int octeon_cf_probe(struct platform_device *pdev)
|
||||
if (!res_cs0)
|
||||
return -EINVAL;
|
||||
|
||||
cs0 = devm_ioremap_nocache(&pdev->dev, res_cs0->start,
|
||||
cs0 = devm_ioremap(&pdev->dev, res_cs0->start,
|
||||
resource_size(res_cs0));
|
||||
if (!cs0)
|
||||
return rv;
|
||||
|
@ -140,7 +140,7 @@ static int rb532_pata_driver_probe(struct platform_device *pdev)
|
||||
info->gpio_line = gpiod;
|
||||
info->irq = irq;
|
||||
|
||||
info->iobase = devm_ioremap_nocache(&pdev->dev, res->start,
|
||||
info->iobase = devm_ioremap(&pdev->dev, res->start,
|
||||
resource_size(res));
|
||||
if (!info->iobase)
|
||||
return -ENOMEM;
|
||||
|
@ -31,12 +31,6 @@
|
||||
#include "suni.h"
|
||||
#include "eni.h"
|
||||
|
||||
#if !defined(__i386__) && !defined(__x86_64__)
|
||||
#ifndef ioremap_nocache
|
||||
#define ioremap_nocache(X,Y) ioremap(X,Y)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/*
|
||||
* TODO:
|
||||
*
|
||||
@ -1725,7 +1719,7 @@ static int eni_do_init(struct atm_dev *dev)
|
||||
}
|
||||
printk(KERN_NOTICE DEV_LABEL "(itf %d): rev.%d,base=0x%lx,irq=%d,",
|
||||
dev->number,pci_dev->revision,real_base,eni_dev->irq);
|
||||
if (!(base = ioremap_nocache(real_base,MAP_MAX_SIZE))) {
|
||||
if (!(base = ioremap(real_base,MAP_MAX_SIZE))) {
|
||||
printk("\n");
|
||||
printk(KERN_ERR DEV_LABEL "(itf %d): can't set up page "
|
||||
"mapping\n",dev->number);
|
||||
|
@ -48,7 +48,7 @@ int bcma_core_chipcommon_b_init(struct bcma_drv_cc_b *ccb)
|
||||
return 0;
|
||||
|
||||
ccb->setup_done = 1;
|
||||
ccb->mii = ioremap_nocache(ccb->core->addr_s[1], BCMA_CORE_SIZE);
|
||||
ccb->mii = ioremap(ccb->core->addr_s[1], BCMA_CORE_SIZE);
|
||||
if (!ccb->mii)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -115,7 +115,7 @@ static int bcma_extpci_read_config(struct bcma_drv_pci *pc, unsigned int dev,
|
||||
if (unlikely(!addr))
|
||||
goto out;
|
||||
err = -ENOMEM;
|
||||
mmio = ioremap_nocache(addr, sizeof(val));
|
||||
mmio = ioremap(addr, sizeof(val));
|
||||
if (!mmio)
|
||||
goto out;
|
||||
|
||||
@ -180,7 +180,7 @@ static int bcma_extpci_write_config(struct bcma_drv_pci *pc, unsigned int dev,
|
||||
if (unlikely(!addr))
|
||||
goto out;
|
||||
err = -ENOMEM;
|
||||
mmio = ioremap_nocache(addr, sizeof(val));
|
||||
mmio = ioremap(addr, sizeof(val));
|
||||
if (!mmio)
|
||||
goto out;
|
||||
|
||||
@ -515,7 +515,7 @@ void bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc)
|
||||
/* Ok, ready to run, register it to the system.
|
||||
* The following needs change, if we want to port hostmode
|
||||
* to non-MIPS platform. */
|
||||
io_map_base = (unsigned long)ioremap_nocache(pc_host->mem_resource.start,
|
||||
io_map_base = (unsigned long)ioremap(pc_host->mem_resource.start,
|
||||
resource_size(&pc_host->mem_resource));
|
||||
pc_host->pci_controller.io_map_base = io_map_base;
|
||||
set_io_port_base(pc_host->pci_controller.io_map_base);
|
||||
|
@ -172,7 +172,7 @@ int __init bcma_host_soc_register(struct bcma_soc *soc)
|
||||
/* iomap only first core. We have to read some register on this core
|
||||
* to scan the bus.
|
||||
*/
|
||||
bus->mmio = ioremap_nocache(BCMA_ADDR_BASE, BCMA_CORE_SIZE * 1);
|
||||
bus->mmio = ioremap(BCMA_ADDR_BASE, BCMA_CORE_SIZE * 1);
|
||||
if (!bus->mmio)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -425,11 +425,11 @@ static int bcma_get_next_core(struct bcma_bus *bus, u32 __iomem **eromptr,
|
||||
}
|
||||
}
|
||||
if (bus->hosttype == BCMA_HOSTTYPE_SOC) {
|
||||
core->io_addr = ioremap_nocache(core->addr, BCMA_CORE_SIZE);
|
||||
core->io_addr = ioremap(core->addr, BCMA_CORE_SIZE);
|
||||
if (!core->io_addr)
|
||||
return -ENOMEM;
|
||||
if (core->wrap) {
|
||||
core->io_wrap = ioremap_nocache(core->wrap,
|
||||
core->io_wrap = ioremap(core->wrap,
|
||||
BCMA_CORE_SIZE);
|
||||
if (!core->io_wrap) {
|
||||
iounmap(core->io_addr);
|
||||
@ -472,7 +472,7 @@ int bcma_bus_scan(struct bcma_bus *bus)
|
||||
|
||||
erombase = bcma_scan_read32(bus, 0, BCMA_CC_EROM);
|
||||
if (bus->hosttype == BCMA_HOSTTYPE_SOC) {
|
||||
eromptr = ioremap_nocache(erombase, BCMA_CORE_SIZE);
|
||||
eromptr = ioremap(erombase, BCMA_CORE_SIZE);
|
||||
if (!eromptr)
|
||||
return -ENOMEM;
|
||||
} else {
|
||||
|
@ -827,7 +827,7 @@ static int mm_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
|
||||
goto failed_req_csr;
|
||||
}
|
||||
|
||||
card->csr_remap = ioremap_nocache(csr_base, csr_len);
|
||||
card->csr_remap = ioremap(csr_base, csr_len);
|
||||
if (!card->csr_remap) {
|
||||
dev_printk(KERN_ERR, &card->dev->dev,
|
||||
"Unable to remap memory region\n");
|
||||
|
@ -97,12 +97,12 @@ int __must_check fsl_create_mc_io(struct device *dev,
|
||||
return -EBUSY;
|
||||
}
|
||||
|
||||
mc_portal_virt_addr = devm_ioremap_nocache(dev,
|
||||
mc_portal_virt_addr = devm_ioremap(dev,
|
||||
mc_portal_phys_addr,
|
||||
mc_portal_size);
|
||||
if (!mc_portal_virt_addr) {
|
||||
dev_err(dev,
|
||||
"devm_ioremap_nocache failed for MC portal %pa\n",
|
||||
"devm_ioremap failed for MC portal %pa\n",
|
||||
&mc_portal_phys_addr);
|
||||
return -ENXIO;
|
||||
}
|
||||
|
@ -941,7 +941,7 @@ int agp_generic_create_gatt_table(struct agp_bridge_data *bridge)
|
||||
|
||||
bridge->gatt_table = (u32 __iomem *)table;
|
||||
#else
|
||||
bridge->gatt_table = ioremap_nocache(virt_to_phys(table),
|
||||
bridge->gatt_table = ioremap(virt_to_phys(table),
|
||||
(PAGE_SIZE * (1 << page_order)));
|
||||
bridge->driver->cache_flush();
|
||||
#endif
|
||||
|
@ -1087,7 +1087,7 @@ static void intel_i9xx_setup_flush(void)
|
||||
}
|
||||
|
||||
if (intel_private.ifp_resource.start)
|
||||
intel_private.i9xx_flush_page = ioremap_nocache(intel_private.ifp_resource.start, PAGE_SIZE);
|
||||
intel_private.i9xx_flush_page = ioremap(intel_private.ifp_resource.start, PAGE_SIZE);
|
||||
if (!intel_private.i9xx_flush_page)
|
||||
dev_err(&intel_private.pcidev->dev,
|
||||
"can't ioremap flush page - no chipset flushing\n");
|
||||
|
@ -204,7 +204,7 @@ static int __init applicom_init(void)
|
||||
if (pci_enable_device(dev))
|
||||
return -EIO;
|
||||
|
||||
RamIO = ioremap_nocache(pci_resource_start(dev, 0), LEN_RAM_IO);
|
||||
RamIO = ioremap(pci_resource_start(dev, 0), LEN_RAM_IO);
|
||||
|
||||
if (!RamIO) {
|
||||
printk(KERN_INFO "ac.o: Failed to ioremap PCI memory "
|
||||
@ -259,7 +259,7 @@ static int __init applicom_init(void)
|
||||
/* Now try the specified ISA cards */
|
||||
|
||||
for (i = 0; i < MAX_ISA_BOARD; i++) {
|
||||
RamIO = ioremap_nocache(mem + (LEN_RAM_IO * i), LEN_RAM_IO);
|
||||
RamIO = ioremap(mem + (LEN_RAM_IO * i), LEN_RAM_IO);
|
||||
|
||||
if (!RamIO) {
|
||||
printk(KERN_INFO "ac.o: Failed to ioremap the ISA card's memory space (slot #%d)\n", i + 1);
|
||||
|
@ -317,7 +317,7 @@ PFX "RNG, try using the 'no_fwh_detect' option.\n";
|
||||
return -EBUSY;
|
||||
}
|
||||
|
||||
intel_rng_hw->mem = ioremap_nocache(INTEL_FWH_ADDR, INTEL_FWH_ADDR_LEN);
|
||||
intel_rng_hw->mem = ioremap(INTEL_FWH_ADDR, INTEL_FWH_ADDR_LEN);
|
||||
if (intel_rng_hw->mem == NULL)
|
||||
return -EBUSY;
|
||||
|
||||
|
@ -81,13 +81,13 @@ static int octeon_rng_probe(struct platform_device *pdev)
|
||||
return -ENOENT;
|
||||
|
||||
|
||||
rng->control_status = devm_ioremap_nocache(&pdev->dev,
|
||||
rng->control_status = devm_ioremap(&pdev->dev,
|
||||
res_ports->start,
|
||||
sizeof(u64));
|
||||
if (!rng->control_status)
|
||||
return -ENOENT;
|
||||
|
||||
rng->result = devm_ioremap_nocache(&pdev->dev,
|
||||
rng->result = devm_ioremap(&pdev->dev,
|
||||
res_result->start,
|
||||
sizeof(u64));
|
||||
if (!rng->result)
|
||||
|
@ -37,8 +37,8 @@ static u16 __init rz_cpg_read_mode_pins(void)
|
||||
void __iomem *ppr0, *pibc0;
|
||||
u16 modes;
|
||||
|
||||
ppr0 = ioremap_nocache(PPR0, 2);
|
||||
pibc0 = ioremap_nocache(PIBC0, 2);
|
||||
ppr0 = ioremap(PPR0, 2);
|
||||
pibc0 = ioremap(PIBC0, 2);
|
||||
BUG_ON(!ppr0 || !pibc0);
|
||||
iowrite16(4, pibc0); /* enable input buffer */
|
||||
modes = ioread16(ppr0);
|
||||
|
@ -905,7 +905,7 @@ static int sh_cmt_map_memory(struct sh_cmt_device *cmt)
|
||||
return -ENXIO;
|
||||
}
|
||||
|
||||
cmt->mapbase = ioremap_nocache(mem->start, resource_size(mem));
|
||||
cmt->mapbase = ioremap(mem->start, resource_size(mem));
|
||||
if (cmt->mapbase == NULL) {
|
||||
dev_err(&cmt->pdev->dev, "failed to remap I/O memory\n");
|
||||
return -ENXIO;
|
||||
|
@ -377,7 +377,7 @@ static int sh_mtu2_map_memory(struct sh_mtu2_device *mtu)
|
||||
return -ENXIO;
|
||||
}
|
||||
|
||||
mtu->mapbase = ioremap_nocache(res->start, resource_size(res));
|
||||
mtu->mapbase = ioremap(res->start, resource_size(res));
|
||||
if (mtu->mapbase == NULL)
|
||||
return -ENXIO;
|
||||
|
||||
|
@ -486,7 +486,7 @@ static int sh_tmu_map_memory(struct sh_tmu_device *tmu)
|
||||
return -ENXIO;
|
||||
}
|
||||
|
||||
tmu->mapbase = ioremap_nocache(res->start, resource_size(res));
|
||||
tmu->mapbase = ioremap(res->start, resource_size(res));
|
||||
if (tmu->mapbase == NULL)
|
||||
return -ENXIO;
|
||||
|
||||
|
@ -445,7 +445,7 @@ static int __init pcc_cpufreq_probe(void)
|
||||
goto out_free;
|
||||
}
|
||||
|
||||
pcch_virt_addr = ioremap_nocache(mem_resource->minimum,
|
||||
pcch_virt_addr = ioremap(mem_resource->minimum,
|
||||
mem_resource->address_length);
|
||||
if (pcch_virt_addr == NULL) {
|
||||
pr_debug("probe: could not map shared mem region\n");
|
||||
|
@ -2507,7 +2507,7 @@ static int hifn_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
||||
addr = pci_resource_start(pdev, i);
|
||||
size = pci_resource_len(pdev, i);
|
||||
|
||||
dev->bar[i] = ioremap_nocache(addr, size);
|
||||
dev->bar[i] = ioremap(addr, size);
|
||||
if (!dev->bar[i]) {
|
||||
err = -ENOMEM;
|
||||
goto err_out_unmap_bars;
|
||||
|
@ -772,10 +772,10 @@ static int request_and_map(struct platform_device *pdev, const char *name,
|
||||
return -EBUSY;
|
||||
}
|
||||
|
||||
*ptr = devm_ioremap_nocache(device, region->start,
|
||||
*ptr = devm_ioremap(device, region->start,
|
||||
resource_size(region));
|
||||
if (*ptr == NULL) {
|
||||
dev_err(device, "ioremap_nocache of %s failed!", name);
|
||||
dev_err(device, "ioremap of %s failed!", name);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
|
@ -324,7 +324,7 @@ static int i3000_probe1(struct pci_dev *pdev, int dev_idx)
|
||||
|
||||
pci_read_config_dword(pdev, I3000_MCHBAR, (u32 *) & mchbar);
|
||||
mchbar &= I3000_MCHBAR_MASK;
|
||||
window = ioremap_nocache(mchbar, I3000_MMR_WINDOW_SIZE);
|
||||
window = ioremap(mchbar, I3000_MMR_WINDOW_SIZE);
|
||||
if (!window) {
|
||||
printk(KERN_ERR "i3000: cannot map mmio space at 0x%lx\n",
|
||||
mchbar);
|
||||
|
@ -280,7 +280,7 @@ static void __iomem *i3200_map_mchbar(struct pci_dev *pdev)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
window = ioremap_nocache(u.mchbar, I3200_MMR_WINDOW_SIZE);
|
||||
window = ioremap(u.mchbar, I3200_MMR_WINDOW_SIZE);
|
||||
if (!window)
|
||||
printk(KERN_ERR "i3200: cannot map mmio space at 0x%llx\n",
|
||||
(unsigned long long)u.mchbar);
|
||||
|
@ -485,7 +485,7 @@ static int i82975x_probe1(struct pci_dev *pdev, int dev_idx)
|
||||
goto fail0;
|
||||
}
|
||||
mchbar &= 0xffffc000; /* bits 31:14 used for 16K window */
|
||||
mch_window = ioremap_nocache(mchbar, 0x1000);
|
||||
mch_window = ioremap(mchbar, 0x1000);
|
||||
if (!mch_window) {
|
||||
edac_dbg(3, "error ioremapping MCHBAR!\n");
|
||||
goto fail0;
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user