Switch back to ioread32 and iowrite32 for cases where bus_space_vaddr is

used instead of bus_space_read/bus_space_write.

diff --git a/sys/dev/pci/drm/drm_linux.h b/sys/dev/pci/drm/drm_linux.h
index aafc466..825a725 100644 (file)
--- a/sys/dev/pci/drm/drm_linux.h
+++ b/sys/dev/pci/drm/drm_linux.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: drm_linux.h,v 1.21 2015/04/12 03:54:10 jsg Exp $      */
+/*     $OpenBSD: drm_linux.h,v 1.22 2015/04/12 05:31:23 jsg Exp $      */
 /*
  * Copyright (c) 2013, 2014 Mark Kettenis
  *
@@ -477,6 +477,20 @@ struct pci_dev {
 #define memcpy_fromio(d, s, n) memcpy(d, s, n)
 #define memset_io(d, b, n)     memset(d, b, n)
 
+static inline u32
+ioread32(const volatile void __iomem *addr)
+{
+       u32 r;
+       memcpy(&r, (void *)addr, 4);
+       return (r);
+}
+
+static inline void
+iowrite32(u32 val, volatile void __iomem *addr)
+{
+       memcpy((void *)addr, &val, 4);
+}
+
 #define page_to_phys(page)     (VM_PAGE_TO_PHYS(page))
 #define page_to_pfn(pp)                (VM_PAGE_TO_PHYS(pp) / PAGE_SIZE)
 #define offset_in_page(off)    ((off) & PAGE_MASK)

diff --git a/sys/dev/pci/drm/i915/intel_opregion.c b/sys/dev/pci/drm/i915/intel_opregion.c
index 2b58d8a..2461c7a 100644 (file)
--- a/sys/dev/pci/drm/i915/intel_opregion.c
+++ b/sys/dev/pci/drm/i915/intel_opregion.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: intel_opregion.c,v 1.6 2015/04/06 10:56:37 jsg Exp $  */
+/*     $OpenBSD: intel_opregion.c,v 1.7 2015/04/12 05:31:23 jsg Exp $  */
 /*
  * Copyright 2008 Intel Corporation <hong.liu@intel.com>
  * Copyright 2008 Red Hat <mjg@redhat.com>
@@ -166,7 +166,7 @@ static u32 asle_set_backlight(struct drm_device *dev, u32 bclp)
 
        max = intel_panel_get_max_backlight(dev);
        intel_panel_set_backlight(dev, bclp * max / 255);
-       asle->cblv = DIV_ROUND_UP(bclp * 100, 255) | ASLE_CBLV_VALID;
+       iowrite32(DIV_ROUND_UP(bclp * 100, 255) | ASLE_CBLV_VALID, &asle->cblv);
 
        return 0;
 }
@@ -210,7 +210,7 @@ void intel_opregion_asle_intr(struct drm_device *dev)
        if (!asle)
                return;
 
-       asle_req = asle->aslc & ASLE_REQ_MSK;
+       asle_req = ioread32(&asle->aslc) & ASLE_REQ_MSK;
 
        if (!asle_req) {
                DRM_DEBUG_DRIVER("non asle set request??\n");
@@ -218,18 +218,18 @@ void intel_opregion_asle_intr(struct drm_device *dev)
        }
 
        if (asle_req & ASLE_SET_ALS_ILLUM)
-               asle_stat |= asle_set_als_illum(dev, asle->alsi);
+               asle_stat |= asle_set_als_illum(dev, ioread32(&asle->alsi));
 
        if (asle_req & ASLE_SET_BACKLIGHT)
-               asle_stat |= asle_set_backlight(dev, asle->bclp);
+               asle_stat |= asle_set_backlight(dev, ioread32(&asle->bclp));
 
        if (asle_req & ASLE_SET_PFIT)
-               asle_stat |= asle_set_pfit(dev, asle->pfit);
+               asle_stat |= asle_set_pfit(dev, ioread32(&asle->pfit));
 
        if (asle_req & ASLE_SET_PWM_FREQ)
-               asle_stat |= asle_set_pwm_freq(dev, asle->pfmb);
+               asle_stat |= asle_set_pwm_freq(dev, ioread32(&asle->pfmb));
 
-       asle->aslc = asle_stat;
+       iowrite32(asle_stat, &asle->aslc);
 }
 
 void intel_opregion_gse_intr(struct drm_device *dev)
@@ -242,7 +242,7 @@ void intel_opregion_gse_intr(struct drm_device *dev)
        if (!asle)
                return;
 
-       asle_req = asle->aslc & ASLE_REQ_MSK;
+       asle_req = ioread32(&asle->aslc) & ASLE_REQ_MSK;
 
        if (!asle_req) {
                DRM_DEBUG_DRIVER("non asle set request??\n");
@@ -255,7 +255,7 @@ void intel_opregion_gse_intr(struct drm_device *dev)
        }
 
        if (asle_req & ASLE_SET_BACKLIGHT)
-               asle_stat |= asle_set_backlight(dev, asle->bclp);
+               asle_stat |= asle_set_backlight(dev, ioread32(&asle->bclp));
 
        if (asle_req & ASLE_SET_PFIT) {
                DRM_DEBUG_DRIVER("Pfit is not supported\n");
@@ -267,7 +267,7 @@ void intel_opregion_gse_intr(struct drm_device *dev)
                asle_stat |= ASLE_PWM_FREQ_FAILED;
        }
 
-       asle->aslc = asle_stat;
+       iowrite32(asle_stat, &asle->aslc);
 }
 #define ASLE_ALS_EN    (1<<0)
 #define ASLE_BLC_EN    (1<<1)
@@ -283,9 +283,10 @@ void intel_opregion_enable_asle(struct drm_device *dev)
                if (IS_MOBILE(dev))
                        intel_enable_asle(dev);
 
-               asle->tche = ASLE_ALS_EN | ASLE_BLC_EN | ASLE_PFIT_EN |
-                       ASLE_PFMB_EN;
-               asle->ardy = 1;
+               iowrite32(ASLE_ALS_EN | ASLE_BLC_EN | ASLE_PFIT_EN |
+                         ASLE_PFMB_EN,
+                         &asle->tche);
+               iowrite32(1, &asle->ardy);
        }
 }
 
@@ -316,10 +317,11 @@ static int intel_opregion_video_event(struct notifier_block *nb,
 
        acpi = system_opregion->acpi;
 
-       if (event->type == 0x80 && !(acpi->cevt & 0x1))
+       if (event->type == 0x80 &&
+           (ioread32(&acpi->cevt) & 1) == 0)
                ret = NOTIFY_BAD;
 
-       acpi->csts = 0;
+       iowrite32(0, &acpi->csts);
 
        return ret;
 }
@@ -345,6 +347,7 @@ static void intel_didl_outputs(struct drm_device *dev)
        struct acpi_device *acpi_dev, *acpi_cdev, *acpi_video_bus = NULL;
        unsigned long long device_id;
        acpi_status status;
+       u32 temp;
        int i = 0;
 
        handle = DEVICE_ACPI_HANDLE(&dev->pdev->dev);
@@ -379,7 +382,8 @@ static void intel_didl_outputs(struct drm_device *dev)
                if (ACPI_SUCCESS(status)) {
                        if (!device_id)
                                goto blind_set;
-                       opregion->acpi->didl[i] = (u32)(device_id & 0x0f0f);
+                       iowrite32((u32)(device_id & 0x0f0f),
+                                 &opregion->acpi->didl[i]);
                        i++;
                }
        }
@@ -387,7 +391,7 @@ static void intel_didl_outputs(struct drm_device *dev)
 end:
        /* If fewer than 8 outputs, the list must be null terminated */
        if (i < 8)
