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

Commit 30fc5c31 authored by Bryan O'Sullivan's avatar Bryan O'Sullivan Committed by Roland Dreier
Browse files

IB/ipath: control receive polarity inversion 



Signed-off-by: default avatarBryan O'Sullivan <bryan.osullivan@qlogic.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent e35d710d

drivers/infiniband/hw/ipath/ipath_driver.c

+17 −0
Original line number Diff line number Diff line
@@ -2116,5 +2116,22 @@ int ipath_reset_device(int unit) 
	return ret;

}



int ipath_set_rx_pol_inv(struct ipath_devdata *dd, u8 new_pol_inv)

{

	u64 val;

	if ( new_pol_inv > INFINIPATH_XGXS_RX_POL_MASK ) {

		return -1;

	}

	if ( dd->ipath_rx_pol_inv != new_pol_inv ) {

		dd->ipath_rx_pol_inv = new_pol_inv;

		val = ipath_read_kreg64(dd, dd->ipath_kregs->kr_xgxsconfig);

		val &= ~(INFINIPATH_XGXS_RX_POL_MASK <<

                         INFINIPATH_XGXS_RX_POL_SHIFT);

                val |= ((u64)dd->ipath_rx_pol_inv) <<

                        INFINIPATH_XGXS_RX_POL_SHIFT;

		ipath_write_kreg(dd, dd->ipath_kregs->kr_xgxsconfig, val);

	}

	return 0;

}

module_init(infinipath_init);

module_exit(infinipath_cleanup);

drivers/infiniband/hw/ipath/ipath_iba6110.c

+9 −0
Original line number Diff line number Diff line
@@ -1290,6 +1290,15 @@ static int ipath_ht_bringup_serdes(struct ipath_devdata *dd) 
		val &= ~INFINIPATH_XGXS_RESET;

		change = 1;

	}

	if (((val >> INFINIPATH_XGXS_RX_POL_SHIFT) &

	     INFINIPATH_XGXS_RX_POL_MASK) != dd->ipath_rx_pol_inv ) {

		/* need to compensate for Tx inversion in partner */

		val &= ~(INFINIPATH_XGXS_RX_POL_MASK <<

		         INFINIPATH_XGXS_RX_POL_SHIFT);

		val |= dd->ipath_rx_pol_inv <<

			INFINIPATH_XGXS_RX_POL_SHIFT;

		change = 1;

	}

	if (change)

		ipath_write_kreg(dd, dd->ipath_kregs->kr_xgxsconfig, val);

drivers/infiniband/hw/ipath/ipath_iba6120.c

+9 −0
Original line number Diff line number Diff line
@@ -654,6 +654,15 @@ static int ipath_pe_bringup_serdes(struct ipath_devdata *dd) 
		val &= ~INFINIPATH_XGXS_RESET;

		change = 1;

	}

	if (((val >> INFINIPATH_XGXS_RX_POL_SHIFT) &

	     INFINIPATH_XGXS_RX_POL_MASK) != dd->ipath_rx_pol_inv ) {

		/* need to compensate for Tx inversion in partner */

		val &= ~(INFINIPATH_XGXS_RX_POL_MASK <<

		         INFINIPATH_XGXS_RX_POL_SHIFT);

		val |= dd->ipath_rx_pol_inv <<

			INFINIPATH_XGXS_RX_POL_SHIFT;

		change = 1;

	}

	if (change)

		ipath_write_kreg(dd, dd->ipath_kregs->kr_xgxsconfig, val);

drivers/infiniband/hw/ipath/ipath_kernel.h

+3 −0
Original line number Diff line number Diff line
@@ -503,6 +503,8 @@ struct ipath_devdata { 
	u8 ipath_pci_cacheline;

	/* LID mask control */

	u8 ipath_lmc;

	/* Rx Polarity inversion (compensate for ~tx on partner) */

	u8 ipath_rx_pol_inv;



	/* local link integrity counter */

	u32 ipath_lli_counter;
@@ -567,6 +569,7 @@ void ipath_get_faststats(unsigned long); 
int ipath_set_linkstate(struct ipath_devdata *, u8);

int ipath_set_mtu(struct ipath_devdata *, u16);

int ipath_set_lid(struct ipath_devdata *, u32, u8);

int ipath_set_rx_pol_inv(struct ipath_devdata *dd, u8 new_pol_inv);



/* for use in system calls, where we want to know device type, etc. */

#define port_fp(fp) ((struct ipath_portdata *) (fp)->private_data)

drivers/infiniband/hw/ipath/ipath_registers.h

+2 −0
Original line number Diff line number Diff line
@@ -282,6 +282,8 @@ 
#define INFINIPATH_XGXS_RESET          0x7ULL

#define INFINIPATH_XGXS_MDIOADDR_MASK  0xfULL

#define INFINIPATH_XGXS_MDIOADDR_SHIFT 4

#define INFINIPATH_XGXS_RX_POL_SHIFT 19

#define INFINIPATH_XGXS_RX_POL_MASK 0xfULL



#define INFINIPATH_RT_ADDR_MASK 0xFFFFFFFFFFULL	/* 40 bits valid */