Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751985AbdFMHmy (ORCPT ); Tue, 13 Jun 2017 03:42:54 -0400 Received: from mail-qt0-f194.google.com ([209.85.216.194]:33509 "EHLO mail-qt0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750818AbdFMHmw (ORCPT ); Tue, 13 Jun 2017 03:42:52 -0400 MIME-Version: 1.0 In-Reply-To: <1497329993-197698-1-git-send-email-liwei.song@windriver.com> References: <1497329993-197698-1-git-send-email-liwei.song@windriver.com> From: Andy Shevchenko Date: Tue, 13 Jun 2017 10:42:50 +0300 Message-ID: Subject: Re: [PATCH V2] i2c: ismt: fix wrong device address when unmap the data buffer To: Song liwei Cc: Wolfram Sang , Seth Heasley , Neil Horman , linux-i2c , linux-kernel Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3582 Lines: 84 On Tue, Jun 13, 2017 at 7:59 AM, Song liwei wrote: > From: Liwei Song > > Fix the following kernel bug: > > kernel BUG at drivers/iommu/intel-iommu.c:3260! > invalid opcode: 0000 [#5] PREEMPT SMP > Hardware name: Intel Corp. Harcuvar/Server, BIOS HAVLCRB0.X64.0013.D39.1608311820 08/31/2016 > task: ffff880175389950 ti: ffff880176bec000 task.ti: ffff880176bec000 > RIP: 0010:[] [] intel_unmap+0x25b/0x260 > RSP: 0018:ffff880176bef5e8 EFLAGS: 00010296 > RAX: 0000000000000024 RBX: ffff8800773c7c88 RCX: 000000000000ce04 > RDX: 0000000080000000 RSI: 0000000000000000 RDI: 0000000000000009 > RBP: ffff880176bef638 R08: 0000000000000010 R09: 0000000000000004 > R10: ffff880175389c78 R11: 0000000000000a4f R12: ffff8800773c7868 > R13: 00000000ffffac88 R14: ffff8800773c7818 R15: 0000000000000001 > FS: 00007fef21258700(0000) GS:ffff88017b5c0000(0000) knlGS:0000000000000000 > CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 > CR2: 000000000066d6d8 CR3: 000000007118c000 CR4: 00000000003406e0 > Stack: > 00000000ffffac88 ffffffff8199867f ffff880176bef5f8 ffff880100000030 > ffff880176bef668 ffff8800773c7c88 ffff880178288098 ffff8800772c0010 > ffff8800773c7818 0000000000000001 ffff880176bef648 ffffffff8150a86e > Call Trace: > [] ? printk+0x46/0x48 > [] intel_unmap_page+0xe/0x10 > [] ismt_access+0x27b/0x8fa [i2c_ismt] > [] ? __pm_runtime_suspend+0xa0/0xa0 > [] ? pm_suspend_timer_fn+0x80/0x80 > [] ? __pm_runtime_suspend+0xa0/0xa0 > [] ? pm_suspend_timer_fn+0x80/0x80 > [] ? pci_bus_read_dev_vendor_id+0xf0/0xf0 > [] i2c_smbus_xfer+0xec/0x4b0 > [] ? vprintk_emit+0x345/0x530 > [] i2cdev_ioctl_smbus+0x12b/0x240 [i2c_dev] > [] ? vprintk_default+0x29/0x40 > [] i2cdev_ioctl+0x63/0x1ec [i2c_dev] > [] do_vfs_ioctl+0x328/0x5d0 > [] ? vfs_write+0x11c/0x190 > [] ? rt_up_read+0x19/0x20 > [] SyS_ioctl+0x81/0xa0 > [] system_call_fastpath+0x16/0x6e > > This happen When run "i2cdetect -y 0" detect SMBus iSMT adapter. > > After finished I2C block read/write, when unmap the data buffer, > a wrong device address was pass to dma_unmap_single(). > > To fix this, give dma_unmap_single() the "dev" parameter, just like > what dma_map_single() does, then unmap can find the right devices. > Much better! Reviewed-by: Andy Shevchenko > Fixes: 13f35ac14cd0 ("i2c: Adding support for Intel iSMT SMBus 2.0 host controller") > Signed-off-by: Liwei Song > --- > drivers/i2c/busses/i2c-ismt.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/i2c/busses/i2c-ismt.c b/drivers/i2c/busses/i2c-ismt.c > index f573448..e98e44e 100644 > --- a/drivers/i2c/busses/i2c-ismt.c > +++ b/drivers/i2c/busses/i2c-ismt.c > @@ -584,7 +584,7 @@ static int ismt_access(struct i2c_adapter *adap, u16 addr, > > /* unmap the data buffer */ > if (dma_size != 0) > - dma_unmap_single(&adap->dev, dma_addr, dma_size, dma_direction); > + dma_unmap_single(dev, dma_addr, dma_size, dma_direction); > > if (unlikely(!time_left)) { > dev_err(dev, "completion wait timed out\n"); > -- > 2.7.4 > -- With Best Regards, Andy Shevchenko