From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4C1B3C433F5 for ; Thu, 21 Apr 2022 13:32:27 +0000 (UTC) Received: from localhost ([::1]:58388 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhWv4-0000lY-6Y for qemu-devel@archiver.kernel.org; Thu, 21 Apr 2022 09:32:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60184) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhWrg-0006wA-Ky; Thu, 21 Apr 2022 09:28:56 -0400 Received: from sender2-op-o12.zoho.com.cn ([163.53.93.243]:17312) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhWrc-000268-9M; Thu, 21 Apr 2022 09:28:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1650547674; s=zoho; d=euphon.net; i=fam@euphon.net; h=Date:From:From:To:To:Cc:Cc:Subject:Subject:Message-ID:References:MIME-Version:Content-Type:In-Reply-To:Message-Id:Reply-To; bh=eKqP7/tip3w6ARO3zFBGmGeYV0CkBfVGQ77vKGBmXE0=; b=fI7PRlAeQ/qAryepRIjn7ij+95xs1w5GL2Ld9oXbgP6YzFzxGVFqMBTZYnAdwREk sSh4m+FRc0gY0GWJmMz7YYXOycYPevH7B+j2wZSqknxl1ahpUFU/e4Lt8tCWGa7+bYy KPoBc1NvI1krcJUQBWYvWiLmbLV7yvYaJIW7s+3I= Received: from localhost (91.110.139.125 [91.110.139.125]) by mx.zoho.com.cn with SMTPS id 1650547672948113.41220285542022; Thu, 21 Apr 2022 21:27:52 +0800 (CST) Date: Thu, 21 Apr 2022 14:27:46 +0100 From: Fam Zheng To: Mark Cave-Ayland Subject: Re: [PATCH 3/6] scsi-disk: add MODE_PAGE_APPLE quirk for Macintosh Message-ID: <20220421132746.GA1500162@fam-dell> References: <20220421065155.31276-1-mark.cave-ayland@ilande.co.uk> <20220421065155.31276-4-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220421065155.31276-4-mark.cave-ayland@ilande.co.uk> X-ZohoCNMailClient: External Received-SPF: pass client-ip=163.53.93.243; envelope-from=fam@euphon.net; helo=sender2-op-o12.zoho.com.cn X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, laurent@vivier.eu, qemu-block@nongnu.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 2022-04-21 07:51, Mark Cave-Ayland wrote: > One of the mechanisms MacOS uses to identify drives compatible with MacOS is to > send a custom MODE SELECT command for page 0x30 to the drive. The response to > this is a hard-coded manufacturer string which must match in order for the > drive to be usable within MacOS. > > Add an implementation of the MODE SELECT page 0x30 response guarded by a newly > defined SCSI_DISK_QUIRK_MODE_PAGE_APPLE quirk bit so that drives attached > to non-Apple machines function exactly as before. > > Signed-off-by: Mark Cave-Ayland > --- > hw/scsi/scsi-disk.c | 19 +++++++++++++++++++ > include/hw/scsi/scsi.h | 3 +++ > include/scsi/constants.h | 1 + > 3 files changed, 23 insertions(+) > > diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c > index d89cdd4e4a..37013756d5 100644 > --- a/hw/scsi/scsi-disk.c > +++ b/hw/scsi/scsi-disk.c > @@ -1085,6 +1085,7 @@ static int mode_sense_page(SCSIDiskState *s, int page, uint8_t **p_outbuf, > [MODE_PAGE_R_W_ERROR] = (1 << TYPE_DISK) | (1 << TYPE_ROM), > [MODE_PAGE_AUDIO_CTL] = (1 << TYPE_ROM), > [MODE_PAGE_CAPABILITIES] = (1 << TYPE_ROM), > + [MODE_PAGE_APPLE] = (1 << TYPE_ROM), > }; > > uint8_t *p = *p_outbuf + 2; > @@ -1229,6 +1230,22 @@ static int mode_sense_page(SCSIDiskState *s, int page, uint8_t **p_outbuf, > p[19] = (16 * 176) & 0xff; > break; > > + case MODE_PAGE_APPLE: > + if (s->qdev.type == TYPE_DISK && > + (s->quirks & SCSI_DISK_QUIRK_MODE_PAGE_APPLE)) { This is always false. SCSI_DISK_QUIRK_MODE_PAGE_APPLE is defined 0. You need (1 << SCSI_DISK_QUIRK_MODE_PAGE_APPLE) instead. > + > + length = 0x24; > + if (page_control == 1) { /* Changeable Values */ > + break; > + } > + > + memset(p, 0, length); > + strcpy((char *)p + 8, "APPLE COMPUTER, INC "); > + break; > + } else { > + return -1; > + } > + > default: > return -1; > } > @@ -3042,6 +3059,8 @@ static Property scsi_hd_properties[] = { > DEFINE_PROP_UINT16("rotation_rate", SCSIDiskState, rotation_rate, 0), > DEFINE_PROP_INT32("scsi_version", SCSIDiskState, qdev.default_scsi_version, > 5), > + DEFINE_PROP_BIT("quirk_mode_page_apple", SCSIDiskState, quirks, > + SCSI_DISK_QUIRK_MODE_PAGE_APPLE, 0), > DEFINE_BLOCK_CHS_PROPERTIES(SCSIDiskState, qdev.conf), > DEFINE_PROP_END_OF_LIST(), > }; > diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h > index 1ffb367f94..f629706250 100644 > --- a/include/hw/scsi/scsi.h > +++ b/include/hw/scsi/scsi.h > @@ -226,4 +226,7 @@ SCSIDevice *scsi_device_get(SCSIBus *bus, int channel, int target, int lun); > /* scsi-generic.c. */ > extern const SCSIReqOps scsi_generic_req_ops; > > +/* scsi-disk.c */ > +#define SCSI_DISK_QUIRK_MODE_PAGE_APPLE 0 > + > #endif > diff --git a/include/scsi/constants.h b/include/scsi/constants.h > index 2a32c08b5e..21ca7b50cd 100644 > --- a/include/scsi/constants.h > +++ b/include/scsi/constants.h > @@ -234,6 +234,7 @@ > #define MODE_PAGE_FAULT_FAIL 0x1c > #define MODE_PAGE_TO_PROTECT 0x1d > #define MODE_PAGE_CAPABILITIES 0x2a > +#define MODE_PAGE_APPLE 0x30 > #define MODE_PAGE_ALLS 0x3f > /* Not in Mt. Fuji, but in ATAPI 2.6 -- deprecated now in favor > * of MODE_PAGE_SENSE_POWER */ > -- > 2.20.1 > > Fam