* [PATCH 01/15] Revert "dm: SMEM (Shared memory) uclass"
2024-11-24 19:17 [PATCH 00/15] qcom: smem: modernize SMEM in U-Boot Caleb Connolly
@ 2024-11-24 19:17 ` Caleb Connolly
2025-01-07 15:30 ` Simon Glass
2024-11-24 19:17 ` [PATCH 02/15] smem: drop drivers/smem Caleb Connolly
` (13 subsequent siblings)
14 siblings, 1 reply; 35+ messages in thread
From: Caleb Connolly @ 2024-11-24 19:17 UTC (permalink / raw)
To: Rayagonda Kokatanur, Tom Rini, Simon Glass, Caleb Connolly,
Neil Armstrong, Sumit Garg, Mario Six
Cc: u-boot, u-boot-qcom
SMEM is a highly Qualcomm specific interface, while having a dedicated
UCLASS for it offers a nice abstraction, for things like memory layout
parsing we need to use it before the driver model is available.
Therefore, it doesn't make sense to fit SMEM into the driver model.
Instead let's adopt a model closer to Linux, and parse SMEM really early
during boot (as soon as we have the FDT).
This reverts commit 7b384eccc785b596f68448b155cbda26df57fb23.
Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
---
arch/arm/Kconfig | 1 -
drivers/Kconfig | 2 --
drivers/Makefile | 1 -
drivers/smem/Kconfig | 24 -------------
drivers/smem/Makefile | 7 ----
drivers/smem/smem-uclass.c | 46 ------------------------
include/dm/uclass-id.h | 1 -
include/smem.h | 90 ----------------------------------------------
8 files changed, 172 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 7282c4123b08..dc44ea1e6c9f 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1091,9 +1091,8 @@ config ARCH_SNAPDRAGON
select GPIO_EXTRA_HEADER
select MSM_SMEM
select OF_CONTROL
select OF_SEPARATE
- select SMEM
select SPMI
select BOARD_LATE_INIT
select OF_BOARD
select SAVE_PREV_BL_FDT_ADDR
diff --git a/drivers/Kconfig b/drivers/Kconfig
index a073230c26dd..6dbbc3172076 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -119,10 +119,8 @@ source "drivers/scsi/Kconfig"
source "drivers/serial/Kconfig"
source "drivers/sm/Kconfig"
-source "drivers/smem/Kconfig"
-
source "drivers/sound/Kconfig"
source "drivers/soc/Kconfig"
diff --git a/drivers/Makefile b/drivers/Makefile
index 9440af1b09bc..385ea3b7918b 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -113,9 +113,8 @@ obj-y += pwm/
obj-y += reset/
obj-y += input/
obj-y += iommu/
# SOC specific infrastructure drivers.
-obj-y += smem/
obj-y += thermal/
obj-$(CONFIG_TEE) += tee/
obj-$(CONFIG_ARM_FFA_TRANSPORT) += firmware/arm-ffa/
obj-y += axi/
diff --git a/drivers/smem/Kconfig b/drivers/smem/Kconfig
deleted file mode 100644
index 73d51b3a7a48..000000000000
--- a/drivers/smem/Kconfig
+++ /dev/null
@@ -1,24 +0,0 @@
-menuconfig SMEM
- bool "SMEM (Shared Memory mamanger) support"
-
-if SMEM
-
-config SANDBOX_SMEM
- bool "Sandbox Shared Memory Manager (SMEM)"
- depends on SANDBOX && DM
- help
- enable SMEM support for sandbox. This is an emulation of a real SMEM
- manager.
- The sandbox driver allocates a shared memory from the heap and
- initialzies it on start.
-
-config MSM_SMEM
- bool "Qualcomm Shared Memory Manager (SMEM)"
- depends on DM
- depends on ARCH_SNAPDRAGON || ARCH_IPQ40XX
- help
- Enable support for the Qualcomm Shared Memory Manager.
- The driver provides an interface to items in a heap shared among all
- processors in a Qualcomm platform.
-
-endif # menu "SMEM Support"
diff --git a/drivers/smem/Makefile b/drivers/smem/Makefile
deleted file mode 100644
index af3e9b50883c..000000000000
--- a/drivers/smem/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Makefile for the U-Boot SMEM interface drivers
-
-obj-$(CONFIG_SANDBOX_SMEM) += sandbox_smem.o
-obj-$(CONFIG_SMEM) += smem-uclass.o
-obj-$(CONFIG_MSM_SMEM) += msm_smem.o
diff --git a/drivers/smem/smem-uclass.c b/drivers/smem/smem-uclass.c
deleted file mode 100644
index 4dea5cc4bf1c..000000000000
--- a/drivers/smem/smem-uclass.c
+++ /dev/null
@@ -1,46 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (c) 2018 Ramon Fried <ramon.fried@gmail.com>
- */
-
-#define LOG_CATEGORY UCLASS_SMEM
-
-#include <dm.h>
-#include <smem.h>
-
-int smem_alloc(struct udevice *dev, unsigned int host,
- unsigned int item, size_t size)
-{
- struct smem_ops *ops = smem_get_ops(dev);
-
- if (!ops->alloc)
- return -ENOSYS;
-
- return ops->alloc(host, item, size);
-}
-
-void *smem_get(struct udevice *dev, unsigned int host,
- unsigned int item, size_t *size)
-{
- struct smem_ops *ops = smem_get_ops(dev);
-
- if (!ops->get)
- return NULL;
-
- return ops->get(host, item, size);
-}
-
-int smem_get_free_space(struct udevice *dev, unsigned int host)
-{
- struct smem_ops *ops = smem_get_ops(dev);
-
- if (!ops->get_free_space)
- return -ENOSYS;
-
- return ops->get_free_space(host);
-}
-
-UCLASS_DRIVER(smem) = {
- .id = UCLASS_SMEM,
- .name = "smem",
-};
diff --git a/include/dm/uclass-id.h b/include/dm/uclass-id.h
index 270088ad94f7..281abe99acf1 100644
--- a/include/dm/uclass-id.h
+++ b/include/dm/uclass-id.h
@@ -128,9 +128,8 @@ enum uclass_id {
UCLASS_SCMI_BASE, /* Interface for SCMI Base protocol */
UCLASS_SCSI, /* SCSI device */
UCLASS_SERIAL, /* Serial UART */
UCLASS_SIMPLE_BUS, /* Bus with child devices */
- UCLASS_SMEM, /* Shared memory interface */
UCLASS_SOC, /* SOC Device */
UCLASS_SOUND, /* Playing simple sounds */
UCLASS_SPI, /* SPI bus */
UCLASS_SPI_FLASH, /* SPI flash */
diff --git a/include/smem.h b/include/smem.h
deleted file mode 100644
index b19c534ebc43..000000000000
--- a/include/smem.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * The shared memory system is an allocate-only heap structure that
- * consists of one of more memory areas that can be accessed by the processors
- * in the SoC.
- *
- * Allocation can be done globally for all processors or to an individual processor.
- * This is controlled by the @host parameter.
- *
- * Allocation and management of heap can be implemented in various ways,
- * The @item parameter should be used as an index/hash to the memory region.
- *
- * Copyright (c) 2018 Ramon Fried <ramon.fried@gmail.com>
- */
-
-#ifndef _smemh_
-#define _smemh_
-
-/* struct smem_ops: Operations for the SMEM uclass */
-struct smem_ops {
- /**
- * alloc() - allocate space for a smem item
- *
- * @host: remote processor id, or -1 for all processors.
- * @item: smem item handle
- * @size: number of bytes to be allocated
- * @return 0 if OK, -ve on error
- */
- int (*alloc)(unsigned int host,
- unsigned int item, size_t size);
-
- /**
- * get() - Resolve ptr of size of a smem item
- *
- * @host: the remote processor, of -1 for all processors.
- * @item: smem item handle
- * @size: pointer to be filled out with the size of the item
- * @return pointer on success, NULL on error
- */
- void *(*get)(unsigned int host,
- unsigned int item, size_t *size);
-
- /**
- * get_free_space() - Get free space in smem in bytes
- *
- * @host: the remote processor identifying a partition, or -1
- * for all processors.
- * @return free space, -ve on error
- */
- int (*get_free_space)(unsigned int host);
-};
-
-#define smem_get_ops(dev) ((struct smem_ops *)(dev)->driver->ops)
-
-/**
- * smem_alloc() - allocate space for a smem item
- * @host: remote processor id, or -1
- * @item: smem item handle
- * @size: number of bytes to be allocated
- * Return: 0 if OK, -ve on error
- *
- * Allocate space for a given smem item of size @size, given that the item is
- * not yet allocated.
- */
-int smem_alloc(struct udevice *dev, unsigned int host, unsigned int item, size_t size);
-
-/**
- * smem_get() - resolve ptr of size of a smem item
- * @host: the remote processor, or -1 for all processors.
- * @item: smem item handle
- * @size: pointer to be filled out with size of the item
- * Return: pointer on success, NULL on error
- *
- * Looks up smem item and returns pointer to it. Size of smem
- * item is returned in @size.
- */
-void *smem_get(struct udevice *dev, unsigned int host, unsigned int item, size_t *size);
-
-/**
- * smem_get_free_space() - retrieve amount of free space in a partition
- * @host: the remote processor identifying a partition, or -1
- * for all processors.
- * Return: size in bytes, -ve on error
- *
- * To be used by smem clients as a quick way to determine if any new
- * allocations has been made.
- */
-int smem_get_free_space(struct udevice *dev, unsigned int host);
-
-#endif /* _smem_h_ */
--
2.47.0
^ permalink raw reply related [flat|nested] 35+ messages in thread* Re: [PATCH 01/15] Revert "dm: SMEM (Shared memory) uclass"
2024-11-24 19:17 ` [PATCH 01/15] Revert "dm: SMEM (Shared memory) uclass" Caleb Connolly
@ 2025-01-07 15:30 ` Simon Glass
0 siblings, 0 replies; 35+ messages in thread
From: Simon Glass @ 2025-01-07 15:30 UTC (permalink / raw)
To: Caleb Connolly
Cc: Rayagonda Kokatanur, Tom Rini, Neil Armstrong, Sumit Garg,
Mario Six, u-boot, u-boot-qcom
Hi Caleb,
On Sun, 24 Nov 2024 at 12:17, Caleb Connolly <caleb.connolly@linaro.org> wrote:
>
> SMEM is a highly Qualcomm specific interface, while having a dedicated
Qualcomm-specific
> UCLASS for it offers a nice abstraction, for things like memory layout
> parsing we need to use it before the driver model is available.
As mentioned on irc, could you explain why that is, i.e. why not parse
the memory layout after driver model is up, but still before
relocation?
>
> Therefore, it doesn't make sense to fit SMEM into the driver model.
> Instead let's adopt a model closer to Linux, and parse SMEM really early
> during boot (as soon as we have the FDT).
>
> This reverts commit 7b384eccc785b596f68448b155cbda26df57fb23.
>
> Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
> ---
> arch/arm/Kconfig | 1 -
> drivers/Kconfig | 2 --
> drivers/Makefile | 1 -
> drivers/smem/Kconfig | 24 -------------
> drivers/smem/Makefile | 7 ----
> drivers/smem/smem-uclass.c | 46 ------------------------
> include/dm/uclass-id.h | 1 -
> include/smem.h | 90 ----------------------------------------------
> 8 files changed, 172 deletions(-)
>
Reviewed-by: Simon Glass <sjg@chromium.org>
Regards,
Simon
^ permalink raw reply [flat|nested] 35+ messages in thread
* [PATCH 02/15] smem: drop drivers/smem
2024-11-24 19:17 [PATCH 00/15] qcom: smem: modernize SMEM in U-Boot Caleb Connolly
2024-11-24 19:17 ` [PATCH 01/15] Revert "dm: SMEM (Shared memory) uclass" Caleb Connolly
@ 2024-11-24 19:17 ` Caleb Connolly
2025-01-07 15:30 ` Simon Glass
2024-11-24 19:17 ` [PATCH 03/15] Revert "test: smem: add basic smem test" Caleb Connolly
` (12 subsequent siblings)
14 siblings, 1 reply; 35+ messages in thread
From: Caleb Connolly @ 2024-11-24 19:17 UTC (permalink / raw)
To: Rayagonda Kokatanur, Tom Rini, Simon Glass, Caleb Connolly,
Neil Armstrong, Sumit Garg, Mario Six
Cc: u-boot, u-boot-qcom
Remove the old qcom SMEM driver port and the sandbox stub
implementation.
Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
---
arch/arm/Kconfig | 1 -
drivers/smem/msm_smem.c | 937 --------------------------------------------
drivers/smem/sandbox_smem.c | 44 ---
3 files changed, 982 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index dc44ea1e6c9f..66b773b0b7f4 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1088,9 +1088,8 @@ config ARCH_SNAPDRAGON
select DM_SERIAL
select DM_RESET
select POWER_DOMAIN
select GPIO_EXTRA_HEADER
- select MSM_SMEM
select OF_CONTROL
select OF_SEPARATE
select SPMI
select BOARD_LATE_INIT
diff --git a/drivers/smem/msm_smem.c b/drivers/smem/msm_smem.c
deleted file mode 100644
index ccd145f9afbb..000000000000
--- a/drivers/smem/msm_smem.c
+++ /dev/null
@@ -1,937 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (c) 2015, Sony Mobile Communications AB.
- * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
- * Copyright (c) 2018, Ramon Fried <ramon.fried@gmail.com>
- */
-
-#include <errno.h>
-#include <dm.h>
-#include <asm/global_data.h>
-#include <dm/device_compat.h>
-#include <dm/devres.h>
-#include <dm/of_access.h>
-#include <dm/of_addr.h>
-#include <asm/io.h>
-#include <linux/bug.h>
-#include <linux/err.h>
-#include <linux/ioport.h>
-#include <linux/io.h>
-#include <linux/sizes.h>
-#include <smem.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-/*
- * The Qualcomm shared memory system is an allocate-only heap structure that
- * consists of one of more memory areas that can be accessed by the processors
- * in the SoC.
- *
- * All systems contains a global heap, accessible by all processors in the SoC,
- * with a table of contents data structure (@smem_header) at the beginning of
- * the main shared memory block.
- *
- * The global header contains meta data for allocations as well as a fixed list
- * of 512 entries (@smem_global_entry) that can be initialized to reference
- * parts of the shared memory space.
- *
- *
- * In addition to this global heap, a set of "private" heaps can be set up at
- * boot time with access restrictions so that only certain processor pairs can
- * access the data.
- *
- * These partitions are referenced from an optional partition table
- * (@smem_ptable), that is found 4kB from the end of the main smem region. The
- * partition table entries (@smem_ptable_entry) lists the involved processors
- * (or hosts) and their location in the main shared memory region.
- *
- * Each partition starts with a header (@smem_partition_header) that identifies
- * the partition and holds properties for the two internal memory regions. The
- * two regions are cached and non-cached memory respectively. Each region
- * contain a link list of allocation headers (@smem_private_entry) followed by
- * their data.
- *
- * Items in the non-cached region are allocated from the start of the partition
- * while items in the cached region are allocated from the end. The free area
- * is hence the region between the cached and non-cached offsets. The header of
- * cached items comes after the data.
- *
- * Version 12 (SMEM_GLOBAL_PART_VERSION) changes the item alloc/get procedure
- * for the global heap. A new global partition is created from the global heap
- * region with partition type (SMEM_GLOBAL_HOST) and the max smem item count is
- * set by the bootloader.
- *
- */
-
-/*
- * The version member of the smem header contains an array of versions for the
- * various software components in the SoC. We verify that the boot loader
- * version is a valid version as a sanity check.
- */
-#define SMEM_MASTER_SBL_VERSION_INDEX 7
-#define SMEM_GLOBAL_HEAP_VERSION 11
-#define SMEM_GLOBAL_PART_VERSION 12
-
-/*
- * The first 8 items are only to be allocated by the boot loader while
- * initializing the heap.
- */
-#define SMEM_ITEM_LAST_FIXED 8
-
-/* Highest accepted item number, for both global and private heaps */
-#define SMEM_ITEM_COUNT 512
-
-/* Processor/host identifier for the application processor */
-#define SMEM_HOST_APPS 0
-
-/* Processor/host identifier for the global partition */
-#define SMEM_GLOBAL_HOST 0xfffe
-
-/* Max number of processors/hosts in a system */
-#define SMEM_HOST_COUNT 10
-
-/**
- * struct smem_proc_comm - proc_comm communication struct (legacy)
- * @command: current command to be executed
- * @status: status of the currently requested command
- * @params: parameters to the command
- */
-struct smem_proc_comm {
- __le32 command;
- __le32 status;
- __le32 params[2];
-};
-
-/**
- * struct smem_global_entry - entry to reference smem items on the heap
- * @allocated: boolean to indicate if this entry is used
- * @offset: offset to the allocated space
- * @size: size of the allocated space, 8 byte aligned
- * @aux_base: base address for the memory region used by this unit, or 0 for
- * the default region. bits 0,1 are reserved
- */
-struct smem_global_entry {
- __le32 allocated;
- __le32 offset;
- __le32 size;
- __le32 aux_base; /* bits 1:0 reserved */
-};
-#define AUX_BASE_MASK 0xfffffffc
-
-/**
- * struct smem_header - header found in beginning of primary smem region
- * @proc_comm: proc_comm communication interface (legacy)
- * @version: array of versions for the various subsystems
- * @initialized: boolean to indicate that smem is initialized
- * @free_offset: index of the first unallocated byte in smem
- * @available: number of bytes available for allocation
- * @reserved: reserved field, must be 0
- * toc: array of references to items
- */
-struct smem_header {
- struct smem_proc_comm proc_comm[4];
- __le32 version[32];
- __le32 initialized;
- __le32 free_offset;
- __le32 available;
- __le32 reserved;
- struct smem_global_entry toc[SMEM_ITEM_COUNT];
-};
-
-/**
- * struct smem_ptable_entry - one entry in the @smem_ptable list
- * @offset: offset, within the main shared memory region, of the partition
- * @size: size of the partition
- * @flags: flags for the partition (currently unused)
- * @host0: first processor/host with access to this partition
- * @host1: second processor/host with access to this partition
- * @cacheline: alignment for "cached" entries
- * @reserved: reserved entries for later use
- */
-struct smem_ptable_entry {
- __le32 offset;
- __le32 size;
- __le32 flags;
- __le16 host0;
- __le16 host1;
- __le32 cacheline;
- __le32 reserved[7];
-};
-
-/**
- * struct smem_ptable - partition table for the private partitions
- * @magic: magic number, must be SMEM_PTABLE_MAGIC
- * @version: version of the partition table
- * @num_entries: number of partitions in the table
- * @reserved: for now reserved entries
- * @entry: list of @smem_ptable_entry for the @num_entries partitions
- */
-struct smem_ptable {
- u8 magic[4];
- __le32 version;
- __le32 num_entries;
- __le32 reserved[5];
- struct smem_ptable_entry entry[];
-};
-
-static const u8 SMEM_PTABLE_MAGIC[] = { 0x24, 0x54, 0x4f, 0x43 }; /* "$TOC" */
-
-/**
- * struct smem_partition_header - header of the partitions
- * @magic: magic number, must be SMEM_PART_MAGIC
- * @host0: first processor/host with access to this partition
- * @host1: second processor/host with access to this partition
- * @size: size of the partition
- * @offset_free_uncached: offset to the first free byte of uncached memory in
- * this partition
- * @offset_free_cached: offset to the first free byte of cached memory in this
- * partition
- * @reserved: for now reserved entries
- */
-struct smem_partition_header {
- u8 magic[4];
- __le16 host0;
- __le16 host1;
- __le32 size;
- __le32 offset_free_uncached;
- __le32 offset_free_cached;
- __le32 reserved[3];
-};
-
-static const u8 SMEM_PART_MAGIC[] = { 0x24, 0x50, 0x52, 0x54 };
-
-/**
- * struct smem_private_entry - header of each item in the private partition
- * @canary: magic number, must be SMEM_PRIVATE_CANARY
- * @item: identifying number of the smem item
- * @size: size of the data, including padding bytes
- * @padding_data: number of bytes of padding of data
- * @padding_hdr: number of bytes of padding between the header and the data
- * @reserved: for now reserved entry
- */
-struct smem_private_entry {
- u16 canary; /* bytes are the same so no swapping needed */
- __le16 item;
- __le32 size; /* includes padding bytes */
- __le16 padding_data;
- __le16 padding_hdr;
- __le32 reserved;
-};
-#define SMEM_PRIVATE_CANARY 0xa5a5
-
-/**
- * struct smem_info - smem region info located after the table of contents
- * @magic: magic number, must be SMEM_INFO_MAGIC
- * @size: size of the smem region
- * @base_addr: base address of the smem region
- * @reserved: for now reserved entry
- * @num_items: highest accepted item number
- */
-struct smem_info {
- u8 magic[4];
- __le32 size;
- __le32 base_addr;
- __le32 reserved;
- __le16 num_items;
-};
-
-static const u8 SMEM_INFO_MAGIC[] = { 0x53, 0x49, 0x49, 0x49 }; /* SIII */
-
-/**
- * struct smem_region - representation of a chunk of memory used for smem
- * @aux_base: identifier of aux_mem base
- * @virt_base: virtual base address of memory with this aux_mem identifier
- * @size: size of the memory region
- */
-struct smem_region {
- u32 aux_base;
- void __iomem *virt_base;
- size_t size;
-};
-
-/**
- * struct qcom_smem - device data for the smem device
- * @dev: device pointer
- * @global_partition: pointer to global partition when in use
- * @global_cacheline: cacheline size for global partition
- * @partitions: list of pointers to partitions affecting the current
- * processor/host
- * @cacheline: list of cacheline sizes for each host
- * @item_count: max accepted item number
- * @num_regions: number of @regions
- * @regions: list of the memory regions defining the shared memory
- */
-struct qcom_smem {
- struct udevice *dev;
-
- struct smem_partition_header *global_partition;
- size_t global_cacheline;
- struct smem_partition_header *partitions[SMEM_HOST_COUNT];
- size_t cacheline[SMEM_HOST_COUNT];
- u32 item_count;
-
- unsigned int num_regions;
- struct smem_region regions[0];
-};
-
-static struct smem_private_entry *
-phdr_to_last_uncached_entry(struct smem_partition_header *phdr)
-{
- void *p = phdr;
-
- return p + le32_to_cpu(phdr->offset_free_uncached);
-}
-
-static void *phdr_to_first_cached_entry(struct smem_partition_header *phdr,
- size_t cacheline)
-{
- void *p = phdr;
-
- return p + le32_to_cpu(phdr->size) - ALIGN(sizeof(*phdr), cacheline);
-}
-
-static void *phdr_to_last_cached_entry(struct smem_partition_header *phdr)
-{
- void *p = phdr;
-
- return p + le32_to_cpu(phdr->offset_free_cached);
-}
-
-static struct smem_private_entry *
-phdr_to_first_uncached_entry(struct smem_partition_header *phdr)
-{
- void *p = phdr;
-
- return p + sizeof(*phdr);
-}
-
-static struct smem_private_entry *
-uncached_entry_next(struct smem_private_entry *e)
-{
- void *p = e;
-
- return p + sizeof(*e) + le16_to_cpu(e->padding_hdr) +
- le32_to_cpu(e->size);
-}
-
-static struct smem_private_entry *
-cached_entry_next(struct smem_private_entry *e, size_t cacheline)
-{
- void *p = e;
-
- return p - le32_to_cpu(e->size) - ALIGN(sizeof(*e), cacheline);
-}
-
-static void *uncached_entry_to_item(struct smem_private_entry *e)
-{
- void *p = e;
-
- return p + sizeof(*e) + le16_to_cpu(e->padding_hdr);
-}
-
-static void *cached_entry_to_item(struct smem_private_entry *e)
-{
- void *p = e;
-
- return p - le32_to_cpu(e->size);
-}
-
-/* Pointer to the one and only smem handle */
-static struct qcom_smem *__smem;
-
-static int qcom_smem_alloc_private(struct qcom_smem *smem,
- struct smem_partition_header *phdr,
- unsigned int item,
- size_t size)
-{
- struct smem_private_entry *hdr, *end;
- size_t alloc_size;
- void *cached;
-
- hdr = phdr_to_first_uncached_entry(phdr);
- end = phdr_to_last_uncached_entry(phdr);
- cached = phdr_to_last_cached_entry(phdr);
-
- while (hdr < end) {
- if (hdr->canary != SMEM_PRIVATE_CANARY) {
- dev_err(smem->dev,
- "Found invalid canary in hosts %d:%d partition\n",
- phdr->host0, phdr->host1);
- return -EINVAL;
- }
-
- if (le16_to_cpu(hdr->item) == item)
- return -EEXIST;
-
- hdr = uncached_entry_next(hdr);
- }
-
- /* Check that we don't grow into the cached region */
- alloc_size = sizeof(*hdr) + ALIGN(size, 8);
- if ((void *)hdr + alloc_size >= cached) {
- dev_err(smem->dev, "Out of memory\n");
- return -ENOSPC;
- }
-
- hdr->canary = SMEM_PRIVATE_CANARY;
- hdr->item = cpu_to_le16(item);
- hdr->size = cpu_to_le32(ALIGN(size, 8));
- hdr->padding_data = cpu_to_le16(le32_to_cpu(hdr->size) - size);
- hdr->padding_hdr = 0;
-
- /*
- * Ensure the header is written before we advance the free offset, so
- * that remote processors that does not take the remote spinlock still
- * gets a consistent view of the linked list.
- */
- dmb();
- le32_add_cpu(&phdr->offset_free_uncached, alloc_size);
-
- return 0;
-}
-
-static int qcom_smem_alloc_global(struct qcom_smem *smem,
- unsigned int item,
- size_t size)
-{
- struct smem_global_entry *entry;
- struct smem_header *header;
-
- header = smem->regions[0].virt_base;
- entry = &header->toc[item];
- if (entry->allocated)
- return -EEXIST;
-
- size = ALIGN(size, 8);
- if (WARN_ON(size > le32_to_cpu(header->available)))
- return -ENOMEM;
-
- entry->offset = header->free_offset;
- entry->size = cpu_to_le32(size);
-
- /*
- * Ensure the header is consistent before we mark the item allocated,
- * so that remote processors will get a consistent view of the item
- * even though they do not take the spinlock on read.
- */
- dmb();
- entry->allocated = cpu_to_le32(1);
-
- le32_add_cpu(&header->free_offset, size);
- le32_add_cpu(&header->available, -size);
-
- return 0;
-}
-
-/**
- * qcom_smem_alloc() - allocate space for a smem item
- * @host: remote processor id, or -1
- * @item: smem item handle
- * @size: number of bytes to be allocated
- *
- * Allocate space for a given smem item of size @size, given that the item is
- * not yet allocated.
- */
-static int qcom_smem_alloc(unsigned int host, unsigned int item, size_t size)
-{
- struct smem_partition_header *phdr;
- int ret;
-
- if (!__smem)
- return -ENOMEM;
-
- if (item < SMEM_ITEM_LAST_FIXED) {
- dev_err(__smem->dev,
- "Rejecting allocation of static entry %d\n", item);
- return -EINVAL;
- }
-
- if (WARN_ON(item >= __smem->item_count))
- return -EINVAL;
-
- if (host < SMEM_HOST_COUNT && __smem->partitions[host]) {
- phdr = __smem->partitions[host];
- ret = qcom_smem_alloc_private(__smem, phdr, item, size);
- } else if (__smem->global_partition) {
- phdr = __smem->global_partition;
- ret = qcom_smem_alloc_private(__smem, phdr, item, size);
- } else {
- ret = qcom_smem_alloc_global(__smem, item, size);
- }
-
- return ret;
-}
-
-static void *qcom_smem_get_global(struct qcom_smem *smem,
- unsigned int item,
- size_t *size)
-{
- struct smem_header *header;
- struct smem_region *area;
- struct smem_global_entry *entry;
- u32 aux_base;
- unsigned int i;
-
- header = smem->regions[0].virt_base;
- entry = &header->toc[item];
- if (!entry->allocated)
- return ERR_PTR(-ENXIO);
-
- aux_base = le32_to_cpu(entry->aux_base) & AUX_BASE_MASK;
-
- for (i = 0; i < smem->num_regions; i++) {
- area = &smem->regions[i];
-
- if (area->aux_base == aux_base || !aux_base) {
- if (size != NULL)
- *size = le32_to_cpu(entry->size);
- return area->virt_base + le32_to_cpu(entry->offset);
- }
- }
-
- return ERR_PTR(-ENOENT);
-}
-
-static void *qcom_smem_get_private(struct qcom_smem *smem,
- struct smem_partition_header *phdr,
- size_t cacheline,
- unsigned int item,
- size_t *size)
-{
- struct smem_private_entry *e, *end;
-
- e = phdr_to_first_uncached_entry(phdr);
- end = phdr_to_last_uncached_entry(phdr);
-
- while (e < end) {
- if (e->canary != SMEM_PRIVATE_CANARY)
- goto invalid_canary;
-
- if (le16_to_cpu(e->item) == item) {
- if (size != NULL)
- *size = le32_to_cpu(e->size) -
- le16_to_cpu(e->padding_data);
-
- return uncached_entry_to_item(e);
- }
-
- e = uncached_entry_next(e);
- }
-
- /* Item was not found in the uncached list, search the cached list */
-
- e = phdr_to_first_cached_entry(phdr, cacheline);
- end = phdr_to_last_cached_entry(phdr);
-
- while (e > end) {
- if (e->canary != SMEM_PRIVATE_CANARY)
- goto invalid_canary;
-
- if (le16_to_cpu(e->item) == item) {
- if (size != NULL)
- *size = le32_to_cpu(e->size) -
- le16_to_cpu(e->padding_data);
-
- return cached_entry_to_item(e);
- }
-
- e = cached_entry_next(e, cacheline);
- }
-
- return ERR_PTR(-ENOENT);
-
-invalid_canary:
- dev_err(smem->dev, "Found invalid canary in hosts %d:%d partition\n",
- phdr->host0, phdr->host1);
-
- return ERR_PTR(-EINVAL);
-}
-
-/**
- * qcom_smem_get() - resolve ptr of size of a smem item
- * @host: the remote processor, or -1
- * @item: smem item handle
- * @size: pointer to be filled out with size of the item
- *
- * Looks up smem item and returns pointer to it. Size of smem
- * item is returned in @size.
- */
-static void *qcom_smem_get(unsigned int host, unsigned int item, size_t *size)
-{
- struct smem_partition_header *phdr;
- size_t cacheln;
- void *ptr = ERR_PTR(-ENOMEM);
-
- if (!__smem)
- return ptr;
-
- if (WARN_ON(item >= __smem->item_count))
- return ERR_PTR(-EINVAL);
-
- if (host < SMEM_HOST_COUNT && __smem->partitions[host]) {
- phdr = __smem->partitions[host];
- cacheln = __smem->cacheline[host];
- ptr = qcom_smem_get_private(__smem, phdr, cacheln, item, size);
- } else if (__smem->global_partition) {
- phdr = __smem->global_partition;
- cacheln = __smem->global_cacheline;
- ptr = qcom_smem_get_private(__smem, phdr, cacheln, item, size);
- } else {
- ptr = qcom_smem_get_global(__smem, item, size);
- }
-
- return ptr;
-
-}
-
-/**
- * qcom_smem_get_free_space() - retrieve amount of free space in a partition
- * @host: the remote processor identifying a partition, or -1
- *
- * To be used by smem clients as a quick way to determine if any new
- * allocations has been made.
- */
-static int qcom_smem_get_free_space(unsigned int host)
-{
- struct smem_partition_header *phdr;
- struct smem_header *header;
- unsigned int ret;
-
- if (!__smem)
- return -ENOMEM;
-
- if (host < SMEM_HOST_COUNT && __smem->partitions[host]) {
- phdr = __smem->partitions[host];
- ret = le32_to_cpu(phdr->offset_free_cached) -
- le32_to_cpu(phdr->offset_free_uncached);
- } else if (__smem->global_partition) {
- phdr = __smem->global_partition;
- ret = le32_to_cpu(phdr->offset_free_cached) -
- le32_to_cpu(phdr->offset_free_uncached);
- } else {
- header = __smem->regions[0].virt_base;
- ret = le32_to_cpu(header->available);
- }
-
- return ret;
-}
-
-static int qcom_smem_get_sbl_version(struct qcom_smem *smem)
-{
- struct smem_header *header;
- __le32 *versions;
-
- header = smem->regions[0].virt_base;
- versions = header->version;
-
- return le32_to_cpu(versions[SMEM_MASTER_SBL_VERSION_INDEX]);
-}
-
-static struct smem_ptable *qcom_smem_get_ptable(struct qcom_smem *smem)
-{
- struct smem_ptable *ptable;
- u32 version;
-
- ptable = smem->regions[0].virt_base + smem->regions[0].size - SZ_4K;
- if (memcmp(ptable->magic, SMEM_PTABLE_MAGIC, sizeof(ptable->magic)))
- return ERR_PTR(-ENOENT);
-
- version = le32_to_cpu(ptable->version);
- if (version != 1) {
- dev_err(smem->dev,
- "Unsupported partition header version %d\n", version);
- return ERR_PTR(-EINVAL);
- }
- return ptable;
-}
-
-static u32 qcom_smem_get_item_count(struct qcom_smem *smem)
-{
- struct smem_ptable *ptable;
- struct smem_info *info;
-
- ptable = qcom_smem_get_ptable(smem);
- if (IS_ERR_OR_NULL(ptable))
- return SMEM_ITEM_COUNT;
-
- info = (struct smem_info *)&ptable->entry[ptable->num_entries];
- if (memcmp(info->magic, SMEM_INFO_MAGIC, sizeof(info->magic)))
- return SMEM_ITEM_COUNT;
-
- return le16_to_cpu(info->num_items);
-}
-
-static int qcom_smem_set_global_partition(struct qcom_smem *smem)
-{
- struct smem_partition_header *header;
- struct smem_ptable_entry *entry = NULL;
- struct smem_ptable *ptable;
- u32 host0, host1, size;
- int i;
-
- ptable = qcom_smem_get_ptable(smem);
- if (IS_ERR(ptable))
- return PTR_ERR(ptable);
-
- for (i = 0; i < le32_to_cpu(ptable->num_entries); i++) {
- entry = &ptable->entry[i];
- host0 = le16_to_cpu(entry->host0);
- host1 = le16_to_cpu(entry->host1);
-
- if (host0 == SMEM_GLOBAL_HOST && host0 == host1)
- break;
- }
-
- if (!entry) {
- dev_err(smem->dev, "Missing entry for global partition\n");
- return -EINVAL;
- }
-
- if (!le32_to_cpu(entry->offset) || !le32_to_cpu(entry->size)) {
- dev_err(smem->dev, "Invalid entry for global partition\n");
- return -EINVAL;
- }
-
- if (smem->global_partition) {
- dev_err(smem->dev, "Already found the global partition\n");
- return -EINVAL;
- }
-
- header = smem->regions[0].virt_base + le32_to_cpu(entry->offset);
- host0 = le16_to_cpu(header->host0);
- host1 = le16_to_cpu(header->host1);
-
- if (memcmp(header->magic, SMEM_PART_MAGIC, sizeof(header->magic))) {
- dev_err(smem->dev, "Global partition has invalid magic\n");
- return -EINVAL;
- }
-
- if (host0 != SMEM_GLOBAL_HOST && host1 != SMEM_GLOBAL_HOST) {
- dev_err(smem->dev, "Global partition hosts are invalid\n");
- return -EINVAL;
- }
-
- if (le32_to_cpu(header->size) != le32_to_cpu(entry->size)) {
- dev_err(smem->dev, "Global partition has invalid size\n");
- return -EINVAL;
- }
-
- size = le32_to_cpu(header->offset_free_uncached);
- if (size > le32_to_cpu(header->size)) {
- dev_err(smem->dev,
- "Global partition has invalid free pointer\n");
- return -EINVAL;
- }
-
- smem->global_partition = header;
- smem->global_cacheline = le32_to_cpu(entry->cacheline);
-
- return 0;
-}
-
-static int qcom_smem_enumerate_partitions(struct qcom_smem *smem,
- unsigned int local_host)
-{
- struct smem_partition_header *header;
- struct smem_ptable_entry *entry;
- struct smem_ptable *ptable;
- unsigned int remote_host;
- u32 host0, host1;
- int i;
-
- ptable = qcom_smem_get_ptable(smem);
- if (IS_ERR(ptable))
- return PTR_ERR(ptable);
-
- for (i = 0; i < le32_to_cpu(ptable->num_entries); i++) {
- entry = &ptable->entry[i];
- host0 = le16_to_cpu(entry->host0);
- host1 = le16_to_cpu(entry->host1);
-
- if (host0 != local_host && host1 != local_host)
- continue;
-
- if (!le32_to_cpu(entry->offset))
- continue;
-
- if (!le32_to_cpu(entry->size))
- continue;
-
- if (host0 == local_host)
- remote_host = host1;
- else
- remote_host = host0;
-
- if (remote_host >= SMEM_HOST_COUNT) {
- dev_err(smem->dev,
- "Invalid remote host %d\n",
- remote_host);
- return -EINVAL;
- }
-
- if (smem->partitions[remote_host]) {
- dev_err(smem->dev,
- "Already found a partition for host %d\n",
- remote_host);
- return -EINVAL;
- }
-
- header = smem->regions[0].virt_base + le32_to_cpu(entry->offset);
- host0 = le16_to_cpu(header->host0);
- host1 = le16_to_cpu(header->host1);
-
- if (memcmp(header->magic, SMEM_PART_MAGIC,
- sizeof(header->magic))) {
- dev_err(smem->dev,
- "Partition %d has invalid magic\n", i);
- return -EINVAL;
- }
-
- if (host0 != local_host && host1 != local_host) {
- dev_err(smem->dev,
- "Partition %d hosts are invalid\n", i);
- return -EINVAL;
- }
-
- if (host0 != remote_host && host1 != remote_host) {
- dev_err(smem->dev,
- "Partition %d hosts are invalid\n", i);
- return -EINVAL;
- }
-
- if (le32_to_cpu(header->size) != le32_to_cpu(entry->size)) {
- dev_err(smem->dev,
- "Partition %d has invalid size\n", i);
- return -EINVAL;
- }
-
- if (le32_to_cpu(header->offset_free_uncached) > le32_to_cpu(header->size)) {
- dev_err(smem->dev,
- "Partition %d has invalid free pointer\n", i);
- return -EINVAL;
- }
-
- smem->partitions[remote_host] = header;
- smem->cacheline[remote_host] = le32_to_cpu(entry->cacheline);
- }
-
- return 0;
-}
-
-static int qcom_smem_map_memory(struct qcom_smem *smem, struct udevice *dev,
- const char *name, int i)
-{
- struct fdt_resource r;
- int ret;
- int node = dev_of_offset(dev);
-
- ret = fdtdec_lookup_phandle(gd->fdt_blob, node, name);
- if (ret < 0) {
- dev_err(dev, "No %s specified\n", name);
- return -EINVAL;
- }
-
- ret = fdt_get_resource(gd->fdt_blob, ret, "reg", 0, &r);
- if (ret)
- return ret;
-
- smem->regions[i].aux_base = (u32)r.start;
- smem->regions[i].size = fdt_resource_size(&r);
- smem->regions[i].virt_base = devm_ioremap(dev, r.start, fdt_resource_size(&r));
- if (!smem->regions[i].virt_base)
- return -ENOMEM;
-
- return 0;
-}
-
-static int qcom_smem_probe(struct udevice *dev)
-{
- struct smem_header *header;
- struct qcom_smem *smem;
- size_t array_size;
- int num_regions;
- u32 version;
- int ret;
- int node = dev_of_offset(dev);
-
- num_regions = 1;
- if (fdtdec_lookup_phandle(gd->fdt_blob, node, "qcomrpm-msg-ram") >= 0)
- num_regions++;
-
- array_size = num_regions * sizeof(struct smem_region);
- smem = devm_kzalloc(dev, sizeof(*smem) + array_size, GFP_KERNEL);
- if (!smem)
- return -ENOMEM;
-
- smem->dev = dev;
- smem->num_regions = num_regions;
-
- ret = qcom_smem_map_memory(smem, dev, "memory-region", 0);
- if (ret)
- return ret;
-
- if (num_regions > 1) {
- ret = qcom_smem_map_memory(smem, dev,
- "qcom,rpm-msg-ram", 1);
- if (ret)
- return ret;
- }
-
- header = smem->regions[0].virt_base;
- if (le32_to_cpu(header->initialized) != 1 ||
- le32_to_cpu(header->reserved)) {
- dev_err(dev, "SMEM is not initialized by SBL\n");
- return -EINVAL;
- }
-
- version = qcom_smem_get_sbl_version(smem);
- switch (version >> 16) {
- case SMEM_GLOBAL_PART_VERSION:
- ret = qcom_smem_set_global_partition(smem);
- if (ret < 0)
- return ret;
- smem->item_count = qcom_smem_get_item_count(smem);
- break;
- case SMEM_GLOBAL_HEAP_VERSION:
- smem->item_count = SMEM_ITEM_COUNT;
- break;
- default:
- dev_err(dev, "Unsupported SMEM version 0x%x\n", version);
- return -EINVAL;
- }
-
- ret = qcom_smem_enumerate_partitions(smem, SMEM_HOST_APPS);
- if (ret < 0 && ret != -ENOENT)
- return ret;
-
- __smem = smem;
-
- return 0;
-}
-
-static int qcom_smem_remove(struct udevice *dev)
-{
- __smem = NULL;
-
- return 0;
-}
-
-const struct udevice_id qcom_smem_of_match[] = {
- { .compatible = "qcom,smem" },
- { }
-};
-
-static const struct smem_ops msm_smem_ops = {
- .alloc = qcom_smem_alloc,
- .get = qcom_smem_get,
- .get_free_space = qcom_smem_get_free_space,
-};
-
-U_BOOT_DRIVER(qcom_smem) = {
- .name = "qcom_smem",
- .id = UCLASS_SMEM,
- .of_match = qcom_smem_of_match,
- .ops = &msm_smem_ops,
- .probe = qcom_smem_probe,
- .remove = qcom_smem_remove,
-};
diff --git a/drivers/smem/sandbox_smem.c b/drivers/smem/sandbox_smem.c
deleted file mode 100644
index fec98e5611d6..000000000000
--- a/drivers/smem/sandbox_smem.c
+++ /dev/null
@@ -1,44 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (c) 2018 Ramon Fried <ramon.fried@gmail.com>
- */
-
-#include <dm.h>
-#include <errno.h>
-#include <smem.h>
-#include <asm/test.h>
-
-static int sandbox_smem_alloc(unsigned int host,
- unsigned int item, size_t size)
-{
- return 0;
-}
-
-static void *sandbox_smem_get(unsigned int host,
- unsigned int item, size_t *size)
-{
- return NULL;
-}
-
-static int sandbox_smem_get_free_space(unsigned int host)
-{
- return 0;
-}
-
-static const struct smem_ops sandbox_smem_ops = {
- .alloc = sandbox_smem_alloc,
- .get = sandbox_smem_get,
- .get_free_space = sandbox_smem_get_free_space,
-};
-
-static const struct udevice_id sandbox_smem_ids[] = {
- { .compatible = "sandbox,smem" },
- { }
-};
-
-U_BOOT_DRIVER(smem_sandbox) = {
- .name = "smem_sandbox",
- .id = UCLASS_SMEM,
- .of_match = sandbox_smem_ids,
- .ops = &sandbox_smem_ops,
-};
--
2.47.0
^ permalink raw reply related [flat|nested] 35+ messages in thread* Re: [PATCH 02/15] smem: drop drivers/smem
2024-11-24 19:17 ` [PATCH 02/15] smem: drop drivers/smem Caleb Connolly
@ 2025-01-07 15:30 ` Simon Glass
0 siblings, 0 replies; 35+ messages in thread
From: Simon Glass @ 2025-01-07 15:30 UTC (permalink / raw)
To: Caleb Connolly
Cc: Rayagonda Kokatanur, Tom Rini, Neil Armstrong, Sumit Garg,
Mario Six, u-boot, u-boot-qcom
On Sun, 24 Nov 2024 at 12:17, Caleb Connolly <caleb.connolly@linaro.org> wrote:
>
> Remove the old qcom SMEM driver port and the sandbox stub
> implementation.
>
> Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
> ---
> arch/arm/Kconfig | 1 -
> drivers/smem/msm_smem.c | 937 --------------------------------------------
> drivers/smem/sandbox_smem.c | 44 ---
> 3 files changed, 982 deletions(-)
>
Reviewed-by: Simon Glass <sjg@chromium.org>
^ permalink raw reply [flat|nested] 35+ messages in thread
* [PATCH 03/15] Revert "test: smem: add basic smem test"
2024-11-24 19:17 [PATCH 00/15] qcom: smem: modernize SMEM in U-Boot Caleb Connolly
2024-11-24 19:17 ` [PATCH 01/15] Revert "dm: SMEM (Shared memory) uclass" Caleb Connolly
2024-11-24 19:17 ` [PATCH 02/15] smem: drop drivers/smem Caleb Connolly
@ 2024-11-24 19:17 ` Caleb Connolly
2025-01-07 15:33 ` Simon Glass
2024-11-24 19:17 ` [PATCH 04/15] Revert "drivers: smem: sandbox" Caleb Connolly
` (11 subsequent siblings)
14 siblings, 1 reply; 35+ messages in thread
From: Caleb Connolly @ 2024-11-24 19:17 UTC (permalink / raw)
To: Rayagonda Kokatanur, Tom Rini, Simon Glass, Caleb Connolly,
Neil Armstrong, Sumit Garg, Mario Six
Cc: u-boot, u-boot-qcom
This reverts commit 20e7705764c4e5ea924f1ea54bb36ebbbeffffe7.
---
test/dm/Makefile | 1 -
test/dm/smem.c | 26 --------------------------
2 files changed, 27 deletions(-)
diff --git a/test/dm/Makefile b/test/dm/Makefile
index bcb52ef1067b..c7511d072716 100644
--- a/test/dm/Makefile
+++ b/test/dm/Makefile
@@ -111,9 +111,8 @@ obj-$(CONFIG_SCSI) += scsi.o
obj-$(CONFIG_DM_SERIAL) += serial.o
obj-$(CONFIG_DM_SPI_FLASH) += sf.o
obj-$(CONFIG_SIMPLE_BUS) += simple-bus.o
obj-$(CONFIG_SIMPLE_PM_BUS) += simple-pm-bus.o
-obj-$(CONFIG_SMEM) += smem.o
obj-$(CONFIG_SOC_DEVICE) += soc.o
obj-$(CONFIG_SOUND) += sound.o
obj-$(CONFIG_DM_SPI) += spi.o
obj-$(CONFIG_SPMI) += spmi.o
diff --git a/test/dm/smem.c b/test/dm/smem.c
deleted file mode 100644
index 89e74cccc574..000000000000
--- a/test/dm/smem.c
+++ /dev/null
@@ -1,26 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2018 Ramon Fried <ramon.fried@gmail.com>
- */
-
-#include <dm.h>
-#include <smem.h>
-#include <dm/test.h>
-#include <test/test.h>
-#include <test/ut.h>
-
-/* Basic test of the smem uclass */
-static int dm_test_smem_base(struct unit_test_state *uts)
-{
- struct udevice *dev;
- size_t size;
-
- ut_assertok(uclass_get_device(UCLASS_SMEM, 0, &dev));
- ut_assertnonnull(dev);
- ut_assertok(smem_alloc(dev, -1, 0, 16));
- ut_asserteq(0, smem_get_free_space(dev, -1));
- ut_assertnull(smem_get(dev, -1, 0, &size));
-
- return 0;
-}
-DM_TEST(dm_test_smem_base, UTF_SCAN_PDATA | UTF_SCAN_FDT);
--
2.47.0
^ permalink raw reply related [flat|nested] 35+ messages in thread* Re: [PATCH 03/15] Revert "test: smem: add basic smem test"
2024-11-24 19:17 ` [PATCH 03/15] Revert "test: smem: add basic smem test" Caleb Connolly
@ 2025-01-07 15:33 ` Simon Glass
0 siblings, 0 replies; 35+ messages in thread
From: Simon Glass @ 2025-01-07 15:33 UTC (permalink / raw)
To: Caleb Connolly
Cc: Rayagonda Kokatanur, Tom Rini, Neil Armstrong, Sumit Garg,
Mario Six, u-boot, u-boot-qcom
On Sun, 24 Nov 2024 at 12:17, Caleb Connolly <caleb.connolly@linaro.org> wrote:
>
> This reverts commit 20e7705764c4e5ea924f1ea54bb36ebbbeffffe7.
> ---
> test/dm/Makefile | 1 -
> test/dm/smem.c | 26 --------------------------
> 2 files changed, 27 deletions(-)
>
Reviewed-by: Simon Glass <sjg@chromium.org>
^ permalink raw reply [flat|nested] 35+ messages in thread
* [PATCH 04/15] Revert "drivers: smem: sandbox"
2024-11-24 19:17 [PATCH 00/15] qcom: smem: modernize SMEM in U-Boot Caleb Connolly
` (2 preceding siblings ...)
2024-11-24 19:17 ` [PATCH 03/15] Revert "test: smem: add basic smem test" Caleb Connolly
@ 2024-11-24 19:17 ` Caleb Connolly
2025-01-07 15:31 ` Simon Glass
2024-11-24 19:17 ` [PATCH 05/15] soc: qcom: import smem from Linux 6.11-rc2 Caleb Connolly
` (10 subsequent siblings)
14 siblings, 1 reply; 35+ messages in thread
From: Caleb Connolly @ 2024-11-24 19:17 UTC (permalink / raw)
To: Rayagonda Kokatanur, Tom Rini, Simon Glass, Caleb Connolly,
Neil Armstrong, Sumit Garg, Mario Six
Cc: u-boot, u-boot-qcom
This reverts commit 7fd7e2cf339ea2ec570f6dae1cdfaf8e066eb4af.
---
arch/sandbox/dts/test.dts | 4 ----
configs/sandbox64_defconfig | 2 --
configs/sandbox_defconfig | 2 --
3 files changed, 8 deletions(-)
diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts
index dee280184b1b..1c1f148d5b5c 100644
--- a/arch/sandbox/dts/test.dts
+++ b/arch/sandbox/dts/test.dts
@@ -1357,12 +1357,8 @@
compatible = "sandbox,scsi";
sandbox,filepath = "scsi.img";
};
- smem@0 {
- compatible = "sandbox,smem";
- };
-
sound {
compatible = "sandbox,sound";
cpu {
sound-dai = <&i2s 0>;
diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig
index 7960b2ef42e7..62a4fb80e2cb 100644
--- a/configs/sandbox64_defconfig
+++ b/configs/sandbox64_defconfig
@@ -228,10 +228,8 @@ CONFIG_SANDBOX_RESET=y
CONFIG_DM_RTC=y
CONFIG_RTC_RV8803=y
CONFIG_SCSI=y
CONFIG_SANDBOX_SERIAL=y
-CONFIG_SMEM=y
-CONFIG_SANDBOX_SMEM=y
CONFIG_SOUND=y
CONFIG_SOUND_SANDBOX=y
CONFIG_SOC_DEVICE=y
CONFIG_SANDBOX_SPI=y
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index 718e4a8283c8..1428d8e4b411 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -297,10 +297,8 @@ CONFIG_RTC_RV8803=y
CONFIG_RTC_HT1380=y
CONFIG_SCSI=y
CONFIG_SANDBOX_SERIAL=y
CONFIG_SM=y
-CONFIG_SMEM=y
-CONFIG_SANDBOX_SMEM=y
CONFIG_SOUND=y
CONFIG_SOUND_DA7219=y
CONFIG_SOUND_MAX98357A=y
CONFIG_SOUND_SANDBOX=y
--
2.47.0
^ permalink raw reply related [flat|nested] 35+ messages in thread* Re: [PATCH 04/15] Revert "drivers: smem: sandbox"
2024-11-24 19:17 ` [PATCH 04/15] Revert "drivers: smem: sandbox" Caleb Connolly
@ 2025-01-07 15:31 ` Simon Glass
0 siblings, 0 replies; 35+ messages in thread
From: Simon Glass @ 2025-01-07 15:31 UTC (permalink / raw)
To: Caleb Connolly
Cc: Rayagonda Kokatanur, Tom Rini, Neil Armstrong, Sumit Garg,
Mario Six, u-boot, u-boot-qcom
On Sun, 24 Nov 2024 at 12:17, Caleb Connolly <caleb.connolly@linaro.org> wrote:
>
> This reverts commit 7fd7e2cf339ea2ec570f6dae1cdfaf8e066eb4af.
> ---
> arch/sandbox/dts/test.dts | 4 ----
> configs/sandbox64_defconfig | 2 --
> configs/sandbox_defconfig | 2 --
> 3 files changed, 8 deletions(-)
Reviewed-by: Simon Glass <sjg@chromium.org>
^ permalink raw reply [flat|nested] 35+ messages in thread
* [PATCH 05/15] soc: qcom: import smem from Linux 6.11-rc2
2024-11-24 19:17 [PATCH 00/15] qcom: smem: modernize SMEM in U-Boot Caleb Connolly
` (3 preceding siblings ...)
2024-11-24 19:17 ` [PATCH 04/15] Revert "drivers: smem: sandbox" Caleb Connolly
@ 2024-11-24 19:17 ` Caleb Connolly
2025-01-07 15:30 ` Simon Glass
2024-11-24 19:17 ` [PATCH 06/15] soc: qcom: smem: adjust headers for U-Boot Caleb Connolly
` (9 subsequent siblings)
14 siblings, 1 reply; 35+ messages in thread
From: Caleb Connolly @ 2024-11-24 19:17 UTC (permalink / raw)
To: Rayagonda Kokatanur, Tom Rini, Simon Glass, Caleb Connolly,
Neil Armstrong, Sumit Garg, Mario Six
Cc: u-boot, u-boot-qcom
Import the SMEM driver from Linux.
Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
---
drivers/soc/qcom/smem.c | 1279 ++++++++++++++++++++++++++++++++++++++++++++
include/soc/qcom/smem.h | 20 +
include/soc/qcom/socinfo.h | 111 ++++
3 files changed, 1410 insertions(+)
diff --git a/drivers/soc/qcom/smem.c b/drivers/soc/qcom/smem.c
new file mode 100644
index 000000000000..8515b8ae7777
--- /dev/null
+++ b/drivers/soc/qcom/smem.c
@@ -0,0 +1,1279 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2015, Sony Mobile Communications AB.
+ * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
+ */
+
+#include <linux/hwspinlock.h>
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_reserved_mem.h>
+#include <linux/platform_device.h>
+#include <linux/sizes.h>
+#include <linux/slab.h>
+#include <linux/soc/qcom/smem.h>
+#include <linux/soc/qcom/socinfo.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
+ * in the SoC.
+ *
+ * All systems contains a global heap, accessible by all processors in the SoC,
+ * with a table of contents data structure (@smem_header) at the beginning of
+ * the main shared memory block.
+ *
+ * The global header contains meta data for allocations as well as a fixed list
+ * of 512 entries (@smem_global_entry) that can be initialized to reference
+ * parts of the shared memory space.
+ *
+ *
+ * In addition to this global heap a set of "private" heaps can be set up at
+ * boot time with access restrictions so that only certain processor pairs can
+ * access the data.
+ *
+ * These partitions are referenced from an optional partition table
+ * (@smem_ptable), that is found 4kB from the end of the main smem region. The
+ * partition table entries (@smem_ptable_entry) lists the involved processors
+ * (or hosts) and their location in the main shared memory region.
+ *
+ * Each partition starts with a header (@smem_partition_header) that identifies
+ * the partition and holds properties for the two internal memory regions. The
+ * two regions are cached and non-cached memory respectively. Each region
+ * contain a link list of allocation headers (@smem_private_entry) followed by
+ * their data.
+ *
+ * Items in the non-cached region are allocated from the start of the partition
+ * while items in the cached region are allocated from the end. The free area
+ * is hence the region between the cached and non-cached offsets. The header of
+ * cached items comes after the data.
+ *
+ * Version 12 (SMEM_GLOBAL_PART_VERSION) changes the item alloc/get procedure
+ * for the global heap. A new global partition is created from the global heap
+ * region with partition type (SMEM_GLOBAL_HOST) and the max smem item count is
+ * set by the bootloader.
+ *
+ * To synchronize allocations in the shared memory heaps a remote spinlock must
+ * be held - currently lock number 3 of the sfpb or tcsr is used for this on all
+ * platforms.
+ *
+ */
+
+/*
+ * The version member of the smem header contains an array of versions for the
+ * various software components in the SoC. We verify that the boot loader
+ * version is a valid version as a sanity check.
+ */
+#define SMEM_MASTER_SBL_VERSION_INDEX 7
+#define SMEM_GLOBAL_HEAP_VERSION 11
+#define SMEM_GLOBAL_PART_VERSION 12
+
+/*
+ * The first 8 items are only to be allocated by the boot loader while
+ * initializing the heap.
+ */
+#define SMEM_ITEM_LAST_FIXED 8
+
+/* Highest accepted item number, for both global and private heaps */
+#define SMEM_ITEM_COUNT 512
+
+/* Processor/host identifier for the application processor */
+#define SMEM_HOST_APPS 0
+
+/* Processor/host identifier for the global partition */
+#define SMEM_GLOBAL_HOST 0xfffe
+
+/* Max number of processors/hosts in a system */
+#define SMEM_HOST_COUNT 20
+
+/**
+ * struct smem_proc_comm - proc_comm communication struct (legacy)
+ * @command: current command to be executed
+ * @status: status of the currently requested command
+ * @params: parameters to the command
+ */
+struct smem_proc_comm {
+ __le32 command;
+ __le32 status;
+ __le32 params[2];
+};
+
+/**
+ * struct smem_global_entry - entry to reference smem items on the heap
+ * @allocated: boolean to indicate if this entry is used
+ * @offset: offset to the allocated space
+ * @size: size of the allocated space, 8 byte aligned
+ * @aux_base: base address for the memory region used by this unit, or 0 for
+ * the default region. bits 0,1 are reserved
+ */
+struct smem_global_entry {
+ __le32 allocated;
+ __le32 offset;
+ __le32 size;
+ __le32 aux_base; /* bits 1:0 reserved */
+};
+#define AUX_BASE_MASK 0xfffffffc
+
+/**
+ * struct smem_header - header found in beginning of primary smem region
+ * @proc_comm: proc_comm communication interface (legacy)
+ * @version: array of versions for the various subsystems
+ * @initialized: boolean to indicate that smem is initialized
+ * @free_offset: index of the first unallocated byte in smem
+ * @available: number of bytes available for allocation
+ * @reserved: reserved field, must be 0
+ * @toc: array of references to items
+ */
+struct smem_header {
+ struct smem_proc_comm proc_comm[4];
+ __le32 version[32];
+ __le32 initialized;
+ __le32 free_offset;
+ __le32 available;
+ __le32 reserved;
+ struct smem_global_entry toc[SMEM_ITEM_COUNT];
+};
+
+/**
+ * struct smem_ptable_entry - one entry in the @smem_ptable list
+ * @offset: offset, within the main shared memory region, of the partition
+ * @size: size of the partition
+ * @flags: flags for the partition (currently unused)
+ * @host0: first processor/host with access to this partition
+ * @host1: second processor/host with access to this partition
+ * @cacheline: alignment for "cached" entries
+ * @reserved: reserved entries for later use
+ */
+struct smem_ptable_entry {
+ __le32 offset;
+ __le32 size;
+ __le32 flags;
+ __le16 host0;
+ __le16 host1;
+ __le32 cacheline;
+ __le32 reserved[7];
+};
+
+/**
+ * struct smem_ptable - partition table for the private partitions
+ * @magic: magic number, must be SMEM_PTABLE_MAGIC
+ * @version: version of the partition table
+ * @num_entries: number of partitions in the table
+ * @reserved: for now reserved entries
+ * @entry: list of @smem_ptable_entry for the @num_entries partitions
+ */
+struct smem_ptable {
+ u8 magic[4];
+ __le32 version;
+ __le32 num_entries;
+ __le32 reserved[5];
+ struct smem_ptable_entry entry[];
+};
+
+static const u8 SMEM_PTABLE_MAGIC[] = { 0x24, 0x54, 0x4f, 0x43 }; /* "$TOC" */
+
+/**
+ * struct smem_partition_header - header of the partitions
+ * @magic: magic number, must be SMEM_PART_MAGIC
+ * @host0: first processor/host with access to this partition
+ * @host1: second processor/host with access to this partition
+ * @size: size of the partition
+ * @offset_free_uncached: offset to the first free byte of uncached memory in
+ * this partition
+ * @offset_free_cached: offset to the first free byte of cached memory in this
+ * partition
+ * @reserved: for now reserved entries
+ */
+struct smem_partition_header {
+ u8 magic[4];
+ __le16 host0;
+ __le16 host1;
+ __le32 size;
+ __le32 offset_free_uncached;
+ __le32 offset_free_cached;
+ __le32 reserved[3];
+};
+
+/**
+ * struct smem_partition - describes smem partition
+ * @virt_base: starting virtual address of partition
+ * @phys_base: starting physical address of partition
+ * @cacheline: alignment for "cached" entries
+ * @size: size of partition
+ */
+struct smem_partition {
+ void __iomem *virt_base;
+ phys_addr_t phys_base;
+ size_t cacheline;
+ size_t size;
+};
+
+static const u8 SMEM_PART_MAGIC[] = { 0x24, 0x50, 0x52, 0x54 };
+
+/**
+ * struct smem_private_entry - header of each item in the private partition
+ * @canary: magic number, must be SMEM_PRIVATE_CANARY
+ * @item: identifying number of the smem item
+ * @size: size of the data, including padding bytes
+ * @padding_data: number of bytes of padding of data
+ * @padding_hdr: number of bytes of padding between the header and the data
+ * @reserved: for now reserved entry
+ */
+struct smem_private_entry {
+ u16 canary; /* bytes are the same so no swapping needed */
+ __le16 item;
+ __le32 size; /* includes padding bytes */
+ __le16 padding_data;
+ __le16 padding_hdr;
+ __le32 reserved;
+};
+#define SMEM_PRIVATE_CANARY 0xa5a5
+
+/**
+ * struct smem_info - smem region info located after the table of contents
+ * @magic: magic number, must be SMEM_INFO_MAGIC
+ * @size: size of the smem region
+ * @base_addr: base address of the smem region
+ * @reserved: for now reserved entry
+ * @num_items: highest accepted item number
+ */
+struct smem_info {
+ u8 magic[4];
+ __le32 size;
+ __le32 base_addr;
+ __le32 reserved;
+ __le16 num_items;
+};
+
+static const u8 SMEM_INFO_MAGIC[] = { 0x53, 0x49, 0x49, 0x49 }; /* SIII */
+
+/**
+ * struct smem_region - representation of a chunk of memory used for smem
+ * @aux_base: identifier of aux_mem base
+ * @virt_base: virtual base address of memory with this aux_mem identifier
+ * @size: size of the memory region
+ */
+struct smem_region {
+ phys_addr_t aux_base;
+ void __iomem *virt_base;
+ size_t size;
+};
+
+/**
+ * struct qcom_smem - device data for the smem device
+ * @dev: device pointer
+ * @hwlock: reference to a hwspinlock
+ * @ptable: virtual base of partition table
+ * @global_partition: describes for global partition when in use
+ * @partitions: list of partitions of current processor/host
+ * @item_count: max accepted item number
+ * @socinfo: platform device pointer
+ * @num_regions: number of @regions
+ * @regions: list of the memory regions defining the shared memory
+ */
+struct qcom_smem {
+ struct device *dev;
+
+ struct hwspinlock *hwlock;
+
+ u32 item_count;
+ struct platform_device *socinfo;
+ struct smem_ptable *ptable;
+ struct smem_partition global_partition;
+ struct smem_partition partitions[SMEM_HOST_COUNT];
+
+ unsigned num_regions;
+ struct smem_region regions[] __counted_by(num_regions);
+};
+
+static void *
+phdr_to_last_uncached_entry(struct smem_partition_header *phdr)
+{
+ void *p = phdr;
+
+ return p + le32_to_cpu(phdr->offset_free_uncached);
+}
+
+static struct smem_private_entry *
+phdr_to_first_cached_entry(struct smem_partition_header *phdr,
+ size_t cacheline)
+{
+ void *p = phdr;
+ struct smem_private_entry *e;
+
+ return p + le32_to_cpu(phdr->size) - ALIGN(sizeof(*e), cacheline);
+}
+
+static void *
+phdr_to_last_cached_entry(struct smem_partition_header *phdr)
+{
+ void *p = phdr;
+
+ return p + le32_to_cpu(phdr->offset_free_cached);
+}
+
+static struct smem_private_entry *
+phdr_to_first_uncached_entry(struct smem_partition_header *phdr)
+{
+ void *p = phdr;
+
+ return p + sizeof(*phdr);
+}
+
+static struct smem_private_entry *
+uncached_entry_next(struct smem_private_entry *e)
+{
+ void *p = e;
+
+ return p + sizeof(*e) + le16_to_cpu(e->padding_hdr) +
+ le32_to_cpu(e->size);
+}
+
+static struct smem_private_entry *
+cached_entry_next(struct smem_private_entry *e, size_t cacheline)
+{
+ void *p = e;
+
+ return p - le32_to_cpu(e->size) - ALIGN(sizeof(*e), cacheline);
+}
+
+static void *uncached_entry_to_item(struct smem_private_entry *e)
+{
+ void *p = e;
+
+ return p + sizeof(*e) + le16_to_cpu(e->padding_hdr);
+}
+
+static void *cached_entry_to_item(struct smem_private_entry *e)
+{
+ void *p = e;
+
+ return p - le32_to_cpu(e->size);
+}
+
+/* Pointer to the one and only smem handle */
+static struct qcom_smem *__smem;
+
+/* Timeout (ms) for the trylock of remote spinlocks */
+#define HWSPINLOCK_TIMEOUT 1000
+
+/* The qcom hwspinlock id is always plus one from the smem host id */
+#define SMEM_HOST_ID_TO_HWSPINLOCK_ID(__x) ((__x) + 1)
+
+/**
+ * qcom_smem_bust_hwspin_lock_by_host() - bust the smem hwspinlock for a host
+ * @host: remote processor id
+ *
+ * Busts the hwspin_lock for the given smem host id. This helper is intended
+ * for remoteproc drivers that manage remoteprocs with an equivalent smem
+ * driver instance in the remote firmware. Drivers can force a release of the
+ * smem hwspin_lock if the rproc unexpectedly goes into a bad state.
+ *
+ * Context: Process context.
+ *
+ * Returns: 0 on success, otherwise negative errno.
+ */
+int qcom_smem_bust_hwspin_lock_by_host(unsigned int host)
+{
+ /* This function is for remote procs, so ignore SMEM_HOST_APPS */
+ if (host == SMEM_HOST_APPS || host >= SMEM_HOST_COUNT)
+ return -EINVAL;
+
+ return hwspin_lock_bust(__smem->hwlock, SMEM_HOST_ID_TO_HWSPINLOCK_ID(host));
+}
+EXPORT_SYMBOL_GPL(qcom_smem_bust_hwspin_lock_by_host);
+
+/**
+ * qcom_smem_is_available() - Check if SMEM is available
+ *
+ * Return: true if SMEM is available, false otherwise.
+ */
+bool qcom_smem_is_available(void)
+{
+ return !!__smem;
+}
+EXPORT_SYMBOL_GPL(qcom_smem_is_available);
+
+static int qcom_smem_alloc_private(struct qcom_smem *smem,
+ struct smem_partition *part,
+ unsigned item,
+ size_t size)
+{
+ struct smem_private_entry *hdr, *end;
+ struct smem_partition_header *phdr;
+ size_t alloc_size;
+ void *cached;
+ void *p_end;
+
+ phdr = (struct smem_partition_header __force *)part->virt_base;
+ p_end = (void *)phdr + part->size;
+
+ hdr = phdr_to_first_uncached_entry(phdr);
+ end = phdr_to_last_uncached_entry(phdr);
+ cached = phdr_to_last_cached_entry(phdr);
+
+ if (WARN_ON((void *)end > p_end || cached > p_end))
+ return -EINVAL;
+
+ while (hdr < end) {
+ if (hdr->canary != SMEM_PRIVATE_CANARY)
+ goto bad_canary;
+ if (le16_to_cpu(hdr->item) == item)
+ return -EEXIST;
+
+ hdr = uncached_entry_next(hdr);
+ }
+
+ if (WARN_ON((void *)hdr > p_end))
+ return -EINVAL;
+
+ /* Check that we don't grow into the cached region */
+ alloc_size = sizeof(*hdr) + ALIGN(size, 8);
+ if ((void *)hdr + alloc_size > cached) {
+ dev_err(smem->dev, "Out of memory\n");
+ return -ENOSPC;
+ }
+
+ hdr->canary = SMEM_PRIVATE_CANARY;
+ hdr->item = cpu_to_le16(item);
+ hdr->size = cpu_to_le32(ALIGN(size, 8));
+ hdr->padding_data = cpu_to_le16(le32_to_cpu(hdr->size) - size);
+ hdr->padding_hdr = 0;
+
+ /*
+ * Ensure the header is written before we advance the free offset, so
+ * that remote processors that does not take the remote spinlock still
+ * gets a consistent view of the linked list.
+ */
+ wmb();
+ le32_add_cpu(&phdr->offset_free_uncached, alloc_size);
+
+ return 0;
+bad_canary:
+ dev_err(smem->dev, "Found invalid canary in hosts %hu:%hu partition\n",
+ le16_to_cpu(phdr->host0), le16_to_cpu(phdr->host1));
+
+ return -EINVAL;
+}
+
+static int qcom_smem_alloc_global(struct qcom_smem *smem,
+ unsigned item,
+ size_t size)
+{
+ struct smem_global_entry *entry;
+ struct smem_header *header;
+
+ header = smem->regions[0].virt_base;
+ entry = &header->toc[item];
+ if (entry->allocated)
+ return -EEXIST;
+
+ size = ALIGN(size, 8);
+ if (WARN_ON(size > le32_to_cpu(header->available)))
+ return -ENOMEM;
+
+ entry->offset = header->free_offset;
+ entry->size = cpu_to_le32(size);
+
+ /*
+ * Ensure the header is consistent before we mark the item allocated,
+ * so that remote processors will get a consistent view of the item
+ * even though they do not take the spinlock on read.
+ */
+ wmb();
+ entry->allocated = cpu_to_le32(1);
+
+ le32_add_cpu(&header->free_offset, size);
+ le32_add_cpu(&header->available, -size);
+
+ return 0;
+}
+
+/**
+ * qcom_smem_alloc() - allocate space for a smem item
+ * @host: remote processor id, or -1
+ * @item: smem item handle
+ * @size: number of bytes to be allocated
+ *
+ * Allocate space for a given smem item of size @size, given that the item is
+ * not yet allocated.
+ */
+int qcom_smem_alloc(unsigned host, unsigned item, size_t size)
+{
+ struct smem_partition *part;
+ unsigned long flags;
+ int ret;
+
+ if (!__smem)
+ return -EPROBE_DEFER;
+
+ if (item < SMEM_ITEM_LAST_FIXED) {
+ dev_err(__smem->dev,
+ "Rejecting allocation of static entry %d\n", item);
+ return -EINVAL;
+ }
+
+ if (WARN_ON(item >= __smem->item_count))
+ return -EINVAL;
+
+ ret = hwspin_lock_timeout_irqsave(__smem->hwlock,
+ HWSPINLOCK_TIMEOUT,
+ &flags);
+ if (ret)
+ return ret;
+
+ if (host < SMEM_HOST_COUNT && __smem->partitions[host].virt_base) {
+ part = &__smem->partitions[host];
+ ret = qcom_smem_alloc_private(__smem, part, item, size);
+ } else if (__smem->global_partition.virt_base) {
+ part = &__smem->global_partition;
+ ret = qcom_smem_alloc_private(__smem, part, item, size);
+ } else {
+ ret = qcom_smem_alloc_global(__smem, item, size);
+ }
+
+ hwspin_unlock_irqrestore(__smem->hwlock, &flags);
+
+ return ret;
+}
+EXPORT_SYMBOL_GPL(qcom_smem_alloc);
+
+static void *qcom_smem_get_global(struct qcom_smem *smem,
+ unsigned item,
+ size_t *size)
+{
+ struct smem_header *header;
+ struct smem_region *region;
+ struct smem_global_entry *entry;
+ u64 entry_offset;
+ u32 e_size;
+ u32 aux_base;
+ unsigned i;
+
+ header = smem->regions[0].virt_base;
+ entry = &header->toc[item];
+ if (!entry->allocated)
+ return ERR_PTR(-ENXIO);
+
+ aux_base = le32_to_cpu(entry->aux_base) & AUX_BASE_MASK;
+
+ for (i = 0; i < smem->num_regions; i++) {
+ region = &smem->regions[i];
+
+ if ((u32)region->aux_base == aux_base || !aux_base) {
+ e_size = le32_to_cpu(entry->size);
+ entry_offset = le32_to_cpu(entry->offset);
+
+ if (WARN_ON(e_size + entry_offset > region->size))
+ return ERR_PTR(-EINVAL);
+
+ if (size != NULL)
+ *size = e_size;
+
+ return region->virt_base + entry_offset;
+ }
+ }
+
+ return ERR_PTR(-ENOENT);
+}
+
+static void *qcom_smem_get_private(struct qcom_smem *smem,
+ struct smem_partition *part,
+ unsigned item,
+ size_t *size)
+{
+ struct smem_private_entry *e, *end;
+ struct smem_partition_header *phdr;
+ void *item_ptr, *p_end;
+ u32 padding_data;
+ u32 e_size;
+
+ phdr = (struct smem_partition_header __force *)part->virt_base;
+ p_end = (void *)phdr + part->size;
+
+ e = phdr_to_first_uncached_entry(phdr);
+ end = phdr_to_last_uncached_entry(phdr);
+
+ while (e < end) {
+ if (e->canary != SMEM_PRIVATE_CANARY)
+ goto invalid_canary;
+
+ if (le16_to_cpu(e->item) == item) {
+ if (size != NULL) {
+ e_size = le32_to_cpu(e->size);
+ padding_data = le16_to_cpu(e->padding_data);
+
+ if (WARN_ON(e_size > part->size || padding_data > e_size))
+ return ERR_PTR(-EINVAL);
+
+ *size = e_size - padding_data;
+ }
+
+ item_ptr = uncached_entry_to_item(e);
+ if (WARN_ON(item_ptr > p_end))
+ return ERR_PTR(-EINVAL);
+
+ return item_ptr;
+ }
+
+ e = uncached_entry_next(e);
+ }
+
+ if (WARN_ON((void *)e > p_end))
+ return ERR_PTR(-EINVAL);
+
+ /* Item was not found in the uncached list, search the cached list */
+
+ e = phdr_to_first_cached_entry(phdr, part->cacheline);
+ end = phdr_to_last_cached_entry(phdr);
+
+ if (WARN_ON((void *)e < (void *)phdr || (void *)end > p_end))
+ return ERR_PTR(-EINVAL);
+
+ while (e > end) {
+ if (e->canary != SMEM_PRIVATE_CANARY)
+ goto invalid_canary;
+
+ if (le16_to_cpu(e->item) == item) {
+ if (size != NULL) {
+ e_size = le32_to_cpu(e->size);
+ padding_data = le16_to_cpu(e->padding_data);
+
+ if (WARN_ON(e_size > part->size || padding_data > e_size))
+ return ERR_PTR(-EINVAL);
+
+ *size = e_size - padding_data;
+ }
+
+ item_ptr = cached_entry_to_item(e);
+ if (WARN_ON(item_ptr < (void *)phdr))
+ return ERR_PTR(-EINVAL);
+
+ return item_ptr;
+ }
+
+ e = cached_entry_next(e, part->cacheline);
+ }
+
+ if (WARN_ON((void *)e < (void *)phdr))
+ return ERR_PTR(-EINVAL);
+
+ return ERR_PTR(-ENOENT);
+
+invalid_canary:
+ dev_err(smem->dev, "Found invalid canary in hosts %hu:%hu partition\n",
+ le16_to_cpu(phdr->host0), le16_to_cpu(phdr->host1));
+
+ return ERR_PTR(-EINVAL);
+}
+
+/**
+ * qcom_smem_get() - resolve ptr of size of a smem item
+ * @host: the remote processor, or -1
+ * @item: smem item handle
+ * @size: pointer to be filled out with size of the item
+ *
+ * Looks up smem item and returns pointer to it. Size of smem
+ * item is returned in @size.
+ */
+void *qcom_smem_get(unsigned host, unsigned item, size_t *size)
+{
+ struct smem_partition *part;
+ void *ptr = ERR_PTR(-EPROBE_DEFER);
+
+ if (!__smem)
+ return ptr;
+
+ if (WARN_ON(item >= __smem->item_count))
+ return ERR_PTR(-EINVAL);
+
+ if (host < SMEM_HOST_COUNT && __smem->partitions[host].virt_base) {
+ part = &__smem->partitions[host];
+ ptr = qcom_smem_get_private(__smem, part, item, size);
+ } else if (__smem->global_partition.virt_base) {
+ part = &__smem->global_partition;
+ ptr = qcom_smem_get_private(__smem, part, item, size);
+ } else {
+ ptr = qcom_smem_get_global(__smem, item, size);
+ }
+
+ return ptr;
+}
+EXPORT_SYMBOL_GPL(qcom_smem_get);
+
+/**
+ * qcom_smem_get_free_space() - retrieve amount of free space in a partition
+ * @host: the remote processor identifying a partition, or -1
+ *
+ * To be used by smem clients as a quick way to determine if any new
+ * allocations has been made.
+ */
+int qcom_smem_get_free_space(unsigned host)
+{
+ struct smem_partition *part;
+ struct smem_partition_header *phdr;
+ struct smem_header *header;
+ unsigned ret;
+
+ if (!__smem)
+ return -EPROBE_DEFER;
+
+ if (host < SMEM_HOST_COUNT && __smem->partitions[host].virt_base) {
+ part = &__smem->partitions[host];
+ phdr = part->virt_base;
+ ret = le32_to_cpu(phdr->offset_free_cached) -
+ le32_to_cpu(phdr->offset_free_uncached);
+
+ if (ret > le32_to_cpu(part->size))
+ return -EINVAL;
+ } else if (__smem->global_partition.virt_base) {
+ part = &__smem->global_partition;
+ phdr = part->virt_base;
+ ret = le32_to_cpu(phdr->offset_free_cached) -
+ le32_to_cpu(phdr->offset_free_uncached);
+
+ if (ret > le32_to_cpu(part->size))
+ return -EINVAL;
+ } else {
+ header = __smem->regions[0].virt_base;
+ ret = le32_to_cpu(header->available);
+
+ if (ret > __smem->regions[0].size)
+ return -EINVAL;
+ }
+
+ return ret;
+}
+EXPORT_SYMBOL_GPL(qcom_smem_get_free_space);
+
+static bool addr_in_range(void __iomem *base, size_t size, void *addr)
+{
+ return base && ((void __iomem *)addr >= base && (void __iomem *)addr < base + size);
+}
+
+/**
+ * qcom_smem_virt_to_phys() - return the physical address associated
+ * with an smem item pointer (previously returned by qcom_smem_get()
+ * @p: the virtual address to convert
+ *
+ * Returns 0 if the pointer provided is not within any smem region.
+ */
+phys_addr_t qcom_smem_virt_to_phys(void *p)
+{
+ struct smem_partition *part;
+ struct smem_region *area;
+ u64 offset;
+ u32 i;
+
+ for (i = 0; i < SMEM_HOST_COUNT; i++) {
+ part = &__smem->partitions[i];
+
+ if (addr_in_range(part->virt_base, part->size, p)) {
+ offset = p - part->virt_base;
+
+ return (phys_addr_t)part->phys_base + offset;
+ }
+ }
+
+ part = &__smem->global_partition;
+
+ if (addr_in_range(part->virt_base, part->size, p)) {
+ offset = p - part->virt_base;
+
+ return (phys_addr_t)part->phys_base + offset;
+ }
+
+ for (i = 0; i < __smem->num_regions; i++) {
+ area = &__smem->regions[i];
+
+ if (addr_in_range(area->virt_base, area->size, p)) {
+ offset = p - area->virt_base;
+
+ return (phys_addr_t)area->aux_base + offset;
+ }
+ }
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(qcom_smem_virt_to_phys);
+
+/**
+ * qcom_smem_get_soc_id() - return the SoC ID
+ * @id: On success, we return the SoC ID here.
+ *
+ * Look up SoC ID from HW/SW build ID and return it.
+ *
+ * Return: 0 on success, negative errno on failure.
+ */
+int qcom_smem_get_soc_id(u32 *id)
+{
+ struct socinfo *info;
+
+ info = qcom_smem_get(QCOM_SMEM_HOST_ANY, SMEM_HW_SW_BUILD_ID, NULL);
+ if (IS_ERR(info))
+ return PTR_ERR(info);
+
+ *id = __le32_to_cpu(info->id);
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(qcom_smem_get_soc_id);
+
+/**
+ * qcom_smem_get_feature_code() - return the feature code
+ * @code: On success, return the feature code here.
+ *
+ * Look up the feature code identifier from SMEM and return it.
+ *
+ * Return: 0 on success, negative errno on failure.
+ */
+int qcom_smem_get_feature_code(u32 *code)
+{
+ struct socinfo *info;
+ u32 raw_code;
+
+ info = qcom_smem_get(QCOM_SMEM_HOST_ANY, SMEM_HW_SW_BUILD_ID, NULL);
+ if (IS_ERR(info))
+ return PTR_ERR(info);
+
+ /* This only makes sense for socinfo >= 16 */
+ if (__le32_to_cpu(info->fmt) < SOCINFO_VERSION(0, 16))
+ return -EOPNOTSUPP;
+
+ raw_code = __le32_to_cpu(info->feature_code);
+
+ /* Ensure the value makes sense */
+ if (raw_code > SOCINFO_FC_INT_MAX)
+ raw_code = SOCINFO_FC_UNKNOWN;
+
+ *code = raw_code;
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(qcom_smem_get_feature_code);
+
+static int qcom_smem_get_sbl_version(struct qcom_smem *smem)
+{
+ struct smem_header *header;
+ __le32 *versions;
+
+ header = smem->regions[0].virt_base;
+ versions = header->version;
+
+ return le32_to_cpu(versions[SMEM_MASTER_SBL_VERSION_INDEX]);
+}
+
+static struct smem_ptable *qcom_smem_get_ptable(struct qcom_smem *smem)
+{
+ struct smem_ptable *ptable;
+ u32 version;
+
+ ptable = smem->ptable;
+ if (memcmp(ptable->magic, SMEM_PTABLE_MAGIC, sizeof(ptable->magic)))
+ return ERR_PTR(-ENOENT);
+
+ version = le32_to_cpu(ptable->version);
+ if (version != 1) {
+ dev_err(smem->dev,
+ "Unsupported partition header version %d\n", version);
+ return ERR_PTR(-EINVAL);
+ }
+ return ptable;
+}
+
+static u32 qcom_smem_get_item_count(struct qcom_smem *smem)
+{
+ struct smem_ptable *ptable;
+ struct smem_info *info;
+
+ ptable = qcom_smem_get_ptable(smem);
+ if (IS_ERR_OR_NULL(ptable))
+ return SMEM_ITEM_COUNT;
+
+ info = (struct smem_info *)&ptable->entry[ptable->num_entries];
+ if (memcmp(info->magic, SMEM_INFO_MAGIC, sizeof(info->magic)))
+ return SMEM_ITEM_COUNT;
+
+ return le16_to_cpu(info->num_items);
+}
+
+/*
+ * Validate the partition header for a partition whose partition
+ * table entry is supplied. Returns a pointer to its header if
+ * valid, or a null pointer otherwise.
+ */
+static struct smem_partition_header *
+qcom_smem_partition_header(struct qcom_smem *smem,
+ struct smem_ptable_entry *entry, u16 host0, u16 host1)
+{
+ struct smem_partition_header *header;
+ u32 phys_addr;
+ u32 size;
+
+ phys_addr = smem->regions[0].aux_base + le32_to_cpu(entry->offset);
+ header = devm_ioremap_wc(smem->dev, phys_addr, le32_to_cpu(entry->size));
+
+ if (!header)
+ return NULL;
+
+ if (memcmp(header->magic, SMEM_PART_MAGIC, sizeof(header->magic))) {
+ dev_err(smem->dev, "bad partition magic %4ph\n", header->magic);
+ return NULL;
+ }
+
+ if (host0 != le16_to_cpu(header->host0)) {
+ dev_err(smem->dev, "bad host0 (%hu != %hu)\n",
+ host0, le16_to_cpu(header->host0));
+ return NULL;
+ }
+ if (host1 != le16_to_cpu(header->host1)) {
+ dev_err(smem->dev, "bad host1 (%hu != %hu)\n",
+ host1, le16_to_cpu(header->host1));
+ return NULL;
+ }
+
+ size = le32_to_cpu(header->size);
+ if (size != le32_to_cpu(entry->size)) {
+ dev_err(smem->dev, "bad partition size (%u != %u)\n",
+ size, le32_to_cpu(entry->size));
+ return NULL;
+ }
+
+ if (le32_to_cpu(header->offset_free_uncached) > size) {
+ dev_err(smem->dev, "bad partition free uncached (%u > %u)\n",
+ le32_to_cpu(header->offset_free_uncached), size);
+ return NULL;
+ }
+
+ return header;
+}
+
+static int qcom_smem_set_global_partition(struct qcom_smem *smem)
+{
+ struct smem_partition_header *header;
+ struct smem_ptable_entry *entry;
+ struct smem_ptable *ptable;
+ bool found = false;
+ int i;
+
+ if (smem->global_partition.virt_base) {
+ dev_err(smem->dev, "Already found the global partition\n");
+ return -EINVAL;
+ }
+
+ ptable = qcom_smem_get_ptable(smem);
+ if (IS_ERR(ptable))
+ return PTR_ERR(ptable);
+
+ for (i = 0; i < le32_to_cpu(ptable->num_entries); i++) {
+ entry = &ptable->entry[i];
+ if (!le32_to_cpu(entry->offset))
+ continue;
+ if (!le32_to_cpu(entry->size))
+ continue;
+
+ if (le16_to_cpu(entry->host0) != SMEM_GLOBAL_HOST)
+ continue;
+
+ if (le16_to_cpu(entry->host1) == SMEM_GLOBAL_HOST) {
+ found = true;
+ break;
+ }
+ }
+
+ if (!found) {
+ dev_err(smem->dev, "Missing entry for global partition\n");
+ return -EINVAL;
+ }
+
+ header = qcom_smem_partition_header(smem, entry,
+ SMEM_GLOBAL_HOST, SMEM_GLOBAL_HOST);
+ if (!header)
+ return -EINVAL;
+
+ smem->global_partition.virt_base = (void __iomem *)header;
+ smem->global_partition.phys_base = smem->regions[0].aux_base +
+ le32_to_cpu(entry->offset);
+ smem->global_partition.size = le32_to_cpu(entry->size);
+ smem->global_partition.cacheline = le32_to_cpu(entry->cacheline);
+
+ return 0;
+}
+
+static int
+qcom_smem_enumerate_partitions(struct qcom_smem *smem, u16 local_host)
+{
+ struct smem_partition_header *header;
+ struct smem_ptable_entry *entry;
+ struct smem_ptable *ptable;
+ u16 remote_host;
+ u16 host0, host1;
+ int i;
+
+ ptable = qcom_smem_get_ptable(smem);
+ if (IS_ERR(ptable))
+ return PTR_ERR(ptable);
+
+ for (i = 0; i < le32_to_cpu(ptable->num_entries); i++) {
+ entry = &ptable->entry[i];
+ if (!le32_to_cpu(entry->offset))
+ continue;
+ if (!le32_to_cpu(entry->size))
+ continue;
+
+ host0 = le16_to_cpu(entry->host0);
+ host1 = le16_to_cpu(entry->host1);
+ if (host0 == local_host)
+ remote_host = host1;
+ else if (host1 == local_host)
+ remote_host = host0;
+ else
+ continue;
+
+ if (remote_host >= SMEM_HOST_COUNT) {
+ dev_err(smem->dev, "bad host %u\n", remote_host);
+ return -EINVAL;
+ }
+
+ if (smem->partitions[remote_host].virt_base) {
+ dev_err(smem->dev, "duplicate host %u\n", remote_host);
+ return -EINVAL;
+ }
+
+ header = qcom_smem_partition_header(smem, entry, host0, host1);
+ if (!header)
+ return -EINVAL;
+
+ smem->partitions[remote_host].virt_base = (void __iomem *)header;
+ smem->partitions[remote_host].phys_base = smem->regions[0].aux_base +
+ le32_to_cpu(entry->offset);
+ smem->partitions[remote_host].size = le32_to_cpu(entry->size);
+ smem->partitions[remote_host].cacheline = le32_to_cpu(entry->cacheline);
+ }
+
+ return 0;
+}
+
+static int qcom_smem_map_toc(struct qcom_smem *smem, struct smem_region *region)
+{
+ u32 ptable_start;
+
+ /* map starting 4K for smem header */
+ region->virt_base = devm_ioremap_wc(smem->dev, region->aux_base, SZ_4K);
+ ptable_start = region->aux_base + region->size - SZ_4K;
+ /* map last 4k for toc */
+ smem->ptable = devm_ioremap_wc(smem->dev, ptable_start, SZ_4K);
+
+ if (!region->virt_base || !smem->ptable)
+ return -ENOMEM;
+
+ return 0;
+}
+
+static int qcom_smem_map_global(struct qcom_smem *smem, u32 size)
+{
+ u32 phys_addr;
+
+ phys_addr = smem->regions[0].aux_base;
+
+ smem->regions[0].size = size;
+ smem->regions[0].virt_base = devm_ioremap_wc(smem->dev, phys_addr, size);
+
+ if (!smem->regions[0].virt_base)
+ return -ENOMEM;
+
+ return 0;
+}
+
+static int qcom_smem_resolve_mem(struct qcom_smem *smem, const char *name,
+ struct smem_region *region)
+{
+ struct device *dev = smem->dev;
+ struct device_node *np;
+ struct resource r;
+ int ret;
+
+ np = of_parse_phandle(dev->of_node, name, 0);
+ if (!np) {
+ dev_err(dev, "No %s specified\n", name);
+ return -EINVAL;
+ }
+
+ ret = of_address_to_resource(np, 0, &r);
+ of_node_put(np);
+ if (ret)
+ return ret;
+
+ region->aux_base = r.start;
+ region->size = resource_size(&r);
+
+ return 0;
+}
+
+static int qcom_smem_probe(struct platform_device *pdev)
+{
+ struct smem_header *header;
+ struct reserved_mem *rmem;
+ struct qcom_smem *smem;
+ unsigned long flags;
+ int num_regions;
+ int hwlock_id;
+ u32 version;
+ u32 size;
+ int ret;
+ int i;
+
+ if (__smem)
+ return 0;
+
+ num_regions = 1;
+ if (of_property_present(pdev->dev.of_node, "qcom,rpm-msg-ram"))
+ num_regions++;
+
+ smem = devm_kzalloc(&pdev->dev, struct_size(smem, regions, num_regions),
+ GFP_KERNEL);
+ if (!smem)
+ return -ENOMEM;
+
+ smem->dev = &pdev->dev;
+ smem->num_regions = num_regions;
+
+ rmem = of_reserved_mem_lookup(pdev->dev.of_node);
+ if (rmem) {
+ smem->regions[0].aux_base = rmem->base;
+ smem->regions[0].size = rmem->size;
+ } else {
+ /*
+ * Fall back to the memory-region reference, if we're not a
+ * reserved-memory node.
+ */
+ ret = qcom_smem_resolve_mem(smem, "memory-region", &smem->regions[0]);
+ if (ret)
+ return ret;
+ }
+
+ if (num_regions > 1) {
+ ret = qcom_smem_resolve_mem(smem, "qcom,rpm-msg-ram", &smem->regions[1]);
+ if (ret)
+ return ret;
+ }
+
+
+ ret = qcom_smem_map_toc(smem, &smem->regions[0]);
+ if (ret)
+ return ret;
+
+ for (i = 1; i < num_regions; i++) {
+ smem->regions[i].virt_base = devm_ioremap_wc(&pdev->dev,
+ smem->regions[i].aux_base,
+ smem->regions[i].size);
+ if (!smem->regions[i].virt_base) {
+ dev_err(&pdev->dev, "failed to remap %pa\n", &smem->regions[i].aux_base);
+ return -ENOMEM;
+ }
+ }
+
+ header = smem->regions[0].virt_base;
+ if (le32_to_cpu(header->initialized) != 1 ||
+ le32_to_cpu(header->reserved)) {
+ dev_err(&pdev->dev, "SMEM is not initialized by SBL\n");
+ return -EINVAL;
+ }
+
+ hwlock_id = of_hwspin_lock_get_id(pdev->dev.of_node, 0);
+ if (hwlock_id < 0) {
+ if (hwlock_id != -EPROBE_DEFER)
+ dev_err(&pdev->dev, "failed to retrieve hwlock\n");
+ return hwlock_id;
+ }
+
+ smem->hwlock = hwspin_lock_request_specific(hwlock_id);
+ if (!smem->hwlock)
+ return -ENXIO;
+
+ ret = hwspin_lock_timeout_irqsave(smem->hwlock, HWSPINLOCK_TIMEOUT, &flags);
+ if (ret)
+ return ret;
+ size = readl_relaxed(&header->available) + readl_relaxed(&header->free_offset);
+ hwspin_unlock_irqrestore(smem->hwlock, &flags);
+
+ version = qcom_smem_get_sbl_version(smem);
+ /*
+ * smem header mapping is required only in heap version scheme, so unmap
+ * it here. It will be remapped in qcom_smem_map_global() when whole
+ * partition is mapped again.
+ */
+ devm_iounmap(smem->dev, smem->regions[0].virt_base);
+ switch (version >> 16) {
+ case SMEM_GLOBAL_PART_VERSION:
+ ret = qcom_smem_set_global_partition(smem);
+ if (ret < 0)
+ return ret;
+ smem->item_count = qcom_smem_get_item_count(smem);
+ break;
+ case SMEM_GLOBAL_HEAP_VERSION:
+ qcom_smem_map_global(smem, size);
+ smem->item_count = SMEM_ITEM_COUNT;
+ break;
+ default:
+ dev_err(&pdev->dev, "Unsupported SMEM version 0x%x\n", version);
+ return -EINVAL;
+ }
+
+ BUILD_BUG_ON(SMEM_HOST_APPS >= SMEM_HOST_COUNT);
+ ret = qcom_smem_enumerate_partitions(smem, SMEM_HOST_APPS);
+ if (ret < 0 && ret != -ENOENT)
+ return ret;
+
+ __smem = smem;
+
+ smem->socinfo = platform_device_register_data(&pdev->dev, "qcom-socinfo",
+ PLATFORM_DEVID_NONE, NULL,
+ 0);
+ if (IS_ERR(smem->socinfo))
+ dev_dbg(&pdev->dev, "failed to register socinfo device\n");
+
+ return 0;
+}
+
+static void qcom_smem_remove(struct platform_device *pdev)
+{
+ platform_device_unregister(__smem->socinfo);
+
+ hwspin_lock_free(__smem->hwlock);
+ __smem = NULL;
+}
+
+static const struct of_device_id qcom_smem_of_match[] = {
+ { .compatible = "qcom,smem" },
+ {}
+};
+MODULE_DEVICE_TABLE(of, qcom_smem_of_match);
+
+static struct platform_driver qcom_smem_driver = {
+ .probe = qcom_smem_probe,
+ .remove_new = qcom_smem_remove,
+ .driver = {
+ .name = "qcom-smem",
+ .of_match_table = qcom_smem_of_match,
+ .suppress_bind_attrs = true,
+ },
+};
+
+static int __init qcom_smem_init(void)
+{
+ return platform_driver_register(&qcom_smem_driver);
+}
+arch_initcall(qcom_smem_init);
+
+static void __exit qcom_smem_exit(void)
+{
+ platform_driver_unregister(&qcom_smem_driver);
+}
+module_exit(qcom_smem_exit)
+
+MODULE_AUTHOR("Bjorn Andersson <bjorn.andersson@sonymobile.com>");
+MODULE_DESCRIPTION("Qualcomm Shared Memory Manager");
+MODULE_LICENSE("GPL v2");
diff --git a/include/soc/qcom/smem.h b/include/soc/qcom/smem.h
new file mode 100644
index 000000000000..f946e3beca21
--- /dev/null
+++ b/include/soc/qcom/smem.h
@@ -0,0 +1,20 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef __QCOM_SMEM_H__
+#define __QCOM_SMEM_H__
+
+#define QCOM_SMEM_HOST_ANY -1
+
+bool qcom_smem_is_available(void);
+int qcom_smem_alloc(unsigned host, unsigned item, size_t size);
+void *qcom_smem_get(unsigned host, unsigned item, size_t *size);
+
+int qcom_smem_get_free_space(unsigned host);
+
+phys_addr_t qcom_smem_virt_to_phys(void *p);
+
+int qcom_smem_get_soc_id(u32 *id);
+int qcom_smem_get_feature_code(u32 *code);
+
+int qcom_smem_bust_hwspin_lock_by_host(unsigned int host);
+
+#endif
diff --git a/include/soc/qcom/socinfo.h b/include/soc/qcom/socinfo.h
new file mode 100644
index 000000000000..608950443eee
--- /dev/null
+++ b/include/soc/qcom/socinfo.h
@@ -0,0 +1,111 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
+#ifndef __QCOM_SOCINFO_H__
+#define __QCOM_SOCINFO_H__
+
+#include <linux/types.h>
+
+/*
+ * SMEM item id, used to acquire handles to respective
+ * SMEM region.
+ */
+#define SMEM_HW_SW_BUILD_ID 137
+
+#define SMEM_SOCINFO_BUILD_ID_LENGTH 32
+#define SMEM_SOCINFO_CHIP_ID_LENGTH 32
+
+/*
+ * SoC version type with major number in the upper 16 bits and minor
+ * number in the lower 16 bits.
+ */
+#define SOCINFO_MAJOR(ver) (((ver) >> 16) & 0xffff)
+#define SOCINFO_MINOR(ver) ((ver) & 0xffff)
+#define SOCINFO_VERSION(maj, min) ((((maj) & 0xffff) << 16)|((min) & 0xffff))
+
+/* Socinfo SMEM item structure */
+struct socinfo {
+ __le32 fmt;
+ __le32 id;
+ __le32 ver;
+ char build_id[SMEM_SOCINFO_BUILD_ID_LENGTH];
+ /* Version 2 */
+ __le32 raw_id;
+ __le32 raw_ver;
+ /* Version 3 */
+ __le32 hw_plat;
+ /* Version 4 */
+ __le32 plat_ver;
+ /* Version 5 */
+ __le32 accessory_chip;
+ /* Version 6 */
+ __le32 hw_plat_subtype;
+ /* Version 7 */
+ __le32 pmic_model;
+ __le32 pmic_die_rev;
+ /* Version 8 */
+ __le32 pmic_model_1;
+ __le32 pmic_die_rev_1;
+ __le32 pmic_model_2;
+ __le32 pmic_die_rev_2;
+ /* Version 9 */
+ __le32 foundry_id;
+ /* Version 10 */
+ __le32 serial_num;
+ /* Version 11 */
+ __le32 num_pmics;
+ __le32 pmic_array_offset;
+ /* Version 12 */
+ __le32 chip_family;
+ __le32 raw_device_family;
+ __le32 raw_device_num;
+ /* Version 13 */
+ __le32 nproduct_id;
+ char chip_id[SMEM_SOCINFO_CHIP_ID_LENGTH];
+ /* Version 14 */
+ __le32 num_clusters;
+ __le32 ncluster_array_offset;
+ __le32 num_subset_parts;
+ __le32 nsubset_parts_array_offset;
+ /* Version 15 */
+ __le32 nmodem_supported;
+ /* Version 16 */
+ __le32 feature_code;
+ __le32 pcode;
+ __le32 npartnamemap_offset;
+ __le32 nnum_partname_mapping;
+ /* Version 17 */
+ __le32 oem_variant;
+ /* Version 18 */
+ __le32 num_kvps;
+ __le32 kvps_offset;
+ /* Version 19 */
+ __le32 num_func_clusters;
+ __le32 boot_cluster;
+ __le32 boot_core;
+};
+
+/* Internal feature codes */
+enum qcom_socinfo_feature_code {
+ /* External feature codes */
+ SOCINFO_FC_UNKNOWN = 0x0,
+ SOCINFO_FC_AA,
+ SOCINFO_FC_AB,
+ SOCINFO_FC_AC,
+ SOCINFO_FC_AD,
+ SOCINFO_FC_AE,
+ SOCINFO_FC_AF,
+ SOCINFO_FC_AG,
+ SOCINFO_FC_AH,
+};
+
+/* Internal feature codes */
+/* Valid values: 0 <= n <= 0xf */
+#define SOCINFO_FC_Yn(n) (0xf1 + (n))
+#define SOCINFO_FC_INT_MAX SOCINFO_FC_Yn(0xf)
+
+/* Product codes */
+#define SOCINFO_PC_UNKNOWN 0
+#define SOCINFO_PCn(n) ((n) + 1)
+#define SOCINFO_PC_RESERVE (BIT(31) - 1)
+
+#endif
--
2.47.0
^ permalink raw reply related [flat|nested] 35+ messages in thread* Re: [PATCH 05/15] soc: qcom: import smem from Linux 6.11-rc2
2024-11-24 19:17 ` [PATCH 05/15] soc: qcom: import smem from Linux 6.11-rc2 Caleb Connolly
@ 2025-01-07 15:30 ` Simon Glass
2025-01-08 14:45 ` Caleb Connolly
0 siblings, 1 reply; 35+ messages in thread
From: Simon Glass @ 2025-01-07 15:30 UTC (permalink / raw)
To: Caleb Connolly
Cc: Rayagonda Kokatanur, Tom Rini, Neil Armstrong, Sumit Garg,
Mario Six, u-boot, u-boot-qcom
On Sun, 24 Nov 2024 at 12:17, Caleb Connolly <caleb.connolly@linaro.org> wrote:
>
> Import the SMEM driver from Linux.
Which version / commit hash?
>
> Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
> ---
> drivers/soc/qcom/smem.c | 1279 ++++++++++++++++++++++++++++++++++++++++++++
> include/soc/qcom/smem.h | 20 +
> include/soc/qcom/socinfo.h | 111 ++++
> 3 files changed, 1410 insertions(+)
Reviewed-by: Simon Glass <sjg@chromium.org>
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PATCH 05/15] soc: qcom: import smem from Linux 6.11-rc2
2025-01-07 15:30 ` Simon Glass
@ 2025-01-08 14:45 ` Caleb Connolly
0 siblings, 0 replies; 35+ messages in thread
From: Caleb Connolly @ 2025-01-08 14:45 UTC (permalink / raw)
To: Simon Glass
Cc: Rayagonda Kokatanur, Tom Rini, Neil Armstrong, Sumit Garg,
Mario Six, u-boot, u-boot-qcom
On 07/01/2025 16:30, Simon Glass wrote:
> On Sun, 24 Nov 2024 at 12:17, Caleb Connolly <caleb.connolly@linaro.org> wrote:
>>
>> Import the SMEM driver from Linux.
>
> Which version / commit hash?
It's mentioned in the subject line, I took it from the tag.
>
>>
>> Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
>> ---
>> drivers/soc/qcom/smem.c | 1279 ++++++++++++++++++++++++++++++++++++++++++++
>> include/soc/qcom/smem.h | 20 +
>> include/soc/qcom/socinfo.h | 111 ++++
>> 3 files changed, 1410 insertions(+)
>
> Reviewed-by: Simon Glass <sjg@chromium.org>
--
// Caleb (they/them)
^ permalink raw reply [flat|nested] 35+ messages in thread
* [PATCH 06/15] soc: qcom: smem: adjust headers for U-Boot
2024-11-24 19:17 [PATCH 00/15] qcom: smem: modernize SMEM in U-Boot Caleb Connolly
` (4 preceding siblings ...)
2024-11-24 19:17 ` [PATCH 05/15] soc: qcom: import smem from Linux 6.11-rc2 Caleb Connolly
@ 2024-11-24 19:17 ` Caleb Connolly
2025-01-07 15:30 ` Simon Glass
2024-11-24 19:17 ` [PATCH 07/15] soc: qcom: smem: adjust " Caleb Connolly
` (8 subsequent siblings)
14 siblings, 1 reply; 35+ messages in thread
From: Caleb Connolly @ 2024-11-24 19:17 UTC (permalink / raw)
To: Rayagonda Kokatanur, Tom Rini, Simon Glass, Caleb Connolly,
Neil Armstrong, Sumit Garg, Mario Six
Cc: u-boot, u-boot-qcom
Drop Linux headers for the U-Boot ones.
Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
---
drivers/soc/qcom/smem.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/drivers/soc/qcom/smem.c b/drivers/soc/qcom/smem.c
index 8515b8ae7777..7143856e85c3 100644
--- a/drivers/soc/qcom/smem.c
+++ b/drivers/soc/qcom/smem.c
@@ -3,19 +3,17 @@
* Copyright (c) 2015, Sony Mobile Communications AB.
* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
*/
-#include <linux/hwspinlock.h>
+#include <dm/device.h>
+#include <dm/device_compat.h>
+#include <dm/ofnode.h>
+#include <linux/bug.h>
#include <linux/io.h>
-#include <linux/module.h>
-#include <linux/of.h>
-#include <linux/of_address.h>
-#include <linux/of_reserved_mem.h>
-#include <linux/platform_device.h>
+#include <linux/ioport.h>
#include <linux/sizes.h>
-#include <linux/slab.h>
-#include <linux/soc/qcom/smem.h>
-#include <linux/soc/qcom/socinfo.h>
+#include <soc/qcom/smem.h>
+#include <soc/qcom/socinfo.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
--
2.47.0
^ permalink raw reply related [flat|nested] 35+ messages in thread* Re: [PATCH 06/15] soc: qcom: smem: adjust headers for U-Boot
2024-11-24 19:17 ` [PATCH 06/15] soc: qcom: smem: adjust headers for U-Boot Caleb Connolly
@ 2025-01-07 15:30 ` Simon Glass
0 siblings, 0 replies; 35+ messages in thread
From: Simon Glass @ 2025-01-07 15:30 UTC (permalink / raw)
To: Caleb Connolly
Cc: Rayagonda Kokatanur, Tom Rini, Neil Armstrong, Sumit Garg,
Mario Six, u-boot, u-boot-qcom
On Sun, 24 Nov 2024 at 12:17, Caleb Connolly <caleb.connolly@linaro.org> wrote:
>
> Drop Linux headers for the U-Boot ones.
>
> Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
> ---
> drivers/soc/qcom/smem.c | 16 +++++++---------
> 1 file changed, 7 insertions(+), 9 deletions(-)
>
Reviewed-by: Simon Glass <sjg@chromium.org>
^ permalink raw reply [flat|nested] 35+ messages in thread
* [PATCH 07/15] soc: qcom: smem: adjust for U-Boot
2024-11-24 19:17 [PATCH 00/15] qcom: smem: modernize SMEM in U-Boot Caleb Connolly
` (5 preceding siblings ...)
2024-11-24 19:17 ` [PATCH 06/15] soc: qcom: smem: adjust headers for U-Boot Caleb Connolly
@ 2024-11-24 19:17 ` Caleb Connolly
2025-01-07 15:30 ` Simon Glass
2024-11-24 19:17 ` [PATCH 08/15] soc: qcom: smem: get serial number from socinfo Caleb Connolly
` (7 subsequent siblings)
14 siblings, 1 reply; 35+ messages in thread
From: Caleb Connolly @ 2024-11-24 19:17 UTC (permalink / raw)
To: Rayagonda Kokatanur, Tom Rini, Simon Glass, Caleb Connolly,
Neil Armstrong, Sumit Garg, Mario Six
Cc: u-boot, u-boot-qcom
Port over the smem code to U-Boot and remove socinfo.
Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
---
drivers/soc/qcom/smem.c | 320 +++++++++---------------------------------------
include/soc/qcom/smem.h | 9 +-
2 files changed, 63 insertions(+), 266 deletions(-)
diff --git a/drivers/soc/qcom/smem.c b/drivers/soc/qcom/smem.c
index 7143856e85c3..5166f289dfb6 100644
--- a/drivers/soc/qcom/smem.c
+++ b/drivers/soc/qcom/smem.c
@@ -3,17 +3,18 @@
* Copyright (c) 2015, Sony Mobile Communications AB.
* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
*/
+#define pr_fmt(fmt) "smem: " fmt
+
#include <dm/device.h>
#include <dm/device_compat.h>
#include <dm/ofnode.h>
#include <linux/bug.h>
#include <linux/io.h>
#include <linux/ioport.h>
#include <linux/sizes.h>
#include <soc/qcom/smem.h>
-#include <soc/qcom/socinfo.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
@@ -260,31 +261,23 @@ struct smem_region {
};
/**
* struct qcom_smem - device data for the smem device
- * @dev: device pointer
- * @hwlock: reference to a hwspinlock
* @ptable: virtual base of partition table
* @global_partition: describes for global partition when in use
* @partitions: list of partitions of current processor/host
* @item_count: max accepted item number
- * @socinfo: platform device pointer
* @num_regions: number of @regions
* @regions: list of the memory regions defining the shared memory
*/
struct qcom_smem {
- struct device *dev;
-
- struct hwspinlock *hwlock;
-
u32 item_count;
- struct platform_device *socinfo;
struct smem_ptable *ptable;
struct smem_partition global_partition;
struct smem_partition partitions[SMEM_HOST_COUNT];
unsigned num_regions;
- struct smem_region regions[] __counted_by(num_regions);
+ struct smem_region regions[];
};
static void *
phdr_to_last_uncached_entry(struct smem_partition_header *phdr)
@@ -351,38 +344,9 @@ static void *cached_entry_to_item(struct smem_private_entry *e)
return p - le32_to_cpu(e->size);
}
/* Pointer to the one and only smem handle */
-static struct qcom_smem *__smem;
-
-/* Timeout (ms) for the trylock of remote spinlocks */
-#define HWSPINLOCK_TIMEOUT 1000
-
-/* The qcom hwspinlock id is always plus one from the smem host id */
-#define SMEM_HOST_ID_TO_HWSPINLOCK_ID(__x) ((__x) + 1)
-
-/**
- * qcom_smem_bust_hwspin_lock_by_host() - bust the smem hwspinlock for a host
- * @host: remote processor id
- *
- * Busts the hwspin_lock for the given smem host id. This helper is intended
- * for remoteproc drivers that manage remoteprocs with an equivalent smem
- * driver instance in the remote firmware. Drivers can force a release of the
- * smem hwspin_lock if the rproc unexpectedly goes into a bad state.
- *
- * Context: Process context.
- *
- * Returns: 0 on success, otherwise negative errno.
- */
-int qcom_smem_bust_hwspin_lock_by_host(unsigned int host)
-{
- /* This function is for remote procs, so ignore SMEM_HOST_APPS */
- if (host == SMEM_HOST_APPS || host >= SMEM_HOST_COUNT)
- return -EINVAL;
-
- return hwspin_lock_bust(__smem->hwlock, SMEM_HOST_ID_TO_HWSPINLOCK_ID(host));
-}
-EXPORT_SYMBOL_GPL(qcom_smem_bust_hwspin_lock_by_host);
+static struct qcom_smem *__smem __section(".data") = NULL;
/**
* qcom_smem_is_available() - Check if SMEM is available
*
@@ -429,9 +393,9 @@ static int qcom_smem_alloc_private(struct qcom_smem *smem,
/* Check that we don't grow into the cached region */
alloc_size = sizeof(*hdr) + ALIGN(size, 8);
if ((void *)hdr + alloc_size > cached) {
- dev_err(smem->dev, "Out of memory\n");
+ log_err("Out of memory\n");
return -ENOSPC;
}
hdr->canary = SMEM_PRIVATE_CANARY;
@@ -449,9 +413,9 @@ static int qcom_smem_alloc_private(struct qcom_smem *smem,
le32_add_cpu(&phdr->offset_free_uncached, alloc_size);
return 0;
bad_canary:
- dev_err(smem->dev, "Found invalid canary in hosts %hu:%hu partition\n",
+ log_err("Found invalid canary in hosts %hu:%hu partition\n",
le16_to_cpu(phdr->host0), le16_to_cpu(phdr->host1));
return -EINVAL;
}
@@ -500,29 +464,21 @@ static int qcom_smem_alloc_global(struct qcom_smem *smem,
*/
int qcom_smem_alloc(unsigned host, unsigned item, size_t size)
{
struct smem_partition *part;
- unsigned long flags;
int ret;
if (!__smem)
return -EPROBE_DEFER;
if (item < SMEM_ITEM_LAST_FIXED) {
- dev_err(__smem->dev,
- "Rejecting allocation of static entry %d\n", item);
+ log_err("Rejecting allocation of static entry %d\n", item);
return -EINVAL;
}
if (WARN_ON(item >= __smem->item_count))
return -EINVAL;
- ret = hwspin_lock_timeout_irqsave(__smem->hwlock,
- HWSPINLOCK_TIMEOUT,
- &flags);
- if (ret)
- return ret;
-
if (host < SMEM_HOST_COUNT && __smem->partitions[host].virt_base) {
part = &__smem->partitions[host];
ret = qcom_smem_alloc_private(__smem, part, item, size);
} else if (__smem->global_partition.virt_base) {
@@ -531,10 +487,8 @@ int qcom_smem_alloc(unsigned host, unsigned item, size_t size)
} else {
ret = qcom_smem_alloc_global(__smem, item, size);
}
- hwspin_unlock_irqrestore(__smem->hwlock, &flags);
-
return ret;
}
EXPORT_SYMBOL_GPL(qcom_smem_alloc);
@@ -660,9 +614,9 @@ static void *qcom_smem_get_private(struct qcom_smem *smem,
return ERR_PTR(-ENOENT);
invalid_canary:
- dev_err(smem->dev, "Found invalid canary in hosts %hu:%hu partition\n",
+ log_err("Found invalid canary in hosts %hu:%hu partition\n",
le16_to_cpu(phdr->host0), le16_to_cpu(phdr->host1));
return ERR_PTR(-EINVAL);
}
@@ -796,63 +750,8 @@ phys_addr_t qcom_smem_virt_to_phys(void *p)
return 0;
}
EXPORT_SYMBOL_GPL(qcom_smem_virt_to_phys);
-/**
- * qcom_smem_get_soc_id() - return the SoC ID
- * @id: On success, we return the SoC ID here.
- *
- * Look up SoC ID from HW/SW build ID and return it.
- *
- * Return: 0 on success, negative errno on failure.
- */
-int qcom_smem_get_soc_id(u32 *id)
-{
- struct socinfo *info;
-
- info = qcom_smem_get(QCOM_SMEM_HOST_ANY, SMEM_HW_SW_BUILD_ID, NULL);
- if (IS_ERR(info))
- return PTR_ERR(info);
-
- *id = __le32_to_cpu(info->id);
-
- return 0;
-}
-EXPORT_SYMBOL_GPL(qcom_smem_get_soc_id);
-
-/**
- * qcom_smem_get_feature_code() - return the feature code
- * @code: On success, return the feature code here.
- *
- * Look up the feature code identifier from SMEM and return it.
- *
- * Return: 0 on success, negative errno on failure.
- */
-int qcom_smem_get_feature_code(u32 *code)
-{
- struct socinfo *info;
- u32 raw_code;
-
- info = qcom_smem_get(QCOM_SMEM_HOST_ANY, SMEM_HW_SW_BUILD_ID, NULL);
- if (IS_ERR(info))
- return PTR_ERR(info);
-
- /* This only makes sense for socinfo >= 16 */
- if (__le32_to_cpu(info->fmt) < SOCINFO_VERSION(0, 16))
- return -EOPNOTSUPP;
-
- raw_code = __le32_to_cpu(info->feature_code);
-
- /* Ensure the value makes sense */
- if (raw_code > SOCINFO_FC_INT_MAX)
- raw_code = SOCINFO_FC_UNKNOWN;
-
- *code = raw_code;
-
- return 0;
-}
-EXPORT_SYMBOL_GPL(qcom_smem_get_feature_code);
-
static int qcom_smem_get_sbl_version(struct qcom_smem *smem)
{
struct smem_header *header;
__le32 *versions;
@@ -873,10 +772,9 @@ static struct smem_ptable *qcom_smem_get_ptable(struct qcom_smem *smem)
return ERR_PTR(-ENOENT);
version = le32_to_cpu(ptable->version);
if (version != 1) {
- dev_err(smem->dev,
- "Unsupported partition header version %d\n", version);
+ log_err("Unsupported partition header version %d\n", version);
return ERR_PTR(-EINVAL);
}
return ptable;
}
@@ -906,42 +804,42 @@ static struct smem_partition_header *
qcom_smem_partition_header(struct qcom_smem *smem,
struct smem_ptable_entry *entry, u16 host0, u16 host1)
{
struct smem_partition_header *header;
- u32 phys_addr;
+ u64 phys_addr;
u32 size;
phys_addr = smem->regions[0].aux_base + le32_to_cpu(entry->offset);
- header = devm_ioremap_wc(smem->dev, phys_addr, le32_to_cpu(entry->size));
+ header = (void *)phys_addr; // devm_ioremap_wc()
if (!header)
return NULL;
if (memcmp(header->magic, SMEM_PART_MAGIC, sizeof(header->magic))) {
- dev_err(smem->dev, "bad partition magic %4ph\n", header->magic);
+ log_err("bad partition magic %4ph\n", header->magic);
return NULL;
}
if (host0 != le16_to_cpu(header->host0)) {
- dev_err(smem->dev, "bad host0 (%hu != %hu)\n",
- host0, le16_to_cpu(header->host0));
+ log_err("bad host0 (%hu != %hu)\n",
+ host0, le16_to_cpu(header->host0));
return NULL;
}
if (host1 != le16_to_cpu(header->host1)) {
- dev_err(smem->dev, "bad host1 (%hu != %hu)\n",
- host1, le16_to_cpu(header->host1));
+ log_err("bad host1 (%hu != %hu)\n",
+ host1, le16_to_cpu(header->host1));
return NULL;
}
size = le32_to_cpu(header->size);
if (size != le32_to_cpu(entry->size)) {
- dev_err(smem->dev, "bad partition size (%u != %u)\n",
+ log_err("bad partition size (%u != %u)\n",
size, le32_to_cpu(entry->size));
return NULL;
}
if (le32_to_cpu(header->offset_free_uncached) > size) {
- dev_err(smem->dev, "bad partition free uncached (%u > %u)\n",
+ log_err("bad partition free uncached (%u > %u)\n",
le32_to_cpu(header->offset_free_uncached), size);
return NULL;
}
@@ -956,9 +854,9 @@ static int qcom_smem_set_global_partition(struct qcom_smem *smem)
bool found = false;
int i;
if (smem->global_partition.virt_base) {
- dev_err(smem->dev, "Already found the global partition\n");
+ log_err("Already found the global partition\n");
return -EINVAL;
}
ptable = qcom_smem_get_ptable(smem);
@@ -981,9 +879,9 @@ static int qcom_smem_set_global_partition(struct qcom_smem *smem)
}
}
if (!found) {
- dev_err(smem->dev, "Missing entry for global partition\n");
+ log_err("Missing entry for global partition\n");
return -EINVAL;
}
header = qcom_smem_partition_header(smem, entry,
@@ -1030,14 +928,14 @@ qcom_smem_enumerate_partitions(struct qcom_smem *smem, u16 local_host)
else
continue;
if (remote_host >= SMEM_HOST_COUNT) {
- dev_err(smem->dev, "bad host %u\n", remote_host);
+ log_err("bad host %u\n", remote_host);
return -EINVAL;
}
if (smem->partitions[remote_host].virt_base) {
- dev_err(smem->dev, "duplicate host %u\n", remote_host);
+ log_err("duplicate host %u\n", remote_host);
return -EINVAL;
}
header = qcom_smem_partition_header(smem, entry, host0, host1);
@@ -1058,12 +956,12 @@ static int qcom_smem_map_toc(struct qcom_smem *smem, struct smem_region *region)
{
u32 ptable_start;
/* map starting 4K for smem header */
- region->virt_base = devm_ioremap_wc(smem->dev, region->aux_base, SZ_4K);
+ region->virt_base = (void *)region->aux_base;
ptable_start = region->aux_base + region->size - SZ_4K;
/* map last 4k for toc */
- smem->ptable = devm_ioremap_wc(smem->dev, ptable_start, SZ_4K);
+ smem->ptable = (struct smem_ptable *)(u64)ptable_start;
if (!region->virt_base || !smem->ptable)
return -ENOMEM;
@@ -1071,54 +969,29 @@ static int qcom_smem_map_toc(struct qcom_smem *smem, struct smem_region *region)
}
static int qcom_smem_map_global(struct qcom_smem *smem, u32 size)
{
- u32 phys_addr;
+ u64 phys_addr;
phys_addr = smem->regions[0].aux_base;
smem->regions[0].size = size;
- smem->regions[0].virt_base = devm_ioremap_wc(smem->dev, phys_addr, size);
+ smem->regions[0].virt_base = (void *)phys_addr;
if (!smem->regions[0].virt_base)
return -ENOMEM;
return 0;
}
-static int qcom_smem_resolve_mem(struct qcom_smem *smem, const char *name,
- struct smem_region *region)
-{
- struct device *dev = smem->dev;
- struct device_node *np;
- struct resource r;
- int ret;
-
- np = of_parse_phandle(dev->of_node, name, 0);
- if (!np) {
- dev_err(dev, "No %s specified\n", name);
- return -EINVAL;
- }
-
- ret = of_address_to_resource(np, 0, &r);
- of_node_put(np);
- if (ret)
- return ret;
-
- region->aux_base = r.start;
- region->size = resource_size(&r);
-
- return 0;
-}
-
-static int qcom_smem_probe(struct platform_device *pdev)
+int qcom_smem_init(void)
{
struct smem_header *header;
- struct reserved_mem *rmem;
struct qcom_smem *smem;
- unsigned long flags;
int num_regions;
- int hwlock_id;
+ fdt_size_t reg_size = 0;
+ u32 phandle;
+ ofnode node, mem_node;
u32 version;
u32 size;
int ret;
int i;
@@ -1126,85 +999,58 @@ static int qcom_smem_probe(struct platform_device *pdev)
if (__smem)
return 0;
num_regions = 1;
- if (of_property_present(pdev->dev.of_node, "qcom,rpm-msg-ram"))
- num_regions++;
- smem = devm_kzalloc(&pdev->dev, struct_size(smem, regions, num_regions),
+ node = ofnode_by_compatible(ofnode_root(), "qcom,smem");
+ if (!ofnode_valid(node))
+ return -ENODEV;
+
+ if (ofnode_has_property(node, "memory-region")) {
+ ofnode_read_u32(node, "memory-region", &phandle);
+ mem_node = ofnode_get_by_phandle(phandle);
+ } else {
+ mem_node = node;
+ }
+
+ smem = kzalloc(sizeof(struct smem_region) * num_regions +
+ sizeof(struct qcom_smem),
GFP_KERNEL);
- if (!smem)
+ if (!smem) {
+ log_err("Failed to allocate memory for smem\n");
return -ENOMEM;
+ }
- smem->dev = &pdev->dev;
smem->num_regions = num_regions;
- rmem = of_reserved_mem_lookup(pdev->dev.of_node);
- if (rmem) {
- smem->regions[0].aux_base = rmem->base;
- smem->regions[0].size = rmem->size;
- } else {
- /*
- * Fall back to the memory-region reference, if we're not a
- * reserved-memory node.
- */
- ret = qcom_smem_resolve_mem(smem, "memory-region", &smem->regions[0]);
- if (ret)
- return ret;
+ smem->regions[0].aux_base = ofnode_get_addr(mem_node);
+ reg_size = ofnode_get_size(mem_node);
+ if (smem->regions[0].aux_base == FDT_ADDR_T_NONE) {
+ log_err("Failed to get base address\n");
+ return -EINVAL;
}
-
- if (num_regions > 1) {
- ret = qcom_smem_resolve_mem(smem, "qcom,rpm-msg-ram", &smem->regions[1]);
- if (ret)
- return ret;
- }
-
+ smem->regions[0].size = reg_size;
ret = qcom_smem_map_toc(smem, &smem->regions[0]);
- if (ret)
+ if (ret) {
+ log_err("Failed to map toc\n");
return ret;
+ }
for (i = 1; i < num_regions; i++) {
- smem->regions[i].virt_base = devm_ioremap_wc(&pdev->dev,
- smem->regions[i].aux_base,
- smem->regions[i].size);
- if (!smem->regions[i].virt_base) {
- dev_err(&pdev->dev, "failed to remap %pa\n", &smem->regions[i].aux_base);
- return -ENOMEM;
- }
+ smem->regions[i].virt_base = (void *)smem->regions[i].aux_base;
}
header = smem->regions[0].virt_base;
if (le32_to_cpu(header->initialized) != 1 ||
le32_to_cpu(header->reserved)) {
- dev_err(&pdev->dev, "SMEM is not initialized by SBL\n");
+ log_err("SMEM is not initialized by SBL\n");
return -EINVAL;
}
- hwlock_id = of_hwspin_lock_get_id(pdev->dev.of_node, 0);
- if (hwlock_id < 0) {
- if (hwlock_id != -EPROBE_DEFER)
- dev_err(&pdev->dev, "failed to retrieve hwlock\n");
- return hwlock_id;
- }
-
- smem->hwlock = hwspin_lock_request_specific(hwlock_id);
- if (!smem->hwlock)
- return -ENXIO;
-
- ret = hwspin_lock_timeout_irqsave(smem->hwlock, HWSPINLOCK_TIMEOUT, &flags);
- if (ret)
- return ret;
size = readl_relaxed(&header->available) + readl_relaxed(&header->free_offset);
- hwspin_unlock_irqrestore(smem->hwlock, &flags);
version = qcom_smem_get_sbl_version(smem);
- /*
- * smem header mapping is required only in heap version scheme, so unmap
- * it here. It will be remapped in qcom_smem_map_global() when whole
- * partition is mapped again.
- */
- devm_iounmap(smem->dev, smem->regions[0].virt_base);
switch (version >> 16) {
case SMEM_GLOBAL_PART_VERSION:
ret = qcom_smem_set_global_partition(smem);
if (ret < 0)
@@ -1215,63 +1061,19 @@ static int qcom_smem_probe(struct platform_device *pdev)
qcom_smem_map_global(smem, size);
smem->item_count = SMEM_ITEM_COUNT;
break;
default:
- dev_err(&pdev->dev, "Unsupported SMEM version 0x%x\n", version);
+ log_err("Unsupported SMEM version 0x%x\n", version);
return -EINVAL;
}
BUILD_BUG_ON(SMEM_HOST_APPS >= SMEM_HOST_COUNT);
ret = qcom_smem_enumerate_partitions(smem, SMEM_HOST_APPS);
- if (ret < 0 && ret != -ENOENT)
+ if (ret < 0 && ret != -ENOENT) {
+ log_err("Failed to enumerate partitions\n");
return ret;
+ }
__smem = smem;
- smem->socinfo = platform_device_register_data(&pdev->dev, "qcom-socinfo",
- PLATFORM_DEVID_NONE, NULL,
- 0);
- if (IS_ERR(smem->socinfo))
- dev_dbg(&pdev->dev, "failed to register socinfo device\n");
-
return 0;
}
-
-static void qcom_smem_remove(struct platform_device *pdev)
-{
- platform_device_unregister(__smem->socinfo);
-
- hwspin_lock_free(__smem->hwlock);
- __smem = NULL;
-}
-
-static const struct of_device_id qcom_smem_of_match[] = {
- { .compatible = "qcom,smem" },
- {}
-};
-MODULE_DEVICE_TABLE(of, qcom_smem_of_match);
-
-static struct platform_driver qcom_smem_driver = {
- .probe = qcom_smem_probe,
- .remove_new = qcom_smem_remove,
- .driver = {
- .name = "qcom-smem",
- .of_match_table = qcom_smem_of_match,
- .suppress_bind_attrs = true,
- },
-};
-
-static int __init qcom_smem_init(void)
-{
- return platform_driver_register(&qcom_smem_driver);
-}
-arch_initcall(qcom_smem_init);
-
-static void __exit qcom_smem_exit(void)
-{
- platform_driver_unregister(&qcom_smem_driver);
-}
-module_exit(qcom_smem_exit)
-
-MODULE_AUTHOR("Bjorn Andersson <bjorn.andersson@sonymobile.com>");
-MODULE_DESCRIPTION("Qualcomm Shared Memory Manager");
-MODULE_LICENSE("GPL v2");
diff --git a/include/soc/qcom/smem.h b/include/soc/qcom/smem.h
index f946e3beca21..a955db08c0f0 100644
--- a/include/soc/qcom/smem.h
+++ b/include/soc/qcom/smem.h
@@ -3,18 +3,13 @@
#define __QCOM_SMEM_H__
#define QCOM_SMEM_HOST_ANY -1
+int qcom_smem_init(void);
+
bool qcom_smem_is_available(void);
int qcom_smem_alloc(unsigned host, unsigned item, size_t size);
void *qcom_smem_get(unsigned host, unsigned item, size_t *size);
int qcom_smem_get_free_space(unsigned host);
-phys_addr_t qcom_smem_virt_to_phys(void *p);
-
-int qcom_smem_get_soc_id(u32 *id);
-int qcom_smem_get_feature_code(u32 *code);
-
-int qcom_smem_bust_hwspin_lock_by_host(unsigned int host);
-
#endif
--
2.47.0
^ permalink raw reply related [flat|nested] 35+ messages in thread* Re: [PATCH 07/15] soc: qcom: smem: adjust for U-Boot
2024-11-24 19:17 ` [PATCH 07/15] soc: qcom: smem: adjust " Caleb Connolly
@ 2025-01-07 15:30 ` Simon Glass
0 siblings, 0 replies; 35+ messages in thread
From: Simon Glass @ 2025-01-07 15:30 UTC (permalink / raw)
To: Caleb Connolly
Cc: Rayagonda Kokatanur, Tom Rini, Neil Armstrong, Sumit Garg,
Mario Six, u-boot, u-boot-qcom
Hi Caleb,
On Sun, 24 Nov 2024 at 12:17, Caleb Connolly <caleb.connolly@linaro.org> wrote:
>
> Port over the smem code to U-Boot and remove socinfo.
>
> Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
> ---
> drivers/soc/qcom/smem.c | 320 +++++++++---------------------------------------
> include/soc/qcom/smem.h | 9 +-
> 2 files changed, 63 insertions(+), 266 deletions(-)
Reviewed-by: Simon Glass <sjg@chromium.org>
I'd really rather have static inlines for the semaphores and locks,
rather than changing the code. This is changing more a quarter of the
code in the C file. Can you take a look?
Also note that in U-Boot, header files need comments. Is that
permitted in Linux?
Regards,
Simon
>
> diff --git a/drivers/soc/qcom/smem.c b/drivers/soc/qcom/smem.c
> index 7143856e85c3..5166f289dfb6 100644
> --- a/drivers/soc/qcom/smem.c
> +++ b/drivers/soc/qcom/smem.c
> @@ -3,17 +3,18 @@
> * Copyright (c) 2015, Sony Mobile Communications AB.
> * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
> */
>
> +#define pr_fmt(fmt) "smem: " fmt
> +
> #include <dm/device.h>
> #include <dm/device_compat.h>
> #include <dm/ofnode.h>
> #include <linux/bug.h>
> #include <linux/io.h>
> #include <linux/ioport.h>
> #include <linux/sizes.h>
> #include <soc/qcom/smem.h>
> -#include <soc/qcom/socinfo.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
> @@ -260,31 +261,23 @@ struct smem_region {
> };
>
> /**
> * struct qcom_smem - device data for the smem device
> - * @dev: device pointer
> - * @hwlock: reference to a hwspinlock
> * @ptable: virtual base of partition table
> * @global_partition: describes for global partition when in use
> * @partitions: list of partitions of current processor/host
> * @item_count: max accepted item number
> - * @socinfo: platform device pointer
> * @num_regions: number of @regions
> * @regions: list of the memory regions defining the shared memory
> */
> struct qcom_smem {
> - struct device *dev;
> -
> - struct hwspinlock *hwlock;
> -
> u32 item_count;
> - struct platform_device *socinfo;
> struct smem_ptable *ptable;
> struct smem_partition global_partition;
> struct smem_partition partitions[SMEM_HOST_COUNT];
>
> unsigned num_regions;
> - struct smem_region regions[] __counted_by(num_regions);
> + struct smem_region regions[];
> };
>
> static void *
> phdr_to_last_uncached_entry(struct smem_partition_header *phdr)
> @@ -351,38 +344,9 @@ static void *cached_entry_to_item(struct smem_private_entry *e)
> return p - le32_to_cpu(e->size);
> }
>
> /* Pointer to the one and only smem handle */
> -static struct qcom_smem *__smem;
> -
> -/* Timeout (ms) for the trylock of remote spinlocks */
> -#define HWSPINLOCK_TIMEOUT 1000
> -
> -/* The qcom hwspinlock id is always plus one from the smem host id */
> -#define SMEM_HOST_ID_TO_HWSPINLOCK_ID(__x) ((__x) + 1)
> -
> -/**
> - * qcom_smem_bust_hwspin_lock_by_host() - bust the smem hwspinlock for a host
> - * @host: remote processor id
> - *
> - * Busts the hwspin_lock for the given smem host id. This helper is intended
> - * for remoteproc drivers that manage remoteprocs with an equivalent smem
> - * driver instance in the remote firmware. Drivers can force a release of the
> - * smem hwspin_lock if the rproc unexpectedly goes into a bad state.
> - *
> - * Context: Process context.
> - *
> - * Returns: 0 on success, otherwise negative errno.
> - */
> -int qcom_smem_bust_hwspin_lock_by_host(unsigned int host)
> -{
> - /* This function is for remote procs, so ignore SMEM_HOST_APPS */
> - if (host == SMEM_HOST_APPS || host >= SMEM_HOST_COUNT)
> - return -EINVAL;
> -
> - return hwspin_lock_bust(__smem->hwlock, SMEM_HOST_ID_TO_HWSPINLOCK_ID(host));
> -}
> -EXPORT_SYMBOL_GPL(qcom_smem_bust_hwspin_lock_by_host);
> +static struct qcom_smem *__smem __section(".data") = NULL;
>
> /**
> * qcom_smem_is_available() - Check if SMEM is available
> *
> @@ -429,9 +393,9 @@ static int qcom_smem_alloc_private(struct qcom_smem *smem,
>
> /* Check that we don't grow into the cached region */
> alloc_size = sizeof(*hdr) + ALIGN(size, 8);
> if ((void *)hdr + alloc_size > cached) {
> - dev_err(smem->dev, "Out of memory\n");
> + log_err("Out of memory\n");
> return -ENOSPC;
> }
>
> hdr->canary = SMEM_PRIVATE_CANARY;
> @@ -449,9 +413,9 @@ static int qcom_smem_alloc_private(struct qcom_smem *smem,
> le32_add_cpu(&phdr->offset_free_uncached, alloc_size);
>
> return 0;
> bad_canary:
> - dev_err(smem->dev, "Found invalid canary in hosts %hu:%hu partition\n",
> + log_err("Found invalid canary in hosts %hu:%hu partition\n",
> le16_to_cpu(phdr->host0), le16_to_cpu(phdr->host1));
>
> return -EINVAL;
> }
> @@ -500,29 +464,21 @@ static int qcom_smem_alloc_global(struct qcom_smem *smem,
> */
> int qcom_smem_alloc(unsigned host, unsigned item, size_t size)
> {
> struct smem_partition *part;
> - unsigned long flags;
> int ret;
>
> if (!__smem)
> return -EPROBE_DEFER;
>
> if (item < SMEM_ITEM_LAST_FIXED) {
> - dev_err(__smem->dev,
> - "Rejecting allocation of static entry %d\n", item);
> + log_err("Rejecting allocation of static entry %d\n", item);
> return -EINVAL;
> }
>
> if (WARN_ON(item >= __smem->item_count))
> return -EINVAL;
>
> - ret = hwspin_lock_timeout_irqsave(__smem->hwlock,
> - HWSPINLOCK_TIMEOUT,
> - &flags);
> - if (ret)
> - return ret;
> -
> if (host < SMEM_HOST_COUNT && __smem->partitions[host].virt_base) {
> part = &__smem->partitions[host];
> ret = qcom_smem_alloc_private(__smem, part, item, size);
> } else if (__smem->global_partition.virt_base) {
> @@ -531,10 +487,8 @@ int qcom_smem_alloc(unsigned host, unsigned item, size_t size)
> } else {
> ret = qcom_smem_alloc_global(__smem, item, size);
> }
>
> - hwspin_unlock_irqrestore(__smem->hwlock, &flags);
> -
> return ret;
> }
> EXPORT_SYMBOL_GPL(qcom_smem_alloc);
>
> @@ -660,9 +614,9 @@ static void *qcom_smem_get_private(struct qcom_smem *smem,
>
> return ERR_PTR(-ENOENT);
>
> invalid_canary:
> - dev_err(smem->dev, "Found invalid canary in hosts %hu:%hu partition\n",
> + log_err("Found invalid canary in hosts %hu:%hu partition\n",
> le16_to_cpu(phdr->host0), le16_to_cpu(phdr->host1));
>
> return ERR_PTR(-EINVAL);
> }
> @@ -796,63 +750,8 @@ phys_addr_t qcom_smem_virt_to_phys(void *p)
> return 0;
> }
> EXPORT_SYMBOL_GPL(qcom_smem_virt_to_phys);
>
> -/**
> - * qcom_smem_get_soc_id() - return the SoC ID
> - * @id: On success, we return the SoC ID here.
> - *
> - * Look up SoC ID from HW/SW build ID and return it.
> - *
> - * Return: 0 on success, negative errno on failure.
> - */
> -int qcom_smem_get_soc_id(u32 *id)
> -{
> - struct socinfo *info;
> -
> - info = qcom_smem_get(QCOM_SMEM_HOST_ANY, SMEM_HW_SW_BUILD_ID, NULL);
> - if (IS_ERR(info))
> - return PTR_ERR(info);
> -
> - *id = __le32_to_cpu(info->id);
> -
> - return 0;
> -}
> -EXPORT_SYMBOL_GPL(qcom_smem_get_soc_id);
> -
> -/**
> - * qcom_smem_get_feature_code() - return the feature code
> - * @code: On success, return the feature code here.
> - *
> - * Look up the feature code identifier from SMEM and return it.
> - *
> - * Return: 0 on success, negative errno on failure.
> - */
> -int qcom_smem_get_feature_code(u32 *code)
> -{
> - struct socinfo *info;
> - u32 raw_code;
> -
> - info = qcom_smem_get(QCOM_SMEM_HOST_ANY, SMEM_HW_SW_BUILD_ID, NULL);
> - if (IS_ERR(info))
> - return PTR_ERR(info);
> -
> - /* This only makes sense for socinfo >= 16 */
> - if (__le32_to_cpu(info->fmt) < SOCINFO_VERSION(0, 16))
> - return -EOPNOTSUPP;
> -
> - raw_code = __le32_to_cpu(info->feature_code);
> -
> - /* Ensure the value makes sense */
> - if (raw_code > SOCINFO_FC_INT_MAX)
> - raw_code = SOCINFO_FC_UNKNOWN;
> -
> - *code = raw_code;
> -
> - return 0;
> -}
> -EXPORT_SYMBOL_GPL(qcom_smem_get_feature_code);
> -
> static int qcom_smem_get_sbl_version(struct qcom_smem *smem)
> {
> struct smem_header *header;
> __le32 *versions;
> @@ -873,10 +772,9 @@ static struct smem_ptable *qcom_smem_get_ptable(struct qcom_smem *smem)
> return ERR_PTR(-ENOENT);
>
> version = le32_to_cpu(ptable->version);
> if (version != 1) {
> - dev_err(smem->dev,
> - "Unsupported partition header version %d\n", version);
> + log_err("Unsupported partition header version %d\n", version);
> return ERR_PTR(-EINVAL);
> }
> return ptable;
> }
> @@ -906,42 +804,42 @@ static struct smem_partition_header *
> qcom_smem_partition_header(struct qcom_smem *smem,
> struct smem_ptable_entry *entry, u16 host0, u16 host1)
> {
> struct smem_partition_header *header;
> - u32 phys_addr;
> + u64 phys_addr;
> u32 size;
>
> phys_addr = smem->regions[0].aux_base + le32_to_cpu(entry->offset);
> - header = devm_ioremap_wc(smem->dev, phys_addr, le32_to_cpu(entry->size));
> + header = (void *)phys_addr; // devm_ioremap_wc()
>
> if (!header)
> return NULL;
>
> if (memcmp(header->magic, SMEM_PART_MAGIC, sizeof(header->magic))) {
> - dev_err(smem->dev, "bad partition magic %4ph\n", header->magic);
> + log_err("bad partition magic %4ph\n", header->magic);
> return NULL;
> }
>
> if (host0 != le16_to_cpu(header->host0)) {
> - dev_err(smem->dev, "bad host0 (%hu != %hu)\n",
> - host0, le16_to_cpu(header->host0));
> + log_err("bad host0 (%hu != %hu)\n",
> + host0, le16_to_cpu(header->host0));
> return NULL;
> }
> if (host1 != le16_to_cpu(header->host1)) {
> - dev_err(smem->dev, "bad host1 (%hu != %hu)\n",
> - host1, le16_to_cpu(header->host1));
> + log_err("bad host1 (%hu != %hu)\n",
> + host1, le16_to_cpu(header->host1));
> return NULL;
> }
>
> size = le32_to_cpu(header->size);
> if (size != le32_to_cpu(entry->size)) {
> - dev_err(smem->dev, "bad partition size (%u != %u)\n",
> + log_err("bad partition size (%u != %u)\n",
> size, le32_to_cpu(entry->size));
> return NULL;
> }
>
> if (le32_to_cpu(header->offset_free_uncached) > size) {
> - dev_err(smem->dev, "bad partition free uncached (%u > %u)\n",
> + log_err("bad partition free uncached (%u > %u)\n",
> le32_to_cpu(header->offset_free_uncached), size);
> return NULL;
> }
>
> @@ -956,9 +854,9 @@ static int qcom_smem_set_global_partition(struct qcom_smem *smem)
> bool found = false;
> int i;
>
> if (smem->global_partition.virt_base) {
> - dev_err(smem->dev, "Already found the global partition\n");
> + log_err("Already found the global partition\n");
> return -EINVAL;
> }
>
> ptable = qcom_smem_get_ptable(smem);
> @@ -981,9 +879,9 @@ static int qcom_smem_set_global_partition(struct qcom_smem *smem)
> }
> }
>
> if (!found) {
> - dev_err(smem->dev, "Missing entry for global partition\n");
> + log_err("Missing entry for global partition\n");
> return -EINVAL;
> }
>
> header = qcom_smem_partition_header(smem, entry,
> @@ -1030,14 +928,14 @@ qcom_smem_enumerate_partitions(struct qcom_smem *smem, u16 local_host)
> else
> continue;
>
> if (remote_host >= SMEM_HOST_COUNT) {
> - dev_err(smem->dev, "bad host %u\n", remote_host);
> + log_err("bad host %u\n", remote_host);
> return -EINVAL;
> }
>
> if (smem->partitions[remote_host].virt_base) {
> - dev_err(smem->dev, "duplicate host %u\n", remote_host);
> + log_err("duplicate host %u\n", remote_host);
> return -EINVAL;
> }
>
> header = qcom_smem_partition_header(smem, entry, host0, host1);
> @@ -1058,12 +956,12 @@ static int qcom_smem_map_toc(struct qcom_smem *smem, struct smem_region *region)
> {
> u32 ptable_start;
>
> /* map starting 4K for smem header */
> - region->virt_base = devm_ioremap_wc(smem->dev, region->aux_base, SZ_4K);
> + region->virt_base = (void *)region->aux_base;
> ptable_start = region->aux_base + region->size - SZ_4K;
> /* map last 4k for toc */
> - smem->ptable = devm_ioremap_wc(smem->dev, ptable_start, SZ_4K);
> + smem->ptable = (struct smem_ptable *)(u64)ptable_start;
>
> if (!region->virt_base || !smem->ptable)
> return -ENOMEM;
>
> @@ -1071,54 +969,29 @@ static int qcom_smem_map_toc(struct qcom_smem *smem, struct smem_region *region)
> }
>
> static int qcom_smem_map_global(struct qcom_smem *smem, u32 size)
> {
> - u32 phys_addr;
> + u64 phys_addr;
>
> phys_addr = smem->regions[0].aux_base;
>
> smem->regions[0].size = size;
> - smem->regions[0].virt_base = devm_ioremap_wc(smem->dev, phys_addr, size);
> + smem->regions[0].virt_base = (void *)phys_addr;
>
> if (!smem->regions[0].virt_base)
> return -ENOMEM;
>
> return 0;
> }
>
> -static int qcom_smem_resolve_mem(struct qcom_smem *smem, const char *name,
> - struct smem_region *region)
> -{
> - struct device *dev = smem->dev;
> - struct device_node *np;
> - struct resource r;
> - int ret;
> -
> - np = of_parse_phandle(dev->of_node, name, 0);
> - if (!np) {
> - dev_err(dev, "No %s specified\n", name);
> - return -EINVAL;
> - }
> -
> - ret = of_address_to_resource(np, 0, &r);
> - of_node_put(np);
> - if (ret)
> - return ret;
> -
> - region->aux_base = r.start;
> - region->size = resource_size(&r);
> -
> - return 0;
> -}
> -
> -static int qcom_smem_probe(struct platform_device *pdev)
> +int qcom_smem_init(void)
> {
> struct smem_header *header;
> - struct reserved_mem *rmem;
> struct qcom_smem *smem;
> - unsigned long flags;
> int num_regions;
> - int hwlock_id;
> + fdt_size_t reg_size = 0;
> + u32 phandle;
> + ofnode node, mem_node;
> u32 version;
> u32 size;
> int ret;
> int i;
> @@ -1126,85 +999,58 @@ static int qcom_smem_probe(struct platform_device *pdev)
> if (__smem)
> return 0;
>
> num_regions = 1;
> - if (of_property_present(pdev->dev.of_node, "qcom,rpm-msg-ram"))
> - num_regions++;
>
> - smem = devm_kzalloc(&pdev->dev, struct_size(smem, regions, num_regions),
> + node = ofnode_by_compatible(ofnode_root(), "qcom,smem");
> + if (!ofnode_valid(node))
> + return -ENODEV;
> +
> + if (ofnode_has_property(node, "memory-region")) {
> + ofnode_read_u32(node, "memory-region", &phandle);
> + mem_node = ofnode_get_by_phandle(phandle);
> + } else {
> + mem_node = node;
> + }
> +
> + smem = kzalloc(sizeof(struct smem_region) * num_regions +
> + sizeof(struct qcom_smem),
> GFP_KERNEL);
> - if (!smem)
> + if (!smem) {
> + log_err("Failed to allocate memory for smem\n");
> return -ENOMEM;
> + }
>
> - smem->dev = &pdev->dev;
> smem->num_regions = num_regions;
>
> - rmem = of_reserved_mem_lookup(pdev->dev.of_node);
> - if (rmem) {
> - smem->regions[0].aux_base = rmem->base;
> - smem->regions[0].size = rmem->size;
> - } else {
> - /*
> - * Fall back to the memory-region reference, if we're not a
> - * reserved-memory node.
> - */
> - ret = qcom_smem_resolve_mem(smem, "memory-region", &smem->regions[0]);
> - if (ret)
> - return ret;
> + smem->regions[0].aux_base = ofnode_get_addr(mem_node);
> + reg_size = ofnode_get_size(mem_node);
> + if (smem->regions[0].aux_base == FDT_ADDR_T_NONE) {
> + log_err("Failed to get base address\n");
> + return -EINVAL;
> }
> -
> - if (num_regions > 1) {
> - ret = qcom_smem_resolve_mem(smem, "qcom,rpm-msg-ram", &smem->regions[1]);
> - if (ret)
> - return ret;
> - }
> -
> + smem->regions[0].size = reg_size;
>
> ret = qcom_smem_map_toc(smem, &smem->regions[0]);
> - if (ret)
> + if (ret) {
> + log_err("Failed to map toc\n");
> return ret;
> + }
>
> for (i = 1; i < num_regions; i++) {
> - smem->regions[i].virt_base = devm_ioremap_wc(&pdev->dev,
> - smem->regions[i].aux_base,
> - smem->regions[i].size);
> - if (!smem->regions[i].virt_base) {
> - dev_err(&pdev->dev, "failed to remap %pa\n", &smem->regions[i].aux_base);
> - return -ENOMEM;
> - }
> + smem->regions[i].virt_base = (void *)smem->regions[i].aux_base;
> }
>
> header = smem->regions[0].virt_base;
> if (le32_to_cpu(header->initialized) != 1 ||
> le32_to_cpu(header->reserved)) {
> - dev_err(&pdev->dev, "SMEM is not initialized by SBL\n");
> + log_err("SMEM is not initialized by SBL\n");
> return -EINVAL;
> }
>
> - hwlock_id = of_hwspin_lock_get_id(pdev->dev.of_node, 0);
> - if (hwlock_id < 0) {
> - if (hwlock_id != -EPROBE_DEFER)
> - dev_err(&pdev->dev, "failed to retrieve hwlock\n");
> - return hwlock_id;
> - }
> -
> - smem->hwlock = hwspin_lock_request_specific(hwlock_id);
> - if (!smem->hwlock)
> - return -ENXIO;
> -
> - ret = hwspin_lock_timeout_irqsave(smem->hwlock, HWSPINLOCK_TIMEOUT, &flags);
> - if (ret)
> - return ret;
> size = readl_relaxed(&header->available) + readl_relaxed(&header->free_offset);
> - hwspin_unlock_irqrestore(smem->hwlock, &flags);
>
> version = qcom_smem_get_sbl_version(smem);
> - /*
> - * smem header mapping is required only in heap version scheme, so unmap
> - * it here. It will be remapped in qcom_smem_map_global() when whole
> - * partition is mapped again.
> - */
> - devm_iounmap(smem->dev, smem->regions[0].virt_base);
> switch (version >> 16) {
> case SMEM_GLOBAL_PART_VERSION:
> ret = qcom_smem_set_global_partition(smem);
> if (ret < 0)
> @@ -1215,63 +1061,19 @@ static int qcom_smem_probe(struct platform_device *pdev)
> qcom_smem_map_global(smem, size);
> smem->item_count = SMEM_ITEM_COUNT;
> break;
> default:
> - dev_err(&pdev->dev, "Unsupported SMEM version 0x%x\n", version);
> + log_err("Unsupported SMEM version 0x%x\n", version);
> return -EINVAL;
> }
>
> BUILD_BUG_ON(SMEM_HOST_APPS >= SMEM_HOST_COUNT);
> ret = qcom_smem_enumerate_partitions(smem, SMEM_HOST_APPS);
> - if (ret < 0 && ret != -ENOENT)
> + if (ret < 0 && ret != -ENOENT) {
> + log_err("Failed to enumerate partitions\n");
> return ret;
> + }
>
> __smem = smem;
>
> - smem->socinfo = platform_device_register_data(&pdev->dev, "qcom-socinfo",
> - PLATFORM_DEVID_NONE, NULL,
> - 0);
> - if (IS_ERR(smem->socinfo))
> - dev_dbg(&pdev->dev, "failed to register socinfo device\n");
> -
> return 0;
> }
> -
> -static void qcom_smem_remove(struct platform_device *pdev)
> -{
> - platform_device_unregister(__smem->socinfo);
> -
> - hwspin_lock_free(__smem->hwlock);
> - __smem = NULL;
> -}
> -
> -static const struct of_device_id qcom_smem_of_match[] = {
> - { .compatible = "qcom,smem" },
> - {}
> -};
> -MODULE_DEVICE_TABLE(of, qcom_smem_of_match);
> -
> -static struct platform_driver qcom_smem_driver = {
> - .probe = qcom_smem_probe,
> - .remove_new = qcom_smem_remove,
> - .driver = {
> - .name = "qcom-smem",
> - .of_match_table = qcom_smem_of_match,
> - .suppress_bind_attrs = true,
> - },
> -};
> -
> -static int __init qcom_smem_init(void)
> -{
> - return platform_driver_register(&qcom_smem_driver);
> -}
> -arch_initcall(qcom_smem_init);
> -
> -static void __exit qcom_smem_exit(void)
> -{
> - platform_driver_unregister(&qcom_smem_driver);
> -}
> -module_exit(qcom_smem_exit)
> -
> -MODULE_AUTHOR("Bjorn Andersson <bjorn.andersson@sonymobile.com>");
> -MODULE_DESCRIPTION("Qualcomm Shared Memory Manager");
> -MODULE_LICENSE("GPL v2");
> diff --git a/include/soc/qcom/smem.h b/include/soc/qcom/smem.h
> index f946e3beca21..a955db08c0f0 100644
> --- a/include/soc/qcom/smem.h
> +++ b/include/soc/qcom/smem.h
> @@ -3,18 +3,13 @@
> #define __QCOM_SMEM_H__
>
> #define QCOM_SMEM_HOST_ANY -1
>
> +int qcom_smem_init(void);
> +
> bool qcom_smem_is_available(void);
> int qcom_smem_alloc(unsigned host, unsigned item, size_t size);
> void *qcom_smem_get(unsigned host, unsigned item, size_t *size);
>
> int qcom_smem_get_free_space(unsigned host);
>
> -phys_addr_t qcom_smem_virt_to_phys(void *p);
> -
> -int qcom_smem_get_soc_id(u32 *id);
> -int qcom_smem_get_feature_code(u32 *code);
> -
> -int qcom_smem_bust_hwspin_lock_by_host(unsigned int host);
> -
> #endif
>
> --
> 2.47.0
>
^ permalink raw reply [flat|nested] 35+ messages in thread
* [PATCH 08/15] soc: qcom: smem: get serial number from socinfo
2024-11-24 19:17 [PATCH 00/15] qcom: smem: modernize SMEM in U-Boot Caleb Connolly
` (6 preceding siblings ...)
2024-11-24 19:17 ` [PATCH 07/15] soc: qcom: smem: adjust " Caleb Connolly
@ 2024-11-24 19:17 ` Caleb Connolly
2025-01-07 15:30 ` Simon Glass
2025-01-08 9:38 ` Stephan Gerhold
2024-11-24 19:17 ` [PATCH 09/15] soc: qcom: smem: stub functions Caleb Connolly
` (6 subsequent siblings)
14 siblings, 2 replies; 35+ messages in thread
From: Caleb Connolly @ 2024-11-24 19:17 UTC (permalink / raw)
To: Rayagonda Kokatanur, Tom Rini, Simon Glass, Caleb Connolly,
Neil Armstrong, Sumit Garg, Mario Six
Cc: u-boot, u-boot-qcom
Implement socinfo support to fetch the serial number if available.
Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
---
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);
+ } else {
+ return -ENOENT;
+ }
+
+ return 0;
+}
+
int qcom_smem_init(void)
{
struct smem_header *header;
struct qcom_smem *smem;
diff --git a/include/soc/qcom/smem.h b/include/soc/qcom/smem.h
index a955db08c0f0..755003807dba 100644
--- a/include/soc/qcom/smem.h
+++ b/include/soc/qcom/smem.h
@@ -4,8 +4,9 @@
#define QCOM_SMEM_HOST_ANY -1
int qcom_smem_init(void);
+int qcom_socinfo_init(void);
bool qcom_smem_is_available(void);
int qcom_smem_alloc(unsigned host, unsigned item, size_t size);
void *qcom_smem_get(unsigned host, unsigned item, size_t *size);
--
2.47.0
^ permalink raw reply related [flat|nested] 35+ messages in thread* Re: [PATCH 08/15] soc: qcom: smem: get serial number from socinfo
2024-11-24 19:17 ` [PATCH 08/15] soc: qcom: smem: get serial number from socinfo Caleb Connolly
@ 2025-01-07 15:30 ` Simon Glass
2025-01-08 9:38 ` Stephan Gerhold
1 sibling, 0 replies; 35+ messages in thread
From: Simon Glass @ 2025-01-07 15:30 UTC (permalink / raw)
To: Caleb Connolly
Cc: Rayagonda Kokatanur, Tom Rini, Neil Armstrong, Sumit Garg,
Mario Six, u-boot, u-boot-qcom
Hi Caleb,
On Sun, 24 Nov 2024 at 12:17, Caleb Connolly <caleb.connolly@linaro.org> wrote:
>
> Implement socinfo support to fetch the serial number if available.
>
> Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
> ---
> drivers/soc/qcom/smem.c | 25 +++++++++++++++++++++++++
> include/soc/qcom/smem.h | 1 +
> 2 files changed, 26 insertions(+)
>
Reviewed-by: Simon Glass <sjg@chromium.org>
nit below
> 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);
> + } else {
> + return -ENOENT;
> + }
> +
> + return 0;
> +}
> +
> int qcom_smem_init(void)
> {
> struct smem_header *header;
> struct qcom_smem *smem;
> diff --git a/include/soc/qcom/smem.h b/include/soc/qcom/smem.h
> index a955db08c0f0..755003807dba 100644
> --- a/include/soc/qcom/smem.h
> +++ b/include/soc/qcom/smem.h
> @@ -4,8 +4,9 @@
>
> #define QCOM_SMEM_HOST_ANY -1
>
> int qcom_smem_init(void);
> +int qcom_socinfo_init(void);
Comment please!
>
> bool qcom_smem_is_available(void);
> int qcom_smem_alloc(unsigned host, unsigned item, size_t size);
> void *qcom_smem_get(unsigned host, unsigned item, size_t *size);
>
> --
> 2.47.0
>
^ permalink raw reply [flat|nested] 35+ messages in thread* Re: [PATCH 08/15] soc: qcom: smem: get serial number from socinfo
2024-11-24 19:17 ` [PATCH 08/15] soc: qcom: smem: get serial number from socinfo Caleb Connolly
2025-01-07 15:30 ` Simon Glass
@ 2025-01-08 9:38 ` Stephan Gerhold
1 sibling, 0 replies; 35+ messages in thread
From: Stephan Gerhold @ 2025-01-08 9:38 UTC (permalink / raw)
To: Caleb Connolly
Cc: Rayagonda Kokatanur, Tom Rini, Simon Glass, Neil Armstrong,
Sumit Garg, Mario Six, u-boot, u-boot-qcom
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 <caleb.connolly@linaro.org>
> ---
> 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
^ permalink raw reply [flat|nested] 35+ messages in thread
* [PATCH 09/15] soc: qcom: smem: stub functions
2024-11-24 19:17 [PATCH 00/15] qcom: smem: modernize SMEM in U-Boot Caleb Connolly
` (7 preceding siblings ...)
2024-11-24 19:17 ` [PATCH 08/15] soc: qcom: smem: get serial number from socinfo Caleb Connolly
@ 2024-11-24 19:17 ` Caleb Connolly
2025-01-07 15:32 ` Simon Glass
2024-11-24 19:17 ` [PATCH 10/15] soc: qcom: smem: add build infra Caleb Connolly
` (5 subsequent siblings)
14 siblings, 1 reply; 35+ messages in thread
From: Caleb Connolly @ 2024-11-24 19:17 UTC (permalink / raw)
To: Rayagonda Kokatanur, Tom Rini, Simon Glass, Caleb Connolly,
Neil Armstrong, Sumit Garg, Mario Six
Cc: u-boot, u-boot-qcom
Allow smem to be optional for Qualcomm platforms by providing stub
functions.
Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
---
include/soc/qcom/smem.h | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/include/soc/qcom/smem.h b/include/soc/qcom/smem.h
index 755003807dba..586432412eb8 100644
--- a/include/soc/qcom/smem.h
+++ b/include/soc/qcom/smem.h
@@ -1,16 +1,36 @@
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef __QCOM_SMEM_H__
#define __QCOM_SMEM_H__
+#include <linux/err.h>
+#include <stdbool.h>
+
#define QCOM_SMEM_HOST_ANY -1
+#if defined(CONFIG_QCOM_SMEM)
int qcom_smem_init(void);
int qcom_socinfo_init(void);
bool qcom_smem_is_available(void);
int qcom_smem_alloc(unsigned host, unsigned item, size_t size);
void *qcom_smem_get(unsigned host, unsigned item, size_t *size);
int qcom_smem_get_free_space(unsigned host);
+#else
+static int qcom_smem_init(void) { return -ENOSYS; }
+
+static bool qcom_smem_is_available(void) { return false; }
+int qcom_smem_alloc(unsigned host, unsigned item, size_t size)
+{
+ return -ENOSYS;
+}
+
+void *qcom_smem_get(unsigned host, unsigned item, size_t *size)
+{
+ return ERR_PTR(-ENOSYS);
+}
+
+int qcom_smem_get_free_space(unsigned host);
+#endif
#endif
--
2.47.0
^ permalink raw reply related [flat|nested] 35+ messages in thread* Re: [PATCH 09/15] soc: qcom: smem: stub functions
2024-11-24 19:17 ` [PATCH 09/15] soc: qcom: smem: stub functions Caleb Connolly
@ 2025-01-07 15:32 ` Simon Glass
0 siblings, 0 replies; 35+ messages in thread
From: Simon Glass @ 2025-01-07 15:32 UTC (permalink / raw)
To: Caleb Connolly
Cc: Rayagonda Kokatanur, Tom Rini, Neil Armstrong, Sumit Garg,
Mario Six, u-boot, u-boot-qcom
On Sun, 24 Nov 2024 at 12:17, Caleb Connolly <caleb.connolly@linaro.org> wrote:
>
> Allow smem to be optional for Qualcomm platforms by providing stub
> functions.
>
> Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
> ---
> include/soc/qcom/smem.h | 20 ++++++++++++++++++++
> 1 file changed, 20 insertions(+)
Reviewed-by: Simon Glass <sjg@chromium.org>
^ permalink raw reply [flat|nested] 35+ messages in thread
* [PATCH 10/15] soc: qcom: smem: add build infra
2024-11-24 19:17 [PATCH 00/15] qcom: smem: modernize SMEM in U-Boot Caleb Connolly
` (8 preceding siblings ...)
2024-11-24 19:17 ` [PATCH 09/15] soc: qcom: smem: stub functions Caleb Connolly
@ 2024-11-24 19:17 ` Caleb Connolly
2025-01-07 15:32 ` Simon Glass
2024-11-24 19:17 ` [PATCH 11/15] mach-snapdragon: increase pre-relocation malloc size for smem Caleb Connolly
` (4 subsequent siblings)
14 siblings, 1 reply; 35+ messages in thread
From: Caleb Connolly @ 2024-11-24 19:17 UTC (permalink / raw)
To: Rayagonda Kokatanur, Tom Rini, Simon Glass, Caleb Connolly,
Neil Armstrong, Sumit Garg, Mario Six
Cc: u-boot, u-boot-qcom
Build the new SMEM driver port, and select it when ARCH_SNAPDRAGON is
selected, since it will be a hard dependency for Qualcomm platforms.
Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
---
drivers/soc/qcom/Kconfig | 8 ++++++++
drivers/soc/qcom/Makefile | 1 +
2 files changed, 9 insertions(+)
diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig
index 4aa7833930c7..ee3d299eebe6 100644
--- a/drivers/soc/qcom/Kconfig
+++ b/drivers/soc/qcom/Kconfig
@@ -23,5 +23,13 @@ config QCOM_RPMH
help
Say y here to support the Qualcomm RPMh (resource peripheral manager)
if you need to control regulators on Qualcomm platforms, say y here.
+config QCOM_SMEM
+ bool "Qualcomm SMEM support"
+ help
+ Say y here to support the Qualcomm SMEM (shared memory) client driver.
+ SMEM is a shared memory region that is used to pass information about
+ the hardware (e.g. DRAM layout, PMIC configuration, etc) between bootloader
+ staged and the OS. If in doubt, say y.
+
endif # SOC_QCOM
diff --git a/drivers/soc/qcom/Makefile b/drivers/soc/qcom/Makefile
index 78fae8bbfa16..f4102f9155a8 100644
--- a/drivers/soc/qcom/Makefile
+++ b/drivers/soc/qcom/Makefile
@@ -1,4 +1,5 @@
# SPDX-License-Identifier: GPL-2.0+
obj-$(CONFIG_QCOM_COMMAND_DB) += cmd-db.o
obj-$(CONFIG_QCOM_RPMH) += rpmh-rsc.o rpmh.o
+obj-$(CONFIG_QCOM_SMEM) += smem.o
--
2.47.0
^ permalink raw reply related [flat|nested] 35+ messages in thread* Re: [PATCH 10/15] soc: qcom: smem: add build infra
2024-11-24 19:17 ` [PATCH 10/15] soc: qcom: smem: add build infra Caleb Connolly
@ 2025-01-07 15:32 ` Simon Glass
0 siblings, 0 replies; 35+ messages in thread
From: Simon Glass @ 2025-01-07 15:32 UTC (permalink / raw)
To: Caleb Connolly
Cc: Rayagonda Kokatanur, Tom Rini, Neil Armstrong, Sumit Garg,
Mario Six, u-boot, u-boot-qcom
Hi Caleb,
On Sun, 24 Nov 2024 at 12:17, Caleb Connolly <caleb.connolly@linaro.org> wrote:
>
> Build the new SMEM driver port, and select it when ARCH_SNAPDRAGON is
> selected, since it will be a hard dependency for Qualcomm platforms.
>
> Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
> ---
> drivers/soc/qcom/Kconfig | 8 ++++++++
> drivers/soc/qcom/Makefile | 1 +
> 2 files changed, 9 insertions(+)
>
> diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig
> index 4aa7833930c7..ee3d299eebe6 100644
> --- a/drivers/soc/qcom/Kconfig
> +++ b/drivers/soc/qcom/Kconfig
> @@ -23,5 +23,13 @@ config QCOM_RPMH
> help
> Say y here to support the Qualcomm RPMh (resource peripheral manager)
> if you need to control regulators on Qualcomm platforms, say y here.
>
> +config QCOM_SMEM
> + bool "Qualcomm SMEM support"
> + help
> + Say y here to support the Qualcomm SMEM (shared memory) client driver.
It's not a driver anymore, just support code. With that fixed:
Reviewed-by: Simon Glass <sjg@chromium.org>
> + SMEM is a shared memory region that is used to pass information about
> + the hardware (e.g. DRAM layout, PMIC configuration, etc) between bootloader
> + staged and the OS. If in doubt, say y.
> +
> endif # SOC_QCOM
> diff --git a/drivers/soc/qcom/Makefile b/drivers/soc/qcom/Makefile
> index 78fae8bbfa16..f4102f9155a8 100644
> --- a/drivers/soc/qcom/Makefile
> +++ b/drivers/soc/qcom/Makefile
> @@ -1,4 +1,5 @@
> # SPDX-License-Identifier: GPL-2.0+
>
> obj-$(CONFIG_QCOM_COMMAND_DB) += cmd-db.o
> obj-$(CONFIG_QCOM_RPMH) += rpmh-rsc.o rpmh.o
> +obj-$(CONFIG_QCOM_SMEM) += smem.o
>
> --
> 2.47.0
>
Regards,
Simon
^ permalink raw reply [flat|nested] 35+ messages in thread
* [PATCH 11/15] mach-snapdragon: increase pre-relocation malloc size for smem
2024-11-24 19:17 [PATCH 00/15] qcom: smem: modernize SMEM in U-Boot Caleb Connolly
` (9 preceding siblings ...)
2024-11-24 19:17 ` [PATCH 10/15] soc: qcom: smem: add build infra Caleb Connolly
@ 2024-11-24 19:17 ` Caleb Connolly
2025-01-07 15:32 ` Simon Glass
2024-11-24 19:17 ` [PATCH 12/15] mach-snapdragon: move memory parsing to its own file Caleb Connolly
` (3 subsequent siblings)
14 siblings, 1 reply; 35+ messages in thread
From: Caleb Connolly @ 2024-11-24 19:17 UTC (permalink / raw)
To: Rayagonda Kokatanur, Tom Rini, Simon Glass, Caleb Connolly,
Neil Armstrong, Sumit Garg, Mario Six
Cc: u-boot, u-boot-qcom
Ensure we have enough space to init smem prior to relocation, since we
might parse the DDR bank layout from there.
Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
---
arch/arm/mach-snapdragon/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-snapdragon/Kconfig b/arch/arm/mach-snapdragon/Kconfig
index 976c0e35fcef..5f3a1b11d8e2 100644
--- a/arch/arm/mach-snapdragon/Kconfig
+++ b/arch/arm/mach-snapdragon/Kconfig
@@ -14,9 +14,9 @@ config SYS_VENDOR
config SYS_MALLOC_LEN
default 0x10000000
config SYS_MALLOC_F_LEN
- default 0x2000
+ default 0x20000
config SPL_SYS_MALLOC_F
default y
--
2.47.0
^ permalink raw reply related [flat|nested] 35+ messages in thread* Re: [PATCH 11/15] mach-snapdragon: increase pre-relocation malloc size for smem
2024-11-24 19:17 ` [PATCH 11/15] mach-snapdragon: increase pre-relocation malloc size for smem Caleb Connolly
@ 2025-01-07 15:32 ` Simon Glass
0 siblings, 0 replies; 35+ messages in thread
From: Simon Glass @ 2025-01-07 15:32 UTC (permalink / raw)
To: Caleb Connolly
Cc: Rayagonda Kokatanur, Tom Rini, Neil Armstrong, Sumit Garg,
Mario Six, u-boot, u-boot-qcom
On Sun, 24 Nov 2024 at 12:17, Caleb Connolly <caleb.connolly@linaro.org> wrote:
>
> Ensure we have enough space to init smem prior to relocation, since we
> might parse the DDR bank layout from there.
>
> Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
> ---
> arch/arm/mach-snapdragon/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Simon Glass <sjg@chromium.org>
Wow that's a lot of space!
>
> diff --git a/arch/arm/mach-snapdragon/Kconfig b/arch/arm/mach-snapdragon/Kconfig
> index 976c0e35fcef..5f3a1b11d8e2 100644
> --- a/arch/arm/mach-snapdragon/Kconfig
> +++ b/arch/arm/mach-snapdragon/Kconfig
> @@ -14,9 +14,9 @@ config SYS_VENDOR
> config SYS_MALLOC_LEN
> default 0x10000000
>
> config SYS_MALLOC_F_LEN
> - default 0x2000
> + default 0x20000
>
> config SPL_SYS_MALLOC_F
> default y
>
>
> --
> 2.47.0
>
^ permalink raw reply [flat|nested] 35+ messages in thread
* [PATCH 12/15] mach-snapdragon: move memory parsing to its own file
2024-11-24 19:17 [PATCH 00/15] qcom: smem: modernize SMEM in U-Boot Caleb Connolly
` (10 preceding siblings ...)
2024-11-24 19:17 ` [PATCH 11/15] mach-snapdragon: increase pre-relocation malloc size for smem Caleb Connolly
@ 2024-11-24 19:17 ` Caleb Connolly
2025-01-07 15:32 ` Simon Glass
2024-11-24 19:17 ` [PATCH 13/15] mach-snapdragon: support parsing memory map from SMEM Caleb Connolly
` (2 subsequent siblings)
14 siblings, 1 reply; 35+ messages in thread
From: Caleb Connolly @ 2024-11-24 19:17 UTC (permalink / raw)
To: Rayagonda Kokatanur, Tom Rini, Simon Glass, Caleb Connolly,
Neil Armstrong, Sumit Garg, Mario Six
Cc: u-boot, u-boot-qcom
This code is getting a bit complicated, split it out to try and keep
things a bit better organised as we're going to be supporting populating
the memory layout from various other sources.
Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
---
arch/arm/mach-snapdragon/Makefile | 2 +-
arch/arm/mach-snapdragon/board.c | 94 ----------------------------
arch/arm/mach-snapdragon/dram.c | 116 +++++++++++++++++++++++++++++++++++
arch/arm/mach-snapdragon/qcom-priv.h | 2 +
4 files changed, 119 insertions(+), 95 deletions(-)
diff --git a/arch/arm/mach-snapdragon/Makefile b/arch/arm/mach-snapdragon/Makefile
index 343e825c6fdd..e481e4f26e5c 100644
--- a/arch/arm/mach-snapdragon/Makefile
+++ b/arch/arm/mach-snapdragon/Makefile
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0+
#
# (C) Copyright 2015 Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
-obj-y += board.o
+obj-y += board.o dram.o
obj-$(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) += capsule_update.o
obj-$(CONFIG_OF_LIVE) += of_fixup.o
diff --git a/arch/arm/mach-snapdragon/board.c b/arch/arm/mach-snapdragon/board.c
index 75a880f093ca..8d171957b852 100644
--- a/arch/arm/mach-snapdragon/board.c
+++ b/arch/arm/mach-snapdragon/board.c
@@ -40,102 +40,8 @@ DECLARE_GLOBAL_DATA_PTR;
static struct mm_region rbx_mem_map[CONFIG_NR_DRAM_BANKS + 2] = { { 0 } };
struct mm_region *mem_map = rbx_mem_map;
-static struct {
- phys_addr_t start;
- phys_size_t size;
-} prevbl_ddr_banks[CONFIG_NR_DRAM_BANKS] __section(".data") = { 0 };
-
-int dram_init(void)
-{
- /*
- * gd->ram_base / ram_size have been setup already
- * in qcom_parse_memory().
- */
- return 0;
-}
-
-static int ddr_bank_cmp(const void *v1, const void *v2)
-{
- const struct {
- phys_addr_t start;
- phys_size_t size;
- } *res1 = v1, *res2 = v2;
-
- if (!res1->size)
- return 1;
- if (!res2->size)
- return -1;
-
- return (res1->start >> 24) - (res2->start >> 24);
-}
-
-/* This has to be done post-relocation since gd->bd isn't preserved */
-static void qcom_configure_bi_dram(void)
-{
- int i;
-
- for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
- gd->bd->bi_dram[i].start = prevbl_ddr_banks[i].start;
- gd->bd->bi_dram[i].size = prevbl_ddr_banks[i].size;
- }
-}
-
-int dram_init_banksize(void)
-{
- qcom_configure_bi_dram();
-
- return 0;
-}
-
-static void qcom_parse_memory(void)
-{
- ofnode node;
- const fdt64_t *memory;
- int memsize;
- phys_addr_t ram_end = 0;
- int i, j, banks;
-
- node = ofnode_path("/memory");
- if (!ofnode_valid(node)) {
- log_err("No memory node found in device tree!\n");
- return;
- }
- memory = ofnode_read_prop(node, "reg", &memsize);
- if (!memory) {
- log_err("No memory configuration was provided by the previous bootloader!\n");
- return;
- }
-
- banks = min(memsize / (2 * sizeof(u64)), (ulong)CONFIG_NR_DRAM_BANKS);
-
- if (memsize / sizeof(u64) > CONFIG_NR_DRAM_BANKS * 2)
- log_err("Provided more than the max of %d memory banks\n", CONFIG_NR_DRAM_BANKS);
-
- if (banks > CONFIG_NR_DRAM_BANKS)
- log_err("Provided more memory banks than we can handle\n");
-
- for (i = 0, j = 0; i < banks * 2; i += 2, j++) {
- prevbl_ddr_banks[j].start = get_unaligned_be64(&memory[i]);
- prevbl_ddr_banks[j].size = get_unaligned_be64(&memory[i + 1]);
- /* SM8650 boards sometimes have empty regions! */
- if (!prevbl_ddr_banks[j].size) {
- j--;
- continue;
- }
- ram_end = max(ram_end, prevbl_ddr_banks[j].start + prevbl_ddr_banks[j].size);
- }
-
- /* Sort our RAM banks -_- */
- qsort(prevbl_ddr_banks, banks, sizeof(prevbl_ddr_banks[0]), ddr_bank_cmp);
-
- gd->ram_base = prevbl_ddr_banks[0].start;
- gd->ram_size = ram_end - gd->ram_base;
- debug("ram_base = %#011lx, ram_size = %#011llx, ram_end = %#011llx\n",
- gd->ram_base, gd->ram_size, ram_end);
-}
-
static void show_psci_version(void)
{
struct arm_smccc_res res;
diff --git a/arch/arm/mach-snapdragon/dram.c b/arch/arm/mach-snapdragon/dram.c
new file mode 100644
index 000000000000..c4c60039cb4c
--- /dev/null
+++ b/arch/arm/mach-snapdragon/dram.c
@@ -0,0 +1,116 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Memory layout parsing for Qualcomm.
+ */
+
+#define LOG_CATEGORY LOGC_BOARD
+#define pr_fmt(fmt) "QCOM-DRAM: " fmt
+
+#include <asm-generic/unaligned.h>
+#include <dm.h>
+#include <log.h>
+#include <sort.h>
+
+static struct {
+ phys_addr_t start;
+ phys_size_t size;
+} prevbl_ddr_banks[CONFIG_NR_DRAM_BANKS] __section(".data") = { 0 };
+
+int dram_init(void)
+{
+ /*
+ * gd->ram_base / ram_size have been setup already
+ * in qcom_parse_memory().
+ */
+ return 0;
+}
+
+static int ddr_bank_cmp(const void *v1, const void *v2)
+{
+ const struct {
+ phys_addr_t start;
+ phys_size_t size;
+ } *res1 = v1, *res2 = v2;
+
+ if (!res1->size)
+ return 1;
+ if (!res2->size)
+ return -1;
+
+ return (res1->start >> 24) - (res2->start >> 24);
+}
+
+/* This has to be done post-relocation since gd->bd isn't preserved */
+static void qcom_configure_bi_dram(void)
+{
+ int i;
+
+ for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
+ gd->bd->bi_dram[i].start = prevbl_ddr_banks[i].start;
+ gd->bd->bi_dram[i].size = prevbl_ddr_banks[i].size;
+ }
+}
+
+int dram_init_banksize(void)
+{
+ qcom_configure_bi_dram();
+
+ return 0;
+}
+
+static void qcom_parse_memory_dt(const fdt64_t *memory, int banks, phys_addr_t *ram_end)
+{
+ int i, j;
+
+ if (banks > CONFIG_NR_DRAM_BANKS)
+ log_err("Provided more memory banks than we can handle\n");
+
+ for (i = 0, j = 0; i < banks * 2; i += 2, j++) {
+ prevbl_ddr_banks[j].start = get_unaligned_be64(&memory[i]);
+ prevbl_ddr_banks[j].size = get_unaligned_be64(&memory[i + 1]);
+ /* SM8650 boards sometimes have empty regions! */
+ if (!prevbl_ddr_banks[j].size) {
+ j--;
+ continue;
+ }
+ *ram_end = max(*ram_end, prevbl_ddr_banks[j].start + prevbl_ddr_banks[j].size);
+ }
+}
+
+/* Parse the memory layout from the FDT. */
+void qcom_parse_memory(void)
+{
+ ofnode node;
+ const fdt64_t *memory;
+ int memsize;
+ phys_addr_t ram_end = 0;
+ int banks;
+
+ node = ofnode_path("/memory");
+ if (!ofnode_valid(node)) {
+ log_err("No memory node found in device tree!\n");
+ return;
+ }
+ memory = ofnode_read_prop(node, "reg", &memsize);
+ if (!memory) {
+ log_err("No memory configuration was provided by the previous bootloader!\n");
+ return;
+ }
+
+ banks = min(memsize / (2 * sizeof(u64)), (ulong)CONFIG_NR_DRAM_BANKS);
+
+ if (memsize / sizeof(u64) > CONFIG_NR_DRAM_BANKS * 2)
+ log_err("Provided more than the max of %d memory banks\n", CONFIG_NR_DRAM_BANKS);
+
+ qcom_parse_memory_dt(memory, banks, &ram_end);
+
+ debug("%d banks, ram_base = %#011lx, ram_size = %#011llx, ram_end = %#011llx\n",
+ banks, gd->ram_base, gd->ram_size, ram_end);
+ /* Sort our RAM banks -_- */
+ qsort(prevbl_ddr_banks, banks, sizeof(prevbl_ddr_banks[0]), ddr_bank_cmp);
+
+ gd->ram_base = prevbl_ddr_banks[0].start;
+ gd->ram_size = ram_end - gd->ram_base;
+ debug("%d banks, ram_base = %#011lx, ram_size = %#011llx, ram_end = %#011llx\n",
+ banks, gd->ram_base, gd->ram_size, ram_end);
+}
diff --git a/arch/arm/mach-snapdragon/qcom-priv.h b/arch/arm/mach-snapdragon/qcom-priv.h
index 74d39197b89f..b7f3bf798d3c 100644
--- a/arch/arm/mach-snapdragon/qcom-priv.h
+++ b/arch/arm/mach-snapdragon/qcom-priv.h
@@ -22,5 +22,7 @@ static inline void qcom_of_fixup_nodes(void)
log_debug("Unable to dynamically fixup USB nodes, please enable CONFIG_OF_LIVE\n");
}
#endif /* OF_LIVE */
+void qcom_parse_memory(void);
+
#endif /* __QCOM_PRIV_H__ */
--
2.47.0
^ permalink raw reply related [flat|nested] 35+ messages in thread* Re: [PATCH 12/15] mach-snapdragon: move memory parsing to its own file
2024-11-24 19:17 ` [PATCH 12/15] mach-snapdragon: move memory parsing to its own file Caleb Connolly
@ 2025-01-07 15:32 ` Simon Glass
0 siblings, 0 replies; 35+ messages in thread
From: Simon Glass @ 2025-01-07 15:32 UTC (permalink / raw)
To: Caleb Connolly
Cc: Rayagonda Kokatanur, Tom Rini, Neil Armstrong, Sumit Garg,
Mario Six, u-boot, u-boot-qcom
Hi Caleb,
On Sun, 24 Nov 2024 at 12:18, Caleb Connolly <caleb.connolly@linaro.org> wrote:
>
> This code is getting a bit complicated, split it out to try and keep
> things a bit better organised as we're going to be supporting populating
> the memory layout from various other sources.
>
> Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
> ---
> arch/arm/mach-snapdragon/Makefile | 2 +-
> arch/arm/mach-snapdragon/board.c | 94 ----------------------------
> arch/arm/mach-snapdragon/dram.c | 116 +++++++++++++++++++++++++++++++++++
> arch/arm/mach-snapdragon/qcom-priv.h | 2 +
> 4 files changed, 119 insertions(+), 95 deletions(-)
Reviewed-by: Simon Glass <sjg@chromium.org>
But please comment the function in the header file:
> diff --git a/arch/arm/mach-snapdragon/qcom-priv.h b/arch/arm/mach-snapdragon/qcom-priv.h
> index 74d39197b89f..b7f3bf798d3c 100644
> --- a/arch/arm/mach-snapdragon/qcom-priv.h
> +++ b/arch/arm/mach-snapdragon/qcom-priv.h
> @@ -22,5 +22,7 @@ static inline void qcom_of_fixup_nodes(void)
> log_debug("Unable to dynamically fixup USB nodes, please enable CONFIG_OF_LIVE\n");
> }
> #endif /* OF_LIVE */
>
> +void qcom_parse_memory(void);
> +
> #endif /* __QCOM_PRIV_H__ */
>
> --
> 2.47.0
>
Regards,
Simon
^ permalink raw reply [flat|nested] 35+ messages in thread
* [PATCH 13/15] mach-snapdragon: support parsing memory map from SMEM
2024-11-24 19:17 [PATCH 00/15] qcom: smem: modernize SMEM in U-Boot Caleb Connolly
` (11 preceding siblings ...)
2024-11-24 19:17 ` [PATCH 12/15] mach-snapdragon: move memory parsing to its own file Caleb Connolly
@ 2024-11-24 19:17 ` Caleb Connolly
2025-01-07 15:32 ` Simon Glass
2025-01-08 9:41 ` Stephan Gerhold
2024-11-24 19:17 ` [PATCH 14/15] mach-snapdragon: fetch serial# " Caleb Connolly
2024-11-24 19:17 ` [PATCH 15/15] qcom_defconfig: enable QCOM_SMEM Caleb Connolly
14 siblings, 2 replies; 35+ messages in thread
From: Caleb Connolly @ 2024-11-24 19:17 UTC (permalink / raw)
To: Rayagonda Kokatanur, Tom Rini, Simon Glass, Caleb Connolly,
Neil Armstrong, Sumit Garg, Mario Six
Cc: u-boot, u-boot-qcom
It is possible to derive the memory map for a Qualcomm platform from the
SMEM shared memory region. The memory map is populated by the preloader.
Introduce support for parsing this data and using it to populate
U-Boot's memory map. Since we aren't yet sure if this will work for
every platform, it is not yet used in all cases, if U-Boot is booted
with an internal FDT which has the memory map defined, this will
be used instead.
If the FDT comes from ABL, or we're using an internal FDT with no memory
map defined, then U-Boot will try to use SMEM. This should remove the
need to define the memory map statically in a U-Boot overlay DT for most
boards.
Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
---
arch/arm/mach-snapdragon/board.c | 2 +-
arch/arm/mach-snapdragon/dram.c | 106 +++++++++++++++++++++++++++++++++--
arch/arm/mach-snapdragon/qcom-priv.h | 4 +-
3 files changed, 106 insertions(+), 6 deletions(-)
diff --git a/arch/arm/mach-snapdragon/board.c b/arch/arm/mach-snapdragon/board.c
index 8d171957b852..269d39e4f6e1 100644
--- a/arch/arm/mach-snapdragon/board.c
+++ b/arch/arm/mach-snapdragon/board.c
@@ -85,9 +85,9 @@ void *board_fdt_blob_setup(int *err)
/*
* Parse the /memory node while we're here,
* this makes it easy to do other things early.
*/
- qcom_parse_memory();
+ qcom_parse_memory(internal_valid);
return (void *)gd->fdt_blob;
}
diff --git a/arch/arm/mach-snapdragon/dram.c b/arch/arm/mach-snapdragon/dram.c
index c4c60039cb4c..ef226e000858 100644
--- a/arch/arm/mach-snapdragon/dram.c
+++ b/arch/arm/mach-snapdragon/dram.c
@@ -9,14 +9,47 @@
#include <asm-generic/unaligned.h>
#include <dm.h>
#include <log.h>
#include <sort.h>
+#include <soc/qcom/smem.h>
+
+#define SMEM_USABLE_RAM_PARTITION_TABLE 402
+#define RAM_PART_NAME_LENGTH 16
+#define RAM_NUM_PART_ENTRIES 32
+#define CATEGORY_SDRAM 0x0E
+#define TYPE_SYSMEM 0x01
static struct {
phys_addr_t start;
phys_size_t size;
} prevbl_ddr_banks[CONFIG_NR_DRAM_BANKS] __section(".data") = { 0 };
+struct smem_ram_ptable_hdr {
+ u32 magic[2];
+ u32 version;
+ u32 reserved;
+ u32 len;
+} __packed;
+
+struct smem_ram_ptn {
+ char name[RAM_PART_NAME_LENGTH];
+ u64 start;
+ u64 size;
+ u32 attr;
+ u32 category;
+ u32 domain;
+ u32 type;
+ u32 num_partitions;
+ u32 reserved[3];
+ u32 reserved2[2]; /* The struct grew by 8 bytes at some point */
+} __packed;
+
+struct smem_ram_ptable {
+ struct smem_ram_ptable_hdr hdr;
+ u32 reserved; /* Added for 8 bytes alignment of header */
+ struct smem_ram_ptn parts[RAM_NUM_PART_ENTRIES];
+} __packed;
+
int dram_init(void)
{
/*
* gd->ram_base / ram_size have been setup already
@@ -47,8 +80,12 @@ static void qcom_configure_bi_dram(void)
for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
gd->bd->bi_dram[i].start = prevbl_ddr_banks[i].start;
gd->bd->bi_dram[i].size = prevbl_ddr_banks[i].size;
+ debug("Bank[%d]: start = %#011llx, size = %#011llx\n",
+ i, gd->bd->bi_dram[i].start, gd->bd->bi_dram[i].size);
+ if (!prevbl_ddr_banks[i].size)
+ break;
}
}
int dram_init_banksize(void)
@@ -57,8 +94,48 @@ int dram_init_banksize(void)
return 0;
}
+/* Parse memory map from SMEM, return the number of entries */
+static int qcom_parse_memory_smem(phys_addr_t *ram_end)
+{
+ size_t size;
+ int i, j = 0, ret;
+ struct smem_ram_ptable *ram_ptable;
+ struct smem_ram_ptn *p;
+
+ ret = qcom_smem_init();
+ if (ret) {
+ debug("Failed to initialize SMEM: %d.\n", ret);
+ return ret;
+ }
+
+ ram_ptable = qcom_smem_get(QCOM_SMEM_HOST_ANY, SMEM_USABLE_RAM_PARTITION_TABLE, &size);
+ if (!ram_ptable) {
+ debug("Failed to find SMEM partition.\n");
+ return -ENODEV;
+ }
+
+ /* Check validy of RAM */
+ for (i = 0; i < RAM_NUM_PART_ENTRIES && j < CONFIG_NR_DRAM_BANKS; i++) {
+ p = &ram_ptable->parts[i];
+ if (p->category != CATEGORY_SDRAM || p->type != TYPE_SYSMEM)
+ continue;
+ if (!p->size && !p->start)
+ break;
+
+ prevbl_ddr_banks[j].start = p->start;
+ prevbl_ddr_banks[j].size = p->size;
+ *ram_end = max(*ram_end, prevbl_ddr_banks[j].start + prevbl_ddr_banks[j].size);
+ j++;
+ }
+
+ if (j == CONFIG_NR_DRAM_BANKS)
+ log_err("SMEM: More than CONFIG_NR_DRAM_BANKS (%u) entries!", CONFIG_NR_DRAM_BANKS);
+
+ return j;
+}
+
static void qcom_parse_memory_dt(const fdt64_t *memory, int banks, phys_addr_t *ram_end)
{
int i, j;
@@ -76,10 +153,23 @@ static void qcom_parse_memory_dt(const fdt64_t *memory, int banks, phys_addr_t *
*ram_end = max(*ram_end, prevbl_ddr_banks[j].start + prevbl_ddr_banks[j].size);
}
}
-/* Parse the memory layout from the FDT. */
-void qcom_parse_memory(void)
+/*
+ * Parse the memory layout from FDT or SMEM:
+ *
+ * If using an internal FDT (where the memory map must have
+ * been written by hand) then we prefer using the layout from
+ * there. This allows overriding SMEM.
+ *
+ * If using an external FDT (coming from ABL), we prefer SMEM
+ * since it is likely to be more accurate / simple, especially
+ * on newer platforms.
+ *
+ * If SMEM parsing fails, we always try to fall back to FDT.
+ *
+ */
+void qcom_parse_memory(bool fdt_is_internal)
{
ofnode node;
const fdt64_t *memory;
int memsize;
@@ -103,10 +193,18 @@ void qcom_parse_memory(void)
log_err("Provided more than the max of %d memory banks\n", CONFIG_NR_DRAM_BANKS);
qcom_parse_memory_dt(memory, banks, &ram_end);
- debug("%d banks, ram_base = %#011lx, ram_size = %#011llx, ram_end = %#011llx\n",
- banks, gd->ram_base, gd->ram_size, ram_end);
+ /*
+ * If using an internal FDT but the memory node is empty
+ * then fall back to SMEM.
+ */
+ if (!prevbl_ddr_banks[0].size && fdt_is_internal) {
+ banks = qcom_parse_memory_smem(&ram_end);
+ if (banks < 0)
+ panic("Couldn't find a valid memory map!\n");
+ }
+
/* Sort our RAM banks -_- */
qsort(prevbl_ddr_banks, banks, sizeof(prevbl_ddr_banks[0]), ddr_bank_cmp);
gd->ram_base = prevbl_ddr_banks[0].start;
diff --git a/arch/arm/mach-snapdragon/qcom-priv.h b/arch/arm/mach-snapdragon/qcom-priv.h
index b7f3bf798d3c..690557463642 100644
--- a/arch/arm/mach-snapdragon/qcom-priv.h
+++ b/arch/arm/mach-snapdragon/qcom-priv.h
@@ -2,8 +2,10 @@
#ifndef __QCOM_PRIV_H__
#define __QCOM_PRIV_H__
+#include <stdbool.h>
+
#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT)
void qcom_configure_capsule_updates(void);
#else
void qcom_configure_capsule_updates(void) {}
@@ -22,7 +24,7 @@ static inline void qcom_of_fixup_nodes(void)
log_debug("Unable to dynamically fixup USB nodes, please enable CONFIG_OF_LIVE\n");
}
#endif /* OF_LIVE */
-void qcom_parse_memory(void);
+void qcom_parse_memory(bool fdt_is_internal);
#endif /* __QCOM_PRIV_H__ */
--
2.47.0
^ permalink raw reply related [flat|nested] 35+ messages in thread* Re: [PATCH 13/15] mach-snapdragon: support parsing memory map from SMEM
2024-11-24 19:17 ` [PATCH 13/15] mach-snapdragon: support parsing memory map from SMEM Caleb Connolly
@ 2025-01-07 15:32 ` Simon Glass
2025-01-08 9:41 ` Stephan Gerhold
1 sibling, 0 replies; 35+ messages in thread
From: Simon Glass @ 2025-01-07 15:32 UTC (permalink / raw)
To: Caleb Connolly
Cc: Rayagonda Kokatanur, Tom Rini, Neil Armstrong, Sumit Garg,
Mario Six, u-boot, u-boot-qcom
On Sun, 24 Nov 2024 at 12:18, Caleb Connolly <caleb.connolly@linaro.org> wrote:
>
> It is possible to derive the memory map for a Qualcomm platform from the
> SMEM shared memory region. The memory map is populated by the preloader.
>
> Introduce support for parsing this data and using it to populate
> U-Boot's memory map. Since we aren't yet sure if this will work for
> every platform, it is not yet used in all cases, if U-Boot is booted
> with an internal FDT which has the memory map defined, this will
> be used instead.
>
> If the FDT comes from ABL, or we're using an internal FDT with no memory
> map defined, then U-Boot will try to use SMEM. This should remove the
> need to define the memory map statically in a U-Boot overlay DT for most
> boards.
>
> Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
> ---
> arch/arm/mach-snapdragon/board.c | 2 +-
> arch/arm/mach-snapdragon/dram.c | 106 +++++++++++++++++++++++++++++++++--
comment again:
> arch/arm/mach-snapdragon/qcom-priv.h | 4 +-
> 3 files changed, 106 insertions(+), 6 deletions(-)
>
Reviewed-by: Simon Glass <sjg@chromium.org>
^ permalink raw reply [flat|nested] 35+ messages in thread
* Re: [PATCH 13/15] mach-snapdragon: support parsing memory map from SMEM
2024-11-24 19:17 ` [PATCH 13/15] mach-snapdragon: support parsing memory map from SMEM Caleb Connolly
2025-01-07 15:32 ` Simon Glass
@ 2025-01-08 9:41 ` Stephan Gerhold
1 sibling, 0 replies; 35+ messages in thread
From: Stephan Gerhold @ 2025-01-08 9:41 UTC (permalink / raw)
To: Caleb Connolly
Cc: Rayagonda Kokatanur, Tom Rini, Simon Glass, Neil Armstrong,
Sumit Garg, Mario Six, u-boot, u-boot-qcom
On Sun, Nov 24, 2024 at 08:17:55PM +0100, Caleb Connolly wrote:
> It is possible to derive the memory map for a Qualcomm platform from the
> SMEM shared memory region. The memory map is populated by the preloader.
>
> Introduce support for parsing this data and using it to populate
> U-Boot's memory map. Since we aren't yet sure if this will work for
> every platform, it is not yet used in all cases, if U-Boot is booted
> with an internal FDT which has the memory map defined, this will
> be used instead.
>
> If the FDT comes from ABL, or we're using an internal FDT with no memory
> map defined, then U-Boot will try to use SMEM. This should remove the
> need to define the memory map statically in a U-Boot overlay DT for most
> boards.
>
> Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
> ---
> arch/arm/mach-snapdragon/board.c | 2 +-
> arch/arm/mach-snapdragon/dram.c | 106 +++++++++++++++++++++++++++++++++--
> arch/arm/mach-snapdragon/qcom-priv.h | 4 +-
> 3 files changed, 106 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm/mach-snapdragon/board.c b/arch/arm/mach-snapdragon/board.c
> index 8d171957b852..269d39e4f6e1 100644
> --- a/arch/arm/mach-snapdragon/board.c
> +++ b/arch/arm/mach-snapdragon/board.c
> @@ -85,9 +85,9 @@ void *board_fdt_blob_setup(int *err)
> /*
> * Parse the /memory node while we're here,
> * this makes it easy to do other things early.
> */
> - qcom_parse_memory();
> + qcom_parse_memory(internal_valid);
>
> return (void *)gd->fdt_blob;
> }
>
> diff --git a/arch/arm/mach-snapdragon/dram.c b/arch/arm/mach-snapdragon/dram.c
> index c4c60039cb4c..ef226e000858 100644
> --- a/arch/arm/mach-snapdragon/dram.c
> +++ b/arch/arm/mach-snapdragon/dram.c
> @@ -9,14 +9,47 @@
> #include <asm-generic/unaligned.h>
> #include <dm.h>
> #include <log.h>
> #include <sort.h>
> +#include <soc/qcom/smem.h>
> +
> +#define SMEM_USABLE_RAM_PARTITION_TABLE 402
> +#define RAM_PART_NAME_LENGTH 16
> +#define RAM_NUM_PART_ENTRIES 32
> +#define CATEGORY_SDRAM 0x0E
> +#define TYPE_SYSMEM 0x01
>
> static struct {
> phys_addr_t start;
> phys_size_t size;
> } prevbl_ddr_banks[CONFIG_NR_DRAM_BANKS] __section(".data") = { 0 };
>
> +struct smem_ram_ptable_hdr {
> + u32 magic[2];
> + u32 version;
> + u32 reserved;
> + u32 len;
> +} __packed;
> +
> +struct smem_ram_ptn {
> + char name[RAM_PART_NAME_LENGTH];
> + u64 start;
> + u64 size;
> + u32 attr;
> + u32 category;
> + u32 domain;
> + u32 type;
> + u32 num_partitions;
> + u32 reserved[3];
> + u32 reserved2[2]; /* The struct grew by 8 bytes at some point */
> +} __packed;
This looks like smem_ram_ptn_v2, as defined in LK:
https://github.com/msm8916-mainline/lk2nd/blob/5e6f1adcb1c070e28a70dc1f3d807ce9538f61c5/platform/msm_shared/smem.h#L620-L660
We need to add a check for smem_ram_ptable_hdr->version and handle the
older structs as well. DB410c has version 1, which is missing the 8
bytes noted in the comment above. This makes it misbehave quite badly...
If I drop the u32 reserved2[2] above it works well though, and correctly
handles variants of DB410c with 2 GiB instead of 1 GiB RAM.
Perhaps it's enough to handle _v1 and _v2 for now. v0 has 32-bit
start/size fields on old SoCs, not sure if anyone is trying to run
U-Boot on these at the moment.
Thanks,
Stephan
^ permalink raw reply [flat|nested] 35+ messages in thread
* [PATCH 14/15] mach-snapdragon: fetch serial# from SMEM
2024-11-24 19:17 [PATCH 00/15] qcom: smem: modernize SMEM in U-Boot Caleb Connolly
` (12 preceding siblings ...)
2024-11-24 19:17 ` [PATCH 13/15] mach-snapdragon: support parsing memory map from SMEM Caleb Connolly
@ 2024-11-24 19:17 ` Caleb Connolly
2025-01-07 15:32 ` Simon Glass
2024-11-24 19:17 ` [PATCH 15/15] qcom_defconfig: enable QCOM_SMEM Caleb Connolly
14 siblings, 1 reply; 35+ messages in thread
From: Caleb Connolly @ 2024-11-24 19:17 UTC (permalink / raw)
To: Rayagonda Kokatanur, Tom Rini, Simon Glass, Caleb Connolly,
Neil Armstrong, Sumit Garg, Mario Six
Cc: u-boot, u-boot-qcom
If available, otherwise fall back to cmdline.
Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
---
arch/arm/mach-snapdragon/board.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-snapdragon/board.c b/arch/arm/mach-snapdragon/board.c
index 269d39e4f6e1..dbac8aa2709a 100644
--- a/arch/arm/mach-snapdragon/board.c
+++ b/arch/arm/mach-snapdragon/board.c
@@ -30,8 +30,9 @@
#include <malloc.h>
#include <fdt_support.h>
#include <usb.h>
#include <sort.h>
+#include <soc/qcom/smem.h>
#include <time.h>
#include "qcom-priv.h"
@@ -198,11 +199,16 @@ static const char *get_cmdline(void)
}
void qcom_set_serialno(void)
{
- const char *cmdline = get_cmdline();
+ const char *cmdline;
char serial[32];
+ if (!qcom_socinfo_init())
+ return;
+
+ cmdline = get_cmdline();
+
if (!cmdline) {
log_debug("Failed to get bootargs\n");
return;
}
@@ -353,8 +359,11 @@ int board_late_init(void)
/* By default copy U-Boots FDT, it will be used as a fallback */
memcpy((void *)addr, (void *)gd->fdt_blob, fdt32_to_cpu(fdt_blob->totalsize));
+ /* Initialise SMEM if it wasn't done already */
+ qcom_smem_init();
+
configure_env();
qcom_late_init();
/* Configure the dfu_string for capsule updates */
--
2.47.0
^ permalink raw reply related [flat|nested] 35+ messages in thread* Re: [PATCH 14/15] mach-snapdragon: fetch serial# from SMEM
2024-11-24 19:17 ` [PATCH 14/15] mach-snapdragon: fetch serial# " Caleb Connolly
@ 2025-01-07 15:32 ` Simon Glass
2025-01-08 15:03 ` Caleb Connolly
0 siblings, 1 reply; 35+ messages in thread
From: Simon Glass @ 2025-01-07 15:32 UTC (permalink / raw)
To: Caleb Connolly
Cc: Rayagonda Kokatanur, Tom Rini, Neil Armstrong, Sumit Garg,
Mario Six, u-boot, u-boot-qcom
Hi Caleb,
On Sun, 24 Nov 2024 at 12:18, Caleb Connolly <caleb.connolly@linaro.org> wrote:
>
> If available, otherwise fall back to cmdline.
>
> Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
> ---
> arch/arm/mach-snapdragon/board.c | 11 ++++++++++-
> 1 file changed, 10 insertions(+), 1 deletion(-)
>
Reviewed-by: Simon Glass <sjg@chromium.org>
Thoughts below
> diff --git a/arch/arm/mach-snapdragon/board.c b/arch/arm/mach-snapdragon/board.c
> index 269d39e4f6e1..dbac8aa2709a 100644
> --- a/arch/arm/mach-snapdragon/board.c
> +++ b/arch/arm/mach-snapdragon/board.c
> @@ -30,8 +30,9 @@
> #include <malloc.h>
> #include <fdt_support.h>
> #include <usb.h>
> #include <sort.h>
> +#include <soc/qcom/smem.h>
> #include <time.h>
>
> #include "qcom-priv.h"
>
> @@ -198,11 +199,16 @@ static const char *get_cmdline(void)
> }
>
> void qcom_set_serialno(void)
> {
> - const char *cmdline = get_cmdline();
> + const char *cmdline;
> char serial[32];
>
> + if (!qcom_socinfo_init())
Hmmm that function should return an error code, i.e. 0 on success.
Does Linux use a boot interface here?
> + return;
Shouldn't this return an error?
> +
> + cmdline = get_cmdline();
> +
drop blank line
> if (!cmdline) {
> log_debug("Failed to get bootargs\n");
Shouldn't this be an error? If not, please add a comment.
> return;
> }
> @@ -353,8 +359,11 @@ int board_late_init(void)
>
> /* By default copy U-Boots FDT, it will be used as a fallback */
> memcpy((void *)addr, (void *)gd->fdt_blob, fdt32_to_cpu(fdt_blob->totalsize));
>
> + /* Initialise SMEM if it wasn't done already */
> + qcom_smem_init();
> +
> configure_env();
> qcom_late_init();
>
> /* Configure the dfu_string for capsule updates */
>
> --
> 2.47.0
>
Regards,
Simon
^ permalink raw reply [flat|nested] 35+ messages in thread* Re: [PATCH 14/15] mach-snapdragon: fetch serial# from SMEM
2025-01-07 15:32 ` Simon Glass
@ 2025-01-08 15:03 ` Caleb Connolly
0 siblings, 0 replies; 35+ messages in thread
From: Caleb Connolly @ 2025-01-08 15:03 UTC (permalink / raw)
To: Simon Glass
Cc: Rayagonda Kokatanur, Tom Rini, Neil Armstrong, Sumit Garg,
Mario Six, u-boot, u-boot-qcom
On 07/01/2025 16:32, Simon Glass wrote:
> Hi Caleb,
>
> On Sun, 24 Nov 2024 at 12:18, Caleb Connolly <caleb.connolly@linaro.org> wrote:
>>
>> If available, otherwise fall back to cmdline.
>>
>> Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
>> ---
>> arch/arm/mach-snapdragon/board.c | 11 ++++++++++-
>> 1 file changed, 10 insertions(+), 1 deletion(-)
>>
>
> Reviewed-by: Simon Glass <sjg@chromium.org>
>
> Thoughts below
>
>> diff --git a/arch/arm/mach-snapdragon/board.c b/arch/arm/mach-snapdragon/board.c
>> index 269d39e4f6e1..dbac8aa2709a 100644
>> --- a/arch/arm/mach-snapdragon/board.c
>> +++ b/arch/arm/mach-snapdragon/board.c
>> @@ -30,8 +30,9 @@
>> #include <malloc.h>
>> #include <fdt_support.h>
>> #include <usb.h>
>> #include <sort.h>
>> +#include <soc/qcom/smem.h>
>> #include <time.h>
>>
>> #include "qcom-priv.h"
>>
>> @@ -198,11 +199,16 @@ static const char *get_cmdline(void)
>> }
>>
>> void qcom_set_serialno(void)
>> {
>> - const char *cmdline = get_cmdline();
>> + const char *cmdline;
>> char serial[32];
>>
>> + if (!qcom_socinfo_init())
>
> Hmmm that function should return an error code, i.e. 0 on success.
> Does Linux use a boot interface here?
the name of this function isn't great, what it actually does it retrieve
the serial number from smem and set serial#, returning 0 on success
(meaning the serial number is set, so we have nothing else to do).
>
>> + return;
>
> Shouldn't this return an error?
>
>> +
>> + cmdline = get_cmdline();
>> +
>
> drop blank line
>
>> if (!cmdline) {
>> log_debug("Failed to get bootargs\n");
>
> Shouldn't this be an error? If not, please add a comment.
bootargs are only available when we're chainloading from ABL (something
we can't easily detect at runtime). I would eventually like to drop this
and rely on smem only ideally. But that's quite unrelated to this series.
>
>> return;
>> }
>> @@ -353,8 +359,11 @@ int board_late_init(void)
>>
>> /* By default copy U-Boots FDT, it will be used as a fallback */
>> memcpy((void *)addr, (void *)gd->fdt_blob, fdt32_to_cpu(fdt_blob->totalsize));
>>
>> + /* Initialise SMEM if it wasn't done already */
>> + qcom_smem_init();
>> +
>> configure_env();
>> qcom_late_init();
>>
>> /* Configure the dfu_string for capsule updates */
>>
>> --
>> 2.47.0
>>
>
> Regards,
> Simon
--
// Caleb (they/them)
^ permalink raw reply [flat|nested] 35+ messages in thread
* [PATCH 15/15] qcom_defconfig: enable QCOM_SMEM
2024-11-24 19:17 [PATCH 00/15] qcom: smem: modernize SMEM in U-Boot Caleb Connolly
` (13 preceding siblings ...)
2024-11-24 19:17 ` [PATCH 14/15] mach-snapdragon: fetch serial# " Caleb Connolly
@ 2024-11-24 19:17 ` Caleb Connolly
2025-01-08 16:57 ` Simon Glass
14 siblings, 1 reply; 35+ messages in thread
From: Caleb Connolly @ 2024-11-24 19:17 UTC (permalink / raw)
To: Rayagonda Kokatanur, Tom Rini, Simon Glass, Caleb Connolly,
Neil Armstrong, Sumit Garg, Mario Six
Cc: u-boot, u-boot-qcom
Used to parse memory layout in some situations.
Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
---
configs/qcom_defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/configs/qcom_defconfig b/configs/qcom_defconfig
index 30f7b1c773fa..b49d897123c1 100644
--- a/configs/qcom_defconfig
+++ b/configs/qcom_defconfig
@@ -109,8 +109,9 @@ CONFIG_MSM_SERIAL=y
CONFIG_MSM_GENI_SERIAL=y
CONFIG_SOC_QCOM=y
CONFIG_QCOM_COMMAND_DB=y
CONFIG_QCOM_RPMH=y
+CONFIG_QCOM_SMEM=y
CONFIG_SPMI_MSM=y
CONFIG_SYSINFO=y
CONFIG_SYSINFO_SMBIOS=y
CONFIG_USB=y
--
2.47.0
^ permalink raw reply related [flat|nested] 35+ messages in thread* Re: [PATCH 15/15] qcom_defconfig: enable QCOM_SMEM
2024-11-24 19:17 ` [PATCH 15/15] qcom_defconfig: enable QCOM_SMEM Caleb Connolly
@ 2025-01-08 16:57 ` Simon Glass
0 siblings, 0 replies; 35+ messages in thread
From: Simon Glass @ 2025-01-08 16:57 UTC (permalink / raw)
To: Caleb Connolly
Cc: Rayagonda Kokatanur, Tom Rini, Neil Armstrong, Sumit Garg,
Mario Six, u-boot, u-boot-qcom
On Sun, 24 Nov 2024 at 12:18, Caleb Connolly <caleb.connolly@linaro.org> wrote:
>
> Used to parse memory layout in some situations.
>
> Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
> ---
> configs/qcom_defconfig | 1 +
> 1 file changed, 1 insertion(+)
Reviewed-by: Simon Glass <sjg@chromium.org>
>
> diff --git a/configs/qcom_defconfig b/configs/qcom_defconfig
> index 30f7b1c773fa..b49d897123c1 100644
> --- a/configs/qcom_defconfig
> +++ b/configs/qcom_defconfig
> @@ -109,8 +109,9 @@ CONFIG_MSM_SERIAL=y
> CONFIG_MSM_GENI_SERIAL=y
> CONFIG_SOC_QCOM=y
> CONFIG_QCOM_COMMAND_DB=y
> CONFIG_QCOM_RPMH=y
> +CONFIG_QCOM_SMEM=y
> CONFIG_SPMI_MSM=y
> CONFIG_SYSINFO=y
> CONFIG_SYSINFO_SMBIOS=y
> CONFIG_USB=y
>
> --
> 2.47.0
>
^ permalink raw reply [flat|nested] 35+ messages in thread