All of lore.kernel.org
 help / color / mirror / Atom feed
From: Taku Izumi <izumi.taku@jp.fujitsu.com>
To: netdev@vger.kernel.org, davem@davemloft.net
Cc: platform-driver-x86@vger.kernel.org, dvhart@infradead.org,
	rkhan@redhat.com, alexander.h.duyck@redhat.com,
	linux-acpi@vger.kernel.org, joe@perches.com,
	sergei.shtylyov@cogentembedded.com, stephen@networkplumber.org,
	yasu.isimatu@gmail.com, Taku Izumi <izumi.taku@jp.fujitsu.com>
Subject: [PATCH v3 03/22] fjes: Hardware cleanup routine
Date: Fri, 21 Aug 2015 17:29:19 +0900	[thread overview]
Message-ID: <1440145778-15941-3-git-send-email-izumi.taku@jp.fujitsu.com> (raw)
In-Reply-To: <1440145778-15941-1-git-send-email-izumi.taku@jp.fujitsu.com>

This patch adds hardware cleanup routine to be
invoked at driver's .remove routine.

Signed-off-by: Taku Izumi <izumi.taku@jp.fujitsu.com>
---
 drivers/net/fjes/fjes_hw.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++
 drivers/net/fjes/fjes_hw.h |  1 +
 2 files changed, 67 insertions(+)

diff --git a/drivers/net/fjes/fjes_hw.c b/drivers/net/fjes/fjes_hw.c
index ae26638..757cece 100644
--- a/drivers/net/fjes/fjes_hw.c
+++ b/drivers/net/fjes/fjes_hw.c
@@ -56,6 +56,12 @@ static u8 *fjes_hw_iomap(struct fjes_hw *hw)
 	return base;
 }
 
+static void fjes_hw_iounmap(struct fjes_hw *hw)
+{
+	iounmap(hw->base);
+	release_mem_region(hw->hw_res.start, hw->hw_res.size);
+}
+
 int fjes_hw_reset(struct fjes_hw *hw)
 {
 	union REG_DCTL dctl;
@@ -109,6 +115,12 @@ static int fjes_hw_alloc_shared_status_region(struct fjes_hw *hw)
 	return 0;
 }
 
+static void fjes_hw_free_shared_status_region(struct fjes_hw *hw)
+{
+	kfree(hw->hw_info.share);
+	hw->hw_info.share = NULL;
+}
+
 static int fjes_hw_alloc_epbuf(struct epbuf_handler *epbh)
 {
 	void *mem;
@@ -126,6 +138,18 @@ static int fjes_hw_alloc_epbuf(struct epbuf_handler *epbh)
 	return 0;
 }
 
+static void fjes_hw_free_epbuf(struct epbuf_handler *epbh)
+{
+	if (epbh->buffer)
+		vfree(epbh->buffer);
+
+	epbh->buffer = NULL;
+	epbh->size = 0;
+
+	epbh->info = NULL;
+	epbh->ring = NULL;
+}
+
 void fjes_hw_setup_epbuf(struct epbuf_handler *epbh, u8 *mac_addr, u32 mtu)
 {
 	union ep_buffer_info *info = epbh->info;
@@ -258,6 +282,32 @@ static int fjes_hw_setup(struct fjes_hw *hw)
 	return 0;
 }
 
+static void fjes_hw_cleanup(struct fjes_hw *hw)
+{
+	int epidx;
+
+	if (!hw->ep_shm_info)
+		return;
+
+	fjes_hw_free_shared_status_region(hw);
+
+	kfree(hw->hw_info.req_buf);
+	hw->hw_info.req_buf = NULL;
+
+	kfree(hw->hw_info.res_buf);
+	hw->hw_info.res_buf = NULL;
+
+	for (epidx = 0; epidx < hw->max_epid ; epidx++) {
+		if (epidx == hw->my_epid)
+			continue;
+		fjes_hw_free_epbuf(&hw->ep_shm_info[epidx].tx);
+		fjes_hw_free_epbuf(&hw->ep_shm_info[epidx].rx);
+	}
+
+	kfree(hw->ep_shm_info);
+	hw->ep_shm_info = NULL;
+}
+
 int fjes_hw_init(struct fjes_hw *hw)
 {
 	int ret;
@@ -285,6 +335,22 @@ int fjes_hw_init(struct fjes_hw *hw)
 	return ret;
 }
 
