powernv/pci: Use pnv_phb as the private data for debugfs entries
PATCH 1/3 powernv/pci: Use pnv_phb as the private data for debugfs entries
Use the pnv_phb structure as the private data pointer for the debugfs files. This lets us delete some code and an open-coded use of hose->private_data.
--- arch/powerpc/platforms/powernv/pci-ioda.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)
arch/powerpc/platforms/powernv/pci-ioda.c +2 -9
@@ -3044,19 +3044,12 @@ static void pnv_ioda_setup_pe_seg(struct pnv_ioda_pe *pe)#ifdef CONFIG_DEBUG_FS static int pnv_pci_diag_data_set (void *data,u64 val) { -struct pci_controller *hose; -struct pnv_phb *phb; +struct pnv_phb *phb = data;s64 ret;if (val !=1ULL )return -EINVAL ; - hose = (struct pci_controller *)data; -if (!hose || !hose->private_data) -return -ENODEV ; - - phb = hose->private_data; -/* Retrieve the diag data from firmware */ ret =opal_pci_get_phb_diag_data2 (phb->opal_id, phb->diag_data, phb->diag_data_size);
@@ -3094,7 +3087,7 @@ static void pnv_pci_ioda_create_dbgfs(void) continue; } -debugfs_create_file ("dump_diag_regs" ,0200 , phb->dbgfs, hose, +debugfs_create_file ("dump_diag_regs" ,0200 , phb->dbgfs, phb, &pnv_pci_diag_data_fops); }#endif /* CONFIG_DEBUG_FS */
Signature · 1 line
2.9.5
PATCH 2/3 powernv/pci: Allow any write trigger the diag dump
Make the dump trigger off any input rather than just '1'. This allows you to write "echo 1> dump_diag_data" and it'll do what you want rather than erroring out pointlessly.
--- arch/powerpc/platforms/powernv/pci-ioda.c | 3 --- 1 file changed, 3 deletions(-)
arch/powerpc/platforms/powernv/pci-ioda.c +0 -3
@@ -3047,9 +3047,6 @@ static int pnv_pci_diag_data_set(void *data, u64 val)struct pnv_phb *phb = data;s64 ret; -if (val !=1ULL ) -return -EINVAL ; -/* Retrieve the diag data from firmware */ ret =opal_pci_get_phb_diag_data2 (phb->opal_id, phb->diag_data, phb->diag_data_size);
Signature · 1 line
2.9.5
PATCH 3/3 powernv/pci: Add a debugfs entry to dump PHB's IODA PE state
In reply to Oliver O'HalloranAdd a debugfs entry to dump the state of the active IODA PEs. The IODA PE state reflects how the PHB's internal concept of a PE is configured. This is separate to the EEH PE state and is managed power the PowerNV PCI backend rather than the EEH core.
--- arch/powerpc/platforms/powernv/pci-ioda.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)
arch/powerpc/platforms/powernv/pci-ioda.c +29 -0
@@ -3061,6 +3061,33 @@ static int pnv_pci_diag_data_set(void *data, u64 val)DEFINE_SIMPLE_ATTRIBUTE (pnv_pci_diag_data_fops,NULL , pnv_pci_diag_data_set,"%llu\n" ); +static int pnv_pci_ioda_pe_dump (void *data,u64 val) +{ +struct pnv_phb *phb = data; +int pe_num; + +for (pe_num =0 ; pe_num < phb->ioda.total_pe_num; pe_num++) { +struct pnv_ioda_pe *pe = &phb->ioda.pe_array[pe_num]; + +if (!test_bit (pe_num, phb->ioda.pe_alloc)) +continue ; + +pe_warn (pe,"rid: %04x dev count: %2d flags: %s%s%s%s%s%s\n" , + pe->rid, pe->device_count, + (pe->flags &PNV_IODA_PE_DEV ) ?"dev " :"" , + (pe->flags &PNV_IODA_PE_BUS ) ?"bus " :"" , + (pe->flags &PNV_IODA_PE_BUS_ALL ) ?"all " :"" , + (pe->flags &PNV_IODA_PE_MASTER ) ?"master " :"" , + (pe->flags &PNV_IODA_PE_SLAVE ) ?"slave " :"" , + (pe->flags &PNV_IODA_PE_VF ) ?"vf " :"" ); + } + +return 0 ; +} + +DEFINE_SIMPLE_ATTRIBUTE (pnv_pci_ioda_pe_dump_fops,NULL , + pnv_pci_ioda_pe_dump,"%llu\n" ); +#endif /* CONFIG_DEBUG_FS */ static void pnv_pci_ioda_create_dbgfs (void )
@@ -3086,6 +3113,8 @@ static void pnv_pci_ioda_create_dbgfs(void)debugfs_create_file ("dump_diag_regs" ,0200 , phb->dbgfs, phb, &pnv_pci_diag_data_fops); +debugfs_create_file ("dump_ioda_pe_state" ,0200 , phb->dbgfs, phb, + &pnv_pci_ioda_pe_dump_fops); }#endif /* CONFIG_DEBUG_FS */ }
Signature · 1 line
2.9.5
Re: [PATCH 3/3] powernv/pci: Add a debugfs entry to dump PHB's IODA PE state
Quoted 27 lines · Oliver O'Halloran
Add a debugfs entry to dump the state of the active IODA PEs. The IODA PE state reflects how the PHB's internal concept of a PE is configured. This is separate to the EEH PE state and is managed power the PowerNV PCI backend rather than the EEH core.
Signed-off-by Oliver O'Halloran <[email protected]>--- arch/powerpc/platforms/powernv/pci-ioda.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)arch/powerpc/platforms/powernv/pci-ioda.c +9
-0@@ -3061,6 +3061,33 @@ static int pnv_pci_diag_data_set(void *data, u64 val)DEFINE_SIMPLE_ATTRIBUTE (pnv_pci_diag_data_fops,NULL , pnv_pci_diag_data_set,"%llu\n" ); +static int pnv_pci_ioda_pe_dump (void *data,u64 val) +{ +struct pnv_phb *phb = data; +int pe_num; + +for (pe_num =0 ; pe_num < phb->ioda.total_pe_num; pe_num++) { +struct pnv_ioda_pe *pe = &phb->ioda.pe_array[pe_num]; + +if (!test_bit (pe_num, phb->ioda.pe_alloc))
arch/powerpc/platforms/powernv/pci-ioda.c static int pnv_pci_diag_data_set(void *data, u64 val) · line 3082
Quoted 10 lines
arch/powerpc/platforms/powernv/pci-ioda.c +10
-0+continue ; + +pe_warn (pe,"rid: %04x dev count: %2d flags: %s%s%s%s%s%s\n" , + pe->rid, pe->device_count, + (pe->flags &PNV_IODA_PE_DEV ) ?"dev " :"" , + (pe->flags &PNV_IODA_PE_BUS ) ?"bus " :"" , + (pe->flags &PNV_IODA_PE_BUS_ALL ) ?"all " :"" , + (pe->flags &PNV_IODA_PE_MASTER ) ?"master " :"" , + (pe->flags &PNV_IODA_PE_SLAVE ) ?"slave " :"" , + (pe->flags &PNV_IODA_PE_VF ) ?"vf " :"" );
Printing raw flags value would hurt imho, just in case (we add some later and forget about debugfs? memory corruption?). Or not :)
Quoted 21 lines
arch/powerpc/platforms/powernv/pci-ioda.c +10
-0+ } + +return 0 ; +} + +DEFINE_SIMPLE_ATTRIBUTE (pnv_pci_ioda_pe_dump_fops,NULL , + pnv_pci_ioda_pe_dump,"%llu\n" ); +#endif /* CONFIG_DEBUG_FS */ static void pnv_pci_ioda_create_dbgfs (void )@@ -3086,6 +3113,8 @@ static void pnv_pci_ioda_create_dbgfs(void)debugfs_create_file ("dump_diag_regs" ,0200 , phb->dbgfs, phb, &pnv_pci_diag_data_fops); +debugfs_create_file ("dump_ioda_pe_state" ,0200 , phb->dbgfs, phb, + &pnv_pci_ioda_pe_dump_fops); }#endif /* CONFIG_DEBUG_FS */ }
Signature · 1 line
Alexey
Quoted 5 lines · Oliver O'Halloran
Use the
pnv_phbstructure as the private data pointer for the debugfs files. This lets us delete some code and an open-coded use ofhose->private_data.Signed-off-by Oliver O'Halloran <[email protected]>
Quoted 39 lines
--- arch/powerpc/platforms/powernv/pci-ioda.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)arch/powerpc/platforms/powernv/pci-ioda.c +2
-9@@ -3044,19 +3044,12 @@ static void pnv_ioda_setup_pe_seg(struct pnv_ioda_pe *pe)#ifdef CONFIG_DEBUG_FS static int pnv_pci_diag_data_set (void *data,u64 val) { -struct pci_controller *hose; -struct pnv_phb *phb; +struct pnv_phb *phb = data;s64 ret;if (val !=1ULL )return -EINVAL ; - hose = (struct pci_controller *)data; -if (!hose || !hose->private_data) -return -ENODEV ; - - phb = hose->private_data; -/* Retrieve the diag data from firmware */ ret =opal_pci_get_phb_diag_data2 (phb->opal_id, phb->diag_data, phb->diag_data_size);@@ -3094,7 +3087,7 @@ static void pnv_pci_ioda_create_dbgfs(void) continue; } -debugfs_create_file ("dump_diag_regs" ,0200 , phb->dbgfs, hose, +debugfs_create_file ("dump_diag_regs" ,0200 , phb->dbgfs, phb, &pnv_pci_diag_data_fops); }#endif /* CONFIG_DEBUG_FS */
Signature · 1 line
Alexey
Quoted 5 lines · Oliver O'Halloran
Use the
pnv_phbstructure as the private data pointer for the debugfs files. This lets us delete some code and an open-coded use ofhose->private_data.Signed-off-by Oliver O'Halloran <[email protected]>
Series applied to powerpc next, thanks.
https://git.kernel.org/powerpc/c/22ba7289079be12c85895fee41602139e9553c93
cheers