From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B0D92C49EA2 for ; Thu, 17 Jun 2021 22:38:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 93A6960FD8 for ; Thu, 17 Jun 2021 22:38:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232676AbhFQWkQ (ORCPT ); Thu, 17 Jun 2021 18:40:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60256 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231295AbhFQWkQ (ORCPT ); Thu, 17 Jun 2021 18:40:16 -0400 Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 00AA2C06175F for ; Thu, 17 Jun 2021 15:38:07 -0700 (PDT) Received: by mail-pf1-x42f.google.com with SMTP id x16so6134743pfa.13 for ; Thu, 17 Jun 2021 15:38:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mu+qrZxoTwCeAPKhmVx0xSJJ2FXcQ6UKtqE/gweBanM=; b=a4nCXbgtXVOXVyGjejOkL9CstlOo8Q+US9MHYcydUJG0Kgry/q85v2vGNTUCxFR6IU OEDS0Ww8VG4cFvLdRvTKebVK7puuL0LZKjkTMYj0NSn5T5TRDdXLKASZ61NmB07r4rHI DKX1kgZJ2kLQjuXz9TEbo0Kzinc+qYOAj7W6ujWNLouGjliKCT7yu5BBqRb9qdG/8N2u l06OuYEN6dP/oENB8MY736p9v/N7z6njVWa578BQK/Vk6zf81yoTQckkrr3EUi13xGte ANJxO5NJGxKsaMPjeOJleKdwc8A8sbGcyn6E4N5RLam/b8ZVm+5+m3qWpZjVkP5w6vjy NZlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mu+qrZxoTwCeAPKhmVx0xSJJ2FXcQ6UKtqE/gweBanM=; b=XjUm0HsBivfEEAKZW3Qo/G5mGJjtnYIgknjctJT60tuPcmGy8HyBZYzD4KZoalnEC0 wiETaIgKX3Zs321fIlIa6jKEQj2vKSt9iEIAMOOEvoOGq787N0Cd0yY6bTl2+HKwIfYB tPuq5TcFZP2pGzHBQ26yOv9A0Zwi9DENQCmt0tfykA+13CWkcMYBt+cBqlMzbbzBG1Vw 5ou0h826ia6ysoLwUgTlzG/XH7rvkQYvee2PsLwGKpMIh8WF2NNAFWIUxRJPCX+hEyET YJNnowNwbQGU9IyLuzTXSP1ALWMrXwbXjCAqoUw/0GFuPtoGbs6RSy27O+UCYHrGAJb6 RtWw== X-Gm-Message-State: AOAM530aLpuS1t9EGXFuxuIbW6JyiBNS7RExtLnz33oBdIjKhjTZIJAQ R+trFYgrUCvFu2AF6NRnv/U= X-Google-Smtp-Source: ABdhPJwsubVVak+4mf7ZLsPHs7gSYkN9hnssybUYAb8dgHEoOfNiKjAVz9SuDVrRU9gJeJOq6gYk/g== X-Received: by 2002:a62:7ac9:0:b029:2ea:8eb:d5a0 with SMTP id v192-20020a627ac90000b02902ea08ebd5a0mr1869632pfc.26.1623969486597; Thu, 17 Jun 2021 15:38:06 -0700 (PDT) Received: from xplor.waratah.dyndns.org (222-152-189-137-fibre.sparkbb.co.nz. [222.152.189.137]) by smtp.gmail.com with ESMTPSA id j3sm6129165pfe.98.2021.06.17.15.38.05 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Jun 2021 15:38:06 -0700 (PDT) Received: by xplor.waratah.dyndns.org (Postfix, from userid 1000) id 45D3C3603D9; Fri, 18 Jun 2021 10:38:02 +1200 (NZST) From: Michael Schmitz To: linux-m68k@vger.kernel.org, geert@linux-m68k.org Cc: alex@kazik.de, Michael Schmitz Subject: [PATCH v4 1/2] m68k: io_mm.h - add APNE 100 MBit support Date: Fri, 18 Jun 2021 10:37:58 +1200 Message-Id: <1623969479-29657-2-git-send-email-schmitzmic@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1623969479-29657-1-git-send-email-schmitzmic@gmail.com> References: <1623969479-29657-1-git-send-email-schmitzmic@gmail.com> Precedence: bulk List-ID: X-Mailing-List: linux-m68k@vger.kernel.org Add code to support 10 Mbit and 100 Mbit mode for APNE driver. A new ISA type ISA_TYPE_AG16 dynamically switches the Amiga ISA inb accessor to word access as required by the 100 Mbit cards. Patch modified after patch "[PATCH RFC net-next] Amiga PCMCIA 100 MBit card support" submitted to netdev 2018/09/16 by Alex Kazik . Signed-off-by: Michael Schmitz -- Changes from v3: Finn Thain: - revert isa_inb() define reordering - omit redundant #ifdef around ISA_TYPE_AG16 case labels Changes from v1: Andreas Schwab: - remove redundant fallthrough annotations Changes from RFC: Geert Uytterhoeven: - rename ISA_TYPE_AG100 to ISA_TYPE_AG16 (16 bit cards) - move ISA_TYPE_AG16 case inside #ifdef CONFIG_AMIGA_PCMCIA - change #if defined(CONFIG_APNE_100MBIT) to #ifdef - fix parentheses in isa_inb() define - omit comment about compiler optimization - add ISA_TYPE_AG16 case to isa_delay() --- arch/m68k/include/asm/io_mm.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/arch/m68k/include/asm/io_mm.h b/arch/m68k/include/asm/io_mm.h index 9c521b0..6a037c1 100644 --- a/arch/m68k/include/asm/io_mm.h +++ b/arch/m68k/include/asm/io_mm.h @@ -101,6 +101,11 @@ #define ISA_TYPE_Q40 (1) #define ISA_TYPE_AG (2) #define ISA_TYPE_ENEC (3) +#define ISA_TYPE_AG16 (4) /* for 100 MBit APNE card */ + +#if defined(CONFIG_APNE100MBIT) +#define MULTI_ISA 1 +#endif #if defined(CONFIG_Q40) && !defined(MULTI_ISA) #define ISA_TYPE ISA_TYPE_Q40 @@ -136,6 +141,7 @@ static inline u8 __iomem *isa_itb(unsigned long addr) case ISA_TYPE_Q40: return (u8 __iomem *)Q40_ISA_IO_B(addr); #endif #ifdef CONFIG_AMIGA_PCMCIA + case ISA_TYPE_AG16: case ISA_TYPE_AG: return (u8 __iomem *)AG_ISA_IO_B(addr); #endif #ifdef CONFIG_ATARI_ROM_ISA @@ -155,6 +161,7 @@ static inline u16 __iomem *isa_itw(unsigned long addr) case ISA_TYPE_Q40: return (u16 __iomem *)Q40_ISA_IO_W(addr); #endif #ifdef CONFIG_AMIGA_PCMCIA + case ISA_TYPE_AG16: case ISA_TYPE_AG: return (u16 __iomem *)AG_ISA_IO_W(addr); #endif #ifdef CONFIG_ATARI_ROM_ISA @@ -171,6 +178,7 @@ static inline u32 __iomem *isa_itl(unsigned long addr) switch(ISA_TYPE) { #ifdef CONFIG_AMIGA_PCMCIA + case ISA_TYPE_AG16: case ISA_TYPE_AG: return (u32 __iomem *)AG_ISA_IO_W(addr); #endif } @@ -184,6 +192,7 @@ static inline u8 __iomem *isa_mtb(unsigned long addr) case ISA_TYPE_Q40: return (u8 __iomem *)Q40_ISA_MEM_B(addr); #endif #ifdef CONFIG_AMIGA_PCMCIA + case ISA_TYPE_AG16: case ISA_TYPE_AG: return (u8 __iomem *)addr; #endif #ifdef CONFIG_ATARI_ROM_ISA @@ -203,6 +212,7 @@ static inline u16 __iomem *isa_mtw(unsigned long addr) case ISA_TYPE_Q40: return (u16 __iomem *)Q40_ISA_MEM_W(addr); #endif #ifdef CONFIG_AMIGA_PCMCIA + case ISA_TYPE_AG16: case ISA_TYPE_AG: return (u16 __iomem *)addr; #endif #ifdef CONFIG_ATARI_ROM_ISA @@ -216,7 +226,7 @@ static inline u16 __iomem *isa_mtw(unsigned long addr) } -#define isa_inb(port) in_8(isa_itb(port)) +#define isa_inb(port) ((ISA_TYPE == ISA_TYPE_AG16) ? ((port) & 1 ? isa_inw((port) - 1) & 0xff : isa_inw(port) >> 8) : in_8(isa_itb(port))) #define isa_inw(port) (ISA_SEX ? in_be16(isa_itw(port)) : in_le16(isa_itw(port))) #define isa_inl(port) (ISA_SEX ? in_be32(isa_itl(port)) : in_le32(isa_itl(port))) #define isa_outb(val,port) out_8(isa_itb(port),(val)) @@ -270,6 +280,7 @@ static inline void isa_delay(void) case ISA_TYPE_Q40: isa_outb(0,0x80); break; #endif #ifdef CONFIG_AMIGA_PCMCIA + case ISA_TYPE_AG16: break; case ISA_TYPE_AG: break; #endif #ifdef CONFIG_ATARI_ROM_ISA -- 2.7.4