From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.19]) (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 B0CD03D5649 for ; Tue, 21 Apr 2026 17:55:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.19 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776794115; cv=none; b=MpSsls3egGfO0r+3KlHN/lIYzjw7BYO+ro4ovbEfR38vzpMR/zg7poyeShnPN+r32lFDMZLkGUOLP6B2wKS8OEL1v2xOFOxPxkVwJpQ+Mz+FgQXVlAdQE2xzTz8S58Pl0mZINZE6u/Eq3AGsLVJ1w920xohqS6438TYvUENv5Pc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776794115; c=relaxed/simple; bh=P0k+z6WGmFM1DEJlHBvodqoGoCPDUtAMrmw1EO5LtcE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gEJ/by5j1SIX1tBp+piRdZyqj/UjpGavh1x6Neke8wUNUpzbefsRGdPyJht4FlATjU/cRNKJ/6uEOQqtI+IM+JMN9vsusKBK149VEcG2dNt+Qi47OQlrmOXQBMQAR/8y7MnbdS76of27P/6i72vP99vLMvj0n/A03DDSiDmMDzg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=Y8Y73Sk5; arc=none smtp.client-ip=198.175.65.19 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Y8Y73Sk5" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1776794114; x=1808330114; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=P0k+z6WGmFM1DEJlHBvodqoGoCPDUtAMrmw1EO5LtcE=; b=Y8Y73Sk5u3jSn4XTtDXRe8f4n3sXWce0yHyH+B3zrAdG4bbh5cI/TVrR UzlwjnuEiDv7pyIiV2enL//ZOo73inYksSWuDNJCtBERd7/2JvLXOtSvm Lvq2aXSeKZ0YCehxVqDgDcT6TGUrTLELhBv3doGD7J+GtcKBc3v+buNWF rR4OTtrFtoosp3nouzW3cmVB9XfGjgp7r2zRF5sfyyn+uC1xgO2PEExXc 9dqusznUgb2gTGxxETK5mlnTLZ08c5vQJpGViwX1s3co9Qxfqq3a+MKL6 +zwpTmBtrc8TZMMb602+GMKp5RzMHvMuiTRirBLZWF7Gl94f1WZRWlXPh g==; X-CSE-ConnectionGUID: ZdBki2XkStmoP8gAAtXpkQ== X-CSE-MsgGUID: uMshJ6jKTSePaeID0uAXGw== X-IronPort-AV: E=McAfee;i="6800,10657,11763"; a="77651433" X-IronPort-AV: E=Sophos;i="6.23,192,1770624000"; d="scan'208";a="77651433" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by orvoesa111.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Apr 2026 10:55:14 -0700 X-CSE-ConnectionGUID: fUUpTz6YRTWsxDMIYUQyAQ== X-CSE-MsgGUID: rIy3YfAnQXqLIBMpgXsGQQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,192,1770624000"; d="scan'208";a="227495086" Received: from hrotuna-mobl2.ger.corp.intel.com (HELO ahunter6-desk) ([10.245.244.242]) by fmviesa006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Apr 2026 10:55:13 -0700 From: Adrian Hunter To: alexandre.belloni@bootlin.com Cc: Frank.Li@nxp.com, linux-i3c@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH V2 15/16] i3c: mipi-i3c-hci: Consolidate DMA ring allocation Date: Tue, 21 Apr 2026 20:54:34 +0300 Message-ID: <20260421175435.122094-16-adrian.hunter@intel.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260421175435.122094-1-adrian.hunter@intel.com> References: <20260421175435.122094-1-adrian.hunter@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: Intel Finland Oy, Registered Address: c/o Alberga Business Park, 6 krs, Bertel Jungin Aukio 5, 02600 Espoo, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Content-Transfer-Encoding: 8bit dma_alloc_coherent() allocates memory in whole pages, which can waste space when command and response queues are allocated separately. Allocate the DMA command and response queues from a single coherent allocation instead, while preserving the required 4-byte alignment. This reduces memory overhead without changing behavior. Signed-off-by: Adrian Hunter --- Changes in V2: Check for failed allocation before assignments to avoid doing arithmetic with NULL pointers drivers/i3c/master/mipi-i3c-hci/dma.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/drivers/i3c/master/mipi-i3c-hci/dma.c b/drivers/i3c/master/mipi-i3c-hci/dma.c index e169f20608a0..73fd86b6fb17 100644 --- a/drivers/i3c/master/mipi-i3c-hci/dma.c +++ b/drivers/i3c/master/mipi-i3c-hci/dma.c @@ -186,14 +186,12 @@ static void hci_dma_free(void *data) for (int i = 0; i < rings->total; i++) { rh = &rings->headers[i]; - if (rh->xfer) - dma_free_coherent(rings->sysdev, - rh->xfer_struct_sz * rh->xfer_entries, - rh->xfer, rh->xfer_dma); - if (rh->resp) - dma_free_coherent(rings->sysdev, - rh->resp_struct_sz * rh->xfer_entries, - rh->resp, rh->resp_dma); + if (rh->xfer) { + size_t sz = round_up(rh->xfer_struct_sz * rh->xfer_entries, 4); + + sz += rh->resp_struct_sz * rh->xfer_entries; + dma_free_coherent(rings->sysdev, sz, rh->xfer, rh->xfer_dma); + } kfree(rh->src_xfers); if (rh->ibi_status) dma_free_coherent(rings->sysdev, @@ -359,18 +357,18 @@ static int hci_dma_init(struct i3c_hci *hci) dev_dbg(&hci->master.dev, "xfer_struct_sz = %d, resp_struct_sz = %d", rh->xfer_struct_sz, rh->resp_struct_sz); - xfers_sz = rh->xfer_struct_sz * rh->xfer_entries; + xfers_sz = round_up(rh->xfer_struct_sz * rh->xfer_entries, 4); resps_sz = rh->resp_struct_sz * rh->xfer_entries; - rh->xfer = dma_alloc_coherent(rings->sysdev, xfers_sz, + rh->xfer = dma_alloc_coherent(rings->sysdev, xfers_sz + resps_sz, &rh->xfer_dma, GFP_KERNEL); - rh->resp = dma_alloc_coherent(rings->sysdev, resps_sz, - &rh->resp_dma, GFP_KERNEL); rh->src_xfers = kzalloc_objs(*rh->src_xfers, rh->xfer_entries); ret = -ENOMEM; - if (!rh->xfer || !rh->resp || !rh->src_xfers) + if (!rh->xfer || !rh->src_xfers) goto err_out; + rh->resp = rh->xfer + xfers_sz; + rh->resp_dma = rh->xfer_dma + xfers_sz; /* IBIs */ -- 2.51.0