From: Herton R. Krzesinski on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1187
Some PCI rockchip changes from a previous merged changed were dropped/not included upstream in v5.13. This is explained on this post: https://lore.kernel.org/linux- pci/20210614230457.752811-1-punitagrawal@gmail.com/
This MR reverts those changes. A diff between drivers/pci/of.c of upstream and ARK is clean now.
Signed-off-by: Herton R. Krzesinski herton@redhat.com
--- drivers/pci/of.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
From: Herton R. Krzesinski herton@redhat.com
Revert "PCI: of: Refactor the check for non-prefetchable 32-bit window"
This reverts commit 7526d4b295786a611864afff7913a79a49a2cb71.
It was dropped from final upsream series merged: https://lore.kernel.org/linux-pci/20210614230457.752811-1-punitagrawal@gmail...
Signed-off-by: Herton R. Krzesinski herton@redhat.com
diff --git a/drivers/pci/of.c b/drivers/pci/of.c index blahblah..blahblah 100644 --- a/drivers/pci/of.c +++ b/drivers/pci/of.c @@ -573,6 +573,12 @@ static int pci_parse_request_of_pci_ranges(struct device *dev, break; case IORESOURCE_MEM: res_valid |= !(res->flags & IORESOURCE_PREFETCH); + + if (!(res->flags & IORESOURCE_PREFETCH)) + if (!(res->flags & IORESOURCE_MEM_64) && + upper_32_bits(resource_size(res))) + dev_warn(dev, "Memory resource size exceeds max for 32 bits\n"); + break; } }
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1187
From: Herton R. Krzesinski herton@redhat.com
Revert "PCI: of: Relax the condition for warning about non-prefetchable memory aperture size"
This reverts commit 70bc1635669324f4e61cf13d597977832d6895c6.
It was dropped from final upsream series merged: https://lore.kernel.org/linux-pci/20210614230457.752811-1-punitagrawal@gmail...
Signed-off-by: Herton R. Krzesinski herton@redhat.com
diff --git a/drivers/pci/of.c b/drivers/pci/of.c index blahblah..blahblah 100644 --- a/drivers/pci/of.c +++ b/drivers/pci/of.c @@ -575,8 +575,7 @@ static int pci_parse_request_of_pci_ranges(struct device *dev, res_valid |= !(res->flags & IORESOURCE_PREFETCH);
if (!(res->flags & IORESOURCE_PREFETCH)) - if (!(res->flags & IORESOURCE_MEM_64) && - upper_32_bits(resource_size(res))) + if (upper_32_bits(resource_size(res))) dev_warn(dev, "Memory resource size exceeds max for 32 bits\n");
break;
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1187
From: pbrobinson on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1187#note_6131647...
ACK LGTM.
From: Justin M. Forbes on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1187#note_6131666...
Acked-by: Justin M. Forbes jforbes@fedoraproject.org (via approve button)
From: pbrobinson on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1187#note_6131670...
Acked-by: Peter Robinson pbrobinson@redhat.com
From: Patrick Talbert on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1187#note_6131691...
Acked-by: Patrick Talbert ptalbert@redhat.com (via approve button)
From: Prarit Bhargava on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1187#note_6131954...
Acked-by: Prarit Bhargava prarit@redhat.com (via approve button)
kernel@lists.fedoraproject.org