- Linux-stable-mirror - lists.linaro.org

[Linux-stable-mirror] patch "usbip: vhci: stop printing kernel pointer addresses in messages" added to usb-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled usbip: vhci: stop printing kernel pointer addresses in messages to my usb git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git in the usb-linus branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will hopefully also be merged in Linus's tree for the next -rc kernel release. If you have any questions about this process, please let me know. >From 8272d099d05f7ab2776cf56a2ab9f9443be18907 Mon Sep 17 00:00:00 2001 From: Shuah Khan <shuahkh(a)osg.samsung.com> Date: Mon, 18 Dec 2017 17:24:22 -0700 Subject: usbip: vhci: stop printing kernel pointer addresses in messages Remove and/or change debug, info. and error messages to not print kernel pointer addresses. Signed-off-by: Shuah Khan <shuahkh(a)osg.samsung.com> Cc: stable <stable(a)vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/usb/usbip/vhci_hcd.c | 10 ---------- drivers/usb/usbip/vhci_rx.c | 23 +++++++++++------------ drivers/usb/usbip/vhci_tx.c | 3 ++- 3 files changed, 13 insertions(+), 23 deletions(-) diff --git a/drivers/usb/usbip/vhci_hcd.c b/drivers/usb/usbip/vhci_hcd.c index 6b3278c4b72a..9efab3dc3734 100644 --- a/drivers/usb/usbip/vhci_hcd.c +++ b/drivers/usb/usbip/vhci_hcd.c @@ -656,9 +656,6 @@ static int vhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flag struct vhci_device *vdev; unsigned long flags; - usbip_dbg_vhci_hc("enter, usb_hcd %p urb %p mem_flags %d\n", - hcd, urb, mem_flags); - if (portnum > VHCI_HC_PORTS) { pr_err("invalid port number %d\n", portnum); return -ENODEV; @@ -822,8 +819,6 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status) struct vhci_device *vdev; unsigned long flags; - pr_info("dequeue a urb %p\n", urb); - spin_lock_irqsave(&vhci->lock, flags); priv = urb->hcpriv; @@ -851,7 +846,6 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status) /* tcp connection is closed */ spin_lock(&vdev->priv_lock); - pr_info("device %p seems to be disconnected\n", vdev); list_del(&priv->list); kfree(priv); urb->hcpriv = NULL; @@ -863,8 +857,6 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status) * vhci_rx will receive RET_UNLINK and give back the URB. * Otherwise, we give back it here. */ - pr_info("gives back urb %p\n", urb); - usb_hcd_unlink_urb_from_ep(hcd, urb); spin_unlock_irqrestore(&vhci->lock, flags); @@ -892,8 +884,6 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status) unlink->unlink_seqnum = priv->seqnum; - pr_info("device %p seems to be still connected\n", vdev); - /* send cmd_unlink and try to cancel the pending URB in the * peer */ list_add_tail(&unlink->list, &vdev->unlink_tx); diff --git a/drivers/usb/usbip/vhci_rx.c b/drivers/usb/usbip/vhci_rx.c index 90577e8b2282..112ebb90d8c9 100644 --- a/drivers/usb/usbip/vhci_rx.c +++ b/drivers/usb/usbip/vhci_rx.c @@ -23,24 +23,23 @@ struct urb *pickup_urb_and_free_priv(struct vhci_device *vdev, __u32 seqnum) urb = priv->urb; status = urb->status; - usbip_dbg_vhci_rx("find urb %p vurb %p seqnum %u\n", - urb, priv, seqnum); + usbip_dbg_vhci_rx("find urb seqnum %u\n", seqnum); switch (status) { case -ENOENT: /* fall through */ case -ECONNRESET: - dev_info(&urb->dev->dev, - "urb %p was unlinked %ssynchronuously.\n", urb, - status == -ENOENT ? "" : "a"); + dev_dbg(&urb->dev->dev, + "urb seq# %u was unlinked %ssynchronuously\n", + seqnum, status == -ENOENT ? "" : "a"); break; case -EINPROGRESS: /* no info output */ break; default: - dev_info(&urb->dev->dev, - "urb %p may be in a error, status %d\n", urb, - status); + dev_dbg(&urb->dev->dev, + "urb seq# %u may be in a error, status %d\n", + seqnum, status); } list_del(&priv->list); @@ -67,8 +66,8 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev, spin_unlock_irqrestore(&vdev->priv_lock, flags); if (!urb) { - pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum); - pr_info("max seqnum %d\n", + pr_err("cannot find a urb of seqnum %u max seqnum %d\n", + pdu->base.seqnum, atomic_read(&vhci_hcd->seqnum)); usbip_event_add(ud, VDEV_EVENT_ERROR_TCP); return; @@ -91,7 +90,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev, if (usbip_dbg_flag_vhci_rx) usbip_dump_urb(urb); - usbip_dbg_vhci_rx("now giveback urb %p\n", urb); + usbip_dbg_vhci_rx("now giveback urb %u\n", pdu->base.seqnum); spin_lock_irqsave(&vhci->lock, flags); usb_hcd_unlink_urb_from_ep(vhci_hcd_to_hcd(vhci_hcd), urb); @@ -158,7 +157,7 @@ static void vhci_recv_ret_unlink(struct vhci_device *vdev, pr_info("the urb (seqnum %d) was already given back\n", pdu->base.seqnum); } else { - usbip_dbg_vhci_rx("now giveback urb %p\n", urb); + usbip_dbg_vhci_rx("now giveback urb %d\n", pdu->base.seqnum); /* If unlink is successful, status is -ECONNRESET */ urb->status = pdu->u.ret_unlink.status; diff --git a/drivers/usb/usbip/vhci_tx.c b/drivers/usb/usbip/vhci_tx.c index d625a2ff4b71..9aed15a358b7 100644 --- a/drivers/usb/usbip/vhci_tx.c +++ b/drivers/usb/usbip/vhci_tx.c @@ -69,7 +69,8 @@ static int vhci_send_cmd_submit(struct vhci_device *vdev) memset(&msg, 0, sizeof(msg)); memset(&iov, 0, sizeof(iov)); - usbip_dbg_vhci_tx("setup txdata urb %p\n", urb); + usbip_dbg_vhci_tx("setup txdata urb seqnum %lu\n", + priv->seqnum); /* 1. setup usbip_header */ setup_cmd_submit_pdu(&pdu_header, urb); -- 2.15.1

