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

Commit 31a34aa4 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/i2c: aux channels not necessarily on nvio 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent eaa8e7ab

drivers/gpu/drm/nouveau/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ nouveau-y += core/subdev/gpio/nve0.o 
nouveau-y += core/subdev/i2c/base.o

nouveau-y += core/subdev/i2c/aux.o

nouveau-y += core/subdev/i2c/bit.o

nouveau-y += core/subdev/i2c/nv94.o

nouveau-y += core/subdev/ibus/nvc0.o

nouveau-y += core/subdev/ibus/nve0.o

nouveau-y += core/subdev/instmem/base.o

drivers/gpu/drm/nouveau/core/include/subdev/i2c.h

+5 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ struct nouveau_i2c_port { 
	u32 drive;

	u32 sense;

	u32 state;

	void (*aux_mux)(struct nouveau_i2c_port *);

	int  (*aux)(struct nouveau_i2c_port *, u8, u32, u8 *, u8);

};



struct nouveau_i2c {
@@ -57,4 +59,7 @@ int nv_wraux(struct nouveau_i2c_port *, u32 addr, u8 *data, u8 size); 
extern const struct i2c_algorithm nouveau_i2c_bit_algo;

extern const struct i2c_algorithm nouveau_i2c_aux_algo;



void nv94_aux_mux(struct nouveau_i2c_port *);

int  nv94_aux(struct nouveau_i2c_port *, u8, u32, u8 *, u8);



#endif

drivers/gpu/drm/nouveau/core/subdev/i2c/aux.c

+20 −148
Original line number Diff line number Diff line
@@ -24,166 +24,39 @@ 


#include <subdev/i2c.h>



/******************************************************************************

 * aux channel util functions

 *****************************************************************************/

#define AUX_DBG(fmt, args...) nv_debug(aux, "AUXCH(%d): " fmt, ch, ##args)

#define AUX_ERR(fmt, args...) nv_error(aux, "AUXCH(%d): " fmt, ch, ##args)



static void

auxch_fini(struct nouveau_i2c *aux, int ch)

{

	nv_mask(aux, 0x00e4e4 + (ch * 0x50), 0x00310000, 0x00000000);

}



static int

auxch_init(struct nouveau_i2c *aux, int ch)

{

	const u32 unksel = 1; /* nfi which to use, or if it matters.. */

	const u32 ureq = unksel ? 0x00100000 : 0x00200000;

	const u32 urep = unksel ? 0x01000000 : 0x02000000;

	u32 ctrl, timeout;



	/* wait up to 1ms for any previous transaction to be done... */

	timeout = 1000;

	do {

		ctrl = nv_rd32(aux, 0x00e4e4 + (ch * 0x50));

		udelay(1);

		if (!timeout--) {

			AUX_ERR("begin idle timeout 0x%08x\n", ctrl);

			return -EBUSY;

		}

	} while (ctrl & 0x03010000);



	/* set some magic, and wait up to 1ms for it to appear */

	nv_mask(aux, 0x00e4e4 + (ch * 0x50), 0x00300000, ureq);

	timeout = 1000;

	do {

		ctrl = nv_rd32(aux, 0x00e4e4 + (ch * 0x50));

		udelay(1);

		if (!timeout--) {

			AUX_ERR("magic wait 0x%08x\n", ctrl);

			auxch_fini(aux, ch);

			return -EBUSY;

		}

	} while ((ctrl & 0x03000000) != urep);



	return 0;

}



static int

auxch_tx(struct nouveau_i2c *aux, int ch, u8 type, u32 addr, u8 *data, u8 size)

{

	u32 ctrl, stat, timeout, retries;

	u32 xbuf[4] = {};

	int ret, i;



	AUX_DBG("%d: 0x%08x %d\n", type, addr, size);



	ret = auxch_init(aux, ch);

	if (ret)

		goto out;



	stat = nv_rd32(aux, 0x00e4e8 + (ch * 0x50));

	if (!(stat & 0x10000000)) {

		AUX_DBG("sink not detected\n");

		ret = -ENXIO;

		goto out;

	}



	if (!(type & 1)) {

		memcpy(xbuf, data, size);

		for (i = 0; i < 16; i += 4) {

			AUX_DBG("wr 0x%08x\n", xbuf[i / 4]);

			nv_wr32(aux, 0x00e4c0 + (ch * 0x50) + i, xbuf[i / 4]);

		}

	}



	ctrl  = nv_rd32(aux, 0x00e4e4 + (ch * 0x50));

	ctrl &= ~0x0001f0ff;

	ctrl |= type << 12;

	ctrl |= size - 1;

	nv_wr32(aux, 0x00e4e0 + (ch * 0x50), addr);



	/* retry transaction a number of times on failure... */

	ret = -EREMOTEIO;

	for (retries = 0; retries < 32; retries++) {

		/* reset, and delay a while if this is a retry */

		nv_wr32(aux, 0x00e4e4 + (ch * 0x50), 0x80000000 | ctrl);

		nv_wr32(aux, 0x00e4e4 + (ch * 0x50), 0x00000000 | ctrl);

		if (retries)

			udelay(400);



		/* transaction request, wait up to 1ms for it to complete */

		nv_wr32(aux, 0x00e4e4 + (ch * 0x50), 0x00010000 | ctrl);



		timeout = 1000;

		do {

			ctrl = nv_rd32(aux, 0x00e4e4 + (ch * 0x50));

			udelay(1);

			if (!timeout--) {

				AUX_ERR("tx req timeout 0x%08x\n", ctrl);

				goto out;

			}

		} while (ctrl & 0x00010000);



		/* read status, and check if transaction completed ok */

		stat = nv_mask(aux, 0x00e4e8 + (ch * 0x50), 0, 0);

		if (!(stat & 0x000f0f00)) {

			ret = 0;

			break;

		}



		AUX_DBG("%02d 0x%08x 0x%08x\n", retries, ctrl, stat);

	}



	if (type & 1) {

		for (i = 0; i < 16; i += 4) {

			xbuf[i / 4] = nv_rd32(aux, 0x00e4d0 + (ch * 0x50) + i);

			AUX_DBG("rd 0x%08x\n", xbuf[i / 4]);

		}

		memcpy(data, xbuf, size);

	}



out:

	auxch_fini(aux, ch);

	return ret;

}



static void

auxch_mux(struct nouveau_i2c_port *port)

int

nv_rdaux(struct nouveau_i2c_port *port, u32 addr, u8 *data, u8 size)

{

	if (port->dcb & 0x00000100) {

		u32 reg = 0x00e500 + (port->drive * 0x50);

		/* nfi, but neither auxch or i2c work if it's 1 */

		nv_mask(port->i2c, reg + 0x0c, 0x00000001, 0x00000000);

		/* nfi, but switches auxch vs normal i2c */

		nv_mask(port->i2c, reg + 0x00, 0x0000f003, 0x00002002);

	if (port->aux) {

		if (port->aux_mux)

			port->aux_mux(port);

		return port->aux(port, 9, addr, data, size);

	}

	return -ENODEV;

}



int

nv_rdaux(struct nouveau_i2c_port *auxch, u32 addr, u8 *data, u8 size)

nv_wraux(struct nouveau_i2c_port *port, u32 addr, u8 *data, u8 size)

{

	auxch_mux(auxch);

	return auxch_tx(auxch->i2c, auxch->drive, 9, addr, data, size);

	if (port->aux) {

		if (port->aux_mux)

			port->aux_mux(port);

		return port->aux(port, 8, addr, data, size);

	}



int

nv_wraux(struct nouveau_i2c_port *auxch, u32 addr, u8 *data, u8 size)

{

	auxch_mux(auxch);

	return auxch_tx(auxch->i2c, auxch->drive, 8, addr, data, size);

	return -ENODEV;

}



static int

aux_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)

{

	struct nouveau_i2c_port *auxch = (struct nouveau_i2c_port *)adap;

	struct nouveau_i2c_port *port = (struct nouveau_i2c_port *)adap;

	struct i2c_msg *msg = msgs;

	int ret, mcnt = num;



	auxch_mux(auxch);

	if (!port->aux)

		return -ENODEV;

	if ( port->aux_mux)

		port->aux_mux(port);



	while (mcnt--) {

		u8 remaining = msg->len;
@@ -201,8 +74,7 @@ aux_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) 
			if (mcnt || remaining > 16)

				cmd |= 4; /* MOT */



			ret = auxch_tx(auxch->i2c, auxch->drive, cmd,

				       msg->addr, ptr, cnt);

			ret = port->aux(port, cmd, msg->addr, ptr, cnt);

			if (ret < 0)

				return ret;

drivers/gpu/drm/nouveau/core/subdev/i2c/base.c

+2 −0
Original line number Diff line number Diff line
@@ -303,6 +303,8 @@ nouveau_i2c_ctor(struct nouveau_object *parent, struct nouveau_object *engine, 
			port->drive = info.drive & 0x0f;

			port->sense = port->drive;

			port->adapter.algo = &nouveau_i2c_aux_algo;

			port->aux_mux = nv94_aux_mux;

			port->aux = nv94_aux;

			break;

		default:

			break;

drivers/gpu/drm/nouveau/core/subdev/i2c/nv94.c

0 → 100644
+165 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2009 Red Hat Inc.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 *

 * Authors: Ben Skeggs

 */



#include <subdev/i2c.h>



/******************************************************************************

 * aux channel util functions

 *****************************************************************************/

#define AUX_DBG(fmt, args...) nv_debug(aux, "AUXCH(%d): " fmt, ch, ##args)

#define AUX_ERR(fmt, args...) nv_error(aux, "AUXCH(%d): " fmt, ch, ##args)



static void

auxch_fini(struct nouveau_i2c *aux, int ch)

{

	nv_mask(aux, 0x00e4e4 + (ch * 0x50), 0x00310000, 0x00000000);

}



static int

auxch_init(struct nouveau_i2c *aux, int ch)

{

	const u32 unksel = 1; /* nfi which to use, or if it matters.. */

	const u32 ureq = unksel ? 0x00100000 : 0x00200000;

	const u32 urep = unksel ? 0x01000000 : 0x02000000;

	u32 ctrl, timeout;



	/* wait up to 1ms for any previous transaction to be done... */

	timeout = 1000;

	do {

		ctrl = nv_rd32(aux, 0x00e4e4 + (ch * 0x50));

		udelay(1);

		if (!timeout--) {

			AUX_ERR("begin idle timeout 0x%08x\n", ctrl);

			return -EBUSY;

		}

	} while (ctrl & 0x03010000);



	/* set some magic, and wait up to 1ms for it to appear */

	nv_mask(aux, 0x00e4e4 + (ch * 0x50), 0x00300000, ureq);

	timeout = 1000;

	do {

		ctrl = nv_rd32(aux, 0x00e4e4 + (ch * 0x50));

		udelay(1);

		if (!timeout--) {

			AUX_ERR("magic wait 0x%08x\n", ctrl);

			auxch_fini(aux, ch);

			return -EBUSY;

		}

	} while ((ctrl & 0x03000000) != urep);



	return 0;

}



int

nv94_aux(struct nouveau_i2c_port *port, u8 type, u32 addr, u8 *data, u8 size)

{

	struct nouveau_i2c *aux = port->i2c;

	u32 ctrl, stat, timeout, retries;

	u32 xbuf[4] = {};

	int ch = port->drive;

	int ret, i;



	AUX_DBG("%d: 0x%08x %d\n", type, addr, size);



	ret = auxch_init(aux, ch);

	if (ret)

		goto out;



	stat = nv_rd32(aux, 0x00e4e8 + (ch * 0x50));

	if (!(stat & 0x10000000)) {

		AUX_DBG("sink not detected\n");

		ret = -ENXIO;

		goto out;

	}



	if (!(type & 1)) {

		memcpy(xbuf, data, size);

		for (i = 0; i < 16; i += 4) {

			AUX_DBG("wr 0x%08x\n", xbuf[i / 4]);

			nv_wr32(aux, 0x00e4c0 + (ch * 0x50) + i, xbuf[i / 4]);

		}

	}



	ctrl  = nv_rd32(aux, 0x00e4e4 + (ch * 0x50));

	ctrl &= ~0x0001f0ff;

	ctrl |= type << 12;

	ctrl |= size - 1;

	nv_wr32(aux, 0x00e4e0 + (ch * 0x50), addr);



	/* retry transaction a number of times on failure... */

	ret = -EREMOTEIO;

	for (retries = 0; retries < 32; retries++) {

		/* reset, and delay a while if this is a retry */

		nv_wr32(aux, 0x00e4e4 + (ch * 0x50), 0x80000000 | ctrl);

		nv_wr32(aux, 0x00e4e4 + (ch * 0x50), 0x00000000 | ctrl);

		if (retries)

			udelay(400);



		/* transaction request, wait up to 1ms for it to complete */

		nv_wr32(aux, 0x00e4e4 + (ch * 0x50), 0x00010000 | ctrl);



		timeout = 1000;

		do {

			ctrl = nv_rd32(aux, 0x00e4e4 + (ch * 0x50));

			udelay(1);

			if (!timeout--) {

				AUX_ERR("tx req timeout 0x%08x\n", ctrl);

				goto out;

			}

		} while (ctrl & 0x00010000);



		/* read status, and check if transaction completed ok */

		stat = nv_mask(aux, 0x00e4e8 + (ch * 0x50), 0, 0);

		if (!(stat & 0x000f0f00)) {

			ret = 0;

			break;

		}



		AUX_DBG("%02d 0x%08x 0x%08x\n", retries, ctrl, stat);

	}



	if (type & 1) {

		for (i = 0; i < 16; i += 4) {

			xbuf[i / 4] = nv_rd32(aux, 0x00e4d0 + (ch * 0x50) + i);

			AUX_DBG("rd 0x%08x\n", xbuf[i / 4]);

		}

		memcpy(data, xbuf, size);

	}



out:

	auxch_fini(aux, ch);

	return ret;

}



void

nv94_aux_mux(struct nouveau_i2c_port *port)

{

	if (port->dcb & 0x00000100) {

		u32 reg = 0x00e500 + (port->drive * 0x50);

		/* nfi, but neither auxch or i2c work if it's 1 */

		nv_mask(port->i2c, reg + 0x0c, 0x00000001, 0x00000000);

		/* nfi, but switches auxch vs normal i2c */

		nv_mask(port->i2c, reg + 0x00, 0x0000f003, 0x00002002);

	}

}