]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
powerpc/powernv: Return for invalid IMC domain
authorAnju T Sudhakar <anju@linux.vnet.ibm.com>
Mon, 20 May 2019 08:57:53 +0000 (14:27 +0530)
committerMichael Ellerman <mpe@ellerman.id.au>
Wed, 22 May 2019 11:32:51 +0000 (21:32 +1000)
Currently init_imc_pmu() can fail either because we try to register an
IMC unit with an invalid domain (i.e an IMC node not supported by the
kernel) or something went wrong while registering a valid IMC unit. In
both the cases kernel provides a 'Register failed' error message.

For example when trace-imc node is not supported by the kernel, but
skiboot advertises a trace-imc node we print:

  IMC Unknown Device type
  IMC PMU (null) Register failed

To avoid confusion just print the unknown device type message, before
attempting PMU registration, so the second message isn't printed.

Fixes: 8f95faaac56c ("powerpc/powernv: Detect and create IMC device")
Reported-by: Pavaman Subramaniyam <pavsubra@in.ibm.com>
Signed-off-by: Anju T Sudhakar <anju@linux.vnet.ibm.com>
Reviewed-by: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>
[mpe: Reword change log a bit]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/platforms/powernv/opal-imc.c

index 3e497b91d2100697a890784e774a20504d6c6e1b..52e9e159bb70a0f7f60936e1d75b4322b954e2b0 100644 (file)
@@ -161,6 +161,10 @@ static int imc_pmu_create(struct device_node *parent, int pmu_index, int domain)
        struct imc_pmu *pmu_ptr;
        u32 offset;
 
+       /* Return for unknown domain */
+       if (domain < 0)
+               return -EINVAL;
+
        /* memory for pmu */
        pmu_ptr = kzalloc(sizeof(*pmu_ptr), GFP_KERNEL);
        if (!pmu_ptr)