mirror of
https://github.com/libretro/Lakka-LibreELEC.git
synced 2025-03-02 20:05:55 +00:00
33b0203020
The following changes were introduced in 6.11-rc1 and 6.11-rc7 only pass 3 variables to - of: remove internal arguments from of_property_for_each_u32() -9722c3b66e6.11-rc7 has refactored drm9da7ec9b19resulting in the following compile error. build.LibreELEC-H6.aarch64-13.0-devel/toolchain/bin/aarch64-libreelec-linux-gnu-ld: drivers/gpu/drm/sun4i/sun8i_dw_hdmi.o: in function `sun8i_dw_hdmi_bind': build.LibreELEC-H6.aarch64-13.0-devel/build/linux-6.11-rc7/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c:394:(.text+0x73c): undefined reference to `drm_bridge_connector_init' Co-authored-by: Jernej Skrabec <jernej.skrabec@gmail.com>
108 lines
3.8 KiB
Diff
108 lines
3.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jernej Skrabec <jernej.skrabec@gmail.com>
|
|
Date: Fri, 14 Oct 2022 20:15:43 +0200
|
|
Subject: [PATCH] iommu/sun50i: Allow page sizes multiple of 4096
|
|
|
|
While peripheral supports only 4K page sizes, we can easily emulate
|
|
support for bigger page sizes, up to 1M. This is done by making multiple
|
|
entries in map function or clearing multiple entries in unmap.
|
|
|
|
This considerably lowers overhead.
|
|
|
|
Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
|
|
---
|
|
drivers/iommu/sun50i-iommu.c | 44 +++++++++++++++++++++---------------
|
|
1 file changed, 26 insertions(+), 18 deletions(-)
|
|
|
|
diff --git a/drivers/iommu/sun50i-iommu.c b/drivers/iommu/sun50i-iommu.c
|
|
index d7c5e9b1a087..9944266c4f58 100644
|
|
--- a/drivers/iommu/sun50i-iommu.c
|
|
+++ b/drivers/iommu/sun50i-iommu.c
|
|
@@ -598,10 +598,12 @@ static int sun50i_iommu_map(struct iommu_domain *domain, unsigned long iova,
|
|
{
|
|
struct sun50i_iommu_domain *sun50i_domain = to_sun50i_domain(domain);
|
|
struct sun50i_iommu *iommu = sun50i_domain->iommu;
|
|
- u32 pte_index;
|
|
+ u32 pte_index, pages, i;
|
|
u32 *page_table, *pte_addr;
|
|
int ret = 0;
|
|
|
|
+ pages = size / SPAGE_SIZE;
|
|
+
|
|
/* the IOMMU can only handle 32-bit addresses, both input and output */
|
|
if ((uint64_t)paddr >> 32) {
|
|
ret = -EINVAL;
|
|
@@ -604,18 +606,21 @@ static int sun50i_iommu_map(struct iommu_domain *domain, unsigned long iova,
|
|
}
|
|
|
|
pte_index = sun50i_iova_get_pte_index(iova);
|
|
- pte_addr = &page_table[pte_index];
|
|
- if (unlikely(sun50i_pte_is_page_valid(*pte_addr))) {
|
|
- phys_addr_t page_phys = sun50i_pte_get_page_address(*pte_addr);
|
|
- dev_err(iommu->dev,
|
|
- "iova %pad already mapped to %pa cannot remap to %pa prot: %#x\n",
|
|
- &iova, &page_phys, &paddr, prot);
|
|
- ret = -EBUSY;
|
|
- goto out;
|
|
+ for (i = 0; i < pages; i++) {
|
|
+ pte_addr = &page_table[pte_index + i];
|
|
+ if (unlikely(sun50i_pte_is_page_valid(*pte_addr))) {
|
|
+ phys_addr_t page_phys = sun50i_pte_get_page_address(*pte_addr);
|
|
+ dev_err(iommu->dev,
|
|
+ "iova %pad already mapped to %pa cannot remap to %pa prot: %#x\n",
|
|
+ &iova, &page_phys, &paddr, prot);
|
|
+ ret = -EBUSY;
|
|
+ goto out;
|
|
+ }
|
|
+ *pte_addr = sun50i_mk_pte(paddr, prot);
|
|
+ paddr += SPAGE_SIZE;
|
|
}
|
|
|
|
- *pte_addr = sun50i_mk_pte(paddr, prot);
|
|
- sun50i_table_flush(sun50i_domain, pte_addr, 1);
|
|
+ sun50i_table_flush(sun50i_domain, &page_table[pte_index], pages);
|
|
*mapped = size;
|
|
|
|
out:
|
|
@@ -626,8 +631,10 @@ static size_t sun50i_iommu_unmap(struct iommu_domain *domain, unsigned long iova
|
|
{
|
|
struct sun50i_iommu_domain *sun50i_domain = to_sun50i_domain(domain);
|
|
phys_addr_t pt_phys;
|
|
+ u32 dte, pages, i;
|
|
u32 *pte_addr;
|
|
- u32 dte;
|
|
+
|
|
+ pages = size / SPAGE_SIZE;
|
|
|
|
dte = sun50i_domain->dt[sun50i_iova_get_dte_index(iova)];
|
|
if (!sun50i_dte_is_pt_valid(dte))
|
|
@@ -636,13 +643,14 @@ static size_t sun50i_iommu_unmap(struct iommu_domain *domain, unsigned long iova
|
|
pt_phys = sun50i_dte_get_pt_address(dte);
|
|
pte_addr = (u32 *)phys_to_virt(pt_phys) + sun50i_iova_get_pte_index(iova);
|
|
|
|
- if (!sun50i_pte_is_page_valid(*pte_addr))
|
|
- return 0;
|
|
+ for (i = 0; i < pages; i++)
|
|
+ if (!sun50i_pte_is_page_valid(pte_addr[i]))
|
|
+ return 0;
|
|
|
|
- memset(pte_addr, 0, sizeof(*pte_addr));
|
|
- sun50i_table_flush(sun50i_domain, pte_addr, 1);
|
|
+ memset(pte_addr, 0, sizeof(*pte_addr) * pages);
|
|
+ sun50i_table_flush(sun50i_domain, pte_addr, pages);
|
|
|
|
- return SZ_4K;
|
|
+ return size;
|
|
}
|
|
|
|
static phys_addr_t sun50i_iommu_iova_to_phys(struct iommu_domain *domain,
|
|
@@ -828,7 +836,7 @@ static int sun50i_iommu_of_xlate(struct device *dev,
|
|
|
|
static const struct iommu_ops sun50i_iommu_ops = {
|
|
.identity_domain = &sun50i_iommu_identity_domain,
|
|
- .pgsize_bitmap = SZ_4K,
|
|
+ .pgsize_bitmap = 0x1ff000,
|
|
.device_group = generic_single_device_group,
|
|
.domain_alloc_paging = sun50i_iommu_domain_alloc_paging,
|
|
.of_xlate = sun50i_iommu_of_xlate,
|