From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH v2 07/22] e1000: Remove unneeded i210 specific register code
Date: Wed, 1 Jun 2016 21:58:36 -0700 [thread overview]
Message-ID: <1464843531-1824-8-git-send-email-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <1464843531-1824-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 | 5 +++--
3 files changed, 8 insertions(+), 24 deletions(-)
diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h
index 7c5c98b..d75c707 100644
--- a/drivers/net/e1000/e1000.h
+++ b/drivers/net/e1000/e1000.h
@@ -404,9 +404,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 c16f69a..497fb7b 100644
--- a/drivers/net/e1000/eeprom.c
+++ b/drivers/net/e1000/eeprom.c
@@ -274,10 +274,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, E1000_I210_EECD);
- else
- eecd = e1000_read_reg(hw, E1000_EECD);
+ eecd = e1000_read_reg(hw, E1000_EECD);
DEBUGFUNC();
@@ -455,10 +452,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, E1000_I210_EERD);
- else
- reg = e1000_read_reg(hw, E1000_EERD);
+ reg = e1000_read_reg(hw, E1000_EERD);
} else {
if (hw->mac_type == e1000_igb)
reg = e1000_read_reg(hw, E1000_I210_EEWR);
@@ -496,24 +490,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, E1000_I210_EERD, eerd);
- else
- e1000_write_reg(hw, E1000_EERD, eerd);
+ e1000_write_reg(hw, E1000_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, E1000_I210_EERD) >>
- E1000_EEPROM_RW_REG_DATA);
- } else {
- data[i] = (e1000_read_reg(hw, E1000_EERD) >>
- E1000_EEPROM_RW_REG_DATA);
- }
-
+ data[i] = (e1000_read_reg(hw, E1000_EERD) >>
+ E1000_EEPROM_RW_REG_DATA);
}
return error;
diff --git a/drivers/net/e1000/main.c b/drivers/net/e1000/main.c
index 11a0a2f..f1055ea 100644
--- a/drivers/net/e1000/main.c
+++ b/drivers/net/e1000/main.c
@@ -549,7 +549,7 @@ static void e1000_reset_hw(struct e1000_hw *hw)
reg = e1000_read_reg(hw, E1000_STATUS);
if (reg & E1000_STATUS_PF_RST_DONE)
dev_dbg(hw->dev, "PF OK\n");
- reg = e1000_read_reg(hw, E1000_I210_EECD);
+ reg = e1000_read_reg(hw, E1000_EECD);
if (reg & E1000_EECD_AUTO_RD)
dev_dbg(hw->dev, "EEC OK\n");
} else if (hw->mac_type < e1000_82540) {
@@ -3564,7 +3564,8 @@ 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, E1000_I210_EECD) & E1000_EECD_FLUPD) &&
+
+ if ((e1000_read_reg(hw, E1000_EECD) & E1000_EECD_FLUPD) &&
e1000_validate_eeprom_checksum(hw))
return -EINVAL;
--
2.5.5
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2016-06-02 4:59 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-02 4:58 [PATCH v2 00/22] e1000 code cleanup and iNVM support Andrey Smirnov
2016-06-02 4:58 ` [PATCH v2 01/22] e1000: Split driver into multiple files Andrey Smirnov
2016-06-02 4:58 ` [PATCH v2 02/22] e1000: Include <net.h> in e1000.h Andrey Smirnov
2016-06-02 4:58 ` [PATCH v2 03/22] e1000: Convert E1000_*_REG macros to functions Andrey Smirnov
2016-06-02 4:58 ` [PATCH v2 04/22] e1000: Fix a bug in e1000_detect_gig_phy Andrey Smirnov
2016-06-02 4:58 ` [PATCH v2 05/22] e1000: Remove unnecessary variable Andrey Smirnov
2016-06-02 4:58 ` [PATCH v2 06/22] e1000: Do not read same register twice Andrey Smirnov
2016-06-02 4:58 ` Andrey Smirnov [this message]
2016-06-02 4:58 ` [PATCH v2 08/22] e1000: Consolidate register offset fixups Andrey Smirnov
2016-06-02 4:58 ` [PATCH v2 09/22] e1000: Remove 'use_eewr' parameter Andrey Smirnov
2016-06-02 4:58 ` [PATCH v2 10/22] e1000: Remove 'page_size' Andrey Smirnov
2016-06-02 4:58 ` [PATCH v2 11/22] e1000: Simplify EEPROM init for e1000_80003es2lan Andrey Smirnov
2016-06-02 4:58 ` [PATCH v2 12/22] e1000: Simplify EEPROM init for e1000_igb Andrey Smirnov
2016-06-02 4:58 ` [PATCH v2 13/22] e1000: Consolidate SPI EEPROM init code Andrey Smirnov
2016-06-02 4:58 ` [PATCH v2 14/22] e1000: Consolidate Microwire " Andrey Smirnov
2016-06-02 4:58 ` [PATCH v2 15/22] e1000: Fix a bug in e1000_probe() Andrey Smirnov
2016-06-02 4:58 ` [PATCH v2 16/22] e1000: Remove unnecessary intialization Andrey Smirnov
2016-06-02 4:58 ` [PATCH v2 17/22] e1000: Refactor Flash/EEPROM reading code Andrey Smirnov
2016-06-02 4:58 ` [PATCH v2 18/22] e1000: Properly release SW_FW_SYNC semaphore bits Andrey Smirnov
2016-06-02 4:58 ` [PATCH v2 19/22] e1000: Add EEPROM access locking for i210 Andrey Smirnov
2016-06-02 4:58 ` [PATCH v2 20/22] e1000: Add a "poll register" function Andrey Smirnov
2016-06-02 4:58 ` [PATCH v2 21/22] e1000: Expose i210's iNVM as a cdev Andrey Smirnov
2016-06-02 4:58 ` [PATCH v2 22/22] e1000: Expose i210's external flash as MTD Andrey Smirnov
2016-06-03 7:15 ` [PATCH v2 00/22] e1000 code cleanup and iNVM support Sascha Hauer
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=1464843531-1824-8-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