From nobody Sat Feb 7 15:40:02 2026 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) (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 BBDCC16BE2C for ; Mon, 12 Aug 2024 19:31:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723491070; cv=none; b=IPoU5EzSQPqK7ADAWFzHGLUYs16pp7jf+NP2daJrP1KsXgwev4U4cV1AacEhI1AHeJihr/UK1o8vjhlklk9NSHlkhQ4UYDD8zjbsjxl5AFHs8eHDKIHR54C35ZB9d13iZc4DCbpOAbfyRjWs3BJdOLpdBgykiI5J0adbEdUwA+U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723491070; c=relaxed/simple; bh=zfDWpDeWWiQ4e/QNsmyErz/xKbrpLlGarNZsWId7S2Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=P0zNjEy3ibhsTHdslksVM78LFzX2488yz2o24MjCumwGVGFruE3yqqGP2YgtzXA6qDVs4pWA3c5xx3ZV5gZwkBC51QzHRY7xha/iM0FrLgOajZIzLQv30YEa3IrZ2dDS4Pc6YFQG9bP5hFz+9Qfw0OaAf0AX/l3sy6MKNI1KdFs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=eSbdjvcp; arc=none smtp.client-ip=192.198.163.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="eSbdjvcp" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723491068; x=1755027068; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=zfDWpDeWWiQ4e/QNsmyErz/xKbrpLlGarNZsWId7S2Q=; b=eSbdjvcpAUbkYO4T3+Sn6zq/Ca2hvsv6KigyVs83eEBOwL3CuED9eRvp N7NPY4q53cD8HMYsIHObtsz0HhCH6G7KR2sqVhnNr1RVgqONHY2A5rW1r y3SRA25vLpgVnbnUnVcx/KwWBo2kdwHmTVq7fzEdxUEO/u48I7rJmySwD kIp3AfXh2WSQK0DkzcrEh5tvqKtXj/NPpmehQT7H4zFOc4H90qhtDk+YR ERxPZHgT6BOdLufJyhuW747sl3jifygYqhXBCHQHDuhlhjqO6IbaFm3rQ FXjuNtRPcpfuVCvLjVIZOHz/fpPWddOosiWbRP8KzvzlU8H48/NBZOV/r g==; X-CSE-ConnectionGUID: IsQZSHUST1qExS7+qEKbKw== X-CSE-MsgGUID: tZK0uNnCR3aLgmn9FXkW0Q== X-IronPort-AV: E=McAfee;i="6700,10204,11162"; a="32243193" X-IronPort-AV: E=Sophos;i="6.09,283,1716274800"; d="scan'208";a="32243193" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Aug 2024 12:31:07 -0700 X-CSE-ConnectionGUID: /HdOifOuSlmCYHWl5Klcmw== X-CSE-MsgGUID: gitgAHEeQFmEGzJhcJ7NDQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,283,1716274800"; d="scan'208";a="58311484" Received: from black.fi.intel.com ([10.237.72.28]) by orviesa009.jf.intel.com with ESMTP; 12 Aug 2024 12:31:05 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 42D49178; Mon, 12 Aug 2024 22:31:04 +0300 (EEST) From: Andy Shevchenko To: Thomas Gleixner , linux-kernel@vger.kernel.org Cc: Herve Codina , Matti Vaittinen , Mark Brown , Andy Shevchenko Subject: [PATCH v1 1/2] irqdomain: Unify checks for bus_token Date: Mon, 12 Aug 2024 22:29:39 +0300 Message-ID: <20240812193101.1266625-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1336.g36b5255a03ac In-Reply-To: <20240812193101.1266625-1-andriy.shevchenko@linux.intel.com> References: <20240812193101.1266625-1-andriy.shevchenko@linux.intel.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" The code uses if (bus_token) and if (bus_token =3D=3D DOMAIN_BUS_ANY). Since bus_token is enum, the later is more robust against changes. Unify all checks to follow the latter variant. Fixes: 0b21add71bd9 ("irqdomain: Handle domain bus token in irq_domain_crea= te()") Fixes: 1bf2c9282927 ("irqdomain: Cleanup domain name allocation") Signed-off-by: Andy Shevchenko Reviewed-by: Matti Vaittinen --- kernel/irq/irqdomain.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index 01001eb615ec..18d253e10e87 100644 --- a/kernel/irq/irqdomain.c +++ b/kernel/irq/irqdomain.c @@ -130,8 +130,10 @@ EXPORT_SYMBOL_GPL(irq_domain_free_fwnode); =20 static int alloc_name(struct irq_domain *domain, char *base, enum irq_doma= in_bus_token bus_token) { - domain->name =3D bus_token ? kasprintf(GFP_KERNEL, "%s-%d", base, bus_tok= en) : - kasprintf(GFP_KERNEL, "%s", base); + if (bus_token =3D=3D DOMAIN_BUS_ANY) + domain->name =3D kasprintf(GFP_KERNEL, "%s", base); + else + domain->name =3D kasprintf(GFP_KERNEL, "%s-%d", base, bus_token); if (!domain->name) return -ENOMEM; =20 @@ -146,8 +148,10 @@ static int alloc_fwnode_name(struct irq_domain *domain= , const struct fwnode_hand const char *suf =3D suffix ? : ""; char *name; =20 - name =3D bus_token ? kasprintf(GFP_KERNEL, "%pfw-%s%s%d", fwnode, suf, se= p, bus_token) : - kasprintf(GFP_KERNEL, "%pfw-%s", fwnode, suf); + if (bus_token =3D=3D DOMAIN_BUS_ANY) + name =3D kasprintf(GFP_KERNEL, "%pfw-%s", fwnode, suf); + else + name =3D kasprintf(GFP_KERNEL, "%pfw-%s%s%d", fwnode, suf, sep, bus_toke= n); if (!name) return -ENOMEM; =20 @@ -166,11 +170,13 @@ static int alloc_unknown_name(struct irq_domain *doma= in, enum irq_domain_bus_tok static atomic_t unknown_domains; int id =3D atomic_inc_return(&unknown_domains); =20 - domain->name =3D bus_token ? kasprintf(GFP_KERNEL, "unknown-%d-%d", id, b= us_token) : - kasprintf(GFP_KERNEL, "unknown-%d", id); - + if (bus_token =3D=3D DOMAIN_BUS_ANY) + domain->name =3D kasprintf(GFP_KERNEL, "unknown-%d", id); + else + domain->name =3D kasprintf(GFP_KERNEL, "unknown-%d-%d", id, bus_token); if (!domain->name) return -ENOMEM; + domain->flags |=3D IRQ_DOMAIN_NAME_ALLOCATED; return 0; } @@ -200,7 +206,7 @@ static int irq_domain_set_name(struct irq_domain *domai= n, const struct irq_domai return alloc_name(domain, fwid->name, bus_token); default: domain->name =3D fwid->name; - if (bus_token) + if (bus_token !=3D DOMAIN_BUS_ANY) return alloc_name(domain, fwid->name, bus_token); } =20 --=20 2.43.0.rc1.1336.g36b5255a03ac From nobody Sat Feb 7 15:40:02 2026 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.10]) (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 B0BBA2599 for ; Mon, 12 Aug 2024 19:31:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.10 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723491069; cv=none; b=aQOODzhRWl3Aasb+Dzk/eBdcg28E99A3p41uzy/OAr6qUjhMbK/p6xu67FEdUXZY5hPJruBbHi+yN8iI6/4Z3gLDGEvqnrXTwIStHjLToi5kAUiDAyJ7VIOz99oijqPTEULufm6ioG8NRiZZWYjLyHdBbRLHtJeMSVCy15valDU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723491069; c=relaxed/simple; bh=aAHzoeuUnXGRvitrK+OloYMAGSoAC3+6V7r2mpdWbDo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pp90RZ81fem4xmWggctWE7XG+daV3lwSiEGTWNfryDzZODCIOIBCzm8Jyli9voQ63ysyWa3fTVZAFuN318GaI6y2t8pCVNrh/c5aTH4cgS4hwadhPtSAON++E/rPese/AAGr8ifA/DdH6ND9jvF6ZsdgvaZPASOB8R/Vpddj/Tg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=WL5/wT54; arc=none smtp.client-ip=192.198.163.10 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="WL5/wT54" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723491068; x=1755027068; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=aAHzoeuUnXGRvitrK+OloYMAGSoAC3+6V7r2mpdWbDo=; b=WL5/wT54opvRvR8UkZrnjHFuHYvVkG0LjDkI3fEfB5053Jfyq/2mXMKi HTzP9PCT3UlR+M5xaip3s5XbOS8+7s9c+kV73oeBv3tRgjw0C8ZSkkTez h1uRQF+eaGO1VfYRN4EsaEGmRIrHRLzg1dKrdYrI8hg7/bmJfo9oBs6wn RbCyAMnLaX121/ODYMNHgsytw4PzklGGQimjL/YhiXn9UtmHxYuaWZ/mj NgtxHlE/BjGW/lIhRkFM553lBsMAdXYIZEMMHlB+yls26Mbacg/0x8ZE7 EOkDRLPkVYVI6l3RWlLxJ1QZ02Fdt5zCblGatv4xuj6ZNf1r77NKKz0iC A==; X-CSE-ConnectionGUID: PNysMwYeT8qnK+ATGKQlVg== X-CSE-MsgGUID: AqloVVreQ0igTTp0bjHYbw== X-IronPort-AV: E=McAfee;i="6700,10204,11162"; a="33024737" X-IronPort-AV: E=Sophos;i="6.09,283,1716274800"; d="scan'208";a="33024737" Received: from fmviesa009.fm.intel.com ([10.60.135.149]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Aug 2024 12:31:07 -0700 X-CSE-ConnectionGUID: SvdYsHybQ+6PUdvly9h+ug== X-CSE-MsgGUID: Gh/bgniVS+WH626Yf7Rbmw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,283,1716274800"; d="scan'208";a="58320868" Received: from black.fi.intel.com ([10.237.72.28]) by fmviesa009.fm.intel.com with ESMTP; 12 Aug 2024 12:31:05 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 4C95C321; Mon, 12 Aug 2024 22:31:04 +0300 (EEST) From: Andy Shevchenko To: Thomas Gleixner , linux-kernel@vger.kernel.org Cc: Herve Codina , Matti Vaittinen , Mark Brown , Andy Shevchenko Subject: [PATCH v1 2/2] irqdomain: Remove stray '-' in the IRQ domain name Date: Mon, 12 Aug 2024 22:29:40 +0300 Message-ID: <20240812193101.1266625-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1336.g36b5255a03ac In-Reply-To: <20240812193101.1266625-1-andriy.shevchenko@linux.intel.com> References: <20240812193101.1266625-1-andriy.shevchenko@linux.intel.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" When domain suffix is not supplied the fwnode case (not irqchip-fwnode) uses alloc_fwnode_name(). This currently unconditionally adds a separator. Fix the logic to make it conditional and drop stray '-' in the IRQ domain name. Fixes: 1e7c05292531 ("irqdomain: Allow giving name suffix for domain") Signed-off-by: Andy Shevchenko Reviewed-by: Matti Vaittinen --- kernel/irq/irqdomain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index 18d253e10e87..1acc5308fcb7 100644 --- a/kernel/irq/irqdomain.c +++ b/kernel/irq/irqdomain.c @@ -149,9 +149,9 @@ static int alloc_fwnode_name(struct irq_domain *domain,= const struct fwnode_hand char *name; =20 if (bus_token =3D=3D DOMAIN_BUS_ANY) - name =3D kasprintf(GFP_KERNEL, "%pfw-%s", fwnode, suf); + name =3D kasprintf(GFP_KERNEL, "%pfw%s%s", fwnode, sep, suf); else - name =3D kasprintf(GFP_KERNEL, "%pfw-%s%s%d", fwnode, suf, sep, bus_toke= n); + name =3D kasprintf(GFP_KERNEL, "%pfw%s%s-%d", fwnode, sep, suf, bus_toke= n); if (!name) return -ENOMEM; =20 --=20 2.43.0.rc1.1336.g36b5255a03ac