7 years, 1 month

1
0
0 0

[Linux-stable-mirror] patch "phy: tegra: fix device-tree node lookups" added to usb-linus

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled phy: tegra: fix device-tree node lookups to my usb git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git in the usb-linus branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will hopefully also be merged in Linus's tree for the next -rc kernel release. If you have any questions about this process, please let me know. >From 046046737bd35bed047460f080ea47e186be731e Mon Sep 17 00:00:00 2001 From: Johan Hovold <johan(a)kernel.org> Date: Wed, 15 Nov 2017 10:43:16 +0100 Subject: phy: tegra: fix device-tree node lookups Fix child-node lookups during probe, which ended up searching the whole device tree depth-first starting at the parents rather than just matching on their children. To make things worse, some parent nodes could end up being being prematurely freed (by tegra_xusb_pad_register()) as of_find_node_by_name() drops a reference to its first argument. Fixes: 53d2a715c240 ("phy: Add Tegra XUSB pad controller support") Cc: stable <stable(a)vger.kernel.org> # 4.7 Cc: Thierry Reding <treding(a)nvidia.com> Signed-off-by: Johan Hovold <johan(a)kernel.org> Signed-off-by: Kishon Vijay Abraham I <kishon(a)ti.com> --- drivers/phy/tegra/xusb.c | 58 ++++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/drivers/phy/tegra/xusb.c b/drivers/phy/tegra/xusb.c index 4307bf0013e1..63e916d4d069 100644 --- a/drivers/phy/tegra/xusb.c +++ b/drivers/phy/tegra/xusb.c @@ -75,14 +75,14 @@ MODULE_DEVICE_TABLE(of, tegra_xusb_padctl_of_match); static struct device_node * tegra_xusb_find_pad_node(struct tegra_xusb_padctl *padctl, const char *name) { - /* - * of_find_node_by_name() drops a reference, so make sure to grab one. - */ - struct device_node *np = of_node_get(padctl->dev->of_node); + struct device_node *pads, *np; + + pads = of_get_child_by_name(padctl->dev->of_node, "pads"); + if (!pads) + return NULL; - np = of_find_node_by_name(np, "pads"); - if (np) - np = of_find_node_by_name(np, name); + np = of_get_child_by_name(pads, name); + of_node_put(pads); return np; } @@ -90,16 +90,16 @@ tegra_xusb_find_pad_node(struct tegra_xusb_padctl *padctl, const char *name) static struct device_node * tegra_xusb_pad_find_phy_node(struct tegra_xusb_pad *pad, unsigned int index) { - /* - * of_find_node_by_name() drops a reference, so make sure to grab one. - */ - struct device_node *np = of_node_get(pad->dev.of_node); + struct device_node *np, *lanes; - np = of_find_node_by_name(np, "lanes"); - if (!np) + lanes = of_get_child_by_name(pad->dev.of_node, "lanes"); + if (!lanes) return NULL; - return of_find_node_by_name(np, pad->soc->lanes[index].name); + np = of_get_child_by_name(lanes, pad->soc->lanes[index].name); + of_node_put(lanes); + + return np; } static int @@ -195,7 +195,7 @@ int tegra_xusb_pad_register(struct tegra_xusb_pad *pad, unsigned int i; int err; - children = of_find_node_by_name(pad->dev.of_node, "lanes"); + children = of_get_child_by_name(pad->dev.of_node, "lanes"); if (!children) return -ENODEV; @@ -444,21 +444,21 @@ static struct device_node * tegra_xusb_find_port_node(struct tegra_xusb_padctl *padctl, const char *type, unsigned int index) { - /* - * of_find_node_by_name() drops a reference, so make sure to grab one. - */ - struct device_node *np = of_node_get(padctl->dev->of_node); + struct device_node *ports, *np; + char *name; - np = of_find_node_by_name(np, "ports"); - if (np) { - char *name; + ports = of_get_child_by_name(padctl->dev->of_node, "ports"); + if (!ports) + return NULL; - name = kasprintf(GFP_KERNEL, "%s-%u", type, index); - if (!name) - return ERR_PTR(-ENOMEM); - np = of_find_node_by_name(np, name); - kfree(name); + name = kasprintf(GFP_KERNEL, "%s-%u", type, index); + if (!name) { + of_node_put(ports); + return ERR_PTR(-ENOMEM); } + np = of_get_child_by_name(ports, name); + kfree(name); + of_node_put(ports); return np; } @@ -847,7 +847,7 @@ static void tegra_xusb_remove_ports(struct tegra_xusb_padctl *padctl) static int tegra_xusb_padctl_probe(struct platform_device *pdev) { - struct device_node *np = of_node_get(pdev->dev.of_node); + struct device_node *np = pdev->dev.of_node; const struct tegra_xusb_padctl_soc *soc; struct tegra_xusb_padctl *padctl; const struct of_device_id *match; @@ -855,7 +855,7 @@ static int tegra_xusb_padctl_probe(struct platform_device *pdev) int err; /* for backwards compatibility with old device trees */ - np = of_find_node_by_name(np, "pads"); + np = of_get_child_by_name(np, "pads"); if (!np) { dev_warn(&pdev->dev, "deprecated DT, using legacy driver\n"); return tegra_xusb_padctl_legacy_probe(pdev); -- 2.15.1

