Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Leo Li <leoyang.li@nxp.com>
To:     Maxim Kochetkov <fido_max@inbox.ru>,
        "linuxppc-dev@lists.ozlabs.org" <linuxppc-dev@lists.ozlabs.org>
CC:     "linux-arm-kernel@lists.infradead.org" 
        <linux-arm-kernel@lists.infradead.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "saravanak@google.com" <saravanak@google.com>,
        Qiang Zhao <qiang.zhao@nxp.com>,
        "gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>,
        kernel test robot <lkp@intel.com>,
        Dan Carpenter <dan.carpenter@oracle.com>
Subject: RE: [PATCH v3] soc: fsl: qe: convert QE interrupt controller to
 platform_device
Thread-Topic: [PATCH v3] soc: fsl: qe: convert QE interrupt controller to
 platform_device
Thread-Index: AQHXgd3qhhGq2JPGak+KUVia7LyFBqtVtp/g
Date:   Mon, 26 Jul 2021 20:44:58 +0000
Message-ID: <AS8PR04MB894679107E1AE2A899D46FA88FE89@AS8PR04MB8946.eurprd04.prod.outlook.com>
References: <20210726052217.13558-1-fido_max@inbox.ru>
In-Reply-To: <20210726052217.13558-1-fido_max@inbox.ru>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?RaiKqtqt90uND/8xeSWdavcodZe3GV2vaX/AfV875vwQO6Coj1Zk9kka2PDh?=
 =?us-ascii?Q?xxsjfq2FnWMNy9T2VgAC+ovwCAFNnTCsL2uZFS2Uu8dgttna61qfyjxly1zr?=
 =?us-ascii?Q?lo5xPrlFlx02gaTGFbuh3+6iNtvIY/w6ceNQweaunF86isXAPVTINR0IZh/N?=
 =?us-ascii?Q?EPFLHMON+qw5aiTMc1d/Um+eEPWSA0pwO44+FqwyPJW7HAjDp2nDoBfOi1Yy?=
 =?us-ascii?Q?M7zfu68dNJuqH2SoSsBIWfKWkwdixTpMNp4VTzK7Go9Am9aO5zVG/6Sv3DP/?=
 =?us-ascii?Q?xX1MdrbJZHEJRxcev1JeWHWZoCUUa7glmN/Et5h8M8aE7ZzWE6WaCMqfEyyY?=
 =?us-ascii?Q?Hb5xl5dw5Ux8U89aOwyfLfn7mHIGjWhe14/xr/a1kpETm0qhfCvU0AGRtq5x?=
 =?us-ascii?Q?PGNqUDlmZ0p0AgBsvm7yKQ0viTNkaNsF9S7PtFBo4iPRB9wey7tOP+KGjaDM?=
 =?us-ascii?Q?zwP87m36/sJIt8P4N1WqQoaC+H4IxZl9VujkAQ9Oj8ZlPCTHm13whfgb/Slz?=
 =?us-ascii?Q?9ZHVRv7TUzh0+m4dwS8yQx3xqv63qd+teFa7qebApYzGrglCtaCAygmhUCyN?=
 =?us-ascii?Q?5FCIaEEP0GsQ07D31FNZQ5xJ1RCb5+2fSfqWKXC+eFm2ltQ8YUj0i9mK5EZO?=
 =?us-ascii?Q?TlXfenVoFoyR84mg0cXTWzqR4l8s64NTwsvUOfzBFvp07LRpaxh2EBu1q6n2?=
 =?us-ascii?Q?Fh9rW6qB1kX/wc/4iv9bWwSQMAN29frGkwtSMtYeUipkvkDKm/QW/Xc1DSFd?=
 =?us-ascii?Q?OodnOcGn8pKFk6lzoj0CbuPDjZLSvmeECMeSQAmmHrndUEkgJoegc4Iqo9/N?=
 =?us-ascii?Q?U3JOJgE51Xukq+2A2wahNM+g+mNGTAwWgGb71NfYjvxqlAEhmfX3tLiReJ7c?=
 =?us-ascii?Q?Sj/VcV1Zo24tAWTcX86BjkZYv57VuSM02lf+wXXgesyzOzoalnFUUKqhDMdk?=
 =?us-ascii?Q?DHzyqSqsqMJZvGm5XLYtsHyhCKb/4gRrWCj62Bt143rovxAH/AOoMT9k9j9h?=
 =?us-ascii?Q?/TrarVh2axvq8qUUJ3VWn8dCUj7fkor/F4C+R6YeDMKOvDViO71BPctOUm5s?=
 =?us-ascii?Q?B695tEHwfTcp8wBkLE58KbmqfASrhUSBHwdIpDnuqMqmrSHJ41pTsIR8jHGR?=
 =?us-ascii?Q?l/N0DcHZOZYNqp+5mRatdXCmmAyiSE5UF5Lkyy/k21CUAo2PcK+w+ZHBVnQc?=
 =?us-ascii?Q?+coPlOwVnI6oM/rtmN6WePfNs+9UqvcP/T0p/GQHOZifzcFzbckkdGd4tlh9?=
 =?us-ascii?Q?o3aaLwinNaxlXB7GsnVK78QAypdWuqi42s6wbeezx0yf/fPVjlYYHxyTxQhA?=
 =?us-ascii?Q?iiRP1LVjg4l2C5IcCrCIpRIt?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8946.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 471cc727-7f58-4537-cc2e-08d950763bc2
