mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH 05/20] e1000: Remove unneeded i210 specific register code
Date: Sun, 17 Jan 2016 19:52:26 -0800	[thread overview]
Message-ID: <1453089161-6697-5-git-send-email-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <1453089161-6697-1-git-send-email-andrew.smirnov@gmail.com>

Despite having EEC(EECD) and EERD at "non-standard" offsets i210
aliases those registers to be accesible via regular addresses so none
of the code removed by this commit is really necessary.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
 drivers/net/e1000/e1000.h  |  2 --
 drivers/net/e1000/eeprom.c | 25 +++++--------------------
 drivers/net/e1000/main.c   |  4 ++--
 3 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h
index 82ff32e..7bc8825 100644
--- a/drivers/net/e1000/e1000.h
+++ b/drivers/net/e1000/e1000.h
@@ -415,9 +415,7 @@ struct e1000_tx_desc {
 #define E1000_CTRL     0x00000	/* Device Control - RW */
 #define E1000_STATUS   0x00008	/* Device Status - RO */
 #define E1000_EECD     0x00010	/* EEPROM/Flash Control - RW */
-#define E1000_I210_EECD     0x12010	/* EEPROM/Flash Control - RW */
 #define E1000_EERD     0x00014	/* EEPROM Read - RW */
-#define E1000_I210_EERD     0x12014	/* EEPROM Read - RW */
 #define E1000_CTRL_EXT 0x00018	/* Extended Device Control - RW */
 #define E1000_MDIC     0x00020	/* MDI Control - RW */
 #define E1000_FCAL     0x00028	/* Flow Control Address Low - RW */
diff --git a/drivers/net/e1000/eeprom.c b/drivers/net/e1000/eeprom.c
index fb39a85..1fa437e 100644
--- a/drivers/net/e1000/eeprom.c
+++ b/drivers/net/e1000/eeprom.c
@@ -275,10 +275,7 @@ int32_t e1000_init_eeprom_params(struct e1000_hw *hw)
 	int32_t ret_val = E1000_SUCCESS;
 	uint16_t eeprom_size;

-	if (hw->mac_type == e1000_igb)
-		eecd = E1000_READ_REG(hw, I210_EECD);
-	else
-		eecd = E1000_READ_REG(hw, EECD);
+	eecd = E1000_READ_REG(hw, EECD);

 	DEBUGFUNC();

@@ -456,10 +453,7 @@ static int32_t e1000_poll_eerd_eewr_done(struct e1000_hw *hw, int eerd)

 	for (i = 0; i < attempts; i++) {
 		if (eerd == E1000_EEPROM_POLL_READ) {
-			if (hw->mac_type == e1000_igb)
-				reg = E1000_READ_REG(hw, I210_EERD);
-			else
-				reg = E1000_READ_REG(hw, EERD);
+			reg = E1000_READ_REG(hw, EERD);
 		} else {
 			if (hw->mac_type == e1000_igb)
 				reg = E1000_READ_REG(hw, I210_EEWR);
@@ -497,24 +491,15 @@ static int32_t e1000_read_eeprom_eerd(struct e1000_hw *hw,
 		eerd = ((offset+i) << E1000_EEPROM_RW_ADDR_SHIFT) +
 			E1000_EEPROM_RW_REG_START;

-		if (hw->mac_type == e1000_igb)
-			E1000_WRITE_REG(hw, I210_EERD, eerd);
-		else
-			E1000_WRITE_REG(hw, EERD, eerd);
+		E1000_WRITE_REG(hw, EERD, eerd);

 		error = e1000_poll_eerd_eewr_done(hw, E1000_EEPROM_POLL_READ);

 		if (error)
 			break;

-		if (hw->mac_type == e1000_igb) {
-			data[i] = (E1000_READ_REG(hw, I210_EERD) >>
-				E1000_EEPROM_RW_REG_DATA);
-		} else {
-			data[i] = (E1000_READ_REG(hw, EERD) >>
-				E1000_EEPROM_RW_REG_DATA);
-		}
-
+		data[i] = (E1000_READ_REG(hw, EERD) >>
+			   E1000_EEPROM_RW_REG_DATA);
 	}

 	return error;
diff --git a/drivers/net/e1000/main.c b/drivers/net/e1000/main.c
index 84459da..a29ceb1 100644
--- a/drivers/net/e1000/main.c
+++ b/drivers/net/e1000/main.c
@@ -550,7 +550,7 @@ static void e1000_reset_hw(struct e1000_hw *hw)
 		reg = E1000_READ_REG(hw, STATUS);
 		if (reg & E1000_STATUS_PF_RST_DONE)
 			dev_dbg(hw->dev, "PF OK\n");
-		reg = E1000_READ_REG(hw, I210_EECD);
+		reg = E1000_READ_REG(hw, EECD);
 		if (reg & E1000_EECD_AUTO_RD)
 			dev_dbg(hw->dev, "EEC OK\n");
 	} else if (hw->mac_type < e1000_82540) {
@@ -3565,7 +3565,7 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 		dev_err(&pdev->dev, "EEPROM is invalid!\n");
 		return -EINVAL;
 	}
-	if ((E1000_READ_REG(hw, I210_EECD) & E1000_EECD_FLUPD) &&
+	if ((E1000_READ_REG(hw, EECD) & E1000_EECD_FLUPD) &&
 	    e1000_validate_eeprom_checksum(hw))
 		return -EINVAL;

--
2.5.0

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2016-01-18  3:53 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1453089161-6697-1-git-send-email-andrew.smirnov@gmail.com>
2016-01-18  3:52 ` [PATCH 02/20] e1000: Fix a bug in e1000_detect_gig_phy Andrey Smirnov
2016-01-18  3:52 ` [PATCH 03/20] e1000: Remove unnecessary variable Andrey Smirnov
2016-01-18  3:52 ` [PATCH 04/20] e1000: Do not read same register twice Andrey Smirnov
2016-01-18  3:52 ` Andrey Smirnov [this message]
2016-01-18  3:52 ` [PATCH 06/20] e1000: Consolidate register offset fixups Andrey Smirnov
2016-01-18  3:52 ` [PATCH 07/20] e1000: Remove 'use_eewr' parameter Andrey Smirnov
2016-01-18  3:52 ` [PATCH 08/20] e1000: Remove 'page_size' Andrey Smirnov
2016-01-18  3:52 ` [PATCH 09/20] e1000: Simplify EEPROM init for e1000_80003es2lan Andrey Smirnov
2016-01-18  3:52 ` [PATCH 10/20] e1000: Simplify EEPROM init for e1000_igb Andrey Smirnov
2016-01-18  3:52 ` [PATCH 11/20] e1000: Consolidate SPI EEPROM init code Andrey Smirnov
2016-01-18  3:52 ` [PATCH 12/20] e1000: Consolidate Microwire " Andrey Smirnov
2016-01-18  3:52 ` [PATCH 13/20] e1000: Fix a bug in e1000_probe() Andrey Smirnov
2016-01-18  3:52 ` [PATCH 14/20] e1000: Remove unnecessary intialization Andrey Smirnov
2016-01-18  3:52 ` [PATCH 15/20] e1000: Refactor Flash/EEPROM reading code Andrey Smirnov
2016-01-18  3:52 ` [PATCH 16/20] e1000: Add functions for register polling Andrey Smirnov
2016-01-19  8:21   ` Sascha Hauer
2016-01-19 18:53     ` Andrey Smirnov
2016-01-20  7:32       ` Sascha Hauer
2016-01-18  3:52 ` [PATCH 17/20] e1000: Properly release SW_FW_SYNC semaphore bits Andrey Smirnov
2016-01-18  3:52 ` [PATCH 18/20] e1000: Add EEPROM access locking for i210 Andrey Smirnov
2016-01-18  3:52 ` [PATCH 19/20] e1000: Expose i210's external flash as MTD Andrey Smirnov
2016-01-18  3:52 ` [PATCH 20/20] e1000: Expose i210's iNVM as a cdev Andrey Smirnov

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=1453089161-6697-5-git-send-email-andrew.smirnov@gmail.com \
    --to=andrew.smirnov@gmail.com \
    --cc=barebox@lists.infradead.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox