From nobody Tue Apr 7 07:09:31 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 72CFB375F99 for ; Sun, 15 Mar 2026 17:25:17 +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=1773595519; cv=none; b=ZM2Gp5UlUQ2I1ZdebHgQX3cw7XQLadUW84cCQ3T7PQgsq11geryitG7us119XGEbaCs8MQnHNmQ2GFM26IdWAW4p16+uyW45Z9uRhoeQErbVE9UE/gR5N4zKOy0pDpH72XxBUnnmr+UQsFZAVo8Y7512vfC5NHUFiUuR8AoaQc8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773595519; c=relaxed/simple; bh=xR1aQtJyjOGsb3F8bKi8GxD9ZWQvMlCBKAMwTQealv0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YNdakRhuLtcEAeEbARP7xP5kscXDle2mqT1AZClif6SGt1sEs32fbO0eNh7iw+shLPQwLjNcwP5XMauWQO10AuLNkaDb+DnXHAe+3tTS3PYceBPwihBBsdsPUutVJFHmLDGRrk6X+W1+g/t47aNUT1ksqlbOCRQfxBpan+PS+24= 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=DrTq3SzD; 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="DrTq3SzD" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-482f454be5bso45735515e9.0 for ; Sun, 15 Mar 2026 10:25:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773595516; x=1774200316; 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=2eNrBLnJJHbmPI7WkNJ6vq9A1HMj64DfR2iaRW7E89k=; b=DrTq3SzDwgDX0a37RPo6o/lql3oPGAHO2S+yv8kxsp3a6YtYN75Qt4fbVaKpwslDg7 XGsRTLLBEDbauK8VtRwI19GKKIXr7AEqg0rH0xGIrvLQlgeoH9An9p4PPWi/+1E+NW2w NEeBbitW+XIQYxmMZXuZVaJHfZpqwlGf5ug5hWJ205vFrXLIj/SzNOTwIbvYE3z7jccj 6X45KrVmz9wR1it9QgWo0tzDreXyPaiTcxwYwyUVNbZvs5VhRLcbXLk22emHCdCv4QeB s96r9tNhj9S0pMTsijrsq6ZvkTAukUjV5L5R6PLDOSCek9THJr/L2hRqJdyhg8CPwrGB 80ZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773595516; x=1774200316; 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=2eNrBLnJJHbmPI7WkNJ6vq9A1HMj64DfR2iaRW7E89k=; b=a4tp7hbIVerDRFNTc4Iz8YK2heg3gAoL+E7K+Z90BpIOKQg3eCV4w29uIh5rVnw4G8 AloaMDx7HmGA7L9+/mb4asZE96zQwh6nqviVGh2+IEC6iRvt30oY/nE1xe2ctiQq/Q6k mIHnDY8pR8DMZWbxF6m6yR4Q0Fhc8AQs+Olw/b99PBUv6cFTY9XGEBBMo0GfF4tQZjTO fUDEXqPQdEBZBuEE4gFcgDebZEH/HNw2l2+FwP+Jj7myU96BWdZpWGIKcFMbg6LAq6HA 8PDKGTb7t5DRvxdUWy6ITRd0aI33+n4pXEFaMgbXfHHhI98cv96TpofhF6SJL8CWLysD npwQ== X-Forwarded-Encrypted: i=1; AJvYcCU050ME6HzG/R9YKKmohHcGuq/Ac+azxLm+jM9jmd5f48fbNc9wi0YYB7WOuAUnsCJoGmClNSxV4hP/uxA=@vger.kernel.org X-Gm-Message-State: AOJu0Ywrbsi8ieDi2TVLYcFAtMqgG5kgl8UtKfgtF2tRh4oxRMllNusV 7+KByeAjquMQiBDejvJUrVNeYLgtP0WwLKRx5ZjloulfpAwsrMxjMiJX X-Gm-Gg: ATEYQzyLDajgM3FVAMH6ljmRhV+ITXK4aLcvuuUvM0c7G9VeJAww8dUduLT/VP/k7cS gwwP3Bt5w+rdywwDItYJB/g2BdjgDfi7Lst8Ki97oaFOBgqcPmLiMKrnQFBvZPxJyydHrhbWG2c bThVekyACBSvbNsLcbtMF1d99dMzvbrGCHufBKURGLluSF1F7kFy3E1rPkTAjWx3ALlaFInfWI+ 5uSSqcdkKGSOmVOEf/AYdHmpN5/CMuoFWII5SguGMxXwO3MX4vGyI04dfJz5mJTBUtrFLrSinF/ 7aLbTyNNesYU7uicpvxM6Dk5YTTsc2toQpds6MX653FN5f6347jSo+MZ9PcPhEhbcTC/6Hiyaib AR3+Vzp/1dFR3bYkWZUG43BCG2di9YjAuypxs51yL1YZUqHi0Wn3OgF5n/TYigSsycrRfPl2MhB wWj1z9WiyZE4l2FFZYAljW0D7daujpkvpMv+Y= X-Received: by 2002:a05:600c:8b28:b0:485:3c11:de84 with SMTP id 5b1f17b1804b1-48555b47ac7mr165571005e9.14.1773595515543; Sun, 15 Mar 2026 10:25:15 -0700 (PDT) Received: from debian.lan ([171.22.84.130]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48541aa73easm457168325e9.3.2026.03.15.10.25.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Mar 2026 10:25:15 -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?= , Adrian Garcia Cicuelo Subject: [PATCH v2 1/3] wifi: iwlwifi: pcie: optimize MSI-X interrupt affinity Date: Sun, 15 Mar 2026 18:25:05 +0100 Message-ID: <20260315172507.270480-2-adriangarciacasado42@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260315172507.270480-1-adriangarciacasado42@gmail.com> References: <20260315172507.270480-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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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: Adrian Garcia Cicuelo --- 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:31 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 61778377EA1 for ; Sun, 15 Mar 2026 17:25:19 +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=1773595521; cv=none; b=UOKab6X5I7WtPuC8CIO+5z3pk6UkoXg6bFPsR1CnUyJlZHc4Eb48YWvK7p45CzVBL1VG1PWZ6AVFKwYdB/A2GpXwEFPJRvifk4nbRCUEmFrij3m+/Hjjd/VXq1BP6pzzwKlVlchKHm7SDOVkflm9/eK8bRb6TlYpJ3lfW4st82U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773595521; c=relaxed/simple; bh=iKpFG0Av0hoqoOlPYCyOzyzjoAeTHTDVQHbGXDPimao=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aEEhIZkYW57Pwop6pC9P4pnAS8NFQZ4WBCgxAt3w0PFjDZa1YypLRNfismG5UZJKLjt092OEZBOvtJOlCEhWQ0DnfG6St5QAXRFzKWyb9+yaLcuaLopF8WsdvQVnyNjlOEvYGg9jjaNmGTMShGmw3nSWGpewfcqLUK+XudM4AIg= 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=MCxyw7jc; 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="MCxyw7jc" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-48541edecf9so40985565e9.1 for ; Sun, 15 Mar 2026 10:25:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773595518; x=1774200318; 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=QBcY1jNO230ersIPOAT9WM1qbuR7iZiog4/B3vVvee0=; b=MCxyw7jcQUketWPDXn6YA/c9jegxAxqw2iy6SMgpnMTSbNb+GM0xZxBWRWGdaLE+ve CmOc+fA+m2rJ6KjEb3TNyQLN4XmSZu+y+D7J9KJcGooMY3vZaeTIIRP7Lmd7e7owSF06 PCTmLqQieGNFisw1FuPaiHPMBJtXrLAVtSd3nj8gouSxzM/nY4Ai9tLIBlIfbFayA4Sx BZMkyqH/F/L6bjkv3jetwXgQvNmNGmdW2EM3HbeRXej1UEIc25nKJTNjsk3u5fSC6uzx Y5Dk2P8R29oxRo2EUKboYLWAtgSMR3FthtptmBAeBkB7HdP86s7UN4OyieWs8s0wxIYl jMIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773595518; x=1774200318; 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=QBcY1jNO230ersIPOAT9WM1qbuR7iZiog4/B3vVvee0=; b=dM7XonhD3Pnc61xCSlQqIzwUaXjs6fP3X7c9axMhc8Y66ToC4f4WtkyUnt784Gspg9 mkFfcZuU0QdL1w5VhD42jinACC+2wE6FMjDUPt21qG+7bEVca/UJRyxCpCq6nP97LDuN kolSip+to2VNOTtuNS1fDb+dB4mRb4JjGVBZV/ZnZk495GXiFjb0V8FM9HbuSOn2d8oW v3tirI4voBFt8Ut+wWrBW7TM5B2MocCtKJ+TQQzDMYQP9c4DM4ifi17WXkE+orjzA/NA uZcTX3jtle+3Dzn0Tvnw6cugBJxpH9oz8PfCHxcekW7eRKpxRGK2+le4hPlTD3sxJSpG FozA== X-Forwarded-Encrypted: i=1; AJvYcCVS+Rn7z4edo00eBobribBU9W/YY2uFX6xuvzUS6yOFJ/EwZuYvHrAzPzNlIFAu5jcF/rv3OcuOcTLFySo=@vger.kernel.org X-Gm-Message-State: AOJu0Yw4QOrlO9VKbNg3bq8ZDLXXZAbU6wgnd/u+CEHwWuRvs/XM8Km+ nn9PYdjiYT88E0AuAHvf4MfoL9aWzICBTnQrSgDYzgTClhcnZK6uKi/4 X-Gm-Gg: ATEYQzwgS7J/9io0gUxrtUBeri0L213z+469i9ZwmYe/anwjbAcAbuQf74dhyTMteZO NT0UbEh0KcQYqEFSr3oDk6x4wRaJeHehbpxR9a4XqfmtzGT5UJQWe8PlB1W7y17yv6VsP0ipQyt ztTNbZovkEu1RKJ3hDTpxYlco5Oyp0IwS2TOGtKTWXNeGzFmjGa/b4ZDIQecikDy2SCcYsM+AmD ezB9pkhMACgDW53i/Eu3C5MlgF3/aF2iaBlBPvkWJgrN9tHHGL2n6aBrjshBJbKQ9+abFX2MGvN ep0fM16lfE04q1szwfLWUBGTR7GidkO9dPKq7bvf2V8xVRbPYr1rE4c3y3ZgdKjEByv8Qloh3ye 7vOuRldoeChpg7S17HAGhhSjO+7cKDpZKyb1Ue505KvAZVArpLejku1HhOsJdEb+14XslYPm+NX rUZyc4x+peUGZDoKXyk4SurwiJYakdfHRxqz8= X-Received: by 2002:a05:600c:8489:b0:482:eec4:76d with SMTP id 5b1f17b1804b1-485566f7a2amr181338655e9.17.1773595517762; Sun, 15 Mar 2026 10:25:17 -0700 (PDT) Received: from debian.lan ([171.22.84.130]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48541aa73easm457168325e9.3.2026.03.15.10.25.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Mar 2026 10:25:17 -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?= , Adrian Garcia Cicuelo Subject: [PATCH v2 2/3] rust: block: rnull: update to Pin> for PinInit Date: Sun, 15 Mar 2026 18:25:06 +0100 Message-ID: <20260315172507.270480-3-adriangarciacasado42@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260315172507.270480-1-adriangarciacasado42@gmail.com> References: <20260315172507.270480-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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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: Adrian Garcia Cicuelo --- 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:31 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 B594E376BD6 for ; Sun, 15 Mar 2026 17:25:21 +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=1773595524; cv=none; b=qSsCtZ7E/cle1wPIV63w8JcHDE0s1y9odxMCClpKGqXb1oJwybfOMeo7i5bjmzrjYcrFWJuTx6zQHST1hLnhhDzPUsq+44q+b2jyGqZankAq5QGFsBxfcXe/dFUkAve243bBzVLTNDFe38ASJr7Lx4CeWDamkVRBkR8ph3nwRLg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773595524; c=relaxed/simple; bh=X32PXM6CIYzypQR5TwfD7Jn/cbq77OlrCWR99DHxUpQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MJhlKvMOgiKOV7j3pBG+tVeQ2l62D8wPk2rvjg5/Ocob+N6cu0xLmYvC1PiASXgV35f21VIuJOY33+3kF5t2UkdKkrX+uuHSfrZGv/vZHuv3C5qN1mNbxRV4N6wWlbFmaZwkXkOc47t/6qREYP3leztSXWuSfuAO9tgzAcNfoyM= 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=OVn/lJIS; 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="OVn/lJIS" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-4853aec185aso31192375e9.1 for ; Sun, 15 Mar 2026 10:25:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773595520; x=1774200320; 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=ubQ1v6PBsq99cAcF2yrnS1WsB85d1f/acmJVUU/lg1s=; b=OVn/lJISE6nIYTVJ/aLvnPsBrPeMZbwCysxgFTAiV7KsOpGZZ1N+8CoWT4pza/yvHz pCvfPpuYfn/UsJcvGHOItAspz4fKEDIx1Xg2rj9HJBExqWW09yEZ5qDxTKIQ0HnVEaws eWd1/riC2qzHSgIfO6qIGErNFVTRVW2pUAi7neTLkK5+mXIBLO8Yq7xQc1Jf9Y4hMvGf FK2yq+acgLUukcvmtR2Ona064ozquy6IygiZgrPaxegHnU4343kpPQUjoVoj2GGokC45 bBjH11U305OTpOgSay8gv+wp73nEd5biFLR/nwFUHL8oivBCysLyAz6eM8lDI77pJHIA F9Sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773595520; x=1774200320; 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=ubQ1v6PBsq99cAcF2yrnS1WsB85d1f/acmJVUU/lg1s=; b=WyEgFxuavdPjxmb7YPTiaadiqtsxL0iupym9Tnn5dcdrenfdeV0/6F7/TG/GjzxmoJ NnbD2m2cNPNNN6LV+eQ2DBQ+8BznIFZtE2olTulNLhMrd2r2MGdhpuDXXn75JEWRw0LN s3RR5zwmzHapon6k9Y79kLmFEBSnTB1t+94ppZIow+sUZ/9sn9RkwImc/OcNxGYjePtH Vmm+UeNVlJWxqcNGXeFquA46wp2vuxLIWRSTW3Ec51/P5Uf6YNiHw3qKnVh+JfiA4hXp zE5K8MRkutxxfQS96/wum/0pu5cXhudTHra5R5ARgI/fzhYsnZDhtl5CMuvWMvYFO7dE /OxA== X-Forwarded-Encrypted: i=1; AJvYcCUbE1+6RKpRiqT7sVoO5edZu7h8ZViX+iZEPREsBf0sufzf0jWe/s/o2GsFBSKCWj1xTfH5lyn3Q2R/5lQ=@vger.kernel.org X-Gm-Message-State: AOJu0YyQOJ5FBzuT3MO/LlS2KPC5O46LTeYQkZWIIDbWA5mfWZbA8ISF TbP9X6yrYDjSbi3NUZXcuuRyNzmkMQ/kO2o1Fuv9/QCfchYypAVUWlL4 X-Gm-Gg: ATEYQzzkCXzyysGj7DNYTrJSRh93MVHkeiBEWctdH49fEEGk+iuU7Hm3uSiX0wDiC5w GlBR2jDp23cB3PuAQSSgs6Ozl/+RMYO4/DIi/b+ipmh5GXCI/jBWw/Ol8GzcwuEyhkt/YC2s6sA yVlWFV3cQYLKIwBlhel1AAuoZZBckLaHoMoGqKojDIJS5zVzcSiy41IJldL8EGJOTqYMww+PP52 okw5eTvlwbTmsOUfRjTlPx4PRyYfZ4oMSUEnziIalL8RepPuWJ9IWIWfDPY5iqT7tx1CTKikC13 N9RqxqaXnLDwchg1PyF3043ucVMbm6I7pRE2XMz++9jzxHZe1sYnHNbdE+N306hvKRERy+gPkf2 g05CdbeS3yrjZHiWE9gJ68aSdQ1oyqVIhXCrPocGU5N0KplH7Xt3qv/06EVvJVN5pLUdWEu48je inXZb+nSNS3wJ15VY8odorlXj2OBIznEgqWZZBU4E2S9D6ng== X-Received: by 2002:a05:600c:4592:b0:485:3dfc:57a with SMTP id 5b1f17b1804b1-4855671044fmr171605205e9.32.1773595519800; Sun, 15 Mar 2026 10:25:19 -0700 (PDT) Received: from debian.lan ([171.22.84.130]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48541aa73easm457168325e9.3.2026.03.15.10.25.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Mar 2026 10:25:19 -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?= , Adrian Garcia Cicuelo Subject: [PATCH v2 3/3] mmc: sdhci-esdhc-imx: consolidate imx25/35 data and add Kingston CID Date: Sun, 15 Mar 2026 18:25:07 +0100 Message-ID: <20260315172507.270480-4-adriangarciacasado42@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260315172507.270480-1-adriangarciacasado42@gmail.com> References: <20260315172507.270480-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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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: Adrian Garcia Cicuelo --- 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