A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-28 02:32:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

return pfn from direct_access, for XIP

Browse source 
Alter the block device ->direct_access() API to work with the new
get_xip_mem() API (that requires both kaddr and pfn are returned).

Some architectures will not do the right thing in their virt_to_page() for use
by XIP (to translate from the kernel virtual address returned by
direct_access(), to a user mappable pfn in XIP's page fault handler.

However, we can't switch it to just return the pfn and not the kaddr, because
we have no good way to get a kva from a pfn, and XIP requires the kva for its
read(2) and write(2) handlers.  So we have to return both.

Signed-off-by: Jared Hulbert <[email protected]>
Signed-off-by: Nick Piggin <[email protected]>
Cc: Carsten Otte <[email protected]>
Cc: Heiko Carstens <[email protected]>
Cc: [email protected]
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
Jared Hulbert 2008-04-28 02:13:02 -07:00 • committed by Linus Torvalds
commit 30afcb4bd2
5 changed files with 27 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

24
fs/ext2/xip.c
View file

@ -16,11 +16,13 @@
static inline int
__inode_direct_access(struct inode *inode, sector_t sector,
unsigned long *data)
void **kaddr, unsigned long *pfn)
{
BUG_ON(!inode->i_sb->s_bdev->bd_disk->fops->direct_access);
return inode->i_sb->s_bdev->bd_disk->fops
->direct_access(inode->i_sb->s_bdev,sector,data);
struct block_device *bdev = inode->i_sb->s_bdev;
struct block_device_operations *ops = bdev->bd_disk->fops;
BUG_ON(!ops->direct_access);
return ops->direct_access(bdev, sector, kaddr, pfn);
}
static inline int
@ -48,12 +50,13 @@ int
ext2_clear_xip_target(struct inode *inode, int block)
{
sector_t sector = block * (PAGE_SIZE/512);
unsigned long data;
void *kaddr;
unsigned long pfn;
int rc;
rc = __inode_direct_access(inode, sector, &data);
rc = __inode_direct_access(inode, sector, &kaddr, &pfn);
if (!rc)
clear_page((void*)data);
clear_page(kaddr);
return rc;
}
@ -74,7 +77,8 @@ ext2_get_xip_page(struct address_space *mapping, sector_t offset,
int create)
{
int rc;
unsigned long data;
void *kaddr;
unsigned long pfn;
sector_t sector;
/* first, retrieve the sector number */
@ -84,9 +88,9 @@ ext2_get_xip_page(struct address_space *mapping, sector_t offset,
/* retrieve address of the target data */
rc = __inode_direct_access
(mapping->host, sector * (PAGE_SIZE/512), &data);
(mapping->host, sector * (PAGE_SIZE/512), &kaddr, &pfn);
if (!rc)
return virt_to_page(data);
return pfn_to_page(pfn);
error:
return ERR_PTR(rc);