PCI: Use pcie_reset_state_t type in function arguments
Subsystems (3)
PATCH 1/2 PCI: Use pcie_reset_state_t type in function arguments
The pcie_reset_state_t type has been introduced in the commit f7bdd12d234d ("pci: New PCI-E reset API") along with the enum pcie_reset_state, but it has never been used for anything else other than to define the members of the enumeration set in the enum pcie_reset_state.
Thus, replace the direct use of enum pcie_reset_state in function arguments and replace it with pcie_reset_state_t type so that the argument type matches the type used in enum pcie_reset_state.
--- drivers/pci/pci.c | 4 ++-- include/linux/pci.h | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-)
drivers/pci/pci.c +2 -2
@@ -2194,7 +2194,7 @@ EXPORT_SYMBOL(pci_disable_device);* implementation. Architecture implementations can override this. */ int __weak pcibios_set_pcie_reset_state (struct pci_dev *dev, -enum pcie_reset_state state) +pcie_reset_state_t state) {return -EINVAL ; }
@@ -2206,7 +2206,7 @@ int __weak pcibios_set_pcie_reset_state(struct pci_dev *dev,* * Sets the PCI reset state for the device. */ -int pci_set_pcie_reset_state (struct pci_dev *dev,enum pcie_reset_state state) +int pci_set_pcie_reset_state (struct pci_dev *dev,pcie_reset_state_t state) {return pcibios_set_pcie_reset_state (dev, state); }
include/linux/pci.h +2 -3
@@ -191,7 +191,6 @@ enum { };typedef unsigned int __bitwise pcie_reset_state_t ; -enum pcie_reset_state {/* Reset is NOT asserted (Use to deassert reset) */ pcie_deassert_reset = (__force pcie_reset_state_t )1 ,
@@ -1205,7 +1204,7 @@ extern unsigned int pcibios_max_latency;void pci_set_master (struct pci_dev *dev);void pci_clear_master (struct pci_dev *dev); -int pci_set_pcie_reset_state (struct pci_dev *dev,enum pcie_reset_state state); +int pci_set_pcie_reset_state (struct pci_dev *dev,pcie_reset_state_t state);int pci_set_cacheline_size (struct pci_dev *dev);int __must_check pci_set_mwi (struct pci_dev *dev);int __must_check pcim_set_mwi (struct pci_dev *dev);
@@ -2079,7 +2078,7 @@ extern u8 pci_cache_line_size;void pcibios_disable_device (struct pci_dev *dev);void pcibios_set_master (struct pci_dev *dev);int pcibios_set_pcie_reset_state (struct pci_dev *dev, -enum pcie_reset_state state); +pcie_reset_state_t state);int pcibios_add_device (struct pci_dev *dev);void pcibios_release_device (struct pci_dev *dev);#ifdef CONFIG_PCI
Signature · 1 line
2.32.0
PATCH 2/2 powerpc/eeh: Use pcie_reset_state_t type in function arguments
The pcie_reset_state_t type has been introduced in the commit f7bdd12d234d ("pci: New PCI-E reset API") along with the enum pcie_reset_state, but it has never been used for anything else other than to define the members of the enumeration set in the enum pcie_reset_state.
Thus, replace the direct use of enum pcie_reset_state in function arguments and replace it with pcie_reset_state_t type so that the argument type matches the type used in enum pcie_reset_state.
--- arch/powerpc/kernel/eeh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/kernel/eeh.c +1 -1
@@ -714,7 +714,7 @@ static void eeh_restore_dev_state(struct eeh_dev *edev, void *userdata)* Return value: * 0 if success */ -int pcibios_set_pcie_reset_state (struct pci_dev *dev,enum pcie_reset_state state) +int pcibios_set_pcie_reset_state (struct pci_dev *dev,pcie_reset_state_t state) {struct eeh_dev *edev =pci_dev_to_eeh_dev (dev);struct eeh_pe *pe =eeh_dev_to_pe (edev);
Signature · 1 line
2.32.0
Re: [PATCH 2/2] powerpc/eeh: Use pcie_reset_state_t type in function arguments
Le 13/07/2021 à 02:25, Krzysztof Wilczyński a écrit :
Quoted 11 lines
The
pcie_reset_state_ttype has been introduced in the commitf7bdd12d234d("pci: New PCI-E reset API") along with the enumpcie_reset_state, but it has never been used for anything else other than to define the members of the enumeration set in the enumpcie_reset_state.Thus, replace the direct use of enum
pcie_reset_statein function arguments and replace it withpcie_reset_state_ttype so that the argument type matches the type used in enumpcie_reset_state.Signed-off-by Krzysztof Wilczyński <[email protected]>
I don't understand the purpose of this change. Does any tool like sparse of so reports an error here ?
My feeling is that by doing this you loose the added value of using an enumerate.
state is used in a switch/case, that's exactly what we expect from an enum.
By the way, I think you can't change the prototype of a weak function in a patch and not change it at the same time for the overloading function.
So should you still think this change is necessary, I think patch 1 and 2 should be squashed together in one.
Christophe
Quoted 17 lines
--- arch/powerpc/kernel/eeh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/powerpc/kernel/eeh.c +1
-1@@ -714,7 +714,7 @@ static void eeh_restore_dev_state(struct eeh_dev *edev, void *userdata)* Return value: * 0 if success */ -int pcibios_set_pcie_reset_state (struct pci_dev *dev,enum pcie_reset_state state) +int pcibios_set_pcie_reset_state (struct pci_dev *dev,pcie_reset_state_t state) {struct eeh_dev *edev =pci_dev_to_eeh_dev (dev);struct eeh_pe *pe =eeh_dev_to_pe (edev);
Re: [PATCH 2/2] powerpc/eeh: Use pcie_reset_state_t type in function arguments
Quoted 13 lines · Christophe Leroy
Le 13/07/2021 à 02:25, Krzysztof Wilczyński a écrit :
Quoted 11 lines
The
pcie_reset_state_ttype has been introduced in the commitf7bdd12d234d("pci: New PCI-E reset API") along with the enumpcie_reset_state, but it has never been used for anything else other than to define the members of the enumeration set in the enumpcie_reset_state.Thus, replace the direct use of enum
pcie_reset_statein function arguments and replace it withpcie_reset_state_ttype so that the argument type matches the type used in enumpcie_reset_state.Signed-off-by Krzysztof Wilczyński <[email protected]>
Quoted 8 lines
I don't understand the purpose of this change. Does any tool like sparse of so reports an error here ?
My feeling is that by doing this you loose the added value of using an enumerate.
state is used in a switch/case, that's exactly what we expect from an enum.
I think this is true: in the patch below, we remove use of "enum pcie_reset_state", so the compiler no longer knows that "state" is an enum, and it cannot verify that "state" has a legal value in the switch statement. And at least with "gcc -Wall", it looks like it *does* complain in that case.
Whether that value is worthwhile, I don't know. AFAICT this is the only place that uses "state", so there's not *much* value.
If we did apply the patch below, I think we could probably make "enum pcie_reset_state" an anonymous enum instead, like the enum for pci_channel_state_t.
But let's back up for a minute. This is only used in the pci_set_pcie_reset_state() path, and that's only used by three
drivers: cxl, genwqe, and ipr, and obviously only on powerpc, since that's the only arch that implements pcibios_set_pcie_reset_state().
What's special about them? Why do they need this and no other drivers do? And why only on powerpc?
I wonder if that powerpc functionality could be implemented in some way that's more integrated into the PCI core reset and error handling framework.
Quoted 17 lines
Quoted 17 lines
--- arch/powerpc/kernel/eeh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/powerpc/kernel/eeh.c +1
-1@@ -714,7 +714,7 @@ static void eeh_restore_dev_state(struct eeh_dev *edev, void *userdata)* Return value: * 0 if success */ -int pcibios_set_pcie_reset_state (struct pci_dev *dev,enum pcie_reset_state state) +int pcibios_set_pcie_reset_state (struct pci_dev *dev,pcie_reset_state_t state) {struct eeh_dev *edev =pci_dev_to_eeh_dev (dev);struct eeh_pe *pe =eeh_dev_to_pe (edev);