| Message ID | 1347374347-3852-10-git-send-email-naresh@chelsio.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Naresh Kumar Inna <naresh@chelsio.com> Date: Tue, 11 Sep 2012 20:09:07 +0530 > This patch contains minor fixes to make cxgb4vf driver work with the updates to > shared firmware/hardware header files. > > Signed-off-by: Naresh Kumar Inna <naresh@chelsio.com> You cannot submit a patch set that isn't bisectable, and in particular create a situation that mid-way through your patch set things do not build or operate correctly. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 9/11/2012 11:03 PM, David Miller wrote: > From: Naresh Kumar Inna <naresh@chelsio.com> > Date: Tue, 11 Sep 2012 20:09:07 +0530 > >> This patch contains minor fixes to make cxgb4vf driver work with the updates to >> shared firmware/hardware header files. >> >> Signed-off-by: Naresh Kumar Inna <naresh@chelsio.com> > > You cannot submit a patch set that isn't bisectable, and in particular > create a situation that mid-way through your patch set things do not > build or operate correctly. > Sorry, I am new to this process. The reason I did that was because I was not sure if I could create a single patch with both cxgb4 and cxgb4vf files in it, since they are two different subsystems. If I could do that, the single patch then would build on its own, and not be dependent on the other patches in the series. Is that something I can do? Thanks, Naresh. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Naresh Kumar Inna <naresh@chelsio.com> Date: Wed, 12 Sep 2012 11:05:22 +0530 > On 9/11/2012 11:03 PM, David Miller wrote: >> From: Naresh Kumar Inna <naresh@chelsio.com> >> Date: Tue, 11 Sep 2012 20:09:07 +0530 >> >>> This patch contains minor fixes to make cxgb4vf driver work with the updates to >>> shared firmware/hardware header files. >>> >>> Signed-off-by: Naresh Kumar Inna <naresh@chelsio.com> >> >> You cannot submit a patch set that isn't bisectable, and in particular >> create a situation that mid-way through your patch set things do not >> build or operate correctly. >> > > Sorry, I am new to this process. The reason I did that was because I was > not sure if I could create a single patch with both cxgb4 and cxgb4vf > files in it, since they are two different subsystems. If I could do > that, the single patch then would build on its own, and not be dependent > on the other patches in the series. Is that something I can do? I don't know how else to say this, every step along the way the tree has to build. You arrange the patches however necessary to achieve that goal. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 9/12/2012 11:17 AM, David Miller wrote: > From: Naresh Kumar Inna <naresh@chelsio.com> > Date: Wed, 12 Sep 2012 11:05:22 +0530 > >> On 9/11/2012 11:03 PM, David Miller wrote: >>> From: Naresh Kumar Inna <naresh@chelsio.com> >>> Date: Tue, 11 Sep 2012 20:09:07 +0530 >>> >>>> This patch contains minor fixes to make cxgb4vf driver work with the updates to >>>> shared firmware/hardware header files. >>>> >>>> Signed-off-by: Naresh Kumar Inna <naresh@chelsio.com> >>> >>> You cannot submit a patch set that isn't bisectable, and in particular >>> create a situation that mid-way through your patch set things do not >>> build or operate correctly. >>> >> >> Sorry, I am new to this process. The reason I did that was because I was >> not sure if I could create a single patch with both cxgb4 and cxgb4vf >> files in it, since they are two different subsystems. If I could do >> that, the single patch then would build on its own, and not be dependent >> on the other patches in the series. Is that something I can do? > > I don't know how else to say this, every step along the way the tree > has to build. You arrange the patches however necessary to achieve > that goal. > OK, I think I should be able to arrange the patch set to fulfill that requirement. I was under the impression it was fine for new drivers to split patches in this fashion, since they go as a single commit, sorry about that. As for a single patch with both cxgb4 and cxgb4vf changes, I assume it is OK for the commit log to start with "cxgb4/cxgb4vf:..."? Thanks, Naresh. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Naresh Kumar Inna <naresh@chelsio.com> writes: > > OK, I think I should be able to arrange the patch set to fulfill that > requirement. I was under the impression it was fine for new drivers to > split patches in this fashion, since they go as a single commit, sorry > about that. What they normally do then is to add the Kconfig or Makefile entry only in the end, so it cannot build before. -Andi
On 9/12/2012 10:22 PM, Andi Kleen wrote: > Naresh Kumar Inna <naresh@chelsio.com> writes: >> >> OK, I think I should be able to arrange the patch set to fulfill that >> requirement. I was under the impression it was fine for new drivers to >> split patches in this fashion, since they go as a single commit, sorry >> about that. > > What they normally do then is to add the Kconfig or Makefile entry > only in the end, so it cannot build before. > > -Andi > Patch-set V4 I sent a few hours ago does just that. Thanks nevertheless. -Naresh -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c index 8877fbf..33fc1ca 100644 --- a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c +++ b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c @@ -536,7 +536,7 @@ static inline void ring_fl_db(struct adapter *adapter, struct sge_fl *fl) if (fl->pend_cred >= FL_PER_EQ_UNIT) { wmb(); t4_write_reg(adapter, T4VF_SGE_BASE_ADDR + SGE_VF_KDOORBELL, - DBPRIO | + DBPRIO(1) | QID(fl->cntxt_id) | PIDX(fl->pend_cred / FL_PER_EQ_UNIT)); fl->pend_cred %= FL_PER_EQ_UNIT; @@ -952,7 +952,7 @@ static inline void ring_tx_db(struct adapter *adapter, struct sge_txq *tq, * Warn if we write doorbells with the wrong priority and write * descriptors before telling HW. */ - WARN_ON((QID(tq->cntxt_id) | PIDX(n)) & DBPRIO); + WARN_ON((QID(tq->cntxt_id) | PIDX(n)) & DBPRIO(1)); wmb(); t4_write_reg(adapter, T4VF_SGE_BASE_ADDR + SGE_VF_KDOORBELL, QID(tq->cntxt_id) | PIDX(n)); @@ -2126,8 +2126,8 @@ int t4vf_sge_alloc_rxq(struct adapter *adapter, struct sge_rspq *rspq, cmd.iqns_to_fl0congen = cpu_to_be32( FW_IQ_CMD_FL0HOSTFCMODE(SGE_HOSTFCMODE_NONE) | - FW_IQ_CMD_FL0PACKEN | - FW_IQ_CMD_FL0PADEN); + FW_IQ_CMD_FL0PACKEN(1) | + FW_IQ_CMD_FL0PADEN(1)); cmd.fl0dcaen_to_fl0cidxfthresh = cpu_to_be16( FW_IQ_CMD_FL0FBMIN(SGE_FETCHBURSTMIN_64B) | @@ -2431,7 +2431,8 @@ int t4vf_sge_init(struct adapter *adapter) */ if (fl1) FL_PG_ORDER = ilog2(fl1) - PAGE_SHIFT; - STAT_LEN = ((sge_params->sge_control & EGRSTATUSPAGESIZE) ? 128 : 64); + STAT_LEN = ((sge_params->sge_control & EGRSTATUSPAGESIZE(1)) ? + 128 : 64); PKTSHIFT = PKTSHIFT_GET(sge_params->sge_control); FL_ALIGN = 1 << (INGPADBOUNDARY_GET(sge_params->sge_control) + SGE_INGPADBOUNDARY_SHIFT);
This patch contains minor fixes to make cxgb4vf driver work with the updates to shared firmware/hardware header files. Signed-off-by: Naresh Kumar Inna <naresh@chelsio.com> --- drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-)