| Message ID | 20211006021205.2579057-3-anton@ozlabs.org (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | [RFC,1/5] ipmi:bt-bmc: Separate out ASPEED specific bits | expand |
On 10/6/21 04:12, Anton Blanchard wrote: > While most of the driver is arch agnostic, setting up and handling > interrupts, and enabling the hardware is not. Create bt_bmc_ops to > handle these functions. > > Signed-off-by: Anton Blanchard <anton@ozlabs.org> See comment on patch 5. Any how, Reviewed-by: Cédric Le Goater <clg@kaod.org> Thanks C. > --- > drivers/char/ipmi/bt-bmc.c | 24 ++++++++++++++++++++---- > 1 file changed, 20 insertions(+), 4 deletions(-) > > diff --git a/drivers/char/ipmi/bt-bmc.c b/drivers/char/ipmi/bt-bmc.c > index 2b0fe1255026..b48e04405ac4 100644 > --- a/drivers/char/ipmi/bt-bmc.c > +++ b/drivers/char/ipmi/bt-bmc.c > @@ -17,6 +17,7 @@ > #include <linux/regmap.h> > #include <linux/sched.h> > #include <linux/timer.h> > +#include <linux/of_device.h> > > /* > * This is a BMC device used to communicate to the host > @@ -435,15 +436,30 @@ static void aspeed_enable_bt(struct bt_bmc *bt_bmc) > BT_CR0_ENABLE_IBT); > } > > +struct bt_bmc_ops { > + int (*config_irq)(struct bt_bmc *bt_bmc, struct platform_device *pdev); > + void (*enable_bt)(struct bt_bmc *bt_bmc); > +}; > + > +static const struct bt_bmc_ops aspeed_bt_bmc_ops = { > + .config_irq = aspeed_bt_bmc_config_irq, > + .enable_bt = aspeed_enable_bt, > +}; > + > static int bt_bmc_probe(struct platform_device *pdev) > { > struct bt_bmc *bt_bmc; > struct device *dev; > int rc; > + const struct bt_bmc_ops *ops; > > dev = &pdev->dev; > dev_info(dev, "Found bt bmc device\n"); > > + ops = of_device_get_match_data(&pdev->dev); > + if (!ops) > + return -ENODEV; > + > bt_bmc = devm_kzalloc(dev, sizeof(*bt_bmc), GFP_KERNEL); > if (!bt_bmc) > return -ENOMEM; > @@ -483,7 +499,7 @@ static int bt_bmc_probe(struct platform_device *pdev) > return rc; > } > > - aspeed_bt_bmc_config_irq(bt_bmc, pdev); > + ops->config_irq(bt_bmc, pdev); > > if (bt_bmc->irq >= 0) { > dev_info(dev, "Using IRQ %d\n", bt_bmc->irq); > @@ -494,7 +510,7 @@ static int bt_bmc_probe(struct platform_device *pdev) > add_timer(&bt_bmc->poll_timer); > } > > - aspeed_enable_bt(bt_bmc); > + ops->enable_bt(bt_bmc); > > clr_b_busy(bt_bmc); > > @@ -512,8 +528,8 @@ static int bt_bmc_remove(struct platform_device *pdev) > } > > static const struct of_device_id bt_bmc_match[] = { > - { .compatible = "aspeed,ast2400-ibt-bmc" }, > - { .compatible = "aspeed,ast2500-ibt-bmc" }, > + { .compatible = "aspeed,ast2400-ibt-bmc", .data = &aspeed_bt_bmc_ops }, > + { .compatible = "aspeed,ast2500-ibt-bmc", .data = &aspeed_bt_bmc_ops }, > { }, > }; > >
diff --git a/drivers/char/ipmi/bt-bmc.c b/drivers/char/ipmi/bt-bmc.c index 2b0fe1255026..b48e04405ac4 100644 --- a/drivers/char/ipmi/bt-bmc.c +++ b/drivers/char/ipmi/bt-bmc.c @@ -17,6 +17,7 @@ #include <linux/regmap.h> #include <linux/sched.h> #include <linux/timer.h> +#include <linux/of_device.h> /* * This is a BMC device used to communicate to the host @@ -435,15 +436,30 @@ static void aspeed_enable_bt(struct bt_bmc *bt_bmc) BT_CR0_ENABLE_IBT); } +struct bt_bmc_ops { + int (*config_irq)(struct bt_bmc *bt_bmc, struct platform_device *pdev); + void (*enable_bt)(struct bt_bmc *bt_bmc); +}; + +static const struct bt_bmc_ops aspeed_bt_bmc_ops = { + .config_irq = aspeed_bt_bmc_config_irq, + .enable_bt = aspeed_enable_bt, +}; + static int bt_bmc_probe(struct platform_device *pdev) { struct bt_bmc *bt_bmc; struct device *dev; int rc; + const struct bt_bmc_ops *ops; dev = &pdev->dev; dev_info(dev, "Found bt bmc device\n"); + ops = of_device_get_match_data(&pdev->dev); + if (!ops) + return -ENODEV; + bt_bmc = devm_kzalloc(dev, sizeof(*bt_bmc), GFP_KERNEL); if (!bt_bmc) return -ENOMEM; @@ -483,7 +499,7 @@ static int bt_bmc_probe(struct platform_device *pdev) return rc; } - aspeed_bt_bmc_config_irq(bt_bmc, pdev); + ops->config_irq(bt_bmc, pdev); if (bt_bmc->irq >= 0) { dev_info(dev, "Using IRQ %d\n", bt_bmc->irq); @@ -494,7 +510,7 @@ static int bt_bmc_probe(struct platform_device *pdev) add_timer(&bt_bmc->poll_timer); } - aspeed_enable_bt(bt_bmc); + ops->enable_bt(bt_bmc); clr_b_busy(bt_bmc); @@ -512,8 +528,8 @@ static int bt_bmc_remove(struct platform_device *pdev) } static const struct of_device_id bt_bmc_match[] = { - { .compatible = "aspeed,ast2400-ibt-bmc" }, - { .compatible = "aspeed,ast2500-ibt-bmc" }, + { .compatible = "aspeed,ast2400-ibt-bmc", .data = &aspeed_bt_bmc_ops }, + { .compatible = "aspeed,ast2500-ibt-bmc", .data = &aspeed_bt_bmc_ops }, { }, };
While most of the driver is arch agnostic, setting up and handling interrupts, and enabling the hardware is not. Create bt_bmc_ops to handle these functions. Signed-off-by: Anton Blanchard <anton@ozlabs.org> --- drivers/char/ipmi/bt-bmc.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-)