MIPS: ip22: Drop addr_is_ram (aa1edac1) · Commits · 戴 / test

arch/mips/sgi-ip22/ip28-berr.c

+2 −18

Original line number	Diff line number	Diff line
		@@ -8,6 +8,7 @@

		#include <linux/init.h>
		#include <linux/kernel.h>
		#include <linux/mm.h>
		#include <linux/sched.h>
		#include <linux/sched/debug.h>
		#include <linux/sched/signal.h>
		@@ -300,23 +301,6 @@ static void print_buserr(const struct pt_regs *regs)
		field, regs->cp0_epc, field, regs->regs[31]);
		}

		/*
		* Check, whether MC's (virtual) DMA address caused the bus error.
		* See "Virtual DMA Specification", Draft 1.5, Feb 13 1992, SGI
		*/

		static int addr_is_ram(unsigned long addr, unsigned sz)
		{
		int i;

		for (i = 0; i < boot_mem_map.nr_map; i++) {
		unsigned long a = boot_mem_map.map[i].addr;
		if (a <= addr && addr+sz <= a+boot_mem_map.map[i].size)
		return 1;
		}
		return 0;
		}

		static int check_microtlb(u32 hi, u32 lo, unsigned long vaddr)
		{
		/* This is likely rather similar to correct code ;-) */
		@@ -331,7 +315,7 @@ static int check_microtlb(u32 hi, u32 lo, unsigned long vaddr)
		/* PTEIndex is VPN-low (bits [22:14]/[20:12] ?) */
		unsigned long pte = (lo >> 6) << 12; /* PTEBase */
		pte += 8*((vaddr >> pgsz) & 0x1ff);
		if (addr_is_ram(pte, 8)) {
		if (page_is_ram(PFN_DOWN(pte))) {
		/*
		* Note: Since DMA hardware does look up
		* translation on its own, this PTE must