From patchwork Tue Feb 21 06:07:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13147417 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id AEE6FC636D7 for ; Tue, 21 Feb 2023 06:07:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E82046B0073; Tue, 21 Feb 2023 01:07:43 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E32EE6B0074; Tue, 21 Feb 2023 01:07:43 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CFAE76B0075; Tue, 21 Feb 2023 01:07:43 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id BEAF06B0073 for ; Tue, 21 Feb 2023 01:07:43 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 9549880148 for ; Tue, 21 Feb 2023 06:07:43 +0000 (UTC) X-FDA: 80490267606.13.88273A0 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf04.hostedemail.com (Postfix) with ESMTP id DB7704000C for ; Tue, 21 Feb 2023 06:07:41 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="Pq/RHx1h"; spf=pass (imf04.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1676959661; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=u1NKntO/QfPCOBzWgJ4dShR6SEblbk9yft7GyEY5yCo=; b=L23r2FjVAgM8sof5GQZXD92RRJC8qjQB33jtamkKXqHYVnjPYQ61RI6/0RsNIeUETRj4ra N9oldyZvW3VmZiljrbed+7RwXb0B5ufAlpCYiFX+nCbpEQmAilmnLKPTa5Za0/ezJVwXEe nzO/1njBr6t3TjTzxOSf1HMCzyoxArQ= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="Pq/RHx1h"; spf=pass (imf04.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1676959661; a=rsa-sha256; cv=none; b=03a99Qjh4zDtlmGDemjjGkBD8EHCrbIr/1dmq0zQsAt+V5KTzk+26GiPtHFtdbkEbrAybC y3Fvvu+kdIX/7MQDJxzaIWKrqRPZPd9e7GhubHiQJrlWA4dP7OQABj5XXgx29HTAJDLGQ5 XSSZ5inQZ4+NOJL8H5254ncJ4hgNpu0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676959661; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=u1NKntO/QfPCOBzWgJ4dShR6SEblbk9yft7GyEY5yCo=; b=Pq/RHx1hBI/C9tpvze5mD9rkUhFJDnMv8RVd3ahE14a5VWDCb2b2fyLMzBe7LtFpot2UKu Np7S2mUzyXsN7u3lqq/00Yea2LYQ9h10IaoYqOCEH7kEwBYCdPtoxgW4ITpLHgJxyEp1PB HXWDwqvSWja0B+XV1UHNQD3n8CwOy7o= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-394-64ARo8UCM-23MdKA0rH2cg-1; Tue, 21 Feb 2023 01:07:37 -0500 X-MC-Unique: 64ARo8UCM-23MdKA0rH2cg-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9B5AD3C0F189; Tue, 21 Feb 2023 06:07:36 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (ovpn-13-7.pek2.redhat.com [10.72.13.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 30FFE492B04; Tue, 21 Feb 2023 06:07:30 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, arnd@arndb.de, hch@infradead.org, mcgrof@kernel.org, Baoquan He , Thomas Bogendoerfer , Huacai Chen , Jiaxun Yang , linux-mips@vger.kernel.org Subject: [RFC PATCH 1/2] mips: add including Date: Tue, 21 Feb 2023 14:07:22 +0800 Message-Id: <20230221060723.26291-2-bhe@redhat.com> In-Reply-To: <20230221060723.26291-1-bhe@redhat.com> References: <20230221060723.26291-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: DB7704000C X-Rspam-User: X-Stat-Signature: nudxrifps5nndgq9gdfik5x7dr4cifum X-HE-Tag: 1676959661-86061 X-HE-Meta: U2FsdGVkX18aB7h2zuGKSJyypX62gfiBfjcvD6lqMWcJuiTvsYAC5KHV4OpV+pfxe1GpVNgVnOFqGEf60qtlF511v+KFxXzXRUAY+gjO/+JSakozV8jStqaT+SRmtRGTf/S02i82ORAOWjl6FQKgNd6kksCUeAwPeu4o4YXkOyAoOpGWt7xMjviZ20AqsS1JSJRjiVPDJ1H5KQkZhqAPOldkvNWjzd3YSiD8L+s+zVrB0Rt/moQDCWoAjQMWSVD0L6OYkPza8JPCSJ9zuD3kfdyByKo/7ggd3CmqTGLeaumXHPNRDLxpXBYXslYDwXfw6gh8acYl8AHSaivW6UUlbrZpiuIys3nOfFnLHyH+NYkY+U1hTXYgnqTMJXXcx0wqYs7j8TL08F8e8IbompApXsPQrPWQtYq0aQtKlOQFyDBKTHGnD6VNhyWsClZpKVa895Z7xhuil+m2IiopMO6k6iKB4V93kebOM5a/tiM0rwtH4ErUZ90XrqsTq/u2PX4GiMkhNGN+sK2D9yFoDktjRFQOKlzGak8pt9mlnDxkk9m2EH/Xheb1gMXzB/eL3Evo28nZFJi3fpiZMfydItk1Eus/Acumdd+khtYk6RRhJmIHegmi/PDTvh8AcjIOPnVqYZIUfxRlNcSqHBbZBIeHQkamEQv7MPzmCWgu0COXTzp78ma7WnDtYIGfnWdWmUXZfFtJxlwOhZxYi3oBzE6pXom5TYOMFDCcnw+VN9BHl/SmSNBJdlUp0Marun7Hc1i+S5KvJPyYc8fns8sqjC8bEYXAx2DZmkIMApRWYbVqzFW3DMUOjUaQTtkmE8HVKDl60QtfhpR8eyRQFVsHNhYGd6yX8DcOQIJGUaRBS8NQX7k0lFoBqJrbS+Zo5O4U2mkD66dYZTkpXKd9ktKqdYbRGVEovgeZv6EJdaau+Xulk6vU2DbzEnz06s8DD3UG09R2CWSTdUC5NSz2fBTa18G tVyRQdMk kucV4c0iFeUQGg/Fbh8xOt1NT0BUQtMgisEepzvJ3xHuieQzFE2vtLfFH/NcN7g9KjYMMf5s7ixfRRyFk9xC+yC601lTDAzQXoFAEAtSVFj7NxJv49yc8/prhtEUeI46MjAi5//5pDlVfb2bqzhPWd2AEqhW3bFYRnXr2PhsoWZYPPsFUupNog3f6h5n5jUtfNBOdOJaELYJT6M1Yqit97sVUd0lUJ/q9p9iuPBuzcoLc9opAVw9Vmhf6Q6BRE1StnNBdazvnVqIsbkkJmWQOEoEY0SUou91j7m4rWn2Gdrpg0C2PRyE0R+hZ1w== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: With the adding, some default ioremap_xx methods defined in asm-generic/io.h can be used. E.g the default ioremap_uc() returning NULL. Signed-off-by: Baoquan He Cc: Thomas Bogendoerfer Cc: Huacai Chen Cc: Jiaxun Yang Cc: linux-mips@vger.kernel.org --- arch/mips/include/asm/io.h | 46 ++++++++++++++++++++++++++++++++++ arch/mips/include/asm/mmiowb.h | 2 -- 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h index e6d5ccaa309e..c89804a5802a 100644 --- a/arch/mips/include/asm/io.h +++ b/arch/mips/include/asm/io.h @@ -129,6 +129,7 @@ static inline phys_addr_t virt_to_phys(const volatile void *x) * almost all conceivable cases a device driver should not be using * this function */ +#define phys_to_virt phys_to_virt static inline void * phys_to_virt(unsigned long address) { return __va(address); @@ -481,14 +482,17 @@ BUILDSTRING(l, u32) BUILDSTRING(q, u64) #endif +#define memset_io memset_io static inline void memset_io(volatile void __iomem *addr, unsigned char val, int count) { memset((void __force *) addr, val, count); } +#define memcpy_fromio memcpy_fromio static inline void memcpy_fromio(void *dst, const volatile void __iomem *src, int count) { memcpy(dst, (void __force *) src, count); } +#define memcpy_toio memcpy_toio static inline void memcpy_toio(volatile void __iomem *dst, const void *src, int count) { memcpy((void __force *) dst, src, count); @@ -549,6 +553,46 @@ extern void (*_dma_cache_inv)(unsigned long start, unsigned long size); #define csr_out32(v, a) (*(volatile u32 *)((unsigned long)(a) + __CSR_32_ADJUST) = (v)) #define csr_in32(a) (*(volatile u32 *)((unsigned long)(a) + __CSR_32_ADJUST)) + +#define inb_p inb_p +#define inw_p inw_p +#define inl_p inl_p +#define insb insb +#define insw insw +#define insl insl + +#define outb_p outb_p +#define outw_p outw_p +#define outl_p outl_p +#define outsb outsb +#define outsw outsw +#define outsl outsl + +#define readb readb +#define readw readw +#define readl readl +#define writeb writeb +#define writew writew +#define writel writel + +#define readsb readsb +#define readsw readsw +#define readsl readsl +#define readsq readsq +#define writesb writesb +#define writesw writesw +#define writesl writesl +#define writesq writesq + +#define __raw_readb __raw_readb +#define __raw_readw __raw_readw +#define __raw_readl __raw_readl +#define __raw_readq __raw_readq +#define __raw_writeb __raw_writeb +#define __raw_writew __raw_writew +#define __raw_writel __raw_writel +#define __raw_writeq __raw_writeq + /* * Convert a physical pointer to a virtual kernel pointer for /dev/mem * access @@ -557,4 +601,6 @@ extern void (*_dma_cache_inv)(unsigned long start, unsigned long size); void __ioread64_copy(void *to, const void __iomem *from, size_t count); +#include + #endif /* _ASM_IO_H */ diff --git a/arch/mips/include/asm/mmiowb.h b/arch/mips/include/asm/mmiowb.h index a40824e3ef8e..007fe55bc7d1 100644 --- a/arch/mips/include/asm/mmiowb.h +++ b/arch/mips/include/asm/mmiowb.h @@ -2,8 +2,6 @@ #ifndef _ASM_MMIOWB_H #define _ASM_MMIOWB_H -#include - #define mmiowb() iobarrier_w() #include