From patchwork Mon Apr 16 22:04:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Schmitz X-Patchwork-Id: 898971 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="H7GiO5on"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Q2Wh5n2Hz9s0n for ; Tue, 17 Apr 2018 08:05:52 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752916AbeDPWFB (ORCPT ); Mon, 16 Apr 2018 18:05:01 -0400 Received: from mail-pl0-f65.google.com ([209.85.160.65]:40384 "EHLO mail-pl0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752849AbeDPWE5 (ORCPT ); Mon, 16 Apr 2018 18:04:57 -0400 Received: by mail-pl0-f65.google.com with SMTP id t22-v6so2175926plo.7; Mon, 16 Apr 2018 15:04:57 -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=yI6c4/8g6LB9DYJ4Rwl+k5IoY+SDPAUqy0sWotnAqKs=; b=H7GiO5onOcAIT7rmcq29Ox/y/Ikuevi+nua/NdDte0yGf+5/NllIghAlwUR5X2QX/i cLPaH45OTwHzu1bop89ba4CRAyHzoTSqF7ZbKapfX+92E8A9o6gCUCXopHOCEUcptBbm mWUEVPz4ujj2QXKJvznr/jcN6dWXuXYQKysk6Y24pgoZULD/CmwwgMBvtFMMlNpZnnd8 8d4kdw9Tn82u24SrJPu66E+AQOG1mu/VjGYzhbfpVHLgffzO0rClmIPHa0MSgQeI7xwR n0BVlcMSq8OFj0AQWG6qGnzT7z7dFZ3qvHQSC3XfJY6APiwPdaAyHij5DVZRtvL8Mk33 BoZw== 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=yI6c4/8g6LB9DYJ4Rwl+k5IoY+SDPAUqy0sWotnAqKs=; b=P7Gg4DlWVSXJC87v7Za1HFFf2HAuoiSs4BQ+18KgwVZEKAxH1K2vtrHmBP5vtJMF9T sfmnrZF4FKud2o02AgknuOVlk2j31MkWOXhYBYpfoa5fvaFOUXQAvahiPp9LgaXFP3N1 2AsYvjdIa275WST2s2TieJ6NSWEOwU6810F2mYFN6Q67RgqvBTOzJag8ALrTzy9VUhfR OQV9yNiSYbjT0BZsKZ4jnfHSxPuMmqOF2GOfcg+pGVgRjEw4JtFk8/KhvFMZ5XE8OBrB XhsPO3n4xw4iqvje+BwftAdhjSEtphLL7R3PBHoM7GslV52fZR93w0bezWv90teb1Cps eA7g== X-Gm-Message-State: ALQs6tBMttR4BsvboWPjifeJitL10Q6lHmL5zojE9pcbBJFj4X3iCjJE kDIdyXbjbmkPECVM6bORATXLBA== X-Google-Smtp-Source: AIpwx4+NTL8Kuk7JNRAH1wKvcgq5DpYd72A1grjgIPiWCSM6FmYSI1DqEKeLB4ELo6yI/aKLtxjj3Q== X-Received: by 2002:a17:902:68c5:: with SMTP id x5-v6mr17137415plm.194.1523916297114; Mon, 16 Apr 2018 15:04:57 -0700 (PDT) Received: from xplor.waratah.dyndns.org (222-154-41-72-adsl.bb.spark.co.nz. [222.154.41.72]) by smtp.gmail.com with ESMTPSA id u28sm27348733pfl.15.2018.04.16.15.04.52 (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 16 Apr 2018 15:04:53 -0700 (PDT) Received: by xplor.waratah.dyndns.org (Postfix, from userid 1000) id 52474360085; Tue, 17 Apr 2018 10:04:49 +1200 (NZST) From: Michael Schmitz To: netdev@vger.kernel.org Cc: linux-m68k@vger.kernel.org, Michael.Karcher@fu-berlin.de, Michael Schmitz , Michael Karcher Subject: [PATCH 04/10] net: ax88796: Add block_input/output hooks to ax_plat_data Date: Tue, 17 Apr 2018 10:04:39 +1200 Message-Id: <1523916285-6057-5-git-send-email-schmitzmic@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1523916285-6057-1-git-send-email-schmitzmic@gmail.com> References: <1523916285-6057-1-git-send-email-schmitzmic@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add platform specific hooks for block transfer reads/writes of packet buffer data, superseding the default provided ax_block_input/output. Currently used for m68k Amiga XSurf100. Signed-off-by: Michael Karcher Signed-off-by: Michael Schmitz --- drivers/net/ethernet/8390/ax88796.c | 10 ++++++++-- include/net/ax88796.h | 9 ++++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c index a4f23ba..9159235 100644 --- a/drivers/net/ethernet/8390/ax88796.c +++ b/drivers/net/ethernet/8390/ax88796.c @@ -758,8 +758,14 @@ static int ax_init_dev(struct net_device *dev) #endif ei_local->reset_8390 = &ax_reset_8390; - ei_local->block_input = &ax_block_input; - ei_local->block_output = &ax_block_output; + if (ax->plat->block_input) + ei_local->block_input = ax->plat->block_input; + else + ei_local->block_input = &ax_block_input; + if (ax->plat->block_output) + ei_local->block_output = ax->plat->block_output; + else + ei_local->block_output = &ax_block_output; ei_local->get_8390_hdr = &ax_get_8390_hdr; ei_local->priv = 0; ei_local->msg_enable = ax_msg_enable; diff --git a/include/net/ax88796.h b/include/net/ax88796.h index b9a3bec..26cc459 100644 --- a/include/net/ax88796.h +++ b/include/net/ax88796.h @@ -8,10 +8,11 @@ * published by the Free Software Foundation. * */ - #ifndef __NET_AX88796_PLAT_H #define __NET_AX88796_PLAT_H +struct net_device; + #define AXFLG_HAS_EEPROM (1<<0) #define AXFLG_MAC_FROMDEV (1<<1) /* device already has MAC */ #define AXFLG_HAS_93CX6 (1<<2) /* use eeprom_93cx6 driver */ @@ -26,6 +27,12 @@ struct ax_plat_data { u32 *reg_offsets; /* register offsets */ u8 *mac_addr; /* MAC addr (only used when AXFLG_MAC_FROMPLATFORM is used */ + + /* uses default ax88796 buffer if set to NULL */ + void (*block_output)(struct net_device *dev, int count, + const unsigned char *buf, int star_page); + void (*block_input)(struct net_device *dev, int count, + struct sk_buff *skb, int ring_offset); }; #endif /* __NET_AX88796_PLAT_H */