From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pieter Date: Tue, 03 Feb 2009 10:53:12 +0200 Subject: [U-Boot] [PATCH 1/2] flash/cfi_flash: Use virtual sector start address, not phys In-Reply-To: <1233614092-5480-1-git-send-email-beckyb@kernel.crashing.org> References: <1233614092-5480-1-git-send-email-beckyb@kernel.crashing.org> Message-ID: <498805F8.4000803@vastech.co.za> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Becky Bruce wrote: > include/flash.h was commented to say that the address in > flash_info->start was a physical address. However, from u-boot's > point of view, and looking at most flash code, it makes more > sense for this to be a virtual address. So I corrected the > comment to indicate that this was a virtual address. > > The only flash driver that was actually treating the address > as physical was the mtd/cfi_flash driver. However, this code > was using it inconsistently as it actually directly dereferenced > the "start" element, while it used map_physmem to get a > virtual address in other places. I changed this driver so > that the code which initializes the info->start field calls > map_physmem to get a virtual address, eliminating the need for > further map_physmem calls. The code is now consistent. > > The *only* place a physical address should be used is when defining the > flash banks list that is used to initialize the flash_info struct, > usually found in the board config file. > > Signed-off-by: Becky Bruce > --- > drivers/mtd/cfi_flash.c | 53 +++++++++++++++++++++------------------------- > include/flash.h | 2 +- > 2 files changed, 25 insertions(+), 30 deletions(-) > > diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c > index 84ff7e8..4cb5fb5 100644 > --- a/drivers/mtd/cfi_flash.c > +++ b/drivers/mtd/cfi_flash.c > @@ -305,17 +305,12 @@ flash_map (flash_info_t * info, flash_sect_t sect, uint offset) > { > unsigned int byte_offset = offset * info->portwidth; > > - return map_physmem(info->start[sect] + byte_offset, > - flash_sector_size(info, sect) - byte_offset, > - MAP_NOCACHE); > + return (void *)(info->start[sect] + byte_offset); > } > > static inline void flash_unmap(flash_info_t *info, flash_sect_t sect, > unsigned int offset, void *addr) > { > - unsigned int byte_offset = offset * info->portwidth; > - > - unmap_physmem(addr, flash_sector_size(info, sect) - byte_offset); > } Since "flash_unmap(flash_info_t *info, flash_sect_t sect,unsigned int offset, void *addr)" function is empty after applying the patch, should all function calls in the /drivers/mtd/cfi_flash.c file not also be removed? cheers pieter