On 12/20/19 11:36 PM, James Smart wrote: > This is the initial patch for the new Emulex target mode SCSI > driver sources. > > This patch: > - Creates the new Emulex source level directory drivers/scsi/elx > and adds the directory to the MAINTAINERS file. > - Creates the first library subdirectory drivers/scsi/elx/libefc_sli. > This library is a SLI-4 interface library. > - Starts the population of the libefc_sli library with definitions > of SLI-4 hardware register offsets and definitions. > > Signed-off-by: Ram Vegesna <ram.vegesna@xxxxxxxxxxxx> > Signed-off-by: James Smart <jsmart2021@xxxxxxxxx> > --- > MAINTAINERS | 8 ++ > drivers/scsi/elx/libefc_sli/sli4.c | 26 ++++ > drivers/scsi/elx/libefc_sli/sli4.h | 239 +++++++++++++++++++++++++++++++++++++ > 3 files changed, 273 insertions(+) > create mode 100644 drivers/scsi/elx/libefc_sli/sli4.c > create mode 100644 drivers/scsi/elx/libefc_sli/sli4.h > > diff --git a/MAINTAINERS b/MAINTAINERS > index cc0a4a8ae06a..dd8e5f340991 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -6139,6 +6139,14 @@ W: http://www.broadcom.com > S: Supported > F: drivers/scsi/lpfc/ > > +EMULEX/BROADCOM EFCT FC/FCOE SCSI TARGET DRIVER > +M: James Smart <james.smart@xxxxxxxxxxxx> > +M: Ram Vegesna <ram.vegesna@xxxxxxxxxxxx> > +L: linux-scsi@xxxxxxxxxxxxxxx > +W: http://www.broadcom.com > +S: Supported > +F: drivers/scsi/elx/ > + > ENE CB710 FLASH CARD READER DRIVER > M: Michał Mirosław <mirq-linux@xxxxxxxxxxxx> > S: Maintained > diff --git a/drivers/scsi/elx/libefc_sli/sli4.c b/drivers/scsi/elx/libefc_sli/sli4.c > new file mode 100644 > index 000000000000..29d33becd334 > --- /dev/null > +++ b/drivers/scsi/elx/libefc_sli/sli4.c > @@ -0,0 +1,26 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Copyright (C) 2019 Broadcom. All Rights Reserved. The term > + * “Broadcom” refers to Broadcom Inc. and/or its subsidiaries. > + */ > + > +/** > + * All common (i.e. transport-independent) SLI-4 functions are implemented > + * in this file. > + */ > +#include "sli4.h" > + > +struct sli4_asic_entry_t { > + u32 rev_id; > + u32 family; > +}; > + > +static struct sli4_asic_entry_t sli4_asic_table[] = { > + { SLI4_ASIC_REV_B0, SLI4_ASIC_GEN_5}, > + { SLI4_ASIC_REV_D0, SLI4_ASIC_GEN_5}, > + { SLI4_ASIC_REV_A3, SLI4_ASIC_GEN_6}, > + { SLI4_ASIC_REV_A0, SLI4_ASIC_GEN_6}, > + { SLI4_ASIC_REV_A1, SLI4_ASIC_GEN_6}, > + { SLI4_ASIC_REV_A3, SLI4_ASIC_GEN_6}, > + { SLI4_ASIC_REV_A1, SLI4_ASIC_GEN_7}, > +}; > diff --git a/drivers/scsi/elx/libefc_sli/sli4.h b/drivers/scsi/elx/libefc_sli/sli4.h > new file mode 100644 > index 000000000000..02c671cf57ef > --- /dev/null > +++ b/drivers/scsi/elx/libefc_sli/sli4.h > @@ -0,0 +1,239 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +/* > + * Copyright (C) 2019 Broadcom. All Rights Reserved. The term > + * “Broadcom” refers to Broadcom Inc. and/or its subsidiaries. > + * > + */ > + > +/* > + * All common SLI-4 structures and function prototypes. > + */ > + > +#ifndef _SLI4_H > +#define _SLI4_H > + > +/************************************************************************* > + * Common SLI-4 register offsets and field definitions > + */ > + > +/* SLI_INTF - SLI Interface Definition Register */ > +#define SLI4_INTF_REG 0x0058 > +enum { > + SLI4_INTF_REV_SHIFT = 4, > + SLI4_INTF_REV_MASK = 0x0F << SLI4_INTF_REV_SHIFT, > + > + SLI4_INTF_REV_S3 = 3 << SLI4_INTF_REV_SHIFT, > + SLI4_INTF_REV_S4 = 4 << SLI4_INTF_REV_SHIFT, > + > + SLI4_INTF_FAMILY_SHIFT = 8, > + SLI4_INTF_FAMILY_MASK = 0x0F << SLI4_INTF_FAMILY_SHIFT, > + > + SLI4_FAMILY_CHECK_ASIC_TYPE = 0xf << SLI4_INTF_FAMILY_SHIFT, > + > + SLI4_INTF_IF_TYPE_SHIFT = 12, > + SLI4_INTF_IF_TYPE_MASK = 0x0F << SLI4_INTF_IF_TYPE_SHIFT, > + > + SLI4_INTF_IF_TYPE_2 = 2 << SLI4_INTF_IF_TYPE_SHIFT, > + SLI4_INTF_IF_TYPE_6 = 6 << SLI4_INTF_IF_TYPE_SHIFT, > + > + SLI4_INTF_VALID_SHIFT = 29, > + SLI4_INTF_VALID_MASK = 7 << SLI4_INTF_VALID_SHIFT, > + > + SLI4_INTF_VALID_VALUE = 6 << SLI4_INTF_VALID_SHIFT, > +}; > + > +/* ASIC_ID - SLI ASIC Type and Revision Register */ > +#define SLI4_ASIC_ID_REG 0x009c > +enum { > + SLI4_ASIC_GEN_SHIFT = 8, > + SLI4_ASIC_GEN_MASK = 0xFF << SLI4_ASIC_GEN_SHIFT, > + SLI4_ASIC_GEN_5 = 0x0b << SLI4_ASIC_GEN_SHIFT, > + SLI4_ASIC_GEN_6 = 0x0c << SLI4_ASIC_GEN_SHIFT, > + SLI4_ASIC_GEN_7 = 0x0d << SLI4_ASIC_GEN_SHIFT, > +}; > + > +enum { > + SLI4_ASIC_REV_A0 = 0x00, > + SLI4_ASIC_REV_A1 = 0x01, > + SLI4_ASIC_REV_A2 = 0x02, > + SLI4_ASIC_REV_A3 = 0x03, > + SLI4_ASIC_REV_B0 = 0x10, > + SLI4_ASIC_REV_B1 = 0x11, > + SLI4_ASIC_REV_B2 = 0x12, > + SLI4_ASIC_REV_C0 = 0x20, > + SLI4_ASIC_REV_C1 = 0x21, > + SLI4_ASIC_REV_C2 = 0x22, > + SLI4_ASIC_REV_D0 = 0x30, > +}; > + > +/* BMBX - Bootstrap Mailbox Register */ > +#define SLI4_BMBX_REG 0x0160 > +#define SLI4_BMBX_MASK_HI 0x3 > +#define SLI4_BMBX_MASK_LO 0xf > +#define SLI4_BMBX_RDY (1 << 0) > +#define SLI4_BMBX_HI (1 << 1) > +#define SLI4_BMBX_WRITE_HI(r) \ > + ((upper_32_bits(r) & ~SLI4_BMBX_MASK_HI) | SLI4_BMBX_HI) > +#define SLI4_BMBX_WRITE_LO(r) \ > + (((upper_32_bits(r) & SLI4_BMBX_MASK_HI) << 30) | \ > + (((r) & ~SLI4_BMBX_MASK_LO) >> 2)) > +#define SLI4_BMBX_SIZE 256 > + > +/* SLIPORT_CONTROL - SLI Port Control Register */ > +#define SLI4_PORT_CTRL_REG 0x0408 > +#define SLI4_PORT_CTRL_IP (1 << 27) > +#define SLI4_PORT_CTRL_IDIS (1 << 22) > +#define SLI4_PORT_CTRL_FDD (1 << 31) > + > +/* SLI4_SLIPORT_ERROR - SLI Port Error Register */ > +#define SLI4_PORT_ERROR1 0x040c > +#define SLI4_PORT_ERROR2 0x0410 > + > +/* EQCQ_DOORBELL - EQ and CQ Doorbell Register */ > +#define SLI4_EQCQ_DB_REG 0x120 > +enum { > + SLI4_EQ_ID_LO_MASK = 0x01FF, > + > + SLI4_CQ_ID_LO_MASK = 0x03FF, > + > + SLI4_EQCQ_CI_EQ = 0x0200, > + > + SLI4_EQCQ_QT_EQ = 0x00000400, > + SLI4_EQCQ_QT_CQ = 0x00000000, > + > + SLI4_EQCQ_ID_HI_SHIFT = 11, > + SLI4_EQCQ_ID_HI_MASK = 0xF800, > + > + SLI4_EQCQ_NUM_SHIFT = 16, > + SLI4_EQCQ_NUM_MASK = 0x1FFF0000, > + > + SLI4_EQCQ_ARM = 0x20000000, > + SLI4_EQCQ_UNARM = 0x00000000, > +}; > + Please be consistent here wrt _SHIFT and _MASK statements. Either have them spelled out (as you do in this case), but then please change the first hunk to avoid an explicit shift. Or keep the style in the first hunk, and change the _MASK values here to use the _SHIFT values (ie SLI4_EQCQ_ID_HI_MASK = 0x1F << SLI4_EQCQ_ID_HI_SHIFT). I don't mind either way, but keep it consistent. Cheers, Hannes -- Dr. Hannes Reinecke Teamlead Storage & Networking hare@xxxxxxx +49 911 74053 688 SUSE Software Solutions Germany GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), GF: Felix Imendörffer
