Skip to contentSkip to conversation

: Renumber PCI error enums to start at zero

PATCH Superseded Linas Vepstas 2 participants 7 messages Nov 1, 2006 – Nov 2, 2006

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 : Renumber PCI error enums to start at zero

Greg,

This is a low-prioriity patch to fix an annoying numbering mistake. Please apply this (and the next patch) at net convenience.

--linas

Subject: [PATCH 1/2]: Renumber PCI error enums to start at zero

Renumber the PCI error enums to start at zero for "normal/online". This allows un-initialized pci channel state (which defaults to zero) to be interpreted as "normal". Add very simple routine to check state, just in case this ever has to be fiddled with again.

----

 include/linux/pci.h |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
include/linux/pci.h +8 -3
Index: linux-2.6.19-rc4-git3/include/linux/pci.h
===================================================================
@@ -86,15 +86,20 @@ typedef unsigned int __bitwise pci_chann
 
 enum pci_channel_state {
 	/* I/O channel is in normal state */
-	pci_channel_io_normal = (__force pci_channel_state_t) 1,
+	pci_channel_io_normal = (__force pci_channel_state_t) 0,
 
 	/* I/O to channel is blocked */
-	pci_channel_io_frozen = (__force pci_channel_state_t) 2,
+	pci_channel_io_frozen = (__force pci_channel_state_t) 1,
 
 	/* PCI card is dead */
-	pci_channel_io_perm_failure = (__force pci_channel_state_t) 3,
+	pci_channel_io_perm_failure = (__force pci_channel_state_t) 2,
 };
 
