UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

MIPS: Fix ISA virt/bus conversion for non-zero PHYS_OFFSET 

isa_virt_to_bus() & isa_bus_to_virt() claim to treat ISA bus addresses
as being identical to physical addresses, but they fail to do so in the
presence of a non-zero PHYS_OFFSET.

Correct this by having them use virt_to_phys() & phys_to_virt(), which
consolidates the calculations to one place & ensures that ISA bus
addresses do indeed match physical addresses.

Signed-off-by: Paul Burton <paul.burton@mips.com>
Patchwork: https://patchwork.linux-mips.org/patch/20047/
Cc: James Hogan <jhogan@kernel.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Cc: Vladimir Kondratiev <vladimir.kondratiev@intel.com>
This commit is contained in:
Paul Burton 2018-07-27 18:23:19 -07:00
parent 0d0e14770d
commit 0494d7ffdc
No known key found for this signature in database
GPG Key ID: 3EA79FACB57500DD
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/mips/include/asm/io.h
View File

@ -143,14 +143,14 @@ static inline void * phys_to_virt(unsigned long address)
/* /*
* ISA I/O bus memory addresses are 1:1 with the physical address. * ISA I/O bus memory addresses are 1:1 with the physical address.
*/ */
static inline unsigned long isa_virt_to_bus(volatile void * address) static inline unsigned long isa_virt_to_bus(volatile void *address)
{ {
return (unsigned long)address - PAGE_OFFSET; return virt_to_phys(address);
} }
static inline void * isa_bus_to_virt(unsigned long address) static inline void *isa_bus_to_virt(unsigned long address)
{ {
return (void *)(address + PAGE_OFFSET); return phys_to_virt(address);
} }
#define isa_page_to_bus page_to_phys #define isa_page_to_bus page_to_phys