IB/qib: change QLogic to Intel
PATCH v2 1/1 IB/qib: change QLogic to Intel
From: Vinit Agnihotri <[email protected]>
These changes modify the qib driver as part of acquiring the Infiniband assets of QLogic.
Reviewed-by Mike Marciniszyn <[email protected]>
Reviewed-by Dean Luick <[email protected]>
Signed-off-by Vinit Agnihotri <[email protected]>
--- drivers/infiniband/hw/qib/Kconfig | 6 drivers/infiniband/hw/qib/qib_driver.c | 5 drivers/infiniband/hw/qib/qib_iba6120.c | 3 drivers/infiniband/hw/qib/qib_init.c | 8 drivers/infiniband/hw/qib/qib_sd7220.c | 4 drivers/infiniband/hw/qib/qib_verbs.c | 4 firmware/Makefile | 2 firmware/intel/sd7220.fw.ihex | 513 +++++++++++++++++++++++++++++++ firmware/qlogic/sd7220.fw.ihex | 513 ------------------------------- 9 files changed, 530 insertions(+), 528 deletions(-) create mode 100644 firmware/intel/sd7220.fw.ihex delete mode 100644 firmware/qlogic/sd7220.fw.ihex
drivers/infiniband/hw/qib/Kconfig +3 -3
@@ -1,7 +1,7 @@ config INFINIBAND_QIB - tristate "QLogic PCIe HCA support" + tristate "Intel PCIe HCA support" depends on 64BIT ---help--- - This is a low-level driver for QLogic PCIe QLE InfiniBand host - channel adapters. This driver does not support the QLogic + This is a low-level driver for Intel PCIe QLE InfiniBand host + channel adapters. This driver does not support the Intel HyperTransport card (model QHT7140).
drivers/infiniband/hw/qib/qib_driver.c +3 -2
@@ -1,4 +1,5 @@/* +* Copyright (c) 2013 Intel Corporation. All rights reserved. * Copyright (c) 2006, 2007, 2008, 2009 QLogic Corporation. All rights reserved. * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved. *
@@ -63,8 +64,8 @@ MODULE_PARM_DESC(compat_ddr_negotiate, "Attempt pre-IBTA 1.2 DDR speed negotiation");MODULE_LICENSE ("Dual BSD/GPL" ); -MODULE_AUTHOR ("QLogic <[email protected]>" ); -MODULE_DESCRIPTION ("QLogic IB driver" ); +MODULE_AUTHOR ("Intel <[email protected]>" ); +MODULE_DESCRIPTION ("Intel IB driver" );MODULE_VERSION (QIB_DRIVER_VERSION );/*
drivers/infiniband/hw/qib/qib_iba6120.c +2 -1
@@ -1,4 +1,5 @@/* +* Copyright (c) 2013 Intel Corporation. All rights reserved. * Copyright (c) 2006, 2007, 2008, 2009, 2010 QLogic Corporation. * All rights reserved. * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.
@@ -51,7 +52,7 @@ static u32 qib_6120_iblink_state(u64);/* * This file contains all the chip-specific register information and -* access functions for the QLogic QLogic_IB PCI-Express chip. +* access functions for the Intel Intel_IB PCI-Express chip. * */
drivers/infiniband/hw/qib/qib_init.c +4 -4
@@ -1,5 +1,5 @@/* -* Copyright (c) 2012 Intel Corporation. All rights reserved. +* Copyright (c) 2012, 2013 Intel Corporation. All rights reserved. * Copyright (c) 2006 - 2012 QLogic Corporation. All rights reserved. * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved. *
@@ -1137,7 +1137,7 @@ void qib_disable_after_error(struct qib_devdata *dd)static void qib_remove_one (struct pci_dev *);static int qib_init_one (struct pci_dev *,const struct pci_device_id *); -#define DRIVER_LOAD_MSG "QLogic " QIB_DRV_NAME " loaded: " +#define DRIVER_LOAD_MSG "Intel " QIB_DRV_NAME " loaded: "#define PFX QIB_DRV_NAME ": "static DEFINE_PCI_DEVICE_TABLE (qib_pci_tbl) = {
@@ -1360,7 +1360,7 @@ static int qib_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) dd =qib_init_iba6120_funcs (pdev, ent);#else qib_early_err (&pdev->dev, -"QLogic PCIE device 0x%x cannot work if CONFIG_PCI_MSI is not enabled\n" , +"Intel PCIE device 0x%x cannot work if CONFIG_PCI_MSI is not enabled\n" , ent->device); dd =ERR_PTR (-ENODEV );#endif
@@ -1376,7 +1376,7 @@ static int qib_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)default :qib_early_err (&pdev->dev, -"Failing on unknown QLogic deviceid 0x%x\n" , +"Failing on unknown Intel deviceid 0x%x\n" , ent->device); ret = -ENODEV ; }
drivers/infiniband/hw/qib/qib_sd7220.c +2 -2
@@ -1,5 +1,5 @@/* -* Copyright (c) 2012 Intel Corporation. All rights reserved. +* Copyright (c) 2013 Intel Corporation. All rights reserved. * Copyright (c) 2006 - 2012 QLogic Corporation. All rights reserved. * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved. *
@@ -44,7 +44,7 @@#include "qib.h" #include "qib_7220.h" -#define SD7220_FW_NAME "qlogic/sd7220.fw" +#define SD7220_FW_NAME "intel/sd7220.fw"MODULE_FIRMWARE (SD7220_FW_NAME );/*
drivers/infiniband/hw/qib/qib_verbs.c +2 -2
@@ -1,5 +1,5 @@/* -* Copyright (c) 2012 Intel Corporation. All rights reserved. +* Copyright (c) 2012, 2013 Intel Corporation. All rights reserved. * Copyright (c) 2006 - 2012 QLogic Corporation. All rights reserved. * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved. *
@@ -2224,7 +2224,7 @@ int qib_register_ib_device(struct qib_devdata *dd) ibdev->dma_ops = &qib_dma_mapping_ops;snprintf (ibdev->node_desc,sizeof (ibdev->node_desc), -"QLogic Infiniband HCA %s" ,init_utsname ()->nodename); +"Intel Infiniband HCA %s" ,init_utsname ()->nodename); ret =ib_register_device (ibdev, qib_create_port_files);if (ret)
firmware/Makefile +1 -1
@@ -82,7 +82,7 @@ fw-shipped-$(CONFIG_SCSI_ADVANSYS) += advansys/mcode.bin advansys/38C1600.bin \ fw-shipped-$(CONFIG_SCSI_QLOGIC_1280) += qlogic/1040.bin qlogic/1280.bin \ qlogic/12160.bin fw-shipped-$(CONFIG_SCSI_QLOGICPTI) += qlogic/isp1000.bin -fw-shipped-$(CONFIG_INFINIBAND_QIB) += qlogic/sd7220.fw +fw-shipped-$(CONFIG_INFINIBAND_QIB) += intel/sd7220.fw fw-shipped-$(CONFIG_SND_KORG1212) += korg/k1212.dsp fw-shipped-$(CONFIG_SND_MAESTRO3) += ess/maestro3_assp_kernel.fw \ ess/maestro3_assp_minisrc.fw
firmware/intel/sd7220.fw.ihex new file +513 -0
513 lines not on this page · raw message
firmware/qlogic/sd7220.fw.ihex deleted +0 -513
513 lines not on this page · raw message
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html