Skip to content

L
linux
Commit 6f227499 authored by Ben Skeggs's avatar Ben Skeggs
Browse files
Options

drm/nouveau/i2c: switch to device pri macros 

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 4de93a08
Hide whitespace changes
Inline Side-by-side
Showing with 98 additions and 73 deletions
drivers/gpu/drm/nouveau/nvkm/subdev/i2c/g94.c
View file @ 6f227499
...@@ -26,21 +26,23 @@ ...@@ -26,21 +26,23 @@
void void
g94_aux_stat(struct nvkm_i2c *i2c, u32 *hi, u32 *lo, u32 *rq, u32 *tx) g94_aux_stat(struct nvkm_i2c *i2c, u32 *hi, u32 *lo, u32 *rq, u32 *tx)
{ {
u32 intr = nv_rd32(i2c, 0x00e06c); struct nvkm_device *device = i2c->subdev.device;
u32 stat = nv_rd32(i2c, 0x00e068) & intr, i; u32 intr = nvkm_rd32(device, 0x00e06c);
u32 stat = nvkm_rd32(device, 0x00e068) & intr, i;
for (i = 0, *hi = *lo = *rq = *tx = 0; i < 8; i++) { for (i = 0, *hi = *lo = *rq = *tx = 0; i < 8; i++) {
if ((stat & (1 << (i * 4)))) *hi |= 1 << i; if ((stat & (1 << (i * 4)))) *hi |= 1 << i;
if ((stat & (2 << (i * 4)))) *lo |= 1 << i; if ((stat & (2 << (i * 4)))) *lo |= 1 << i;
if ((stat & (4 << (i * 4)))) *rq |= 1 << i; if ((stat & (4 << (i * 4)))) *rq |= 1 << i;
if ((stat & (8 << (i * 4)))) *tx |= 1 << i; if ((stat & (8 << (i * 4)))) *tx |= 1 << i;
} }
nv_wr32(i2c, 0x00e06c, intr); nvkm_wr32(device, 0x00e06c, intr);
} }
void void
g94_aux_mask(struct nvkm_i2c *i2c, u32 type, u32 mask, u32 data) g94_aux_mask(struct nvkm_i2c *i2c, u32 type, u32 mask, u32 data)
{ {
u32 temp = nv_rd32(i2c, 0x00e068), i; struct nvkm_device *device = i2c->subdev.device;
u32 temp = nvkm_rd32(device, 0x00e068), i;
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
if (mask & (1 << i)) { if (mask & (1 << i)) {
if (!(data & (1 << i))) { if (!(data & (1 << i))) {
...@@ -50,21 +52,23 @@ g94_aux_mask(struct nvkm_i2c *i2c, u32 type, u32 mask, u32 data) ...@@ -50,21 +52,23 @@ g94_aux_mask(struct nvkm_i2c *i2c, u32 type, u32 mask, u32 data)
temp |= type << (i * 4); temp |= type << (i * 4);
} }
} }
nv_wr32(i2c, 0x00e068, temp); nvkm_wr32(device, 0x00e068, temp);
} }
#define AUX_DBG(fmt, args...) nv_debug(aux, "AUXCH(%d): " fmt, ch, ##args) #define AUX_DBG(fmt, args...) nv_debug(i2c, "AUXCH(%d): " fmt, ch, ##args)
#define AUX_ERR(fmt, args...) nv_error(aux, "AUXCH(%d): " fmt, ch, ##args) #define AUX_ERR(fmt, args...) nv_error(i2c, "AUXCH(%d): " fmt, ch, ##args)
static void static void
auxch_fini(struct nvkm_i2c *aux, int ch) auxch_fini(struct nvkm_i2c *i2c, int ch)
{ {
nv_mask(aux, 0x00e4e4 + (ch * 0x50), 0x00310000, 0x00000000); struct nvkm_device *device = i2c->subdev.device;
nvkm_mask(device, 0x00e4e4 + (ch * 0x50), 0x00310000, 0x00000000);
} }
static int static int
auxch_init(struct nvkm_i2c *aux, int ch) auxch_init(struct nvkm_i2c *i2c, int ch)
{ {
struct nvkm_device *device = i2c->subdev.device;
const u32 unksel = 1; /* nfi which to use, or if it matters.. */ const u32 unksel = 1; /* nfi which to use, or if it matters.. */
const u32 ureq = unksel ? 0x00100000 : 0x00200000; const u32 ureq = unksel ? 0x00100000 : 0x00200000;
const u32 urep = unksel ? 0x01000000 : 0x02000000; const u32 urep = unksel ? 0x01000000 : 0x02000000;
...@@ -73,7 +77,7 @@ auxch_init(struct nvkm_i2c *aux, int ch) ...@@ -73,7 +77,7 @@ auxch_init(struct nvkm_i2c *aux, int ch)
/* wait up to 1ms for any previous transaction to be done... */ /* wait up to 1ms for any previous transaction to be done... */
timeout = 1000; timeout = 1000;
do { do {
ctrl = nv_rd32(aux, 0x00e4e4 + (ch * 0x50)); ctrl = nvkm_rd32(device, 0x00e4e4 + (ch * 0x50));
udelay(1); udelay(1);
if (!timeout--) { if (!timeout--) {
AUX_ERR("begin idle timeout 0x%08x\n", ctrl); AUX_ERR("begin idle timeout 0x%08x\n", ctrl);
...@@ -82,14 +86,14 @@ auxch_init(struct nvkm_i2c *aux, int ch) ...@@ -82,14 +86,14 @@ auxch_init(struct nvkm_i2c *aux, int ch)
} while (ctrl & 0x03010000); } while (ctrl & 0x03010000);
/* set some magic, and wait up to 1ms for it to appear */ /* set some magic, and wait up to 1ms for it to appear */
nv_mask(aux, 0x00e4e4 + (ch * 0x50), 0x00300000, ureq); nvkm_mask(device, 0x00e4e4 + (ch * 0x50), 0x00300000, ureq);
timeout = 1000; timeout = 1000;
do { do {
ctrl = nv_rd32(aux, 0x00e4e4 + (ch * 0x50)); ctrl = nvkm_rd32(device, 0x00e4e4 + (ch * 0x50));
udelay(1); udelay(1);
if (!timeout--) { if (!timeout--) {
AUX_ERR("magic wait 0x%08x\n", ctrl); AUX_ERR("magic wait 0x%08x\n", ctrl);
auxch_fini(aux, ch); auxch_fini(i2c, ch);
return -EBUSY; return -EBUSY;
} }
} while ((ctrl & 0x03000000) != urep); } while ((ctrl & 0x03000000) != urep);
...@@ -101,7 +105,8 @@ int ...@@ -101,7 +105,8 @@ int
g94_aux(struct nvkm_i2c_port *base, bool retry, g94_aux(struct nvkm_i2c_port *base, bool retry,
u8 type, u32 addr, u8 *data, u8 size) u8 type, u32 addr, u8 *data, u8 size)
{ {
struct nvkm_i2c *aux = nvkm_i2c(base); struct nvkm_i2c *i2c = nvkm_i2c(base);
struct nvkm_device *device = i2c->subdev.device;
struct nv50_i2c_port *port = (void *)base; struct nv50_i2c_port *port = (void *)base;
u32 ctrl, stat, timeout, retries; u32 ctrl, stat, timeout, retries;
u32 xbuf[4] = {}; u32 xbuf[4] = {};
...@@ -110,11 +115,11 @@ g94_aux(struct nvkm_i2c_port *base, bool retry, ...@@ -110,11 +115,11 @@ g94_aux(struct nvkm_i2c_port *base, bool retry,
AUX_DBG("%d: 0x%08x %d\n", type, addr, size); AUX_DBG("%d: 0x%08x %d\n", type, addr, size);
ret = auxch_init(aux, ch); ret = auxch_init(i2c, ch);
if (ret < 0) if (ret < 0)
goto out; goto out;
stat = nv_rd32(aux, 0x00e4e8 + (ch * 0x50)); stat = nvkm_rd32(device, 0x00e4e8 + (ch * 0x50));
if (!(stat & 0x10000000)) { if (!(stat & 0x10000000)) {
AUX_DBG("sink not detected\n"); AUX_DBG("sink not detected\n");
ret = -ENXIO; ret = -ENXIO;
...@@ -125,30 +130,30 @@ g94_aux(struct nvkm_i2c_port *base, bool retry, ...@@ -125,30 +130,30 @@ g94_aux(struct nvkm_i2c_port *base, bool retry,
memcpy(xbuf, data, size); memcpy(xbuf, data, size);
for (i = 0; i < 16; i += 4) { for (i = 0; i < 16; i += 4) {
AUX_DBG("wr 0x%08x\n", xbuf[i / 4]); AUX_DBG("wr 0x%08x\n", xbuf[i / 4]);
nv_wr32(aux, 0x00e4c0 + (ch * 0x50) + i, xbuf[i / 4]); nvkm_wr32(device, 0x00e4c0 + (ch * 0x50) + i, xbuf[i / 4]);
} }
} }
ctrl = nv_rd32(aux, 0x00e4e4 + (ch * 0x50)); ctrl = nvkm_rd32(device, 0x00e4e4 + (ch * 0x50));
ctrl &= ~0x0001f0ff; ctrl &= ~0x0001f0ff;
ctrl |= type << 12; ctrl |= type << 12;
ctrl |= size - 1; ctrl |= size - 1;
nv_wr32(aux, 0x00e4e0 + (ch * 0x50), addr); nvkm_wr32(device, 0x00e4e0 + (ch * 0x50), addr);
/* (maybe) retry transaction a number of times on failure... */ /* (maybe) retry transaction a number of times on failure... */
for (retries = 0; !ret && retries < 32; retries++) { for (retries = 0; !ret && retries < 32; retries++) {
/* reset, and delay a while if this is a retry */ /* reset, and delay a while if this is a retry */
nv_wr32(aux, 0x00e4e4 + (ch * 0x50), 0x80000000 | ctrl); nvkm_wr32(device, 0x00e4e4 + (ch * 0x50), 0x80000000 | ctrl);
nv_wr32(aux, 0x00e4e4 + (ch * 0x50), 0x00000000 | ctrl); nvkm_wr32(device, 0x00e4e4 + (ch * 0x50), 0x00000000 | ctrl);
if (retries) if (retries)
udelay(400); udelay(400);
/* transaction request, wait up to 1ms for it to complete */ /* transaction request, wait up to 1ms for it to complete */
nv_wr32(aux, 0x00e4e4 + (ch * 0x50), 0x00010000 | ctrl); nvkm_wr32(device, 0x00e4e4 + (ch * 0x50), 0x00010000 | ctrl);
timeout = 1000; timeout = 1000;
do { do {
ctrl = nv_rd32(aux, 0x00e4e4 + (ch * 0x50)); ctrl = nvkm_rd32(device, 0x00e4e4 + (ch * 0x50));
udelay(1); udelay(1);
if (!timeout--) { if (!timeout--) {
AUX_ERR("tx req timeout 0x%08x\n", ctrl); AUX_ERR("tx req timeout 0x%08x\n", ctrl);
...@@ -159,7 +164,7 @@ g94_aux(struct nvkm_i2c_port *base, bool retry, ...@@ -159,7 +164,7 @@ g94_aux(struct nvkm_i2c_port *base, bool retry,
ret = 1; ret = 1;
/* read status, and check if transaction completed ok */ /* read status, and check if transaction completed ok */
stat = nv_mask(aux, 0x00e4e8 + (ch * 0x50), 0, 0); stat = nvkm_mask(device, 0x00e4e8 + (ch * 0x50), 0, 0);
if ((stat & 0x000f0000) == 0x00080000 || if ((stat & 0x000f0000) == 0x00080000 ||
(stat & 0x000f0000) == 0x00020000) (stat & 0x000f0000) == 0x00020000)
ret = retry ? 0 : 1; ret = retry ? 0 : 1;
...@@ -173,14 +178,14 @@ g94_aux(struct nvkm_i2c_port *base, bool retry, ...@@ -173,14 +178,14 @@ g94_aux(struct nvkm_i2c_port *base, bool retry,
if (type & 1) { if (type & 1) {
for (i = 0; i < 16; i += 4) { for (i = 0; i < 16; i += 4) {
xbuf[i / 4] = nv_rd32(aux, 0x00e4d0 + (ch * 0x50) + i); xbuf[i / 4] = nvkm_rd32(device, 0x00e4d0 + (ch * 0x50) + i);
AUX_DBG("rd 0x%08x\n", xbuf[i / 4]); AUX_DBG("rd 0x%08x\n", xbuf[i / 4]);
} }
memcpy(data, xbuf, size); memcpy(data, xbuf, size);
} }
out: out:
auxch_fini(aux, ch); auxch_fini(i2c, ch);
return ret < 0 ? ret : (stat & 0x000f0000) >> 16; return ret < 0 ? ret : (stat & 0x000f0000) >> 16;
} }
......
drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gf110.c
View file @ 6f227499
...@@ -27,16 +27,18 @@ static int ...@@ -27,16 +27,18 @@ static int
gf110_i2c_sense_scl(struct nvkm_i2c_port *base) gf110_i2c_sense_scl(struct nvkm_i2c_port *base)
{ {
struct nvkm_i2c *i2c = (void *)nvkm_i2c(base); struct nvkm_i2c *i2c = (void *)nvkm_i2c(base);
struct nvkm_device *device = i2c->subdev.device;
struct nv50_i2c_port *port = (void *)base; struct nv50_i2c_port *port = (void *)base;
return !!(nv_rd32(i2c, port->addr) & 0x00000010); return !!(nvkm_rd32(device, port->addr) & 0x00000010);
} }
static int static int
gf110_i2c_sense_sda(struct nvkm_i2c_port *base) gf110_i2c_sense_sda(struct nvkm_i2c_port *base)
{ {
struct nvkm_i2c *i2c = (void *)nvkm_i2c(base); struct nvkm_i2c *i2c = (void *)nvkm_i2c(base);
struct nvkm_device *device = i2c->subdev.device;
struct nv50_i2c_port *port = (void *)base; struct nv50_i2c_port *port = (void *)base;
return !!(nv_rd32(i2c, port->addr) & 0x00000020); return !!(nvkm_rd32(device, port->addr) & 0x00000020);
} }
static const struct nvkm_i2c_func static const struct nvkm_i2c_func
......
drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gk104.c
View file @ 6f227499
...@@ -26,21 +26,23 @@ ...@@ -26,21 +26,23 @@
void void
gk104_aux_stat(struct nvkm_i2c *i2c, u32 *hi, u32 *lo, u32 *rq, u32 *tx) gk104_aux_stat(struct nvkm_i2c *i2c, u32 *hi, u32 *lo, u32 *rq, u32 *tx)
{ {
u32 intr = nv_rd32(i2c, 0x00dc60); struct nvkm_device *device = i2c->subdev.device;
u32 stat = nv_rd32(i2c, 0x00dc68) & intr, i; u32 intr = nvkm_rd32(device, 0x00dc60);
u32 stat = nvkm_rd32(device, 0x00dc68) & intr, i;
for (i = 0, *hi = *lo = *rq = *tx = 0; i < 8; i++) { for (i = 0, *hi = *lo = *rq = *tx = 0; i < 8; i++) {
if ((stat & (1 << (i * 4)))) *hi |= 1 << i; if ((stat & (1 << (i * 4)))) *hi |= 1 << i;
if ((stat & (2 << (i * 4)))) *lo |= 1 << i; if ((stat & (2 << (i * 4)))) *lo |= 1 << i;
if ((stat & (4 << (i * 4)))) *rq |= 1 << i; if ((stat & (4 << (i * 4)))) *rq |= 1 << i;
if ((stat & (8 << (i * 4)))) *tx |= 1 << i; if ((stat & (8 << (i * 4)))) *tx |= 1 << i;
} }
nv_wr32(i2c, 0x00dc60, intr); nvkm_wr32(device, 0x00dc60, intr);
} }
void void
gk104_aux_mask(struct nvkm_i2c *i2c, u32 type, u32 mask, u32 data) gk104_aux_mask(struct nvkm_i2c *i2c, u32 type, u32 mask, u32 data)
{ {
u32 temp = nv_rd32(i2c, 0x00dc68), i; struct nvkm_device *device = i2c->subdev.device;
u32 temp = nvkm_rd32(device, 0x00dc68), i;
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
if (mask & (1 << i)) { if (mask & (1 << i)) {
if (!(data & (1 << i))) { if (!(data & (1 << i))) {
...@@ -50,7 +52,7 @@ gk104_aux_mask(struct nvkm_i2c *i2c, u32 type, u32 mask, u32 data) ...@@ -50,7 +52,7 @@ gk104_aux_mask(struct nvkm_i2c *i2c, u32 type, u32 mask, u32 data)
temp |= type << (i * 4); temp |= type << (i * 4);
} }
} }
nv_wr32(i2c, 0x00dc68, temp); nvkm_wr32(device, 0x00dc68, temp);
} }
struct nvkm_oclass * struct nvkm_oclass *
......
drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gm204.c
View file @ 6f227499
...@@ -23,18 +23,20 @@ ...@@ -23,18 +23,20 @@
*/ */
#include "nv50.h" #include "nv50.h"
#define AUX_DBG(fmt, args...) nv_debug(aux, "AUXCH(%d): " fmt, ch, ##args) #define AUX_DBG(fmt, args...) nv_debug(i2c, "AUXCH(%d): " fmt, ch, ##args)
#define AUX_ERR(fmt, args...) nv_error(aux, "AUXCH(%d): " fmt, ch, ##args) #define AUX_ERR(fmt, args...) nv_error(i2c, "AUXCH(%d): " fmt, ch, ##args)
static void static void
auxch_fini(struct nvkm_i2c *aux, int ch) auxch_fini(struct nvkm_i2c *i2c, int ch)
{ {
nv_mask(aux, 0x00d954 + (ch * 0x50), 0x00310000, 0x00000000); struct nvkm_device *device = i2c->subdev.device;
nvkm_mask(device, 0x00d954 + (ch * 0x50), 0x00310000, 0x00000000);
} }
static int static int
auxch_init(struct nvkm_i2c *aux, int ch) auxch_init(struct nvkm_i2c *i2c, int ch)
{ {
struct nvkm_device *device = i2c->subdev.device;
const u32 unksel = 1; /* nfi which to use, or if it matters.. */ const u32 unksel = 1; /* nfi which to use, or if it matters.. */
const u32 ureq = unksel ? 0x00100000 : 0x00200000; const u32 ureq = unksel ? 0x00100000 : 0x00200000;
const u32 urep = unksel ? 0x01000000 : 0x02000000; const u32 urep = unksel ? 0x01000000 : 0x02000000;
...@@ -43,7 +45,7 @@ auxch_init(struct nvkm_i2c *aux, int ch) ...@@ -43,7 +45,7 @@ auxch_init(struct nvkm_i2c *aux, int ch)
/* wait up to 1ms for any previous transaction to be done... */ /* wait up to 1ms for any previous transaction to be done... */
timeout = 1000; timeout = 1000;
do { do {
ctrl = nv_rd32(aux, 0x00d954 + (ch * 0x50)); ctrl = nvkm_rd32(device, 0x00d954 + (ch * 0x50));
udelay(1); udelay(1);
if (!timeout--) { if (!timeout--) {
AUX_ERR("begin idle timeout 0x%08x\n", ctrl); AUX_ERR("begin idle timeout 0x%08x\n", ctrl);
...@@ -52,14 +54,14 @@ auxch_init(struct nvkm_i2c *aux, int ch) ...@@ -52,14 +54,14 @@ auxch_init(struct nvkm_i2c *aux, int ch)
} while (ctrl & 0x03010000); } while (ctrl & 0x03010000);
/* set some magic, and wait up to 1ms for it to appear */ /* set some magic, and wait up to 1ms for it to appear */
nv_mask(aux, 0x00d954 + (ch * 0x50), 0x00300000, ureq); nvkm_mask(device, 0x00d954 + (ch * 0x50), 0x00300000, ureq);
timeout = 1000; timeout = 1000;
do { do {
ctrl = nv_rd32(aux, 0x00d954 + (ch * 0x50)); ctrl = nvkm_rd32(device, 0x00d954 + (ch * 0x50));
udelay(1); udelay(1);
if (!timeout--) { if (!timeout--) {
AUX_ERR("magic wait 0x%08x\n", ctrl); AUX_ERR("magic wait 0x%08x\n", ctrl);
auxch_fini(aux, ch); auxch_fini(i2c, ch);
return -EBUSY; return -EBUSY;
} }
} while ((ctrl & 0x03000000) != urep); } while ((ctrl & 0x03000000) != urep);
...@@ -71,7 +73,8 @@ int ...@@ -71,7 +73,8 @@ int
gm204_aux(struct nvkm_i2c_port *base, bool retry, gm204_aux(struct nvkm_i2c_port *base, bool retry,
u8 type, u32 addr, u8 *data, u8 size) u8 type, u32 addr, u8 *data, u8 size)
{ {
struct nvkm_i2c *aux = nvkm_i2c(base); struct nvkm_i2c *i2c = nvkm_i2c(base);
struct nvkm_device *device = i2c->subdev.device;
struct nv50_i2c_port *port = (void *)base; struct nv50_i2c_port *port = (void *)base;
u32 ctrl, stat, timeout, retries; u32 ctrl, stat, timeout, retries;
u32 xbuf[4] = {}; u32 xbuf[4] = {};
...@@ -80,11 +83,11 @@ gm204_aux(struct nvkm_i2c_port *base, bool retry, ...@@ -80,11 +83,11 @@ gm204_aux(struct nvkm_i2c_port *base, bool retry,
AUX_DBG("%d: 0x%08x %d\n", type, addr, size); AUX_DBG("%d: 0x%08x %d\n", type, addr, size);
ret = auxch_init(aux, ch); ret = auxch_init(i2c, ch);
if (ret < 0) if (ret < 0)
goto out; goto out;
stat = nv_rd32(aux, 0x00d958 + (ch * 0x50)); stat = nvkm_rd32(device, 0x00d958 + (ch * 0x50));
if (!(stat & 0x10000000)) { if (!(stat & 0x10000000)) {
AUX_DBG("sink not detected\n"); AUX_DBG("sink not detected\n");
ret = -ENXIO; ret = -ENXIO;
...@@ -95,30 +98,30 @@ gm204_aux(struct nvkm_i2c_port *base, bool retry, ...@@ -95,30 +98,30 @@ gm204_aux(struct nvkm_i2c_port *base, bool retry,
memcpy(xbuf, data, size); memcpy(xbuf, data, size);
for (i = 0; i < 16; i += 4) { for (i = 0; i < 16; i += 4) {
AUX_DBG("wr 0x%08x\n", xbuf[i / 4]); AUX_DBG("wr 0x%08x\n", xbuf[i / 4]);
nv_wr32(aux, 0x00d930 + (ch * 0x50) + i, xbuf[i / 4]); nvkm_wr32(device, 0x00d930 + (ch * 0x50) + i, xbuf[i / 4]);
} }
} }
ctrl = nv_rd32(aux, 0x00d954 + (ch * 0x50)); ctrl = nvkm_rd32(device, 0x00d954 + (ch * 0x50));
ctrl &= ~0x0001f0ff; ctrl &= ~0x0001f0ff;
ctrl |= type << 12; ctrl |= type << 12;
ctrl |= size - 1; ctrl |= size - 1;
nv_wr32(aux, 0x00d950 + (ch * 0x50), addr); nvkm_wr32(device, 0x00d950 + (ch * 0x50), addr);
/* (maybe) retry transaction a number of times on failure... */ /* (maybe) retry transaction a number of times on failure... */
for (retries = 0; !ret && retries < 32; retries++) { for (retries = 0; !ret && retries < 32; retries++) {
/* reset, and delay a while if this is a retry */ /* reset, and delay a while if this is a retry */
nv_wr32(aux, 0x00d954 + (ch * 0x50), 0x80000000 | ctrl); nvkm_wr32(device, 0x00d954 + (ch * 0x50), 0x80000000 | ctrl);
nv_wr32(aux, 0x00d954 + (ch * 0x50), 0x00000000 | ctrl); nvkm_wr32(device, 0x00d954 + (ch * 0x50), 0x00000000 | ctrl);
if (retries) if (retries)
udelay(400); udelay(400);
/* transaction request, wait up to 1ms for it to complete */ /* transaction request, wait up to 1ms for it to complete */
nv_wr32(aux, 0x00d954 + (ch * 0x50), 0x00010000 | ctrl); nvkm_wr32(device, 0x00d954 + (ch * 0x50), 0x00010000 | ctrl);
timeout = 1000; timeout = 1000;
do { do {
ctrl = nv_rd32(aux, 0x00d954 + (ch * 0x50)); ctrl = nvkm_rd32(device, 0x00d954 + (ch * 0x50));
udelay(1); udelay(1);
if (!timeout--) { if (!timeout--) {
AUX_ERR("tx req timeout 0x%08x\n", ctrl); AUX_ERR("tx req timeout 0x%08x\n", ctrl);
...@@ -129,7 +132,7 @@ gm204_aux(struct nvkm_i2c_port *base, bool retry, ...@@ -129,7 +132,7 @@ gm204_aux(struct nvkm_i2c_port *base, bool retry,
ret = 1; ret = 1;
/* read status, and check if transaction completed ok */ /* read status, and check if transaction completed ok */
stat = nv_mask(aux, 0x00d958 + (ch * 0x50), 0, 0); stat = nvkm_mask(device, 0x00d958 + (ch * 0x50), 0, 0);
if ((stat & 0x000f0000) == 0x00080000 || if ((stat & 0x000f0000) == 0x00080000 ||
(stat & 0x000f0000) == 0x00020000) (stat & 0x000f0000) == 0x00020000)
ret = retry ? 0 : 1; ret = retry ? 0 : 1;
...@@ -143,14 +146,14 @@ gm204_aux(struct nvkm_i2c_port *base, bool retry, ...@@ -143,14 +146,14 @@ gm204_aux(struct nvkm_i2c_port *base, bool retry,
if (type & 1) { if (type & 1) {
for (i = 0; i < 16; i += 4) { for (i = 0; i < 16; i += 4) {
xbuf[i / 4] = nv_rd32(aux, 0x00d940 + (ch * 0x50) + i); xbuf[i / 4] = nvkm_rd32(device, 0x00d940 + (ch * 0x50) + i);
AUX_DBG("rd 0x%08x\n", xbuf[i / 4]); AUX_DBG("rd 0x%08x\n", xbuf[i / 4]);
} }
memcpy(data, xbuf, size); memcpy(data, xbuf, size);
} }
out: out:
auxch_fini(aux, ch); auxch_fini(i2c, ch);
return ret < 0 ? ret : (stat & 0x000f0000) >> 16; return ret < 0 ? ret : (stat & 0x000f0000) >> 16;
} }
......
drivers/gpu/drm/nouveau/nvkm/subdev/i2c/nv4e.c
View file @ 6f227499
...@@ -34,32 +34,36 @@ static void ...@@ -34,32 +34,36 @@ static void
nv4e_i2c_drive_scl(struct nvkm_i2c_port *base, int state) nv4e_i2c_drive_scl(struct nvkm_i2c_port *base, int state)
{ {
struct nvkm_i2c *i2c = (void *)nvkm_i2c(base); struct nvkm_i2c *i2c = (void *)nvkm_i2c(base);
struct nvkm_device *device = i2c->subdev.device;
struct nv4e_i2c_port *port = (void *)base; struct nv4e_i2c_port *port = (void *)base;
nv_mask(i2c, port->addr, 0x2f, state ? 0x21 : 0x01); nvkm_mask(device, port->addr, 0x2f, state ? 0x21 : 0x01);
} }
static void static void
nv4e_i2c_drive_sda(struct nvkm_i2c_port *base, int state) nv4e_i2c_drive_sda(struct nvkm_i2c_port *base, int state)
{ {
struct nvkm_i2c *i2c = (void *)nvkm_i2c(base); struct nvkm_i2c *i2c = (void *)nvkm_i2c(base);
struct nvkm_device *device = i2c->subdev.device;
struct nv4e_i2c_port *port = (void *)base; struct nv4e_i2c_port *port = (void *)base;
nv_mask(i2c, port->addr, 0x1f, state ? 0x11 : 0x01); nvkm_mask(device, port->addr, 0x1f, state ? 0x11 : 0x01);
} }
static int static int
nv4e_i2c_sense_scl(struct nvkm_i2c_port *base) nv4e_i2c_sense_scl(struct nvkm_i2c_port *base)
{ {
struct nvkm_i2c *i2c = (void *)nvkm_i2c(base); struct nvkm_i2c *i2c = (void *)nvkm_i2c(base);
struct nvkm_device *device = i2c->subdev.device;
struct nv4e_i2c_port *port = (void *)base; struct nv4e_i2c_port *port = (void *)base;
return !!(nv_rd32(i2c, port->addr) & 0x00040000); return !!(nvkm_rd32(device, port->addr) & 0x00040000);
} }
static int static int
nv4e_i2c_sense_sda(struct nvkm_i2c_port *base) nv4e_i2c_sense_sda(struct nvkm_i2c_port *base)
{ {
struct nvkm_i2c *i2c = (void *)nvkm_i2c(base); struct nvkm_i2c *i2c = (void *)nvkm_i2c(base);
struct nvkm_device *device = i2c->subdev.device;
struct nv4e_i2c_port *port = (void *)base; struct nv4e_i2c_port *port = (void *)base;
return !!(nv_rd32(i2c, port->addr) & 0x00080000); return !!(nvkm_rd32(device, port->addr) & 0x00080000);
} }
static const struct nvkm_i2c_func static const struct nvkm_i2c_func
......
drivers/gpu/drm/nouveau/nvkm/subdev/i2c/nv50.c
View file @ 6f227499
...@@ -27,36 +27,40 @@ void ...@@ -27,36 +27,40 @@ void
nv50_i2c_drive_scl(struct nvkm_i2c_port *base, int state) nv50_i2c_drive_scl(struct nvkm_i2c_port *base, int state)
{ {
struct nvkm_i2c *i2c = (void *)nvkm_i2c(base); struct nvkm_i2c *i2c = (void *)nvkm_i2c(base);
struct nvkm_device *device = i2c->subdev.device;
struct nv50_i2c_port *port = (void *)base; struct nv50_i2c_port *port = (void *)base;
if (state) port->state |= 0x01; if (state) port->state |= 0x01;
else port->state &= 0xfe; else port->state &= 0xfe;
nv_wr32(i2c, port->addr, port->state); nvkm_wr32(device, port->addr, port->state);
} }
void void
nv50_i2c_drive_sda(struct nvkm_i2c_port *base, int state) nv50_i2c_drive_sda(struct nvkm_i2c_port *base, int state)
{ {
struct nvkm_i2c *i2c = (void *)nvkm_i2c(base); struct nvkm_i2c *i2c = (void *)nvkm_i2c(base);
struct nvkm_device *device = i2c->subdev.device;
struct nv50_i2c_port *port = (void *)base; struct nv50_i2c_port *port = (void *)base;
if (state) port->state |= 0x02; if (state) port->state |= 0x02;
else port->state &= 0xfd; else port->state &= 0xfd;
nv_wr32(i2c, port->addr, port->state); nvkm_wr32(device, port->addr, port->state);
} }
int int
nv50_i2c_sense_scl(struct nvkm_i2c_port *base) nv50_i2c_sense_scl(struct nvkm_i2c_port *base)
{ {
struct nvkm_i2c *i2c = (void *)nvkm_i2c(base); struct nvkm_i2c *i2c = (void *)nvkm_i2c(base);
struct nvkm_device *device = i2c->subdev.device;
struct nv50_i2c_port *port = (void *)base; struct nv50_i2c_port *port = (void *)base;
return !!(nv_rd32(i2c, port->addr) & 0x00000001); return !!(nvkm_rd32(device, port->addr) & 0x00000001);
} }
int int
nv50_i2c_sense_sda(struct nvkm_i2c_port *base) nv50_i2c_sense_sda(struct nvkm_i2c_port *base)
{ {
struct nvkm_i2c *i2c = (void *)nvkm_i2c(base); struct nvkm_i2c *i2c = (void *)nvkm_i2c(base);
struct nvkm_device *device = i2c->subdev.device;
struct nv50_i2c_port *port = (void *)base; struct nv50_i2c_port *port = (void *)base;
return !!(nv_rd32(i2c, port->addr) & 0x00000002); return !!(nvkm_rd32(device, port->addr) & 0x00000002);
} }
static const struct nvkm_i2c_func static const struct nvkm_i2c_func
...@@ -101,8 +105,9 @@ int ...@@ -101,8 +105,9 @@ int
nv50_i2c_port_init(struct nvkm_object *object) nv50_i2c_port_init(struct nvkm_object *object)
{ {
struct nvkm_i2c *i2c = (void *)nvkm_i2c(object); struct nvkm_i2c *i2c = (void *)nvkm_i2c(object);
struct nvkm_device *device = i2c->subdev.device;
struct nv50_i2c_port *port = (void *)object; struct nv50_i2c_port *port = (void *)object;
nv_wr32(i2c, port->addr, port->state); nvkm_wr32(device, port->addr, port->state);
return nvkm_i2c_port_init(&port->base); return nvkm_i2c_port_init(&port->base);
} }
......
drivers/gpu/drm/nouveau/nvkm/subdev/i2c/padg94.c
View file @ 6f227499
...@@ -32,8 +32,9 @@ static int ...@@ -32,8 +32,9 @@ static int
g94_i2c_pad_fini(struct nvkm_object *object, bool suspend) g94_i2c_pad_fini(struct nvkm_object *object, bool suspend)
{ {
struct nvkm_i2c *i2c = (void *)nvkm_i2c(object); struct nvkm_i2c *i2c = (void *)nvkm_i2c(object);
struct nvkm_device *device = i2c->subdev.device;
struct g94_i2c_pad *pad = (void *)object; struct g94_i2c_pad *pad = (void *)object;
nv_mask(i2c, 0x00e50c + pad->addr, 0x00000001, 0x00000001); nvkm_mask(device, 0x00e50c + pad->addr, 0x00000001, 0x00000001);
return nvkm_i2c_pad_fini(&pad->base, suspend); return nvkm_i2c_pad_fini(&pad->base, suspend);
} }
...@@ -41,19 +42,20 @@ static int ...@@ -41,19 +42,20 @@ static int
g94_i2c_pad_init(struct nvkm_object *object) g94_i2c_pad_init(struct nvkm_object *object)
{ {
struct nvkm_i2c *i2c = (void *)nvkm_i2c(object); struct nvkm_i2c *i2c = (void *)nvkm_i2c(object);
struct nvkm_device *device = i2c->subdev.device;
struct g94_i2c_pad *pad = (void *)object; struct g94_i2c_pad *pad = (void *)object;
switch (nv_oclass(pad->base.next)->handle) { switch (nv_oclass(pad->base.next)->handle) {
case NV_I2C_TYPE_DCBI2C(DCB_I2C_NVIO_AUX): case NV_I2C_TYPE_DCBI2C(DCB_I2C_NVIO_AUX):
nv_mask(i2c, 0x00e500 + pad->addr, 0x0000c003, 0x00000002); nvkm_mask(device, 0x00e500 + pad->addr, 0x0000c003, 0x00000002);
break; break;
case NV_I2C_TYPE_DCBI2C(DCB_I2C_NVIO_BIT): case NV_I2C_TYPE_DCBI2C(DCB_I2C_NVIO_BIT):
default: default:
nv_mask(i2c, 0x00e500 + pad->addr, 0x0000c003, 0x0000c001); nvkm_mask(device, 0x00e500 + pad->addr, 0x0000c003, 0x0000c001);
break; break;
} }
nv_mask(i2c, 0x00e50c + pad->addr, 0x00000001, 0x00000000); nvkm_mask(device, 0x00e50c + pad->addr, 0x00000001, 0x00000000);
return nvkm_i2c_pad_init(&pad->base); return nvkm_i2c_pad_init(&pad->base);
} }
......
drivers/gpu/drm/nouveau/nvkm/subdev/i2c/padgm204.c
View file @ 6f227499
...@@ -32,8 +32,9 @@ static int ...@@ -32,8 +32,9 @@ static int
gm204_i2c_pad_fini(struct nvkm_object *object, bool suspend) gm204_i2c_pad_fini(struct nvkm_object *object, bool suspend)
{ {
struct nvkm_i2c *i2c = (void *)nvkm_i2c(object); struct nvkm_i2c *i2c = (void *)nvkm_i2c(object);
struct nvkm_device *device = i2c->subdev.device;
struct gm204_i2c_pad *pad = (void *)object; struct gm204_i2c_pad *pad = (void *)object;
nv_mask(i2c, 0x00d97c + pad->addr, 0x00000001, 0x00000001); nvkm_mask(device, 0x00d97c + pad->addr, 0x00000001, 0x00000001);
return nvkm_i2c_pad_fini(&pad->base, suspend); return nvkm_i2c_pad_fini(&pad->base, suspend);
} }
...@@ -41,19 +42,20 @@ static int ...@@ -41,19 +42,20 @@ static int
gm204_i2c_pad_init(struct nvkm_object *object) gm204_i2c_pad_init(struct nvkm_object *object)
{ {
struct nvkm_i2c *i2c = (void *)nvkm_i2c(object); struct nvkm_i2c *i2c = (void *)nvkm_i2c(object);
struct nvkm_device *device = i2c->subdev.device;
struct gm204_i2c_pad *pad = (void *)object; struct gm204_i2c_pad *pad = (void *)object;
switch (nv_oclass(pad->base.next)->handle) { switch (nv_oclass(pad->base.next)->handle) {
case NV_I2C_TYPE_DCBI2C(DCB_I2C_NVIO_AUX): case NV_I2C_TYPE_DCBI2C(DCB_I2C_NVIO_AUX):
nv_mask(i2c, 0x00d970 + pad->addr, 0x0000c003, 0x00000002); nvkm_mask(device, 0x00d970 + pad->addr, 0x0000c003, 0x00000002);
break; break;
case NV_I2C_TYPE_DCBI2C(DCB_I2C_NVIO_BIT): case NV_I2C_TYPE_DCBI2C(DCB_I2C_NVIO_BIT):
default: default:
nv_mask(i2c, 0x00d970 + pad->addr, 0x0000c003, 0x0000c001); nvkm_mask(device, 0x00d970 + pad->addr, 0x0000c003, 0x0000c001);
break; break;
} }
nv_mask(i2c, 0x00d97c + pad->addr, 0x00000001, 0x00000000); nvkm_mask(device, 0x00d97c + pad->addr, 0x00000001, 0x00000000);
return nvkm_i2c_pad_init(&pad->base); return nvkm_i2c_pad_init(&pad->base);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7