|
1 | | -/* $NetBSD: bcm2838_pcie.c,v 1.9 2024/12/31 13:58:21 skrll Exp $ */ |
| 1 | +/* $NetBSD: bcm2838_pcie.c,v 1.10 2025/01/03 13:04:02 skrll Exp $ */ |
2 | 2 |
|
3 | 3 | /*- |
4 | 4 | * Copyright (c) 2020 The NetBSD Foundation, Inc. |
|
30 | 30 | */ |
31 | 31 |
|
32 | 32 | #include <sys/cdefs.h> |
33 | | -__KERNEL_RCSID(0, "$NetBSD: bcm2838_pcie.c,v 1.9 2024/12/31 13:58:21 skrll Exp $"); |
| 33 | +__KERNEL_RCSID(0, "$NetBSD: bcm2838_pcie.c,v 1.10 2025/01/03 13:04:02 skrll Exp $"); |
34 | 34 |
|
35 | 35 | #include <sys/param.h> |
36 | 36 | #include <sys/device.h> |
@@ -73,11 +73,11 @@ struct bcmstb_busspace { |
73 | 73 |
|
74 | 74 | struct bcmstb_softc { |
75 | 75 | bus_space_tag_t sc_bst; |
76 | | - bus_space_handle_t sc_bsh; |
| 76 | + bus_space_handle_t sc_bsh; |
77 | 77 | bus_dma_tag_t sc_dmat; |
78 | 78 |
|
79 | 79 | kmutex_t sc_lock; |
80 | | - const char *sc_name; |
| 80 | + const char * sc_name; |
81 | 81 |
|
82 | 82 | int sc_phandle; |
83 | 83 |
|
@@ -151,9 +151,9 @@ stb_setbits(struct bcmstb_softc *sc, int r, uint32_t clr, uint32_t set) |
151 | 151 | w = (w & ~clr) | set; |
152 | 152 | stb_write(sc, r, w); |
153 | 153 | } |
154 | | -#define STBWRITE(sc, r, v) stb_write((sc), (r), (v)) |
155 | | -#define STBREAD(sc, r) stb_read((sc), (r)) |
156 | | -#define STBRMW(sc, r, c, s) stb_setbits((sc), (r), (c), (s)) |
| 154 | +#define STBWRITE(sc, r, v) stb_write((sc), (r), (v)) |
| 155 | +#define STBREAD(sc, r) stb_read((sc), (r)) |
| 156 | +#define STBRMW(sc, r, c, s) stb_setbits((sc), (r), (c), (s)) |
157 | 157 |
|
158 | 158 | static const struct device_compatible_entry compat_data[] = { |
159 | 159 | { .compat = "brcm,pci-plat-dev" }, |
@@ -688,7 +688,7 @@ bcmstb_intr_map(const struct pci_attach_args *pa, pci_intr_handle_t *ih) |
688 | 688 |
|
689 | 689 | imap = fdtbus_get_prop(sc->sc_phandle, "interrupt-map", &imaplen); |
690 | 690 | imask = fdtbus_get_prop(sc->sc_phandle, "interrupt-map-mask", |
691 | | - &imasklen); |
| 691 | + &imasklen); |
692 | 692 | if (imap == NULL || imask == NULL || imasklen != 16) |
693 | 693 | return EINVAL; |
694 | 694 |
|
@@ -860,8 +860,7 @@ bcmstb_bus_space_map(void *t, bus_addr_t bpa, bus_size_t size, int flag, |
860 | 860 |
|
861 | 861 | for (size_t i = 0; i < bs->nranges; i++) { |
862 | 862 | const bus_addr_t rmin = bs->ranges[i].bpci; |
863 | | - const bus_addr_t rmax = bs->ranges[i].bpci - 1 + bs->ranges[i] |
864 | | -.size; |
| 863 | + const bus_addr_t rmax = bs->ranges[i].bpci - 1 + bs->ranges[i].size; |
865 | 864 | if ((bpa >= rmin) && ((bpa - 1 + size) <= rmax)) { |
866 | 865 | const bus_addr_t pa = bs->ranges[i].bbus + (bpa - rmin); |
867 | 866 |
|
|
0 commit comments