| Message ID | 20250120-scmi-fwdevlink-v2-4-3af2fa37dbac@nxp.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | scmi: Bypass set fwnode and introduce allow/block list to address devlink issue | expand |
On Sun, Jan 19, 2025 at 11:14 PM Peng Fan (OSS) <peng.fan@oss.nxp.com> wrote: > > From: Peng Fan <peng.fan@nxp.com> > > With machine_blocklist, the blocked machines will not have pinctrl scmi > devices created. The fw_devlink will link consumer and supplier > correctly. > > Signed-off-by: Peng Fan <peng.fan@nxp.com> > --- > drivers/pinctrl/pinctrl-scmi.c | 15 ++++++--------- > 1 file changed, 6 insertions(+), 9 deletions(-) > > diff --git a/drivers/pinctrl/pinctrl-scmi.c b/drivers/pinctrl/pinctrl-scmi.c > index df4bbcd7d1d59ac2c8ddc320dc10d702ad1ed5b2..f041478758b50e85d99214f4fe42208d0c8c808f 100644 > --- a/drivers/pinctrl/pinctrl-scmi.c > +++ b/drivers/pinctrl/pinctrl-scmi.c > @@ -505,11 +505,6 @@ static int pinctrl_scmi_get_pins(struct scmi_pinctrl *pmx, > return 0; > } > > -static const char * const scmi_pinctrl_blocklist[] = { > - "fsl,imx95", > - NULL > -}; > - > static int scmi_pinctrl_probe(struct scmi_device *sdev) > { > int ret; > @@ -521,9 +516,6 @@ static int scmi_pinctrl_probe(struct scmi_device *sdev) > if (!sdev->handle) > return -EINVAL; > > - if (of_machine_compatible_match(scmi_pinctrl_blocklist)) > - return -ENODEV; > - > handle = sdev->handle; > > pinctrl_ops = handle->devm_protocol_get(sdev, SCMI_PROTOCOL_PINCTRL, &ph); > @@ -561,8 +553,13 @@ static int scmi_pinctrl_probe(struct scmi_device *sdev) > return pinctrl_enable(pmx->pctldev); > } > > +static const char * const scmi_pinctrl_blocklist[] = { > + "fsl,imx95", > + NULL > +}; > + > static const struct scmi_device_id scmi_id_table[] = { > - { SCMI_PROTOCOL_PINCTRL, "pinctrl" }, > + { SCMI_PROTOCOL_PINCTRL, "pinctrl", scmi_pinctrl_blocklist, NULL }, > { } > }; > MODULE_DEVICE_TABLE(scmi, scmi_id_table); > Definite NACK to this. Please don't depend on indirect conditions/flags. There's no guarantee that this check will hold true in the future. -Saravana
diff --git a/drivers/pinctrl/pinctrl-scmi.c b/drivers/pinctrl/pinctrl-scmi.c index df4bbcd7d1d59ac2c8ddc320dc10d702ad1ed5b2..f041478758b50e85d99214f4fe42208d0c8c808f 100644 --- a/drivers/pinctrl/pinctrl-scmi.c +++ b/drivers/pinctrl/pinctrl-scmi.c @@ -505,11 +505,6 @@ static int pinctrl_scmi_get_pins(struct scmi_pinctrl *pmx, return 0; } -static const char * const scmi_pinctrl_blocklist[] = { - "fsl,imx95", - NULL -}; - static int scmi_pinctrl_probe(struct scmi_device *sdev) { int ret; @@ -521,9 +516,6 @@ static int scmi_pinctrl_probe(struct scmi_device *sdev) if (!sdev->handle) return -EINVAL; - if (of_machine_compatible_match(scmi_pinctrl_blocklist)) - return -ENODEV; - handle = sdev->handle; pinctrl_ops = handle->devm_protocol_get(sdev, SCMI_PROTOCOL_PINCTRL, &ph); @@ -561,8 +553,13 @@ static int scmi_pinctrl_probe(struct scmi_device *sdev) return pinctrl_enable(pmx->pctldev); } +static const char * const scmi_pinctrl_blocklist[] = { + "fsl,imx95", + NULL +}; + static const struct scmi_device_id scmi_id_table[] = { - { SCMI_PROTOCOL_PINCTRL, "pinctrl" }, + { SCMI_PROTOCOL_PINCTRL, "pinctrl", scmi_pinctrl_blocklist, NULL }, { } }; MODULE_DEVICE_TABLE(scmi, scmi_id_table);