From nobody Wed Jan 12 07:15:55 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 8A15B19523EC; Wed, 12 Jan 2022 07:15:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JYf3w14bwz3rRl; Wed, 12 Jan 2022 07:15:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7A97797B; Wed, 12 Jan 2022 07:15:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20C7FtHB069982; Wed, 12 Jan 2022 07:15:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20C7Ft4f069981; Wed, 12 Jan 2022 07:15:55 GMT (envelope-from git) Date: Wed, 12 Jan 2022 07:15:55 GMT Message-Id: <202201120715.20C7Ft4f069981@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andriy Gapon Subject: git: 60b7d5a24a8f - main - mmc_da: use MMC_SECTOR_SIZE constant in place of literals List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 60b7d5a24a8fe9ddd4f3880119a52d9df8519fbe Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641971756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=URH1CNoVC5HHoi2fjc6DINfzi/POgTiaZqLXDa/qnm0=; b=XxC5m+CYbjrYdXAvgITKQTXa1zFB3Zq1CfwIU6nVuFZjqu58IjQCVVC9V5EYlDfBCgO/pD 1gOVJNggfH2FYcZ351UcaLl7qFH9BgDCZmw3Y+WNA2NOEbEb4hEoeoTSfqjsbkFMZ4kzlh RhAN5oSVASrjdEkDkDsAI0871z3Fjl91wmx31O4NG3S4di5C/4T5wKvACLZhm3mZbZ7ftP aAzwLmQoD2YeycKjjDhEXt2mJWPvBqK2aMnrvfGqUl1TfODnoS+3Szdvb2FTEcLyHj7rFI UrVCz7MCmdFAUK4sl2zY2+p2rL7qAD744p0tPFYMiZ5N+EtAXfB2i+lIsIeNjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641971756; a=rsa-sha256; cv=none; b=g2IcviAWi6ABPRZFfJ5ci6rfTYpYRpiqMGfST+pcRCI+EvSrQUbeFpDvm6CbGbD5pcLZjH iNafyFBTKBfUWmljZWk4W/Q97+5sEB6HqeImFQvU5EKkwZMOzBx1olnKSm4CZDyb7Gm7m1 1cb+iwV65tVLd2lBMfsZ8B7Iy/+l7b0ENONFmJbTNA/Gc9CxCSp1SGFzDEMmlKzUIA/Skf r1ZQVFc8v3jxcnYkNUfeds9aTE66GfdNEbVCqGnM0iKUL+PYerchHlOtm281i+EvlcmYga siprKeMF0nQEyn0N5nYbYcKO2sXN+VDL6ptfrAdYpuo8k3SgNGSxkt6oAPtaSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=60b7d5a24a8fe9ddd4f3880119a52d9df8519fbe commit 60b7d5a24a8fe9ddd4f3880119a52d9df8519fbe Author: Andriy Gapon AuthorDate: 2022-01-12 07:14:36 +0000 Commit: Andriy Gapon CommitDate: 2022-01-12 07:14:36 +0000 mmc_da: use MMC_SECTOR_SIZE constant in place of literals Suggested by: manu MFC after: 2 weeks --- sys/cam/mmc/mmc_da.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/cam/mmc/mmc_da.c b/sys/cam/mmc/mmc_da.c index 8740421e416b..bc2f6f642132 100644 --- a/sys/cam/mmc/mmc_da.c +++ b/sys/cam/mmc/mmc_da.c @@ -1264,7 +1264,7 @@ sdda_start_init(void *context, union ccb *start_ccb) mmc_decode_cid_sd(mmcp->card_cid, &softc->cid); } - softc->sector_count = softc->csd.capacity / 512; + softc->sector_count = softc->csd.capacity / MMC_SECTOR_SIZE; softc->mediasize = softc->csd.capacity; softc->cmd6_time = mmc_get_cmd6_timeout(periph); @@ -1276,7 +1276,7 @@ sdda_start_init(void *context, union ccb *start_ccb) (softc->raw_ext_csd[EXT_CSD_SEC_CNT + 3] << 24); if (sec_count != 0) { softc->sector_count = sec_count; - softc->mediasize = softc->sector_count * 512; + softc->mediasize = softc->sector_count * MMC_SECTOR_SIZE; /* FIXME: there should be a better name for this option...*/ mmcp->card_features |= CARD_FEATURE_SDHC; } @@ -1563,7 +1563,7 @@ sdda_add_part(struct cam_periph *periph, u_int type, const char *name, part->disk = disk_alloc(); part->disk->d_rotation_rate = DISK_RR_NON_ROTATING; part->disk->d_devstat = devstat_new_entry(part->name, - cnt, 512, + cnt, MMC_SECTOR_SIZE, DEVSTAT_ALL_SUPPORTED, DEVSTAT_TYPE_DIRECT | XPORT_DEVSTAT_TYPE(cpi.transport), DEVSTAT_PRIORITY_DISK); @@ -1845,7 +1845,7 @@ sddastart(struct cam_periph *periph, union ccb *start_ccb) { struct ccb_mmcio *mmcio; uint64_t blockno = bp->bio_pblkno; - uint16_t count = bp->bio_bcount / 512; + uint16_t count = bp->bio_bcount / MMC_SECTOR_SIZE; uint16_t opcode; if (bp->bio_cmd == BIO_READ) @@ -1882,7 +1882,7 @@ sddastart(struct cam_periph *periph, union ccb *start_ccb) mmcio->cmd.data = softc->mmcdata; memset(mmcio->cmd.data, 0, sizeof(struct mmc_data)); mmcio->cmd.data->data = bp->bio_data; - mmcio->cmd.data->len = 512 * count; + mmcio->cmd.data->len = MMC_SECTOR_SIZE * count; mmcio->cmd.data->flags = (bp->bio_cmd == BIO_READ ? MMC_DATA_READ : MMC_DATA_WRITE); /* Direct h/w to issue CMD12 upon completion */ if (count > 1) { @@ -2032,7 +2032,7 @@ sddadump(void *arg, void *virtual, vm_offset_t physical, off_t offset, if (softc->state != SDDA_STATE_NORMAL) return (ENXIO); - count = length / 512; + count = length / MMC_SECTOR_SIZE; if (count == 0) return (0); @@ -2052,7 +2052,7 @@ sddadump(void *arg, void *virtual, vm_offset_t physical, off_t offset, else opcode = MMC_WRITE_BLOCK; mmcio.cmd.opcode = opcode; - mmcio.cmd.arg = offset / 512; + mmcio.cmd.arg = offset / MMC_SECTOR_SIZE; if (!(mmcp->card_features & CARD_FEATURE_SDHC)) mmcio.cmd.arg <<= 9; @@ -2060,7 +2060,7 @@ sddadump(void *arg, void *virtual, vm_offset_t physical, off_t offset, mmcio.cmd.data = softc->mmcdata; memset(mmcio.cmd.data, 0, sizeof(struct mmc_data)); mmcio.cmd.data->data = virtual; - mmcio.cmd.data->len = 512 * count; + mmcio.cmd.data->len = MMC_SECTOR_SIZE * count; mmcio.cmd.data->flags = MMC_DATA_WRITE; /* Direct h/w to issue CMD12 upon completion */