From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9FA5B4399E8 for ; Wed, 22 Jul 2026 18:07:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784743681; cv=none; b=ZJ3MjnFrX80SjpRDvKb0sFcd1AaAdOMlhHfCUKVulBFzQlnvvn51KYtXnwNjZSMJONbv3lR5+/OhxmD5m1ryFNQYnGspoQDylhArIdF6aIh7uTqQnOC5x0rtfBPfQYxcPio5H3cOjVcvFD1T+jniYix8DpJ4QU5AJw844oGcXfw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784743681; c=relaxed/simple; bh=TpE8QClr+OwJyQhNTJ67DLJl9MRQBJxYCmu8d+Q9yt8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mnSDiikXzbtPvjQ/KXolENraAprKvgOk9li91fWqwuUd3QFIXy2iuRgqZw5Nci7m/XUOSQDd01od1jyTNdbAtdDYFqVMWzWckrz0LbfDmNG777unZCxH40K/ZMEaTB90WocnuYlTez5dun4+nJCe5Ly0A9rarFaU0J5vG7gjZiM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dJ4d2bOZ; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="dJ4d2bOZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 633891F00A3A; Wed, 22 Jul 2026 18:07:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1784743679; bh=z4F6ZLG/E8o4yZd2gtAI+T0kw9NHXB98FjCaHi0o1Hw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dJ4d2bOZ+Ke1srAkmdK7SlLhkG8rJdWWcdFNbP8GioHSY1V3c243gpseoe+8MFqT8 EY6RQaW02BoAe/RROQ1ULX2L3iFK5u8S8x9FIf/PrV2oV1jypaXYgRMskbCj5HZe+K qjfUPG4+v0ad8Jrvb8VH0l9ji62cGiiP1YJ+wwi+amj0MFbhBn95dhuyOpJYI4iK7W BFjyJKFAYBTUIwb6wYwWIdzOQ9merfmo0uSQr2W8A8TZbBkbzryIwwVDJ3L3dS/6xd 7Ktqf4UTHjnVLfZ3eNOzUl0R1Kp/+Gz5TrCtbGT0ZPDikij2Pk5+UKLwNT4xMbQrvL +ey/VslSDznWw== From: Sasha Levin To: stable@vger.kernel.org Cc: Subbaraya Sundeep , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.12.y 1/2] octeontx2: Annotate mmio regions as __iomem Date: Wed, 22 Jul 2026 14:07:56 -0400 Message-ID: <20260722180757.2202348-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026072013-trivial-overlaid-d42a@gregkh> References: <2026072013-trivial-overlaid-d42a@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Subbaraya Sundeep [ Upstream commit d0976b43956ee8c8bd093223df9115bfcf63dfe5 ] This patch removes unnecessary typecasts by marking the mbox_regions array as __iomem since it is used to store pointers to memory-mapped I/O (MMIO) regions. Also simplified the call to readq() in PF driver by removing redundant type casts. Signed-off-by: Subbaraya Sundeep Link: https://patch.msgid.link/1749484309-3434-1-git-send-email-sbhatta@marvell.com Signed-off-by: Jakub Kicinski Stable-dep-of: f918554fb724 ("octeontx2-pf: clear stale mailbox IRQ state before request_irq()") Signed-off-by: Sasha Levin --- drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 12 ++++++------ drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 3 +-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu.c index df662d07a5e9c7..cafd4ad3ed25a4 100644 --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu.c +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu.c @@ -2401,7 +2401,7 @@ static inline void rvu_afvf_mbox_up_handler(struct work_struct *work) __rvu_mbox_up_handler(mwork, TYPE_AFVF); } -static int rvu_get_mbox_regions(struct rvu *rvu, void **mbox_addr, +static int rvu_get_mbox_regions(struct rvu *rvu, void __iomem **mbox_addr, int num, int type, unsigned long *pf_bmap) { struct rvu_hwinfo *hw = rvu->hw; @@ -2426,7 +2426,7 @@ static int rvu_get_mbox_regions(struct rvu *rvu, void **mbox_addr, bar4 = rvupf_read64(rvu, RVU_PF_VF_BAR4_ADDR); bar4 += region * MBOX_SIZE; } - mbox_addr[region] = (void *)ioremap_wc(bar4, MBOX_SIZE); + mbox_addr[region] = ioremap_wc(bar4, MBOX_SIZE); if (!mbox_addr[region]) goto error; } @@ -2449,7 +2449,7 @@ static int rvu_get_mbox_regions(struct rvu *rvu, void **mbox_addr, RVU_AF_PF_BAR4_ADDR); bar4 += region * MBOX_SIZE; } - mbox_addr[region] = (void *)ioremap_wc(bar4, MBOX_SIZE); + mbox_addr[region] = ioremap_wc(bar4, MBOX_SIZE); if (!mbox_addr[region]) goto error; } @@ -2457,7 +2457,7 @@ static int rvu_get_mbox_regions(struct rvu *rvu, void **mbox_addr, error: while (region--) - iounmap((void __iomem *)mbox_addr[region]); + iounmap(mbox_addr[region]); return -ENOMEM; } @@ -2467,10 +2467,10 @@ static int rvu_mbox_init(struct rvu *rvu, struct mbox_wq_info *mw, void (mbox_up_handler)(struct work_struct *)) { int err = -EINVAL, i, dir, dir_up; + void __iomem **mbox_regions; void __iomem *reg_base; struct rvu_work *mwork; unsigned long *pf_bmap; - void **mbox_regions; const char *name; u64 cfg; @@ -2493,7 +2493,7 @@ static int rvu_mbox_init(struct rvu *rvu, struct mbox_wq_info *mw, mutex_init(&rvu->mbox_lock); - mbox_regions = kcalloc(num, sizeof(void *), GFP_KERNEL); + mbox_regions = kcalloc(num, sizeof(void __iomem *), GFP_KERNEL); if (!mbox_regions) { err = -ENOMEM; goto free_bitmap; diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c index ce01fab28624f2..9274c60ddeedb8 100644 --- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c +++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c @@ -593,8 +593,7 @@ static int otx2_pfvf_mbox_init(struct otx2_nic *pf, int numvfs) base = pci_resource_start(pf->pdev, PCI_MBOX_BAR_NUM) + MBOX_SIZE; else - base = readq((void __iomem *)((u64)pf->reg_base + - RVU_PF_VF_BAR4_ADDR)); + base = readq(pf->reg_base + RVU_PF_VF_BAR4_ADDR); hwbase = ioremap_wc(base, MBOX_SIZE * pf->total_vfs); if (!hwbase) { -- 2.53.0