Linux-RISC-V Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Palmer Dabbelt <palmer@dabbelt.com>
To: zong.li@sifive.com, linux-riscv@lists.infradead.org, rppt@linux.ibm.com
Cc: mark.rutland@arm.com, steve@sk2.org, davidgow@google.com,
	catalin.marinas@arm.com, linus.walleij@linaro.org,
	Palmer Dabbelt <palmerdabbelt@google.com>,
	brendanhiggins@google.com, elver@google.com, glider@google.com,
	mchehab+samsung@kernel.org, linux-riscv@lists.infradead.org,
	alex.shi@linux.alibaba.com, will@kernel.org,
	dan.j.williams@intel.com, linux-arch@vger.kernel.org,
	uwe@kleine-koenig.org, alex@ghiti.fr, takahiro.akashi@linaro.org,
	paulmck@kernel.org, masahiroy@kernel.org, linux@armlinux.org.uk,
	krzk@kernel.org, ardb@kernel.org, bgolaszewski@baylibre.com,
	clabbe@baylibre.com, james.morse@arm.com,
	kernel-team@android.com, pmladek@suse.com,
	zaslonko@linux.ibm.com, aou@eecs.berkeley.edu,
	keescook@chromium.org, Arnd Bergmann <arnd@arndb.de>,
	rostedt@goodmis.org, broonie@kernel.org,
	matti.vaittinen@fi.rohmeurope.com, gregory.0xf0@gmail.com,
	Paul Walmsley <paul.walmsley@sifive.com>,
	tglx@linutronix.de, andriy.shevchenko@linux.intel.com,
	gxt@pku.edu.cn, linux-arm-kernel@lists.infradead.org,
	Greg KH <gregkh@linuxfoundation.org>,
	rdunlap@infradead.org, Nick Desaulniers <ndesaulniers@google.com>,
	linux-kernel@vger.kernel.org, changbin.du@intel.com,
	mcgrof@kernel.org, Palmer Dabbelt <palmer@dabbelt.com>,
	mhiramat@kernel.org, akpm@linux-foundation.org,
	davem@davemloft.net
Subject: [PATCH v2 3/5] arm: Use the generic devmem_is_allowed()
Date: Thu,  9 Jul 2020 14:19:23 -0700	[thread overview]
Message-ID: <20200709211925.1926557-4-palmer@dabbelt.com> (raw)
In-Reply-To: <20200709211925.1926557-1-palmer@dabbelt.com>

From: Palmer Dabbelt <palmerdabbelt@google.com>

This is exactly the same as the arm64 version, which I recently copied
into lib/ for use by the RISC-V port.

[I haven't even build tested this.  The lib/ patch is on riscv/for-next,
which I'm targeting for 5.9, so this won't work alone.  See the cover
letter for more details.]

Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
---
 arch/arm/Kconfig          |  2 +-
 arch/arm/include/asm/io.h |  1 -
 arch/arm/mm/mmap.c        | 22 ----------------------
 3 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 2ac74904a3ce..da0f88f6c196 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -5,7 +5,6 @@ config ARM
 	select ARCH_32BIT_OFF_T
 	select ARCH_HAS_BINFMT_FLAT
 	select ARCH_HAS_DEBUG_VIRTUAL if MMU
-	select ARCH_HAS_DEVMEM_IS_ALLOWED
 	select ARCH_HAS_DMA_WRITE_COMBINE if !ARM_DMA_MEM_BUFFERABLE
 	select ARCH_HAS_ELF_RANDOMIZE
 	select ARCH_HAS_FORTIFY_SOURCE
@@ -54,6 +53,7 @@ config ARM
 	select GENERIC_IRQ_PROBE
 	select GENERIC_IRQ_SHOW
 	select GENERIC_IRQ_SHOW_LEVEL
+	select GENERIC_LIB_DEVMEM_IS_ALLOWED
 	select GENERIC_PCI_IOMAP
 	select GENERIC_SCHED_CLOCK
 	select GENERIC_SMP_IDLE_THREAD
diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h
index ab2b654084fa..fc748122f1e0 100644
--- a/arch/arm/include/asm/io.h
+++ b/arch/arm/include/asm/io.h
@@ -441,7 +441,6 @@ extern void pci_iounmap(struct pci_dev *dev, void __iomem *addr);
 #define ARCH_HAS_VALID_PHYS_ADDR_RANGE
 extern int valid_phys_addr_range(phys_addr_t addr, size_t size);
 extern int valid_mmap_phys_addr_range(unsigned long pfn, size_t size);
-extern int devmem_is_allowed(unsigned long pfn);
 #endif
 
 /*
diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
index b8d912ac9e61..a0f8a0ca0788 100644
--- a/arch/arm/mm/mmap.c
+++ b/arch/arm/mm/mmap.c
@@ -165,25 +165,3 @@ int valid_mmap_phys_addr_range(unsigned long pfn, size_t size)
 {
 	return (pfn + (size >> PAGE_SHIFT)) <= (1 + (PHYS_MASK >> PAGE_SHIFT));
 }
-
-#ifdef CONFIG_STRICT_DEVMEM
-
-#include <linux/ioport.h>
-
-/*
- * devmem_is_allowed() checks to see if /dev/mem access to a certain
- * address is valid. The argument is a physical page number.
- * We mimic x86 here by disallowing access to system RAM as well as
- * device-exclusive MMIO regions. This effectively disable read()/write()
- * on /dev/mem.
- */
-int devmem_is_allowed(unsigned long pfn)
-{
-	if (iomem_is_exclusive(pfn << PAGE_SHIFT))
-		return 0;
-	if (!page_is_ram(pfn))
-		return 1;
-	return 0;
-}
-
-#endif
-- 
2.27.0.383.g050319c2ae-goog


_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv

  parent reply	other threads:[~2020-07-09 21:20 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-09 21:19 Add and use a generic version of devmem_is_allowed() Palmer Dabbelt
2020-07-09 21:19 ` [PATCH v2 1/5] lib: Add " Palmer Dabbelt
2020-07-09 21:19 ` [PATCH v2 2/5] RISC-V: Use the new generic devmem_is_allowed() Palmer Dabbelt
2020-07-09 21:19 ` Palmer Dabbelt [this message]
2020-07-09 21:19 ` [PATCH v2 4/5] arm64: Use the " Palmer Dabbelt
2020-07-14 18:14   ` Catalin Marinas
2020-07-09 21:19 ` [PATCH v2 5/5] unicore32: " Palmer Dabbelt
2020-07-12  6:09 ` Add and use a generic version of devmem_is_allowed() Mike Rapoport
2020-07-29  0:00 ` Luis Chamberlain
2020-12-11 20:32   ` Palmer Dabbelt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200709211925.1926557-4-palmer@dabbelt.com \
    --to=palmer@dabbelt.com \
    --cc=akpm@linux-foundation.org \
    --cc=alex.shi@linux.alibaba.com \
    --cc=alex@ghiti.fr \
    --cc=andriy.shevchenko@linux.intel.com \
    --cc=aou@eecs.berkeley.edu \
    --cc=ardb@kernel.org \
    --cc=arnd@arndb.de \
    --cc=bgolaszewski@baylibre.com \
    --cc=brendanhiggins@google.com \
    --cc=broonie@kernel.org \
    --cc=catalin.marinas@arm.com \
    --cc=changbin.du@intel.com \
    --cc=clabbe@baylibre.com \
    --cc=dan.j.williams@intel.com \
    --cc=davem@davemloft.net \
    --cc=davidgow@google.com \
    --cc=elver@google.com \
    --cc=glider@google.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=gregory.0xf0@gmail.com \
    --cc=gxt@pku.edu.cn \
    --cc=james.morse@arm.com \
    --cc=keescook@chromium.org \
    --cc=kernel-team@android.com \
    --cc=krzk@kernel.org \
    --cc=linus.walleij@linaro.org \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-riscv@lists.infradead.org \
    --cc=linux@armlinux.org.uk \
    --cc=mark.rutland@arm.com \
    --cc=masahiroy@kernel.org \
    --cc=matti.vaittinen@fi.rohmeurope.com \
    --cc=mcgrof@kernel.org \
    --cc=mchehab+samsung@kernel.org \
    --cc=mhiramat@kernel.org \
    --cc=ndesaulniers@google.com \
    --cc=palmerdabbelt@google.com \
    --cc=paul.walmsley@sifive.com \
    --cc=paulmck@kernel.org \
    --cc=pmladek@suse.com \
    --cc=rdunlap@infradead.org \
    --cc=rostedt@goodmis.org \
    --cc=rppt@linux.ibm.com \
    --cc=steve@sk2.org \
    --cc=takahiro.akashi@linaro.org \
    --cc=tglx@linutronix.de \
    --cc=uwe@kleine-koenig.org \
    --cc=will@kernel.org \
    --cc=zaslonko@linux.ibm.com \
    --cc=zong.li@sifive.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox