From patchwork Fri Apr 15 19:08:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 12815238 X-Patchwork-Delegate: kuba@kernel.org 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3046FC433F5 for ; Fri, 15 Apr 2022 19:08:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348393AbiDOTLF (ORCPT ); Fri, 15 Apr 2022 15:11:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47374 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348303AbiDOTLC (ORCPT ); Fri, 15 Apr 2022 15:11:02 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B2B8DAFFD; Fri, 15 Apr 2022 12:08:33 -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 dfw.source.kernel.org (Postfix) with ESMTPS id CF6C161AD1; Fri, 15 Apr 2022 19:08:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E7BFFC385A4; Fri, 15 Apr 2022 19:08:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1650049712; bh=nreQfjm+N9qOhwr5Z/uFXcKNU+5eXomO6oZib8laKZg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Uy7wm2dbW0KsrkPVWxh3QI7TRGnVyhSSco7+9aVi5fskwyqNsDWtS+q/SXS0bNcDO CYltjjk3xL9ZG6NwBehx/ojBF5VY7YIGy3NLngmpDUfuDXDgriKqzMRePSTVMnGAdD R+rqHc1skZ92pOdAFuoa4otdVxaZew8vigWMLMntEk6IdaYxNKGjrYB8+Mfk1d5bD5 WiKK6lwF3+vqPJl7B0VQDyrm5GpW3KJLj91M175TJmwtb2bQWMafnrh0awZTyXc+yi n1+OadUZmi73lelEAcmJo9wdqSiDxF2HbLYakkwcJVG5pomoGx33bln+IKhygSvfk/ n/ZpSUlcUTW0Q== From: Bjorn Helgaas To: Richard Henderson , Ivan Kokshaysky , Matt Turner , Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Yoshinori Sato , Rich Felker , Chas Williams <3chas3@gmail.com>, "David S . Miller" , Jakub Kicinski , Paolo Abeni Cc: linux-alpha@vger.kernel.org, linux-ia64@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, linux-atm-general@lists.sourceforge.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Helgaas Subject: [PATCH 1/7] net: wan: atp: remove unused eeprom_delay() Date: Fri, 15 Apr 2022 14:08:11 -0500 Message-Id: <20220415190817.842864-2-helgaas@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220415190817.842864-1-helgaas@kernel.org> References: <20220415190817.842864-1-helgaas@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Bjorn Helgaas atp.h is included only by atp.c, which does not use eeprom_delay(). Remove the unused definition. Signed-off-by: Bjorn Helgaas --- drivers/net/ethernet/realtek/atp.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/net/ethernet/realtek/atp.h b/drivers/net/ethernet/realtek/atp.h index 63f0d2d0e87b..b202184eddd4 100644 --- a/drivers/net/ethernet/realtek/atp.h +++ b/drivers/net/ethernet/realtek/atp.h @@ -255,10 +255,6 @@ static inline void write_word_mode0(short ioaddr, unsigned short value) #define EE_DATA_WRITE 0x01 /* EEPROM chip data in. */ #define EE_DATA_READ 0x08 /* EEPROM chip data out. */ -/* Delay between EEPROM clock transitions. */ -#define eeprom_delay(ticks) \ -do { int _i = 40; while (--_i > 0) { __SLOW_DOWN_IO; } } while (0) - /* The EEPROM commands include the alway-set leading bit. */ #define EE_WRITE_CMD(offset) (((5 << 6) + (offset)) << 17) #define EE_READ(offset) (((6 << 6) + (offset)) << 17) From patchwork Fri Apr 15 19:08:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 12815239 X-Patchwork-Delegate: kuba@kernel.org 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C7B72C433EF for ; Fri, 15 Apr 2022 19:08:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348555AbiDOTLL (ORCPT ); Fri, 15 Apr 2022 15:11:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47434 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348399AbiDOTLF (ORCPT ); Fri, 15 Apr 2022 15:11:05 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B3F3DB2D3; Fri, 15 Apr 2022 12:08:35 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 3613061BA7; Fri, 15 Apr 2022 19:08:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5BEFAC385A8; Fri, 15 Apr 2022 19:08:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1650049714; bh=Il4WOHfjx/Jfo7X5I2JM0pjBeqxepMTlwqwf2vBZu9U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BIaQqTWUSmUIyzdX/NKHSU6Az27xEK3K875mXeTynF5kMb6mqDjraYWkSgFexmcwS ooKPHsD8YdVIH5ScRxt2oSOLc2QynC69e8ygkGurUcLF1vNe0jGZwP7eZSHZfRHq+Z stAGCZb9Dx0jT7dcxefaMgZd4vk/pfJ1OHW5AojnYMNwlA7P2pAA77c+Eicfl2UCjU 8I+dFmzAXrdJKKfzi3PrAA5iPpYEBRhPxypV56R6KLW5bLAgZomPKpqVzrdHFVbXJ8 jIKGNm/bIGsE8RQPPT41a9ICdf8YjIcdvGZQj6fzluT4dIkIoEcheJCTKWbNOoCST3 G4RiggVXkGGAg== From: Bjorn Helgaas To: Richard Henderson , Ivan Kokshaysky , Matt Turner , Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Yoshinori Sato , Rich Felker , Chas Williams <3chas3@gmail.com>, "David S . Miller" , Jakub Kicinski , Paolo Abeni Cc: linux-alpha@vger.kernel.org, linux-ia64@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, linux-atm-general@lists.sourceforge.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Helgaas Subject: [PATCH 2/7] net: wan: lmc: remove unused DELAY() Date: Fri, 15 Apr 2022 14:08:12 -0500 Message-Id: <20220415190817.842864-3-helgaas@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220415190817.842864-1-helgaas@kernel.org> References: <20220415190817.842864-1-helgaas@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Bjorn Helgaas lmc_var.h is included only by files in drivers/net/wan/lmc/, and none of them uses DELAY(). Remove the unused definition and related comments. Signed-off-by: Bjorn Helgaas --- drivers/net/wan/lmc/lmc_main.c | 8 -------- drivers/net/wan/lmc/lmc_var.h | 8 -------- 2 files changed, 16 deletions(-) diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c index 76c6b4f89890..45b2d25782ed 100644 --- a/drivers/net/wan/lmc/lmc_main.c +++ b/drivers/net/wan/lmc/lmc_main.c @@ -1669,21 +1669,17 @@ unsigned lmc_mii_readreg (lmc_softc_t * const sc, unsigned devaddr, unsigned reg LMC_CSR_WRITE (sc, csr_9, dataval); lmc_delay (); - /* __SLOW_DOWN_IO; */ LMC_CSR_WRITE (sc, csr_9, dataval | 0x10000); lmc_delay (); - /* __SLOW_DOWN_IO; */ } for (i = 19; i > 0; i--) { LMC_CSR_WRITE (sc, csr_9, 0x40000); lmc_delay (); - /* __SLOW_DOWN_IO; */ retval = (retval << 1) | ((LMC_CSR_READ (sc, csr_9) & 0x80000) ? 1 : 0); LMC_CSR_WRITE (sc, csr_9, 0x40000 | 0x10000); lmc_delay (); - /* __SLOW_DOWN_IO; */ } return (retval >> 1) & 0xffff; @@ -1708,10 +1704,8 @@ void lmc_mii_writereg (lmc_softc_t * const sc, unsigned devaddr, unsigned regno, LMC_CSR_WRITE (sc, csr_9, datav); lmc_delay (); - /* __SLOW_DOWN_IO; */ LMC_CSR_WRITE (sc, csr_9, (datav | 0x10000)); lmc_delay (); - /* __SLOW_DOWN_IO; */ i--; } @@ -1720,10 +1714,8 @@ void lmc_mii_writereg (lmc_softc_t * const sc, unsigned devaddr, unsigned regno, { LMC_CSR_WRITE (sc, csr_9, 0x40000); lmc_delay (); - /* __SLOW_DOWN_IO; */ LMC_CSR_WRITE (sc, csr_9, 0x50000); lmc_delay (); - /* __SLOW_DOWN_IO; */ i--; } } diff --git a/drivers/net/wan/lmc/lmc_var.h b/drivers/net/wan/lmc/lmc_var.h index 99f0aa787a35..cf824bb1932c 100644 --- a/drivers/net/wan/lmc/lmc_var.h +++ b/drivers/net/wan/lmc/lmc_var.h @@ -44,14 +44,6 @@ typedef struct lmc___ctl lmc_ctl_t; #define LMC_CSR_WRITE(sc, reg, val) \ outl((val), (sc)->lmc_csrs.reg) -//#ifdef _LINUX_DELAY_H -// #define SLOW_DOWN_IO udelay(2); -// #undef __SLOW_DOWN_IO -// #define __SLOW_DOWN_IO udelay(2); -//#endif - -#define DELAY(n) SLOW_DOWN_IO - #define lmc_delay() inl(sc->lmc_csrs.csr_9) /* This macro sync's up with the mii so that reads and writes can take place */ From patchwork Fri Apr 15 19:08:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 12815240 X-Patchwork-Delegate: kuba@kernel.org 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B145FC433F5 for ; Fri, 15 Apr 2022 19:08:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348748AbiDOTLU (ORCPT ); Fri, 15 Apr 2022 15:11:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47522 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232623AbiDOTLJ (ORCPT ); Fri, 15 Apr 2022 15:11:09 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9D9B6DB2E1; Fri, 15 Apr 2022 12:08:37 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 371B061BB8; Fri, 15 Apr 2022 19:08:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6F7C9C385A4; Fri, 15 Apr 2022 19:08:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1650049716; bh=o4MX8UK2Ayi2FU0PSYzgH1W7goqrO0bs8RfgMd3gAVQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cweHab1Gdg6zDAzegVfOlAcwLW0ZwyDacOnsclAJlJquxFoXV6FmDWc3aQd5lF7UK BCj2JeCoOaAm0MV5HhGtowfZX5F/tpn4QARtoxmMlDxgFzQr3KWzQOHH9Zv6W34+Ez uNkS2GjiA9M5zDb41OTuhdLm6hl1safKJ+7xyYZyNWUPI8UwsntYxXmlul+LZVXL5/ 6TLKtRMfgV0r8kxWTabiWAdVZHYscdPBqfySCuuha7mxFzQ9t60jFezg3F9f+tqhsV mFqTtjcCEbIr4trxsLK8ztpzsoa9De11Z2III0lnWhLbz2LgR9UQpK60LlFOKjysH2 SxpHeGecr7ioA== From: Bjorn Helgaas To: Richard Henderson , Ivan Kokshaysky , Matt Turner , Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Yoshinori Sato , Rich Felker , Chas Williams <3chas3@gmail.com>, "David S . Miller" , Jakub Kicinski , Paolo Abeni Cc: linux-alpha@vger.kernel.org, linux-ia64@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, linux-atm-general@lists.sourceforge.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Helgaas Subject: [PATCH 3/7] net: remove comments that mention obsolete __SLOW_DOWN_IO Date: Fri, 15 Apr 2022 14:08:13 -0500 Message-Id: <20220415190817.842864-4-helgaas@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220415190817.842864-1-helgaas@kernel.org> References: <20220415190817.842864-1-helgaas@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Bjorn Helgaas Signed-off-by: Bjorn Helgaas --- drivers/atm/nicstarmac.c | 5 ----- drivers/net/ethernet/dec/tulip/winbond-840.c | 2 -- drivers/net/ethernet/natsemi/natsemi.c | 2 -- 3 files changed, 9 deletions(-) diff --git a/drivers/atm/nicstarmac.c b/drivers/atm/nicstarmac.c index e0dda9062e6b..791f69a07ddf 100644 --- a/drivers/atm/nicstarmac.c +++ b/drivers/atm/nicstarmac.c @@ -14,11 +14,6 @@ typedef void __iomem *virt_addr_t; #define CYCLE_DELAY 5 -/* - This was the original definition -#define osp_MicroDelay(microsec) \ - do { int _i = 4*microsec; while (--_i > 0) { __SLOW_DOWN_IO; }} while (0) -*/ #define osp_MicroDelay(microsec) {unsigned long useconds = (microsec); \ udelay((useconds));} /* diff --git a/drivers/net/ethernet/dec/tulip/winbond-840.c b/drivers/net/ethernet/dec/tulip/winbond-840.c index 86b1d23eba83..1db19463fd46 100644 --- a/drivers/net/ethernet/dec/tulip/winbond-840.c +++ b/drivers/net/ethernet/dec/tulip/winbond-840.c @@ -474,8 +474,6 @@ static int w840_probe1(struct pci_dev *pdev, const struct pci_device_id *ent) No extra delay is needed with 33Mhz PCI, but future 66Mhz access may need a delay. Note that pre-2.0.34 kernels had a cache-alignment bug that made udelay() unreliable. - The old method of using an ISA access as a delay, __SLOW_DOWN_IO__, is - deprecated. */ #define eeprom_delay(ee_addr) ioread32(ee_addr) diff --git a/drivers/net/ethernet/natsemi/natsemi.c b/drivers/net/ethernet/natsemi/natsemi.c index 82a22711ce45..50bca486a244 100644 --- a/drivers/net/ethernet/natsemi/natsemi.c +++ b/drivers/net/ethernet/natsemi/natsemi.c @@ -989,8 +989,6 @@ static int natsemi_probe1(struct pci_dev *pdev, const struct pci_device_id *ent) No extra delay is needed with 33Mhz PCI, but future 66Mhz access may need a delay. Note that pre-2.0.34 kernels had a cache-alignment bug that made udelay() unreliable. - The old method of using an ISA access as a delay, __SLOW_DOWN_IO__, is - deprecated. */ #define eeprom_delay(ee_addr) readl(ee_addr) From patchwork Fri Apr 15 19:08:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 12815242 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 55AC6C433EF for ; Fri, 15 Apr 2022 19:09:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348968AbiDOTL1 (ORCPT ); Fri, 15 Apr 2022 15:11:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47596 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348521AbiDOTLL (ORCPT ); Fri, 15 Apr 2022 15:11:11 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0CADDDB484; Fri, 15 Apr 2022 12:08:41 -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 B7C4DB82CE7; Fri, 15 Apr 2022 19:08:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 46964C385A4; Fri, 15 Apr 2022 19:08:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1650049718; bh=3GSH601X4LqRWpFnvScC4daS1AorO+4ieLuBBuBrntQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HnUbP0tTgnYaEiIklhCUba59DaMfbxRXhh4KmBtilODwJGDfbzRmqaluIQB+/zG2/ lrfFa28WnL/+NTR0wjJHq6Rpn8wGuyCiErbKLcfSGSIfabnzsS/fpWRFPzQtCq4dEy ir+0/mNgWrdpB8LKWgHyvkwno1tmv3ofGhLvp+yrSNPMF9nhUQ75NGgdEOk6v1vq16 FAfUp68uiRWZyK8NbPjr6Pr+tOOKua6y/4VdSCbXl8TdQ/4hReVq87LbV9VJeCHlcX hE40D4uiGabJtuqqO8JR239Vyj64zw+KbhlK8X/ZCagNzttkC8YaLtIE3o5fzQiGwa uhxCeopoqALDQ== From: Bjorn Helgaas To: Richard Henderson , Ivan Kokshaysky , Matt Turner , Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Yoshinori Sato , Rich Felker , Chas Williams <3chas3@gmail.com>, "David S . Miller" , Jakub Kicinski , Paolo Abeni Cc: linux-alpha@vger.kernel.org, linux-ia64@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, linux-atm-general@lists.sourceforge.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Helgaas Subject: [PATCH 4/7] sh: remove unused SLOW_DOWN_IO Date: Fri, 15 Apr 2022 14:08:14 -0500 Message-Id: <20220415190817.842864-5-helgaas@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220415190817.842864-1-helgaas@kernel.org> References: <20220415190817.842864-1-helgaas@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- 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 cf9a3ec32406..3fe0e56eff4e 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) From patchwork Fri Apr 15 19:08:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 12815241 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 79687C433F5 for ; Fri, 15 Apr 2022 19:09:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348963AbiDOTL0 (ORCPT ); Fri, 15 Apr 2022 15:11:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47598 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348542AbiDOTLL (ORCPT ); Fri, 15 Apr 2022 15:11:11 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F9FADB2CB; Fri, 15 Apr 2022 12:08:41 -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 dfw.source.kernel.org (Postfix) with ESMTPS id E0CAE61BB8; Fri, 15 Apr 2022 19:08:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1FA50C385A5; Fri, 15 Apr 2022 19:08:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1650049720; bh=QNhkR5f2VwsmRJLjyIIeuyQ3Ro0/ZTlpiHVGueu8khw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RzXW0JUf3FmmvjCkNLPg6xeSiQ00FCdgqtRjSiv750sCreQXBhr+haJGO3gaKecxK Ut63sQ0/8xIkmtE1di1uclIYjE3djP8GM/NAZvEmiQ50vNroamDnR8EJhVyHC90mAX DCjvBvyeNWljHEVX3CqMYuSlRG8rajCE4XkjMSePx9n1RQV1NZMCyYIazZvPVRo+0I GHgXCH+MAp6nGOF2EU4Ezu3OBddS8QZSxKM+2+OKfJ2EOMkezjpNIdTE3XnvMI4AIT BkT+aUHhioeRJQGiWGOXv1o/Fi2wCjLqpTFlNLS+zZ+1bOC9ECLuRExRrZ8wlP2c6J beDpycOtgITAA== From: Bjorn Helgaas To: Richard Henderson , Ivan Kokshaysky , Matt Turner , Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Yoshinori Sato , Rich Felker , Chas Williams <3chas3@gmail.com>, "David S . Miller" , Jakub Kicinski , Paolo Abeni Cc: linux-alpha@vger.kernel.org, linux-ia64@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, linux-atm-general@lists.sourceforge.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Helgaas Subject: [PATCH 5/7] powerpc: Remove unused SLOW_DOWN_IO definition Date: Fri, 15 Apr 2022 14:08:15 -0500 Message-Id: <20220415190817.842864-6-helgaas@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220415190817.842864-1-helgaas@kernel.org> References: <20220415190817.842864-1-helgaas@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Bjorn Helgaas Remove unused SLOW_DOWN_IO definition. Signed-off-by: Bjorn Helgaas --- arch/powerpc/include/asm/io.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/io.h index fee979d3a1aa..c5a5f7c9b231 100644 --- a/arch/powerpc/include/asm/io.h +++ b/arch/powerpc/include/asm/io.h @@ -38,8 +38,6 @@ extern struct pci_dev *isa_bridge_pcidev; #define SIO_CONFIG_RA 0x398 #define SIO_CONFIG_RD 0x399 -#define SLOW_DOWN_IO - /* 32 bits uses slightly different variables for the various IO * bases. Most of this file only uses _IO_BASE though which we * define properly based on the platform From patchwork Fri Apr 15 19:08:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 12815244 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EC8A4C433EF for ; Fri, 15 Apr 2022 19:09:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348885AbiDOTLm (ORCPT ); Fri, 15 Apr 2022 15:11:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47866 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348679AbiDOTLS (ORCPT ); Fri, 15 Apr 2022 15:11:18 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 54E5ADB2EC; Fri, 15 Apr 2022 12:08:43 -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 dfw.source.kernel.org (Postfix) with ESMTPS id E101C61CB7; Fri, 15 Apr 2022 19:08:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1FD7CC385B7; Fri, 15 Apr 2022 19:08:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1650049722; bh=II6OEIXWBm46BUBaioGDbgMZ+vUKj+RzIpjwlTwoobY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mucLjtHZlTlqn2DfNqXglYqlzQSZRXHg7K3buWgwJ6TRmRLexMpb/3xdYzYZVnJs+ gvBVNpEgyW88VKmUYBkUJbakIu5PdplrUxVwEyeu9N/5FtduwCXjlc6s+6XwFWAL7a J3hnMLdtA0dszo+jHajTb12P1IDdZL9y+8tQ9AM1qXC1DXvSJv/qQ6bqPGDCQJxN9s 8SuiW1RQrqkyjOH5CKiSXg68i99swwTacX+KoAEKHxEuVCAvdKmn+ZTzSKf8SCV95w qZvkONpo92Q8EjiphevANVfZ7bTf5QgoMcAuHZJkuE3BCcOyhiGmvRmV3bWHD9MpWP RuPfTe7QgwUPw== From: Bjorn Helgaas To: Richard Henderson , Ivan Kokshaysky , Matt Turner , Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Yoshinori Sato , Rich Felker , Chas Williams <3chas3@gmail.com>, "David S . Miller" , Jakub Kicinski , Paolo Abeni Cc: linux-alpha@vger.kernel.org, linux-ia64@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, linux-atm-general@lists.sourceforge.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Helgaas Subject: [PATCH 6/7] ia64: remove unused __SLOW_DOWN_IO and SLOW_DOWN_IO definitions Date: Fri, 15 Apr 2022 14:08:16 -0500 Message-Id: <20220415190817.842864-7-helgaas@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220415190817.842864-1-helgaas@kernel.org> References: <20220415190817.842864-1-helgaas@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Bjorn Helgaas Remove unused __SLOW_DOWN_IO and SLOW_DOWN_IO definitions. Signed-off-by: Bjorn Helgaas --- arch/ia64/include/asm/io.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/ia64/include/asm/io.h b/arch/ia64/include/asm/io.h index 6d93b923b379..1069e1730b2e 100644 --- a/arch/ia64/include/asm/io.h +++ b/arch/ia64/include/asm/io.h @@ -23,10 +23,6 @@ #include #include -/* We don't use IO slowdowns on the ia64, but.. */ -#define __SLOW_DOWN_IO do { } while (0) -#define SLOW_DOWN_IO do { } while (0) - #define __IA64_UNCACHED_OFFSET RGN_BASE(RGN_UNCACHED) /* From patchwork Fri Apr 15 19:08:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 12815243 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4170BC433F5 for ; Fri, 15 Apr 2022 19:09:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348750AbiDOTLk (ORCPT ); Fri, 15 Apr 2022 15:11:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348551AbiDOTLX (ORCPT ); Fri, 15 Apr 2022 15:11:23 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C6DB7DBD1D; Fri, 15 Apr 2022 12:08:46 -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 70AC9B82EF1; Fri, 15 Apr 2022 19:08:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 05DE7C385A5; Fri, 15 Apr 2022 19:08:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1650049724; bh=dvZpqVTi0jdBV+n0QdZhgd89O8shNTR194n0OIslFEI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Vo9SN5UB5HN+TQ8PDoWan0KcngRkeZPACjXnATfZw2QPo8YV8IFEsKTgTqaUHb4Wq buYSTHLuV8dWUQ+yssZu4Cu0uOcBv0mjwVsDVHIh1maofvqLvYAAAy1RVEFK9yCXo+ dPGdBtMn+DALp8LeFcJxFbSsAfDVa+Yze68PW2g0l28eXMzTI2kK5VoUBifIrHOtwZ 1WOf86Z5OYIWDhVv4bhoKtsirQ9OaUxjNMN4e/90dC6L7vUMwinM6ndR4799Tqlo2s Geiv9PhbOsZgFOoijb1U7+dWqsYEaovac2mSFv5v7ZmqCiWLmIaVi+7wvIiA7CI4f6 lLjJ23uF8IhFQ== From: Bjorn Helgaas To: Richard Henderson , Ivan Kokshaysky , Matt Turner , Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Yoshinori Sato , Rich Felker , Chas Williams <3chas3@gmail.com>, "David S . Miller" , Jakub Kicinski , Paolo Abeni Cc: linux-alpha@vger.kernel.org, linux-ia64@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, linux-atm-general@lists.sourceforge.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Helgaas Subject: [PATCH 7/7] alpha: remove unused __SLOW_DOWN_IO and SLOW_DOWN_IO definitions Date: Fri, 15 Apr 2022 14:08:17 -0500 Message-Id: <20220415190817.842864-8-helgaas@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220415190817.842864-1-helgaas@kernel.org> References: <20220415190817.842864-1-helgaas@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Bjorn Helgaas Remove unused __SLOW_DOWN_IO and SLOW_DOWN_IO definitions. Signed-off-by: Bjorn Helgaas --- arch/alpha/include/asm/io.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/alpha/include/asm/io.h b/arch/alpha/include/asm/io.h index c9cb554fbe54..338dd24400bd 100644 --- a/arch/alpha/include/asm/io.h +++ b/arch/alpha/include/asm/io.h @@ -14,10 +14,6 @@ the implementation we have here matches that interface. */ #include -/* We don't use IO slowdowns on the Alpha, but.. */ -#define __SLOW_DOWN_IO do { } while (0) -#define SLOW_DOWN_IO do { } while (0) - /* * Virtual -> physical identity mapping starts at this offset */