mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
Cc: "barebox@lists.infradead.org" <barebox@lists.infradead.org>
Subject: Re: [PATCH 2/3] e1000: implement support for smaller flash chips
Date: Mon, 9 Oct 2017 11:24:35 -0700	[thread overview]
Message-ID: <CAHQ1cqFGVfnZ78u827d0DV9Epcco0QzXwRKud37H3+87w774Uw@mail.gmail.com> (raw)
In-Reply-To: <20171009093616.12686-3-u.kleine-koenig@pengutronix.de>

On Mon, Oct 9, 2017 at 2:36 AM, Uwe Kleine-König
<u.kleine-koenig@pengutronix.de> wrote:
> In older revisions of the i210 data sheet (rev 2.8) M25PE80 (1 MiB) is still
> listed as supported. So check the full range of FLA.FL_SIZE which also
> simplifies the code.
>

Looks good to me:

Acked-by: Andrey Smirnov <andrew.smirnov@gmail.com>

> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
>  drivers/net/e1000/e1000.h  |  3 ---
>  drivers/net/e1000/eeprom.c | 14 +++-----------
>  2 files changed, 3 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h
> index 2a29ef47e818..1bc57bf2760c 100644
> --- a/drivers/net/e1000/e1000.h
> +++ b/drivers/net/e1000/e1000.h
> @@ -2106,9 +2106,6 @@ struct e1000_eeprom_info {
>  #define E1000_FLA                      0x1201C
>  #define E1000_FLA_FL_SIZE_SHIFT                17
>  #define E1000_FLA_FL_SIZE_MASK         (0b111 << E1000_FLA_FL_SIZE_SHIFT) /* EEprom Size */
> -#define E1000_FLA_FL_SIZE_2MB          0b101
> -#define E1000_FLA_FL_SIZE_4MB          0b110
> -#define E1000_FLA_FL_SIZE_8MB          0b111
>
>
>  #define E1000_FLSWCTL_ADDR(a)          ((a) & 0x00FFFFFF)
> diff --git a/drivers/net/e1000/eeprom.c b/drivers/net/e1000/eeprom.c
> index 1a0c6e15abef..739bc17a519e 100644
> --- a/drivers/net/e1000/eeprom.c
> +++ b/drivers/net/e1000/eeprom.c
> @@ -414,17 +414,9 @@ int32_t e1000_init_eeprom_params(struct e1000_hw *hw)
>                         fla &= E1000_FLA_FL_SIZE_MASK;
>                         fla >>= E1000_FLA_FL_SIZE_SHIFT;
>
> -                       switch (fla) {
> -                       case E1000_FLA_FL_SIZE_8MB:
> -                               eeprom->word_size = SZ_8M / 2;
> -                               break;
> -                       case E1000_FLA_FL_SIZE_4MB:
> -                               eeprom->word_size = SZ_4M / 2;
> -                               break;
> -                       case E1000_FLA_FL_SIZE_2MB:
> -                               eeprom->word_size = SZ_2M / 2;
> -                               break;
> -                       default:
> +                       if (fla) {
> +                               eeprom->word_size = (SZ_64K << fla) / 2;
> +                       } else {
>                                 eeprom->word_size = 2048;
>                                 dev_info(hw->dev, "Unprogrammed Flash detected, "
>                                          "limiting access to first 4KB\n");
> --
> 2.11.0
>

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

  reply	other threads:[~2017-10-09 18:24 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-09  9:36 [PATCH 0/3] e1000: access to flash on i210 Uwe Kleine-König
2017-10-09  9:36 ` [PATCH 1/3] e1000: implement register mapping for E1000_{EERD, FLSW{CTL, DATA, CNT}} Uwe Kleine-König
2017-10-09 18:22   ` Andrey Smirnov
2017-10-09 18:33     ` [PATCH 1/3] e1000: implement register mapping for E1000_{EERD,FLSW{CTL,DATA,CNT}} Uwe Kleine-König
2017-10-09  9:36 ` [PATCH 2/3] e1000: implement support for smaller flash chips Uwe Kleine-König
2017-10-09 18:24   ` Andrey Smirnov [this message]
2017-10-09  9:36 ` [PATCH 3/3] HACK: e1000: don't check for FLSWCTL.GLDONE when waiting for idle Uwe Kleine-König
2017-10-09 14:24   ` Uwe Kleine-König
2017-10-09 18:15     ` Andrey Smirnov
2017-10-09 18:41       ` Uwe Kleine-König

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=CAHQ1cqFGVfnZ78u827d0DV9Epcco0QzXwRKud37H3+87w774Uw@mail.gmail.com \
    --to=andrew.smirnov@gmail.com \
    --cc=barebox@lists.infradead.org \
    --cc=u.kleine-koenig@pengutronix.de \
    /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