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

patch "usb: core: message: remove extra endianness conversion in" added to usb-next

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled usb: core: message: remove extra endianness conversion in 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-next 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 also be merged in the next major kernel release during the merge window. If you have any questions about this process, please let me know. >From 48b73d0fa11aa8613d51f7be61d2fa7f0ab05fd3 Mon Sep 17 00:00:00 2001 From: Ruslan Bilovol <ruslan.bilovol(a)gmail.com> Date: Fri, 25 May 2018 19:11:40 +0300 Subject: usb: core: message: remove extra endianness conversion in usb_set_isoch_delay No need to do extra endianness conversion in usb_set_isoch_delay because it is already done in usb_control_msg() Fixes: 886ee36e7205 ("usb: core: add support for USB_REQ_SET_ISOCH_DELAY") Cc: Dmytro Panchenko <dmytro.panchenko(a)globallogic.com> Cc: Felipe Balbi <felipe.balbi(a)linux.intel.com> Cc: stable <stable(a)vger.kernel.org> # v4.16+ Signed-off-by: Ruslan Bilovol <ruslan.bilovol(a)gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/usb/core/message.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c index 0c11d40a12bc..7b137003c2be 100644 --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c @@ -940,7 +940,7 @@ int usb_set_isoch_delay(struct usb_device *dev) return usb_control_msg(dev, usb_sndctrlpipe(dev, 0), USB_REQ_SET_ISOCH_DELAY, USB_DIR_OUT | USB_TYPE_STANDARD | USB_RECIP_DEVICE, - cpu_to_le16(dev->hub_delay), 0, NULL, 0, + dev->hub_delay, 0, NULL, 0, USB_CTRL_SET_TIMEOUT); } -- 2.17.1

7 years, 5 months

1
0
0 0

