Skip to contentSkip to conversation

ehea firmware interface based on Anton Blanchard's new hvcall interface

PATCH In review Jan-Bernd Themann 3 participants 4 messages Sep 27, 2006 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ehea firmware interface based on Anton Blanchard's new hvcall interface

Hi Jeff,

the last patch did not work, so here is the new patch. The patch is build against
git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev.2.6.git HEAD today. Could you give it a try?

This eHEA patch reflects changes according to Anton's new hvcall interface which has been commited in Paul's git tree:

git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git

In addition to the above changes the patch includes a bug fix (port state notification) and minor changes (default queue length, coding style updates).

Thanks,
Jan-Bernd

---

 drivers/net/ehea/ehea.h         |   13 
 drivers/net/ehea/ehea_ethtool.c |    2 
 drivers/net/ehea/ehea_main.c    |    6 
 drivers/net/ehea/ehea_phyp.c    |  559 ++++++++++++++++------------------------
 4 files changed, 242 insertions(+), 338 deletions(-)
drivers/net/ehea/ehea.h +7 -6
diff -Nurp netdev-2.6/drivers/net/ehea/ehea.h netdev-2.6_patched/drivers/net/ehea/ehea.h
@@ -39,7 +39,7 @@
 #include <asm/io.h>
 
 #define DRV_NAME	"ehea"
-#define DRV_VERSION	"EHEA_0028"
+#define DRV_VERSION	"EHEA_0033"
 
 #define EHEA_MSG_DEFAULT (NETIF_MSG_LINK | NETIF_MSG_TIMER \
 	| NETIF_MSG_RX_ERR | NETIF_MSG_TX_ERR)
@@ -50,6 +50,7 @@
 #define EHEA_MAX_ENTRIES_SQ  32767
 #define EHEA_MIN_ENTRIES_QP  127
 
+#define EHEA_SMALL_QUEUES
 #define EHEA_NUM_TX_QP 1
 
 #ifdef EHEA_SMALL_QUEUES
@@ -59,11 +60,11 @@
 #define EHEA_DEF_ENTRIES_RQ2    1023
 #define EHEA_DEF_ENTRIES_RQ3    1023
 #else
-#define EHEA_MAX_CQE_COUNT     32000
-#define EHEA_DEF_ENTRIES_SQ    16000
-#define EHEA_DEF_ENTRIES_RQ1   32080
-#define EHEA_DEF_ENTRIES_RQ2    4020
-#define EHEA_DEF_ENTRIES_RQ3    4020
+#define EHEA_MAX_CQE_COUNT      4080
+#define EHEA_DEF_ENTRIES_SQ     4080
+#define EHEA_DEF_ENTRIES_RQ1    8160
+#define EHEA_DEF_ENTRIES_RQ2    2040
+#define EHEA_DEF_ENTRIES_RQ3    2040
 #endif
 
 #define EHEA_MAX_ENTRIES_EQ 20
drivers/net/ehea/ehea_ethtool.c +1 -1
diff -Nurp netdev-2.6/drivers/net/ehea/ehea_ethtool.c netdev-2.6_patched/drivers/net/ehea/ehea_ethtool.c
@@ -270,7 +270,7 @@ static void ehea_get_ethtool_stats(struc
 	kfree(cb6);
 }
 
-const struct ethtool_ops ehea_ethtool_ops = {
+struct ethtool_ops ehea_ethtool_ops = {
 	.get_settings = ehea_get_settings,
 	.get_drvinfo = ehea_get_drvinfo,
 	.get_msglevel = ehea_get_msglevel,
drivers/net/ehea/ehea_main.c +3 -3
diff -Nurp netdev-2.6/drivers/net/ehea/ehea_main.c netdev-2.6_patched/drivers/net/ehea/ehea_main.c
@@ -769,7 +769,7 @@ static void ehea_parse_eqe(struct ehea_a
 		if (EHEA_BMASK_GET(NEQE_PORT_UP, eqe)) {
 			if (!netif_carrier_ok(port->netdev)) {
 				ret = ehea_sense_port_attr(
-					adapter->port[portnum]);
+					port);
 				if (ret) {
 					ehea_error("failed resensing port "
 						   "attributes");
@@ -821,7 +821,7 @@ static void ehea_parse_eqe(struct ehea_a
 		netif_stop_queue(port->netdev);
 		break;
 	default:
-		ehea_error("unknown event code %x", ec);
+		ehea_error("unknown event code %x, eqe=0x%lX", ec, eqe);
 		break;
 	}
 }
@@ -1845,7 +1845,7 @@ static int ehea_start_xmit(struct sk_buf
 
 	if (netif_msg_tx_queued(port)) {
 		ehea_info("post swqe on QP %d", pr->qp->init_attr.qp_nr);
-		ehea_dump(swqe, sizeof(*swqe), "swqe");
+		ehea_dump(swqe, 512, "swqe");
 	}
 
 	ehea_post_swqe(pr->qp, swqe);
drivers/net/ehea/ehea_phyp.c +231 -328

727 lines not on this page · raw message

#1 lore raw
Quoted 5 lines · Jan-Bernd Themann

Hi Jeff,

the last patch did not work, so here is the new patch. The patch is build against
git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev.2.6.git HEAD today. Could you give it a try?

Per the standard patch format in Documentation/SubmittingPatches, these sort of comments should go beneath the "---" separator. Otherwise, if they are not hand-edited out, they will go into the final changeset description.

Quoted 4 lines

This eHEA patch reflects changes according to Anton's new hvcall interface which has been commited in Paul's git tree:

git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git

When is this going upstream? I don't want things to get too out-of-sync.

Quoted 2 lines

In addition to the above changes the patch includes a bug fix (port state notification) and minor changes (default queue length, coding style updates).

These changes should be in a separate patch. Makes 'git bisect' work better, makes the changes more reviewable, and in general follows the "separate logical changes" rule.

drivers/net/ehea/ehea_ethtool.c static void ehea_get_ethtool_stats(struc · line 276

Quoted 12 lines

diff -Nurp netdev-2.6/drivers/net/ehea/ehea_ethtool.c netdev-2.6_patched/drivers/net/ehea/ehea_ethtool.c

drivers/net/ehea/ehea_ethtool.c +1 -1
@@ -270,7 +270,7 @@ static void ehea_get_ethtool_stats(struc
 	kfree(cb6);
 }
 
-const struct ethtool_ops ehea_ethtool_ops = {
+struct ethtool_ops ehea_ethtool_ops = {
 	.get_settings = ehea_get_settings,
 	.get_drvinfo = ehea_get_drvinfo,
 	.get_msglevel = ehea_get_msglevel,

This is an obvious regression.

Jeff

#2 lore raw

Jeff,

Quoted 6 lines
Quoted 4 lines

This eHEA patch reflects changes according to Anton's new hvcall interface which has been commited in Paul's git tree:

git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git

When is this going upstream? I don't want things to get too out-of-sync.

It's upstream already, and currently the ehea driver in Linus' tree doesn't compile as a result.

Paul.

#3 lore raw
Quoted 10 lines · Paul Mackerras

Jeff,

Quoted 5 lines
Quoted 4 lines

This eHEA patch reflects changes according to Anton's new hvcall interface which has been commited in Paul's git tree:

git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git

When is this going upstream? I don't want things to get too out-of-sync.

It's upstream already, and currently the ehea driver in Linus' tree doesn't compile as a result.

Thanks for the clarification. The original quoted text sorta implied the opposite.

Jeff