Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 21 Mar 2019 10:51:36 +0000 (UTC)
From:      Marcin Wojtas <mw@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r345373 - head/sys/arm64/arm64
Message-ID:  <201903211051.x2LApaTd077983@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mw
Date: Thu Mar 21 10:51:36 2019
New Revision: 345373
URL: https://svnweb.freebsd.org/changeset/base/345373

Log:
  Add bus_release_resource() method to nexus on arm64
  
  The nexus module was missing method for releasing bus resources. As a
  result, it couldn't be released and the bus_release_resource() call would
  return ENXIO.
  
  Next call to bus_alloc_resource() for the same resource was returning
  error, because it wasn't released previously and it was still busy.
  
  The implementation of the nexus_release_resource() is the same as for
  arm architecture.
  
  Submitted by:  Michal Krawczyk <mk@semihalf.com>
  Reported-by:   Greg V <greg@unrelenting.technology>
  Tested-by:     cperciva, Greg V <greg@unrelenting.technology>
  Obtained from: Semihalf
  MFC after:     2 weeks
  Sponsored by:  Amazon, Inc.
  Differential revision: https://reviews.freebsd.org/D19641

Modified:
  head/sys/arm64/arm64/nexus.c

Modified: head/sys/arm64/arm64/nexus.c
==============================================================================
--- head/sys/arm64/arm64/nexus.c	Thu Mar 21 10:50:36 2019	(r345372)
+++ head/sys/arm64/arm64/nexus.c	Thu Mar 21 10:51:36 2019	(r345373)
@@ -113,6 +113,8 @@ static	int nexus_set_resource(device_t, device_t, int,
     rman_res_t, rman_res_t);
 static	int nexus_deactivate_resource(device_t, device_t, int, int,
     struct resource *);
+static int nexus_release_resource(device_t, device_t, int, int,
+    struct resource *);
 
 static int nexus_setup_intr(device_t dev, device_t child, struct resource *res,
     int flags, driver_filter_t *filt, driver_intr_t *intr, void *arg, void **cookiep);
@@ -137,6 +139,7 @@ static device_method_t nexus_methods[] = {
 	DEVMETHOD(bus_get_resource_list, nexus_get_reslist),
 	DEVMETHOD(bus_set_resource,	nexus_set_resource),
 	DEVMETHOD(bus_deactivate_resource,	nexus_deactivate_resource),
+	DEVMETHOD(bus_release_resource,	nexus_release_resource),
 	DEVMETHOD(bus_setup_intr,	nexus_setup_intr),
 	DEVMETHOD(bus_teardown_intr,	nexus_teardown_intr),
 	DEVMETHOD(bus_get_bus_tag,	nexus_get_bus_tag),
@@ -268,6 +271,20 @@ nexus_alloc_resource(device_t bus, device_t child, int
 	}
 
 	return (rv);
+}
+
+static int
+nexus_release_resource(device_t bus, device_t child, int type, int rid,
+    struct resource *res)
+{
+	int error;
+
+	if (rman_get_flags(res) & RF_ACTIVE) {
+		error = bus_deactivate_resource(child, type, rid, res);
+		if (error)
+			return (error);
+	}
+	return (rman_release_resource(res));
 }
 
 static int



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903211051.x2LApaTd077983>