7 years, 1 month

1
0
0 0

[Linux-stable-mirror] [PATCH] fscache: Fix the default for fscache_maybe_release_page()

by David Howells

Fix the default for fscache_maybe_release_page() for when the cookie isn't valid or the page isn't cached. It mustn't return false as that indicates the page cannot yet be freed. The problem with the default is that if, say, there's no cache, but a network filesystem's pages are using up almost all the available memory, a system can OOM because the filesystem ->releasepage() op will not allow them to be released as fscache_maybe_release_page() incorrectly prevents it. This can be tested by writing a sequence of 512MiB files to an AFS mount. It does not affect NFS or CIFS because both of those wrap the call in a check of PG_fscache and it shouldn't bother Ceph as that only has PG_private set whilst writeback is in progress. This might be an issue for 9P, however. Note that the pages aren't entirely stuck. Removing a file or unmounting will clear things because that uses ->invalidatepage() instead. Fixes: 201a15428bd5 ("FS-Cache: Handle pages pending storage that get evicted under OOM conditions") Reported-by: Marc Dionne <marc.dionne(a)auristor.com> Signed-off-by: David Howells <dhowells(a)redhat.com> Reviewed-by: Jeff Layton <jlayton(a)redhat.com> Acked-by: Al Viro <viro(a)zeniv.linux.org.uk> cc: stable(a)vger.kernel.org # 2.6.32+ --- include/linux/fscache.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/fscache.h b/include/linux/fscache.h index f4ff47d4a893..fe0c349684fa 100644 --- a/include/linux/fscache.h +++ b/include/linux/fscache.h @@ -755,7 +755,7 @@ bool fscache_maybe_release_page(struct fscache_cookie *cookie, { if (fscache_cookie_valid(cookie) && PageFsCache(page)) return __fscache_maybe_release_page(cookie, page, gfp); - return false; + return true; } /**

7 years, 1 month

1
0
0 0

[Linux-stable-mirror] [PATCH] fscache: Fix the default for fscache_maybe_release_page()

by David Howells

Fix the default for fscache_maybe_release_page() for when the cookie isn't valid or the page isn't cached. It mustn't return false as that indicates the page cannot yet be freed. The problem with the default is that if, say, there's no cache, but a network filesystem's pages are using up almost all the available memory, a system can OOM because the filesystem ->releasepage() op will not allow them to be released as fscache_maybe_release_page() incorrectly prevents it. This can be tested by writing a sequence of 512MiB files to an AFS mount. It does not affect NFS or CIFS because both of those wrap the call in a check of PG_fscache and it shouldn't bother Ceph as that only has PG_private set whilst writeback is in progress. This might be an issue for 9P, however. Note that the pages aren't entirely stuck. Removing a file or unmounting will clear things because that uses ->invalidatepage() instead. Fixes: 201a15428bd5 ("FS-Cache: Handle pages pending storage that get evicted under OOM conditions") Reported-by: Marc Dionne <marc.dionne(a)auristor.com> Signed-off-by: David Howells <dhowells(a)redhat.com> Reviewed-by: Jeff Layton <jlayton(a)redhat.com> Acked-by: Al Viro <viro(a)zeniv.linux.org.uk> cc: stable(a)vger.kernel.org # 2.6.32+ --- include/linux/fscache.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/fscache.h b/include/linux/fscache.h index f4ff47d4a893..fe0c349684fa 100644 --- a/include/linux/fscache.h +++ b/include/linux/fscache.h @@ -755,7 +755,7 @@ bool fscache_maybe_release_page(struct fscache_cookie *cookie, { if (fscache_cookie_valid(cookie) && PageFsCache(page)) return __fscache_maybe_release_page(cookie, page, gfp); - return false; + return true; } /**

7 years, 1 month

1
0
0 0

[Linux-stable-mirror] [PATCH stable-queue] drop platform-x86-sony-laptop-fix-error-handling-in-sony_nc_setup_rfkill.patch

by alexander.levin＠verizon.com

