From patchwork Wed Sep 13 14:08:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 138853 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1123768vqx; Wed, 13 Sep 2023 07:25:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFS1mUwLo/UwAnN87q1AgbORWXUJk6eFeXhgZNa8HIPNcfulDaKzi7qZJFmaidyEfDmbjqx X-Received: by 2002:a05:6830:c93:b0:6b9:70c9:e1c8 with SMTP id bn19-20020a0568300c9300b006b970c9e1c8mr2666610otb.5.1694615110060; Wed, 13 Sep 2023 07:25:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694615110; cv=none; d=google.com; s=arc-20160816; b=l62hWyS0wQJAZ91VdBGkg2a9ZA776D/ApGeNulDtKcTEDrZmOogv2/qooqRs7pa2k+ m6+vbx37Oot/cK/pSrjE7jvaLdnUcYT1NJPsJcZ3+sspE3ePQcvnYjGoivS6+O9lnr2F d50pJn5oeiJVETx4y3AEgJL1g2tiL+eLodavqUKdbaWzb6IvyTGe1Wg6GcJ5WRFgR48r PnKlMNGvJQTqXiXM9vtlZs8PpFGyY9OoWeWY2dXsmbhpOS1Qrg/ImQzyUC10uOXK6UtI 5IinVEZFcdWEnu/PSiciVihMpAPJ+nLid/5aamJUNZvfpkC9qbQYwZ39z1YvIiI5ryiH 19OQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=H9dUecZKfR+BZkOyIuYodLUSzMwUH5DhN4gmv0+eYVw=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=nh0hpk9QUnFCaFYpiwbKMJKWrHGVHkxtFlt7iXhFqQfj1CXgRQQRLPuGtzPUZaM+ky 7cMwZgpbUuXuPmQMOuu1MYz2XV+taUO5jG1qb0dH2BLFaK+gZdPPd5aUi1HvXI+Ud7NY CiNtB9Zzh+xtpCvOQ1iJqg4eFx36VtJW6oCcov2LhppqCJ8i0ssgBJkK26p2o5I1Z5e3 FWpONB9kskhdAYqKcJoVWuVF12Z4d/N+2ouFYll2itykcjtnudB381q2PxUbh6Co48lx DDyaqmRR8wPf9YzEWhK/KCJC+0AdLxPZJ8PSkZqpSpdzbvKU5l+E/wTrMnNA9U2fzDbZ ptVA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id ca26-20020a056a00419a00b0068fa57d2486si5210545pfb.125.2023.09.13.07.25.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 07:25:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 99A0D845085C; Wed, 13 Sep 2023 07:10:55 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241688AbjIMOKp (ORCPT + 36 others); Wed, 13 Sep 2023 10:10:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58316 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241456AbjIMOJs (ORCPT ); Wed, 13 Sep 2023 10:09:48 -0400 Received: from cantor.telenet-ops.be (cantor.telenet-ops.be [IPv6:2a02:1800:120:4::f00:10]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 04B202109 for ; Wed, 13 Sep 2023 07:08:53 -0700 (PDT) Received: from xavier.telenet-ops.be (xavier.telenet-ops.be [IPv6:2a02:1800:120:4::f00:14]) by cantor.telenet-ops.be (Postfix) with ESMTPS id 4Rm2PG2qljz4wwdj for ; Wed, 13 Sep 2023 16:08:50 +0200 (CEST) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f674:9611:cd05:f25a]) by xavier.telenet-ops.be with bizsmtp id lS8p2A0063fvA4V01S8p3f; Wed, 13 Sep 2023 16:08:50 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXe-003ctO-Ag; Wed, 13 Sep 2023 16:08:47 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXv-00FV6Q-LK; Wed, 13 Sep 2023 16:08:47 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 38/52] m68k: sun3: Improve Sun3/3x DVMA abstraction in Date: Wed, 13 Sep 2023 16:08:28 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:10:55 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776932733326271724 X-GMAIL-MSGID: 1776932733326271724 When building with W=1: arch/m68k/sun3/dvma.c:65:13: warning: no previous prototype for ‘sun3_dvma_init’ [-Wmissing-prototypes] 65 | void __init sun3_dvma_init(void) | ^~~~~~~~~~~~~~ arch/m68k/sun3x/dvma.c:178:6: warning: no previous prototype for ‘dvma_unmap_iommu’ [-Wmissing-prototypes] 179 | void dvma_unmap_iommu(unsigned long baddr, int len) | ^~~~~~~~~~~~~~~~ Fix this by moving the declarations for sun3_dvma_init() and dvma_unmap_iommu() to . Avoid #ifdefs in callers by providing dummy static inline functions. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/include/asm/dvma.h | 8 +++++++- arch/m68k/sun3/sun3dvma.c | 15 --------------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/arch/m68k/include/asm/dvma.h b/arch/m68k/include/asm/dvma.h index f609ec1de36d0d2c..d1d66d04844d3e1c 100644 --- a/arch/m68k/include/asm/dvma.h +++ b/arch/m68k/include/asm/dvma.h @@ -58,12 +58,16 @@ extern void dvma_free(void *vaddr); #define dvma_vtob(x) dvma_vtop(x) #define dvma_btov(x) dvma_ptov(x) +void sun3_dvma_init(void); + static inline int dvma_map_cpu(unsigned long kaddr, unsigned long vaddr, int len) { return 0; } +static inline void dvma_unmap_iommu(unsigned long baddr, int len) { } + #else /* Sun3x */ /* sun3x dvma page support */ @@ -78,9 +82,11 @@ static inline int dvma_map_cpu(unsigned long kaddr, unsigned long vaddr, #define dvma_vtob(x) ((unsigned long)(x) & 0x00ffffff) #define dvma_btov(x) ((unsigned long)(x) | 0xff000000) -extern int dvma_map_cpu(unsigned long kaddr, unsigned long vaddr, int len); +static inline void sun3_dvma_init(void) { } +int dvma_map_cpu(unsigned long kaddr, unsigned long vaddr, int len); +void dvma_unmap_iommu(unsigned long baddr, int len); /* everything below this line is specific to dma used for the onboard ESP scsi on sun3x */ diff --git a/arch/m68k/sun3/sun3dvma.c b/arch/m68k/sun3/sun3dvma.c index 4b560f4d3960c2b5..f66b2413209069f2 100644 --- a/arch/m68k/sun3/sun3dvma.c +++ b/arch/m68k/sun3/sun3dvma.c @@ -20,18 +20,6 @@ #undef DVMA_DEBUG -#ifdef CONFIG_SUN3X -extern void dvma_unmap_iommu(unsigned long baddr, int len); -#else -static inline void dvma_unmap_iommu(unsigned long a, int b) -{ -} -#endif - -#ifdef CONFIG_SUN3 -extern void sun3_dvma_init(void); -#endif - static unsigned long *iommu_use; #define dvma_index(baddr) ((baddr - DVMA_START) >> DVMA_PAGE_SHIFT) @@ -274,10 +262,7 @@ void __init dvma_init(void) dvma_unmap_iommu(DVMA_START, DVMA_SIZE); -#ifdef CONFIG_SUN3 sun3_dvma_init(); -#endif - } unsigned long dvma_map_align(unsigned long kaddr, int len, int align)