From patchwork Mon Feb 8 08:00:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Loic Poulain X-Patchwork-Id: 378538 Delivered-To: patch@linaro.org Received: by 2002:a02:b18a:0:0:0:0:0 with SMTP id t10csp4474219jah; Sun, 7 Feb 2021 23:54:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJyjlXrKG7JhY6Lv8z4nWhwmPbfPeo9Hqp4QaxDPrUN8aUoIMTHey6PVTiy6d/f+KMYJrBOV X-Received: by 2002:a17:907:2130:: with SMTP id qo16mr15103904ejb.537.1612770882222; Sun, 07 Feb 2021 23:54:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612770882; cv=none; d=google.com; s=arc-20160816; b=cbz86o6C5mCef7zKX1vMIEzN6F/Otg6EYmq4KCuWMdcVwpSjOsazsLdAlhW8ZJfA0c orKj1UEqUjJ5HfIv5Yz868t7WYYAoa/g3dQTEGWuuriHULyMNH5db6EepM16Vt4Jw/Zt czA6a5jByLk6w8ihx5vMOMn5tkfnHN7UqQR42PFoS5xuTaAz3qVIMvF4ccsxsQzM6LBF oKfOs7FKBvywWWo/fi2Sq16xrLwcOIIdGk7p1siQJ+dPynlxJE8hTxNq4V9IHgu9f4Rd z2shlN1qDkFj0bf5sMhBSrNKN9J+UmDflsz3MlwYqFKC3GP3OTCF8Vu+WuwbVWVNQpgy KkrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:to:references:in-reply-to:message-id:date :subject:cc:from:dkim-signature; bh=nUxAXdLjhkJNUqiBcTNdD1orykfV5lPBWV6f7eDBEEk=; b=CmnmDzIMYudVAF7c433A8mGfOPdTkbfUEYxKtp5QeqZaCAx6JOV0aMgJQhpasNDHB9 Sdsc+lEcNIjWTzy9xacyU8QoF6UEAaPRNN1Qwh8CXPviQ1E1/Fczu3FeoBAEfMF5tH/Y mOfAHuVedeXwExpJEZHHrvCjnGlpPkkPe48eHBB4sa1Lnxb2BvKUIw+mpd4EyLY0U8vk bOa5fS8vzR/T/HPYcejTlzHtdAjAcGkpGORfhoosvYTufhTAEfZzj6BuGrHSJ6yCR1Q3 +Zib7ixhGlQzzPKYcIhepds1axhodgbX0CkoPLYRDi36pEDImT7MfedPe9XcUoU6u25y gJ5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="AfYc/0Io"; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id l6si43449edv.68.2021.02.07.23.54.42; Sun, 07 Feb 2021 23:54:42 -0800 (PST) Received-SPF: pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="AfYc/0Io"; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230059AbhBHHxn (ORCPT + 8 others); Mon, 8 Feb 2021 02:53:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230027AbhBHHx0 (ORCPT ); Mon, 8 Feb 2021 02:53:26 -0500 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7C080C06178C for ; Sun, 7 Feb 2021 23:52:39 -0800 (PST) Received: by mail-wr1-x430.google.com with SMTP id z6so15876162wrq.10 for ; Sun, 07 Feb 2021 23:52:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nUxAXdLjhkJNUqiBcTNdD1orykfV5lPBWV6f7eDBEEk=; b=AfYc/0Iows13/JMtkrIcj3smCNTE0D6ybhCjZJtfxLd6lxUmj//dMBYyTLLod1iJl/ LHgvwiBu68GljKg/feTOTmZ/cMsA3ZNU4JOnADH2HzorB/0+XMEVh7pc2pq6RKy1kzRf KHcBXFRDcdchhlRsO9+UU831E425fFaJdaXY11DMkhYnSvJsZCNWfkSGqWtDfdEVH5P6 1aQbQuareOyeVIVfF/faUQoNcvQXjYwfpTml20H0Bn1eq2MYB4Idw+WqomuT0gv9I3CB QcbL2six580lAuIuyEtyhx1tHPzPAwVfpj4OCzTq5ZjQz2jff7aYPHyv31D8MPiWPgi5 0RGA== 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=nUxAXdLjhkJNUqiBcTNdD1orykfV5lPBWV6f7eDBEEk=; b=k6PJJPQboYstsRGF0uEKIc5kmhtTcojpsTcdVX27cUjXxxXZ6mEYxfQtUeu7qZUa+m 2Nymj5DreeheZqynfVBpfq0pAxFwswd9jwF17b8Hj1qRBHM0HKCyDGWWlR33e/vblcg/ m1J0z0vnBiFb4GIeTs6ta3ud+YPm866wY23JnAFnrjYJ6l0CvUjK5sQk2fNaHfa6qW1j s4usyqH4cPWMafStfersy1z3DUbPIY/uPsQCxtQ0kHSpgYrrZZxqe3Ekjk+q0scgg0x9 ikxJcKYWAibtnMgwhkFdbLlXRN4jEdtVxgny/itVuQWZq98J3FZYIF8ukZZJbBlcSKEF +wPw== X-Gm-Message-State: AOAM5315V89f+b4JXJYPQCvVGJEg4WgGrXvKRNW55HU41Q9h1N94tudj 9bw0oAGLN9zAxPt4ryIgJ6TXjq9R9AkKYQ== X-Received: by 2002:a05:6000:104f:: with SMTP id c15mr18301365wrx.239.1612770758083; Sun, 07 Feb 2021 23:52:38 -0800 (PST) Received: from localhost.localdomain ([2a01:e0a:490:8730:2c22:849b:ef6a:c4b9]) by smtp.gmail.com with ESMTPSA id g16sm18784952wmi.30.2021.02.07.23.52.37 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 07 Feb 2021 23:52:37 -0800 (PST) From: Loic Poulain Cc: netdev@vger.kernel.org, bjorn@mork.no, dcbw@redhat.com, carl.yin@quectel.com, mpearson@lenovo.com, cchen50@lenovo.com, jwjiang@lenovo.com, ivan.zhang@quectel.com, naveen.kumar@quectel.com, ivan.mikhanchuk@quectel.com, Loic Poulain Subject: [PATCH net-next v4 3/5] net: mhi: Create mhi.h Date: Mon, 8 Feb 2021 09:00:35 +0100 Message-Id: <1612771237-3782-4-git-send-email-loic.poulain@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1612771237-3782-1-git-send-email-loic.poulain@linaro.org> References: <1612771237-3782-1-git-send-email-loic.poulain@linaro.org> To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Move mhi-net shared structures to mhi header, that will be used by upcoming proto(s). Signed-off-by: Loic Poulain --- drivers/net/mhi/mhi.h | 36 ++++++++++++++++++++++++++++++++++++ drivers/net/mhi/net.c | 33 ++------------------------------- 2 files changed, 38 insertions(+), 31 deletions(-) create mode 100644 drivers/net/mhi/mhi.h -- 2.7.4 diff --git a/drivers/net/mhi/mhi.h b/drivers/net/mhi/mhi.h new file mode 100644 index 0000000..5050e4a --- /dev/null +++ b/drivers/net/mhi/mhi.h @@ -0,0 +1,36 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* MHI Network driver - Network over MHI bus + * + * Copyright (C) 2021 Linaro Ltd + */ + +struct mhi_net_stats { + u64_stats_t rx_packets; + u64_stats_t rx_bytes; + u64_stats_t rx_errors; + u64_stats_t rx_dropped; + u64_stats_t tx_packets; + u64_stats_t tx_bytes; + u64_stats_t tx_errors; + u64_stats_t tx_dropped; + struct u64_stats_sync tx_syncp; + struct u64_stats_sync rx_syncp; +}; + +struct mhi_net_dev { + struct mhi_device *mdev; + struct net_device *ndev; + struct sk_buff *skbagg_head; + struct sk_buff *skbagg_tail; + const struct mhi_net_proto *proto; + void *proto_data; + struct delayed_work rx_refill; + struct mhi_net_stats stats; + u32 rx_queue_sz; +}; + +struct mhi_net_proto { + int (*init)(struct mhi_net_dev *mhi_netdev); + struct sk_buff * (*tx_fixup)(struct mhi_net_dev *mhi_netdev, struct sk_buff *skb); + void (*rx)(struct mhi_net_dev *mhi_netdev, struct sk_buff *skb); +}; diff --git a/drivers/net/mhi/net.c b/drivers/net/mhi/net.c index b92c2e1..58b4b7c 100644 --- a/drivers/net/mhi/net.c +++ b/drivers/net/mhi/net.c @@ -12,41 +12,12 @@ #include #include +#include "mhi.h" + #define MHI_NET_MIN_MTU ETH_MIN_MTU #define MHI_NET_MAX_MTU 0xffff #define MHI_NET_DEFAULT_MTU 0x4000 -struct mhi_net_stats { - u64_stats_t rx_packets; - u64_stats_t rx_bytes; - u64_stats_t rx_errors; - u64_stats_t rx_dropped; - u64_stats_t tx_packets; - u64_stats_t tx_bytes; - u64_stats_t tx_errors; - u64_stats_t tx_dropped; - struct u64_stats_sync tx_syncp; - struct u64_stats_sync rx_syncp; -}; - -struct mhi_net_dev { - struct mhi_device *mdev; - struct net_device *ndev; - struct sk_buff *skbagg_head; - struct sk_buff *skbagg_tail; - const struct mhi_net_proto *proto; - void *proto_data; - struct delayed_work rx_refill; - struct mhi_net_stats stats; - u32 rx_queue_sz; -}; - -struct mhi_net_proto { - int (*init)(struct mhi_net_dev *mhi_netdev); - struct sk_buff * (*tx_fixup)(struct mhi_net_dev *mhi_netdev, struct sk_buff *skb); - void (*rx)(struct mhi_net_dev *mhi_netdev, struct sk_buff *skb); -}; - struct mhi_device_info { const char *netname; const struct mhi_net_proto *proto;