From 8ab93843210046548da3eb6b5d75f0824aa86a90 Mon Sep 17 00:00:00 2001 From: Vladimir Sokolovsky Date: Mon, 8 Dec 2014 16:28:36 +0200 Subject: [PATCH] Refreshed backports over linux-3.18 Signed-off-by: Vladimir Sokolovsky --- ...18-cxgb4-bundle-firmware-with-driver.patch | 8 ++--- ...xgb4-backport-changes-for-linux-3.12.patch | 16 +++++----- patches/0020-Fix-pr_fmt-warnings.patch | 20 +++++------- patches/0021-be2net-backport-patch.patch | 31 ++++++++----------- ...crdma-Fixing-the-be2net-include-path.patch | 11 ++----- 5 files changed, 36 insertions(+), 50 deletions(-) diff --git a/patches/0018-cxgb4-bundle-firmware-with-driver.patch b/patches/0018-cxgb4-bundle-firmware-with-driver.patch index 1100bf8..1e8c5ec 100644 --- a/patches/0018-cxgb4-bundle-firmware-with-driver.patch +++ b/patches/0018-cxgb4-bundle-firmware-with-driver.patch @@ -24,7 +24,7 @@ index xxxxxxx..xxxxxxx xxxxxx #include <../drivers/net/bonding/bonding.h> -@@ -5671,12 +5672,21 @@ static struct fw_info *find_fw_info(int chip) +@@ -5675,12 +5676,21 @@ static struct fw_info *find_fw_info(int chip) return NULL; } @@ -47,7 +47,7 @@ index xxxxxxx..xxxxxxx xxxxxx u32 v, port_vec; enum dev_state state; u32 params[7], val[7]; -@@ -5713,7 +5723,7 @@ static int adap_init0(struct adapter *adap) +@@ -5717,7 +5727,7 @@ static int adap_init0(struct adapter *adap) if ((adap->flags & MASTER_PF) && state != DEV_STATE_INIT) { struct fw_info *fw_info; struct fw_hdr *card_fw; @@ -56,7 +56,7 @@ index xxxxxxx..xxxxxxx xxxxxx const u8 *fw_data = NULL; unsigned int fw_size = 0; -@@ -5736,13 +5746,34 @@ static int adap_init0(struct adapter *adap) +@@ -5740,13 +5750,34 @@ static int adap_init0(struct adapter *adap) /* Get FW from from /lib/firmware/ */ ret = request_firmware(&fw, fw_info->fw_mod_name, adap->pdev_dev); @@ -93,7 +93,7 @@ index xxxxxxx..xxxxxxx xxxxxx } /* upgrade FW logic */ -@@ -5752,6 +5783,8 @@ static int adap_init0(struct adapter *adap) +@@ -5756,6 +5787,8 @@ static int adap_init0(struct adapter *adap) /* Cleaning up */ if (fw != NULL) release_firmware(fw); diff --git a/patches/0019-cxgb4-backport-changes-for-linux-3.12.patch b/patches/0019-cxgb4-backport-changes-for-linux-3.12.patch index 66d60d3..21ae99e 100644 --- a/patches/0019-cxgb4-backport-changes-for-linux-3.12.patch +++ b/patches/0019-cxgb4-backport-changes-for-linux-3.12.patch @@ -55,7 +55,7 @@ index xxxxxxx..xxxxxxx xxxxxx } static inline int is_offload(const struct adapter *adap) -@@ -3004,6 +3019,7 @@ static int cxgb_set_features(struct net_device *dev, netdev_features_t features) +@@ -3008,6 +3023,7 @@ static int cxgb_set_features(struct net_device *dev, netdev_features_t features) return err; } @@ -63,7 +63,7 @@ index xxxxxxx..xxxxxxx xxxxxx static u32 get_rss_table_size(struct net_device *dev) { const struct port_info *pi = netdev_priv(dev); -@@ -3032,6 +3048,7 @@ static int set_rss_table(struct net_device *dev, const u32 *p, const u8 *key) +@@ -3036,6 +3052,7 @@ static int set_rss_table(struct net_device *dev, const u32 *p, const u8 *key) return write_rss(pi, pi->rss); return 0; } @@ -71,7 +71,7 @@ index xxxxxxx..xxxxxxx xxxxxx static int get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info, u32 *rules) -@@ -3122,9 +3139,11 @@ static const struct ethtool_ops cxgb_ethtool_ops = { +@@ -3126,9 +3143,11 @@ static const struct ethtool_ops cxgb_ethtool_ops = { .get_wol = get_wol, .set_wol = set_wol, .get_rxnfc = get_rxnfc, @@ -83,7 +83,7 @@ index xxxxxxx..xxxxxxx xxxxxx .flash_device = set_flash, }; -@@ -4423,20 +4442,30 @@ static int cxgb4_inet6addr_handler(struct notifier_block *this, +@@ -4427,20 +4446,30 @@ static int cxgb4_inet6addr_handler(struct notifier_block *this, struct inet6_ifaddr *ifa = data; struct net_device *event_dev; int ret = NOTIFY_DONE; @@ -114,7 +114,7 @@ index xxxxxxx..xxxxxxx xxxxxx if (!first_pdev) { ret = clip_add(slave->dev, ifa, event); /* If clip_add is success then only initialize -@@ -4449,6 +4478,10 @@ static int cxgb4_inet6addr_handler(struct notifier_block *this, +@@ -4453,6 +4482,10 @@ static int cxgb4_inet6addr_handler(struct notifier_block *this, to_pci_dev(slave->dev->dev.parent)) ret = clip_add(slave->dev, ifa, event); } @@ -125,7 +125,7 @@ index xxxxxxx..xxxxxxx xxxxxx } else ret = clip_add(ifa->idev->dev, ifa, event); -@@ -4459,6 +4492,7 @@ static struct notifier_block cxgb4_inet6addr_notifier = { +@@ -4463,6 +4496,7 @@ static struct notifier_block cxgb4_inet6addr_notifier = { .notifier_call = cxgb4_inet6addr_handler }; @@ -133,7 +133,7 @@ index xxxxxxx..xxxxxxx xxxxxx /* Retrieves IPv6 addresses from a root device (bond, vlan) associated with * a physical device. * The physical device reference is needed to send the actul CLIP command. -@@ -4504,7 +4538,11 @@ static int update_root_dev_clip(struct net_device *dev) +@@ -4508,7 +4542,11 @@ static int update_root_dev_clip(struct net_device *dev) } for (i = 0; i < VLAN_N_VID; i++) { @@ -145,7 +145,7 @@ index xxxxxxx..xxxxxxx xxxxxx if (!root_dev) continue; -@@ -6443,9 +6481,25 @@ static int enable_msix(struct adapter *adap) +@@ -6447,9 +6485,25 @@ static int enable_msix(struct adapter *adap) #else need = adap->params.nports + EXTRA_VECS + ofld_need; #endif diff --git a/patches/0020-Fix-pr_fmt-warnings.patch b/patches/0020-Fix-pr_fmt-warnings.patch index aee2a84..369ee62 100644 --- a/patches/0020-Fix-pr_fmt-warnings.patch +++ b/patches/0020-Fix-pr_fmt-warnings.patch @@ -1,5 +1,4 @@ From: Steve Wise -Date: Tue, 2 Dec 2014 15:56:37 -0600 Subject: [PATCH] Fix pr_fmt warnings Signed-off-by: Steve Wise @@ -15,7 +14,7 @@ Signed-off-by: Steve Wise 8 files changed, 24 insertions(+), 0 deletions(-) diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c -index 74c30f4..abd464b 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/infiniband/core/mad.c +++ b/drivers/infiniband/core/mad.c @@ -34,6 +34,9 @@ @@ -29,7 +28,7 @@ index 74c30f4..abd464b 100644 #include diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c -index 1d5cc79..5afe4af 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/infiniband/core/user_mad.c +++ b/drivers/infiniband/core/user_mad.c @@ -33,6 +33,9 @@ @@ -43,7 +42,7 @@ index 1d5cc79..5afe4af 100644 #include diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c -index 4e3c59a..d2d8cc5 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c +++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c @@ -30,6 +30,9 @@ @@ -57,7 +56,7 @@ index 4e3c59a..d2d8cc5 100644 #include diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c -index 54eedd9..aae67f0 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c +++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c @@ -30,6 +30,9 @@ @@ -71,7 +70,7 @@ index 54eedd9..aae67f0 100644 #include diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c -index 71e3f86..3df02db 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c @@ -32,6 +32,9 @@ @@ -85,7 +84,7 @@ index 71e3f86..3df02db 100644 #include diff --git a/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c b/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c -index 49692a1..3bda559 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c +++ b/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c @@ -12,6 +12,9 @@ @@ -99,7 +98,7 @@ index 49692a1..3bda559 100644 #include diff --git a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c -index 1508125..e1fac5f 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c +++ b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c @@ -11,6 +11,9 @@ @@ -113,7 +112,7 @@ index 1508125..e1fac5f 100644 #include diff --git a/drivers/scsi/cxgbi/libcxgbi.c b/drivers/scsi/cxgbi/libcxgbi.c -index 7da59c3..bc41b19 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/scsi/cxgbi/libcxgbi.c +++ b/drivers/scsi/cxgbi/libcxgbi.c @@ -11,6 +11,9 @@ @@ -126,6 +125,3 @@ index 7da59c3..bc41b19 100644 #define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__ #include --- -1.7.1 - diff --git a/patches/0021-be2net-backport-patch.patch b/patches/0021-be2net-backport-patch.patch index 110fcdb..3fa036d 100644 --- a/patches/0021-be2net-backport-patch.patch +++ b/patches/0021-be2net-backport-patch.patch @@ -1,7 +1,5 @@ -From dc3cc69f6acb3891404cd46300a2934511b605ef Mon Sep 17 00:00:00 2001 From: Selvin Xavier -Date: Sat, 6 Dec 2014 15:16:41 +0530 -Subject: [PATCH 1/2] be2net: backport patch +Subject: [PATCH] be2net: backport patch Signed-off-by: Selvin Xavier --- @@ -10,14 +8,14 @@ Signed-off-by: Selvin Xavier drivers/net/ethernet/emulex/benet/be_cmds.c | 6 +- drivers/net/ethernet/emulex/benet/be_compat.c | 74 +++++++ drivers/net/ethernet/emulex/benet/be_compat.h | 126 +++++++++++ - drivers/net/ethernet/emulex/benet/be_ethtool.c | 43 +++- + drivers/net/ethernet/emulex/benet/be_ethtool.c | 43 ++++- drivers/net/ethernet/emulex/benet/be_main.c | 271 +++++++++++++++++++++--- 7 files changed, 492 insertions(+), 40 deletions(-) create mode 100644 drivers/net/ethernet/emulex/benet/be_compat.c create mode 100644 drivers/net/ethernet/emulex/benet/be_compat.h diff --git a/drivers/net/ethernet/emulex/benet/Makefile b/drivers/net/ethernet/emulex/benet/Makefile -index 1a91b27..a32863b 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/net/ethernet/emulex/benet/Makefile +++ b/drivers/net/ethernet/emulex/benet/Makefile @@ -4,4 +4,4 @@ @@ -27,7 +25,7 @@ index 1a91b27..a32863b 100644 -be2net-y := be_main.o be_cmds.o be_ethtool.o be_roce.o +be2net-y := be_main.o be_cmds.o be_ethtool.o be_roce.o be_compat.o diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h -index 9a2d752..fff6982 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/net/ethernet/emulex/benet/be.h +++ b/drivers/net/ethernet/emulex/benet/be.h @@ -20,6 +20,7 @@ @@ -73,7 +71,7 @@ index 9a2d752..fff6982 100644 #define be_physfn(adapter) (!adapter->virtfn) diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c -index fead5c6..1d12f49 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/net/ethernet/emulex/benet/be_cmds.c +++ b/drivers/net/ethernet/emulex/benet/be_cmds.c @@ -1920,7 +1920,11 @@ int be_cmd_rx_filter(struct be_adapter *adapter, u32 flags, u32 value) @@ -310,7 +308,7 @@ index 0000000..e6a94f7 + +#endif /* BE_COMPAT_H */ diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c -index e42a791..04628fa 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/net/ethernet/emulex/benet/be_ethtool.c +++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c @@ -380,7 +380,11 @@ static void be_get_ethtool_stats(struct net_device *netdev, @@ -456,7 +454,7 @@ index e42a791..04628fa 100644 .get_module_eeprom = be_get_module_eeprom }; diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c -index 3e8475c..916c4a3 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/net/ethernet/emulex/benet/be_main.c +++ b/drivers/net/ethernet/emulex/benet/be_main.c @@ -143,8 +143,8 @@ static int be_queue_alloc(struct be_adapter *adapter, struct be_queue_info *q, @@ -974,7 +972,7 @@ index 3e8475c..916c4a3 100644 static int be_ndo_bridge_setlink(struct net_device *dev, struct nlmsghdr *nlh) { struct be_adapter *adapter = netdev_priv(dev); -@@ -4363,6 +4563,8 @@ static int be_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq, +@@ -4368,6 +4568,8 @@ static int be_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq, BRIDGE_MODE_VEPA : BRIDGE_MODE_VEB); } @@ -983,7 +981,7 @@ index 3e8475c..916c4a3 100644 #ifdef CONFIG_BE2NET_VXLAN static void be_add_vxlan_port(struct net_device *netdev, sa_family_t sa_family, __be16 port) -@@ -4421,11 +4623,6 @@ static void be_del_vxlan_port(struct net_device *netdev, sa_family_t sa_family, +@@ -4426,11 +4628,6 @@ static void be_del_vxlan_port(struct net_device *netdev, sa_family_t sa_family, "Disabled VxLAN offloads for UDP port %d\n", be16_to_cpu(port)); } @@ -995,7 +993,7 @@ index 3e8475c..916c4a3 100644 #endif static const struct net_device_ops be_netdev_ops = { -@@ -4435,27 +4632,37 @@ static const struct net_device_ops be_netdev_ops = { +@@ -4440,27 +4637,37 @@ static const struct net_device_ops be_netdev_ops = { .ndo_set_rx_mode = be_set_rx_mode, .ndo_set_mac_address = be_mac_addr_set, .ndo_change_mtu = be_change_mtu, @@ -1034,7 +1032,7 @@ index 3e8475c..916c4a3 100644 #endif }; -@@ -4481,7 +4688,9 @@ static void be_netdev_init(struct net_device *netdev) +@@ -4486,7 +4693,9 @@ static void be_netdev_init(struct net_device *netdev) netdev->vlan_features |= NETIF_F_SG | NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM; @@ -1044,7 +1042,7 @@ index 3e8475c..916c4a3 100644 netdev->flags |= IFF_MULTICAST; -@@ -4594,7 +4803,7 @@ static int be_ctrl_init(struct be_adapter *adapter) +@@ -4599,7 +4808,7 @@ static int be_ctrl_init(struct be_adapter *adapter) rx_filter->size = sizeof(struct be_cmd_req_rx_filter); rx_filter->va = dma_zalloc_coherent(&adapter->pdev->dev, rx_filter->size, &rx_filter->dma, @@ -1053,7 +1051,7 @@ index 3e8475c..916c4a3 100644 if (!rx_filter->va) { status = -ENOMEM; goto free_mbox; -@@ -4643,7 +4852,7 @@ static int be_stats_init(struct be_adapter *adapter) +@@ -4648,7 +4857,7 @@ static int be_stats_init(struct be_adapter *adapter) cmd->size = sizeof(struct be_cmd_req_get_stats_v2); cmd->va = dma_zalloc_coherent(&adapter->pdev->dev, cmd->size, &cmd->dma, @@ -1062,6 +1060,3 @@ index 3e8475c..916c4a3 100644 if (!cmd->va) return -ENOMEM; return 0; --- -1.7.9.5 - diff --git a/patches/0022-ocrdma-Fixing-the-be2net-include-path.patch b/patches/0022-ocrdma-Fixing-the-be2net-include-path.patch index aa844b4..1d0201b 100644 --- a/patches/0022-ocrdma-Fixing-the-be2net-include-path.patch +++ b/patches/0022-ocrdma-Fixing-the-be2net-include-path.patch @@ -1,15 +1,13 @@ -From 822ca969cb8d72b7b3e20ea380ce9853e67e95bd Mon Sep 17 00:00:00 2001 From: Selvin Xavier -Date: Sat, 6 Dec 2014 11:32:39 +0530 -Subject: [PATCH 2/2] ocrdma: Fixing the be2net include path +Subject: [PATCH] ocrdma: Fixing the be2net include path Signed-off-by: Selvin Xavier --- drivers/infiniband/hw/ocrdma/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/infiniband/hw/ocrdma/Makefile b/drivers/infiniband/hw/ocrdma/Makefile -index d1bfd4f..071f3f7 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/infiniband/hw/ocrdma/Makefile +++ b/drivers/infiniband/hw/ocrdma/Makefile @@ -1,4 +1,4 @@ @@ -18,6 +16,3 @@ index d1bfd4f..071f3f7 100644 obj-$(CONFIG_INFINIBAND_OCRDMA) += ocrdma.o --- -1.7.9.5 - -- 2.41.0