On Sun, Nov 24, 2024 at 08:17:50PM +0100, Caleb Connolly wrote: > Implement socinfo support to fetch the serial number if available. > > Signed-off-by: Caleb Connolly <[email protected]> > --- > drivers/soc/qcom/smem.c | 25 +++++++++++++++++++++++++ > include/soc/qcom/smem.h | 1 + > 2 files changed, 26 insertions(+) > > diff --git a/drivers/soc/qcom/smem.c b/drivers/soc/qcom/smem.c > index 5166f289dfb6..5570c5c907ad 100644 > --- a/drivers/soc/qcom/smem.c > +++ b/drivers/soc/qcom/smem.c > @@ -13,8 +13,10 @@ > #include <linux/io.h> > #include <linux/ioport.h> > #include <linux/sizes.h> > #include <soc/qcom/smem.h> > +#include <soc/qcom/socinfo.h> > +#include <env.h> > > /* > * The Qualcomm shared memory system is a allocate only heap structure that > * consists of one of more memory areas that can be accessed by the > processors > @@ -982,8 +984,31 @@ static int qcom_smem_map_global(struct qcom_smem *smem, > u32 size) > > return 0; > } > > +int qcom_socinfo_init(void) > +{ > + struct socinfo *info; > + size_t item_size; > + char buf[32] = { 0 }; > + > + info = qcom_smem_get(QCOM_SMEM_HOST_ANY, SMEM_HW_SW_BUILD_ID, > + &item_size); > + if (IS_ERR(info)) { > + log_err("Couldn't find socinfo: %ld\n", PTR_ERR(info)); > + return PTR_ERR(info); > + } > + > + if (offsetof(struct socinfo, serial_num) <= item_size) { > + snprintf(buf, sizeof(buf), "%u", le32_to_cpu(info->serial_num)); > + env_set("serial#", buf);
Hm, this conflicts with qcom_late_init() setting the serial# in board/qualcomm/dragonboard410c/dragonboard410c.c: ## Error: Can't overwrite "serial#" ## Error inserting "serial#" variable, errno=1 DB410c doesn't have a proper serial number in socinfo. Turns out using offsetof() in this check is wrong, I sent a patch for this on Linux that was applied upstream: https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git/commit/?h=for-next&id=22cf4fae6660b6e1a583a41cbf84e3046ca9ccd0 Can you add that fix here? offsetofend() doesn't exist in U-Boot. Might be cleanest to just copy that over to U-Boot's linux/stddef.h. Thanks, Stephan
