| Message ID | 1429866309-202444-1-git-send-email-yuanzhichang@hisilicon.com |
|---|---|
| State | Accepted |
| Headers | show |
On Fri, Apr 24, 2015 at 10:05:09AM +0100, Zhichang Yuan wrote: > In the patch whose commit id is 41f8bba7f5552d0, function pci_pio_to_address > was modified to retieve the corresponding I/O port by CPU physical address. > But the convertion processing is not correct. It will return a wrong I/O port. > This patch will fix it. > > Fixes: 41f8bba7f555 ("of/pci: Add pci_register_io_range() and pci_pio_to_address()") > CC: stable@vger.kernel.org > Signed-off-by: Zhichang Yuan <yuanzhichang@hisilicon.com> Acked-by: Liviu Dudau <Liviu.Dudau@arm.com> > --- > changes since V1: > Improved commit message. > > drivers/of/address.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/of/address.c b/drivers/of/address.c > index 78a7dcb..6906a3f 100644 > --- a/drivers/of/address.c > +++ b/drivers/of/address.c > @@ -765,7 +765,7 @@ unsigned long __weak pci_address_to_pio(phys_addr_t address) > spin_lock(&io_range_lock); > list_for_each_entry(res, &io_range_list, list) { > if (address >= res->start && address < res->start + res->size) { > - addr = res->start - address + offset; > + addr = address - res->start + offset; > break; > } > offset += res->size; > -- > 1.9.1 >
On Fri, Apr 24, 2015 at 05:05:09PM +0800, Zhichang Yuan wrote: > In the patch whose commit id is 41f8bba7f5552d0, function pci_pio_to_address > was modified to retieve the corresponding I/O port by CPU physical address. > But the convertion processing is not correct. It will return a wrong I/O port. > This patch will fix it. Argh. As I mentioned for v1, your patch changes pci_address_to_pio(), but your patch title and changelog mentions pci_pio_to_address(). I fixed it for you, added Liviu's ack, and applied it to pci/host-generic for v4.2. The original change (41f8bba7f555) went through my tree because it was part of a series that added arm64 PCI support, so maybe it makes sense for this fix to go through my tree, too. But if you'd rather send it through the OF tree, that's fine with me. Just let me know. > Fixes: 41f8bba7f555 ("of/pci: Add pci_register_io_range() and pci_pio_to_address()") > CC: stable@vger.kernel.org > Signed-off-by: Zhichang Yuan <yuanzhichang@hisilicon.com> > --- > changes since V1: > Improved commit message. > > drivers/of/address.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/of/address.c b/drivers/of/address.c > index 78a7dcb..6906a3f 100644 > --- a/drivers/of/address.c > +++ b/drivers/of/address.c > @@ -765,7 +765,7 @@ unsigned long __weak pci_address_to_pio(phys_addr_t address) > spin_lock(&io_range_lock); > list_for_each_entry(res, &io_range_list, list) { > if (address >= res->start && address < res->start + res->size) { > - addr = res->start - address + offset; > + addr = address - res->start + offset; > break; > } > offset += res->size; > -- > 1.9.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-pci" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 2015/5/17 0:06, Bjorn Helgaas wrote: > On Fri, Apr 24, 2015 at 05:05:09PM +0800, Zhichang Yuan wrote: >> In the patch whose commit id is 41f8bba7f5552d0, function pci_pio_to_address >> was modified to retieve the corresponding I/O port by CPU physical address. >> But the convertion processing is not correct. It will return a wrong I/O port. >> This patch will fix it. > > Argh. As I mentioned for v1, your patch changes pci_address_to_pio(), > but your patch title and changelog mentions pci_pio_to_address(). > Yes. The title is not correct. Sorry for my mistake again:( > I fixed it for you, added Liviu's ack, and applied it to pci/host-generic > for v4.2. > > The original change (41f8bba7f555) went through my tree because it was part > of a series that added arm64 PCI support, so maybe it makes sense for this > fix to go through my tree, too. But if you'd rather send it through the OF > tree, that's fine with me. Just let me know. > I found this patch in the list of your tree for v4.2 merge window. Obviously I will not send it through the of tree. Thanks! --Zhichang >> Fixes: 41f8bba7f555 ("of/pci: Add pci_register_io_range() and pci_pio_to_address()") >> CC: stable@vger.kernel.org >> Signed-off-by: Zhichang Yuan <yuanzhichang@hisilicon.com> >> --- >> changes since V1: >> Improved commit message. >> >> drivers/of/address.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/of/address.c b/drivers/of/address.c >> index 78a7dcb..6906a3f 100644 >> --- a/drivers/of/address.c >> +++ b/drivers/of/address.c >> @@ -765,7 +765,7 @@ unsigned long __weak pci_address_to_pio(phys_addr_t address) >> spin_lock(&io_range_lock); >> list_for_each_entry(res, &io_range_list, list) { >> if (address >= res->start && address < res->start + res->size) { >> - addr = res->start - address + offset; >> + addr = address - res->start + offset; >> break; >> } >> offset += res->size; >> -- >> 1.9.1 >> >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-pci" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html > > -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/of/address.c b/drivers/of/address.c index 78a7dcb..6906a3f 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c @@ -765,7 +765,7 @@ unsigned long __weak pci_address_to_pio(phys_addr_t address) spin_lock(&io_range_lock); list_for_each_entry(res, &io_range_list, list) { if (address >= res->start && address < res->start + res->size) { - addr = res->start - address + offset; + addr = address - res->start + offset; break; } offset += res->size;
In the patch whose commit id is 41f8bba7f5552d0, function pci_pio_to_address was modified to retieve the corresponding I/O port by CPU physical address. But the convertion processing is not correct. It will return a wrong I/O port. This patch will fix it. Fixes: 41f8bba7f555 ("of/pci: Add pci_register_io_range() and pci_pio_to_address()") CC: stable@vger.kernel.org Signed-off-by: Zhichang Yuan <yuanzhichang@hisilicon.com> --- changes since V1: Improved commit message. drivers/of/address.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)