Signed-off-by: Sasha Levin <alexander.levin(a)verizon.com> --- ...ix-error-handling-in-sony_nc_setup_rfkill.patch | 56 ---------------------- queue-3.18/series | 1 - ...ix-error-handling-in-sony_nc_setup_rfkill.patch | 56 ---------------------- queue-4.14/series | 1 - ...ix-error-handling-in-sony_nc_setup_rfkill.patch | 56 ---------------------- queue-4.4/series | 1 - ...ix-error-handling-in-sony_nc_setup_rfkill.patch | 56 ---------------------- queue-4.9/series | 1 - 8 files changed, 228 deletions(-) delete mode 100644 queue-3.18/platform-x86-sony-laptop-fix-error-handling-in-sony_nc_setup_rfkill.patch delete mode 100644 queue-4.14/platform-x86-sony-laptop-fix-error-handling-in-sony_nc_setup_rfkill.patch delete mode 100644 queue-4.4/platform-x86-sony-laptop-fix-error-handling-in-sony_nc_setup_rfkill.patch delete mode 100644 queue-4.9/platform-x86-sony-laptop-fix-error-handling-in-sony_nc_setup_rfkill.patch diff --git a/queue-3.18/platform-x86-sony-laptop-fix-error-handling-in-sony_nc_setup_rfkill.patch b/queue-3.18/platform-x86-sony-laptop-fix-error-handling-in-sony_nc_setup_rfkill.patch deleted file mode 100644 index 29eccbffe..000000000 --- a/queue-3.18/platform-x86-sony-laptop-fix-error-handling-in-sony_nc_setup_rfkill.patch +++ /dev/null @@ -1,56 +0,0 @@ -From foo@baz Mon Dec 18 15:03:25 CET 2017 -From: Markus Elfring <elfring(a)users.sourceforge.net> -Date: Wed, 1 Nov 2017 18:42:45 +0100 -Subject: platform/x86: sony-laptop: Fix error handling in sony_nc_setup_rfkill() - -From: Markus Elfring <elfring(a)users.sourceforge.net> - - -[ Upstream commit f6c8a317ab208aee223776327c06f23342492d54 ] - -Source code review for a specific software refactoring showed the need -for another correction because the error code "-1" was returned so far -if a call of the function "sony_call_snc_handle" failed here. -Thus assign the return value from these two function calls also to -the variable "err" and provide it in case of a failure. - -Fixes: d6f15ed876b83a1a0eba1d0473eef58acc95444a ("sony-laptop: use soft rfkill status stored in hw") -Suggested-by: Andy Shevchenko <andy.shevchenko(a)gmail.com> -Link: https://lkml.org/lkml/2017/10/31/463 -Link: https://lkml.kernel.org/r/<CAHp75VcMkXCioCzmLE0+BTmkqc5RSOx9yPO0ectVHMrMvewgwg(a)mail.gmail.com> -Signed-off-by: Markus Elfring <elfring(a)users.sourceforge.net> -Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> -Signed-off-by: Sasha Levin <alexander.levin(a)verizon.com> -Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> ---- - drivers/platform/x86/sony-laptop.c | 14 ++++++++------ - 1 file changed, 8 insertions(+), 6 deletions(-) - ---- a/drivers/platform/x86/sony-laptop.c -+++ b/drivers/platform/x86/sony-laptop.c -@@ -1654,17 +1654,19 @@ static int sony_nc_setup_rfkill(struct a - if (!rfk) - return -ENOMEM; - -- if (sony_call_snc_handle(sony_rfkill_handle, 0x200, &result) < 0) { -+ err = sony_call_snc_handle(sony_rfkill_handle, 0x200, &result); -+ if (err < 0) { - rfkill_destroy(rfk); -- return -1; -+ return err; - } - hwblock = !(result & 0x1); - -- if (sony_call_snc_handle(sony_rfkill_handle, -- sony_rfkill_address[nc_type], -- &result) < 0) { -+ err = sony_call_snc_handle(sony_rfkill_handle, -+ sony_rfkill_address[nc_type], -+ &result); -+ if (err < 0) { - rfkill_destroy(rfk); -- return -1; -+ return err; - } - swblock = !(result & 0x2); - diff --git a/queue-3.18/series b/queue-3.18/series index ed60ddbc4..8525d16ff 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -43,7 +43,6 @@ pci-pme-handle-invalid-data-when-reading-root-status.patch powerpc-powernv-cpufreq-fix-the-frequency-read-by-proc-cpuinfo.patch powerpc-opal-fix-ebusy-bug-in-acquiring-tokens.patch powerpc-ipic-fix-status-get-and-status-clear.patch -platform-x86-sony-laptop-fix-error-handling-in-sony_nc_setup_rfkill.patch target-iscsi-fix-a-race-condition-in-iscsit_add_reject_from_cmd.patch iscsi-target-fix-memory-leak-in-lio_target_tiqn_addtpg.patch target-fix-condition-return-in-core_pr_dump_initiator_port.patch diff --git a/queue-4.14/platform-x86-sony-laptop-fix-error-handling-in-sony_nc_setup_rfkill.patch b/queue-4.14/platform-x86-sony-laptop-fix-error-handling-in-sony_nc_setup_rfkill.patch deleted file mode 100644 index 80673c2e3..000000000 --- a/queue-4.14/platform-x86-sony-laptop-fix-error-handling-in-sony_nc_setup_rfkill.patch +++ /dev/null @@ -1,56 +0,0 @@ -From foo@baz Mon Dec 18 13:28:59 CET 2017 -From: Markus Elfring <elfring(a)users.sourceforge.net> -Date: Wed, 1 Nov 2017 18:42:45 +0100 -Subject: platform/x86: sony-laptop: Fix error handling in sony_nc_setup_rfkill() - -From: Markus Elfring <elfring(a)users.sourceforge.net> - - -[ Upstream commit f6c8a317ab208aee223776327c06f23342492d54 ] - -Source code review for a specific software refactoring showed the need -for another correction because the error code "-1" was returned so far -if a call of the function "sony_call_snc_handle" failed here. -Thus assign the return value from these two function calls also to -the variable "err" and provide it in case of a failure. - -Fixes: d6f15ed876b83a1a0eba1d0473eef58acc95444a ("sony-laptop: use soft rfkill status stored in hw") -Suggested-by: Andy Shevchenko <andy.shevchenko(a)gmail.com> -Link: https://lkml.org/lkml/2017/10/31/463 -Link: https://lkml.kernel.org/r/<CAHp75VcMkXCioCzmLE0+BTmkqc5RSOx9yPO0ectVHMrMvewgwg(a)mail.gmail.com> -Signed-off-by: Markus Elfring <elfring(a)users.sourceforge.net> -Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> -Signed-off-by: Sasha Levin <alexander.levin(a)verizon.com> -Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> ---- - drivers/platform/x86/sony-laptop.c | 14 ++++++++------ - 1 file changed, 8 insertions(+), 6 deletions(-) - ---- a/drivers/platform/x86/sony-laptop.c -+++ b/drivers/platform/x86/sony-laptop.c -@@ -1660,17 +1660,19 @@ static int sony_nc_setup_rfkill(struct a - if (!rfk) - return -ENOMEM; - -- if (sony_call_snc_handle(sony_rfkill_handle, 0x200, &result) < 0) { -+ err = sony_call_snc_handle(sony_rfkill_handle, 0x200, &result); -+ if (err < 0) { - rfkill_destroy(rfk); -- return -1; -+ return err; - } - hwblock = !(result & 0x1); - -- if (sony_call_snc_handle(sony_rfkill_handle, -- sony_rfkill_address[nc_type], -- &result) < 0) { -+ err = sony_call_snc_handle(sony_rfkill_handle, -+ sony_rfkill_address[nc_type], -+ &result); -+ if (err < 0) { - rfkill_destroy(rfk); -- return -1; -+ return err; - } - swblock = !(result & 0x2); - diff --git a/queue-4.14/series b/queue-4.14/series index 8d3089853..7e1d0f7a3 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -68,7 +68,6 @@ powerpc-opal-fix-ebusy-bug-in-acquiring-tokens.patch powerpc-ipic-fix-status-get-and-status-clear.patch powerpc-pseries-vio-dispose-of-virq-mapping-on-vdevice-unregister.patch platform-x86-intel_punit_ipc-fix-resource-ioremap-warning.patch -platform-x86-sony-laptop-fix-error-handling-in-sony_nc_setup_rfkill.patch target-iscsi-detect-conn_cmd_list-corruption-early.patch target-iscsi-fix-a-race-condition-in-iscsit_add_reject_from_cmd.patch iscsi-target-fix-memory-leak-in-lio_target_tiqn_addtpg.patch diff --git a/queue-4.4/platform-x86-sony-laptop-fix-error-handling-in-sony_nc_setup_rfkill.patch b/queue-4.4/platform-x86-sony-laptop-fix-error-handling-in-sony_nc_setup_rfkill.patch deleted file mode 100644 index 7dd8d3d60..000000000 --- a/queue-4.4/platform-x86-sony-laptop-fix-error-handling-in-sony_nc_setup_rfkill.patch +++ /dev/null @@ -1,56 +0,0 @@ -From foo@baz Mon Dec 18 14:47:43 CET 2017 -From: Markus Elfring <elfring(a)users.sourceforge.net> -Date: Wed, 1 Nov 2017 18:42:45 +0100 -Subject: platform/x86: sony-laptop: Fix error handling in sony_nc_setup_rfkill() - -From: Markus Elfring <elfring(a)users.sourceforge.net> - - -[ Upstream commit f6c8a317ab208aee223776327c06f23342492d54 ] - -Source code review for a specific software refactoring showed the need -for another correction because the error code "-1" was returned so far -if a call of the function "sony_call_snc_handle" failed here. -Thus assign the return value from these two function calls also to -the variable "err" and provide it in case of a failure. - -Fixes: d6f15ed876b83a1a0eba1d0473eef58acc95444a ("sony-laptop: use soft rfkill status stored in hw") -Suggested-by: Andy Shevchenko <andy.shevchenko(a)gmail.com> -Link: https://lkml.org/lkml/2017/10/31/463 -Link: https://lkml.kernel.org/r/<CAHp75VcMkXCioCzmLE0+BTmkqc5RSOx9yPO0ectVHMrMvewgwg(a)mail.gmail.com> -Signed-off-by: Markus Elfring <elfring(a)users.sourceforge.net> -Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> -Signed-off-by: Sasha Levin <alexander.levin(a)verizon.com> -Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> ---- - drivers/platform/x86/sony-laptop.c | 14 ++++++++------ - 1 file changed, 8 insertions(+), 6 deletions(-) - ---- a/drivers/platform/x86/sony-laptop.c -+++ b/drivers/platform/x86/sony-laptop.c -@@ -1655,17 +1655,19 @@ static int sony_nc_setup_rfkill(struct a - if (!rfk) - return -ENOMEM; - -- if (sony_call_snc_handle(sony_rfkill_handle, 0x200, &result) < 0) { -+ err = sony_call_snc_handle(sony_rfkill_handle, 0x200, &result); -+ if (err < 0) { - rfkill_destroy(rfk); -- return -1; -+ return err; - } - hwblock = !(result & 0x1); - -- if (sony_call_snc_handle(sony_rfkill_handle, -- sony_rfkill_address[nc_type], -- &result) < 0) { -+ err = sony_call_snc_handle(sony_rfkill_handle, -+ sony_rfkill_address[nc_type], -+ &result); -+ if (err < 0) { - rfkill_destroy(rfk); -- return -1; -+ return err; - } - swblock = !(result & 0x2); - diff --git a/queue-4.4/series b/queue-4.4/series index d52e15576..d1ebd64a3 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -76,7 +76,6 @@ powerpc-powernv-cpufreq-fix-the-frequency-read-by-proc-cpuinfo.patch netfilter-ipvs-fix-inappropriate-output-of-procfs.patch powerpc-opal-fix-ebusy-bug-in-acquiring-tokens.patch powerpc-ipic-fix-status-get-and-status-clear.patch -platform-x86-sony-laptop-fix-error-handling-in-sony_nc_setup_rfkill.patch target-iscsi-fix-a-race-condition-in-iscsit_add_reject_from_cmd.patch iscsi-target-fix-memory-leak-in-lio_target_tiqn_addtpg.patch target-fix-condition-return-in-core_pr_dump_initiator_port.patch diff --git a/queue-4.9/platform-x86-sony-laptop-fix-error-handling-in-sony_nc_setup_rfkill.patch b/queue-4.9/platform-x86-sony-laptop-fix-error-handling-in-sony_nc_setup_rfkill.patch deleted file mode 100644 index be1bf544f..000000000 --- a/queue-4.9/platform-x86-sony-laptop-fix-error-handling-in-sony_nc_setup_rfkill.patch +++ /dev/null @@ -1,56 +0,0 @@ -From foo@baz Mon Dec 18 14:12:35 CET 2017 -From: Markus Elfring <elfring(a)users.sourceforge.net> -Date: Wed, 1 Nov 2017 18:42:45 +0100 -Subject: platform/x86: sony-laptop: Fix error handling in sony_nc_setup_rfkill() - -From: Markus Elfring <elfring(a)users.sourceforge.net> - - -[ Upstream commit f6c8a317ab208aee223776327c06f23342492d54 ] - -Source code review for a specific software refactoring showed the need -for another correction because the error code "-1" was returned so far -if a call of the function "sony_call_snc_handle" failed here. -Thus assign the return value from these two function calls also to -the variable "err" and provide it in case of a failure. - -Fixes: d6f15ed876b83a1a0eba1d0473eef58acc95444a ("sony-laptop: use soft rfkill status stored in hw") -Suggested-by: Andy Shevchenko <andy.shevchenko(a)gmail.com> -Link: https://lkml.org/lkml/2017/10/31/463 -Link: https://lkml.kernel.org/r/<CAHp75VcMkXCioCzmLE0+BTmkqc5RSOx9yPO0ectVHMrMvewgwg(a)mail.gmail.com> -Signed-off-by: Markus Elfring <elfring(a)users.sourceforge.net> -Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> -Signed-off-by: Sasha Levin <alexander.levin(a)verizon.com> -Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> ---- - drivers/platform/x86/sony-laptop.c | 14 ++++++++------ - 1 file changed, 8 insertions(+), 6 deletions(-) - ---- a/drivers/platform/x86/sony-laptop.c -+++ b/drivers/platform/x86/sony-laptop.c -@@ -1660,17 +1660,19 @@ static int sony_nc_setup_rfkill(struct a - if (!rfk) - return -ENOMEM; - -- if (sony_call_snc_handle(sony_rfkill_handle, 0x200, &result) < 0) { -+ err = sony_call_snc_handle(sony_rfkill_handle, 0x200, &result); -+ if (err < 0) { - rfkill_destroy(rfk); -- return -1; -+ return err; - } - hwblock = !(result & 0x1); - -- if (sony_call_snc_handle(sony_rfkill_handle, -- sony_rfkill_address[nc_type], -- &result) < 0) { -+ err = sony_call_snc_handle(sony_rfkill_handle, -+ sony_rfkill_address[nc_type], -+ &result); -+ if (err < 0) { - rfkill_destroy(rfk); -- return -1; -+ return err; - } - swblock = !(result & 0x2); - diff --git a/queue-4.9/series b/queue-4.9/series index ddb7a33cf..295f28ae2 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -121,7 +121,6 @@ netfilter-ipvs-fix-inappropriate-output-of-procfs.patch powerpc-opal-fix-ebusy-bug-in-acquiring-tokens.patch powerpc-ipic-fix-status-get-and-status-clear.patch platform-x86-intel_punit_ipc-fix-resource-ioremap-warning.patch -platform-x86-sony-laptop-fix-error-handling-in-sony_nc_setup_rfkill.patch target-iscsi-fix-a-race-condition-in-iscsit_add_reject_from_cmd.patch iscsi-target-fix-memory-leak-in-lio_target_tiqn_addtpg.patch target-fix-condition-return-in-core_pr_dump_initiator_port.patch -- 2.11.0

