 @@ -1,239 +1,244 @@
-/*	$NetBSD: nouveau_nvkm_subdev_pci_base.c,v 1.3 2018/08/27 07:40:40 riastradh Exp $	*/
+/*	$NetBSD: nouveau_nvkm_subdev_pci_base.c,v 1.4 2018/12/19 09:20:56 maya Exp $	*/
 /*
  * Copyright 2015 Red Hat Inc.
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
  * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
  * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  * OTHER DEALINGS IN THE SOFTWARE.
+ *
  * Authors: Ben Skeggs <bskeggs@redhat.com>
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_pci_base.c,v 1.3 2018/08/27 07:40:40 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_pci_base.c,v 1.4 2018/12/19 09:20:56 maya Exp $");
 #include "priv.h"
 #include "agp.h"
 #include <core/option.h>
 #include <core/pci.h>
 #include <subdev/mc.h>
 u32
 nvkm_pci_rd32(struct nvkm_pci *pci, u16 addr)
+{
 	return pci->func->rd32(pci, addr);
+}
 void
 nvkm_pci_wr08(struct nvkm_pci *pci, u16 addr, u8 data)
+{
 	pci->func->wr08(pci, addr, data);
+}
 void
 nvkm_pci_wr32(struct nvkm_pci *pci, u16 addr, u32 data)
+{
 	pci->func->wr32(pci, addr, data);
+}
 u32
 nvkm_pci_mask(struct nvkm_pci *pci, u16 addr, u32 mask, u32 value)
+{
 	u32 data = pci->func->rd32(pci, addr);
 	pci->func->wr32(pci, addr, (data & ~mask) | value);
 	return data;
+}
 void
 nvkm_pci_rom_shadow(struct nvkm_pci *pci, bool shadow)
+{
 	u32 data = nvkm_pci_rd32(pci, 0x0050);
 	if (shadow)
 		data |=  0x00000001;
 	else
 		data &= ~0x00000001;
 	nvkm_pci_wr32(pci, 0x0050, data);
+}
 static irqreturn_t
 nvkm_pci_intr(DRM_IRQ_ARGS)
+{
 	struct nvkm_pci *pci = arg;
 	struct nvkm_mc *mc = pci->subdev.device->mc;
 	bool handled = false;
 	if (likely(mc)) {
 		nvkm_mc_intr_unarm(mc);
 		if (pci->msi)
 			pci->func->msi_rearm(pci);
 		nvkm_mc_intr(mc, &handled);
 		nvkm_mc_intr_rearm(mc);
+	}
 	return handled ? IRQ_HANDLED : IRQ_NONE;
+}
 static int
 nvkm_pci_fini(struct nvkm_subdev *subdev, bool suspend)
+{
 	struct nvkm_pci *pci = nvkm_pci(subdev);
 #ifdef __NetBSD__
 	const struct pci_attach_args *pa = &pci->pdev->pd_pa;
 	if (pci->pci_intrcookie != NULL) {
 		pci_intr_disestablish(pa->pa_pc, pci->pci_intrcookie);
 		pci->pci_intrcookie = NULL;
+	}
 	if (pci->pci_ihp != NULL) {
 		pci_intr_release(pa->pa_pc, pci->pci_ihp, 1);
 		pci->pci_ihp = NULL;
+	}
 #else
 	if (pci->irq >= 0) {
 		free_irq(pci->irq, pci);
 		pci->irq = -1;
 	};
 #endif
 	if (pci->agp.bridge)
 		nvkm_agp_fini(pci);
 	return 0;
+}
 static int
 nvkm_pci_preinit(struct nvkm_subdev *subdev)
+{
 	struct nvkm_pci *pci = nvkm_pci(subdev);
 	if (pci->agp.bridge)
 		nvkm_agp_preinit(pci);
 	return 0;
+}
 static int
 nvkm_pci_init(struct nvkm_subdev *subdev)
+{
 	struct nvkm_pci *pci = nvkm_pci(subdev);
 	struct pci_dev *pdev = pci->pdev;
 	int ret;
 	if (pci->agp.bridge) {
 		ret = nvkm_agp_init(pci);
 		if (ret)
 			return ret;
+	}
 	if (pci->func->init)
 		pci->func->init(pci);
 #ifdef __NetBSD__
+    {
 	const struct pci_attach_args *pa = &pdev->pd_pa;
 	int counts[PCI_INTR_TYPE_SIZE] =  {
 			[PCI_INTR_TYPE_INTX] = 1,
 			[PCI_INTR_TYPE_MSI] = 0,
 			[PCI_INTR_TYPE_MSIX] = 0,
 	};
 	/* XXX errno NetBSD->Linux */