+static inline int pci_channel_offline(pci_channel_state_t state)
+{
+	return (state != pci_channel_io_normal);
+}
+
 typedef unsigned short __bitwise pci_bus_flags_t;
 enum pci_bus_flags {
 	PCI_BUS_FLAGS_NO_MSI = (__force pci_bus_flags_t) 1,
#1 lore raw

PATCH 2/2 : Use newly defined PCI channel offline routine

Subject: [PATCH 2/2]: Use newly defined PCI channel offline routine

Use newly minted routine to access the PCI channel state.

----

 drivers/net/e1000/e1000_main.c |    2 +-
 drivers/net/ixgb/ixgb_main.c   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/e1000/e1000_main.c +1 -1
Index: linux-2.6.19-rc4-git3/drivers/net/e1000/e1000_main.c
===================================================================
@@ -3297,7 +3297,7 @@ e1000_update_stats(struct e1000_adapter 
 	 */
 	if (adapter->link_speed == 0)
 		return;
-	if (pdev->error_state && pdev->error_state != pci_channel_io_normal)
+	if (pci_channel_offline(pdev->error_state))
 		return;
 
 	spin_lock_irqsave(&adapter->stats_lock, flags);
drivers/net/ixgb/ixgb_main.c +1 -1
Index: linux-2.6.19-rc4-git3/drivers/net/ixgb/ixgb_main.c
===================================================================
@@ -1564,7 +1564,7 @@ ixgb_update_stats(struct ixgb_adapter *a
 	struct pci_dev *pdev = adapter->pdev;
 
 	/* Prevent stats update while adapter is being reset */
-	if (pdev->error_state && pdev->error_state != pci_channel_io_normal)
+	if (pci_channel_offline(pdev->error_state))
 		return;
 
 	if((netdev->flags & IFF_PROMISC) || (netdev->flags & IFF_ALLMULTI) ||
#2 lore raw

Re: [PATCH 2/2]: Use newly defined PCI channel offline routine

Quoted 3 lines · Linas Vepstas

Subject: [PATCH 2/2]: Use newly defined PCI channel offline routine

Use newly minted routine to access the PCI channel state.

why not write this so that it reads:

Review

Quoted 1 line
(quoted diff) +1 -0
+	if (pci_channel_offline(pdev))

iow are we assuming that there are multiple error_state's per pdev? That seems bogus.

Auke

Quoted 34 lines

----

 drivers/net/e1000/e1000_main.c |    2 +-
 drivers/net/ixgb/ixgb_main.c   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: linux-2.6.19-rc4-git3/drivers/net/e1000/e1000_main.c
===================================================================

drivers/net/e1000/e1000_main.c +1 -1
@@ -3297,7 +3297,7 @@ e1000_update_stats(struct e1000_adapter 
 	 */
 	if (adapter->link_speed == 0)
 		return;
-	if (pdev->error_state && pdev->error_state != pci_channel_io_normal)
+	if (pci_channel_offline(pdev->error_state))
 		return;
 
 	spin_lock_irqsave(&adapter->stats_lock, flags);

Index: linux-2.6.19-rc4-git3/drivers/net/ixgb/ixgb_main.c
===================================================================

drivers/net/ixgb/ixgb_main.c +1 -1
@@ -1564,7 +1564,7 @@ ixgb_update_stats(struct ixgb_adapter *a
 	struct pci_dev *pdev = adapter->pdev;
 
 	/* Prevent stats update while adapter is being reset */
-	if (pdev->error_state && pdev->error_state != pci_channel_io_normal)
+	if (pci_channel_offline(pdev->error_state))
 		return;
 
 	if((netdev->flags & IFF_PROMISC) || (netdev->flags & IFF_ALLMULTI) ||
#3 lore raw

Re: [PATCH 2/2]: Use newly defined PCI channel offline routine

Quoted 3 lines · Auke Kok

why not write this so that it reads:

Review

Quoted 1 line
(quoted diff) +1 -0
+	if (pci_channel_offline(pdev))

Dohhh! of course!

My excuse? Someone was trying to talk to me
while I wrote this code ...

--linas

#4 lore raw

PATCH v2 2/2 : Use newly defined PCI channel offline routine

In reply to Linas Vepstas

On Wed, Nov 01, 2006 at 06:00:35PM -0600, Linas Vepstas wrote:
[...]
Resubmit, per Auke ...

--linas

Use newly minted routine to access the PCI channel state.

----

 drivers/net/e1000/e1000_main.c |    2 +-
 drivers/net/ixgb/ixgb_main.c   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/e1000/e1000_main.c +1 -1
Index: linux-2.6.19-rc4-git3/drivers/net/e1000/e1000_main.c
===================================================================
@@ -3297,7 +3297,7 @@ e1000_update_stats(struct e1000_adapter 
 	 */
 	if (adapter->link_speed == 0)
 		return;
-	if (pdev->error_state && pdev->error_state != pci_channel_io_normal)
+	if (pci_channel_offline(pdev))
 		return;
 
 	spin_lock_irqsave(&adapter->stats_lock, flags);
drivers/net/ixgb/ixgb_main.c +1 -1
Index: linux-2.6.19-rc4-git3/drivers/net/ixgb/ixgb_main.c
===================================================================
@@ -1564,7 +1564,7 @@ ixgb_update_stats(struct ixgb_adapter *a
 	struct pci_dev *pdev = adapter->pdev;
 
 	/* Prevent stats update while adapter is being reset */
-	if (pdev->error_state && pdev->error_state != pci_channel_io_normal)
+	if (pci_channel_offline(pdev))
 		return;
 
 	if((netdev->flags & IFF_PROMISC) || (netdev->flags & IFF_ALLMULTI) ||
Acked-by on v2 2/2
#5 lore raw

Re: [PATCH 2/2 v2]: Use newly defined PCI channel offline routine

Quoted 3 lines · Linas Vepstas

On Wed, Nov 01, 2006 at 06:00:35PM -0600, Linas Vepstas wrote:
[...]
Resubmit, per Auke ...

This I'll ACK :)

Cheers,

Auke

Quoted 6 lines

--linas

Use newly minted routine to access the PCI channel state.

Quoted 36 lines

----

 drivers/net/e1000/e1000_main.c |    2 +-
 drivers/net/ixgb/ixgb_main.c   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: linux-2.6.19-rc4-git3/drivers/net/e1000/e1000_main.c
===================================================================

drivers/net/e1000/e1000_main.c +1 -1
@@ -3297,7 +3297,7 @@ e1000_update_stats(struct e1000_adapter 
 	 */
 	if (adapter->link_speed == 0)
 		return;
-	if (pdev->error_state && pdev->error_state != pci_channel_io_normal)
+	if (pci_channel_offline(pdev))
 		return;
 
 	spin_lock_irqsave(&adapter->stats_lock, flags);

Index: linux-2.6.19-rc4-git3/drivers/net/ixgb/ixgb_main.c
===================================================================

drivers/net/ixgb/ixgb_main.c +1 -2
@@ -1564,7 +1564,7 @@ ixgb_update_stats(struct ixgb_adapter *a
 	struct pci_dev *pdev = adapter->pdev;
 
 	/* Prevent stats update while adapter is being reset */
-	if (pdev->error_state && pdev->error_state != pci_channel_io_normal)
+	if (pci_channel_offline(pdev))
 		return;
 
 	if((netdev->flags & IFF_PROMISC) || (netdev->flags & IFF_ALLMULTI) ||
-

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

#6 lore raw

PATCH v2 1/2 : Renumber PCI error enums to start at zero

In reply to Linas Vepstas

On Wed, Nov 01, 2006 at 05:54:17PM -0600, Linas Vepstas wrote:
[...]
Fix brain-disengaged error.

Greg,

This is a low-prioriity patch to fix an annoying numbering mistake. Please apply this (and the next patch) at net convenience.

--linas

Subject: [PATCH 1/2]: Renumber PCI error enums to start at zero

Renumber the PCI error enums to start at zero for "normal/online". This allows un-initialized pci channel state (which defaults to zero) to be interpreted as "normal". Add very simple routine to check state, just in case this ever has to be fiddled with again.

----

 include/linux/pci.h |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
include/linux/pci.h +8 -3
Index: linux-2.6.19-rc4-git3/include/linux/pci.h
===================================================================
@@ -86,13 +86,13 @@ typedef unsigned int __bitwise pci_chann
 
 enum pci_channel_state {
 	/* I/O channel is in normal state */
-	pci_channel_io_normal = (__force pci_channel_state_t) 1,
+	pci_channel_io_normal = (__force pci_channel_state_t) 0,
 
 	/* I/O to channel is blocked */
-	pci_channel_io_frozen = (__force pci_channel_state_t) 2,
+	pci_channel_io_frozen = (__force pci_channel_state_t) 1,
 
 	/* PCI card is dead */
-	pci_channel_io_perm_failure = (__force pci_channel_state_t) 3,
+	pci_channel_io_perm_failure = (__force pci_channel_state_t) 2,
 };
 
 typedef unsigned short __bitwise pci_bus_flags_t;
@@ -180,6 +180,11 @@ struct pci_dev {
 #define	to_pci_dev(n) container_of(n, struct pci_dev, dev)
 #define for_each_pci_dev(d) while ((d = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, d)) != NULL)
 
+static inline int pci_channel_offline(struct pci_dev *pdev)
+{
+	return (pdev->error_state != pci_channel_io_normal);
+}
+
 static inline struct pci_cap_saved_state *pci_find_saved_cap(
 	struct pci_dev *pci_dev,char cap)
 {