 @@ -1,14 +1,14 @@
-/*	$NetBSD: cd.c,v 1.330 2015/04/26 15:15:20 mlelstv Exp $	*/
+/*	$NetBSD: cd.c,v 1.331 2016/05/15 15:37:38 reinoud Exp $	*/
 /*-
  * Copyright (c) 1998, 2001, 2003, 2004, 2005, 2008 The NetBSD Foundation,
  * Inc.  All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum.
+ *
  * MMC framework implemented and contributed to the NetBSD Foundation by
  * Reinoud Zandijk.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
 @@ -40,27 +40,27 @@
  * Mellon University, makes this software available to CMU to distribute
  * or use in any manner that they see fit as long as this message is kept with
  * the software. For this reason TFS also grants any other persons or
  * organisations permission to use or modify this software.
+ *
  * TFS supplies this software to be publicly redistributed
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
+ *
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.330 2015/04/26 15:15:20 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.331 2016/05/15 15:37:38 reinoud Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/buf.h>
 #include <sys/bufq.h>
 #include <sys/uio.h>
 #include <sys/malloc.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 @@ -1789,29 +1789,29 @@ cdgetdisklabel(struct cd_softc *cd)
  * we count.
  */
 static int
 read_cd_capacity(struct scsipi_periph *periph, uint32_t *blksize, u_long *last_lba)
+{
 	struct scsipi_read_cd_capacity    cap_cmd;
 	/*
 	 * XXX: see PR 48550 and PR 48754:
 	 * the ahcisata(4) driver can not deal with unaligned
 	 * data, so align this "a bit"
 	 */
 	struct scsipi_read_cd_cap_data    cap __aligned(2);
 	struct scsipi_read_discinfo       di_cmd;
-	struct scsipi_read_discinfo_data  di;
+	struct scsipi_read_discinfo_data  di __aligned(2);
 	struct scsipi_read_trackinfo      ti_cmd;
-	struct scsipi_read_trackinfo_data ti;
+	struct scsipi_read_trackinfo_data ti __aligned(2);
 	uint32_t track_start, track_size;
 	int error, flags, msb, lsb, last_track;
 	/* if the device doesn't grok capacity, return the dummies */
 	if (periph->periph_quirks & PQUIRK_NOCAPACITY)
 		return 0;
 	/* first try read CD capacity for blksize and last recorded lba */
 	/* issue the cd capacity request */
 	flags = XS_CTL_DATA_IN;
 	memset(&cap_cmd, 0, sizeof(cap_cmd));
 	memset(&cap, 0, sizeof(cap));
 	cap_cmd.opcode = READ_CD_CAPACITY;
 @@ -2976,27 +2976,27 @@ mmc_getdiscinfo_dvdrom(struct scsipi_per
 	/* TODO how to handle disc_barcode and disc_id */
 	/* done */
 	return 0;
+}
 static int
 mmc_getdiscinfo(struct scsipi_periph *periph,
 		struct mmc_discinfo *mmc_discinfo)
+{
 	struct scsipi_get_configuration   gc_cmd;
 	struct scsipi_get_conf_data      *gc;
 	struct scsipi_get_conf_feature   *gcf;
 	struct scsipi_read_discinfo       di_cmd;
-	struct scsipi_read_discinfo_data  di;
+	struct scsipi_read_discinfo_data  di __aligned(2);
 	const uint32_t buffer_size = 1024;
 	uint32_t feat_tbl_len, pos;
 	u_long   last_lba = 0;
 	uint8_t  *buffer, *fpos;
 	int feature, last_feature, features_len, feature_cur, feature_len;
 	int lsb, msb, error, flags;
 	feat_tbl_len = buffer_size;
 	buffer = malloc(buffer_size, M_TEMP, M_WAITOK);
 	/* initialise structure */
 	memset(mmc_discinfo, 0, sizeof(struct mmc_discinfo));
 @@ -3492,29 +3492,29 @@ mmc_gettrackinfo_dvdrom(struct scsipi_pe
 	trackinfo->track_size    = track_size;
 	trackinfo->last_recorded = 0;
 out:
 	free(buffer, M_TEMP);
 	return error;
+}
 static int
 mmc_gettrackinfo(struct scsipi_periph *periph,
 		 struct mmc_trackinfo *trackinfo)
+{
 	struct scsipi_read_trackinfo      ti_cmd;
-	struct scsipi_read_trackinfo_data ti;
+	struct scsipi_read_trackinfo_data ti __aligned(2);
 	struct scsipi_get_configuration   gc_cmd;
-	struct scsipi_get_conf_data       gc;
+	struct scsipi_get_conf_data       gc __aligned(2);
 	int error, flags;
 	int mmc_profile;
 	/* set up SCSI call with track number from trackinfo.tracknr */
 	flags = XS_CTL_DATA_IN | XS_CTL_SILENT;
 	memset(&ti_cmd, 0, sizeof(ti_cmd));
 	ti_cmd.opcode    = READ_TRACKINFO;
 	ti_cmd.addr_type = READ_TRACKINFO_ADDR_TRACK;
 	ti_cmd.data_len[1] = READ_TRACKINFO_RETURNSIZE;
 	/* trackinfo.tracknr contains number of tracks to query */
 	_lto4b(trackinfo->tracknr, ti_cmd.address);
 	error = scsipi_command(periph,