7 years, 1 month

2
1
0 0

[Linux-stable-mirror] [PATCH 01/14] MIPS: Fix CM region target definitions

by thirtsa.dreyfus＠intel.com

From: Paul Burton <paul.burton(a)imgtec.com> The default CM target field in the GCR_BASE register is encoded with 0 meaning memory & 1 being reserved. However the definitions we use for those bits effectively get these two values backwards - likely because they were copied from the definitions for the CM regions where the target is encoded differently. This results in use setting up GCR_BASE with the reserved target value by default, rather than targeting memory as intended. Although we currently seem to get away with this it's not a great idea to rely upon. Fix this by changing our macros to match the documentated target values. The incorrect encoding became used as of commit 9f98f3dd0c51 ("MIPS: Add generic CM probe & access code") in the Linux v3.15 cycle, and was likely carried forwards from older but unused code introduced by commit 39b8d5254246 ("[MIPS] Add support for MIPS CMP platform.") in the v2.6.26 cycle. Signed-off-by: Paul Burton <paul.burton(a)imgtec.com> Reported-by: Matt Redfearn <matt.redfearn(a)imgtec.com> Cc: Matt Redfearn <matt.redfearn(a)imgtec.com> Cc: Ralf Baechle <ralf(a)linux-mips.org> Cc: linux-mips(a)linux-mips.org Cc: <stable(a)vger.kernel.org> # v3.15+ --- arch/mips/include/asm/mips-cm.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/mips/include/asm/mips-cm.h b/arch/mips/include/asm/mips-cm.h index f6231b9..c6aaabd 100644 --- a/arch/mips/include/asm/mips-cm.h +++ b/arch/mips/include/asm/mips-cm.h @@ -142,8 +142,8 @@ static inline bool mips_cm_has_l2sync(void) GCR_ACCESSOR_RW(64, 0x008, base) #define CM_GCR_BASE_GCRBASE GENMASK_ULL(47, 15) #define CM_GCR_BASE_CMDEFTGT GENMASK(1, 0) -#define CM_GCR_BASE_CMDEFTGT_DISABLED 0 -#define CM_GCR_BASE_CMDEFTGT_MEM 1 +#define CM_GCR_BASE_CMDEFTGT_MEM 0 +#define CM_GCR_BASE_CMDEFTGT_RESERVED 1 #define CM_GCR_BASE_CMDEFTGT_IOCU0 2 #define CM_GCR_BASE_CMDEFTGT_IOCU1 3 -- 1.9.1 --------------------------------------------------------------------- Intel Israel (74) Limited This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.

