* [PATCH v2] mfd: intel-m10-bmc: Change staging size to a variable
@ 2024-04-02 18:49 Peter Colberg
2024-04-09 2:38 ` Xu Yilun
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Peter Colberg @ 2024-04-02 18:49 UTC (permalink / raw)
To: Moritz Fischer, Wu Hao, Xu Yilun, Tom Rix, Lee Jones, linux-fpga,
linux-kernel
Cc: Russ Weight, Marco Pagani, Matthew Gerlach, Ilpo Järvinen,
Russ Weight, Peter Colberg
From: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
The secure update driver does a sanity-check of the image size in
comparison to the size of the staging area in FLASH. Instead of
hard-wiring M10BMC_STAGING_SIZE, move the staging size to the
m10bmc_csr_map structure to make the size assignment more flexible.
Co-developed-by: Russ Weight <russell.h.weight@intel.com>
Signed-off-by: Russ Weight <russell.h.weight@intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Peter Colberg <peter.colberg@intel.com>
---
v2:
- Revise commit message to remove reference to nonexistent larger FPGAs.
---
drivers/fpga/intel-m10-bmc-sec-update.c | 3 ++-
drivers/mfd/intel-m10-bmc-pmci.c | 1 +
drivers/mfd/intel-m10-bmc-spi.c | 1 +
include/linux/mfd/intel-m10-bmc.h | 1 +
4 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/fpga/intel-m10-bmc-sec-update.c b/drivers/fpga/intel-m10-bmc-sec-update.c
index 89851b133709..7ac9f9f5af12 100644
--- a/drivers/fpga/intel-m10-bmc-sec-update.c
+++ b/drivers/fpga/intel-m10-bmc-sec-update.c
@@ -529,11 +529,12 @@ static enum fw_upload_err m10bmc_sec_prepare(struct fw_upload *fwl,
const u8 *data, u32 size)
{
struct m10bmc_sec *sec = fwl->dd_handle;
+ const struct m10bmc_csr_map *csr_map = sec->m10bmc->info->csr_map;
u32 ret;
sec->cancel_request = false;
- if (!size || size > M10BMC_STAGING_SIZE)
+ if (!size || size > csr_map->staging_size)
return FW_UPLOAD_ERR_INVALID_SIZE;
if (sec->m10bmc->flash_bulk_ops)
diff --git a/drivers/mfd/intel-m10-bmc-pmci.c b/drivers/mfd/intel-m10-bmc-pmci.c
index 0392ef8b57d8..698c5933938b 100644
--- a/drivers/mfd/intel-m10-bmc-pmci.c
+++ b/drivers/mfd/intel-m10-bmc-pmci.c
@@ -370,6 +370,7 @@ static const struct m10bmc_csr_map m10bmc_n6000_csr_map = {
.pr_reh_addr = M10BMC_N6000_PR_REH_ADDR,
.pr_magic = M10BMC_N6000_PR_PROG_MAGIC,
.rsu_update_counter = M10BMC_N6000_STAGING_FLASH_COUNT,
+ .staging_size = M10BMC_STAGING_SIZE,
};
static const struct intel_m10bmc_platform_info m10bmc_pmci_n6000 = {
diff --git a/drivers/mfd/intel-m10-bmc-spi.c b/drivers/mfd/intel-m10-bmc-spi.c
index cbeb7de9e041..d64d28199df6 100644
--- a/drivers/mfd/intel-m10-bmc-spi.c
+++ b/drivers/mfd/intel-m10-bmc-spi.c
@@ -109,6 +109,7 @@ static const struct m10bmc_csr_map m10bmc_n3000_csr_map = {
.pr_reh_addr = M10BMC_N3000_PR_REH_ADDR,
.pr_magic = M10BMC_N3000_PR_PROG_MAGIC,
.rsu_update_counter = M10BMC_N3000_STAGING_FLASH_COUNT,
+ .staging_size = M10BMC_STAGING_SIZE,
};
static struct mfd_cell m10bmc_d5005_subdevs[] = {
diff --git a/include/linux/mfd/intel-m10-bmc.h b/include/linux/mfd/intel-m10-bmc.h
index ee66c9751003..988f1cd90032 100644
--- a/include/linux/mfd/intel-m10-bmc.h
+++ b/include/linux/mfd/intel-m10-bmc.h
@@ -205,6 +205,7 @@ struct m10bmc_csr_map {
unsigned int pr_reh_addr;
unsigned int pr_magic;
unsigned int rsu_update_counter;
+ unsigned int staging_size;
};
/**
--
2.44.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v2] mfd: intel-m10-bmc: Change staging size to a variable
2024-04-02 18:49 [PATCH v2] mfd: intel-m10-bmc: Change staging size to a variable Peter Colberg
@ 2024-04-09 2:38 ` Xu Yilun
2024-04-11 15:49 ` Lee Jones
2024-04-12 7:34 ` (subset) " Lee Jones
2 siblings, 0 replies; 6+ messages in thread
From: Xu Yilun @ 2024-04-09 2:38 UTC (permalink / raw)
To: Peter Colberg
Cc: Moritz Fischer, Wu Hao, Xu Yilun, Tom Rix, Lee Jones, linux-fpga,
linux-kernel, Russ Weight, Marco Pagani, Matthew Gerlach,
Ilpo Järvinen, Russ Weight
On Tue, Apr 02, 2024 at 02:49:25PM -0400, Peter Colberg wrote:
> From: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
>
> The secure update driver does a sanity-check of the image size in
> comparison to the size of the staging area in FLASH. Instead of
> hard-wiring M10BMC_STAGING_SIZE, move the staging size to the
> m10bmc_csr_map structure to make the size assignment more flexible.
>
> Co-developed-by: Russ Weight <russell.h.weight@intel.com>
> Signed-off-by: Russ Weight <russell.h.weight@intel.com>
> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
> Signed-off-by: Peter Colberg <peter.colberg@intel.com>
Reviewed-by: Xu Yilun <yilun.xu@intel.com>
> ---
> v2:
> - Revise commit message to remove reference to nonexistent larger FPGAs.
> ---
> drivers/fpga/intel-m10-bmc-sec-update.c | 3 ++-
> drivers/mfd/intel-m10-bmc-pmci.c | 1 +
> drivers/mfd/intel-m10-bmc-spi.c | 1 +
> include/linux/mfd/intel-m10-bmc.h | 1 +
> 4 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/fpga/intel-m10-bmc-sec-update.c b/drivers/fpga/intel-m10-bmc-sec-update.c
> index 89851b133709..7ac9f9f5af12 100644
> --- a/drivers/fpga/intel-m10-bmc-sec-update.c
> +++ b/drivers/fpga/intel-m10-bmc-sec-update.c
> @@ -529,11 +529,12 @@ static enum fw_upload_err m10bmc_sec_prepare(struct fw_upload *fwl,
> const u8 *data, u32 size)
> {
> struct m10bmc_sec *sec = fwl->dd_handle;
> + const struct m10bmc_csr_map *csr_map = sec->m10bmc->info->csr_map;
> u32 ret;
>
> sec->cancel_request = false;
>
> - if (!size || size > M10BMC_STAGING_SIZE)
> + if (!size || size > csr_map->staging_size)
> return FW_UPLOAD_ERR_INVALID_SIZE;
>
> if (sec->m10bmc->flash_bulk_ops)
> diff --git a/drivers/mfd/intel-m10-bmc-pmci.c b/drivers/mfd/intel-m10-bmc-pmci.c
> index 0392ef8b57d8..698c5933938b 100644
> --- a/drivers/mfd/intel-m10-bmc-pmci.c
> +++ b/drivers/mfd/intel-m10-bmc-pmci.c
> @@ -370,6 +370,7 @@ static const struct m10bmc_csr_map m10bmc_n6000_csr_map = {
> .pr_reh_addr = M10BMC_N6000_PR_REH_ADDR,
> .pr_magic = M10BMC_N6000_PR_PROG_MAGIC,
> .rsu_update_counter = M10BMC_N6000_STAGING_FLASH_COUNT,
> + .staging_size = M10BMC_STAGING_SIZE,
> };
>
> static const struct intel_m10bmc_platform_info m10bmc_pmci_n6000 = {
> diff --git a/drivers/mfd/intel-m10-bmc-spi.c b/drivers/mfd/intel-m10-bmc-spi.c
> index cbeb7de9e041..d64d28199df6 100644
> --- a/drivers/mfd/intel-m10-bmc-spi.c
> +++ b/drivers/mfd/intel-m10-bmc-spi.c
> @@ -109,6 +109,7 @@ static const struct m10bmc_csr_map m10bmc_n3000_csr_map = {
> .pr_reh_addr = M10BMC_N3000_PR_REH_ADDR,
> .pr_magic = M10BMC_N3000_PR_PROG_MAGIC,
> .rsu_update_counter = M10BMC_N3000_STAGING_FLASH_COUNT,
> + .staging_size = M10BMC_STAGING_SIZE,
> };
>
> static struct mfd_cell m10bmc_d5005_subdevs[] = {
> diff --git a/include/linux/mfd/intel-m10-bmc.h b/include/linux/mfd/intel-m10-bmc.h
> index ee66c9751003..988f1cd90032 100644
> --- a/include/linux/mfd/intel-m10-bmc.h
> +++ b/include/linux/mfd/intel-m10-bmc.h
> @@ -205,6 +205,7 @@ struct m10bmc_csr_map {
> unsigned int pr_reh_addr;
> unsigned int pr_magic;
> unsigned int rsu_update_counter;
> + unsigned int staging_size;
> };
>
> /**
> --
> 2.44.0
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v2] mfd: intel-m10-bmc: Change staging size to a variable
2024-04-02 18:49 [PATCH v2] mfd: intel-m10-bmc: Change staging size to a variable Peter Colberg
2024-04-09 2:38 ` Xu Yilun
@ 2024-04-11 15:49 ` Lee Jones
2024-04-12 2:35 ` Xu Yilun
2024-04-12 7:34 ` (subset) " Lee Jones
2 siblings, 1 reply; 6+ messages in thread
From: Lee Jones @ 2024-04-11 15:49 UTC (permalink / raw)
To: Peter Colberg
Cc: Moritz Fischer, Wu Hao, Xu Yilun, Tom Rix, linux-fpga,
linux-kernel, Russ Weight, Marco Pagani, Matthew Gerlach,
Ilpo Järvinen, Russ Weight
On Tue, 02 Apr 2024, Peter Colberg wrote:
> From: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
>
> The secure update driver does a sanity-check of the image size in
> comparison to the size of the staging area in FLASH. Instead of
> hard-wiring M10BMC_STAGING_SIZE, move the staging size to the
> m10bmc_csr_map structure to make the size assignment more flexible.
>
> Co-developed-by: Russ Weight <russell.h.weight@intel.com>
> Signed-off-by: Russ Weight <russell.h.weight@intel.com>
> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
> Signed-off-by: Peter Colberg <peter.colberg@intel.com>
Xu Yilun, Peter,
Do you require a pull-request from an immutable branch for this?
--
Lee Jones [李琼斯]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] mfd: intel-m10-bmc: Change staging size to a variable
2024-04-11 15:49 ` Lee Jones
@ 2024-04-12 2:35 ` Xu Yilun
2024-04-12 7:25 ` Lee Jones
0 siblings, 1 reply; 6+ messages in thread
From: Xu Yilun @ 2024-04-12 2:35 UTC (permalink / raw)
To: Lee Jones
Cc: Peter Colberg, Moritz Fischer, Wu Hao, Xu Yilun, Tom Rix,
linux-fpga, linux-kernel, Russ Weight, Marco Pagani,
Matthew Gerlach, Ilpo Järvinen, Russ Weight
On Thu, Apr 11, 2024 at 04:49:56PM +0100, Lee Jones wrote:
> On Tue, 02 Apr 2024, Peter Colberg wrote:
>
> > From: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
> >
> > The secure update driver does a sanity-check of the image size in
> > comparison to the size of the staging area in FLASH. Instead of
> > hard-wiring M10BMC_STAGING_SIZE, move the staging size to the
> > m10bmc_csr_map structure to make the size assignment more flexible.
> >
> > Co-developed-by: Russ Weight <russell.h.weight@intel.com>
> > Signed-off-by: Russ Weight <russell.h.weight@intel.com>
> > Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
> > Signed-off-by: Peter Colberg <peter.colberg@intel.com>
>
> Xu Yilun, Peter,
>
> Do you require a pull-request from an immutable branch for this?
No need. The patchset could all be applied to mfd branch.
Thanks,
Yilun
>
> --
> Lee Jones [李琼斯]
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] mfd: intel-m10-bmc: Change staging size to a variable
2024-04-12 2:35 ` Xu Yilun
@ 2024-04-12 7:25 ` Lee Jones
0 siblings, 0 replies; 6+ messages in thread
From: Lee Jones @ 2024-04-12 7:25 UTC (permalink / raw)
To: Xu Yilun
Cc: Peter Colberg, Moritz Fischer, Wu Hao, Xu Yilun, Tom Rix,
linux-fpga, linux-kernel, Russ Weight, Marco Pagani,
Matthew Gerlach, Ilpo Järvinen, Russ Weight
On Fri, 12 Apr 2024, Xu Yilun wrote:
> On Thu, Apr 11, 2024 at 04:49:56PM +0100, Lee Jones wrote:
> > On Tue, 02 Apr 2024, Peter Colberg wrote:
> >
> > > From: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
> > >
> > > The secure update driver does a sanity-check of the image size in
> > > comparison to the size of the staging area in FLASH. Instead of
> > > hard-wiring M10BMC_STAGING_SIZE, move the staging size to the
> > > m10bmc_csr_map structure to make the size assignment more flexible.
> > >
> > > Co-developed-by: Russ Weight <russell.h.weight@intel.com>
> > > Signed-off-by: Russ Weight <russell.h.weight@intel.com>
> > > Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
> > > Signed-off-by: Peter Colberg <peter.colberg@intel.com>
> >
> > Xu Yilun, Peter,
> >
> > Do you require a pull-request from an immutable branch for this?
>
> No need. The patchset could all be applied to mfd branch.
Prefect, thank you.
--
Lee Jones [李琼斯]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: (subset) [PATCH v2] mfd: intel-m10-bmc: Change staging size to a variable
2024-04-02 18:49 [PATCH v2] mfd: intel-m10-bmc: Change staging size to a variable Peter Colberg
2024-04-09 2:38 ` Xu Yilun
2024-04-11 15:49 ` Lee Jones
@ 2024-04-12 7:34 ` Lee Jones
2 siblings, 0 replies; 6+ messages in thread
From: Lee Jones @ 2024-04-12 7:34 UTC (permalink / raw)
To: Moritz Fischer, Wu Hao, Xu Yilun, Tom Rix, Lee Jones, linux-fpga,
linux-kernel, Peter Colberg
Cc: Russ Weight, Marco Pagani, Matthew Gerlach, Ilpo Järvinen,
Russ Weight
On Tue, 02 Apr 2024 14:49:25 -0400, Peter Colberg wrote:
> The secure update driver does a sanity-check of the image size in
> comparison to the size of the staging area in FLASH. Instead of
> hard-wiring M10BMC_STAGING_SIZE, move the staging size to the
> m10bmc_csr_map structure to make the size assignment more flexible.
>
>
Applied, thanks!
[1/1] mfd: intel-m10-bmc: Change staging size to a variable
commit: 770bb9cf4e857ac76f0671309cec689d2a3a4b46
--
Lee Jones [李琼斯]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-04-12 7:34 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-02 18:49 [PATCH v2] mfd: intel-m10-bmc: Change staging size to a variable Peter Colberg
2024-04-09 2:38 ` Xu Yilun
2024-04-11 15:49 ` Lee Jones
2024-04-12 2:35 ` Xu Yilun
2024-04-12 7:25 ` Lee Jones
2024-04-12 7:34 ` (subset) " Lee Jones
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 NNTP newsgroup(s).