Unverified Commit d8f2638b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'qcom-drivers-fixes-for-6.11' of... 

Merge tag 'qcom-drivers-fixes-for-6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes

Qualcomm driver fixes for v6.11

This corrects the tzmem virt-to-phys conversion, which caused issues for
the uefisecapp implementation of EFI variable access. SDM670 is excluded
from tzmem usage due to reported issues.

The SCM get wait queue context call is corrected to be marked ATOMIC and
some dead code in qseecom, following the tzmem conversion, is removed.

The memory backing command DB is remapped writecombined, to avoid XPU
violations when Linux runs without the Qualcomm hypervisor.

Two compile fixes are added for pd-mapper, and the broken reference
count is corrected, to make pd-mapper deal with remoteprocs going away.

In pmic_glink a race condition where the client callbacks might be
called before we returned the client handle is corrected. The broken conditions
for when to signal that the firmware is going down is also corrected.

In the pmic_glink UCSI driver, the ucsi_unregister() is moved out of the
pdr callback, as this is being invoked in atomic context.

Konrad's email address is updated in MAINTAINERS, and related mailmap
entries are added.

* tag 'qcom-drivers-fixes-for-6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  soc: qcom: pd-mapper: Fix singleton refcount
  firmware: qcom: tzmem: disable sdm670 platform
  soc: qcom: pmic_glink: Actually communicate when remote goes down
  usb: typec: ucsi: Move unregister out of atomic section
  soc: qcom: pmic_glink: Fix race during initialization
  firmware: qcom: qseecom: remove unused functions
  firmware: qcom: tzmem: fix virtual-to-physical address conversion
  firmware: qcom: scm: Mark get_wq_ctx() as atomic call
  MAINTAINERS: Update Konrad Dybcio's email address
  mailmap: Add an entry for Konrad Dybcio
  soc: qcom: pd-mapper: mark qcom_pdm_domains as __maybe_unused
  soc: qcom: cmd-db: Map shared memory as WC, not WB
  soc: qcom: pd-mapper: Depend on ARCH_QCOM || COMPILE_TEST

Link: https://lore.kernel.org/r/20240826145209.1646159-1-andersson@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 27795c50 c158ceb8

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -354,6 +354,8 @@ Kenneth Westfield <quic_kwestfie@quicinc.com> <kwestfie@codeaurora.org> 
Kiran Gunda <quic_kgunda@quicinc.com> <kgunda@codeaurora.org>

Kirill Tkhai <tkhai@ya.ru> <ktkhai@virtuozzo.com>

Kishon Vijay Abraham I <kishon@kernel.org> <kishon@ti.com>

Konrad Dybcio <konradybcio@kernel.org> <konrad.dybcio@linaro.org>

Konrad Dybcio <konradybcio@kernel.org> <konrad.dybcio@somainline.org>

Konstantin Khlebnikov <koct9i@gmail.com> <khlebnikov@yandex-team.ru>

Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>

Koushik <raghavendra.koushik@neterion.com>

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -2745,7 +2745,7 @@ F: include/linux/soc/qcom/ 








ARM/QUALCOMM SUPPORT









M:	Bjorn Andersson <andersson@kernel.org>









M:	Konrad Dybcio <konrad.dybcio@linaro.org>









M:	Konrad Dybcio <konradybcio@kernel.org>









L:	linux-arm-msm@vger.kernel.org









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git








@@ -7106,7 +7106,7 @@ F:	drivers/gpu/drm/tiny/panel-mipi-dbi.c







DRM DRIVER for Qualcomm Adreno GPUs









M:	Rob Clark <robdclark@gmail.com>









R:	Sean Paul <sean@poorly.run>









R:	Konrad Dybcio <konrad.dybcio@linaro.org>









R:	Konrad Dybcio <konradybcio@kernel.org>









L:	linux-arm-msm@vger.kernel.org









L:	dri-devel@lists.freedesktop.org









L:	freedreno@lists.freedesktop.org








@@ -18774,7 +18774,7 @@ F:	include/uapi/drm/qaic_accel.h















QUALCOMM CORE POWER REDUCTION (CPR) AVS DRIVER









M:	Bjorn Andersson <andersson@kernel.org>









M:	Konrad Dybcio <konrad.dybcio@linaro.org>









M:	Konrad Dybcio <konradybcio@kernel.org>









L:	linux-pm@vger.kernel.org









L:	linux-arm-msm@vger.kernel.org









S:	Maintained

