X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Jul 2021 20:44:58.6938
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: NHt/4l4ZZpw3OR7/OZhNSL1VqJw1bI0i+wLI5fU0PQ9i8Uwf17XpJIVmzKUc0St24YKWYsmlY5az09gdOhziRA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8980
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


> -----Original Message-----
> From: Maxim Kochetkov <fido_max@inbox.ru>
> Sent: Monday, July 26, 2021 12:22 AM
> To: linuxppc-dev@lists.ozlabs.org
> Cc: linux-arm-kernel@lists.infradead.org; linux-kernel@vger.kernel.org;
> saravanak@google.com; Leo Li <leoyang.li@nxp.com>; Qiang Zhao
> <qiang.zhao@nxp.com>; gregkh@linuxfoundation.org; Maxim Kochetkov
> <fido_max@inbox.ru>; kernel test robot <lkp@intel.com>; Dan Carpenter
> <dan.carpenter@oracle.com>
> Subject: [PATCH v3] soc: fsl: qe: convert QE interrupt controller to
> platform_device
>=20
> Since 5.13 QE's ucc nodes can't get interrupts from devicetree:
>=20
> 	ucc@2000 {
> 		cell-index =3D <1>;
> 		reg =3D <0x2000 0x200>;
> 		interrupts =3D <32>;
> 		interrupt-parent =3D <&qeic>;
> 	};
>=20
> Now fw_devlink expects driver to create and probe a struct device for
> interrupt controller.
>=20
> So lets convert this driver to simple platform_device with probe().
> Also use platform_get_ and devm_ family function to get/allocate resource=
s
> and drop unused .compatible =3D "qeic".
>=20
> [1] -
> https://eur01.safelinks.protection.outlook.com/?url=3Dhttps%3A%2F%2Flore.=
k
> ernel.org%2Flkml%2FCAGETcx9PiX%3D%3DmLxB9PO8Myyk6u2vhPVwTMsA
> 5NkD-
> ywH5xhusw%40mail.gmail.com&amp;data=3D04%7C01%7Cleoyang.li%40nxp.co
> m%7C6e64e4b86f2d4a89390808d94ff50bec%7C686ea1d3bc2b4c6fa92cd99c5c
> 301635%7C0%7C0%7C637628736153046082%7CUnknown%7CTWFpbGZsb3d8
> eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3
> D%7C1000&amp;sdata=3DG7HhGFmRLvMyNMULSddWctD3HhtVWMfZAxPXjl8
> CBTY%3D&amp;reserved=3D0
> Fixes: e590474768f1 ("driver core: Set fw_devlink=3Don by default")
> Fixes: ea718c699055 ("Revert "Revert "driver core: Set fw_devlink=3Don by
> default""")
> Signed-off-by: Maxim Kochetkov <fido_max@inbox.ru>
> Reported-by: kernel test robot <lkp@intel.com>
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
> Changes in v3:
>  - use .compatible =3D "qeic" again (Li Yang <leoyang.li@nxp.com> asks to=
 keep
> it)
>=20
> Changes in v2:
>  - use devm_ family functions to allocate mem/resources
>  - use platform_get_ family functions to get resources/irqs
>  - drop unused .compatible =3D "qeic"
>=20
>  drivers/soc/fsl/qe/qe_ic.c | 75 ++++++++++++++++++++++----------------
>  1 file changed, 44 insertions(+), 31 deletions(-)
>=20
> diff --git a/drivers/soc/fsl/qe/qe_ic.c b/drivers/soc/fsl/qe/qe_ic.c inde=
x
> 3f711c1a0996..54cabd2605dd 100644
> --- a/drivers/soc/fsl/qe/qe_ic.c
> +++ b/drivers/soc/fsl/qe/qe_ic.c
> @@ -23,6 +23,7 @@
>  #include <linux/signal.h>
>  #include <linux/device.h>
>  #include <linux/spinlock.h>
> +#include <linux/platform_device.h>
>  #include <asm/irq.h>
>  #include <asm/io.h>
>  #include <soc/fsl/qe/qe.h>
> @@ -404,41 +405,40 @@ static void qe_ic_cascade_muxed_mpic(struct
> irq_desc *desc)
>  	chip->irq_eoi(&desc->irq_data);
>  }
>=20
> -static void __init qe_ic_init(struct device_node *node)
> +static int qe_ic_init(struct platform_device *pdev)
>  {
> +	struct device *dev =3D &pdev->dev;
>  	void (*low_handler)(struct irq_desc *desc);
>  	void (*high_handler)(struct irq_desc *desc);
>  	struct qe_ic *qe_ic;
> -	struct resource res;
> -	u32 ret;
> +	struct resource *res;
> +	struct device_node *node =3D pdev->dev.of_node;
>=20
> -	ret =3D of_address_to_resource(node, 0, &res);
> -	if (ret)
> -		return;
> +	res =3D platform_get_resource(pdev, IORESOURCE_MEM, 0);
> +	if (res =3D=3D NULL) {
> +		dev_err(dev, "no memory resource defined\n");
> +		return -ENODEV;
> +	}
>=20
> -	qe_ic =3D kzalloc(sizeof(*qe_ic), GFP_KERNEL);
> +	qe_ic =3D devm_kzalloc(dev, sizeof(*qe_ic), GFP_KERNEL);
>  	if (qe_ic =3D=3D NULL)
> -		return;
> +		return -ENOMEM;
>=20
> -	qe_ic->irqhost =3D irq_domain_add_linear(node, NR_QE_IC_INTS,
> -					       &qe_ic_host_ops, qe_ic);
> -	if (qe_ic->irqhost =3D=3D NULL) {
> -		kfree(qe_ic);
> -		return;
> +	qe_ic->regs =3D devm_ioremap(dev, res->start, resource_size(res));
> +	if (qe_ic->regs =3D=3D NULL) {
> +		dev_err(dev, "failed to ioremap() registers\n");
> +		return -ENODEV;
>  	}
>=20
> -	qe_ic->regs =3D ioremap(res.start, resource_size(&res));
> -
>  	qe_ic->hc_irq =3D qe_ic_irq_chip;
>=20
> -	qe_ic->virq_high =3D irq_of_parse_and_map(node, 0);
> -	qe_ic->virq_low =3D irq_of_parse_and_map(node, 1);
> +	qe_ic->virq_high =3D platform_get_irq(pdev, 0);
> +	qe_ic->virq_low =3D platform_get_irq(pdev, 1);
>=20
> -	if (!qe_ic->virq_low) {
> -		printk(KERN_ERR "Failed to map QE_IC low IRQ\n");
> -		kfree(qe_ic);
> -		return;
> +	if (qe_ic->virq_low < 0) {
> +		return -ENODEV;
>  	}
> +
>  	if (qe_ic->virq_high !=3D qe_ic->virq_low) {
>  		low_handler =3D qe_ic_cascade_low;
>  		high_handler =3D qe_ic_cascade_high;
> @@ -447,6 +447,13 @@ static void __init qe_ic_init(struct device_node
> *node)
>  		high_handler =3D NULL;
>  	}
>=20
> +	qe_ic->irqhost =3D irq_domain_add_linear(node, NR_QE_IC_INTS,
> +					       &qe_ic_host_ops, qe_ic);
> +	if (qe_ic->irqhost =3D=3D NULL) {
> +		dev_err(dev, "failed to add irq domain\n");
> +		return -ENODEV;
> +	}
> +
>  	qe_ic_write(qe_ic->regs, QEIC_CICR, 0);
>=20
>  	irq_set_handler_data(qe_ic->virq_low, qe_ic); @@ -456,20 +463,26
> @@ static void __init qe_ic_init(struct device_node *node)
>  		irq_set_handler_data(qe_ic->virq_high, qe_ic);
>  		irq_set_chained_handler(qe_ic->virq_high, high_handler);
>  	}
> +	return 0;
>  }
> +static const struct of_device_id qe_ic_ids[] =3D {
> +	{ .compatible =3D "fsl,qe-ic"},
> +	{ .compatible =3D "qeic"},

Probably you missed the point from my first response.  The original code is=
 match by device type "qeic" instead of compatible string "qeic".   So we s=
hould use { .type =3D "qeic"} here.

> +	{},
> +};
>=20
> -static int __init qe_ic_of_init(void)
> +static struct platform_driver qe_ic_driver =3D
>  {
> -	struct device_node *np;
> +	.driver	=3D {
> +		.name		=3D "qe-ic",
> +		.of_match_table	=3D qe_ic_ids,
> +	},
> +	.probe	=3D qe_ic_init,
> +};
>=20
> -	np =3D of_find_compatible_node(NULL, NULL, "fsl,qe-ic");
> -	if (!np) {
> -		np =3D of_find_node_by_type(NULL, "qeic");
> -		if (!np)
> -			return -ENODEV;
> -	}
> -	qe_ic_init(np);
> -	of_node_put(np);
> +static int __init qe_ic_of_init(void)
> +{
> +	platform_driver_register(&qe_ic_driver);
>  	return 0;
>  }
>  subsys_initcall(qe_ic_of_init);
> --
> 2.31.1