From nobody Tue Apr 7 07:09:04 2026 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1CB8B37756D for ; Sun, 15 Mar 2026 17:27:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773595678; cv=none; b=Te25Uz6S3+HIWIvdo4Fge3L4lvL88jh02ysrJXx0Qrgg2IEFbl6VLDOxj1UMtyLMmFsbIDXascMW4ZH/5RpDQOX3V3/1zwtar1alUNAx6AwLWrnttwJQQCn8KA6jlgonb8vXy1VyA5EqQkdsrHPPF74WijzQgrgb9VbREbZuJbw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773595678; c=relaxed/simple; bh=3xFqNDbANLuxYwJZCL+0J4Zy2U0siwNrORG2I8A78Nw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Lr6QGrLagv8TEeRu+HjVwFjuznnne0pItrXRA+ZOaVv4WOP5u/nHn74B4GwpsY4aQFhJ1ZcmcCAGT32OqVUBsbsE2TvN4bRv04F9nKY+rhO4tR+oL1bELC6W303WkPclUfxeGVgqJB4wp3lGK8MyzJi2d9U4FLg7SYUtr00uTJU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ARu4y2Gm; arc=none smtp.client-ip=209.85.128.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ARu4y2Gm" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-4852a9c6309so29704455e9.0 for ; Sun, 15 Mar 2026 10:27:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773595675; x=1774200475; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QBtR9VKnPKJgjfwnbtGvinYVj4EmpVw+ixE7+VzQpDU=; b=ARu4y2GmG8QpEa86w6wV6HozJ+IePGtzrgO8f2Cyo5k5GRcYQNuJPtlF+s3R/QjVs9 qq0h8HIz8Hl+kKZG8q+UVAOAiggVhGAA56fT5Lxcvg8RTWszZcEBVFYEawgyy3bAtCCW kLVh0XwZ+N6z7U7yhUF/UQ0qzDiUl5QUnmeWgqdTtjIgppV9nxyVZUpb5T//OR2mUFvG xQJvpDXPsIyJCejURnU2cAiDA7Sddfh40zilghcy4OZJ1GovOXbu7NHo6l9Q4P3XIAGD ZGfmG/xfhA0hde6hAXbQq8wlI2kWPxDudCEaO5Up1Ahfc9QgsgUHjsLmCjC4sfg/LnhG JFtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773595675; x=1774200475; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=QBtR9VKnPKJgjfwnbtGvinYVj4EmpVw+ixE7+VzQpDU=; b=ZeZvWvfKaLAPEWmxSFlkJAL6JcH9z51FLkPJY0R3tjeiYN6Zrn483vUlgWHJknQA7H +dnizd1Dl0XGu8/KQvqo2UKdroi/KfPQej0ikqkJeFKdMgg9yzY2XooN9jHB6gsug9b/ unMu05/tgfM0YdbY7l2Jh2RJJXCCmCkarPTTQFPpzQxVLNs2PjHl7VsdrJuiS0G+/uHD TCqkGT6eS5nvhRdTG41yEYsD8AHMQBbJl1l+EYMWlCmPIdQyZvZETV1jyOU5lOMPsQuh 4G33rmVUz4lvUoqCbaZ1sIt+WcuumD1YVE7jQrfFmvufijK3XsV8/YibA8vSg2X0goHY HPjw== X-Forwarded-Encrypted: i=1; AJvYcCVUiwPplriEiLpinh3zWYrWfWLupECO3XTEJlMGFPK5bBaQUiQnrVfI6KFq4y1G1h+Gaw/epI/EUZGcVJY=@vger.kernel.org X-Gm-Message-State: AOJu0YyMBcJIZdJ8JyBJMgPEd0VaB14ufRrikOhCAf6CrUeER6OokORx YCOjJpDsr3uSoEpkaU8T/j7pi8f8bk/Zu5QRWFEOzpivL714HPe2aZ4/ X-Gm-Gg: ATEYQzwJLnwye5G6tbBwTf0FPs3Y6+ffWyNTn5XjCugZeJZfjR62JCqGkYl6hFHeBVI ZVI3QMdIM+Cva53SLcIyf1F6ydt4cmIvz0ha7n2Quz4eE49pZCMthIXVSJBjpyRlNd5fEjT1r7g T7fwVkG8nTiOESdfcMKyMmA626lzE1WVFqjPZkhrng0ZB1y/1Kb28ZIDvJr8lW5STGSdNnrSBZT rwMdQ1wHj6HDC0RbgoFsJaIH5gr/mf/aNY/PfCqjJ/Bf2013e/7SdaOwVwaw2mzdZKXsg1lODFd HYZAzmZHPcW330f7zQUfKP9f39IJXxcvX6ahnKCvlwdQc2NIJwurSOOI5F5GZsl5qtg0ahwefz2 WsuYQJZ32XWmwqUjsxqp5LRG8DW62sDLMs1zRoHLTckLyZNIRbf99kTDdfRs82/gbdGlpUFG0L0 8UV/XWOUi3LHZhZEYqSDq/GA9nxCq9a9o+ce0= X-Received: by 2002:a05:600c:1395:b0:480:1c85:88bf with SMTP id 5b1f17b1804b1-4855670b72fmr170714095e9.27.1773595675367; Sun, 15 Mar 2026 10:27:55 -0700 (PDT) Received: from debian.lan ([171.22.84.130]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48557c6586csm73644905e9.20.2026.03.15.10.27.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Mar 2026 10:27:54 -0700 (PDT) From: =?UTF-8?q?Adri=C3=A1n=20Garc=C3=ADa=20Casado?= To: Ulf Hansson , Adrian Hunter , Andreas Hindborg , Jens Axboe , Miri Korenblit Cc: Miguel Ojeda , Haibo Chen , Frank Li , Sascha Hauer , Boqun Feng , linux-mmc@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-block@vger.kernel.org, rust-for-linux@vger.kernel.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Adri=C3=A1n=20Garc=C3=ADa=20Casado?= , =?UTF-8?q?Adri=C3=A1n=20Garc=C3=ADa=20Casado?= Subject: [PATCH v2 1/3] wifi: iwlwifi: pcie: optimize MSI-X interrupt affinity Date: Sun, 15 Mar 2026 18:26:38 +0100 Message-ID: <20260315172746.270734-2-adriangarciacasado42@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260315172746.270734-1-adriangarciacasado42@gmail.com> References: <20260315172746.270734-1-adriangarciacasado42@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Implement a balanced RSS queue distribution by skipping CPU0 for high-rate MSI-X interrupts when multiple CPUs are online. This reduces contention with system housekeeping tasks on the boot core and improves overall throughput. Signed-off-by: Adri=C3=A1n Garc=C3=ADa Casado --- drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c b/drive= rs/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c index 4560d92d7..87149f29e 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c @@ -1683,7 +1683,17 @@ static void iwl_pcie_irq_set_affinity(struct iwl_tra= ns *trans, * Get the cpu prior to the place to search * (i.e. return will be > i - 1). */ + /* + * Balanced distribution: skip CPU0 for high-rate RSS queues + * to avoid contention with system housekeeping. + */ cpu =3D cpumask_next(i - offset, cpu_online_mask); + if (cpu >=3D nr_cpu_ids) + cpu =3D cpumask_first(cpu_online_mask); + + if (cpu =3D=3D 0 && num_online_cpus() > 1) + cpu =3D cpumask_next(0, cpu_online_mask); + cpumask_set_cpu(cpu, &trans_pcie->affinity_mask[i]); ret =3D irq_set_affinity_hint(trans_pcie->msix_entries[i].vector, &trans_pcie->affinity_mask[i]); --=20 2.47.3 From nobody Tue Apr 7 07:09:04 2026 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9C270377029 for ; Sun, 15 Mar 2026 17:27:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773595681; cv=none; b=l8GwPCkYyMx0GfvL10bBkxZEGMcf94HzeGHwMAfEnPLVJ6MD/7S1y6XssHSpQvZ7R2vSZdRSk3WPLx4vtCL4AbPHVIhh2sztFkRNck8gM+5xzgNG81Expadvox709LCIsOded8MNllytrulpTKAGOWF2S6yH58kASbFjs8Yx28I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773595681; c=relaxed/simple; bh=y8Mtr9pcqnP0vzscG2RNUti3BiDjvt7BhqDCfc6+Xhk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=qYXHs1OqmYE39v3Cv0xNUonoCDFNynhqcBsxN7GdncFXhc4iND35HLvxsv5TC47jfQXpdM4uW2luvP1Q3Jo9zBrrBbM9x58MaYBZGiYDmcIdqY8r0J2YYQtGiZcOSeGkLyDI3boqr7qSHCBsRawI1NrmGsYQX4DdzxPb8AW7X94= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=B7IjVq2h; arc=none smtp.client-ip=209.85.128.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="B7IjVq2h" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-4852ff06541so42350045e9.2 for ; Sun, 15 Mar 2026 10:27:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773595678; x=1774200478; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5dhH5M5FJNqVSup5S7MKNqMM3K7FwdoGd3zPkVDPQec=; b=B7IjVq2he/R/gxoyzIozDS4TOhCTh7tA/GbsLWYGRrUopXDRznIt7PMswdCUQaWC8T 7Zav6qEKDiIrmBGDD6LV1VCs+MZo2OWSsvEz4uZsmUkPVZWyLJRI9dube/GW7qWVrBII OQRvgGYKtlzb/JfbDB70hRrP6WkNmAGhwXSV2G/DfK+RPXDD1gqcOxgUMDQf7ClGk65T v6SnNpJviw7xWXAdzNX2a1J8R7qTLVQGDdDrs4f9uKP7wL7m+0sgxEf/PnRCgqtVRWHb MZA82adK5DHXIq1KCmVWTxw5FYZ1Ar+Y8QziwfQPIaoX6dpa3UL2Ai2gMbhes6/MisG5 3yEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773595678; x=1774200478; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=5dhH5M5FJNqVSup5S7MKNqMM3K7FwdoGd3zPkVDPQec=; b=qbxsWqTOug3ObykdRcfkSUHzC3nYn2QoUUBmThmHRWLNh+PrP45YvIXuIyfOADCPVf vDnUEw7tpa0aSqxe5Sd6JpNlu4B1dN9Ad4qAzaSj/Is6tTZsiQSeJcxDsF0ptK1pUNlv 5zGju8bPMSFuaobeG++7801JLS9YMy9/mUMtDbZ+WjkuHGy9Awq6MkC7wLfzzpE5Ug7E DMjkHoYRFTU1P2vUWc8EAMiKq6jrs0+S5PXw+xzGp98ot33KZxztcWHo/a+E+m9hJOVv xUoFrBszHtfLtNOwMttdEvDTmTkeo4Eir9p3540RDyIuIvb9BN/CzPekPtwbVVcLLird vk7g== X-Forwarded-Encrypted: i=1; AJvYcCVpV9E3FFuRuSwVRzQhmj39VmWqn+8a4XMcCn+Uxgqp7Af5irZbCk4p+nlBGkSLsTXklbSTgt0DHxzDTkI=@vger.kernel.org X-Gm-Message-State: AOJu0YxAfimYcSsJs0PJDIszS/ROQs5mfmO3ywTXLXlez/trk0Oq8SeQ ZKjrvMMyL/Kl0Aa4vIaeM42QFN5VOKdcBPl0psGEoT/Ay2McPceMJzfR X-Gm-Gg: ATEYQzyDrD0YLyBSYFstwfyd2ge2gl+9piyaBmdjec44qD8Mx8yidHO4sq3gdaDQy3Q T9FrjTzk9EKPyMvrIeWzadlkw5u38Nu+zuv1kJypebVqsF/VPlWF0nO6+rxtMh2CdEyAUfyLGZ1 LgZ4lQg7QRgW2XWZLB2vba4tuuY9eRjfJJ3VghT70yZ/2usk25Mz8F21M1qOadHPgti1VMEoZsP UUIKEUvLoJIRzKfCm+DoZ/IOTBdGUCZ9IJ5j3ZppRq5bwDFMfwq4ZmycYcCgYJRBjDURcd0uek/ XTFuDvsjN5akiWlAqzj29ZybdZqtg7lGb5C7m3MozCsX/RMFrwDppDZFzPv1kIRPxMkOdEhhZqU mPyl+5Jivgt4cL4TlPpGcPs3uXJZVF0cxnlIC1oQMKKqR0Pjgr3s6O0vT8o5I6TcZI5LuA6agkc BhKlpoqzvgkB114rGf2WN7L89snZxu1NYwKJk= X-Received: by 2002:a05:600c:c162:b0:485:3fd1:992c with SMTP id 5b1f17b1804b1-485566d2fe7mr159704575e9.1.1773595677669; Sun, 15 Mar 2026 10:27:57 -0700 (PDT) Received: from debian.lan ([171.22.84.130]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48557c6586csm73644905e9.20.2026.03.15.10.27.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Mar 2026 10:27:56 -0700 (PDT) From: =?UTF-8?q?Adri=C3=A1n=20Garc=C3=ADa=20Casado?= To: Ulf Hansson , Adrian Hunter , Andreas Hindborg , Jens Axboe , Miri Korenblit Cc: Miguel Ojeda , Haibo Chen , Frank Li , Sascha Hauer , Boqun Feng , linux-mmc@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-block@vger.kernel.org, rust-for-linux@vger.kernel.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Adri=C3=A1n=20Garc=C3=ADa=20Casado?= , =?UTF-8?q?Adri=C3=A1n=20Garc=C3=ADa=20Casado?= Subject: [PATCH v2 2/3] rust: block: rnull: update to Pin> for PinInit Date: Sun, 15 Mar 2026 18:26:39 +0100 Message-ID: <20260315172746.270734-3-adriangarciacasado42@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260315172746.270734-1-adriangarciacasado42@gmail.com> References: <20260315172746.270734-1-adriangarciacasado42@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Update the Rust rnull driver to use Pin> for queue data allocation. This aligns the driver with the latest PinInit zero-copy initialization abstractions in kernel 7.0 and fixes a type mismatch with GenDiskBuilder::build(). Signed-off-by: Adri=C3=A1n Garc=C3=ADa Casado --- drivers/block/rnull/rnull.rs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/block/rnull/rnull.rs b/drivers/block/rnull/rnull.rs index 0ca8715fe..23df23936 100644 --- a/drivers/block/rnull/rnull.rs +++ b/drivers/block/rnull/rnull.rs @@ -54,7 +54,7 @@ fn new( ) -> Result> { let tagset =3D Arc::pin_init(TagSet::new(1, 256, 1), GFP_KERNEL)?; =20 - let queue_data =3D Box::new(QueueData { irq_mode }, GFP_KERNEL)?; + let queue_data =3D Box::pin_init(QueueData { irq_mode }, GFP_KERNE= L)?; =20 gen_disk::GenDiskBuilder::new() .capacity_sectors(capacity_mib << (20 - block::SECTOR_SHIFT)) @@ -65,16 +65,21 @@ fn new( } } =20 +#[pin_data] struct QueueData { irq_mode: IRQMode, } =20 #[vtable] impl Operations for NullBlkDevice { - type QueueData =3D KBox; + type QueueData =3D Pin>; =20 #[inline(always)] - fn queue_rq(queue_data: &QueueData, rq: ARef>, _is_l= ast: bool) -> Result { + fn queue_rq( + queue_data: Pin<&QueueData>, + rq: ARef>, + _is_last: bool, + ) -> Result { match queue_data.irq_mode { IRQMode::None =3D> mq::Request::end_ok(rq) .map_err(|_e| kernel::error::code::EIO) @@ -87,7 +92,7 @@ fn queue_rq(queue_data: &QueueData, rq: ARef>, _is_last: bool) Ok(()) } =20 - fn commit_rqs(_queue_data: &QueueData) {} + fn commit_rqs(_queue_data: Pin<&QueueData>) {} =20 fn complete(rq: ARef>) { mq::Request::end_ok(rq) --=20 2.47.3 From nobody Tue Apr 7 07:09:04 2026 Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1F2A1377EC0 for ; Sun, 15 Mar 2026 17:28:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773595684; cv=none; b=bzx5bnQNW3p7uGH8JzIk5A0CSuW2xCJ5Rey4PpVZTE0CQ9t+JUcW9WQ0TVhiNfeBhya6homoarxlwni7xYj6D52vu3FiPV/D4LDrRqoMyI9unk61THRAN2uA2R2EG6hKdnv2ypF40YKubTU7nXmrqnSynbU4UNEfjFOq80TZdxA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773595684; c=relaxed/simple; bh=QyIuFOJZx926p9XhEzOqnlY0Tjj4EaWSbZ1NmZeyRpg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=eJuR2CyBOj4SADhXsdBsie67GDgu0+S+1GM3NurCbQYN9HNYI7H3Ej0QYLgaVO45oNFLK/IS2/gZdr5C/vcvEVMUPpTVUPdFxYPV8Iiri1EaiYGGViTNpwZqrRc/ywJYnBUp/zs5edp09WauRDKOlC/V+8p1tpHXvcfYHOeARBc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=KaftvYRw; arc=none smtp.client-ip=209.85.128.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KaftvYRw" Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-4852e9ca034so34430425e9.2 for ; Sun, 15 Mar 2026 10:28:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773595681; x=1774200481; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YIEg7cppvNlK1uJeRyCMqJFg9lbXRMhPBqnGtbbFM64=; b=KaftvYRwTkpwOyTOTR15hx72rP9U1+qsLRZwEpP0661vgIcqr3lg7EBVrhFxsnDwAW Ft3pAkQ+cP+XZtoiuCfViQGC+f/xf+2KTA2ggxz5v58oydL3P7jTYsWtexLlQIABT61c +p5UefG2DSeCjHyaUBPTYrFFFWrTXfWlct6SnQ3KuaemwET/LzDtFMb0ppqS5oxjCSmo LrMikbM9yaN+4a8pBiuoJda4Anh/iYvhBtUjFlKJmXk6hZiSGZ6nCOf7rZg0dTSv7H9e zm4zmFnWaJ6yHQcjovyZ8OTAGLBPYHXB89ydhmt6rdNd0tBkYjoIWYYI86Pv3sCq5YoN Ru+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773595681; x=1774200481; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=YIEg7cppvNlK1uJeRyCMqJFg9lbXRMhPBqnGtbbFM64=; b=ovRfFSouhgb9M5MqxmjzWAv9fNW0KJVR5mLe3q0onj11jiWWnwIwtQvAobiIenkg8R PX34OlAHYv8vdoiSgJuGjwcWiZdk0sJecrHNdvaZHQRQM+GBGbC9g0UOijZvny5Fi5NN E1FOmnhMgY192wRpIy5NvWL4sp41QEMmLgM5jc6g+Ejevh84d3EPImkC8QB61x/mLmuh jANj11hS7dVH7yRFlWJ06OKo7qITgchiNMiL8Vt+/Ny1SHK1R0VswZRUc15lfu+kzWrJ w4ExktNHdyHYNqSDITwcorq2Ea4y1ruLBIGgWuo2dJH/H0KTDl9MD81pxEZNrQtZbzDg YsQg== X-Forwarded-Encrypted: i=1; AJvYcCW0UZblSsfcHW79MMWbCe9V4YJ6qwJeLVJ4u1VL4+3DNQuTbuB4u0ZpxcPTL2Gh3XCI3DBGTpOAFZ1FIVg=@vger.kernel.org X-Gm-Message-State: AOJu0Yy+zV4uqyLuZVKA51y+ZtqHerTdQLBrJu0ZprfpsLuOlp65hjiM HRyFL5Vd8ZtM+iteUyo6XrqYWWHPZROhZBudgNLcoMegVpFb7EpKm0mJ X-Gm-Gg: ATEYQzyeDMEIbctQq7XFEj73ejfAfXIXpZVWqyIFzCxjvx25FU6+ShRKnDsC771dhJt Jp2M6YG1U47+UrDd1JiLBmdxg8MioHtQif8pE5tpu13uq/UisB0el90nzb9bgBgouD8yD0WVQ+Q E53kIUGKcmQHH3YqOpYR70v7jXWG4BZDH0cHGc+Whu0ZLBIStkc6q30NF52ILlQuJgq8G4Atn5y M+ungpqc/4ekvugbB2wRa3mjbXkAM676xbnjl3APfAFqun2FiydEEh6wuFUfn/mL9qc1CGjgJi2 h3VkW2DXBK8joyIy+A7pqgKiKwbo/vJrpKBPYk8b/Mt2CpobEGpGy7oJ21nc8KenI1YZgTXYVSL nMkKow0ZDll5FaaNhiOKmHEyhcr4VIUIQGKn4xr6ciWaeaobuhbnuwIbYwVPw81NYZIjYOW06nr bGC3iDOW0BWOfFA+NsE5VAvWEeFBh4QvoYapk= X-Received: by 2002:a05:600c:64cf:b0:477:561f:6fc8 with SMTP id 5b1f17b1804b1-485566cf81fmr167182995e9.5.1773595681386; Sun, 15 Mar 2026 10:28:01 -0700 (PDT) Received: from debian.lan ([171.22.84.130]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48557c6586csm73644905e9.20.2026.03.15.10.27.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Mar 2026 10:28:00 -0700 (PDT) From: =?UTF-8?q?Adri=C3=A1n=20Garc=C3=ADa=20Casado?= To: Ulf Hansson , Adrian Hunter , Andreas Hindborg , Jens Axboe , Miri Korenblit Cc: Miguel Ojeda , Haibo Chen , Frank Li , Sascha Hauer , Boqun Feng , linux-mmc@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-block@vger.kernel.org, rust-for-linux@vger.kernel.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Adri=C3=A1n=20Garc=C3=ADa=20Casado?= , =?UTF-8?q?Adri=C3=A1n=20Garc=C3=ADa=20Casado?= Subject: [PATCH v2 3/3] mmc: sdhci-esdhc-imx: consolidate imx25/35 data and add Kingston CID Date: Sun, 15 Mar 2026 18:26:40 +0100 Message-ID: <20260315172746.270734-4-adriangarciacasado42@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260315172746.270734-1-adriangarciacasado42@gmail.com> References: <20260315172746.270734-1-adriangarciacasado42@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Consolidate esdhc_imx25 and esdhc_imx35 soc data into a single shared struct since they share the same flags. This reduces redundancy. Also add the CID_MANFID_KINGSTON definition to quirks.h for centralized management. Signed-off-by: Adri=C3=A1n Garc=C3=ADa Casado --- drivers/mmc/core/quirks.h | 4 ++++ drivers/mmc/host/sdhci-esdhc-imx.c | 12 ++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/mmc/core/quirks.h b/drivers/mmc/core/quirks.h index c417ed34c..d736bb4be 100644 --- a/drivers/mmc/core/quirks.h +++ b/drivers/mmc/core/quirks.h @@ -15,6 +15,10 @@ =20 #include "card.h" =20 +#ifndef CID_MANFID_KINGSTON +#define CID_MANFID_KINGSTON 0x70 +#endif + static const struct mmc_fixup __maybe_unused mmc_sd_fixups[] =3D { /* * Kingston Canvas Go! Plus microSD cards never finish SD cache flush. diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-es= dhc-imx.c index a7a5df673..9cfa26722 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -256,11 +256,7 @@ struct esdhc_soc_data { u32 quirks; }; =20 -static const struct esdhc_soc_data esdhc_imx25_data =3D { - .flags =3D ESDHC_FLAG_ERR004536, -}; - -static const struct esdhc_soc_data esdhc_imx35_data =3D { +static const struct esdhc_soc_data esdhc_imx25_35_data =3D { .flags =3D ESDHC_FLAG_ERR004536, }; =20 @@ -391,8 +387,8 @@ struct pltfm_imx_data { }; =20 static const struct of_device_id imx_esdhc_dt_ids[] =3D { - { .compatible =3D "fsl,imx25-esdhc", .data =3D &esdhc_imx25_data, }, - { .compatible =3D "fsl,imx35-esdhc", .data =3D &esdhc_imx35_data, }, + { .compatible =3D "fsl,imx25-esdhc", .data =3D &esdhc_imx25_35_data, }, + { .compatible =3D "fsl,imx35-esdhc", .data =3D &esdhc_imx25_35_data, }, { .compatible =3D "fsl,imx51-esdhc", .data =3D &esdhc_imx51_data, }, { .compatible =3D "fsl,imx53-esdhc", .data =3D &esdhc_imx53_data, }, { .compatible =3D "fsl,imx6sx-usdhc", .data =3D &usdhc_imx6sx_data, }, @@ -414,7 +410,7 @@ MODULE_DEVICE_TABLE(of, imx_esdhc_dt_ids); =20 static inline int is_imx25_esdhc(struct pltfm_imx_data *data) { - return data->socdata =3D=3D &esdhc_imx25_data; + return data->socdata =3D=3D &esdhc_imx25_35_data; } =20 static inline int is_imx53_esdhc(struct pltfm_imx_data *data) --=20 2.47.3