From patchwork Fri Nov 4 06:43:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathias Kresin X-Patchwork-Id: 691153 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3t9C6k3qBqz9t2g for ; Fri, 4 Nov 2016 17:46:38 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=kresin-me.20150623.gappssmtp.com header.i=@kresin-me.20150623.gappssmtp.com header.b="ovnc/oYK"; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1c2YEu-0000Jk-9T; Fri, 04 Nov 2016 06:44:36 +0000 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1c2YET-00005j-1c for lede-dev@lists.infradead.org; Fri, 04 Nov 2016 06:44:13 +0000 Received: by mail-wm0-x241.google.com with SMTP id p190so2368572wmp.1 for ; Thu, 03 Nov 2016 23:43:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kresin-me.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=r/S1YK6SDgQpm9YjB1/fCbwFGRkjiOSDCiSBrdqoU7c=; b=ovnc/oYKbTzc2eunRAb+Qz5K7QtNillUUGLiZ/uCKf9FbueNR4ZbEfClR7X5nibg2R nETQbtXQjWgtZGrDoSAqoqwpQMEk+Idi0kZMUyLX9OTwIQl/xiahHpIIM6O0zvvE1od/ M2TA0n3DLRw/0w1vAaM6t/DRhRz9V9n38C76wS/sQWzvplZBqAFWHorJHPD3wqcfUEVX JB29NxWs0q64o7bPJPFxCaf7qGC2QtRDHeV8piAHZKoD1zLnSODgHh3N6Wr/1ZlvlFLM DMOy8Nm62uszIgTHKImyQQDf5Na7ArOIHTxORgXhxox7cKlAp7mhQqkDntkIuiDTYtKn cHkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=r/S1YK6SDgQpm9YjB1/fCbwFGRkjiOSDCiSBrdqoU7c=; b=igk3EnyDEdCVaHd6dNiNo6Ff14u1X0K/0axvIknQ3EA58x8uMKarqpJpkfWm7wP/1y KEtGnuWEe3CUS8ggkT2+H53hCt+txpzNWlSz5P380NAVxTmFg3VK6PPjGOE8/rXbaf2K takffnONI0V1zGSieuIq9IEnDe+o69l9ZGU1DV90siguWRjhyvOA24tBRFdGvZNQKYyP J+/6rUiLiXg0DSz5MbAeJaCYiPoDQSj/86v9echOwlhtWauQqHN+sA3BoKPx2eA0Ghf/ y4Pf0GCJwlovPrn70V07Uq8Z+YLj3LIJ9SCXfU6zX3CnBHEQRpgk7uJGnLsUnQEmtHcy F+Eg== X-Gm-Message-State: ABUngvdXzmAUBQyxtGIkmvsnWpUMqhUB2ltjjxa86DeBRNkA/j32h6tjfGmyF3vqLsWu6g== X-Received: by 10.194.176.162 with SMTP id cj2mr10098001wjc.25.1478241827742; Thu, 03 Nov 2016 23:43:47 -0700 (PDT) Received: from desktop.wvd.kresin.me (p200300454B00EB0005D9FB87ED1E3F73.dip0.t-ipconnect.de. [2003:45:4b00:eb00:5d9:fb87:ed1e:3f73]) by smtp.gmail.com with ESMTPSA id h10sm12527530wje.48.2016.11.03.23.43.46 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 03 Nov 2016 23:43:47 -0700 (PDT) From: Mathias Kresin To: lede-dev@lists.infradead.org Date: Fri, 4 Nov 2016 07:43:39 +0100 Message-Id: <1478241820-4888-3-git-send-email-dev@kresin.me> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1478241820-4888-1-git-send-email-dev@kresin.me> References: <1478241820-4888-1-git-send-email-dev@kresin.me> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161103_234409_478066_5A4B5A2E X-CRM114-Status: GOOD ( 14.33 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2a00:1450:400c:c09:0:0:0:241 listed in] [list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid Subject: [LEDE-DEV] [PATCH 2/3] mac80211: rt2x00: remove eeprom filename dependency from mtd-eeprom X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org The ralink,mtd-eeprom device tree property doesn't require the ralink,eeprom property to work. Rework the error handling and user notification as well. Do not log an error if the mtd-eeprom parameter isn't used. It could be intentional and should not scare the user. Check if the number of bytes read from the mtd devices matches the requested number of bytes. In case of an mtd read error, give a hint to the user which partition was tried to read from. In case everything is fine, notify the user as well. Signed-off-by: Mathias Kresin --- ...-eeprom-on-SoC-from-a-mtd-device-defines-.patch | 27 ++++++++++++---------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/package/kernel/mac80211/patches/605-rt2x00-load-eeprom-on-SoC-from-a-mtd-device-defines-.patch b/package/kernel/mac80211/patches/605-rt2x00-load-eeprom-on-SoC-from-a-mtd-device-defines-.patch index 5097304..6c264ef 100644 --- a/package/kernel/mac80211/patches/605-rt2x00-load-eeprom-on-SoC-from-a-mtd-device-defines-.patch +++ b/package/kernel/mac80211/patches/605-rt2x00-load-eeprom-on-SoC-from-a-mtd-device-defines-.patch @@ -6,9 +6,9 @@ Subject: [PATCH] rt2x00: load eeprom on SoC from a mtd device defines inside Signed-off-by: John Crispin --- - drivers/net/wireless/ralink/rt2x00/Kconfig | 1 + - drivers/net/wireless/ralink/rt2x00/rt2800pci.c | 44 ++++++++++++++++++++++++++----- - 2 files changed, 39 insertions(+), 6 deletions(-) + drivers/net/wireless/ralink/rt2x00/Kconfig | 1 + + drivers/net/wireless/ralink/rt2x00/rt2x00eeprom.c | 61 +++++++++++++++++++++++ + 2 files changed, 62 insertions(+) --- a/drivers/net/wireless/ralink/rt2x00/Kconfig +++ b/drivers/net/wireless/ralink/rt2x00/Kconfig @@ -22,7 +22,7 @@ Signed-off-by: John Crispin Supported chips: RT2880, RT3050, RT3052, RT3350, RT3352. --- a/drivers/net/wireless/ralink/rt2x00/rt2x00eeprom.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00eeprom.c -@@ -26,11 +26,66 @@ +@@ -26,11 +26,69 @@ #include #include @@ -47,10 +47,8 @@ Signed-off-by: John Crispin + phandle phandle; + + list = of_get_property(np, "ralink,mtd-eeprom", &size); -+ if (!list) { -+ dev_err(rt2x00dev->dev, "failed to load eeprom property\n"); ++ if (!list) + return -ENOENT; -+ } + + phandle = be32_to_cpup(list++); + if (phandle) @@ -76,11 +74,16 @@ Signed-off-by: John Crispin + ret = mtd_read(mtd, offset, len, &retlen, (u_char *) rt2x00dev->eeprom); + put_mtd_device(mtd); + -+ if (!ret) { -+ rt2x00dev->eeprom_file = &mtd_fw; -+ mtd_fw.size = len; -+ mtd_fw.data = (const u8 *) rt2x00dev->eeprom; ++ if ((retlen != rt2x00dev->ops->eeprom_size) || ret) { ++ dev_err(rt2x00dev->dev, "failed to load eeprom from device \"%s\"\n", part); ++ return ret; + } ++ ++ rt2x00dev->eeprom_file = &mtd_fw; ++ mtd_fw.size = len; ++ mtd_fw.data = (const u8 *) rt2x00dev->eeprom; ++ ++ dev_info(rt2x00dev->dev, "loaded eeprom from mtd device \"%s\"\n", part); +#endif + + return ret; @@ -89,7 +92,7 @@ Signed-off-by: John Crispin static const char * rt2x00lib_get_eeprom_file_name(struct rt2x00_dev *rt2x00dev) { -@@ -58,6 +113,9 @@ static int rt2x00lib_request_eeprom_file +@@ -58,6 +116,9 @@ static int rt2x00lib_request_eeprom_file const char *ee_name; int retval;