iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nios2 update for v5.2-rc2

Browse Source 
nios2: Fix ioremap
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJd8gbaAAoJEFWoEK+e3syCdrYP/R/bORwHVBFf5k1kb2ms+pds
 rms8iWapuQPLLZy6XwyqxgGmyD0nnjcus4ysjBFm3Y4obJgYNC/fBr56iszzhALY
 mUXJFtS3Ci3xYoDFXyzrgCu80i9Cv+kTeoF7vEOpTQoz02UrXDXdRB7ryJxSEbVK
 rmgyHrmtz+NmRA4pklBDZZjmbKuZd4LjH9WTym5CwXZHNQ1mmTDtE9hMOYniV7p4
 I4cEdcZdaZLJFMnkgc0LpQGOG93KZc93cXx6H22mT82UkgiiSAbOEOWeLM2Xa+Ni
 XwQIbtGBMvYq7pgMUUZxnGnAOPB/0/hEDamVjF/U5VaHJ7q5pfyXBLGWjVbmj9oE
 NuQtDEVUViiATbfPf5l7Koxk9Ec4wSerAaJ7Ai1QK+ypn8+n2Ft5QbtRkDzS1tiX
 Hbo9PnqRFl4U5KjwOBP60S2PYLzNlFB3Y5okcJXvkP440ZnSQ4/gzqopx7swIHUd
 Hj7cQdXY1BHQ7GLuL/9ptduf5lLRSc/l2jbGhH8R/0obIt7SzICQH6uNhB0AtxL9
 4YaALFc4aIrn1+APi6Vk9we5aVy/Hcw6Nm0dAdh4iOnjil+kqecfV20J9G7B3IR8
 nRdH80ueu7LRkwXcxLVOwfoa8dYvnXQ991DLrPv/IkiNC7crxMd3hDxhVbXDKqcl
 Wbz9mh0GcgmSuSkpu53+
 =g5yg
 -----END PGP SIGNATURE-----

Merge tag 'nios2-v5.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2

Pull nios2 fix from Ley Foon Tan:
 "Fix nios2 ioremap regression"

* tag 'nios2-v5.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2:
  nios2: Fix ioremap
This commit is contained in:
Linus Torvalds 2019-12-13 15:05:00 -08:00
commit e31736d9fa
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/nios2/mm/ioremap.c
View File

@ -138,6 +138,14 @@ void __iomem *ioremap(unsigned long phys_addr, unsigned long size)
return NULL;
}
/*
* Map uncached objects in the low part of address space to
* CONFIG_NIOS2_IO_REGION_BASE
*/
if (IS_MAPPABLE_UNCACHEABLE(phys_addr) &&
IS_MAPPABLE_UNCACHEABLE(last_addr))
return (void __iomem *)(CONFIG_NIOS2_IO_REGION_BASE + phys_addr);
/* Mappings have to be page-aligned */
offset = phys_addr & ~PAGE_MASK;
phys_addr &= PAGE_MASK;