powerpc/eeh: Avoid misleading message "EEH: no capable adapters found"

Due to recent refactoring in EEH in:
commit b9fde58db7e5 ("powerpc/powernv: Rework EEH initialization on
powernv")
a misleading message was seen in the kernel message buffer:

[    0.108431] EEH: PowerNV platform initialized
[    0.589979] EEH: No capable adapters found

This happened due to the removal of the initialization delay for powernv
platform.

Even though the EEH infrastructure for the devices is eventually
initialized and still works just fine the eeh device probe step is
postponed in order to assure the PEs are created. Later
pnv_eeh_post_init does the probe devices job but at that point the
message was already shown right after eeh_init flow.

This patch introduces a new flag EEH_POSTPONED_PROBE to represent that
temporary state and avoid the message mentioned above and showing the
follow one instead:

[    0.107724] EEH: PowerNV platform initialized
[    4.844825] EEH: PCI Enhanced I/O Error Handling Enabled

Signed-off-by: Mauro S. M. Rodrigues <maurosr@linux.vnet.ibm.com>
Acked-by: Russell Currey <ruscur@russell.cc>
Tested-by:Venkat Rao B <vrbagal1@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/include/asm/eeh.h b/arch/powerpc/include/asm/eeh.h
index 677102baf3cdb8960842216d5a59633a0c312c9b..219637ea69a1c934f82ecda06cf3f34d2b8085ad 100644 (file)
--- a/arch/powerpc/include/asm/eeh.h
+++ b/arch/powerpc/include/asm/eeh.h
@@ -36,13 +36,14 @@ struct pci_dn;
 #ifdef CONFIG_EEH
 
 /* EEH subsystem flags */
-#define EEH_ENABLED            0x01    /* EEH enabled          */
-#define EEH_FORCE_DISABLED     0x02    /* EEH disabled         */
-#define EEH_PROBE_MODE_DEV     0x04    /* From PCI device      */
-#define EEH_PROBE_MODE_DEVTREE 0x08    /* From device tree     */
-#define EEH_VALID_PE_ZERO      0x10    /* PE#0 is valid        */
-#define EEH_ENABLE_IO_FOR_LOG  0x20    /* Enable IO for log    */
-#define EEH_EARLY_DUMP_LOG     0x40    /* Dump log immediately */
+#define EEH_ENABLED            0x01    /* EEH enabled                       */
+#define EEH_FORCE_DISABLED     0x02    /* EEH disabled                      */
+#define EEH_PROBE_MODE_DEV     0x04    /* From PCI device                   */
+#define EEH_PROBE_MODE_DEVTREE 0x08    /* From device tree                  */
+#define EEH_VALID_PE_ZERO      0x10    /* PE#0 is valid                     */
+#define EEH_ENABLE_IO_FOR_LOG  0x20    /* Enable IO for log                 */
+#define EEH_EARLY_DUMP_LOG     0x40    /* Dump log immediately              */
+#define EEH_POSTPONED_PROBE    0x80    /* Powernv may postpone device probe */
 
 /*
  * Delay for PE reset, all in ms

diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c
index 5746809cfaad81824be80a647edc5182456dfd5b..6ebba3e48b012b50b3150b3462bd224166c1b456 100644 (file)
--- a/arch/powerpc/kernel/eeh.c
+++ b/arch/powerpc/kernel/eeh.c
@@ -1087,7 +1087,7 @@ static int eeh_init(void)
 
        if (eeh_enabled())
                pr_info("EEH: PCI Enhanced I/O Error Handling Enabled\n");
-       else
+       else if (!eeh_has_flag(EEH_POSTPONED_PROBE))
                pr_info("EEH: No capable adapters found\n");
 
        return ret;

diff --git a/arch/powerpc/platforms/powernv/eeh-powernv.c b/arch/powerpc/platforms/powernv/eeh-powernv.c
index ddfc3544d28514aedf4e57008e687940ce94cda3..3c1beae29f2d838ddc3871a0f78608b5068fb125 100644 (file)
--- a/arch/powerpc/platforms/powernv/eeh-powernv.c
+++ b/arch/powerpc/platforms/powernv/eeh-powernv.c
@@ -223,6 +223,14 @@ int pnv_eeh_post_init(void)
        eeh_probe_devices();
        eeh_addr_cache_build();
 
+       if (eeh_has_flag(EEH_POSTPONED_PROBE)) {
+               eeh_clear_flag(EEH_POSTPONED_PROBE);
+               if (eeh_enabled())
+                       pr_info("EEH: PCI Enhanced I/O Error Handling Enabled\n");
+               else
+                       pr_info("EEH: No capable adapters found\n");
+       }
+
        /* Register OPAL event notifier */
        eeh_event_irq = opal_event_request(ilog2(OPAL_EVENT_PCI_ERROR));
        if (eeh_event_irq < 0) {
@@ -384,8 +392,10 @@ static void *pnv_eeh_probe(struct pci_dn *pdn, void *data)
                return NULL;
 
        /* Skip if we haven't probed yet */
-       if (phb->ioda.pe_rmap[config_addr] == IODA_INVALID_PE)
+       if (phb->ioda.pe_rmap[config_addr] == IODA_INVALID_PE) {
+               eeh_add_flag(EEH_POSTPONED_PROBE);
                return NULL;
+       }
 
        /* Initialize eeh device */
        edev->class_code = pdn->class_code;