From patchwork Fri Oct 14 00:19:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 2450 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp543606wrs; Thu, 13 Oct 2022 17:20:51 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5ZvL9vJsdiDlbp3FRWjuR6amJJpqg2nilnN2GhY4BVFdDXg1i+Vk+fDUh/SZcDDXZHUPsY X-Received: by 2002:a17:907:701:b0:780:2c44:e4dd with SMTP id xb1-20020a170907070100b007802c44e4ddmr1645809ejb.589.1665706851799; Thu, 13 Oct 2022 17:20:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665706851; cv=none; d=google.com; s=arc-20160816; b=xXqthvyv8FfSAcejDJKKwYv/Or/CTFVS0SCImZ4Wfy25VdS71Ydp3e8aN5ssHg3unI iNzHcRmnT0llmbYEoTFLOXiHAxMSbvvA91Srfe7yqiUO+CIlgjQMZB0sp1t+8Re329sG xZqGGA+43nBDZAuSKB+tTIwZyyFfycSMUeyvkut8cY5iHxehXjFLqVA8XvKhBj1qOqf3 Yh4xRUT/qgvmm/+FM9LUFRfUTvSIwH3emgabUhrcqjKclQAzcuilgefX1+MPV36MbJeH /kDhGVqUN45HIS+AOHt1XKucjOD55nTgIc0aBsFxqrudFpnGj2Czx1zWUXB9wHVVgatO Ax1Q== 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 :dkim-signature; bh=d8el9JoMtUxdrI3M+3wTXU1Eevc0ai+WHxdx1G7khOI=; b=mTXyKLjS41FsmbnXlEMUbKaf+Xan2cPQGt20hWyd8m3N3RFvWOgjCdTPfPg+fxHEHI 7fTVuLg9wtXgjwreas9IsP0iDDdGImUQNY4tEDC8rkQSUlKshmhRb872w3FlhZdro7og GVkXgqP8nrrWBs0Dq1VR2hZdMrxMjddvG9Ulz3Hxxw/YmC6K+vQ+0OQAER9/rwFIPW+2 NU5qxW6ERdNofI7MMe3H2+QFKkYewHkL4IpkHR/e3r8FpT2jlmYK2L97hs3tmGgpdTA4 sSxpcFOFGgjffdU5R5GA82nyHzkPzIIFdpSVz8+Ogt3FkqAQO8vGfsUp4EnBCvEdTWpa eG2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=V+ecO9Q5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e16-20020a056402191000b0045b36a64f32si1070093edz.376.2022.10.13.17.20.26; Thu, 13 Oct 2022 17:20:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=V+ecO9Q5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229648AbiJNATd (ORCPT + 99 others); Thu, 13 Oct 2022 20:19:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229613AbiJNATb (ORCPT ); Thu, 13 Oct 2022 20:19:31 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5028B183D86; Thu, 13 Oct 2022 17:19:29 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 647E7B8217A; Fri, 14 Oct 2022 00:19:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E46CFC433C1; Fri, 14 Oct 2022 00:19:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1665706766; bh=truyd6YXrnJgH30xs9lXfxt5wDtPtug7TuX2iG1sDRU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V+ecO9Q5WguXB07V4rM+vFlU1cbrhBaORj1CS2HmHDlG2OMUtstpFQfkqXMaOwZB7 xcXlTaAAUOI0c3p1Op48lhR8vpkWDcmDAxzNlvKXCWsZZZu4PMHUMnP6kUx38jhIQR iruz4O2tYUuLAdCLWl7YDSGNB1xsUWfMVcLmNkd23EYAiSfHqh4Q7/gZJup/EHOpVF Z6lUJjkM15/gXC0kQ7ZsWJ7Rh95ZirWZRYq0WWFw3ClqLuAqcUPZsUCQkH9VPK4vFf zTL6t0PiQSvAegrPGDipBcfgPf/NYzhmtBD5yKs9yrgwVbHGUDRmbeIPz4/UaKequd tBQc58bPO5ybA== From: Bjorn Helgaas To: linux-kernel@vger.kernel.org Cc: Bjorn Helgaas , Yoshinori Sato , Rich Felker , linux-sh@vger.kernel.org Subject: [PATCH 1/3] sh: remove unused SLOW_DOWN_IO Date: Thu, 13 Oct 2022 19:19:09 -0500 Message-Id: <20221014001911.3342485-2-helgaas@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221014001911.3342485-1-helgaas@kernel.org> References: <20221014001911.3342485-1-helgaas@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746620227608587560?= X-GMAIL-MSGID: =?utf-8?q?1746620227608587560?= From: Bjorn Helgaas io.h defines SLOW_DOWN_IO only when CONF_SLOWDOWN_IO is defined, but CONF_SLOWDOWN_IO is never defined and is in fact explicitly undefined. Remove SLOW_DOWN_IO and related code. N.B. 37b7a97884ba ("sh: machvec IO death.") went to some trouble to add CONF_SLOWDOWN_IO and SLOW_DOWN_IO, for no obvious reason. Maybe there was some out-of-tree case that used this. Signed-off-by: Bjorn Helgaas Cc: Yoshinori Sato Cc: Rich Felker Cc: linux-sh@vger.kernel.org --- arch/sh/include/asm/io.h | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h index fba90e670ed4..8d2df499b2fc 100644 --- a/arch/sh/include/asm/io.h +++ b/arch/sh/include/asm/io.h @@ -121,11 +121,6 @@ __BUILD_MEMORY_STRING(__raw_, q, u64) #ifdef CONFIG_HAS_IOPORT_MAP -/* - * Slowdown I/O port space accesses for antique hardware. - */ -#undef CONF_SLOWDOWN_IO - /* * On SuperH I/O ports are memory mapped, so we access them using normal * load/store instructions. sh_io_port_base is the virtual address to @@ -145,13 +140,7 @@ static inline void __set_io_port_base(unsigned long pbase) extern void __iomem *__ioport_map(unsigned long addr, unsigned int size); #endif -#ifdef CONF_SLOWDOWN_IO -#define SLOW_DOWN_IO __raw_readw(sh_io_port_base) -#else -#define SLOW_DOWN_IO -#endif - -#define __BUILD_IOPORT_SINGLE(pfx, bwlq, type, p, slow) \ +#define __BUILD_IOPORT_SINGLE(pfx, bwlq, type, p) \ \ static inline void pfx##out##bwlq##p(type val, unsigned long port) \ { \ @@ -159,7 +148,6 @@ static inline void pfx##out##bwlq##p(type val, unsigned long port) \ \ __addr = __ioport_map(port, sizeof(type)); \ *__addr = val; \ - slow; \ } \ \ static inline type pfx##in##bwlq##p(unsigned long port) \ @@ -169,14 +157,13 @@ static inline type pfx##in##bwlq##p(unsigned long port) \ \ __addr = __ioport_map(port, sizeof(type)); \ __val = *__addr; \ - slow; \ \ return __val; \ } #define __BUILD_IOPORT_PFX(bus, bwlq, type) \ __BUILD_IOPORT_SINGLE(bus, bwlq, type, ,) \ - __BUILD_IOPORT_SINGLE(bus, bwlq, type, _p, SLOW_DOWN_IO) + __BUILD_IOPORT_SINGLE(bus, bwlq, type, _p,) #define BUILDIO_IOPORT(bwlq, type) \ __BUILD_IOPORT_PFX(, bwlq, type)