+void fjes_hw_exit(struct fjes_hw *hw)
+{
+	int ret;
+
+	if (hw->base) {
+		ret = fjes_hw_reset(hw);
+		if (ret)
+			pr_err("%s: reset error", __func__);
+
+		fjes_hw_iounmap(hw);
+		hw->base = NULL;
+	}
+
+	fjes_hw_cleanup(hw);
+}
+
 void fjes_hw_set_irqmask(struct fjes_hw *hw,
 			 enum REG_ICTL_MASK intr_mask, bool mask)
 {
diff --git a/drivers/net/fjes/fjes_hw.h b/drivers/net/fjes/fjes_hw.h
index 836ebe2..1b3e9ca 100644
--- a/drivers/net/fjes/fjes_hw.h
+++ b/drivers/net/fjes/fjes_hw.h
@@ -241,6 +241,7 @@ struct fjes_hw {
 };
 
 int fjes_hw_init(struct fjes_hw *);
+void fjes_hw_exit(struct fjes_hw *);
 int fjes_hw_reset(struct fjes_hw *);
 
 void fjes_hw_init_command_registers(struct fjes_hw *,
-- 
1.8.3.1


  parent reply	other threads:[~2015-08-21  8:34 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-21  8:28 [PATCH v3 00/22] FUJITSU Extended Socket network device driver Taku Izumi
2015-08-21  8:29 ` [PATCH v3 01/22] fjes: Introduce FUJITSU Extended Socket Network Device driver Taku Izumi
2015-08-21  8:29   ` [PATCH v3 02/22] fjes: Hardware initialization routine Taku Izumi
2015-08-21  8:29   ` Taku Izumi [this message]
2015-08-21  8:29   ` [PATCH v3 04/22] fjes: platform_driver's .probe and .remove routine Taku Izumi
2015-08-21  8:29   ` [PATCH v3 05/22] fjes: ES information acquisition routine Taku Izumi
2015-08-21  8:29   ` [PATCH v3 06/22] fjes: buffer address regist/unregistration routine Taku Izumi
2015-08-21  8:29   ` [PATCH v3 07/22] fjes: net_device_ops.ndo_open and .ndo_stop Taku Izumi
2015-08-21  8:29   ` [PATCH v3 08/22] fjes: net_device_ops.ndo_start_xmit Taku Izumi
2015-08-21  8:29   ` [PATCH v3 09/22] fjes: raise_intr_rxdata_task Taku Izumi
2015-08-21  8:29   ` [PATCH v3 10/22] fjes: tx_stall_task Taku Izumi
2015-08-21  8:29   ` [PATCH v3 11/22] fjes: NAPI polling function Taku Izumi
2015-08-21  8:29   ` [PATCH v3 12/22] fjes: net_device_ops.ndo_get_stats64 Taku Izumi
2015-08-21  8:29   ` [PATCH v3 13/22] fjes: net_device_ops.ndo_change_mtu Taku Izumi
2015-08-21  8:29   ` [PATCH v3 14/22] fjes: net_device_ops.ndo_tx_timeout Taku Izumi
2015-08-21  8:29   ` [PATCH v3 15/22] fjes: net_device_ops.ndo_vlan_rx_add/kill_vid Taku Izumi
2015-08-21  8:29   ` [PATCH v3 16/22] fjes: interrupt_watch_task Taku Izumi
2015-08-21  8:29   ` [PATCH v3 17/22] fjes: force_close_task Taku Izumi
2015-08-21  8:29   ` [PATCH v3 18/22] fjes: unshare_watch_task Taku Izumi
2015-08-21  8:29   ` [PATCH v3 19/22] fjes: update_zone_task Taku Izumi
2015-08-21  8:29   ` [PATCH v3 20/22] fjes: epstop_task Taku Izumi
2015-08-21  8:29   ` [PATCH v3 21/22] fjes: handle receive cancellation request interrupt Taku Izumi
2015-08-21  8:29   ` [PATCH v3 22/22] fjes: ethtool support Taku Izumi
2015-08-24 21:10 ` [PATCH v3 00/22] FUJITSU Extended Socket network device driver David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1440145778-15941-3-git-send-email-izumi.taku@jp.fujitsu.com \
    --to=izumi.taku@jp.fujitsu.com \
    --cc=alexander.h.duyck@redhat.com \
    --cc=davem@davemloft.net \
    --cc=dvhart@infradead.org \
    --cc=joe@perches.com \
    --cc=linux-acpi@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=platform-driver-x86@vger.kernel.org \
    --cc=rkhan@redhat.com \
    --cc=sergei.shtylyov@cogentembedded.com \
    --cc=stephen@networkplumber.org \
    --cc=yasu.isimatu@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.