Commit f2539e14 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-ipa-a-few-bug-fixes' 

Alex Elder says:

====================
net: ipa: a few bug fixes

This series fixes four minor bugs.  The first two are things that
sparse points out.  All four are very simple and each patch should
explain itself pretty well.
====================

Link: https://lore.kernel.org/r/20210201232609.3524451-1-elder@linaro.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 4ace7a6e 113b6ea0

drivers/net/ipa/gsi.c

+1 −1
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ static void gsi_evt_ring_de_alloc_command(struct gsi *gsi, u32 evt_ring_id) 
static enum gsi_channel_state gsi_channel_state(struct gsi_channel *channel)

{

	u32 channel_id = gsi_channel_id(channel);

	void *virt = channel->gsi->virt;

	void __iomem *virt = channel->gsi->virt;

	u32 val;



	val = ioread32(virt + GSI_CH_C_CNTXT_0_OFFSET(channel_id));

drivers/net/ipa/ipa_endpoint.c

+3 −3
Original line number Diff line number Diff line
@@ -588,7 +588,7 @@ static void ipa_endpoint_init_hdr_metadata_mask(struct ipa_endpoint *endpoint) 


	/* Note that HDR_ENDIANNESS indicates big endian header fields */

	if (endpoint->data->qmap)

		val = cpu_to_be32(IPA_ENDPOINT_QMAP_METADATA_MASK);

		val = (__force u32)cpu_to_be32(IPA_ENDPOINT_QMAP_METADATA_MASK);



	iowrite32(val, endpoint->ipa->reg_virt + offset);

}
@@ -1164,7 +1164,7 @@ static bool ipa_endpoint_status_skip(struct ipa_endpoint *endpoint, 
		return true;

	if (!status->pkt_len)

		return true;

	endpoint_id = u32_get_bits(status->endp_dst_idx,

	endpoint_id = u8_get_bits(status->endp_dst_idx,

				  IPA_STATUS_DST_IDX_FMASK);

	if (endpoint_id != endpoint->endpoint_id)

		return true;

drivers/net/ipa/ipa_mem.c

+2 −2
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ static void ipa_imem_exit(struct ipa *ipa) 


		size = iommu_unmap(domain, ipa->imem_iova, ipa->imem_size);

		if (size != ipa->imem_size)

			dev_warn(dev, "unmapped %zu IMEM bytes, expected %lu\n",

			dev_warn(dev, "unmapped %zu IMEM bytes, expected %zu\n",

				 size, ipa->imem_size);

	} else {

		dev_err(dev, "couldn't get IPA IOMMU domain for IMEM\n");
@@ -440,7 +440,7 @@ static void ipa_smem_exit(struct ipa *ipa) 


		size = iommu_unmap(domain, ipa->smem_iova, ipa->smem_size);

		if (size != ipa->smem_size)

			dev_warn(dev, "unmapped %zu SMEM bytes, expected %lu\n",

			dev_warn(dev, "unmapped %zu SMEM bytes, expected %zu\n",

				 size, ipa->smem_size);



	} else {