From patchwork Mon Apr 16 22:04:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Schmitz X-Patchwork-Id: 898966 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="XhQsNPDV"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Q2Vs1cC6z9s1l for ; Tue, 17 Apr 2018 08:05:09 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753083AbeDPWFH (ORCPT ); Mon, 16 Apr 2018 18:05:07 -0400 Received: from mail-pl0-f66.google.com ([209.85.160.66]:38102 "EHLO mail-pl0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751210AbeDPWE7 (ORCPT ); Mon, 16 Apr 2018 18:04:59 -0400 Received: by mail-pl0-f66.google.com with SMTP id c7-v6so10801127plr.5; Mon, 16 Apr 2018 15:04:59 -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=EYO0nXXoX+ci50DTIpeO+okL9qAiL3ilFk8/dHkZttg=; b=XhQsNPDV3AqUSnD1GEXHtoTrq6Tb2BsWYY4XZ6HI+QKc3aaMEBYm+GsKFKKZuYA+/f xZUfELywpY8EAgRdfd+JQzrcGY/PYyzQ7ikseAGq8iT5L9kEVzprug0CbH7/4QQitthc yhtOV2ayY8oYY3i+TPgSLRN18IOndIq78ZyQ7YEx2yFwvXdQy7W5c8Kghr1Xpu1cW+ce 6hIqWTXri4OnYGjHAxvs+8U8AaaoM4SFSq14vcqPU/atcn+OYVHs0vWZziyLvvbvb4VV /pQ8nsRb/BdsUXWhDk0hpr7xxkFnlzAafFjpxBZePM3jpEu73BsuHnoEiVsn2XZ9aQ/V ro8A== 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=EYO0nXXoX+ci50DTIpeO+okL9qAiL3ilFk8/dHkZttg=; b=H0tj/2TPsP3IvtlZxColU0oxAWZAg35oWOIpDJbEMwwhn/cq8SsY45w2M4YON7+TRt OPYqcFVNCVrIn0ctqvrq8+8HyiSMVcQWbOL/njwyMsVRGNwHxGqxazVt5KHu90Bw5szd rEJRXfAo+oLSYS1GuSWgqn4+DkkCObTfr1EZzUWHhh6CAmMYKNOzN/dzbRRuc98iW+D5 evvlYLtOoOGb2SonmMy3uzlY7+495XL8lQ5t2gXIq6me/9GT2h4Axi2SuTy1s64vslQk 7JDq5M6necQCM5k7FQ1buFCtgX3QgCZZ0Ghm/Pul2mBrxuvlMFIdgTghHExYfSfqbBaW pe9w== X-Gm-Message-State: ALQs6tAAKKgBoKrSzWDbJqAHN4S+MpCI4AcfUxp85M7Pnk1x2zbH2bvD 1LP9rDJQM9AmNQgZHcNN1z74Hg== X-Google-Smtp-Source: AIpwx49KzcBgLQgU9H5vIitdCtNjgh63AMs/Lh0pVyRvGrqQBtKUVumOOsZRPKqT8zmEMtACdrJuKw== X-Received: by 2002:a17:902:6b87:: with SMTP id p7-v6mr7428246plk.101.1523916299057; Mon, 16 Apr 2018 15:04:59 -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 75sm26319945pfx.71.2018.04.16.15.04.57 (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 16 Apr 2018 15:04:57 -0700 (PDT) Received: by xplor.waratah.dyndns.org (Postfix, from userid 1000) id 62B1F360087; 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 05/10] net: ax88796: add interrupt status callback to platform data Date: Tue, 17 Apr 2018 10:04:40 +1200 Message-Id: <1523916285-6057-6-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 To be able to tell the ax88796 driver whether it is sensible to enter the 8390 interrupt handler, an "is this interrupt caused by the 88796" callback has been added to the ax_plat_data structure (with NULL being compatible to the previous behaviour). Signed-off-by: Michael Karcher Signed-off-by: Michael Schmitz --- drivers/net/ethernet/8390/ax88796.c | 23 +++++++++++++++++++++-- include/net/ax88796.h | 5 +++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c index 9159235..b6d5bec 100644 --- a/drivers/net/ethernet/8390/ax88796.c +++ b/drivers/net/ethernet/8390/ax88796.c @@ -167,6 +167,21 @@ static void ax_reset_8390(struct net_device *dev) ei_outb(ENISR_RESET, addr + EN0_ISR); /* Ack intr. */ } +/* Wrapper for __ei_interrupt for platforms that have a platform-specific + * way to find out whether the interrupt request might be caused by + * the ax88796 chip. + */ +static irqreturn_t ax_ei_interrupt_filtered(int irq, void *dev_id) +{ + struct net_device *dev = dev_id; + struct ax_device *ax = to_ax_dev(dev); + struct platform_device *pdev = to_platform_device(dev->dev.parent); + + if (!ax->plat->check_irq(pdev)) + return IRQ_NONE; + + return ax_ei_interrupt(irq, dev_id); +} static void ax_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr, int ring_page) @@ -402,8 +417,12 @@ static int ax_open(struct net_device *dev) if (ret) goto failed_request_irq; - ret = request_irq(dev->irq, ax_ei_interrupt, ax->irqflags, - dev->name, dev); + if (ax->plat->check_irq) + ret = request_irq(dev->irq, ax_ei_interrupt_filtered, + ax->irqflags, dev->name, dev); + else + ret = request_irq(dev->irq, ax_ei_interrupt, ax->irqflags, + dev->name, dev); if (ret) goto failed_request_irq; diff --git a/include/net/ax88796.h b/include/net/ax88796.h index 26cc459..26412cd 100644 --- a/include/net/ax88796.h +++ b/include/net/ax88796.h @@ -12,6 +12,7 @@ #define __NET_AX88796_PLAT_H struct net_device; +struct platform_device; #define AXFLG_HAS_EEPROM (1<<0) #define AXFLG_MAC_FROMDEV (1<<1) /* device already has MAC */ @@ -33,6 +34,10 @@ struct ax_plat_data { const unsigned char *buf, int star_page); void (*block_input)(struct net_device *dev, int count, struct sk_buff *skb, int ring_offset); + /* returns nonzero if a pending interrupt request might by caused by + * the ax88786. Handles all interrupts if set to NULL + */ + int (*check_irq)(struct platform_device *pdev); }; #endif /* __NET_AX88796_PLAT_H */