lkml.org 
[lkml]   [2024]   [Apr]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH v10 4/7] spmi: pmic-arb: Make the APID init a version operation
    Rather than using conditionals in probe function, add the APID init
    as a version specific operation. Due to v7, which supports multiple
    buses, pass on the bus index to be used for sorting out the apid base
    and count.

    Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
    Signed-off-by: Abel Vesa <abel.vesa@linaro.org>
    ---
    drivers/spmi/spmi-pmic-arb.c | 144 +++++++++++++++++++++----------------------
    1 file changed, 69 insertions(+), 75 deletions(-)

    diff --git a/drivers/spmi/spmi-pmic-arb.c b/drivers/spmi/spmi-pmic-arb.c
    index 12c0efd744c2..fe45d62a42e2 100644
    --- a/drivers/spmi/spmi-pmic-arb.c
    +++ b/drivers/spmi/spmi-pmic-arb.c
    @@ -186,6 +186,7 @@ struct spmi_pmic_arb {
    * struct pmic_arb_ver_ops - version dependent functionality.
    *
    * @ver_str: version string.
    + * @init_apid: finds the apid base and count
    * @ppid_to_apid: finds the apid for a given ppid.
    * @non_data_cmd: on v1 issues an spmi non-data command.
    * on v2 no HW support, returns -EOPNOTSUPP.
    @@ -205,6 +206,7 @@ struct spmi_pmic_arb {
    */
    struct pmic_arb_ver_ops {
    const char *ver_str;
    + int (*init_apid)(struct spmi_pmic_arb *pmic_arb);
    int (*ppid_to_apid)(struct spmi_pmic_arb *pmic_arb, u16 ppid);
    /* spmi commands (read_cmd, write_cmd, cmd) functionality */
    int (*offset)(struct spmi_pmic_arb *pmic_arb, u8 sid, u16 addr,
    @@ -947,6 +949,32 @@ static int qpnpint_irq_domain_alloc(struct irq_domain *domain,
    return 0;
    }

    +static int pmic_arb_init_apid_min_max(struct spmi_pmic_arb *pmic_arb)
    +{
    + /*
    + * Initialize max_apid/min_apid to the opposite bounds, during
    + * the irq domain translation, we are sure to update these
    + */
    + pmic_arb->max_apid = 0;
    + pmic_arb->min_apid = pmic_arb->max_periphs - 1;
    +
    + return 0;
    +}
    +
    +static int pmic_arb_init_apid_v1(struct spmi_pmic_arb *pmic_arb)
    +{
    + u32 *mapping_table;
    +
    + mapping_table = devm_kcalloc(&pmic_arb->spmic->dev, pmic_arb->max_periphs,
    + sizeof(*mapping_table), GFP_KERNEL);
    + if (!mapping_table)
    + return -ENOMEM;
    +
    + pmic_arb->mapping_table = mapping_table;
    +
    + return pmic_arb_init_apid_min_max(pmic_arb);
    +}
    +
    static int pmic_arb_ppid_to_apid_v1(struct spmi_pmic_arb *pmic_arb, u16 ppid)
    {
    u32 *mapping_table = pmic_arb->mapping_table;
    @@ -1149,6 +1177,34 @@ static int pmic_arb_offset_v2(struct spmi_pmic_arb *pmic_arb, u8 sid, u16 addr,
    return 0x1000 * pmic_arb->ee + 0x8000 * apid;
    }

    +static int pmic_arb_init_apid_v5(struct spmi_pmic_arb *pmic_arb)
    +{
    + int ret;
    +
    + pmic_arb->base_apid = 0;
    + pmic_arb->apid_count = readl_relaxed(pmic_arb->core + PMIC_ARB_FEATURES) &
    + PMIC_ARB_FEATURES_PERIPH_MASK;
    +
    + if (pmic_arb->base_apid + pmic_arb->apid_count > pmic_arb->max_periphs) {
    + dev_err(&pmic_arb->spmic->dev, "Unsupported APID count %d detected\n",
    + pmic_arb->base_apid + pmic_arb->apid_count);
    + return -EINVAL;
    + }
    +
    + ret = pmic_arb_init_apid_min_max(pmic_arb);
    + if (ret)
    + return ret;
    +
    + ret = pmic_arb_read_apid_map_v5(pmic_arb);
    + if (ret) {
    + dev_err(&pmic_arb->spmic->dev, "could not read APID->PPID mapping table, rc= %d\n",
    + ret);
    + return ret;
    + }
    +
    + return 0;
    +}
    +
    /*
    * v5 offset per ee and per apid for observer channels and per apid for
    * read/write channels.
    @@ -1363,6 +1419,7 @@ pmic_arb_apid_owner_v7(struct spmi_pmic_arb *pmic_arb, u16 n)

    static const struct pmic_arb_ver_ops pmic_arb_v1 = {
    .ver_str = "v1",
    + .init_apid = pmic_arb_init_apid_v1,
    .ppid_to_apid = pmic_arb_ppid_to_apid_v1,
    .non_data_cmd = pmic_arb_non_data_cmd_v1,
    .offset = pmic_arb_offset_v1,
    @@ -1377,6 +1434,7 @@ static const struct pmic_arb_ver_ops pmic_arb_v1 = {

    static const struct pmic_arb_ver_ops pmic_arb_v2 = {
    .ver_str = "v2",
    + .init_apid = pmic_arb_init_apid_v1,
    .ppid_to_apid = pmic_arb_ppid_to_apid_v2,
    .non_data_cmd = pmic_arb_non_data_cmd_v2,
    .offset = pmic_arb_offset_v2,
    @@ -1391,6 +1449,7 @@ static const struct pmic_arb_ver_ops pmic_arb_v2 = {

    static const struct pmic_arb_ver_ops pmic_arb_v3 = {
    .ver_str = "v3",
    + .init_apid = pmic_arb_init_apid_v1,
    .ppid_to_apid = pmic_arb_ppid_to_apid_v2,
    .non_data_cmd = pmic_arb_non_data_cmd_v2,
    .offset = pmic_arb_offset_v2,
    @@ -1405,6 +1464,7 @@ static const struct pmic_arb_ver_ops pmic_arb_v3 = {

    static const struct pmic_arb_ver_ops pmic_arb_v5 = {
    .ver_str = "v5",
    + .init_apid = pmic_arb_init_apid_v5,
    .ppid_to_apid = pmic_arb_ppid_to_apid_v5,
    .non_data_cmd = pmic_arb_non_data_cmd_v2,
    .offset = pmic_arb_offset_v5,
    @@ -1419,6 +1479,7 @@ static const struct pmic_arb_ver_ops pmic_arb_v5 = {

    static const struct pmic_arb_ver_ops pmic_arb_v7 = {
    .ver_str = "v7",
    + .init_apid = pmic_arb_init_apid_v5,
    .ppid_to_apid = pmic_arb_ppid_to_apid_v5,
    .non_data_cmd = pmic_arb_non_data_cmd_v2,
    .offset = pmic_arb_offset_v7,
    @@ -1444,7 +1505,6 @@ static int spmi_pmic_arb_probe(struct platform_device *pdev)
    struct spmi_controller *ctrl;
    struct resource *res;
    void __iomem *core;
    - u32 *mapping_table;
    u32 channel, ee, hw_ver;
    int err;

    @@ -1472,12 +1532,6 @@ static int spmi_pmic_arb_probe(struct platform_device *pdev)

    pmic_arb->core_size = resource_size(res);

    - pmic_arb->ppid_to_apid = devm_kcalloc(&ctrl->dev, PMIC_ARB_MAX_PPID,
    - sizeof(*pmic_arb->ppid_to_apid),
    - GFP_KERNEL);
    - if (!pmic_arb->ppid_to_apid)
    - return -ENOMEM;
    -
    hw_ver = readl_relaxed(core + PMIC_ARB_VERSION);

    if (hw_ver < PMIC_ARB_VERSION_V2_MIN) {
    @@ -1511,58 +1565,17 @@ static int spmi_pmic_arb_probe(struct platform_device *pdev)
    return -ENOMEM;
    }

    - pmic_arb->max_periphs = PMIC_ARB_MAX_PERIPHS;
    + dev_info(&ctrl->dev, "PMIC arbiter version %s (0x%x)\n",
    + pmic_arb->ver_ops->ver_str, hw_ver);

    - if (hw_ver >= PMIC_ARB_VERSION_V7_MIN) {
    + if (hw_ver < PMIC_ARB_VERSION_V7_MIN)
    + pmic_arb->max_periphs = PMIC_ARB_MAX_PERIPHS;
    + else
    pmic_arb->max_periphs = PMIC_ARB_MAX_PERIPHS_V7;
    - /* Optional property for v7: */
    - of_property_read_u32(pdev->dev.of_node, "qcom,bus-id",
    - &pmic_arb->bus_instance);
    - if (pmic_arb->bus_instance > 1) {
    - dev_err(&pdev->dev, "invalid bus instance (%u) specified\n",
    - pmic_arb->bus_instance);
    - return -EINVAL;
    - }

    - if (pmic_arb->bus_instance == 0) {
    - pmic_arb->base_apid = 0;
    - pmic_arb->apid_count =
    - readl_relaxed(core + PMIC_ARB_FEATURES) &
    - PMIC_ARB_FEATURES_PERIPH_MASK;
    - } else {
    - pmic_arb->base_apid =
    - readl_relaxed(core + PMIC_ARB_FEATURES) &
    - PMIC_ARB_FEATURES_PERIPH_MASK;
    - pmic_arb->apid_count =
    - readl_relaxed(core + PMIC_ARB_FEATURES1) &
    - PMIC_ARB_FEATURES_PERIPH_MASK;
    - }
    -
    - if (pmic_arb->base_apid + pmic_arb->apid_count > pmic_arb->max_periphs) {
    - dev_err(&pdev->dev, "Unsupported APID count %d detected\n",
    - pmic_arb->base_apid + pmic_arb->apid_count);
    - return -EINVAL;
    - }
    - } else if (hw_ver >= PMIC_ARB_VERSION_V5_MIN) {
    - pmic_arb->base_apid = 0;
    - pmic_arb->apid_count = readl_relaxed(core + PMIC_ARB_FEATURES) &
    - PMIC_ARB_FEATURES_PERIPH_MASK;
    -
    - if (pmic_arb->apid_count > pmic_arb->max_periphs) {
    - dev_err(&pdev->dev, "Unsupported APID count %d detected\n",
    - pmic_arb->apid_count);
    - return -EINVAL;
    - }
    - }
    -
    - pmic_arb->apid_data = devm_kcalloc(&ctrl->dev, pmic_arb->max_periphs,
    - sizeof(*pmic_arb->apid_data),
    - GFP_KERNEL);
    - if (!pmic_arb->apid_data)
    - return -ENOMEM;
    -
    - dev_info(&ctrl->dev, "PMIC arbiter version %s (0x%x)\n",
    - pmic_arb->ver_ops->ver_str, hw_ver);
    + err = pmic_arb->ver_ops->init_apid(pmic_arb);
    + if (err)
    + return err;

    res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "intr");
    pmic_arb->intr = devm_ioremap_resource(&ctrl->dev, res);
    @@ -1604,16 +1617,6 @@ static int spmi_pmic_arb_probe(struct platform_device *pdev)
    }

    pmic_arb->ee = ee;
    - mapping_table = devm_kcalloc(&ctrl->dev, pmic_arb->max_periphs,
    - sizeof(*mapping_table), GFP_KERNEL);
    - if (!mapping_table)
    - return -ENOMEM;
    -
    - pmic_arb->mapping_table = mapping_table;
    - /* Initialize max_apid/min_apid to the opposite bounds, during
    - * the irq domain translation, we are sure to update these */
    - pmic_arb->max_apid = 0;
    - pmic_arb->min_apid = pmic_arb->max_periphs - 1;

    platform_set_drvdata(pdev, ctrl);
    raw_spin_lock_init(&pmic_arb->lock);
    @@ -1622,15 +1625,6 @@ static int spmi_pmic_arb_probe(struct platform_device *pdev)
    ctrl->read_cmd = pmic_arb_read_cmd;
    ctrl->write_cmd = pmic_arb_write_cmd;

    - if (hw_ver >= PMIC_ARB_VERSION_V5_MIN) {
    - err = pmic_arb_read_apid_map_v5(pmic_arb);
    - if (err) {
    - dev_err(&pdev->dev, "could not read APID->PPID mapping table, rc= %d\n",
    - err);
    - return err;
    - }
    - }
    -
    dev_dbg(&pdev->dev, "adding irq domain\n");
    pmic_arb->domain = irq_domain_add_tree(pdev->dev.of_node,
    &pmic_arb_irq_domain_ops, pmic_arb);
    --
    2.34.1


    \
     
     \ /
      Last update: 2024-05-27 16:43    [W:2.170 / U:0.304 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site