Skip to contentSkip to conversation

net: wwan: iosm: fix dma_alloc_coherent incompatible pointer type

PATCH Applied [email protected] 2 participants 2 messages Nov 24, 2022 – Nov 29, 2022

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH v2 2/4 net: wwan: iosm: fix dma_alloc_coherent incompatible pointer type

From: M Chetan Kumar <[email protected]>

Fix build error reported on armhf while preparing 6.1-rc5 for Debian.

iosm_ipc_protocol.c:244:36: error: passing argument 3 of 'dma_alloc_coherent' from incompatible pointer type.

Change phy_ap_shm type from phys_addr_t to dma_addr_t.

Fixes faed4c6f6f48 ("net: iosm: shared memory protocol")

--
v2: No Change.

---
 drivers/net/wwan/iosm/iosm_ipc_protocol.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wwan/iosm/iosm_ipc_protocol.h +1 -1
index 9b3a6d86ece7..289397c4ea6c 100644
@@ -122,7 +122,7 @@ struct iosm_protocol {
 	struct iosm_imem *imem;
 	struct ipc_rsp *rsp_ring[IPC_MEM_MSG_ENTRIES];
 	struct device *dev;
-	phys_addr_t phy_ap_shm;
+	dma_addr_t phy_ap_shm;
 	u32 old_msg_tail;
 };
 
Signature · 1 line
2.34.1
Tested-by on v2 2/4
#1 lore raw

Hi,

Quoted 24 lines · On Thu, Nov 24, 2022 at 04:08:03PM +0530, [email protected] wrote:

From: M Chetan Kumar <[email protected]>

Fix build error reported on armhf while preparing 6.1-rc5 for Debian.

iosm_ipc_protocol.c:244:36: error: passing argument 3 of 'dma_alloc_coherent' from incompatible pointer type.

Change phy_ap_shm type from phys_addr_t to dma_addr_t.

Fixes faed4c6f6f48 ("net: iosm: shared memory protocol")

--
v2: No Change.

---
 drivers/net/wwan/iosm/iosm_ipc_protocol.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wwan/iosm/iosm_ipc_protocol.h +0 -0
index 9b3a6d86ece7..289397c4ea6c 100644

drivers/net/wwan/iosm/iosm_ipc_protocol.h struct iosm_protocol { · line 127

Quoted 7 lines
drivers/net/wwan/iosm/iosm_ipc_protocol.h +1 -1
@@ -122,7 +122,7 @@ struct iosm_protocol {
 	struct iosm_imem *imem;
 	struct ipc_rsp *rsp_ring[IPC_MEM_MSG_ENTRIES];
 	struct device *dev;
-	phys_addr_t phy_ap_shm;
+	dma_addr_t phy_ap_shm;
 	u32 old_msg_tail;
 };

FTR, confirmed now as well on the official build infrastrcture, with the commit applied:
https://buildd.debian.org/status/fetch.php?pkg=linux&arch=armhf&ver=6.1%7Erc6-1%7Eexp1&stamp=1669504139&raw=0

Regards,
Salvatore