diff --git a/sys/dev/mmc/mmcbrvar.h b/sys/dev/mmc/mmcbrvar.h
index a6285eb7e9d3..7b0bc4739863 100644
--- a/sys/dev/mmc/mmcbrvar.h
+++ b/sys/dev/mmc/mmcbrvar.h
@@ -1,143 +1,156 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
  * Copyright (c) 2006 Bernd Walter.  All rights reserved.
  * Copyright (c) 2006 M. Warner Losh.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Portions of this software may have been developed with reference to
  * the SD Simplified Specification.  The following disclaimer may apply:
  *
  * The following conditions apply to the release of the simplified
  * specification ("Simplified Specification") by the SD Card Association and
  * the SD Group. The Simplified Specification is a subset of the complete SD
  * Specification which is owned by the SD Card Association and the SD
  * Group. This Simplified Specification is provided on a non-confidential
  * basis subject to the disclaimers below. Any implementation of the
  * Simplified Specification may require a license from the SD Card
  * Association, SD Group, SD-3C LLC or other third parties.
  *
  * Disclaimers:
  *
  * The information contained in the Simplified Specification is presented only
  * as a standard specification for SD Cards and SD Host/Ancillary products and
  * is provided "AS-IS" without any representations or warranties of any
  * kind. No responsibility is assumed by the SD Group, SD-3C LLC or the SD
  * Card Association for any damages, any infringements of patents or other
  * right of the SD Group, SD-3C LLC, the SD Card Association or any third
  * parties, which may result from its use. No license is granted by
  * implication, estoppel or otherwise under any patent or other rights of the
  * SD Group, SD-3C LLC, the SD Card Association or any third party. Nothing
  * herein shall be construed as an obligation by the SD Group, the SD-3C LLC
  * or the SD Card Association to disclose or distribute any technical
  * information, know-how or other confidential information to any third party.
  *
  * $FreeBSD$
  */
 
 #ifndef DEV_MMC_MMCBRVAR_H
 #define	DEV_MMC_MMCBRVAR_H
 
 #include <dev/mmc/mmcreg.h>
 
 #include "mmcbr_if.h"
 
 enum mmcbr_device_ivars {
     MMCBR_IVAR_BUS_MODE,
     MMCBR_IVAR_BUS_WIDTH,
     MMCBR_IVAR_CHIP_SELECT,
     MMCBR_IVAR_CLOCK,
     MMCBR_IVAR_F_MIN,
     MMCBR_IVAR_F_MAX,
     MMCBR_IVAR_HOST_OCR,
     MMCBR_IVAR_MODE,
     MMCBR_IVAR_OCR,
     MMCBR_IVAR_POWER_MODE,
     MMCBR_IVAR_RETUNE_REQ,
     MMCBR_IVAR_VDD,
     MMCBR_IVAR_VCCQ,
     MMCBR_IVAR_CAPS,
     MMCBR_IVAR_TIMING,
     MMCBR_IVAR_MAX_DATA,
     MMCBR_IVAR_MAX_BUSY_TIMEOUT
 };
 
 /*
  * Simplified accessors for bridge devices
  */
 #define	MMCBR_ACCESSOR(var, ivar, type)					\
 	__BUS_ACCESSOR(mmcbr, var, MMCBR, ivar, type)
 
 MMCBR_ACCESSOR(bus_mode, BUS_MODE, int)
 MMCBR_ACCESSOR(bus_width, BUS_WIDTH, int)
 MMCBR_ACCESSOR(chip_select, CHIP_SELECT, int)
 MMCBR_ACCESSOR(clock, CLOCK, int)
 MMCBR_ACCESSOR(f_max, F_MAX, int)
 MMCBR_ACCESSOR(f_min, F_MIN, int)
 MMCBR_ACCESSOR(host_ocr, HOST_OCR, int)
 MMCBR_ACCESSOR(mode, MODE, int)
 MMCBR_ACCESSOR(ocr, OCR, int)
 MMCBR_ACCESSOR(power_mode, POWER_MODE, int)
-MMCBR_ACCESSOR(retune_req, RETUNE_REQ, int)
 MMCBR_ACCESSOR(vdd, VDD, int)
 MMCBR_ACCESSOR(vccq, VCCQ, int)
 MMCBR_ACCESSOR(caps, CAPS, int)
 MMCBR_ACCESSOR(timing, TIMING, int)
 MMCBR_ACCESSOR(max_data, MAX_DATA, int)
 MMCBR_ACCESSOR(max_busy_timeout, MAX_BUSY_TIMEOUT, u_int)
 
+static int __inline
+mmcbr_get_retune_req(device_t dev)
+{
+	uintptr_t v;
+
+	if (__predict_false(BUS_READ_IVAR(device_get_parent(dev), dev,
+	    MMCBR_IVAR_RETUNE_REQ, &v) != 0))
+		return (retune_req_none);
+	return ((int)v);
+}
+
+/*
+ * Convenience wrappers for the mmcbr interface
+ */
 static int __inline
 mmcbr_update_ios(device_t dev)
 {
 
 	return (MMCBR_UPDATE_IOS(device_get_parent(dev), dev));
 }
 
 static int __inline
 mmcbr_tune(device_t dev, bool hs400)
 {
 
 	return (MMCBR_TUNE(device_get_parent(dev), dev, hs400));
 }
 
 static int __inline
 mmcbr_retune(device_t dev, bool reset)
 {
 
 	return (MMCBR_RETUNE(device_get_parent(dev), dev, reset));
 }
 
 static int __inline
 mmcbr_switch_vccq(device_t dev)
 {
 
 	return (MMCBR_SWITCH_VCCQ(device_get_parent(dev), dev));
 }
 
 static int __inline
 mmcbr_get_ro(device_t dev)
 {
 
 	return (MMCBR_GET_RO(device_get_parent(dev), dev));
 }
 
 #endif /* DEV_MMC_MMCBRVAR_H */