From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH 18/20] e1000: Add EEPROM access locking for i210
Date: Sun, 17 Jan 2016 19:52:39 -0800 [thread overview]
Message-ID: <1453089161-6697-18-git-send-email-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <1453089161-6697-1-git-send-email-andrew.smirnov@gmail.com>
As per datasheet (section 4.6 p. 147) accessing EEPROM on i210
requires software to hold a corresponding lock bit in SW_FW_SYNC
register.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
drivers/net/e1000/eeprom.c | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/drivers/net/e1000/eeprom.c b/drivers/net/e1000/eeprom.c
index c3677c5..aca16f7 100644
--- a/drivers/net/e1000/eeprom.c
+++ b/drivers/net/e1000/eeprom.c
@@ -16,7 +16,8 @@ static int32_t e1000_read_eeprom_eerd(struct e1000_hw *hw, uint16_t offset,
uint16_t words, uint16_t *data);
static int32_t e1000_spi_eeprom_ready(struct e1000_hw *hw);
static void e1000_release_eeprom(struct e1000_hw *hw);
-
+static int32_t e1000_acquire_eeprom_flash(struct e1000_hw *hw);
+static void e1000_release_eeprom_flash(struct e1000_hw *hw);
/******************************************************************************
@@ -290,6 +291,11 @@ static int32_t e1000_acquire_eeprom_microwire(struct e1000_hw *hw)
return E1000_SUCCESS;
}
+static int32_t e1000_acquire_eeprom_flash(struct e1000_hw *hw)
+{
+ return e1000_swfw_sync_acquire(hw, E1000_SWFW_EEP_SM);
+}
+
static int32_t e1000_acquire_eeprom(struct e1000_hw *hw)
{
if (hw->eeprom.acquire)
@@ -403,6 +409,9 @@ int32_t e1000_init_eeprom_params(struct e1000_hw *hw)
if (eecd & E1000_EECD_I210_FLASH_DETECTED) {
eeprom->type = e1000_eeprom_flash;
eeprom->word_size = 2048;
+
+ eeprom->acquire = e1000_acquire_eeprom_flash;
+ eeprom->release = e1000_release_eeprom_flash;
} else {
eeprom->type = e1000_eeprom_invm;
}
@@ -621,6 +630,14 @@ static void e1000_release_eeprom_spi(struct e1000_hw *hw)
e1000_release_eeprom_spi_microwire_epilogue(hw);
}
+static void e1000_release_eeprom_flash(struct e1000_hw *hw)
+{
+ if (e1000_swfw_sync_release(hw, E1000_SWFW_EEP_SM) < 0)
+ dev_warn(hw->dev,
+ "Timeout while releasing SWFW_SYNC bits (0x%08x)\n",
+ E1000_SWFW_EEP_SM);
+}
+
static void e1000_release_eeprom(struct e1000_hw *hw)
{
if (hw->eeprom.release)
--
2.5.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev 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 ` [PATCH 05/20] e1000: Remove unneeded i210 specific register code Andrey Smirnov
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 ` Andrey Smirnov [this message]
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-18-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