| @@ -1023,7 +1023,7 @@ static void its_free_tables(struct its_node *its) · 1022 unmodified lines |
| 1023 | | 1023 | |
| 1024 | static int its_alloc_tables(struct its_node *its) | 1024 | static int its_alloc_tables(struct its_node *its) |
| 1025 | { | 1025 | { |
| 1026 | u64 typer = readq_relaxed(its->base + GITS_TYPER); | 1026 | u64 typer = gic_read_typer(its->base + GITS_TYPER); |
| 1027 | u32 ids = GITS_TYPER_DEVBITS(typer); | 1027 | u32 ids = GITS_TYPER_DEVBITS(typer); |
| 1028 | u64 shr = GITS_BASER_InnerShareable; | 1028 | u64 shr = GITS_BASER_InnerShareable; |
| 1029 | u64 cache = GITS_BASER_WaWb; | 1029 | u64 cache = GITS_BASER_WaWb; |
| @@ -1198,7 +1198,7 @@ static void its_cpu_init_collection(void) · 168 unmodified lines |
| 1198 | * We now have to bind each collection to its target | 1198 | * We now have to bind each collection to its target |
| 1199 | * redistributor. | 1199 | * redistributor. |
| 1200 | */ | 1200 | */ |
| 1201 | if (readq_relaxed(its->base + GITS_TYPER) & GITS_TYPER_PTA) { | 1201 | if (gic_read_typer(its->base + GITS_TYPER) & GITS_TYPER_PTA) { |
| 1202 | /* | 1202 | /* |
| 1203 | * This ITS wants the physical address of the | 1203 | * This ITS wants the physical address of the |
| 1204 | * redistributor. | 1204 | * redistributor. |
| @@ -1208,7 +1208,7 @@ static void its_cpu_init_collection(void) · 3 unmodified lines |
| 1208 | /* | 1208 | /* |
| 1209 | * This ITS wants a linear CPU number. | 1209 | * This ITS wants a linear CPU number. |
| 1210 | */ | 1210 | */ |
| 1211 | target = readq_relaxed(gic_data_rdist_rd_base() + GICR_TYPER); | 1211 | target = gic_read_typer(gic_data_rdist_rd_base() + GICR_TYPER); |
| 1212 | target = GICR_TYPER_CPU_NUMBER(target) << 16; | 1212 | target = GICR_TYPER_CPU_NUMBER(target) << 16; |
| 1213 | } | 1213 | } |
| 1214 | | 1214 | |
| @@ -1691,7 +1691,7 @@ static int __init its_probe_one(struct resource *res, · 476 unmodified lines |
| 1691 | INIT_LIST_HEAD(&its->its_device_list); | 1691 | INIT_LIST_HEAD(&its->its_device_list); |
| 1692 | its->base = its_base; | 1692 | its->base = its_base; |
| 1693 | its->phys_base = res->start; | 1693 | its->phys_base = res->start; |
| 1694 | its->ite_size = ((readl_relaxed(its_base + GITS_TYPER) >> 4) & 0xf) + 1; | 1694 | its->ite_size = ((gic_read_typer(its_base + GITS_TYPER) >> 4) & 0xf) + 1; |
| 1695 | its->numa_node = numa_node; | 1695 | its->numa_node = numa_node; |
| 1696 | | 1696 | |
| 1697 | its->cmd_base = kzalloc(ITS_CMD_QUEUE_SZ, GFP_KERNEL); | 1697 | its->cmd_base = kzalloc(ITS_CMD_QUEUE_SZ, GFP_KERNEL); |
| @@ -1763,7 +1763,7 @@ out_unmap: · 65 unmodified lines |
| 1763 | | 1763 | |
| 1764 | static bool gic_rdists_supports_plpis(void) | 1764 | static bool gic_rdists_supports_plpis(void) |
| 1765 | { | 1765 | { |
| 1766 | return !!(readl_relaxed(gic_data_rdist_rd_base() + GICR_TYPER) & GICR_TYPER_PLPIS); | 1766 | return !!(gic_read_typer(gic_data_rdist_rd_base() + GICR_TYPER) & GICR_TYPER_PLPIS); |
| 1767 | } | 1767 | } |
| 1768 | | 1768 | |
| 1769 | int its_cpu_init(void) | 1769 | int its_cpu_init(void) |