drivers/firmware/qcom/qcom_scm-smc.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -73,7 +73,7 @@ int scm_get_wq_ctx(u32 *wq_ctx, u32 *flags, u32 *more_pending)







	struct arm_smccc_res get_wq_res;









	struct arm_smccc_args get_wq_ctx = {0};



















	get_wq_ctx.args[0] = ARM_SMCCC_CALL_VAL(ARM_SMCCC_STD_CALL,









	get_wq_ctx.args[0] = ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL,









				ARM_SMCCC_SMC_64, ARM_SMCCC_OWNER_SIP,









				SCM_SMC_FNID(QCOM_SCM_SVC_WAITQ, QCOM_SCM_WAITQ_GET_WQ_CTX));










































drivers/firmware/qcom/qcom_tzmem.c



+22
−11






























Original line number
Diff line number
Diff line







@@ -40,7 +40,6 @@ struct qcom_tzmem_pool {







};



















struct qcom_tzmem_chunk {









	phys_addr_t paddr;









	size_t size;









	struct qcom_tzmem_pool *owner;









};








@@ -78,6 +77,7 @@ static bool qcom_tzmem_using_shm_bridge;







/* List of machines that are known to not support SHM bridge correctly. */









static const char *const qcom_tzmem_blacklist[] = {









	"qcom,sc8180x",









	"qcom,sdm670", /* failure in GPU firmware loading */









	"qcom,sdm845", /* reset in rmtfs memory assignment */









	"qcom,sm8150", /* reset in rmtfs memory assignment */









	NULL








@@ -385,7 +385,6 @@ void *qcom_tzmem_alloc(struct qcom_tzmem_pool *pool, size_t size, gfp_t gfp)







		return NULL;









	}



















	chunk->paddr = gen_pool_virt_to_phys(pool->genpool, vaddr);









	chunk->size = size;









	chunk->owner = pool;


















@@ -431,25 +430,37 @@ void qcom_tzmem_free(void *vaddr)







EXPORT_SYMBOL_GPL(qcom_tzmem_free);



















/**









 * qcom_tzmem_to_phys() - Map the virtual address of a TZ buffer to physical.









 * @vaddr: Virtual address of the buffer allocated from a TZ memory pool.









 * qcom_tzmem_to_phys() - Map the virtual address of TZ memory to physical.









 * @vaddr: Virtual address of memory allocated from a TZ memory pool.









 *









 * Can be used in any context. The address must have been returned by a call









 * to qcom_tzmem_alloc().









 * Can be used in any context. The address must point to memory allocated









 * using qcom_tzmem_alloc().









 *









 * Returns: Physical address of the buffer.









 * Returns:









 * Physical address mapped from the virtual or 0 if the mapping failed.









 */









phys_addr_t qcom_tzmem_to_phys(void *vaddr)









{









	struct qcom_tzmem_chunk *chunk;









	struct radix_tree_iter iter;









	void __rcu **slot;









	phys_addr_t ret;



















	guard(spinlock_irqsave)(&qcom_tzmem_chunks_lock);



















	chunk = radix_tree_lookup(&qcom_tzmem_chunks, (unsigned long)vaddr);









	if (!chunk)









		return 0;









	radix_tree_for_each_slot(slot, &qcom_tzmem_chunks, &iter, 0) {









		chunk = radix_tree_deref_slot_protected(slot,









						&qcom_tzmem_chunks_lock);



















		ret = gen_pool_virt_to_phys(chunk->owner->genpool,









					    (unsigned long)vaddr);









		if (ret == -1)









			continue;



















		return ret;









	}



















	return chunk->paddr;









	return 0;









}









EXPORT_SYMBOL_GPL(qcom_tzmem_to_phys);










































drivers/power/supply/qcom_battmgr.c



+10
−6






























Original line number
Diff line number
Diff line







@@ -1387,12 +1387,16 @@ static int qcom_battmgr_probe(struct auxiliary_device *adev,







					     "failed to register wireless charing power supply\n");









	}



















	battmgr->client = devm_pmic_glink_register_client(dev,









							  PMIC_GLINK_OWNER_BATTMGR,









	battmgr->client = devm_pmic_glink_client_alloc(dev, PMIC_GLINK_OWNER_BATTMGR,









						       qcom_battmgr_callback,









						       qcom_battmgr_pdr_notify,









						       battmgr);









	return PTR_ERR_OR_ZERO(battmgr->client);









	if (IS_ERR(battmgr->client))









		return PTR_ERR(battmgr->client);



















	pmic_glink_client_register(battmgr->client);



















	return 0;









}



















static const struct auxiliary_device_id qcom_battmgr_id_table[] = {