7 years, 1 month

1
0
0 0

Re: [Linux-stable-mirror] [PATCH for-4.14.y 0/5] e1000e: Upstream fixes for linux-4.14.y

by Greg KH

On Mon, Dec 11, 2017 at 10:58:10PM +0100, Christian Hesse wrote: > Greg KH <gregkh(a)linuxfoundation.org> on Tue, 2017/12/05 08:35: > > On Tue, Dec 05, 2017 at 08:23:27AM +0100, Christian Hesse wrote: > > > Greg KH <gregkh(a)linuxfoundation.org> on Mon, 2017/12/04 19:37: > > > > On Mon, Dec 04, 2017 at 04:47:00PM +0100, Christian Hesse wrote: > > > > > Amit Pundir <amit.pundir(a)linaro.org> on Mon, 2017/11/27 18:23: > > > > > > Hi Greg, > > > > > > > > > > > > Found few e100e upstream fixes from Benjamin Poirier in lede > > > > > > source tree, https://git.lede-project.org/?p=source.git, and > > > > > > these fixes seem reasonable enough for 4.14.y too. > > > > > > > > > > > > Also submitting an e1000e buffer overrun fix by Sasha Neftin. > > > > > > > > > > > > Cherry-picked and build tested for linux v4.14.2 for ARCH=arm/arm64. > > > > > > > > > > > > Regards, > > > > > > Amit Pundir > > > > > > > > > > > > > > > > > > Benjamin Poirier (4): > > > > > > e1000e: Fix error path in link detection > > > > > > e1000e: Fix return value test > > > > > > e1000e: Separate signaling for link check/link up > > > > > > e1000e: Avoid receiver overrun interrupt bursts > > > > > > > > > > > > Sasha Neftin (1): > > > > > > e1000e: fix buffer overrun while the I219 is processing DMA > > > > > > transactions > > > > > > > > > > Hello everybody, > > > > > > > > > > looks like one of these breaks connectivity on my Thinkpad X250. > > > > > Just downgraded to linux 4.14.2 to verify. > > > > > > > > Can you try the -rc release I just did? It has a fix for this series in > > > > it. > > > > > > It connects with the notebook's built in ethernet port (did not check with > > > 4.14.3) but still fails to see a link when placed in docking station. > > > > Do you have the same issues with 4.15-rc2? > > Just a short heads-up and final result for this thread... > The issue is fixed with Benjamin's patch: > > https://patchwork.kernel.org/patch/10104349/ Any word on getting this patch into Linus's tree anytime soon? thanks, greg k-h

