Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8274869 authored Dec 21, 2007 by Dave Olson Committed by Roland Dreier Jan 25, 2008

IB/ipath: Generalize some xxx_SHIFT macros



In preparation for upcoming chips that have different values for
INFINIPATH_R_PORTENABLE_SHIFT, INFINIPATH_R_INTRAVAIL_SHIFT,
INFINIPATH_R_TAILUPD_SHIFT, and portcfg_shift, remove the shared
#defines and use device-specific variables instead.

Signed-off-by: Dave Olson <dave.olson@qlogic.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

parent c59a80ac

drivers/infiniband/hw/ipath/ipath_file_ops.c

+8 −7

Original line number	Diff line number	Diff line
		@@ -744,10 +744,10 @@ static int ipath_manage_rcvq(struct ipath_portdata *pd, unsigned subport,
		*/
		if (pd->port_rcvhdrtail_kvaddr)
		ipath_clear_rcvhdrtail(pd);
		set_bit(INFINIPATH_R_PORTENABLE_SHIFT + pd->port_port,
		set_bit(dd->ipath_r_portenable_shift + pd->port_port,
		&dd->ipath_rcvctrl);
		} else
		clear_bit(INFINIPATH_R_PORTENABLE_SHIFT + pd->port_port,
		clear_bit(dd->ipath_r_portenable_shift + pd->port_port,
		&dd->ipath_rcvctrl);
		ipath_write_kreg(dd, dd->ipath_kregs->kr_rcvctrl,
		dd->ipath_rcvctrl);
		@@ -1405,7 +1405,7 @@ static unsigned int ipath_poll_next(struct ipath_portdata *pd,
		/* flush waiting flag so we don't miss an event */
		wmb();

		set_bit(pd->port_port + INFINIPATH_R_INTRAVAIL_SHIFT,
		set_bit(pd->port_port + dd->ipath_r_intravail_shift,
		&dd->ipath_rcvctrl);

		ipath_write_kreg(dd, dd->ipath_kregs->kr_rcvctrl,
		@@ -1938,10 +1938,11 @@ static int ipath_do_user_init(struct file *fp,
		*/
		if (pd->port_rcvhdrtail_kvaddr)
		ipath_clear_rcvhdrtail(pd);
		set_bit(INFINIPATH_R_PORTENABLE_SHIFT + pd->port_port,
		set_bit(dd->ipath_r_portenable_shift + pd->port_port,
		&dd->ipath_rcvctrl);
		ipath_write_kreg(dd, dd->ipath_kregs->kr_rcvctrl,
		dd->ipath_rcvctrl & ~INFINIPATH_R_TAILUPD);
		dd->ipath_rcvctrl &
		~(1ULL << dd->ipath_r_tailupd_shift));
		ipath_write_kreg(dd, dd->ipath_kregs->kr_rcvctrl,
		dd->ipath_rcvctrl);
		/* Notify any waiting slaves */
		@@ -2050,9 +2051,9 @@ static int ipath_close(struct inode in, struct file fp)
		if (dd->ipath_kregbase) {
		int i;
		/* atomically clear receive enable port and intr avail. */
		clear_bit(INFINIPATH_R_PORTENABLE_SHIFT + port,
		clear_bit(dd->ipath_r_portenable_shift + port,
		&dd->ipath_rcvctrl);
		clear_bit(pd->port_port + INFINIPATH_R_INTRAVAIL_SHIFT,
		clear_bit(pd->port_port + dd->ipath_r_intravail_shift,
		&dd->ipath_rcvctrl);
		ipath_write_kreg( dd, dd->ipath_kregs->kr_rcvctrl,
		dd->ipath_rcvctrl);

drivers/infiniband/hw/ipath/ipath_iba6110.c

+12 −0

Original line number	Diff line number	Diff line
		@@ -296,6 +296,12 @@ static const struct ipath_cregs ipath_ht_cregs = {
		#define INFINIPATH_RT_BUFSIZE_MASK 0x3FFFULL
		#define INFINIPATH_RT_BUFSIZE_SHIFT 48

		#define INFINIPATH_R_INTRAVAIL_SHIFT 16
		#define INFINIPATH_R_TAILUPD_SHIFT 31

		/* kr_xgxsconfig bits */
		#define INFINIPATH_XGXS_RESET 0x7ULL

		/*
		* masks and bits that are different in different chips, or present only
		* in one
		@@ -1079,6 +1085,12 @@ static void ipath_init_ht_variables(struct ipath_devdata *dd)
		dd->ipath_gpio_sda = IPATH_GPIO_SDA;
		dd->ipath_gpio_scl = IPATH_GPIO_SCL;

		/* Fill in shifts for RcvCtrl. */
		dd->ipath_r_portenable_shift = INFINIPATH_R_PORTENABLE_SHIFT;
		dd->ipath_r_intravail_shift = INFINIPATH_R_INTRAVAIL_SHIFT;
		dd->ipath_r_tailupd_shift = INFINIPATH_R_TAILUPD_SHIFT;
		dd->ipath_r_portcfg_shift = 0; /* Not on IBA6110 */

		dd->ipath_i_bitsextant =
		(INFINIPATH_I_RCVURG_MASK << INFINIPATH_I_RCVURG_SHIFT) \|
		(INFINIPATH_I_RCVAVAIL_MASK <<

drivers/infiniband/hw/ipath/ipath_iba6120.c

+9 −0

Original line number	Diff line number	Diff line
		@@ -296,6 +296,9 @@ static const struct ipath_cregs ipath_pe_cregs = {
		#define IPATH_GPIO_SCL (1ULL << \
		(_IPATH_GPIO_SCL_NUM+INFINIPATH_EXTC_GPIOOE_SHIFT))

		#define INFINIPATH_R_INTRAVAIL_SHIFT 16
		#define INFINIPATH_R_TAILUPD_SHIFT 31

		/* 6120 specific hardware errors... */
		static const struct ipath_hwerror_msgs ipath_6120_hwerror_msgs[] = {
		INFINIPATH_HWE_MSG(PCIEPOISONEDTLP, "PCIe Poisoned TLP"),
		@@ -916,6 +919,12 @@ static void ipath_init_pe_variables(struct ipath_devdata *dd)
		dd->ipath_gpio_sda = IPATH_GPIO_SDA;
		dd->ipath_gpio_scl = IPATH_GPIO_SCL;

		/* Fill in shifts for RcvCtrl. */
		dd->ipath_r_portenable_shift = INFINIPATH_R_PORTENABLE_SHIFT;
		dd->ipath_r_intravail_shift = INFINIPATH_R_INTRAVAIL_SHIFT;
		dd->ipath_r_tailupd_shift = INFINIPATH_R_TAILUPD_SHIFT;
		dd->ipath_r_portcfg_shift = 0; /* Not on IBA6120 */

		/* variables for sanity checking interrupt and errors */
		dd->ipath_hwe_bitsextant =
		(INFINIPATH_HWE_RXEMEMPARITYERR_MASK <<

drivers/infiniband/hw/ipath/ipath_init_chip.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -508,9 +508,9 @@ static void enable_chip(struct ipath_devdata *dd,
		* enable port 0 receive, and receive interrupt. other ports
		* done as user opens and inits them.
		*/
		dd->ipath_rcvctrl = INFINIPATH_R_TAILUPD \|
		(1ULL << INFINIPATH_R_PORTENABLE_SHIFT) \|
		(1ULL << INFINIPATH_R_INTRAVAIL_SHIFT);
		dd->ipath_rcvctrl = (1ULL << dd->ipath_r_tailupd_shift) \|
		(1ULL << dd->ipath_r_portenable_shift) \|
		(1ULL << dd->ipath_r_intravail_shift);
		ipath_write_kreg(dd, dd->ipath_kregs->kr_rcvctrl,
		dd->ipath_rcvctrl);

drivers/infiniband/hw/ipath/ipath_intr.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -975,7 +975,7 @@ static void handle_urcv(struct ipath_devdata *dd, u32 istat)
		if (portr & (1 << i) && pd && pd->port_cnt) {
		if (test_and_clear_bit(IPATH_PORT_WAITING_RCV,
		&pd->port_flag)) {
		clear_bit(i + INFINIPATH_R_INTRAVAIL_SHIFT,
		clear_bit(i + dd->ipath_r_intravail_shift,
		&dd->ipath_rcvctrl);
		wake_up_interruptible(&pd->port_wait);
		rcvdint = 1;