-               opregion->acpi->didl[i] = 0;
+               iowrite32(0, &opregion->acpi->didl[i]);
        return;
 
 blind_set:
@@ -421,7 +425,9 @@ blind_set:
                        output_type = ACPI_LVDS_OUTPUT;
                        break;
                }
-               opregion->acpi->didl[i] |= (1<<31) | output_type | i;
+               temp = ioread32(&opregion->acpi->didl[i]);
+               iowrite32(temp | (1<<31) | output_type | i,
+                         &opregion->acpi->didl[i]);
                i++;
        }
        goto end;
@@ -443,8 +449,8 @@ void intel_opregion_init(struct drm_device *dev)
                /* Notify BIOS we are ready to handle ACPI video ext notifs.
                 * Right now, all the events are handled by the ACPI video module.
                 * We don't actually need to do anything with them. */
-               opregion->acpi->csts = 0;
-               opregion->acpi->drdy = 1;
+               iowrite32(0, &opregion->acpi->csts);
+               iowrite32(1, &opregion->acpi->drdy);
 
                system_opregion = opregion;
 #ifdef notyet
@@ -465,7 +471,7 @@ void intel_opregion_fini(struct drm_device *dev)
                return;
 
        if (opregion->acpi) {
-               opregion->acpi->drdy = 0;
+               iowrite32(0, &opregion->acpi->drdy);
 
                system_opregion = NULL;
 #ifdef notyet
@@ -517,7 +523,7 @@ int intel_opregion_setup(struct drm_device *dev)
 
        opregion->lid_state = base + ACPI_CLID;
 
-       mboxes = opregion->header->mboxes;
+       mboxes = ioread32(&opregion->header->mboxes);
        if (mboxes & MBOX_ACPI) {
                DRM_DEBUG_DRIVER("Public ACPI methods supported\n");
                opregion->acpi = base + OPREGION_ACPI_OFFSET;

diff --git a/sys/dev/pci/drm/i915/intel_overlay.c b/sys/dev/pci/drm/i915/intel_overlay.c
index 49b595a..430c96b 100644 (file)
--- a/sys/dev/pci/drm/i915/intel_overlay.c
+++ b/sys/dev/pci/drm/i915/intel_overlay.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: intel_overlay.c,v 1.15 2015/04/11 02:59:05 jsg Exp $  */
+/*     $OpenBSD: intel_overlay.c,v 1.16 2015/04/12 05:31:23 jsg Exp $  */
 /*
  * Copyright © 2009
  *
@@ -601,16 +601,19 @@ static bool update_scaling_factors(struct intel_overlay *overlay,
        overlay->old_xscale = xscale;
        overlay->old_yscale = yscale;
 
-       regs->YRGBSCALE = (((yscale & FRACT_MASK) << 20) |
+       iowrite32(((yscale & FRACT_MASK) << 20) |
                  ((xscale >> FP_SHIFT)  << 16) |
-                 ((xscale & FRACT_MASK) << 3));
+                 ((xscale & FRACT_MASK) << 3),
+                &regs->YRGBSCALE);
 
-       regs->UVSCALE = (((yscale_UV & FRACT_MASK) << 20) |
+       iowrite32(((yscale_UV & FRACT_MASK) << 20) |
                  ((xscale_UV >> FP_SHIFT)  << 16) |
-                 ((xscale_UV & FRACT_MASK) << 3));
+                 ((xscale_UV & FRACT_MASK) << 3),
+                &regs->UVSCALE);
 
-       regs->UVSCALEV = ((((yscale    >> FP_SHIFT) << 16) |
-                  ((yscale_UV >> FP_SHIFT) << 0)));
+       iowrite32((((yscale    >> FP_SHIFT) << 16) |
+                  ((yscale_UV >> FP_SHIFT) << 0)),
+                &regs->UVSCALEV);
 
        if (scale_changed)
                update_polyphase_filter(regs);
@@ -625,24 +628,26 @@ static void update_colorkey(struct intel_overlay *overlay,
 
        switch (overlay->crtc->base.fb->bits_per_pixel) {
        case 8:
-               regs->DCLRKV = 0;
-               regs->DCLRKM = CLK_RGB8I_MASK | DST_KEY_ENABLE;
+               iowrite32(0, &regs->DCLRKV);
+               iowrite32(CLK_RGB8I_MASK | DST_KEY_ENABLE, &regs->DCLRKM);
                break;
 
        case 16:
                if (overlay->crtc->base.fb->depth == 15) {
-                       regs->DCLRKV = RGB15_TO_COLORKEY(key);
-                       regs->DCLRKM = CLK_RGB15_MASK | DST_KEY_ENABLE;
+                       iowrite32(RGB15_TO_COLORKEY(key), &regs->DCLRKV);
+                       iowrite32(CLK_RGB15_MASK | DST_KEY_ENABLE,
+                                 &regs->DCLRKM);
                } else {
-                       regs->DCLRKV = RGB16_TO_COLORKEY(key);
-                       regs->DCLRKM = CLK_RGB16_MASK | DST_KEY_ENABLE;
+                       iowrite32(RGB16_TO_COLORKEY(key), &regs->DCLRKV);
+                       iowrite32(CLK_RGB16_MASK | DST_KEY_ENABLE,
+                                 &regs->DCLRKM);
                }
                break;
 
        case 24:
        case 32:
-               regs->DCLRKV = key;
-               regs->DCLRKM = CLK_RGB24_MASK | DST_KEY_ENABLE;
+               iowrite32(key, &regs->DCLRKV);
+               iowrite32(CLK_RGB24_MASK | DST_KEY_ENABLE, &regs->DCLRKM);
                break;
        }
 }
@@ -730,7 +735,7 @@ static int intel_overlay_do_put_image(struct intel_overlay *overlay,
                        oconfig |= OCONF_CSC_MODE_BT709;
                oconfig |= overlay->crtc->pipe == 0 ?
                        OCONF_PIPE_A : OCONF_PIPE_B;
-               regs->OCONFIG = oconfig;
+               iowrite32(oconfig, &regs->OCONFIG);
                intel_overlay_unmap_regs(overlay, regs);
 
                ret = intel_overlay_on(overlay);
@@ -744,8 +749,8 @@ static int intel_overlay_do_put_image(struct intel_overlay *overlay,
                goto out_unpin;
        }
 
-       regs->DWINPOS = (params->dst_y << 16) | params->dst_x;
-       regs->DWINSZ = (params->dst_h << 16) | params->dst_w;
+       iowrite32((params->dst_y << 16) | params->dst_x, &regs->DWINPOS);
+       iowrite32((params->dst_h << 16) | params->dst_w, &regs->DWINSZ);
 
        if (params->format & I915_OVERLAY_YUV_PACKED)
                tmp_width = packed_width_bytes(params->format, params->src_w);
@@ -755,7 +760,7 @@ static int intel_overlay_do_put_image(struct intel_overlay *overlay,
        swidth = params->src_w;
        swidthsw = calc_swidthsw(overlay->dev, params->offset_Y, tmp_width);
        sheight = params->src_h;
-       regs->OBUF_0Y = new_bo->gtt_offset + params->offset_Y;
+       iowrite32(new_bo->gtt_offset + params->offset_Y, &regs->OBUF_0Y);
        ostride = params->stride_Y;
 
        if (params->format & I915_OVERLAY_YUV_PLANAR) {
@@ -769,21 +774,21 @@ static int intel_overlay_do_put_image(struct intel_overlay *overlay,
                                      params->src_w/uv_hscale);
                swidthsw |= max_t(u32, tmp_U, tmp_V) << 16;
                sheight |= (params->src_h/uv_vscale) << 16;
-               regs->OBUF_0U = new_bo->gtt_offset + params->offset_U;
-               regs->OBUF_0V = new_bo->gtt_offset + params->offset_V;
+               iowrite32(new_bo->gtt_offset + params->offset_U, &regs->OBUF_0U);
+               iowrite32(new_bo->gtt_offset + params->offset_V, &regs->OBUF_0V);
                ostride |= params->stride_UV << 16;
        }
 
-       regs->SWIDTH = swidth;
-       regs->SWIDTHSW = swidthsw;
-       regs->SHEIGHT = sheight;
-       regs->OSTRIDE = ostride;
+       iowrite32(swidth, &regs->SWIDTH);
+       iowrite32(swidthsw, &regs->SWIDTHSW);
+       iowrite32(sheight, &regs->SHEIGHT);
+       iowrite32(ostride, &regs->OSTRIDE);
 
        scale_changed = update_scaling_factors(overlay, regs, params);
 
        update_colorkey(overlay, regs);
 
-       regs->OCMD = overlay_cmd_reg(params);
+       iowrite32(overlay_cmd_reg(params), &regs->OCMD);
 
        intel_overlay_unmap_regs(overlay, regs);
 
@@ -822,7 +827,7 @@ int intel_overlay_switch_off(struct intel_overlay *overlay)
                return ret;
 
        regs = intel_overlay_map_regs(overlay);
-       regs->OCMD = 0;
+       iowrite32(0, &regs->OCMD);
        intel_overlay_unmap_regs(overlay, regs);
 
        ret = intel_overlay_off(overlay);
@@ -1191,8 +1196,9 @@ out_free:
 static void update_reg_attrs(struct intel_overlay *overlay,
                             struct overlay_registers __iomem *regs)
 {
-       regs->OCLRC0 = (overlay->contrast << 18) | (overlay->brightness & 0xff);
-       regs->OCLRC1 = overlay->saturation;
+       iowrite32((overlay->contrast << 18) | (overlay->brightness & 0xff),
+                 &regs->OCLRC0);
+       iowrite32(overlay->saturation, &regs->OCLRC1);
 }
 
 static bool check_gamma_bounds(u32 gamma1, u32 gamma2)

diff --git a/sys/dev/pci/drm/ttm/ttm_bo_util.c b/sys/dev/pci/drm/ttm/ttm_bo_util.c
index eafa80b..48e20d9 100644 (file)
--- a/sys/dev/pci/drm/ttm/ttm_bo_util.c
+++ b/sys/dev/pci/drm/ttm/ttm_bo_util.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ttm_bo_util.c,v 1.13 2015/04/12 03:54:10 jsg Exp $    */
+/*     $OpenBSD: ttm_bo_util.c,v 1.14 2015/04/12 05:31:23 jsg Exp $    */
 /**************************************************************************
  *
  * Copyright (c) 2007-2009 VMware, Inc., Palo Alto, CA., USA
@@ -247,11 +247,7 @@ static int ttm_copy_io_page(void *dst, void *src, unsigned long page)
 
        int i;
        for (i = 0; i < PAGE_SIZE / sizeof(uint32_t); ++i)
-#ifdef notyet
                iowrite32(ioread32(srcP++), dstP++);
-#else
-               *dstP++ = *srcP++;
-#endif
        return 0;
 }