patch "NFC: pn533: don't send USB data off of the stack" added to usb-next

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled NFC: pn533: don't send USB data off of the stack 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-next 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 also be merged in the next major kernel release during the merge window. If you have any questions about this process, please let me know. >From dbafc28955fa6779dc23d1607a0fee5e509a278b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Date: Sun, 20 May 2018 15:19:46 +0200 Subject: NFC: pn533: don't send USB data off of the stack It's amazing that this driver ever worked, but now that x86 doesn't allow USB data to be sent off of the stack, it really does not work at all. Fix this up by properly allocating the data for the small "commands" that get sent to the device off of the stack. We do this for one command by having a whole urb just for ack messages, as they can be submitted in interrupt context, so we can not use usb_bulk_msg(). But the poweron command can sleep (and does), so use usb_bulk_msg() for that transfer. Reported-by: Carlos Manuel Santos <cmmpsantos(a)gmail.com> Cc: Samuel Ortiz <sameo(a)linux.intel.com> Cc: Stephen Hemminger <stephen(a)networkplumber.org> Cc: stable <stable(a)vger.kernel.org> Reviewed-by: Johan Hovold <johan(a)kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/nfc/pn533/usb.c | 42 +++++++++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/drivers/nfc/pn533/usb.c b/drivers/nfc/pn533/usb.c index e153e8b64bb8..d5553c47014f 100644 --- a/drivers/nfc/pn533/usb.c +++ b/drivers/nfc/pn533/usb.c @@ -62,6 +62,9 @@ struct pn533_usb_phy { struct urb *out_urb; struct urb *in_urb; + struct urb *ack_urb; + u8 *ack_buffer; + struct pn533 *priv; }; @@ -150,13 +153,16 @@ static int pn533_usb_send_ack(struct pn533 *dev, gfp_t flags) struct pn533_usb_phy *phy = dev->phy; static const u8 ack[6] = {0x00, 0x00, 0xff, 0x00, 0xff, 0x00}; /* spec 7.1.1.3: Preamble, SoPC (2), ACK Code (2), Postamble */ - int rc; - phy->out_urb->transfer_buffer = (u8 *)ack; - phy->out_urb->transfer_buffer_length = sizeof(ack); - rc = usb_submit_urb(phy->out_urb, flags); + if (!phy->ack_buffer) { + phy->ack_buffer = kmemdup(ack, sizeof(ack), flags); + if (!phy->ack_buffer) + return -ENOMEM; + } - return rc; + phy->ack_urb->transfer_buffer = phy->ack_buffer; + phy->ack_urb->transfer_buffer_length = sizeof(ack); + return usb_submit_urb(phy->ack_urb, flags); } static int pn533_usb_send_frame(struct pn533 *dev, @@ -375,26 +381,31 @@ static int pn533_acr122_poweron_rdr(struct pn533_usb_phy *phy) /* Power on th reader (CCID cmd) */ u8 cmd[10] = {PN533_ACR122_PC_TO_RDR_ICCPOWERON, 0, 0, 0, 0, 0, 0, 3, 0, 0}; + char *buffer; + int transferred; int rc; void *cntx; struct pn533_acr122_poweron_rdr_arg arg; dev_dbg(&phy->udev->dev, "%s\n", __func__); + buffer = kmemdup(cmd, sizeof(cmd), GFP_KERNEL); + if (!buffer) + return -ENOMEM; + init_completion(&arg.done); cntx = phy->in_urb->context; /* backup context */ phy->in_urb->complete = pn533_acr122_poweron_rdr_resp; phy->in_urb->context = &arg; - phy->out_urb->transfer_buffer = cmd; - phy->out_urb->transfer_buffer_length = sizeof(cmd); - print_hex_dump_debug("ACR122 TX: ", DUMP_PREFIX_NONE, 16, 1, cmd, sizeof(cmd), false); - rc = usb_submit_urb(phy->out_urb, GFP_KERNEL); - if (rc) { + rc = usb_bulk_msg(phy->udev, phy->out_urb->pipe, buffer, sizeof(cmd), + &transferred, 0); + kfree(buffer); + if (rc || (transferred != sizeof(cmd))) { nfc_err(&phy->udev->dev, "Reader power on cmd error %d\n", rc); return rc; @@ -490,8 +501,9 @@ static int pn533_usb_probe(struct usb_interface *interface, phy->in_urb = usb_alloc_urb(0, GFP_KERNEL); phy->out_urb = usb_alloc_urb(0, GFP_KERNEL); + phy->ack_urb = usb_alloc_urb(0, GFP_KERNEL); - if (!phy->in_urb || !phy->out_urb) + if (!phy->in_urb || !phy->out_urb || !phy->ack_urb) goto error; usb_fill_bulk_urb(phy->in_urb, phy->udev, @@ -501,7 +513,9 @@ static int pn533_usb_probe(struct usb_interface *interface, usb_fill_bulk_urb(phy->out_urb, phy->udev, usb_sndbulkpipe(phy->udev, out_endpoint), NULL, 0, pn533_send_complete, phy); - + usb_fill_bulk_urb(phy->ack_urb, phy->udev, + usb_sndbulkpipe(phy->udev, out_endpoint), + NULL, 0, pn533_send_complete, phy); switch (id->driver_info) { case PN533_DEVICE_STD: @@ -554,6 +568,7 @@ static int pn533_usb_probe(struct usb_interface *interface, error: usb_free_urb(phy->in_urb); usb_free_urb(phy->out_urb); + usb_free_urb(phy->ack_urb); usb_put_dev(phy->udev); kfree(in_buf); @@ -573,10 +588,13 @@ static void pn533_usb_disconnect(struct usb_interface *interface) usb_kill_urb(phy->in_urb); usb_kill_urb(phy->out_urb); + usb_kill_urb(phy->ack_urb); kfree(phy->in_urb->transfer_buffer); usb_free_urb(phy->in_urb); usb_free_urb(phy->out_urb); + usb_free_urb(phy->ack_urb); + kfree(phy->ack_buffer); nfc_info(&interface->dev, "NXP PN533 NFC device disconnected\n"); } -- 2.17.1

7 years, 5 months

1
0
0 0

[PATCH v3 1/2] cpufreq: ti-cpufreq: Fix an incorrect error return value

by Suman Anna

Commit 05829d9431df ("cpufreq: ti-cpufreq: kfree opp_data when failure") has fixed a memory leak in the failure path, however the patch returned a positive value on get_cpu_device() failure instead of the previous negative value. Fix this incorrect error return value properly. Fixes: 05829d9431df ("cpufreq: ti-cpufreq: kfree opp_data when failure") Cc: Zumeng Chen <zumeng.chen(a)gmail.com> Cc: <stable(a)vger.kernel.org> # v4.14+ Signed-off-by: Suman Anna <s-anna(a)ti.com> Acked-by: Viresh Kumar <viresh.kumar(a)linaro.org> --- drivers/cpufreq/ti-cpufreq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/cpufreq/ti-cpufreq.c b/drivers/cpufreq/ti-cpufreq.c index 6ba709b6f095..896caba5dfe5 100644 --- a/drivers/cpufreq/ti-cpufreq.c +++ b/drivers/cpufreq/ti-cpufreq.c @@ -226,7 +226,7 @@ static int ti_cpufreq_probe(struct platform_device *pdev) opp_data->cpu_dev = get_cpu_device(0); if (!opp_data->cpu_dev) { pr_err("%s: Failed to get device for CPU0\n", __func__); - ret = ENODEV; + ret = -ENODEV; goto free_opp_data; } -- 2.17.0

7 years, 5 months

1
0
0 0

[PATCH] MIPS: ptrace: Fix PTRACE_PEEKUSR requests for 64-bit FGRs

by Maciej W. Rozycki

Use 64-bit accesses for 64-bit floating-point general registers with PTRACE_PEEKUSR, removing the truncation of their upper halves in the FR=1 mode, caused by commit bbd426f542cb ("MIPS: Simplify FP context access"), which inadvertently switched them to using 32-bit accesses. The PTRACE_POKEUSR side is fine as it's never been broken and continues using 64-bit accesses. Cc: <stable(a)vger.kernel.org> # 3.19+ Fixes: bbd426f542cb ("MIPS: Simplify FP context access") Signed-off-by: Maciej W. Rozycki <macro(a)mips.com> --- Hi, Here's another one, spotted in the course of GDB PR gdb/22286 regression testing with the n64 ABI. Please apply. Maciej --- arch/mips/kernel/ptrace.c | 2 +- arch/mips/kernel/ptrace32.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) linux-mips-ptrace-peekusr-fp64.diff Index: linux/arch/mips/kernel/ptrace.c =================================================================== --- linux.orig/arch/mips/kernel/ptrace.c 2018-05-15 17:44:25.000000000 +0100 +++ linux/arch/mips/kernel/ptrace.c 2018-05-16 11:22:00.714605000 +0100 @@ -1070,7 +1070,7 @@ long arch_ptrace(struct task_struct *chi break; } #endif - tmp = get_fpr32(&fregs[addr - FPR_BASE], 0); + tmp = get_fpr64(&fregs[addr - FPR_BASE], 0); break; case PC: tmp = regs->cp0_epc; Index: linux/arch/mips/kernel/ptrace32.c =================================================================== --- linux.orig/arch/mips/kernel/ptrace32.c 2018-05-15 17:45:16.000000000 +0100 +++ linux/arch/mips/kernel/ptrace32.c 2018-05-16 11:22:16.313698000 +0100 @@ -109,7 +109,7 @@ long compat_arch_ptrace(struct task_stru addr & 1); break; } - tmp = get_fpr32(&fregs[addr - FPR_BASE], 0); + tmp = get_fpr64(&fregs[addr - FPR_BASE], 0); break; case PC: tmp = regs->cp0_epc;

7 years, 5 months

3
4
0 0

[PATCH] MIPS: prctl: Disallow FRE without FR with PR_SET_FP_MODE requests

by Maciej W. Rozycki

Having PR_FP_MODE_FRE (i.e. Config5.FRE) set without PR_FP_MODE_FR (i.e. Status.FR) is not supported as the lone purpose of Config5.FRE is to emulate Status.FR=0 handling on FPU hardware that has Status.FR=1 hardwired[1][2]. Also we do not handle this case elsewhere, and assume throughout our code that TIF_HYBRID_FPREGS and TIF_32BIT_FPREGS cannot be set both at once for a task, leading to inconsistent behaviour if this does happen. Return unsuccessfully then from prctl(2) PR_SET_FP_MODE calls requesting PR_FP_MODE_FRE to be set with PR_FP_MODE_FR clear. This corresponds to modes allowed by `mips_set_personality_fp'. References: [1] "MIPS Architecture For Programmers, Vol. III: MIPS32 / microMIPS32 Privileged Resource Architecture", Imagination Technologies, Document Number: MD00090, Revision 6.02, July 10, 2015, Table 9.69 "Config5 Register Field Descriptions", p. 262 [2] "MIPS Architecture For Programmers, Volume III: MIPS64 / microMIPS64 Privileged Resource Architecture", Imagination Technologies, Document Number: MD00091, Revision 6.03, December 22, 2015, Table 9.72 "Config5 Register Field Descriptions", p. 288 Cc: stable(a)vger.kernel.org # 4.0+ Fixes: 9791554b45a2 ("MIPS,prctl: add PR_[GS]ET_FP_MODE prctl options for MIPS") Signed-off-by: Maciej W. Rozycki <macro(a)mips.com> --- arch/mips/kernel/process.c | 4 ++++ 1 file changed, 4 insertions(+) linux-mips-set-process-fp-mode-fr-fre.diff Index: linux/arch/mips/kernel/process.c =================================================================== --- linux.orig/arch/mips/kernel/process.c 2018-05-12 22:52:11.000000000 +0100 +++ linux/arch/mips/kernel/process.c 2018-05-12 23:07:15.147112000 +0100 @@ -721,6 +721,10 @@ int mips_set_process_fp_mode(struct task if (value & ~known_bits) return -EOPNOTSUPP; + /* Setting FRE without FR is not supported. */ + if ((value & (PR_FP_MODE_FR | PR_FP_MODE_FRE)) == PR_FP_MODE_FRE) + return -EOPNOTSUPP; + /* Avoid inadvertently triggering emulation */ if ((value & PR_FP_MODE_FR) && raw_cpu_has_fpu && !(raw_current_cpu_data.fpu_id & MIPS_FPIR_F64))

7 years, 5 months

3
3
0 0

[PATCH 03/18] drm/amd/display: Make atomic-check validate underscan changes

by Harry Wentland

From: David Francis <David.Francis(a)amd.com> When the underscan state was changed, atomic-check was triggering a validation but passing the old underscan values. This change adds a somewhat hacky check in dm_update_crtcs_state that will update the stream if old and newunderscan values are different. This was causing 4k on Fiji to allow underscan when it wasn't permitted. Signed-off-by: David Francis <David.Francis(a)amd.com> Reviewed-by: David Francis <David.Francis(a)amd.com> Acked-by: Harry Wentland <harry.wentland(a)amd.com> Cc: stable(a)vger.kernel.org --- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 07f4793a945f..e7ecddf359da 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -4679,8 +4679,8 @@ static int dm_update_crtcs_state(struct amdgpu_display_manager *dm, for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) { struct amdgpu_crtc *acrtc = NULL; struct amdgpu_dm_connector *aconnector = NULL; - struct drm_connector_state *new_con_state = NULL; - struct dm_connector_state *dm_conn_state = NULL; + struct drm_connector_state *drm_new_conn_state = NULL, *drm_old_conn_state = NULL; + struct dm_connector_state *dm_new_conn_state = NULL, *dm_old_conn_state = NULL; struct drm_plane_state *new_plane_state = NULL; new_stream = NULL; @@ -4701,19 +4701,24 @@ static int dm_update_crtcs_state(struct amdgpu_display_manager *dm, /* TODO This hack should go away */ if (aconnector && enable) { // Make sure fake sink is created in plug-in scenario - new_con_state = drm_atomic_get_connector_state(state, + drm_new_conn_state = drm_atomic_get_new_connector_state(state, &aconnector->base); + drm_old_conn_state = drm_atomic_get_old_connector_state(state, + &aconnector->base); + - if (IS_ERR(new_con_state)) { - ret = PTR_ERR_OR_ZERO(new_con_state); + + if (IS_ERR(drm_new_conn_state)) { + ret = PTR_ERR_OR_ZERO(drm_new_conn_state); break; } - dm_conn_state = to_dm_connector_state(new_con_state); + dm_new_conn_state = to_dm_connector_state(drm_new_conn_state); + dm_old_conn_state = to_dm_connector_state(drm_old_conn_state); new_stream = create_stream_for_sink(aconnector, &new_crtc_state->mode, - dm_conn_state); + dm_new_conn_state); /* * we can have no stream on ACTION_SET if a display @@ -4729,7 +4734,7 @@ static int dm_update_crtcs_state(struct amdgpu_display_manager *dm, } set_freesync_on_stream(dm, dm_new_crtc_state, - dm_conn_state, new_stream); + dm_new_conn_state, new_stream); if (dc_is_stream_unchanged(new_stream, dm_old_crtc_state->stream) && dc_is_stream_scaling_unchanged(new_stream, dm_old_crtc_state->stream)) { @@ -4837,6 +4842,11 @@ static int dm_update_crtcs_state(struct amdgpu_display_manager *dm, */ BUG_ON(dm_new_crtc_state->stream == NULL); + /* Scaling or underscan settings */ + if (is_scaling_state_different(dm_old_conn_state, dm_new_conn_state)) + update_stream_scaling_settings( + &new_crtc_state->mode, dm_new_conn_state, dm_new_crtc_state->stream); + /* Color managment settings */ if (dm_new_crtc_state->base.color_mgmt_changed) { ret = amdgpu_dm_set_regamma_lut(dm_new_crtc_state); -- 2.17.0

7 years, 5 months

2
1
0 0

[PATCH 1/3] orangefs: set i_size on new symlink

by Martin Brandenburg

As long as a symlink inode remains in-core, the destination (and therefore size) will not be re-fetched from the server, as it cannot change. The original implementation of the attribute cache assumed that setting the expiry time in the past was sufficient to cause a re-fetch of all attributes on the next getattr. That does not work in this case. The bug manifested itself as follows. When the command sequence touch foo; ln -s foo bar; ls -l bar is run, the output was lrwxrwxrwx. 1 fedora fedora 4906 Apr 24 19:10 bar -> foo However, after a re-mount, ls -l bar produces lrwxrwxrwx. 1 fedora fedora 3 Apr 24 19:10 bar -> foo After this commit, even before a re-mount, the output is lrwxrwxrwx. 1 fedora fedora 3 Apr 24 19:10 bar -> foo Reported-by: Becky Ligon <ligon(a)clemson.edu> Signed-off-by: Martin Brandenburg <martin(a)omnibond.com> Fixes: 71680c18c8f2 ("orangefs: Cache getattr results.") Cc: stable(a)vger.kernel.org Cc: hubcap(a)omnibond.com --- fs/orangefs/namei.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/fs/orangefs/namei.c b/fs/orangefs/namei.c index 6e3134e6d98a..bfc4b1028701 100644 --- a/fs/orangefs/namei.c +++ b/fs/orangefs/namei.c @@ -327,6 +327,13 @@ static int orangefs_symlink(struct inode *dir, ret = PTR_ERR(inode); goto out; } + /* + * This is necessary because orangefs_inode_getattr will not + * re-read symlink size as it is impossible for it to change. + * Invalidating the cache does not help. orangefs_new_inode + * does not set the correct size (it does not know symname). + */ + inode->i_size = strlen(symname); gossip_debug(GOSSIP_NAME_DEBUG, "Assigned symlink inode new number of %pU\n", -- 2.14.3

7 years, 5 months

1
1
0 0

[PATCH v2] libata: Drop SanDisk SD7UB3Q*G1001 NOLPM quirk

by Hans de Goede

Commit 184add2ca23c ("libata: Apply NOLPM quirk for SanDisk SD7UB3Q*G1001 SSDs") disabled LPM for SanDisk SD7UB3Q*G1001 SSDs. This has lead to several reports of users of that SSD where LPM was working fine and who know have a significantly increased idle power consumption on their laptops. Likely there is another problem on the T450s from the original reporter which gets exposed by the uncore reaching deeper sleep states (higher PC-states) due to LPM being enabled. The problem as reported, a hardfreeze about once a day, already did not sound like it would be caused by LPM and the reports of the SSD working fine confirm this. The original reporter is ok with dropping the quirk. A X250 user has reported the same hard freeze problem and for him the problem went away after unrelated updates, I suspect some GPU driver stack changes fixed things. TL;DR: The original reporters problem were triggered by LPM but not an LPM issue, so drop the quirk for the SSD in question. BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1583207 Cc: stable(a)vger.kernel.org Cc: Richard W.M. Jones <rjones(a)redhat.com> Cc: Lorenzo Dalrio <lorenzo.dalrio(a)gmail.com> Reported-by: Lorenzo Dalrio <lorenzo.dalrio(a)gmail.com> Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- Changes in v2: -Rebase on 4.17-rc7 --- drivers/ata/libata-core.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 346b163f6e89..9bfd2f7e4542 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -4557,9 +4557,6 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { { "SAMSUNG MZMPC128HBFU-000MV", "CXM14M1Q", ATA_HORKAGE_NOLPM, }, { "SAMSUNG SSD PM830 mSATA *", "CXM13D1Q", ATA_HORKAGE_NOLPM, }, - /* Sandisk devices which are known to not handle LPM well */ - { "SanDisk SD7UB3Q*G1001", NULL, ATA_HORKAGE_NOLPM, }, - /* devices that don't properly handle queued TRIM commands */ { "Micron_M500IT_*", "MU01", ATA_HORKAGE_NO_NCQ_TRIM | ATA_HORKAGE_ZERO_AFTER_TRIM, }, -- 2.17.0

7 years, 5 months

3
3
0 0

[PATCH v8 0/5] mtd: cfi_cmdset_0002: Change write and erase functions

by Tokunori Ikegami

The changes are to make sure to check the operation status. Actually the flash write and erase error behavior is caused on our products. The flash is Macronix flash device MX29GL512FHT2I-11G used by our products. The patch series was separated for changes of flash write and erase. Since those were not depended each other at the time. But by additional changes the changes are related more as same way currently. So combine patch series for the flash write and erase changes as v6. Signed-off-by: Tokunori Ikegami <ikegami(a)allied-telesis.co.jp> Reviewed-by: Joakim Tjernlund <Joakim.Tjernlund(a)infinera.com> Cc: Chris Packham <chris.packham(a)alliedtelesis.co.nz> Cc: Brian Norris <computersforpeace(a)gmail.com> Cc: David Woodhouse <dwmw2(a)infradead.org> Cc: Boris Brezillon <boris.brezillon(a)free-electrons.com> Cc: Marek Vasut <marek.vasut(a)gmail.com> Cc: Richard Weinberger <richard(a)nod.at> Cc: Cyrille Pitchen <cyrille.pitchen(a)wedev4u.fr> Cc: linux-mtd(a)lists.infradead.org Cc: stable(a)vger.kernel.org Tokunori Ikegami (5): mtd: cfi_cmdset_0002: Change write buffer to check correct value mtd: cfi_cmdset_0002: Change definition naming to retry write operation mtd: cfi_cmdset_0002: Change erase functions to retry for error mtd: cfi_cmdset_0002: Change erase functions to check chip good only mtd: cfi_cmdset_0002: Change erase one block to enable XIP once drivers/mtd/chips/cfi_cmdset_0002.c | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) -- 2.16.1

7 years, 5 months

2
5
0 0

[PATCH 08/18] drm/amd/display: Update color props when modeset is required

by Harry Wentland

From: "Leo (Sunpeng) Li" <sunpeng.li(a)amd.com> This fixes issues where color management properties don't persist over DPMS on/off, or when the CRTC is moved across connectors. Signed-off-by: Leo (Sunpeng) Li <sunpeng.li(a)amd.com> Reviewed-by: Harry Wentland <Harry.Wentland(a)amd.com> Cc: stable(a)vger.kernel.org --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index b6020a83cdb0..29176d2c5d6e 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -4848,8 +4848,12 @@ static int dm_update_crtcs_state(struct amdgpu_display_manager *dm, update_stream_scaling_settings( &new_crtc_state->mode, dm_new_conn_state, dm_new_crtc_state->stream); - /* Color managment settings */ - if (dm_new_crtc_state->base.color_mgmt_changed) { + /* + * Color management settings. We also update color properties + * when a modeset is needed, to ensure it gets reprogrammed. + */ + if (dm_new_crtc_state->base.color_mgmt_changed || + drm_atomic_crtc_needs_modeset(new_crtc_state)) { ret = amdgpu_dm_set_regamma_lut(dm_new_crtc_state); if (ret) goto fail; -- 2.17.0

7 years, 5 months

1
0
0 0

[PATCH 05/18] drm/amd/display: Fix BUG_ON during CRTC atomic check update

by Harry Wentland

From: "Leo (Sunpeng) Li" <sunpeng.li(a)amd.com> For cases where the CRTC is inactive (DPMS off), where a modeset is not required, yet the CRTC is still in the atomic state, we should not attempt to update anything on it. Previously, we were relying on the modereset_required() helper to check the above condition. However, the function returns false immediatly if a modeset is not required, ignoring the CRTC's enable/active state flags. The correct way to filter is by looking at these flags instead. Signed-off-by: Leo (Sunpeng) Li <sunpeng.li(a)amd.com> Reviewed-by: Harry Wentland <Harry.Wentland(a)amd.com> Cc: stable(a)vger.kernel.org --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index e7ecddf359da..b6020a83cdb0 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -4830,15 +4830,16 @@ static int dm_update_crtcs_state(struct amdgpu_display_manager *dm, * We want to do dc stream updates that do not require a * full modeset below. */ - if (!enable || !aconnector || modereset_required(new_crtc_state)) + if (!(enable && aconnector && new_crtc_state->enable && + new_crtc_state->active)) continue; /* * Given above conditions, the dc state cannot be NULL because: - * 1. We're attempting to enable a CRTC. Which has a... - * 2. Valid connector attached, and - * 3. User does not want to reset it (disable or mark inactive, - * which can happen on a CRTC that's already disabled). - * => It currently exists. + * 1. We're in the process of enabling CRTCs (just been added + * to the dc context, or already is on the context) + * 2. Has a valid connector attached, and + * 3. Is currently active and enabled. + * => The dc stream state currently exists. */ BUG_ON(dm_new_crtc_state->stream == NULL); -- 2.17.0

7 years, 5 months

1
0
0 0

[PATCH v4] xpad: Add GPD Win 2 Controller USB IDs

by flibitijibibo＠gmail.com

From: Ethan Lee <flibitijibibo(a)gmail.com> GPD Win 2 Website: http://www.gpd.hk/gpdwin2.asp Tested on a unit from the first production run sent to Indiegogo backers Signed-off-by: Ethan Lee <flibitijibibo(a)gmail.com> Cc: stable(a)vger.kernel.org --- drivers/input/joystick/xpad.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index 06e9650b3b30..a89b81b35932 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -123,6 +123,7 @@ static const struct xpad_device { u8 mapping; u8 xtype; } xpad_device[] = { + { 0x0079, 0x18d4, "GPD Win 2 Controller", 0, XTYPE_XBOX360 }, { 0x044f, 0x0f00, "Thrustmaster Wheel", 0, XTYPE_XBOX }, { 0x044f, 0x0f03, "Thrustmaster Wheel", 0, XTYPE_XBOX }, { 0x044f, 0x0f07, "Thrustmaster, Inc. Controller", 0, XTYPE_XBOX }, @@ -409,6 +410,7 @@ static const signed short xpad_abs_triggers[] = { static const struct usb_device_id xpad_table[] = { { USB_INTERFACE_INFO('X', 'B', 0) }, /* X-Box USB-IF not approved class */ + XPAD_XBOX360_VENDOR(0x0079), /* GPD Win 2 Controller */ XPAD_XBOX360_VENDOR(0x044f), /* Thrustmaster X-Box 360 controllers */ XPAD_XBOX360_VENDOR(0x045e), /* Microsoft X-Box 360 controllers */ XPAD_XBOXONE_VENDOR(0x045e), /* Microsoft X-Box One controllers */ -- 2.13.6

7 years, 5 months

2
1
0 0

[PATCH v3] goodix: Add new I2C/ACPI ids for GPD Win 2 touch screen

by flibitijibibo＠gmail.com

From: Ethan Lee <flibitijibibo(a)gmail.com> GPD Win 2 Website: http://www.gpd.hk/gpdwin2.asp Tested on a unit from the first production run sent to Indiegogo backers Signed-off-by: Ethan Lee <flibitijibibo(a)gmail.com> Cc: stable(a)vger.kernel.org --- drivers/input/touchscreen/goodix.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscreen/goodix.c index 9736c83dd418..6a4ffe800194 100644 --- a/drivers/input/touchscreen/goodix.c +++ b/drivers/input/touchscreen/goodix.c @@ -926,6 +926,7 @@ static SIMPLE_DEV_PM_OPS(goodix_pm_ops, goodix_suspend, goodix_resume); static const struct i2c_device_id goodix_ts_id[] = { { "GDIX1001:00", 0 }, + { "GDIX1002:00", 0 }, { } }; MODULE_DEVICE_TABLE(i2c, goodix_ts_id); @@ -933,6 +934,7 @@ MODULE_DEVICE_TABLE(i2c, goodix_ts_id); #ifdef CONFIG_ACPI static const struct acpi_device_id goodix_acpi_match[] = { { "GDIX1001", 0 }, + { "GDIX1002", 0 }, { } }; MODULE_DEVICE_TABLE(acpi, goodix_acpi_match); -- 2.13.6

7 years, 5 months

1
0
0 0

[PATCH v2 1/5] crypto: ccree: correct host regs offset

by Gilad Ben-Yossef

The product signature and HW revision register have different offset on the older HW revisions. This fixes the problem of the driver failing sanity check on silicon despite working on the FPGA emulation systems. Fixes: 27b3b22dd98c ("crypto: ccree - add support for older HW revs") Cc: stable(a)vger.kernel.org Signed-off-by: Gilad Ben-Yossef <gilad(a)benyossef.com> --- drivers/crypto/ccree/cc_debugfs.c | 7 +++++-- drivers/crypto/ccree/cc_driver.c | 8 ++++++-- drivers/crypto/ccree/cc_driver.h | 2 ++ drivers/crypto/ccree/cc_host_regs.h | 6 ++++-- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/drivers/crypto/ccree/cc_debugfs.c b/drivers/crypto/ccree/cc_debugfs.c index 08f8db4..5ca184e 100644 --- a/drivers/crypto/ccree/cc_debugfs.c +++ b/drivers/crypto/ccree/cc_debugfs.c @@ -26,7 +26,8 @@ struct cc_debugfs_ctx { static struct dentry *cc_debugfs_dir; static struct debugfs_reg32 debug_regs[] = { - CC_DEBUG_REG(HOST_SIGNATURE), + { .name = "SIGNATURE" }, /* Must be 0th */ + { .name = "VERSION" }, /* Must be 1st */ CC_DEBUG_REG(HOST_IRR), CC_DEBUG_REG(HOST_POWER_DOWN_EN), CC_DEBUG_REG(AXIM_MON_ERR), @@ -34,7 +35,6 @@ static struct debugfs_reg32 debug_regs[] = { CC_DEBUG_REG(HOST_IMR), CC_DEBUG_REG(AXIM_CFG), CC_DEBUG_REG(AXIM_CACHE_PARAMS), - CC_DEBUG_REG(HOST_VERSION), CC_DEBUG_REG(GPR_HOST), CC_DEBUG_REG(AXIM_MON_COMP), }; @@ -58,6 +58,9 @@ int cc_debugfs_init(struct cc_drvdata *drvdata) struct debugfs_regset32 *regset; struct dentry *file; + debug_regs[0].offset = drvdata->sig_offset; + debug_regs[1].offset = drvdata->ver_offset; + ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL); if (!ctx) return -ENOMEM; diff --git a/drivers/crypto/ccree/cc_driver.c b/drivers/crypto/ccree/cc_driver.c index 89ce013..6f93ce7 100644 --- a/drivers/crypto/ccree/cc_driver.c +++ b/drivers/crypto/ccree/cc_driver.c @@ -207,9 +207,13 @@ static int init_cc_resources(struct platform_device *plat_dev) if (hw_rev->rev >= CC_HW_REV_712) { new_drvdata->hash_len_sz = HASH_LEN_SIZE_712; new_drvdata->axim_mon_offset = CC_REG(AXIM_MON_COMP); + new_drvdata->sig_offset = CC_REG(HOST_SIGNATURE_712); + new_drvdata->ver_offset = CC_REG(HOST_VERSION_712); } else { new_drvdata->hash_len_sz = HASH_LEN_SIZE_630; new_drvdata->axim_mon_offset = CC_REG(AXIM_MON_COMP8); + new_drvdata->sig_offset = CC_REG(HOST_SIGNATURE_630); + new_drvdata->ver_offset = CC_REG(HOST_VERSION_630); } platform_set_drvdata(plat_dev, new_drvdata); @@ -276,7 +280,7 @@ static int init_cc_resources(struct platform_device *plat_dev) } /* Verify correct mapping */ - signature_val = cc_ioread(new_drvdata, CC_REG(HOST_SIGNATURE)); + signature_val = cc_ioread(new_drvdata, new_drvdata->sig_offset); if (signature_val != hw_rev->sig) { dev_err(dev, "Invalid CC signature: SIGNATURE=0x%08X != expected=0x%08X\n", signature_val, hw_rev->sig); @@ -287,7 +291,7 @@ static int init_cc_resources(struct platform_device *plat_dev) /* Display HW versions */ dev_info(dev, "ARM CryptoCell %s Driver: HW version 0x%08X, Driver version %s\n", - hw_rev->name, cc_ioread(new_drvdata, CC_REG(HOST_VERSION)), + hw_rev->name, cc_ioread(new_drvdata, new_drvdata->ver_offset), DRV_MODULE_VERSION); rc = init_cc_regs(new_drvdata, true); diff --git a/drivers/crypto/ccree/cc_driver.h b/drivers/crypto/ccree/cc_driver.h index 2048fde..95f82b2 100644 --- a/drivers/crypto/ccree/cc_driver.h +++ b/drivers/crypto/ccree/cc_driver.h @@ -129,6 +129,8 @@ struct cc_drvdata { enum cc_hw_rev hw_rev; u32 hash_len_sz; u32 axim_mon_offset; + u32 sig_offset; + u32 ver_offset; }; struct cc_crypto_alg { diff --git a/drivers/crypto/ccree/cc_host_regs.h b/drivers/crypto/ccree/cc_host_regs.h index f510018..616b2e1 100644 --- a/drivers/crypto/ccree/cc_host_regs.h +++ b/drivers/crypto/ccree/cc_host_regs.h @@ -45,7 +45,8 @@ #define CC_HOST_ICR_DSCRPTR_WATERMARK_QUEUE0_CLEAR_BIT_SIZE 0x1UL #define CC_HOST_ICR_AXIM_COMP_INT_CLEAR_BIT_SHIFT 0x17UL #define CC_HOST_ICR_AXIM_COMP_INT_CLEAR_BIT_SIZE 0x1UL -#define CC_HOST_SIGNATURE_REG_OFFSET 0xA24UL +#define CC_HOST_SIGNATURE_712_REG_OFFSET 0xA24UL +#define CC_HOST_SIGNATURE_630_REG_OFFSET 0xAC8UL #define CC_HOST_SIGNATURE_VALUE_BIT_SHIFT 0x0UL #define CC_HOST_SIGNATURE_VALUE_BIT_SIZE 0x20UL #define CC_HOST_BOOT_REG_OFFSET 0xA28UL @@ -105,7 +106,8 @@ #define CC_HOST_BOOT_ONLY_ENCRYPT_LOCAL_BIT_SIZE 0x1UL #define CC_HOST_BOOT_AES_EXISTS_LOCAL_BIT_SHIFT 0x1EUL #define CC_HOST_BOOT_AES_EXISTS_LOCAL_BIT_SIZE 0x1UL -#define CC_HOST_VERSION_REG_OFFSET 0xA40UL +#define CC_HOST_VERSION_712_REG_OFFSET 0xA40UL +#define CC_HOST_VERSION_630_REG_OFFSET 0xAD8UL #define CC_HOST_VERSION_VALUE_BIT_SHIFT 0x0UL #define CC_HOST_VERSION_VALUE_BIT_SIZE 0x20UL #define CC_HOST_KFDE0_VALID_REG_OFFSET 0xA60UL -- 2.7.4

7 years, 5 months

2
2
0 0

[PATCH] libata: Drop SanDisk SD7UB3Q*G1001 NOLPM quirk

by Hans de Goede

Commit 184add2ca23c ("libata: Apply NOLPM quirk for SanDisk SD7UB3Q*G1001 SSDs") disabled LPM for SanDisk SD7UB3Q*G1001 SSDs. This has lead to several reports of users of that SSD where LPM was working fine and who know have a significantly increased idle power consumption on their laptops. Likely there is another problem on the T450s from the original reporter which gets exposed by the uncore reaching deeper sleep states (higher PC-states) due to LPM being enabled. The problem as reported, a hardfreeze about once a day, already did not sound like it would be caused by LPM and the reports of the SSD working fine confirm this. The original reporter is ok with dropping the quirk. A X250 user has reported the same hard freeze problem and for him the problem went away after unrelated updates, I suspect some GPU driver stack changes fixed things. TL;DR: The original reporters problem were triggered by LPM but not an LPM issue, so drop the quirk for the SSD in question. BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1583207 Cc: stable(a)vger.kernel.org Cc: Richard W.M. Jones <rjones(a)redhat.com> Cc: Lorenzo Dalrio <lorenzo.dalrio(a)gmail.com> Reported-by: Lorenzo Dalrio <lorenzo.dalrio(a)gmail.com> Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- drivers/ata/libata-core.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 68596bd4cf06..6e400ff2b5db 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -4552,9 +4552,6 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { /* This specific Samsung model/firmware-rev does not handle LPM well */ { "SAMSUNG MZMPC128HBFU-000MV", "CXM14M1Q", ATA_HORKAGE_NOLPM, }, - /* Sandisk devices which are known to not handle LPM well */ - { "SanDisk SD7UB3Q*G1001", NULL, ATA_HORKAGE_NOLPM, }, - /* devices that don't properly handle queued TRIM commands */ { "Micron_M500_*", NULL, ATA_HORKAGE_NO_NCQ_TRIM | ATA_HORKAGE_ZERO_AFTER_TRIM, }, -- 2.17.0

7 years, 5 months

1
1
0 0

patch "usb: core: message: remove extra endianness conversion in" added to usb-testing

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled usb: core: message: remove extra endianness conversion in 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-testing 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 be merged to the usb-next branch sometime soon, after it passes testing, and the merge window is open. If you have any questions about this process, please let me know. >From 48b73d0fa11aa8613d51f7be61d2fa7f0ab05fd3 Mon Sep 17 00:00:00 2001 From: Ruslan Bilovol <ruslan.bilovol(a)gmail.com> Date: Fri, 25 May 2018 19:11:40 +0300 Subject: usb: core: message: remove extra endianness conversion in usb_set_isoch_delay No need to do extra endianness conversion in usb_set_isoch_delay because it is already done in usb_control_msg() Fixes: 886ee36e7205 ("usb: core: add support for USB_REQ_SET_ISOCH_DELAY") Cc: Dmytro Panchenko <dmytro.panchenko(a)globallogic.com> Cc: Felipe Balbi <felipe.balbi(a)linux.intel.com> Cc: stable <stable(a)vger.kernel.org> # v4.16+ Signed-off-by: Ruslan Bilovol <ruslan.bilovol(a)gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/usb/core/message.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c index 0c11d40a12bc..7b137003c2be 100644 --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c @@ -940,7 +940,7 @@ int usb_set_isoch_delay(struct usb_device *dev) return usb_control_msg(dev, usb_sndctrlpipe(dev, 0), USB_REQ_SET_ISOCH_DELAY, USB_DIR_OUT | USB_TYPE_STANDARD | USB_RECIP_DEVICE, - cpu_to_le16(dev->hub_delay), 0, NULL, 0, + dev->hub_delay, 0, NULL, 0, USB_CTRL_SET_TIMEOUT); } -- 2.17.1

7 years, 5 months

1
0
0 0

patch "NFC: pn533: don't send USB data off of the stack" added to usb-testing

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled NFC: pn533: don't send USB data off of the stack 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-testing 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 be merged to the usb-next branch sometime soon, after it passes testing, and the merge window is open. If you have any questions about this process, please let me know. >From dbafc28955fa6779dc23d1607a0fee5e509a278b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Date: Sun, 20 May 2018 15:19:46 +0200 Subject: NFC: pn533: don't send USB data off of the stack It's amazing that this driver ever worked, but now that x86 doesn't allow USB data to be sent off of the stack, it really does not work at all. Fix this up by properly allocating the data for the small "commands" that get sent to the device off of the stack. We do this for one command by having a whole urb just for ack messages, as they can be submitted in interrupt context, so we can not use usb_bulk_msg(). But the poweron command can sleep (and does), so use usb_bulk_msg() for that transfer. Reported-by: Carlos Manuel Santos <cmmpsantos(a)gmail.com> Cc: Samuel Ortiz <sameo(a)linux.intel.com> Cc: Stephen Hemminger <stephen(a)networkplumber.org> Cc: stable <stable(a)vger.kernel.org> Reviewed-by: Johan Hovold <johan(a)kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/nfc/pn533/usb.c | 42 +++++++++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/drivers/nfc/pn533/usb.c b/drivers/nfc/pn533/usb.c index e153e8b64bb8..d5553c47014f 100644 --- a/drivers/nfc/pn533/usb.c +++ b/drivers/nfc/pn533/usb.c @@ -62,6 +62,9 @@ struct pn533_usb_phy { struct urb *out_urb; struct urb *in_urb; + struct urb *ack_urb; + u8 *ack_buffer; + struct pn533 *priv; }; @@ -150,13 +153,16 @@ static int pn533_usb_send_ack(struct pn533 *dev, gfp_t flags) struct pn533_usb_phy *phy = dev->phy; static const u8 ack[6] = {0x00, 0x00, 0xff, 0x00, 0xff, 0x00}; /* spec 7.1.1.3: Preamble, SoPC (2), ACK Code (2), Postamble */ - int rc; - phy->out_urb->transfer_buffer = (u8 *)ack; - phy->out_urb->transfer_buffer_length = sizeof(ack); - rc = usb_submit_urb(phy->out_urb, flags); + if (!phy->ack_buffer) { + phy->ack_buffer = kmemdup(ack, sizeof(ack), flags); + if (!phy->ack_buffer) + return -ENOMEM; + } - return rc; + phy->ack_urb->transfer_buffer = phy->ack_buffer; + phy->ack_urb->transfer_buffer_length = sizeof(ack); + return usb_submit_urb(phy->ack_urb, flags); } static int pn533_usb_send_frame(struct pn533 *dev, @@ -375,26 +381,31 @@ static int pn533_acr122_poweron_rdr(struct pn533_usb_phy *phy) /* Power on th reader (CCID cmd) */ u8 cmd[10] = {PN533_ACR122_PC_TO_RDR_ICCPOWERON, 0, 0, 0, 0, 0, 0, 3, 0, 0}; + char *buffer; + int transferred; int rc; void *cntx; struct pn533_acr122_poweron_rdr_arg arg; dev_dbg(&phy->udev->dev, "%s\n", __func__); + buffer = kmemdup(cmd, sizeof(cmd), GFP_KERNEL); + if (!buffer) + return -ENOMEM; + init_completion(&arg.done); cntx = phy->in_urb->context; /* backup context */ phy->in_urb->complete = pn533_acr122_poweron_rdr_resp; phy->in_urb->context = &arg; - phy->out_urb->transfer_buffer = cmd; - phy->out_urb->transfer_buffer_length = sizeof(cmd); - print_hex_dump_debug("ACR122 TX: ", DUMP_PREFIX_NONE, 16, 1, cmd, sizeof(cmd), false); - rc = usb_submit_urb(phy->out_urb, GFP_KERNEL); - if (rc) { + rc = usb_bulk_msg(phy->udev, phy->out_urb->pipe, buffer, sizeof(cmd), + &transferred, 0); + kfree(buffer); + if (rc || (transferred != sizeof(cmd))) { nfc_err(&phy->udev->dev, "Reader power on cmd error %d\n", rc); return rc; @@ -490,8 +501,9 @@ static int pn533_usb_probe(struct usb_interface *interface, phy->in_urb = usb_alloc_urb(0, GFP_KERNEL); phy->out_urb = usb_alloc_urb(0, GFP_KERNEL); + phy->ack_urb = usb_alloc_urb(0, GFP_KERNEL); - if (!phy->in_urb || !phy->out_urb) + if (!phy->in_urb || !phy->out_urb || !phy->ack_urb) goto error; usb_fill_bulk_urb(phy->in_urb, phy->udev, @@ -501,7 +513,9 @@ static int pn533_usb_probe(struct usb_interface *interface, usb_fill_bulk_urb(phy->out_urb, phy->udev, usb_sndbulkpipe(phy->udev, out_endpoint), NULL, 0, pn533_send_complete, phy); - + usb_fill_bulk_urb(phy->ack_urb, phy->udev, + usb_sndbulkpipe(phy->udev, out_endpoint), + NULL, 0, pn533_send_complete, phy); switch (id->driver_info) { case PN533_DEVICE_STD: @@ -554,6 +568,7 @@ static int pn533_usb_probe(struct usb_interface *interface, error: usb_free_urb(phy->in_urb); usb_free_urb(phy->out_urb); + usb_free_urb(phy->ack_urb); usb_put_dev(phy->udev); kfree(in_buf); @@ -573,10 +588,13 @@ static void pn533_usb_disconnect(struct usb_interface *interface) usb_kill_urb(phy->in_urb); usb_kill_urb(phy->out_urb); + usb_kill_urb(phy->ack_urb); kfree(phy->in_urb->transfer_buffer); usb_free_urb(phy->in_urb); usb_free_urb(phy->out_urb); + usb_free_urb(phy->ack_urb); + kfree(phy->ack_buffer); nfc_info(&interface->dev, "NXP PN533 NFC device disconnected\n"); } -- 2.17.1

7 years, 5 months

1
0
0 0

[PATCH v4] rtc: sun6i: Fix bit_idx value for clk_register_gate

by Jagan Teki

From: Michael Trimarchi <michael(a)amarulasolutions.com> clk-gate core will take bit_idx through clk_register_gate and then do clk_gate_ops by using BIT(bit_idx), but rtc-sun6i is passing bit_idx as BIT(bit_idx) it becomes BIT(BIT(bit_idx) which is wrong and eventually external gate clock is not enabling. This patch fixed by passing bit index and the original change introduced from below commit. "rtc: sun6i: Add support for the external oscillator gate" (sha1: 17ecd246414b3a0fe0cb248c86977a8bda465b7b) Signed-off-by: Michael Trimarchi <michael(a)amarulasolutions.com> Fixes: 17ecd246414b ("rtc: sun6i: Add support for the external oscillator gate") Cc: stable(a)vger.kernel.org Signed-off-by: Jagan Teki <jagan(a)amarulasolutions.com> --- Changes for v4: - Cc to stable tree Changes for v3: - add fixes tag - Cced stable ML Changes for v2: - add suffix _OFFSET with macro name to distinguish b/w register actual values vs offset. drivers/rtc/rtc-sun6i.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/rtc/rtc-sun6i.c b/drivers/rtc/rtc-sun6i.c index 2e6fb275acc8..2cd5a7b1a2e3 100644 --- a/drivers/rtc/rtc-sun6i.c +++ b/drivers/rtc/rtc-sun6i.c @@ -74,7 +74,7 @@ #define SUN6I_ALARM_CONFIG_WAKEUP BIT(0) #define SUN6I_LOSC_OUT_GATING 0x0060 -#define SUN6I_LOSC_OUT_GATING_EN BIT(0) +#define SUN6I_LOSC_OUT_GATING_EN_OFFSET 0 /* * Get date values @@ -255,7 +255,7 @@ static void __init sun6i_rtc_clk_init(struct device_node *node) &clkout_name); rtc->ext_losc = clk_register_gate(NULL, clkout_name, rtc->hw.init->name, 0, rtc->base + SUN6I_LOSC_OUT_GATING, - SUN6I_LOSC_OUT_GATING_EN, 0, + SUN6I_LOSC_OUT_GATING_EN_OFFSET, 0, &rtc->lock); if (IS_ERR(rtc->ext_losc)) { pr_crit("Couldn't register the LOSC external gate\n"); -- 2.14.3

7 years, 5 months

3
2
0 0

[PATCH v3] xpad: Add GPD Win 2 Controller USB IDs

by flibitijibibo＠gmail.com

From: Ethan Lee <flibitijibibo(a)gmail.com> GPD Win 2 Website: http://www.gpd.hk/gpdwin2.asp Tested on a unit from the first production run sent to Indiegogo backers Signed-off-by: Ethan Lee <flibitijibibo(a)gmail.com> --- drivers/input/joystick/xpad.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index 06e9650b3b30..a89b81b35932 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -123,6 +123,7 @@ static const struct xpad_device { u8 mapping; u8 xtype; } xpad_device[] = { + { 0x0079, 0x18d4, "GPD Win 2 Controller", 0, XTYPE_XBOX360 }, { 0x044f, 0x0f00, "Thrustmaster Wheel", 0, XTYPE_XBOX }, { 0x044f, 0x0f03, "Thrustmaster Wheel", 0, XTYPE_XBOX }, { 0x044f, 0x0f07, "Thrustmaster, Inc. Controller", 0, XTYPE_XBOX }, @@ -409,6 +410,7 @@ static const signed short xpad_abs_triggers[] = { static const struct usb_device_id xpad_table[] = { { USB_INTERFACE_INFO('X', 'B', 0) }, /* X-Box USB-IF not approved class */ + XPAD_XBOX360_VENDOR(0x0079), /* GPD Win 2 Controller */ XPAD_XBOX360_VENDOR(0x044f), /* Thrustmaster X-Box 360 controllers */ XPAD_XBOX360_VENDOR(0x045e), /* Microsoft X-Box 360 controllers */ XPAD_XBOXONE_VENDOR(0x045e), /* Microsoft X-Box One controllers */ -- 2.13.6

7 years, 5 months

3
2
0 0

[PATCH 1/4] IB/isert: fix T10-pi check mask setting

by Max Gurtovoy

A copy/paste bug (probably) caused setting of an app_tag check mask in case where a ref_tag check was needed. Fixes: 38a2d0d429f1 ("IB/isert: convert to the generic RDMA READ/WRITE API") Fixes: 9e961ae73c2c ("IB/isert: Support T10-PI protected transactions") Cc: stable(a)vger.kernel.org Reviewed-by: Christoph Hellwig <hch(a)lst.de> Reviewed-by: Sagi Grimberg <sagi(a)grimberg.me> Signed-off-by: Max Gurtovoy <maxg(a)mellanox.com> --- drivers/infiniband/ulp/isert/ib_isert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c index fff40b0..d8b6bde 100644 --- a/drivers/infiniband/ulp/isert/ib_isert.c +++ b/drivers/infiniband/ulp/isert/ib_isert.c @@ -2108,7 +2108,7 @@ sig_attrs->check_mask = (se_cmd->prot_checks & TARGET_DIF_CHECK_GUARD ? 0xc0 : 0) | - (se_cmd->prot_checks & TARGET_DIF_CHECK_REFTAG ? 0x30 : 0) | + (se_cmd->prot_checks & TARGET_DIF_CHECK_APPTAG ? 0x30 : 0) | (se_cmd->prot_checks & TARGET_DIF_CHECK_REFTAG ? 0x0f : 0); return 0; } -- 1.8.3.1

7 years, 5 months

1
0
0 0

[PATCH 3.2 000/153] 3.2.102-rc1 review

by Ben Hutchings

This is the start of the stable review cycle for the 3.2.102 release. There are 153 patches in this series, which will be posted as responses to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Thu May 31 23:00:00 UTC 2018. Anything received after that time might be too late. All the patches have also been committed to the linux-3.2.y-rc branch of https://git.kernel.org/pub/scm/linux/kernel/git/bwh/linux-stable-rc.git . A shortlog and diffstat can be found below. Ben. ------------- Adam Goode (1): ALSA: seq: correctly detect input buffer overflow [21fd3e956ee8a307a06bc6e095f5767a00eb2a7e] Alan Stern (1): USB: OHCI: Fix race between ED unlink and URB submission [7d8021c967648accd1b78e5e1ddaad655cd2c61f] Alex Chen (1): ocfs2: subsystem.su_mutex is required while accessing the item->ci_parent [853bc26a7ea39e354b9f8889ae7ad1492ffa28d2] Alexander Potapenko (1): netlink: make sure nladdr has correct size in netlink_connect() [7880287981b60a6808f39f297bb66936e8bdf57a] Alexey Kodanev (2): dccp: check sk for closed state in dccp_sendmsg() [67f93df79aeefc3add4e4b31a752600f834236e2] sctp: verify size of a new chunk in _sctp_make_chunk() [07f2c7ab6f8d0a7e7c5764c4e6cc9c52951b9d9c] Aman Deep (1): usb: ohci: Proper handling of ed_rm_list to handle race condition between usb_kill_urb() and finish_unlinks() [46408ea558df13b110e0866b99624384a33bdeba] Andy Lutomirski (1): x86/entry/64: Don't use IST entry for #BP stack [d8ba61ba58c88d5207c1ba2f7d9a2280e7d03be9] Anna-Maria Gleixner (1): hrtimer: Ensure POSIX compliance (relative CLOCK_REALTIME hrtimers) [48d0c9becc7f3c66874c100c126459a9da0fdced] Arnd Bergmann (1): scsi: fas216: fix sense buffer initialization [96d5eaa9bb74d299508d811d865c2c41b38b0301] Bart Van Assche (1): pktcdvd: Fix pkt_setup_dev() error path [5a0ec388ef0f6e33841aeb810d7fa23f049ec4cd] Bastian Stender (1): mmc: block: fix updating ext_csd caches on ioctl call [e74ef2194b41ba5e511fab29fe5ff00e72d2f42a] Ben Crocker (1): drm/radeon: insist on 32-bit DMA for Cedar on PPC64/PPC64LE [2c83029cda55a5e7665c7c6326909427d6a01350] Benjamin Poirier (1): e1000e: Fix check_for_link return value with autoneg off [4e7dc08e57c95673d2edaba8983c3de4dd1f65f5] Chenjie (1): mm/madvise.c: fix madvise() infinite loop under special circumstances [6ea8d958a2c95a1d514015d4e29ba21a8c0a1a91] Chien Tin Tung (1): RDMA/ucma: Correct option size check using optlen [5f3e3b85cc0a5eae1c46d72e47d3de7bf208d9e2] Christophe JAILLET (1): media: bt8xx: Fix err 'bt878_probe()' [45392ff6881dbe56d41ef0b17c2e576065f8ffa1] Clay McClure (1): ubi: Fix race condition between ubi volume creation and udev [a51a0c8d213594bc094cb8e54aad0cb6d7f7b9a6] Colin Ian King (1): scsi: aacraid: remove redundant setting of variable c [91814744646351a470f256fbcb853fb5a7229a9f] Cong Wang (2): netfilter: ipt_CLUSTERIP: fix a refcount bug in clusterip_config_find_get() [db93a3632b0f8773a3899e04a3a3e0aa7a26eb46] netfilter: xt_RATEEST: acquire xt_rateest_mutex for hash insert [7dc68e98757a8eccf8ca7a53a29b896f1eef1f76] Corentin Labbe (1): powerpc/pseries: Add empty update_numa_cpu_lookup_table() for NUMA=n [c1e150ceb61e4a585bad156da15c33bfe89f5858] Dan Carpenter (8): ALSA: pcm: potential uninitialized return values [5607dddbfca774fb38bffadcb077fe03aa4ac5c6] ASoC: au1x: Fix timeout tests in au1xac97c_ac97_read() [123af9043e93cb6f235207d260d50f832cdb5439] ASoC: nuc900: Fix a loop timeout test [65a12b3aafed5fc59f4ce41b22b752b1729e6701] HID: roccat: prevent an out of bounds read in kovaplus_profile_activated() [7ad81482cad67cbe1ec808490d1ddfc420c42008] ath9k_htc: Add a sanity check in ath9k_htc_ampdu_action() [413fd2f5c0233d3cde391679b967c1f14cd2cb27] cdrom: information leak in cdrom_ioctl_media_changed() [9de4ee40547fd315d4a0ed1dd15a2fa3559ad707] media: cpia2: Fix a couple off by one bugs [d5ac225c7d64c9c3ef821239edc035634e594ec9] staging: ncpfs: memory corruption in ncp_read_kernel() [4c41aa24baa4ed338241d05494f2c595c885af8f] Danilo Krummrich (1): usb: quirks: add control message delay for 1b1c:1b20 [cb88a0588717ba6c756cb5972d75766b273a6817] Darrick J. Wong (1): ext4: fix block bitmap validation when bigalloc, ^flex_bg [e674e5cbd0942b42a12106ac0be8330f4301bef4] David Rientjes (1): kernel/relay.c: limit kmalloc size to KMALLOC_MAX_SIZE [88913bd8ea2a75d7e460a4bed5f75e1c32660d7e] Dmitry Vyukov (1): netfilter: ipt_CLUSTERIP: fix out-of-bounds accesses in clusterip_tg_check() [1a38956cce5eabd7b74f94bab70265e4df83165e] Eran Ben Elisha (1): net/mlx4_en: Fix mixed PFC and Global pause user control requests [6e8814ceb7e8f468659ef9253bd212c07ae19584] Eric Biggers (6): crypto: cryptd - pass through absence of ->setkey() [841a3ff329713f796a63356fef6e2f72e4a3f6a3] crypto: hash - annotate algorithms taking optional key [a208fa8f33031b9e0aba44c7d1b7e68eb0cbd29e] crypto: hash - introduce crypto_hash_alg_has_setkey() [cd6ed77ad5d223dc6299fb58f62e0f5267f7e2ba] crypto: hash - prevent using keyed hashes without setting key [9fa68f620041be04720d0cbfb1bd3ddfc6310b24] libata: fix length validation of ATAPI-relayed SCSI commands [058f58e235cbe03e923b30ea7c49995a46a8725f] libata: remove WARN() for DMA or PIO command without data [9173e5e80729c8434b8d27531527c5245f4a5594] Eric Dumazet (3): l2tp: do not accept arbitrary sockets [17cfe79a65f98abe535261856c5aef14f306dff7] net: igmp: add a missing rcu locking section [e7aadb27a5415e8125834b84a74477bfbee4eff5] netfilter: IDLETIMER: be syzkaller friendly [cfc2c740533368b96e2be5e0a4e8c3cace7d9814] Eric W. Biederman (4): fs: Teach path_connected to handle nfs filesystems with multiple roots. [95dd77580ccd66a0da96e6d4696945b8cea39431] mn10300/misalignment: Use SIGSEGV SEGV_MAPERR to report a failed user copy [6ac1dc736b323011a55ecd1fc5897c24c4f77cbd] signal/openrisc: Fix do_unaligned_access to send the proper signal [500d58300571b6602341b041f97c082a461ef994] signal/sh: Ensure si_signo is initialized in do_divide_error [0e88bb002a9b2ee8cc3cc9478ce2dc126f849696] Erik Veijola (1): ALSA: usb-audio: Add a quirck for B&W PX headphones [240a8af929c7c57dcde28682725b29cf8474e8e5] Ernesto A . Fernández (1): ext4: correct documentation for grpid mount option [9f0372488cc9243018a812e8cfbf27de650b187b] Eugene Syromiatnikov (1): s390: fix handling of -1 in set{,fs}[gu]id16 syscalls [6dd0d2d22aa363fec075cb2577ba273ac8462e94] Felix Kuehling (1): drm/ttm: Don't add swapped BOs to swap-LRU list [fd5002d6a3c602664b07668a24df4ef7a43bf078] Florian Fainelli (1): MIPS: TXX9: use IS_ENABLED() macro [b33b44073734842ec0c75d376c40d0471d6113ff] Florian Westphal (5): netfilter: bridge: ebt_among: add missing match size checks [c4585a2823edf4d1326da44d1524ecbfda26bb37] netfilter: bridge: ebt_among: add more missing match size checks [c8d70a700a5b486bfa8e5a7d33d805389f6e59f9] netfilter: ebtables: CONFIG_COMPAT: don't trust userland offsets [b71812168571fa55e44cdd0254471331b9c4c4c6] netfilter: ebtables: fix erroneous reject of last rule [932909d9b28d27e807ff8eecb68c7748f6701628] xfrm_user: uncoditionally validate esn replay attribute struct [d97ca5d714a5334aecadadf696875da40f1fbf3e] Greg Kroah-Hartman (1): USB: serial: pl2303: new device id for Chilitag [d08dd3f3dd2ae351b793fc5b76abdbf0fd317b12] Greg Kurz (1): 9p/trans_virtio: discard zero-length reply [26d99834f89e76514076d9cd06f61e56e6a509b8] Hangbin Liu (1): l2tp: fix missing print session offset info [820da5357572715c6235ba3b3daa2d5b43a1198f] Hans de Goede (5): USB: cdc-acm: Do not log urb submission errors on disconnect [f0386c083c2ce85284dc0b419d7b89c8e567c09f] ahci: Add PCI-id for the Highpoint Rocketraid 644L card [28b2182dad43f6f8fcbd167539a26714fd12bd64] libata: Apply NOLPM quirk to Crucial M500 480 and 960GB SSDs [62ac3f7305470e3f52f159de448bc1a771717e88] libata: Apply NOLPM quirk to Crucial MX100 512GB SSDs [9c7be59fc519af9081c46c48f06f2b8fadf55ad8] libata: Make Crucial BX100 500GB LPM quirk apply to all firmware versions [3bf7b5d6d017c27e0d3b160aafb35a8e7cfeda1f] Ivan Vecera (1): net/mlx4_en: do not ignore autoneg in mlx4_en_set_pauseparam() [278d436a476f69fc95d5c82bf61b6c2d02f4d44e] Jack Stocker (1): Add delay-init quirk for Corsair K70 RGB keyboards [7a1646d922577b5b48c0d222e03831141664bb59] Jake Daryll Obina (1): jffs2: Fix use-after-free bug in jffs2_iget()'s error handling path [5bdd0c6f89fba430e18d636493398389dadc3b17] Jakub Kicinski (1): net: fix race on decreasing number of TX queues [ac5b70198adc25c73fba28de4f78adcee8f6be0b] James Chapman (2): l2tp: don't use inet_shutdown on ppp session destroy [225eb26489d05c679a4c4197ffcb81c81e9dcaf4] l2tp: fix race in pppol2tp_release with session object destroy [d02ba2a6110c530a32926af8ad441111774d2893] James Hogan (1): MIPS: Fix clean of vmlinuz.{32,ecoff,bin,srec} [5f2483eb2423152445b39f2db59d372f523e664e] Jan Beulich (1): x86/mm: Fix {pmd,pud}_{set,clear}_flags() [842cef9113c2120f74f645111ded1e020193d84c] Jason Gunthorpe (1): sctp: Fix mangled IPv4 addresses on a IPv6 listening socket [9302d7bb0c5cd46be5706859301f18c137b2439f] Jason Yan (2): scsi: libsas: fix error when getting phy events [2b23d9509fd7174b362482cf5f3b5f9a2265bc33] scsi: libsas: fix memory leak in sas_smp_get_phy_events() [4a491b1ab11ca0556d2fda1ff1301e862a2d44c4] Jean Delvare (2): firmware/dmi_scan: constify strings [ffbbb96dd7570b9aafd426cd77a7ee03d224cabf] firmware: dmi_scan: Fix handling of empty DMI strings [a7770ae194569e96a93c48aceb304edded9cc648] Jeremy Boone (1): tpm_tis: fix potential buffer overruns caused by bit glitches on the bus [6bb320ca4a4a7b5b3db8c8d7250cc40002046878] Jia-Ju Bai (1): USB: serial: io_edgeport: fix possible sleep-in-atomic [c7b8f77872c73f69a16528a9eb87afefcccdc18b] Johannes Berg (1): regulatory: add NUL to request alpha2 [657308f73e674e86b60509a430a46e569bf02846] Julia Lawall (1): USB: usbmon: remove assignment from IS_ERR argument [46c236dc7d1212d7417e6fb0317f91c44c719322] Julian Wiedmann (2): s390/qeth: fix SETIP command handling [1c5b2216fbb973a9410e0b06389740b5c1289171] s390/qeth: free netdevice when removing a card [6be687395b3124f002a653c1a50b3260222b3cd7] K.Prasad (1): perf/hwpb: Invoke __perf_event_disable() if interrupts are already disabled [500ad2d8b01390c98bc6dce068bccfa9534b8212] Kai-Heng Feng (2): libata: disable LPM for Crucial BX100 SSD 500GB drive [b17e5729a630d8326a48ec34ef02e6b4464a6aef] xhci: Fix front USB ports on ASUS PRIME B350M-A [191edc5e2e515aab1075a3f0ef23599e80be5f59] Kirill Marinushkin (1): ALSA: usb-audio: Fix parsing descriptor of UAC2 processing unit [a6618f4aedb2b60932d766bd82ae7ce866e842aa] Leon Romanovsky (7): RDMA/ucma: Check that device exists prior to accessing it [c8d3bcbfc5eab3f01cf373d039af725f3b488813] RDMA/ucma: Check that device is connected prior to access it [4b658d1bbc16605330694bb3ef2570c465ef383d] RDMA/ucma: Check that user doesn't overflow QP state [a5880b84430316e3e1c1f5d23aa32ec6000cc717] RDMA/ucma: Ensure that CM_ID exists prior to access it [e8980d67d6017c8eee8f9c35f782c4bd68e004c9] RDMA/ucma: Fix access to non-initialized CM_ID object [7688f2c3bbf55e52388e37ac5d63ca471a7712e1] RDMA/ucma: Fix use-after-free access in ucma_close [ed65a4dc22083e73bac599ded6a262318cad7baf] RDMA/ucma: Limit possible option size [6a21dfc0d0db7b7e0acedce67ca533a6eb19283c] Linus Torvalds (2): perf/hwbp: Simplify the perf-hwbp code, fix documentation [f67b15037a7a50c57f72e69a6d59941ad90a0f0f] tty: vt: fix up tabstops properly [f1869a890cdedb92a3fab969db5d0fd982850273] Linus Walleij (1): mtd: jedec_probe: Fix crash in jedec_read_mfr() [87a73eb5b56fd6e07c8e499fe8608ef2d8912b82] Liu Bo (1): Btrfs: fix extent state leak from tree log [55237a5f2431a72435e3ed39e4306e973c0446b7] Lukas Czerner (1): ext4: fix bitmap position validation [22be37acce25d66ecf6403fc8f44df9c5ded2372] Marc Kleine-Budde (1): slip: sl_alloc(): remove unused parameter "dev_t line" [936e5d8bdfa72577e28ea671d9e2ee4fef0d6b3e] Masami Hiramatsu (1): tracing: probeevent: Fix to support minus offset from symbol [c5d343b6b7badd1f5fe0873eff2e8d63a193e732] Matt Redfearn (1): MIPS: TXx9: use IS_BUILTIN() for CONFIG_LEDS_CLASS [0cde5b44a30f1daaef1c34e08191239dc63271c4] Matthew Wilcox (1): cifs: Fix missing put_xid in cifs_file_strict_mmap [f04a703c3d613845ae3141bfaf223489de8ab3eb] Matthias Schiffer (1): batman-adv: fix packet checksum in receive path [abd6360591d3f8259f41c34e31ac4826dfe621b8] Mauro Carvalho Chehab (1): media: cxusb, dib0700: ignore XC2028_I2C_FLUSH [9893b905e743ded332575ca04486bd586c0772f7] Mel Gorman (1): mm: pin address_space before dereferencing it while isolating an LRU page [69d763fc6d3aee787a3e8c8c35092b4f4960fa5d] Michel Dänzer (1): drm/radeon: Don't turn off DP sink when disconnected [2681bc79eeb640562c932007bfebbbdc55bf6a7d] Mike Kravetz (2): hugetlbfs: check for pgoff value overflow [63489f8e821144000e0bdca7e65a8d1cc23a7ee7] hugetlbfs: fix offset overflow in hugetlbfs mmap [045c7a3f53d9403b62d396b6d051c4be5044cdb4] Mikulas Patocka (2): alpha: fix crash if pthread_create races with signal delivery [21ffceda1c8b3807615c40d440d7815e0c85d366] alpha: fix reboot on Avanti platform [55fc633c41a08ce9244ff5f528f420b16b1e04d6] Mulhern (1): dm thin: fix documentation relative to low water mark threshold [9b28a1102efc75d81298198166ead87d643a29ce] Nathan Fontenot (1): powerpc/numa: Invalidate numa_cpu_lookup_table on cpu remove [1d9a090783bef19fe8cdec878620d22f05191316] Nicolas Dichtel (2): netlink: avoid a double skb free in genlmsg_mcast() [02a2385f37a7c6594c9d89b64c4a1451276f08eb] netlink: ensure to loop over all netns in genlmsg_multicast_allns() [cb9f7a9a5c96a773bbc9c70660dc600cfff82f82] Nicolas Pitre (1): console/dummy: leave .con_font_get set to NULL [724ba8b30b044aa0d94b1cd374fc15806cdd6f18] Oliver Neukum (1): CDC-ACM: apply quirk for card reader [df1cc78a52491f71d8170d513d0f6f114faa1bda] Paolo Abeni (5): dn_getsockoptdecnet: move nf_{get/set}sockopt outside sock lock [dfec091439bb2acf763497cfc58f2bdfc67c56b7] netfilter: drop outermost socket lock in getsockopt() [01ea306f2ac2baff98d472da719193e738759d93] netfilter: nat: cope with negative port range [db57ccf0f2f4624b4c4758379f8165277504fbd7] netfilter: on sockopt() acquire sock lock only in the required scope [3f34cfae1238848fd53f25e5c8fd59da57901f4b] netfilter: x_tables: fix missing timer initialization in xt_LED [10414014bc085aac9f787a5890b33b5605fbcfc4] Pete Zaitcev (1): usb: usbmon: Read text within supplied buffer size [a5f596830e27e15f7a0ecd6be55e433d776986d8] Peter Malone (1): fbdev: Fixing arbitrary kernel leak in case FBIOGETCMAP_SPARC in sbusfb_ioctl_helper(). [250c6c49e3b68756b14983c076183568636e2bde] Raghava Aditya Renukunta (1): scsi: aacraid: Fix udev inquiry race condition [f4e8708d3104437fd7716e957f38c265b0c509ef] Rasmus Villemoes (1): nospec: Allow index argument to have const-qualified type [b98c6a160a057d5686a8c54c79cc6c8c94a7d0c8] Seunghun Han (1): x86/MCE: Serialize sysfs changes [b3b7c4795ccab5be71f080774c45bbbcc75c2aaf] Stefan Roese (1): ALSA: pcm: Use dma_bytes as size parameter in dma_mmap_coherent() [9066ae7ff5d89c0b5daa271e2d573540097a94fa] Stephan Mueller (1): crypto: af_alg - whitelist mask and type [bb30b8848c85e18ca7e371d0a869e94b3e383bdf] Takashi Iwai (7): ALSA: aloop: Fix access to not-yet-ready substream via cable [8e6b1a72a75bb5067ccb6b56d8ca4aa3a300a64e] ALSA: aloop: Sync stale timer before release [67a01afaf3d34893cf7d2ea19b34555d6abb7cb0] ALSA: seq: Clear client entry before deleting else at closing [a2ff19f7b70118ced291a28d5313469914de451b] ALSA: seq: Don't allow resizing pool in use [d85739367c6d56e475c281945c68fdb05ca74b4c] ALSA: seq: Fix possible UAF in snd_seq_check_queue() [d0f833065221cbfcbadf19fd4102bcfa9330006a] ALSA: seq: Fix racy pool initializations [d15d662e89fc667b90cd294b0eb45694e33144da] ALSA: seq: More protection for concurrent write and ioctl races [7bd80091567789f1c0cb70eb4737aac8bcd2b6b9] Tejun Heo (1): tty: make n_tty_read() always abort if hangup is in progress [28b0f8a6962a24ed21737578f3b1b07424635c9e] Theodore Ts'o (2): ext4: add validity checks for bitmap block numbers [7dac4a1726a9c64a517d595c40e95e2d0d135f6f] ext4: fail ext4_iget for root directory if unallocated [8e4b5eae5decd9dfe5a4ee369c22028f90ab4c44] Thinh Nguyen (1): usb: dwc3: gadget: Set maxpacket size for ep0 IN [6180026341e852a250e1f97ebdcf71684a3c81b9] Thomas Gleixner (1): posix-timers: Protect posix clock array access against speculation [19b558db12f9f4e45a22012bae7b4783e62224da] Tony Luck (1): x86/MCE: Save microcode revision in machine check records [fa94d0c6e0f3431523f5701084d799c77c7d4a4f] Tyrel Datwyler (1): scsi: ibmvfc: fix misdefined reserved field in ibmvfc_fcp_rsp_info [c39813652700f3df552b6557530f1e5f782dbe2f] Ulrich Hecht (1): serial: sh-sci: prevent lockup on full TTY buffers [7842055bfce4bf0170d0f61df8b2add8399697be] Vinicius Costa Gomes (1): skbuff: Fix not waking applications when errors are enqueued [6e5d58fdc9bedd0255a8781b258f10bbdc63e975] Wang Nan (1): x86/traps: Enable DEBUG_STACK after cpu_init() for TRAP_DB/BP [b4d8327024637cb2a1f7910dcb5d0ad7a096f473] Xin Long (2): bonding: process the err returned by dev_set_allmulti properly in bond_enslave [9f5a90c107741b864398f4ac0014711a8c1d8474] bridge: check brport attr show in brport_show [1b12580af1d0677c3c3a19e35bfe5d59b03f737f] Yisheng Xie (1): mm/mempolicy.c: avoid use uninitialized preferred_node [8970a63e965b43288c4f5f40efbc2bbf80de7f16] Zhang Bo (1): Input: matrix_keypad - fix race when disabling interrupts [ea4f7bd2aca9f68470e9aac0fc9432fd180b1fe7] Zhouyi Zhou (1): ext4: save error to disk in __ext4_grp_locked_error() [06f29cc81f0350261f59643a505010531130eea0] Documentation/device-mapper/thin-provisioning.txt | 8 +- Documentation/filesystems/ext4.txt | 2 +- Makefile | 4 +- arch/alpha/kernel/pci_impl.h | 3 +- arch/alpha/kernel/process.c | 12 +-- arch/mips/boot/compressed/Makefile | 6 +- arch/mips/txx9/generic/setup.c | 12 +-- arch/mips/txx9/generic/setup_tx4939.c | 2 +- arch/mips/txx9/rbtx4939/setup.c | 11 +- arch/mn10300/mm/misalignment.c | 2 +- arch/openrisc/kernel/traps.c | 10 +- arch/powerpc/include/asm/topology.h | 8 ++ arch/powerpc/platforms/pseries/hotplug-cpu.c | 2 + arch/s390/kernel/compat_linux.c | 8 +- arch/sh/kernel/traps_32.c | 3 +- arch/x86/crypto/crc32c-intel.c | 1 + arch/x86/include/asm/mce.h | 4 + arch/x86/include/asm/pgtable.h | 4 +- arch/x86/include/asm/pgtable_types.h | 5 + arch/x86/kernel/cpu/mcheck/mce.c | 26 ++++- arch/x86/kernel/entry_64.S | 2 +- arch/x86/kernel/traps.c | 20 +++- crypto/af_alg.c | 5 + crypto/ahash.c | 33 +++++- crypto/algif_hash.c | 54 +++------- crypto/crc32c.c | 1 + crypto/cryptd.c | 6 +- crypto/shash.c | 25 ++++- drivers/ata/ahci.c | 4 +- drivers/ata/libata-core.c | 13 ++- drivers/ata/libata-scsi.c | 4 +- drivers/block/pktcdvd.c | 4 +- drivers/cdrom/cdrom.c | 2 +- drivers/char/tpm/tpm_tis.c | 5 +- drivers/firmware/dmi_scan.c | 30 +++--- drivers/gpu/drm/radeon/radeon_connectors.c | 31 +++--- drivers/gpu/drm/radeon/radeon_device.c | 4 + drivers/gpu/drm/ttm/ttm_bo.c | 2 +- drivers/hid/hid-roccat-kovaplus.c | 2 + drivers/infiniband/core/cma.c | 3 + drivers/infiniband/core/ucma.c | 33 ++++-- drivers/input/keyboard/matrix_keypad.c | 4 +- drivers/media/dvb/bt8xx/bt878.c | 3 +- drivers/media/dvb/dvb-usb/cxusb.c | 2 + drivers/media/dvb/dvb-usb/dib0700_devices.c | 1 + drivers/media/video/cpia2/cpia2_v4l.c | 4 +- drivers/mmc/card/block.c | 21 ++++ drivers/mtd/chips/jedec_probe.c | 2 + drivers/mtd/ubi/vmt.c | 15 ++- drivers/net/bonding/bond_main.c | 5 +- drivers/net/ethernet/intel/e1000e/ich8lan.c | 2 +- drivers/net/ethernet/intel/e1000e/lib.c | 6 +- drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 27 +++-- drivers/net/ethernet/mellanox/mlx4/en_main.c | 4 +- drivers/net/slip/slip.c | 4 +- drivers/net/wireless/ath/ath9k/htc_drv_main.c | 4 + drivers/s390/net/qeth_core.h | 5 + drivers/s390/net/qeth_core_main.c | 16 +-- drivers/s390/net/qeth_l2_main.c | 2 +- drivers/s390/net/qeth_l3_main.c | 2 +- drivers/scsi/aacraid/aachba.c | 22 ++-- drivers/scsi/arm/fas216.c | 2 +- drivers/scsi/ibmvscsi/ibmvfc.h | 2 +- drivers/scsi/libsas/sas_expander.c | 3 +- drivers/tty/n_tty.c | 6 ++ drivers/tty/serial/sh-sci.c | 2 + drivers/tty/vt/vt.c | 8 +- drivers/usb/class/cdc-acm.c | 5 +- drivers/usb/core/message.c | 4 + drivers/usb/core/quirks.c | 6 +- drivers/usb/dwc3/gadget.c | 2 + drivers/usb/host/ohci-q.c | 24 ++--- drivers/usb/host/xhci-pci.c | 3 + drivers/usb/host/xhci.c | 3 + drivers/usb/host/xhci.h | 1 + drivers/usb/mon/mon_text.c | 124 ++++++++++++++-------- drivers/usb/serial/io_edgeport.c | 1 - drivers/usb/serial/pl2303.c | 1 + drivers/usb/serial/pl2303.h | 1 + drivers/video/console/dummycon.c | 1 - drivers/video/sbuslib.c | 4 +- fs/btrfs/tree-log.c | 5 +- fs/cifs/file.c | 26 +++-- fs/ext4/balloc.c | 25 ++++- fs/ext4/ialloc.c | 7 ++ fs/ext4/inode.c | 7 ++ fs/ext4/super.c | 1 + fs/hugetlbfs/inode.c | 26 ++++- fs/jffs2/fs.c | 1 - fs/namei.c | 5 +- fs/ncpfs/ncplib_kernel.c | 4 + fs/nfs/super.c | 2 + fs/ocfs2/cluster/nodemanager.c | 63 +++++++++-- include/crypto/hash.h | 34 ++++-- include/crypto/internal/hash.h | 2 + include/linux/crypto.h | 8 ++ include/linux/fs.h | 4 + include/linux/nospec.h | 3 +- include/linux/perf_event.h | 2 + include/linux/usb/audio.h | 4 +- include/linux/usb/quirks.h | 3 + include/net/regulatory.h | 2 +- include/net/sctp/sctp.h | 7 +- kernel/events/core.c | 2 +- kernel/events/hw_breakpoint.c | 41 +++---- kernel/hrtimer.c | 7 +- kernel/posix-timers.c | 15 ++- kernel/relay.c | 2 +- kernel/trace/trace_kprobe.c | 11 +- mm/hugetlb.c | 9 ++ mm/madvise.c | 2 +- mm/mempolicy.c | 3 + mm/vmscan.c | 14 ++- net/9p/trans_virtio.c | 3 +- net/batman-adv/soft-interface.c | 7 +- net/bridge/br_sysfs_if.c | 3 + net/bridge/netfilter/ebt_among.c | 55 +++++++++- net/bridge/netfilter/ebtables.c | 17 ++- net/core/dev.c | 12 ++- net/core/skbuff.c | 4 +- net/dccp/proto.c | 5 + net/decnet/af_decnet.c | 62 ++++++----- net/ipv4/igmp.c | 4 + net/ipv4/ip_sockglue.c | 21 +--- net/ipv4/netfilter/ipt_CLUSTERIP.c | 24 ++++- net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 6 +- net/ipv4/netfilter/nf_nat_proto_common.c | 7 +- net/ipv6/ipv6_sockglue.c | 27 ++--- net/l2tp/l2tp_core.c | 8 +- net/l2tp/l2tp_netlink.c | 2 + net/l2tp/l2tp_ppp.c | 62 +++++------ net/netfilter/xt_IDLETIMER.c | 9 +- net/netfilter/xt_LED.c | 12 +-- net/netfilter/xt_RATEEST.c | 22 +++- net/netlink/af_netlink.c | 3 + net/netlink/genetlink.c | 12 ++- net/sctp/sm_make_chunk.c | 8 +- net/xfrm/xfrm_user.c | 21 ++-- sound/core/oss/pcm_oss.c | 4 +- sound/core/pcm_native.c | 2 +- sound/core/seq/seq_clientmgr.c | 29 +++-- sound/core/seq/seq_fifo.c | 4 +- sound/core/seq/seq_memory.c | 14 ++- sound/core/seq/seq_memory.h | 3 +- sound/core/seq/seq_prioq.c | 27 ++--- sound/core/seq/seq_prioq.h | 6 +- sound/core/seq/seq_queue.c | 28 ++--- sound/drivers/aloop.c | 17 ++- sound/soc/au1x/ac97c.c | 6 +- sound/soc/nuc900/nuc900-ac97.c | 4 +- sound/usb/quirks-table.h | 47 ++++++++ 151 files changed, 1140 insertions(+), 584 deletions(-) -- Ben Hutchings The program is absolutely right; therefore, the computer must be wrong.

7 years, 5 months

2
154
0 0

[PATCH 01/17] IB/isert: fix T10-pi check mask setting

by Max Gurtovoy

A copy/paste bug (probably) caused setting of an app_tag check mask in case where a ref_tag check was needed. Fixes: 38a2d0d429f1 ("IB/isert: convert to the generic RDMA READ/WRITE API") Fixes: 9e961ae73c2c ("IB/isert: Support T10-PI protected transactions") Cc: stable(a)vger.kernel.org Signed-off-by: Max Gurtovoy <maxg(a)mellanox.com> --- drivers/infiniband/ulp/isert/ib_isert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c index fff40b0..d8b6bde 100644 --- a/drivers/infiniband/ulp/isert/ib_isert.c +++ b/drivers/infiniband/ulp/isert/ib_isert.c @@ -2108,7 +2108,7 @@ sig_attrs->check_mask = (se_cmd->prot_checks & TARGET_DIF_CHECK_GUARD ? 0xc0 : 0) | - (se_cmd->prot_checks & TARGET_DIF_CHECK_REFTAG ? 0x30 : 0) | + (se_cmd->prot_checks & TARGET_DIF_CHECK_APPTAG ? 0x30 : 0) | (se_cmd->prot_checks & TARGET_DIF_CHECK_REFTAG ? 0x0f : 0); return 0; } -- 1.8.3.1

7 years, 5 months

5
15
0 0

+ mm-huge_memoryc-__split_huge_page-use-atomic-clearpagedirty.patch added to -mm tree

by akpm＠linux-foundation.org

The patch titled Subject: mm/huge_memory.c: __split_huge_page() use atomic ClearPageDirty() has been added to the -mm tree. Its filename is mm-huge_memoryc-__split_huge_page-use-atomic-clearpagedirty.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-huge_memoryc-__split_huge_page-… and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-huge_memoryc-__split_huge_page-… Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Hugh Dickins <hughd(a)google.com> Subject: mm/huge_memory.c: __split_huge_page() use atomic ClearPageDirty() Swapping load on huge=always tmpfs (with khugepaged tuned up to be very eager, but I'm not sure that is relevant) soon hung uninterruptibly, waiting for page lock in shmem_getpage_gfp()'s find_lock_entry(), most often when "cp -a" was trying to write to a smallish file. Debug showed that the page in question was not locked, and page->mapping NULL by now, but page->index consistent with having been in a huge page before. Reproduced in minutes on a 4.15 kernel, even with 4.17's 605ca5ede764 ("mm/huge_memory.c: reorder operations in __split_huge_page_tail()") added in; but took hours to reproduce on a 4.17 kernel (no idea why). The culprit proved to be the __ClearPageDirty() on tails beyond i_size in __split_huge_page(): the non-atomic __bitoperation may have been safe when 4.8's baa355fd3314 ("thp: file pages support for split_huge_page()") introduced it, but liable to erase PageWaiters after 4.10's 62906027091f ("mm: add PageWaiters indicating tasks are waiting for a page bit"). Link: http://lkml.kernel.org/r/alpine.LSU.2.11.1805291841070.3197@eggly.anvils Fixes: 62906027091f ("mm: add PageWaiters indicating tasks are waiting for a page bit") Signed-off-by: Hugh Dickins <hughd(a)google.com> Acked-by: Kirill A. Shutemov <kirill.shutemov(a)linux.intel.com> Cc: Konstantin Khlebnikov <khlebnikov(a)yandex-team.ru> Cc: Nicholas Piggin <npiggin(a)gmail.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- mm/huge_memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN mm/huge_memory.c~mm-huge_memoryc-__split_huge_page-use-atomic-clearpagedirty mm/huge_memory.c --- a/mm/huge_memory.c~mm-huge_memoryc-__split_huge_page-use-atomic-clearpagedirty +++ a/mm/huge_memory.c @@ -2431,7 +2431,7 @@ static void __split_huge_page(struct pag __split_huge_page_tail(head, i, lruvec, list); /* Some pages can be beyond i_size: drop them from page cache */ if (head[i].index >= end) { - __ClearPageDirty(head + i); + ClearPageDirty(head + i); __delete_from_page_cache(head + i, NULL); if (IS_ENABLED(CONFIG_SHMEM) && PageSwapBacked(head)) shmem_uncharge(head->mapping->host, 1); _ Patches currently in -mm which might be from hughd(a)google.com are mm-huge_memoryc-__split_huge_page-use-atomic-clearpagedirty.patch

7 years, 5 months

1
0
0 0

Linux 4.14.47

by Greg KH

I'm announcing the release of the 4.14.47 kernel. This is a quick release, reverting one commit in the 4.14.46 networking stack that should not have gotten backported. If 4.14.46 works for you, wonderful, but you really should update to be sure... The updated 4.14.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.14.y and can be browsed at the normal kernel.org git web browser: http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Makefile | 2 +- net/ipv4/ip_vti.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) Greg Kroah-Hartman (2): Revert "vti4: Don't override MTU passed on link creation via IFLA_MTU" Linux 4.14.47

7 years, 5 months

1
1
0 0

Patches for -stable to improve support for recent gcc versions

by Guenter Roeck

Hi Greg, please apply the following patches. to v4.4-stable and older: cb36af3e48be sh: New gcc support to support gcc 8.1.0 for sh to v4.9-stable and older: 009615ab7fd4 USB: serial: cp210x: use tcflag_t to fix incompatible pointer type to support gcc 7.3.0 for sparc Copying Arnd - I can't get sparc images to compile with gcc 8.1.0. Any idea ? Thanks, Guenter

7 years, 5 months

3
14
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror