From: Michael Ellerman <mpe@ellerman•id.au>
To: Tyrel Datwyler <tyreld@linux•ibm.com>
Cc: nathanl@linux•ibm.com, linuxppc-dev@lists•ozlabs.org,
Tyrel Datwyler <tyreld@linux•vnet.ibm.com>,
Tyrel Datwyler <tyreld@linux•ibm.com>
Subject: Re: [PATCH 3/9] powerpc/pseries: Add cpu DLPAR support for drc-info property
Date: Thu, 07 Nov 2019 22:35:26 +1100 [thread overview]
Message-ID: <878sor6hs1.fsf@mpe.ellerman.id.au> (raw)
In-Reply-To: <1572967453-9586-4-git-send-email-tyreld@linux.ibm.com>
Tyrel Datwyler <tyreld@linux•ibm.com> writes:
> diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c
> index bbda646..9ba006c 100644
> --- a/arch/powerpc/platforms/pseries/hotplug-cpu.c
> +++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c
> @@ -730,24 +774,49 @@ static int find_dlpar_cpus_to_add(u32 *cpu_drcs, u32 cpus_to_add)
> return -1;
> }
>
> - /* Search the ibm,drc-indexes array for possible CPU drcs to
> - * add. Note that the format of the ibm,drc-indexes array is
> - * the number of entries in the array followed by the array
> - * of drc values so we start looking at index = 1.
> - */
> - index = 1;
> - while (cpus_found < cpus_to_add) {
> - u32 drc;
> + info = of_find_property(parent, "ibm,drc-info", NULL);
> + if (info) {
> + struct of_drc_info drc;
> + const __be32 *value;
> + int count;
>
> - rc = of_property_read_u32_index(parent, "ibm,drc-indexes",
> - index++, &drc);
> - if (rc)
> - break;
> + value = of_prop_next_u32(info, NULL, &count);
> + if (value)
> + value++;
>
> - if (dlpar_cpu_exists(parent, drc))
> - continue;
> + for (i = 0; i < count; i++) {
> + of_read_drc_info_cell(&info, &value, &drc);
> + if (strncmp(drc.drc_type, "CPU", 3))
> + break;
> +
> + for (j = 0; j < drc.num_sequential_elems && cpus_found < cpus_to_add; j++) {
This line's nearly 100 columns, which suggests that this logic has
gotten too convoluted to be a single function.
So I think you should split one or both arms of the if out into separate
functions.
You're basically doing nothing after the if, so possibly you can just
return the result of the split out functions directly.
cheers
> + drc_index = drc.drc_index_start + (drc.sequential_inc * j);
> +
> + if (dlpar_cpu_exists(parent, drc_index))
> + continue;
> +
> + cpu_drcs[cpus_found++] = drc_index;
> + }
> + }
> + } else {
> + /* Search the ibm,drc-indexes array for possible CPU drcs to
> + * add. Note that the format of the ibm,drc-indexes array is
> + * the number of entries in the array followed by the array
> + * of drc values so we start looking at index = 1.
> + */
> + index = 1;
> + while (cpus_found < cpus_to_add) {
> + rc = of_property_read_u32_index(parent, "ibm,drc-indexes",
> + index++, &drc_index);
> +
> + if (rc)
> + break;
>
> - cpu_drcs[cpus_found++] = drc;
> + if (dlpar_cpu_exists(parent, drc_index))
> + continue;
> +
> + cpu_drcs[cpus_found++] = drc_index;
> + }
> }
>
> of_node_put(parent);
next prev parent reply other threads:[~2019-11-07 11:38 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-05 15:24 [PATCH 0/9] Fixes and Enablement of ibm,drc-info property Tyrel Datwyler
2019-11-05 15:24 ` [PATCH 1/9] powerpc/pseries: Fix bad drc_index_start value parsing of drc-info entry Tyrel Datwyler
2019-11-05 15:24 ` [PATCH 2/9] powerpc/pseries: Fix drc-info mappings of logical cpus to drc-index Tyrel Datwyler
2019-11-05 15:24 ` [PATCH 3/9] powerpc/pseries: Add cpu DLPAR support for drc-info property Tyrel Datwyler
2019-11-05 16:55 ` Thomas Falcon
2019-11-06 20:15 ` Tyrel Datwyler
2019-11-07 11:35 ` Michael Ellerman [this message]
2019-11-05 15:24 ` [PATCH 4/9] PCI: rpaphp: Fix up pointer to first drc-info entry Tyrel Datwyler
2019-11-05 15:24 ` [PATCH 5/9] PCI: rpaphp: Don't rely on firmware feature to imply drc-info support Tyrel Datwyler
2019-11-05 15:24 ` [PATCH 6/9] PCI: rpaphp: Add drc-info support for hotplug slot registration Tyrel Datwyler
2019-11-05 15:24 ` [PATCH 7/9] PCI: rpaphp: annotate and correctly byte swap DRC properties Tyrel Datwyler
2019-11-07 11:40 ` Michael Ellerman
2019-11-05 15:24 ` [PATCH 8/9] PCI: rpaphp: Correctly match ibm, my-drc-index to drc-name when using drc-info Tyrel Datwyler
2019-11-05 15:24 ` [PATCH 9/9] powerpc/pseries: Enable support for ibm, drc-info property Tyrel Datwyler
2019-11-07 11:38 ` Michael Ellerman
2019-11-05 17:03 ` [PATCH 0/9] Fixes and Enablement of ibm,drc-info property Thomas Falcon
2019-11-06 20:12 ` Tyrel Datwyler
2019-11-07 11:26 ` Michael Ellerman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=878sor6hs1.fsf@mpe.ellerman.id.au \
--to=mpe@ellerman$(echo .)id.au \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=nathanl@linux$(echo .)ibm.com \
--cc=tyreld@linux$(echo .)ibm.com \
--cc=tyreld@linux$(echo .)vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox