[PATCH net-next 0/1] [pull request] iwl-next Intel Wired LAN Driver Updates 2022-02-07

[PATCH net-next 0/1] [pull request] iwl-next Intel Wired LAN Driver Updates 2022-02-07

[Tony Nguyen]

This pull request is targeting net-next and rdma-next branches. RDMA
patches will be sent to RDMA tree following acceptance of this shared
pull request. These patches have been reviewed by netdev and RDMA
mailing lists[1].

Dave adds support for ice driver to provide DSCP QoS mappings to irdma
driver.

[1] https://lore.kernel.org/netdev/20220202191921.1638-1-shiraz.saleem@intel.com/
---
The following are changes since commit e783362eb54cd99b2cac8b3a9aeac942e6f6ac07:
  Linux 5.17-rc1
and are available in the git repository at:
  git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/linux iwl-next

Dave Ertman (1):
  ice: add support for DSCP QoS for IDC

 drivers/net/ethernet/intel/ice/ice_idc.c | 5 +++++
 include/linux/net/intel/iidc.h           | 4 ++++
 2 files changed, 9 insertions(+)

-- 
2.31.1

[PATCH net-next 1/1] ice: add support for DSCP QoS for IDC

[Tony Nguyen]

From: Dave Ertman <david.m.ertman@intel.com>

The ice driver provides QoS information to auxiliary drivers
through the exported function ice_get_qos_params.  This function
doesn't currently support L3 DSCP QoS.

Add the necessary defines, structure elements and code to support
DSCP QoS through the IIDC functions.

Signed-off-by: Dave Ertman <david.m.ertman@intel.com>
Signed-off-by: Shiraz Saleem <shiraz.saleem@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
 drivers/net/ethernet/intel/ice/ice_idc.c | 5 +++++
 include/linux/net/intel/iidc.h           | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/drivers/net/ethernet/intel/ice/ice_idc.c b/drivers/net/ethernet/intel/ice/ice_idc.c
index fc3580167e7b..263a2e7577a2 100644
--- a/drivers/net/ethernet/intel/ice/ice_idc.c
+++ b/drivers/net/ethernet/intel/ice/ice_idc.c
@@ -227,6 +227,11 @@ void ice_get_qos_params(struct ice_pf *pf, struct iidc_qos_params *qos)
 
 	for (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++)
 		qos->tc_info[i].rel_bw = dcbx_cfg->etscfg.tcbwtable[i];
+
+	qos->pfc_mode = dcbx_cfg->pfc_mode;
+	if (qos->pfc_mode == IIDC_DSCP_PFC_MODE)
+		for (i = 0; i < IIDC_MAX_DSCP_MAPPING; i++)
+			qos->dscp_map[i] = dcbx_cfg->dscp_map[i];
 }
 EXPORT_SYMBOL_GPL(ice_get_qos_params);
 
diff --git a/include/linux/net/intel/iidc.h b/include/linux/net/intel/iidc.h
index 1289593411d3..1c1332e4df26 100644
--- a/include/linux/net/intel/iidc.h
+++ b/include/linux/net/intel/iidc.h
@@ -32,6 +32,8 @@ enum iidc_rdma_protocol {
 };
 
 #define IIDC_MAX_USER_PRIORITY		8
+#define IIDC_MAX_DSCP_MAPPING		64
+#define IIDC_DSCP_PFC_MODE		0x1
 
 /* Struct to hold per RDMA Qset info */
 struct iidc_rdma_qset_params {
@@ -60,6 +62,8 @@ struct iidc_qos_params {
 	u8 vport_relative_bw;
 	u8 vport_priority_type;
 	u8 num_tc;
+	u8 pfc_mode;
+	u8 dscp_map[IIDC_MAX_DSCP_MAPPING];
 };
 
 struct iidc_event {
-- 
2.31.1

Re: [PATCH net-next 0/1] [pull request] iwl-next Intel Wired LAN Driver Updates 2022-02-07

[Jason Gunthorpe]

On Mon, Feb 07, 2022 at 03:59:20PM -0800, Tony Nguyen wrote:
> This pull request is targeting net-next and rdma-next branches. RDMA
> patches will be sent to RDMA tree following acceptance of this shared
> pull request. These patches have been reviewed by netdev and RDMA
> mailing lists[1].
> 
> Dave adds support for ice driver to provide DSCP QoS mappings to irdma
> driver.
> 
> [1] https://lore.kernel.org/netdev/20220202191921.1638-1-shiraz.saleem@intel.com/
> The following are changes since commit e783362eb54cd99b2cac8b3a9aeac942e6f6ac07:
>   Linux 5.17-rc1
> and are available in the git repository at:
>   git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/linux iwl-next

No signed tag?

In future can you send these in the standard form so patchworks will
pick them up?

Also please add cover letters so there is something to put in the
merge

But PR applied along with the matching two RDMA patches.

Thanks,
Jason

Re: [PATCH net-next 0/1] [pull request] iwl-next Intel Wired LAN Driver Updates 2022-02-07

[Nguyen, Anthony L]

On Tue, 2022-02-08 at 13:00 -0400, Jason Gunthorpe wrote:
> On Mon, Feb 07, 2022 at 03:59:20PM -0800, Tony Nguyen wrote:
> > This pull request is targeting net-next and rdma-next branches.
> > RDMA
> > patches will be sent to RDMA tree following acceptance of this
> > shared
> > pull request. These patches have been reviewed by netdev and RDMA
> > mailing lists[1].
> > 
> > Dave adds support for ice driver to provide DSCP QoS mappings to
> > irdma
> > driver.
> > 
> > [1]
> > https://lore.kernel.org/netdev/20220202191921.1638-1-shiraz.saleem@intel.com/
> > The following are changes since commit
> > e783362eb54cd99b2cac8b3a9aeac942e6f6ac07:
> >   Linux 5.17-rc1
> > and are available in the git repository at:
> >   git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/linux iwl-
> > next
> 
> No signed tag?
> 
> In future can you send these in the standard form so patchworks will
> pick them up?
> 
> Also please add cover letters so there is something to put in the
> merge

I'm still trying to figure out how to do the shared pull requests. I'll
look into resolving these issues you pointed out for next one.

One of the things I'm still unsure on is whether the shared pull
request should contain the netdev and RDMA patches or only the netdev
ones.

Thanks,
Tony

> But PR applied along with the matching two RDMA patches.
> Thanks,
> Jason

Re: [PATCH net-next 0/1] [pull request] iwl-next Intel Wired LAN Driver Updates 2022-02-07

[Leon Romanovsky]

On Tue, Feb 08, 2022 at 09:18:36PM +0000, Nguyen, Anthony L wrote:
> On Tue, 2022-02-08 at 13:00 -0400, Jason Gunthorpe wrote:
> > On Mon, Feb 07, 2022 at 03:59:20PM -0800, Tony Nguyen wrote:
> > > This pull request is targeting net-next and rdma-next branches.
> > > RDMA
> > > patches will be sent to RDMA tree following acceptance of this
> > > shared
> > > pull request. These patches have been reviewed by netdev and RDMA
> > > mailing lists[1].
> > > 
> > > Dave adds support for ice driver to provide DSCP QoS mappings to
> > > irdma
> > > driver.
> > > 
> > > [1]
> > > https://lore.kernel.org/netdev/20220202191921.1638-1-shiraz.saleem@intel.com/
> > > The following are changes since commit
> > > e783362eb54cd99b2cac8b3a9aeac942e6f6ac07:
> > >   Linux 5.17-rc1
> > > and are available in the git repository at:
> > >   git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/linux iwl-
> > > next
> > 
> > No signed tag?
> > 
> > In future can you send these in the standard form so patchworks will
> > pick them up?
> > 
> > Also please add cover letters so there is something to put in the
> > merge
> 
> I'm still trying to figure out how to do the shared pull requests. I'll
> look into resolving these issues you pointed out for next one.
> 
> One of the things I'm still unsure on is whether the shared pull
> request should contain the netdev and RDMA patches or only the netdev
> ones.

Shared PR intends to solve merge conflicts between various subsystems.

It means that sometimes both netdev and RDMA patches will be there,
however such situation is not common flow. Most of the time, you will
put only netdev changes there, because your driver core logic lays
there and it is there the conflicts will be.

However, there are minimal set of rules which you should follow:
1. This branch should be based on clean -rcX. No back merge of net-next
or rdma-next or other -next.
2. Bisectable
3. Possible to pull as a standlone set without extra patches on top
and it won't break compilation and/or working target which pulled this
branch.

Thanks

> 
> Thanks,
> Tony
> 
> > But PR applied along with the matching two RDMA patches.
> > Thanks,
> > Jason
> 

Re: [PATCH net-next 0/1] [pull request] iwl-next Intel Wired LAN Driver Updates 2022-02-07

[Nguyen, Anthony L]

On Wed, 2022-02-09 at 11:50 +0200, Leon Romanovsky wrote:
> On Tue, Feb 08, 2022 at 09:18:36PM +0000, Nguyen, Anthony L wrote:
> > On Tue, 2022-02-08 at 13:00 -0400, Jason Gunthorpe wrote:
> > > On Mon, Feb 07, 2022 at 03:59:20PM -0800, Tony Nguyen wrote:
> > > 
> 
> It means that sometimes both netdev and RDMA patches will be there,
> however such situation is not common flow. Most of the time, you will
> put only netdev changes there, because your driver core logic lays
> there and it is there the conflicts will be.
> 
> However, there are minimal set of rules which you should follow:
> 1. This branch should be based on clean -rcX. No back merge of net-
> next
> or rdma-next or other -next.
> 2. Bisectable
> 3. Possible to pull as a standlone set without extra patches on top
> and it won't break compilation and/or working target which pulled
> this
> branch.

This helps. Thanks for the information Leon.

- Tony

Re: [PATCH net-next 0/1] [pull request] iwl-next Intel Wired LAN Driver Updates 2022-02-07

[Jakub Kicinski]

On Mon,  7 Feb 2022 15:59:20 -0800 Tony Nguyen wrote:
> This pull request is targeting net-next and rdma-next branches. RDMA
> patches will be sent to RDMA tree following acceptance of this shared
> pull request. These patches have been reviewed by netdev and RDMA
> mailing lists[1].
> 
> Dave adds support for ice driver to provide DSCP QoS mappings to irdma
> driver.

Pulled thanks!