7 years, 1 month

2
1
0 0

[Linux-stable-mirror] [PATCH] clk: sunxi: sun9i-mmc: Implement reset callback for reset controls

by Chen-Yu Tsai

Our MMC host driver now issues a reset, instead of just deasserting the reset control, since commit c34eda69ad4c ("mmc: sunxi: Reset the device at probe time"). The sun9i-mmc clock driver does not support this, and will fail, which results in MMC not probing. This patch implements the reset callback by asserting the reset control, then deasserting it after a small delay. Fixes: 7a6fca879f59 ("clk: sunxi: Add driver for A80 MMC config clocks/resets") Cc: <stable(a)vger.kernel.org> # 4.14.x Signed-off-by: Chen-Yu Tsai <wens(a)csie.org> --- drivers/clk/sunxi/clk-sun9i-mmc.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/clk/sunxi/clk-sun9i-mmc.c b/drivers/clk/sunxi/clk-sun9i-mmc.c index a1a634253d6f..f00d8758ba24 100644 --- a/drivers/clk/sunxi/clk-sun9i-mmc.c +++ b/drivers/clk/sunxi/clk-sun9i-mmc.c @@ -16,6 +16,7 @@ #include <linux/clk.h> #include <linux/clk-provider.h> +#include <linux/delay.h> #include <linux/init.h> #include <linux/of.h> #include <linux/of_device.h> @@ -83,9 +84,20 @@ static int sun9i_mmc_reset_deassert(struct reset_controller_dev *rcdev, return 0; } +static int sun9i_mmc_reset_reset(struct reset_controller_dev *rcdev, + unsigned long id) +{ + sun9i_mmc_reset_assert(rcdev, id); + udelay(10); + sun9i_mmc_reset_deassert(rcdev, id); + + return 0; +} + static const struct reset_control_ops sun9i_mmc_reset_ops = { .assert = sun9i_mmc_reset_assert, .deassert = sun9i_mmc_reset_deassert, + .reset = sun9i_mmc_reset_reset, }; static int sun9i_a80_mmc_config_clk_probe(struct platform_device *pdev) -- 2.15.0

