From: "Rafał Miłecki" <zajec5@gmail.com>
To: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: linux-mips@vger.kernel.org,
"Florian Fainelli" <f.fainelli@gmail.com>,
"Vivek Unune" <npcomplete13@gmail.com>,
bcm-kernel-feedback-list@broadcom.com,
linux-kernel@vger.kernel.org,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Rafał Miłecki" <rafal@milecki.pl>
Subject: [PATCH mips/linux.git 5/5] firmware: bcm47xx_nvram: inline code checking NVRAM size
Date: Mon, 8 Mar 2021 10:03:20 +0100 [thread overview]
Message-ID: <20210308090320.9765-6-zajec5@gmail.com> (raw)
In-Reply-To: <20210308090320.9765-1-zajec5@gmail.com>
From: Rafał Miłecki <rafal@milecki.pl>
Separated function was not improving code quality much (or at all).
Moreover it expected possible flash end address as argument and it was
returning NVRAM size.
The new code always operates on offsets which means less logic and less
calculations.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---
drivers/firmware/broadcom/bcm47xx_nvram.c | 25 +++++++----------------
1 file changed, 7 insertions(+), 18 deletions(-)
diff --git a/drivers/firmware/broadcom/bcm47xx_nvram.c b/drivers/firmware/broadcom/bcm47xx_nvram.c
index 1d2271b1e07a..bd235833b687 100644
--- a/drivers/firmware/broadcom/bcm47xx_nvram.c
+++ b/drivers/firmware/broadcom/bcm47xx_nvram.c
@@ -42,18 +42,6 @@ static bool bcm47xx_nvram_is_valid(void __iomem *nvram)
return ((struct nvram_header *)nvram)->magic == NVRAM_MAGIC;
}
-static u32 find_nvram_size(void __iomem *end)
-{
- int i;
-
- for (i = 0; i < ARRAY_SIZE(nvram_sizes); i++) {
- if (bcm47xx_nvram_is_valid(end - nvram_sizes[i]))
- return nvram_sizes[i];
- }
-
- return 0;
-}
-
/**
* bcm47xx_nvram_copy - copy NVRAM to internal buffer
*/
@@ -85,7 +73,7 @@ static int bcm47xx_nvram_find_and_copy(void __iomem *flash_start, size_t res_siz
{
size_t flash_size;
size_t offset;
- u32 size;
+ int i;
if (nvram_len) {
pr_warn("nvram already initialized\n");
@@ -93,12 +81,13 @@ static int bcm47xx_nvram_find_and_copy(void __iomem *flash_start, size_t res_siz
}
/* TODO: when nvram is on nand flash check for bad blocks first. */
+
+ /* Try every possible flash size and check for NVRAM at its end */
for (flash_size = FLASH_MIN; flash_size <= res_size; flash_size <<= 1) {
- /* Windowed flash access */
- size = find_nvram_size(flash_start + flash_size);
- if (size) {
- offset = flash_size - size;
- goto found;
+ for (i = 0; i < ARRAY_SIZE(nvram_sizes); i++) {
+ offset = flash_size - nvram_sizes[i];
+ if (bcm47xx_nvram_is_valid(flash_start + offset))
+ goto found;
}
}
--
2.26.2
next prev parent reply other threads:[~2021-03-08 9:04 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-08 9:03 [PATCH mips/linux.git 0/5] firmware: bcm47xx_nvram: refactor finding & reading NVRAM Rafał Miłecki
2021-03-08 9:03 ` [PATCH mips/linux.git 1/5] firmware: bcm47xx_nvram: rename finding function and its variables Rafał Miłecki
2021-03-08 9:03 ` [PATCH mips/linux.git 2/5] firmware: bcm47xx_nvram: add helper checking for NVRAM Rafał Miłecki
2021-03-08 9:03 ` [PATCH mips/linux.git 3/5] firmware: bcm47xx_nvram: extract code copying NVRAM Rafał Miłecki
2021-03-08 9:03 ` [PATCH mips/linux.git 4/5] firmware: bcm47xx_nvram: look for NVRAM with for instead of while Rafał Miłecki
2021-03-08 9:03 ` Rafał Miłecki [this message]
2021-03-12 15:00 ` [PATCH mips/linux.git 0/5] firmware: bcm47xx_nvram: refactor finding & reading NVRAM Thomas Bogendoerfer
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=20210308090320.9765-6-zajec5@gmail.com \
--to=zajec5@gmail.com \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=f.fainelli@gmail.com \
--cc=f4bug@amsat.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=npcomplete13@gmail.com \
--cc=rafal@milecki.pl \
--cc=tsbogend@alpha.franken.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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).