-	ret = -pci_intr_alloc(pa, &pci->pci_ihp, NULL, 0);
+	ret = -pci_intr_alloc(pa, &pci->pci_ihp, counts, PCI_INTR_TYPE_INTX);
 	if (ret)
 		return ret;
 	pci->pci_intrcookie = pci_intr_establish_xname(pa->pa_pc,
 	    pci->pci_ihp[0], IPL_DRM, nvkm_pci_intr, pci,
 	    device_xname(pci_dev_dev(pdev)));
 	if (pci->pci_intrcookie == NULL)
 		return -EIO;	/* XXX er? */
+    }
 #else
 	ret = request_irq(pdev->irq, nvkm_pci_intr, IRQF_SHARED, "nvkm", pci);
 	if (ret)
 		return ret;
 	pci->irq = pdev->irq;
 #endif
 	/* Ensure MSI interrupts are armed, for the case where there are
 	 * already interrupts pending (for whatever reason) at load time.
 	 */
 	if (pci->msi)
 		pci->func->msi_rearm(pci);
 	return ret;
+}
 static void *
 nvkm_pci_dtor(struct nvkm_subdev *subdev)
+{
 	struct nvkm_pci *pci = nvkm_pci(subdev);
 	nvkm_agp_dtor(pci);
 	if (pci->msi)
 		pci_disable_msi(pci->pdev);
 	return nvkm_pci(subdev);
+}
 static const struct nvkm_subdev_func
 nvkm_pci_func = {
 	.dtor = nvkm_pci_dtor,
 	.preinit = nvkm_pci_preinit,
 	.init = nvkm_pci_init,
 	.fini = nvkm_pci_fini,
 };
 int
 nvkm_pci_new_(const struct nvkm_pci_func *func, struct nvkm_device *device,
 	      int index, struct nvkm_pci **ppci)
+{
 	struct nvkm_pci *pci;
 	if (!(pci = *ppci = kzalloc(sizeof(**ppci), GFP_KERNEL)))
 		return -ENOMEM;
 	nvkm_subdev_ctor(&nvkm_pci_func, device, index, 0, &pci->subdev);
 	pci->func = func;
 	pci->pdev = device->func->pci(device)->pdev;
 #ifndef __NetBSD__
 	pci->irq = -1;
 #endif
 	if (device->type == NVKM_DEVICE_AGP)
 		nvkm_agp_ctor(pci);
 	switch (pci->pdev->device & 0x0ff0) {
 	case 0x00f0:
 	case 0x02e0:
 		/* BR02? NFI how these would be handled yet exactly */
 		break;
 	default:
 		switch (device->chipset) {
 		case 0xaa:
 			/* reported broken, nv also disable it */
 			break;
 		default:
 			pci->msi = true;
 			break;
+		}
+	}
 #ifdef __BIG_ENDIAN
 	pci->msi = false;
 #endif
 	pci->msi = nvkm_boolopt(device->cfgopt, "NvMSI", pci->msi);
 	if (pci->msi && func->msi_rearm) {
 		pci->msi = pci_enable_msi(pci->pdev) == 0;
 		if (pci->msi)
 			nvkm_debug(&pci->subdev, "MSI enabled\n");
 	} else {
 		pci->msi = false;
+	}
 	return 0;
+}