7 years, 1 month

3
2
0 0

Re: [Linux-stable-mirror] [PATCH] mtd: cfi: convert inline functions to macros

by Richard Weinberger

Am Mittwoch, 11. Oktober 2017, 15:54:10 CET schrieb Arnd Bergmann: > The map_word_() functions, dating back to linux-2.6.8, try to perform > bitwise operations on a 'map_word' structure. This may have worked > with compilers that were current then (gcc-3.4 or earlier), but end > up being rather inefficient on any version I could try now (gcc-4.4 or > higher). Specifically we hit a problem analyzed in gcc PR81715 where we > fail to reuse the stack space for local variables. > > This can be seen immediately in the stack consumption for > cfi_staa_erase_varsize() and other functions that (with CONFIG_KASAN) > can be up to 2200 bytes. Changing the inline functions into macros brings > this down to 1280 bytes. Without KASAN, the same problem exists, but > the stack consumption is lower to start with, my patch shrinks it from > 920 to 496 bytes on with arm-linux-gnueabi-gcc-5.4, and saves around > 1KB in .text size for cfi_cmdset_0020.c, as it avoids copying map_word > structures for each call to one of these helpers. > > With the latest gcc-8 snapshot, the problem is fixed in upstream gcc, > but nobody uses that yet, so we should still work around it in mainline > kernels and probably backport the workaround to stable kernels as well. > We had a couple of other functions that suffered from the same gcc bug, > and all of those had a simpler workaround involving dummy variables > in the inline function. Unfortunately that did not work here, the > macro hack was the best I could come up with. > > It would also be helpful to have someone to a little performance testing > on the patch, to see how much it helps in terms of CPU utilitzation. > > Link: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81715 > Cc: stable(a)vger.kernel.org > Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> Acked-by: Richard Weinberger <richard(a)nod.at> Marek, I know you are not super happy with this patch but IMHO this is the solution with the least hassle. While functions offer better type checking I think this functions are trivial enough to exist as macros too. Also forcing users to upgrade/fix their compilers is only possible in a perfect world. Thanks, //richard

7 years, 1 month

4
5
0 0

[Linux-stable-mirror] FAILED: patch "[PATCH] usb: musb: da8xx: fix babble condition handling" failed to apply to 4.14-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From bd3486ded7a0c313a6575343e6c2b21d14476645 Mon Sep 17 00:00:00 2001 From: Bin Liu <b-liu(a)ti.com> Date: Tue, 5 Dec 2017 08:45:30 -0600 Subject: [PATCH] usb: musb: da8xx: fix babble condition handling When babble condition happens, the musb controller might automatically turns off VBUS. On DA8xx platform, the controller generates drvvbus interrupt for turning off VBUS along with the babble interrupt. In this case, we should handle the babble interrupt first and recover from the babble condition. This change ignores the drvvbus interrupt if babble interrupt is also generated at the same time, so the babble recovery routine works properly. Cc: stable(a)vger.kernel.org # v3.16+ Signed-off-by: Bin Liu <b-liu(a)ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> diff --git a/drivers/usb/musb/da8xx.c b/drivers/usb/musb/da8xx.c index 0397606a211b..6c036de63272 100644 --- a/drivers/usb/musb/da8xx.c +++ b/drivers/usb/musb/da8xx.c @@ -284,7 +284,15 @@ static irqreturn_t da8xx_musb_interrupt(int irq, void *hci) musb->xceiv->otg->state = OTG_STATE_A_WAIT_VRISE; portstate(musb->port1_status |= USB_PORT_STAT_POWER); del_timer(&musb->dev_timer); - } else { + } else if (!(musb->int_usb & MUSB_INTR_BABBLE)) { + /* + * When babble condition happens, drvvbus interrupt + * is also generated. Ignore this drvvbus interrupt + * and let babble interrupt handler recovers the + * controller; otherwise, the host-mode flag is lost + * due to the MUSB_DEV_MODE() call below and babble + * recovery logic will not be called. + */ musb->is_active = 0; MUSB_DEV_MODE(musb); otg->default_a = 0;

7 years, 1 month

3
3
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror