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 v2 13/22] e1000: Consolidate SPI EEPROM init code
Date: Wed,  1 Jun 2016 21:58:42 -0700	[thread overview]
Message-ID: <1464843531-1824-14-git-send-email-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <1464843531-1824-1-git-send-email-andrew.smirnov@gmail.com>

All of the chips that bitbang SPI to access EEPROM appear to be
configured in the same way, so move common code into a separate
function and make use of it.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
 drivers/net/e1000/eeprom.c | 46 +++++++++++++++++++++-------------------------
 1 file changed, 21 insertions(+), 25 deletions(-)

diff --git a/drivers/net/e1000/eeprom.c b/drivers/net/e1000/eeprom.c
index 55a8f96..89514eb 100644
--- a/drivers/net/e1000/eeprom.c
+++ b/drivers/net/e1000/eeprom.c
@@ -260,6 +260,22 @@ static int32_t e1000_acquire_eeprom(struct e1000_hw *hw)
 	return E1000_SUCCESS;
 }
 
+static void e1000_eeprom_uses_spi(struct e1000_eeprom_info *eeprom,
+				  uint32_t eecd)
+{
+	eeprom->type = e1000_eeprom_spi;
+	eeprom->opcode_bits = 8;
+	eeprom->delay_usec = 1;
+	if (eecd & E1000_EECD_ADDR_BITS) {
+		eeprom->address_bits = 16;
+	} else {
+		eeprom->address_bits = 8;
+	}
+
+	eeprom->use_eerd = false;
+}
+
+
 /******************************************************************************
  * Sets up eeprom variables in the hw struct.  Must be called after mac_type
  * is configured.  Additionally, if this is ICH8, the flash controller GbE
@@ -312,13 +328,7 @@ int32_t e1000_init_eeprom_params(struct e1000_hw *hw)
 	case e1000_82547:
 	case e1000_82547_rev_2:
 		if (eecd & E1000_EECD_TYPE) {
-			eeprom->type = e1000_eeprom_spi;
-			eeprom->opcode_bits = 8;
-			eeprom->delay_usec = 1;
-			if (eecd & E1000_EECD_ADDR_BITS)
-				eeprom->address_bits = 16;
-			else
-				eeprom->address_bits = 8;
+			e1000_eeprom_uses_spi(eeprom, eecd);
 		} else {
 			eeprom->type = e1000_eeprom_microwire;
 			eeprom->opcode_bits = 3;
@@ -335,27 +345,13 @@ int32_t e1000_init_eeprom_params(struct e1000_hw *hw)
 		break;
 	case e1000_82571:
 	case e1000_82572:
-		eeprom->type = e1000_eeprom_spi;
-		eeprom->opcode_bits = 8;
-		eeprom->delay_usec = 1;
-		if (eecd & E1000_EECD_ADDR_BITS)
-			eeprom->address_bits = 16;
-		else
-			eeprom->address_bits = 8;
-
-		eeprom->use_eerd = false;
+		e1000_eeprom_uses_spi(eeprom, eecd);
 		break;
 	case e1000_82573:
 	case e1000_82574:
-		eeprom->type = e1000_eeprom_spi;
-		eeprom->opcode_bits = 8;
-		eeprom->delay_usec = 1;
-		if (eecd & E1000_EECD_ADDR_BITS)
-			eeprom->address_bits = 16;
-		else
-			eeprom->address_bits = 8;
-
-		if (e1000_is_onboard_nvm_eeprom(hw) == false) {
+		if (e1000_is_onboard_nvm_eeprom(hw)) {
+			e1000_eeprom_uses_spi(eeprom, eecd);
+		} else {
 			eeprom->use_eerd = true;
 
 			eeprom->type = e1000_eeprom_flash;
-- 
2.5.5


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

  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 ` [PATCH v2 07/22] e1000: Remove unneeded i210 specific register code Andrey Smirnov
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 ` Andrey Smirnov [this message]
2016-06-02  4:58 ` [PATCH v2 14/22] e1000: Consolidate Microwire EEPROM init code 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-14-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