From mboxrd@z Thu Jan 1 00:00:00 1970 From: moinejf@free.fr (Jean-Francois Moine) Date: Thu, 9 Jan 2014 11:57:45 +0100 Subject: [PATCH v2 2/28] drm/i2c: tda998x: check more I/O errors Message-ID: <20140109115745.5f81523e@armhf> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Signed-off-by: Jean-Francois Moine --- drivers/gpu/drm/i2c/tda998x_drv.c | 45 ++++++++++++++++------ 1 file changed, 33 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c index 26dd299..603f716 100644 --- a/drivers/gpu/drm/i2c/tda998x_drv.c +++ b/drivers/gpu/drm/i2c/tda998x_drv.c @@ -362,7 +362,7 @@ fail: return 0; } -static void +static int set_page(struct tda998x_priv *priv, uint16_t reg) { if (REG2PAGE(reg) != priv->current_page) { @@ -371,11 +371,14 @@ set_page(struct tda998x_priv *priv, uint16_t reg) REG_CURPAGE, REG2PAGE(reg) }; int ret = i2c_master_send(client, buf, sizeof(buf)); - if (ret < 0) + if (ret < 0) { dev_err(&client->dev, "Error %d writing to REG_CURPAGE\n", ret); + return ret; + } priv->current_page = REG2PAGE(reg); } + return 0; } static int @@ -385,7 +388,9 @@ reg_read_range(struct tda998x_priv *priv, uint16_t reg, char *buf, int cnt) uint8_t addr = REG2ADDR(reg); int ret; - set_page(priv, reg); + ret = set_page(priv, reg); + if (ret < 0) + return ret; ret = i2c_master_send(client, &addr, sizeof(addr)); if (ret < 0) @@ -412,18 +417,24 @@ reg_write_range(struct tda998x_priv *priv, uint16_t reg, uint8_t *p, int cnt) buf[0] = REG2ADDR(reg); memcpy(&buf[1], p, cnt); - set_page(priv, reg); + ret = set_page(priv, reg); + if (ret < 0) + return; ret = i2c_master_send(client, buf, cnt + 1); if (ret < 0) dev_err(&client->dev, "Error %d writing to 0x%x\n", ret, reg); } -static uint8_t +static int reg_read(struct tda998x_priv *priv, uint16_t reg) { uint8_t val = 0; - reg_read_range(priv, reg, &val, sizeof(val)); + int ret; + + ret = reg_read_range(priv, reg, &val, sizeof(val)); + if (ret < 0) + return ret; return val; } @@ -434,7 +445,9 @@ reg_write(struct tda998x_priv *priv, uint16_t reg, uint8_t val) uint8_t buf[] = {REG2ADDR(reg), val}; int ret; - set_page(priv, reg); + ret = set_page(priv, reg); + if (ret < 0) + return; ret = i2c_master_send(client, buf, ARRAY_SIZE(buf)); if (ret < 0) @@ -448,7 +461,9 @@ reg_write16(struct tda998x_priv *priv, uint16_t reg, uint16_t val) uint8_t buf[] = {REG2ADDR(reg), val >> 8, val}; int ret; - set_page(priv, reg); + ret = set_page(priv, reg); + if (ret < 0) + return; ret = i2c_master_send(client, buf, ARRAY_SIZE(buf)); if (ret < 0) @@ -970,8 +985,10 @@ read_edid_block(struct drm_encoder *encoder, uint8_t *buf, int blk) /* wait for block read to complete: */ for (i = 100; i > 0; i--) { - uint8_t val = reg_read(priv, REG_INT_FLAGS_2); - if (val & INT_FLAGS_2_EDID_BLK_RD) + ret = reg_read(priv, REG_INT_FLAGS_2); + if (ret < 0) + return ret; + if (ret & INT_FLAGS_2_EDID_BLK_RD) break; msleep(1); } @@ -1134,6 +1151,7 @@ tda998x_encoder_init(struct i2c_client *client, struct drm_encoder_slave *encoder_slave) { struct tda998x_priv *priv; + int ret; priv = kzalloc(sizeof(*priv), GFP_KERNEL); if (!priv) @@ -1158,8 +1176,11 @@ tda998x_encoder_init(struct i2c_client *client, tda998x_reset(priv); /* read version: */ - priv->rev = reg_read(priv, REG_VERSION_LSB) | - reg_read(priv, REG_VERSION_MSB) << 8; + ret = reg_read(priv, REG_VERSION_LSB) | + (reg_read(priv, REG_VERSION_MSB) << 8); + if (ret < 0) + goto fail; + priv->rev = ret; /* mask off feature bits: */ priv->rev &= ~0x30; /* not-hdcp and not-scalar bit */ -- Ken ar c'henta? | ** Breizh ha Linux atav! ** Jef | http://moinejf.free.fr/ From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jean-Francois Moine Subject: [PATCH v2 2/28] drm/i2c: tda998x: check more I/O errors Date: Thu, 9 Jan 2014 11:57:45 +0100 Message-ID: <20140109115745.5f81523e@armhf> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from smtp1-g21.free.fr (smtp1-g21.free.fr [212.27.42.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 601EBFBCBF for ; Thu, 9 Jan 2014 03:09:16 -0800 (PST) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org To: dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org List-Id: dri-devel@lists.freedesktop.org ClNpZ25lZC1vZmYtYnk6IEplYW4tRnJhbmNvaXMgTW9pbmUgPG1vaW5lamZAZnJlZS5mcj4KLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTJjL3RkYTk5OHhfZHJ2LmMgfCA0NSArKysrKysrKysrKysrKysr LS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMzMgaW5zZXJ0aW9ucygrKSwgMTIgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2kyYy90ZGE5OTh4X2Rydi5jIGIvZHJpdmVy cy9ncHUvZHJtL2kyYy90ZGE5OTh4X2Rydi5jCmluZGV4IDI2ZGQyOTkuLjYwM2Y3MTYgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pMmMvdGRhOTk4eF9kcnYuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTJjL3RkYTk5OHhfZHJ2LmMKQEAgLTM2Miw3ICszNjIsNyBAQCBmYWlsOgogCXJldHVy biAwOwogfQogCi1zdGF0aWMgdm9pZAorc3RhdGljIGludAogc2V0X3BhZ2Uoc3RydWN0IHRkYTk5 OHhfcHJpdiAqcHJpdiwgdWludDE2X3QgcmVnKQogewogCWlmIChSRUcyUEFHRShyZWcpICE9IHBy aXYtPmN1cnJlbnRfcGFnZSkgewpAQCAtMzcxLDExICszNzEsMTQgQEAgc2V0X3BhZ2Uoc3RydWN0 IHRkYTk5OHhfcHJpdiAqcHJpdiwgdWludDE2X3QgcmVnKQogCQkJCVJFR19DVVJQQUdFLCBSRUcy UEFHRShyZWcpCiAJCX07CiAJCWludCByZXQgPSBpMmNfbWFzdGVyX3NlbmQoY2xpZW50LCBidWYs IHNpemVvZihidWYpKTsKLQkJaWYgKHJldCA8IDApCisJCWlmIChyZXQgPCAwKSB7CiAJCQlkZXZf ZXJyKCZjbGllbnQtPmRldiwgIkVycm9yICVkIHdyaXRpbmcgdG8gUkVHX0NVUlBBR0VcbiIsIHJl dCk7CisJCQlyZXR1cm4gcmV0OworCQl9CiAKIAkJcHJpdi0+Y3VycmVudF9wYWdlID0gUkVHMlBB R0UocmVnKTsKIAl9CisJcmV0dXJuIDA7CiB9CiAKIHN0YXRpYyBpbnQKQEAgLTM4NSw3ICszODgs OSBAQCByZWdfcmVhZF9yYW5nZShzdHJ1Y3QgdGRhOTk4eF9wcml2ICpwcml2LCB1aW50MTZfdCBy ZWcsIGNoYXIgKmJ1ZiwgaW50IGNudCkKIAl1aW50OF90IGFkZHIgPSBSRUcyQUREUihyZWcpOwog CWludCByZXQ7CiAKLQlzZXRfcGFnZShwcml2LCByZWcpOworCXJldCA9IHNldF9wYWdlKHByaXYs IHJlZyk7CisJaWYgKHJldCA8IDApCisJCXJldHVybiByZXQ7CiAKIAlyZXQgPSBpMmNfbWFzdGVy X3NlbmQoY2xpZW50LCAmYWRkciwgc2l6ZW9mKGFkZHIpKTsKIAlpZiAocmV0IDwgMCkKQEAgLTQx MiwxOCArNDE3LDI0IEBAIHJlZ193cml0ZV9yYW5nZShzdHJ1Y3QgdGRhOTk4eF9wcml2ICpwcml2 LCB1aW50MTZfdCByZWcsIHVpbnQ4X3QgKnAsIGludCBjbnQpCiAJYnVmWzBdID0gUkVHMkFERFIo cmVnKTsKIAltZW1jcHkoJmJ1ZlsxXSwgcCwgY250KTsKIAotCXNldF9wYWdlKHByaXYsIHJlZyk7 CisJcmV0ID0gc2V0X3BhZ2UocHJpdiwgcmVnKTsKKwlpZiAocmV0IDwgMCkKKwkJcmV0dXJuOwog CiAJcmV0ID0gaTJjX21hc3Rlcl9zZW5kKGNsaWVudCwgYnVmLCBjbnQgKyAxKTsKIAlpZiAocmV0 IDwgMCkKIAkJZGV2X2VycigmY2xpZW50LT5kZXYsICJFcnJvciAlZCB3cml0aW5nIHRvIDB4JXhc biIsIHJldCwgcmVnKTsKIH0KIAotc3RhdGljIHVpbnQ4X3QKK3N0YXRpYyBpbnQKIHJlZ19yZWFk KHN0cnVjdCB0ZGE5OTh4X3ByaXYgKnByaXYsIHVpbnQxNl90IHJlZykKIHsKIAl1aW50OF90IHZh bCA9IDA7Ci0JcmVnX3JlYWRfcmFuZ2UocHJpdiwgcmVnLCAmdmFsLCBzaXplb2YodmFsKSk7CisJ aW50IHJldDsKKworCXJldCA9IHJlZ19yZWFkX3JhbmdlKHByaXYsIHJlZywgJnZhbCwgc2l6ZW9m KHZhbCkpOworCWlmIChyZXQgPCAwKQorCQlyZXR1cm4gcmV0OwogCXJldHVybiB2YWw7CiB9CiAK QEAgLTQzNCw3ICs0NDUsOSBAQCByZWdfd3JpdGUoc3RydWN0IHRkYTk5OHhfcHJpdiAqcHJpdiwg dWludDE2X3QgcmVnLCB1aW50OF90IHZhbCkKIAl1aW50OF90IGJ1ZltdID0ge1JFRzJBRERSKHJl ZyksIHZhbH07CiAJaW50IHJldDsKIAotCXNldF9wYWdlKHByaXYsIHJlZyk7CisJcmV0ID0gc2V0 X3BhZ2UocHJpdiwgcmVnKTsKKwlpZiAocmV0IDwgMCkKKwkJcmV0dXJuOwogCiAJcmV0ID0gaTJj X21hc3Rlcl9zZW5kKGNsaWVudCwgYnVmLCBBUlJBWV9TSVpFKGJ1ZikpOwogCWlmIChyZXQgPCAw KQpAQCAtNDQ4LDcgKzQ2MSw5IEBAIHJlZ193cml0ZTE2KHN0cnVjdCB0ZGE5OTh4X3ByaXYgKnBy aXYsIHVpbnQxNl90IHJlZywgdWludDE2X3QgdmFsKQogCXVpbnQ4X3QgYnVmW10gPSB7UkVHMkFE RFIocmVnKSwgdmFsID4+IDgsIHZhbH07CiAJaW50IHJldDsKIAotCXNldF9wYWdlKHByaXYsIHJl Zyk7CisJcmV0ID0gc2V0X3BhZ2UocHJpdiwgcmVnKTsKKwlpZiAocmV0IDwgMCkKKwkJcmV0dXJu OwogCiAJcmV0ID0gaTJjX21hc3Rlcl9zZW5kKGNsaWVudCwgYnVmLCBBUlJBWV9TSVpFKGJ1Zikp OwogCWlmIChyZXQgPCAwKQpAQCAtOTcwLDggKzk4NSwxMCBAQCByZWFkX2VkaWRfYmxvY2soc3Ry dWN0IGRybV9lbmNvZGVyICplbmNvZGVyLCB1aW50OF90ICpidWYsIGludCBibGspCiAKIAkvKiB3 YWl0IGZvciBibG9jayByZWFkIHRvIGNvbXBsZXRlOiAqLwogCWZvciAoaSA9IDEwMDsgaSA+IDA7 IGktLSkgewotCQl1aW50OF90IHZhbCA9IHJlZ19yZWFkKHByaXYsIFJFR19JTlRfRkxBR1NfMik7 Ci0JCWlmICh2YWwgJiBJTlRfRkxBR1NfMl9FRElEX0JMS19SRCkKKwkJcmV0ID0gcmVnX3JlYWQo cHJpdiwgUkVHX0lOVF9GTEFHU18yKTsKKwkJaWYgKHJldCA8IDApCisJCQlyZXR1cm4gcmV0Owor CQlpZiAocmV0ICYgSU5UX0ZMQUdTXzJfRURJRF9CTEtfUkQpCiAJCQlicmVhazsKIAkJbXNsZWVw KDEpOwogCX0KQEAgLTExMzQsNiArMTE1MSw3IEBAIHRkYTk5OHhfZW5jb2Rlcl9pbml0KHN0cnVj dCBpMmNfY2xpZW50ICpjbGllbnQsCiAJCSAgICBzdHJ1Y3QgZHJtX2VuY29kZXJfc2xhdmUgKmVu Y29kZXJfc2xhdmUpCiB7CiAJc3RydWN0IHRkYTk5OHhfcHJpdiAqcHJpdjsKKwlpbnQgcmV0Owog CiAJcHJpdiA9IGt6YWxsb2Moc2l6ZW9mKCpwcml2KSwgR0ZQX0tFUk5FTCk7CiAJaWYgKCFwcml2 KQpAQCAtMTE1OCw4ICsxMTc2LDExIEBAIHRkYTk5OHhfZW5jb2Rlcl9pbml0KHN0cnVjdCBpMmNf Y2xpZW50ICpjbGllbnQsCiAJdGRhOTk4eF9yZXNldChwcml2KTsKIAogCS8qIHJlYWQgdmVyc2lv bjogKi8KLQlwcml2LT5yZXYgPSByZWdfcmVhZChwcml2LCBSRUdfVkVSU0lPTl9MU0IpIHwKLQkJ CXJlZ19yZWFkKHByaXYsIFJFR19WRVJTSU9OX01TQikgPDwgODsKKwlyZXQgPSByZWdfcmVhZChw cml2LCBSRUdfVkVSU0lPTl9MU0IpIHwKKwkJKHJlZ19yZWFkKHByaXYsIFJFR19WRVJTSU9OX01T QikgPDwgOCk7CisJaWYgKHJldCA8IDApCisJCWdvdG8gZmFpbDsKKwlwcml2LT5yZXYgPSByZXQ7 CiAKIAkvKiBtYXNrIG9mZiBmZWF0dXJlIGJpdHM6ICovCiAJcHJpdi0+cmV2ICY9IH4weDMwOyAv KiBub3QtaGRjcCBhbmQgbm90LXNjYWxhciBiaXQgKi8KCi0tIApLZW4gYXIgYydoZW50YcOxCXwJ ICAgICAgKiogQnJlaXpoIGhhIExpbnV4IGF0YXYhICoqCkplZgkJfAkJaHR0cDovL21vaW5lamYu ZnJlZS5mci8KX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K ZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754515AbaAILJg (ORCPT ); Thu, 9 Jan 2014 06:09:36 -0500 Received: from smtp1-g21.free.fr ([212.27.42.1]:56758 "EHLO smtp1-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754158AbaAILJS convert rfc822-to-8bit (ORCPT ); Thu, 9 Jan 2014 06:09:18 -0500 Date: Thu, 9 Jan 2014 11:57:45 +0100 From: Jean-Francois Moine To: dri-devel@lists.freedesktop.org Cc: Dave Airlie , Rob Clark , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/28] drm/i2c: tda998x: check more I/O errors Message-ID: <20140109115745.5f81523e@armhf> X-Mailer: Claws Mail 3.9.3 (GTK+ 2.24.22; arm-unknown-linux-gnueabihf) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Jean-Francois Moine --- drivers/gpu/drm/i2c/tda998x_drv.c | 45 ++++++++++++++++------ 1 file changed, 33 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c index 26dd299..603f716 100644 --- a/drivers/gpu/drm/i2c/tda998x_drv.c +++ b/drivers/gpu/drm/i2c/tda998x_drv.c @@ -362,7 +362,7 @@ fail: return 0; } -static void +static int set_page(struct tda998x_priv *priv, uint16_t reg) { if (REG2PAGE(reg) != priv->current_page) { @@ -371,11 +371,14 @@ set_page(struct tda998x_priv *priv, uint16_t reg) REG_CURPAGE, REG2PAGE(reg) }; int ret = i2c_master_send(client, buf, sizeof(buf)); - if (ret < 0) + if (ret < 0) { dev_err(&client->dev, "Error %d writing to REG_CURPAGE\n", ret); + return ret; + } priv->current_page = REG2PAGE(reg); } + return 0; } static int @@ -385,7 +388,9 @@ reg_read_range(struct tda998x_priv *priv, uint16_t reg, char *buf, int cnt) uint8_t addr = REG2ADDR(reg); int ret; - set_page(priv, reg); + ret = set_page(priv, reg); + if (ret < 0) + return ret; ret = i2c_master_send(client, &addr, sizeof(addr)); if (ret < 0) @@ -412,18 +417,24 @@ reg_write_range(struct tda998x_priv *priv, uint16_t reg, uint8_t *p, int cnt) buf[0] = REG2ADDR(reg); memcpy(&buf[1], p, cnt); - set_page(priv, reg); + ret = set_page(priv, reg); + if (ret < 0) + return; ret = i2c_master_send(client, buf, cnt + 1); if (ret < 0) dev_err(&client->dev, "Error %d writing to 0x%x\n", ret, reg); } -static uint8_t +static int reg_read(struct tda998x_priv *priv, uint16_t reg) { uint8_t val = 0; - reg_read_range(priv, reg, &val, sizeof(val)); + int ret; + + ret = reg_read_range(priv, reg, &val, sizeof(val)); + if (ret < 0) + return ret; return val; } @@ -434,7 +445,9 @@ reg_write(struct tda998x_priv *priv, uint16_t reg, uint8_t val) uint8_t buf[] = {REG2ADDR(reg), val}; int ret; - set_page(priv, reg); + ret = set_page(priv, reg); + if (ret < 0) + return; ret = i2c_master_send(client, buf, ARRAY_SIZE(buf)); if (ret < 0) @@ -448,7 +461,9 @@ reg_write16(struct tda998x_priv *priv, uint16_t reg, uint16_t val) uint8_t buf[] = {REG2ADDR(reg), val >> 8, val}; int ret; - set_page(priv, reg); + ret = set_page(priv, reg); + if (ret < 0) + return; ret = i2c_master_send(client, buf, ARRAY_SIZE(buf)); if (ret < 0) @@ -970,8 +985,10 @@ read_edid_block(struct drm_encoder *encoder, uint8_t *buf, int blk) /* wait for block read to complete: */ for (i = 100; i > 0; i--) { - uint8_t val = reg_read(priv, REG_INT_FLAGS_2); - if (val & INT_FLAGS_2_EDID_BLK_RD) + ret = reg_read(priv, REG_INT_FLAGS_2); + if (ret < 0) + return ret; + if (ret & INT_FLAGS_2_EDID_BLK_RD) break; msleep(1); } @@ -1134,6 +1151,7 @@ tda998x_encoder_init(struct i2c_client *client, struct drm_encoder_slave *encoder_slave) { struct tda998x_priv *priv; + int ret; priv = kzalloc(sizeof(*priv), GFP_KERNEL); if (!priv) @@ -1158,8 +1176,11 @@ tda998x_encoder_init(struct i2c_client *client, tda998x_reset(priv); /* read version: */ - priv->rev = reg_read(priv, REG_VERSION_LSB) | - reg_read(priv, REG_VERSION_MSB) << 8; + ret = reg_read(priv, REG_VERSION_LSB) | + (reg_read(priv, REG_VERSION_MSB) << 8); + if (ret < 0) + goto fail; + priv->rev = ret; /* mask off feature bits: */ priv->rev &= ~0x30; /* not-hdcp and not-scalar bit */ -- Ken ar c'hentañ | ** Breizh ha Linux atav! ** Jef | http://moinejf.free.fr/