From cdfeeb9b48c8e012eec56c7965352d070a72c38e Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 14 Jan 2017 19:41:59 +0100 Subject: [PATCH] linux4.9: add a few small patches for rpi3. --- srcpkgs/linux4.9/patches/i2c-bcm2835.patch | 40 +++++++++ srcpkgs/linux4.9/patches/musl.patch | 11 +++ srcpkgs/linux4.9/patches/smsc95xx-mac.patch | 95 +++++++++++++++++++++ srcpkgs/linux4.9/template | 2 +- 4 files changed, 147 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/linux4.9/patches/i2c-bcm2835.patch create mode 100644 srcpkgs/linux4.9/patches/musl.patch create mode 100644 srcpkgs/linux4.9/patches/smsc95xx-mac.patch diff --git a/srcpkgs/linux4.9/patches/i2c-bcm2835.patch b/srcpkgs/linux4.9/patches/i2c-bcm2835.patch new file mode 100644 index 00000000000..1417f4d9baf --- /dev/null +++ b/srcpkgs/linux4.9/patches/i2c-bcm2835.patch @@ -0,0 +1,40 @@ +From patchwork Mon Oct 3 20:06:10 2016 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 8bit +Subject: [v4,3/7] i2c: bcm2835: Use dev_dbg logging on transfer errors +From: =?utf-8?q?Noralf_Tr=C3=B8nnes?= +X-Patchwork-Id: 9360899 +Message-Id: <1475525174-28604-4-git-send-email-noralf@tronnes.org> +To: wsa@the-dreams.de, swarren@wwwdotorg.org, eric@anholt.net +Cc: linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org, + linux-arm-kernel@lists.infradead.org, linux-rpi-kernel@lists.infradead.org, + =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= +Date: Mon, 3 Oct 2016 22:06:10 +0200 + +Writing to an AT24C32 generates on average 2x i2c transfer errors per +32-byte page write. Which amounts to a lot for a 4k write. This is due +to the fact that the chip doesn't respond during it's internal write +cycle when the at24 driver tries and retries the next write. +Only a handful drivers use dev_err() on transfer error, so switch to +dev_dbg() instead. + +Signed-off-by: Noralf Trønnes +Reviewed-by: Eric Anholt +--- + drivers/i2c/busses/i2c-bcm2835.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c +index d2ba1a4..54d510a 100644 +--- a/drivers/i2c/busses/i2c-bcm2835.c ++++ b/drivers/i2c/busses/i2c-bcm2835.c +@@ -216,7 +216,7 @@ static int bcm2835_i2c_xfer_msg(struct bcm2835_i2c_dev *i2c_dev, + (msg->flags & I2C_M_IGNORE_NAK)) + return 0; + +- dev_err(i2c_dev->dev, "i2c transfer failed: %x\n", i2c_dev->msg_err); ++ dev_dbg(i2c_dev->dev, "i2c transfer failed: %x\n", i2c_dev->msg_err); + + if (i2c_dev->msg_err & BCM2835_I2C_S_ERR) + return -EREMOTEIO; diff --git a/srcpkgs/linux4.9/patches/musl.patch b/srcpkgs/linux4.9/patches/musl.patch new file mode 100644 index 00000000000..2aa0c9a789b --- /dev/null +++ b/srcpkgs/linux4.9/patches/musl.patch @@ -0,0 +1,11 @@ +--- linux-4.9.3/net/ceph/snapshot.c.orig ++++ linux-4.9.3/net/ceph/snapshot.c +@@ -18,8 +18,6 @@ + * 02110-1301, USA. + */ + +-#include +- + #include + #include + #include diff --git a/srcpkgs/linux4.9/patches/smsc95xx-mac.patch b/srcpkgs/linux4.9/patches/smsc95xx-mac.patch new file mode 100644 index 00000000000..bf77c2d9e23 --- /dev/null +++ b/srcpkgs/linux4.9/patches/smsc95xx-mac.patch @@ -0,0 +1,95 @@ +From e36d607d56dc5c0cbf2cb600e7686b559ea77b44 Mon Sep 17 00:00:00 2001 +From: popcornmix +Date: Tue, 18 Feb 2014 01:43:50 -0300 +Subject: [PATCH] net/smsc95xx: Allow mac address to be set as a parameter + +--- + drivers/net/usb/smsc95xx.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 56 insertions(+) + +diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c +index dc989a8..912be75 100644 +--- a/drivers/net/usb/smsc95xx.c ++++ b/drivers/net/usb/smsc95xx.c +@@ -60,6 +60,7 @@ + #define SUSPEND_SUSPEND3 (0x08) + #define SUSPEND_ALLMODES (SUSPEND_SUSPEND0 | SUSPEND_SUSPEND1 | \ + SUSPEND_SUSPEND2 | SUSPEND_SUSPEND3) ++#define MAC_ADDR_LEN (6) + + #define CARRIER_CHECK_DELAY (2 * HZ) + +@@ -80,6 +81,10 @@ static bool turbo_mode = true; + module_param(turbo_mode, bool, 0644); + MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction"); + ++static char *macaddr = ":"; ++module_param(macaddr, charp, 0); ++MODULE_PARM_DESC(macaddr, "MAC address"); ++ + static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index, + u32 *data, int in_pm) + { +@@ -809,8 +814,59 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd) + return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL); + } + ++/* Check the macaddr module parameter for a MAC address */ ++static int smsc95xx_is_macaddr_param(struct usbnet *dev, u8 *dev_mac) ++{ ++ int i, j, got_num, num; ++ u8 mtbl[MAC_ADDR_LEN]; ++ ++ if (macaddr[0] == ':') ++ return 0; ++ ++ i = 0; ++ j = 0; ++ num = 0; ++ got_num = 0; ++ while (j < MAC_ADDR_LEN) { ++ if (macaddr[i] && macaddr[i] != ':') { ++ got_num++; ++ if ('0' <= macaddr[i] && macaddr[i] <= '9') ++ num = num * 16 + macaddr[i] - '0'; ++ else if ('A' <= macaddr[i] && macaddr[i] <= 'F') ++ num = num * 16 + 10 + macaddr[i] - 'A'; ++ else if ('a' <= macaddr[i] && macaddr[i] <= 'f') ++ num = num * 16 + 10 + macaddr[i] - 'a'; ++ else ++ break; ++ i++; ++ } else if (got_num == 2) { ++ mtbl[j++] = (u8) num; ++ num = 0; ++ got_num = 0; ++ i++; ++ } else { ++ break; ++ } ++ } ++ ++ if (j == MAC_ADDR_LEN) { ++ netif_dbg(dev, ifup, dev->net, "Overriding MAC address with: " ++ "%02x:%02x:%02x:%02x:%02x:%02x\n", mtbl[0], mtbl[1], mtbl[2], ++ mtbl[3], mtbl[4], mtbl[5]); ++ for (i = 0; i < MAC_ADDR_LEN; i++) ++ dev_mac[i] = mtbl[i]; ++ return 1; ++ } else { ++ return 0; ++ } ++} ++ + static void smsc95xx_init_mac_address(struct usbnet *dev) + { ++ /* Check module parameters */ ++ if (smsc95xx_is_macaddr_param(dev, dev->net->dev_addr)) ++ return; ++ + const u8 *mac_addr; + + /* maybe the boot loader passed the MAC address in devicetree */ +-- +2.10.2 + diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template index cf2b3aea64a..05655c236ff 100644 --- a/srcpkgs/linux4.9/template +++ b/srcpkgs/linux4.9/template @@ -1,7 +1,7 @@ # Template file for 'linux4.9' pkgname=linux4.9 version=4.9.3 -revision=2 +revision=3 patch_args="-Np1" wrksrc="linux-${version}" maintainer="Juan RP "