From nobody Sun Apr 28 12:32:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1490979100714426.10106362465115; Fri, 31 Mar 2017 09:51:40 -0700 (PDT) Received: from localhost ([::1]:42004 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ctzlz-0006YD-C7 for importer@patchew.org; Fri, 31 Mar 2017 12:51:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56550) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ctzjN-0004v6-Bn for qemu-devel@nongnu.org; Fri, 31 Mar 2017 12:48:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ctzjI-0004pQ-Td for qemu-devel@nongnu.org; Fri, 31 Mar 2017 12:48:57 -0400 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:34451) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ctzjI-0004p1-Op for qemu-devel@nongnu.org; Fri, 31 Mar 2017 12:48:52 -0400 Received: by mail-qk0-x241.google.com with SMTP id 10so11177620qkh.1 for ; Fri, 31 Mar 2017 09:48:52 -0700 (PDT) Received: from HEDWIG.ini.cmu.edu (HEDWIG.INI.CMU.EDU. [128.2.16.51]) by smtp.gmail.com with ESMTPSA id z42sm3859371qtb.20.2017.03.31.09.48.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 09:48:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZPhWmDTXfisxCGzkpiXOTV0rcEsfkfwpDkE8mDdQLtY=; b=riG7U5lLHgWrLm/ZAI+3wv65AYBvWZml1X9mTsEeY/XaqozjFNyIIQMkwpFpLLKPy6 BG4A43DGYsr+Gek/9uYwD7xJFDvslIgizCbRtiJbGkQK78mCzkLcmBxj7FF+VYFof4Q9 2xFM+Gm7PKRPMSiuuqqkN42YyfESJoKpkR50BD9UbUabdGUiJoYn10+RF3+0V0YwWYXF lwVHbUfpSuWAbY9dzNDmwXTWxTe8zh9L2nIziAgKfzD4obAkmMUAIdHYmPfT1hvG4P0M LckD2D+wZ0JvdFpOpJX76n5s4O2cEm5ZcxRjXs6ARgGKbIBCZ4adrX41mTHV2fgNW/c6 87TQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ZPhWmDTXfisxCGzkpiXOTV0rcEsfkfwpDkE8mDdQLtY=; b=QRRAhuOuWlF1gaWlzoah02fWTcKiavoYKdBZvF9c4a57o0812Y0N3DaoguH2yt+wAV 2BQIlyFkTM/nOOP2wvG7FiOLilUjfUXLs4t1oMBTtTFWZfehn1TE5TZds7hL3aC6u+/r p3nJonbOSgPy42L65F1YYv6oK9gHW6D2GYHxWOvEyijUtjE10aCBHJFh/fLRpDwkNL/c VDG7fbScZ5tekLE7jhsU0XI5OktmI8J7MdWvybocYUkgDJHP3lkSWQWQ0ipE4HEW4Pxv Fb+172GS+BFLsJfdGpUbWQ5q5rijmrUsx4o7RCozTKh9K5cVgwbG22OlV3waVHZkdbDq eMgg== X-Gm-Message-State: AFeK/H1K0VP6BAMfHDZGkWRLLNz+y4Rgdan071Sri+fzNAkDQLkK6CHXmbXW1c+5C6sObQ== X-Received: by 10.55.19.83 with SMTP id d80mr3893672qkh.196.1490978932160; Fri, 31 Mar 2017 09:48:52 -0700 (PDT) From: "Gabriel L. Somlo" To: qemu-devel@nongnu.org Date: Fri, 31 Mar 2017 12:48:39 -0400 Message-Id: <1490978921-3782-2-git-send-email-gsomlo@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1490978921-3782-1-git-send-email-gsomlo@gmail.com> References: <1490978921-3782-1-git-send-email-gsomlo@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::241 Subject: [Qemu-devel] [PATCH v1 1/3] applesmc: cosmetic whitespace and indentation cleanup X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: agraf@suse.de, eshelton@pobox.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Gabriel Somlo Reviewed-by: Alexander Graf Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/misc/applesmc.c | 100 +++++++++++++++++++++++++++----------------------= ---- 1 file changed, 51 insertions(+), 49 deletions(-) diff --git a/hw/misc/applesmc.c b/hw/misc/applesmc.c index 77fab5b..986f2ac 100644 --- a/hw/misc/applesmc.c +++ b/hw/misc/applesmc.c @@ -39,24 +39,27 @@ /* #define DEBUG_SMC */ =20 #define APPLESMC_DEFAULT_IOBASE 0x300 -/* data port used by Apple SMC */ -#define APPLESMC_DATA_PORT 0x0 -/* command/status port used by Apple SMC */ -#define APPLESMC_CMD_PORT 0x4 -#define APPLESMC_NR_PORTS 32 =20 -#define APPLESMC_READ_CMD 0x10 -#define APPLESMC_WRITE_CMD 0x11 -#define APPLESMC_GET_KEY_BY_INDEX_CMD 0x12 -#define APPLESMC_GET_KEY_TYPE_CMD 0x13 +enum { + APPLESMC_DATA_PORT =3D 0x00, + APPLESMC_CMD_PORT =3D 0x04, + APPLESMC_NUM_PORTS =3D 0x20, +}; + +enum { + APPLESMC_READ_CMD =3D 0x10, + APPLESMC_WRITE_CMD =3D 0x11, + APPLESMC_GET_KEY_BY_INDEX_CMD =3D 0x12, + APPLESMC_GET_KEY_TYPE_CMD =3D 0x13, +}; =20 #ifdef DEBUG_SMC #define smc_debug(...) fprintf(stderr, "AppleSMC: " __VA_ARGS__) #else -#define smc_debug(...) do { } while(0) +#define smc_debug(...) do { } while (0) #endif =20 -static char default_osk[64] =3D "This is a dummy key. Enter the real key " +static char default_osk[65] =3D "This is a dummy key. Enter the real key " "using the -osk parameter"; =20 struct AppleSMCData { @@ -77,12 +80,11 @@ struct AppleSMCState { uint32_t iobase; uint8_t cmd; uint8_t status; - uint8_t key[4]; + char key[4]; uint8_t read_pos; uint8_t data_len; uint8_t data_pos; uint8_t data[255]; - uint8_t charactic[4]; char *osk; QLIST_HEAD(, AppleSMCData) data_def; }; @@ -93,10 +95,10 @@ static void applesmc_io_cmd_write(void *opaque, hwaddr = addr, uint64_t val, AppleSMCState *s =3D opaque; =20 smc_debug("CMD Write B: %#x =3D %#x\n", addr, val); - switch(val) { - case APPLESMC_READ_CMD: - s->status =3D 0x0c; - break; + switch (val) { + case APPLESMC_READ_CMD: + s->status =3D 0x0c; + break; } s->cmd =3D val; s->read_pos =3D 0; @@ -123,54 +125,54 @@ static void applesmc_io_data_write(void *opaque, hwad= dr addr, uint64_t val, AppleSMCState *s =3D opaque; =20 smc_debug("DATA Write B: %#x =3D %#x\n", addr, val); - switch(s->cmd) { - case APPLESMC_READ_CMD: - if(s->read_pos < 4) { - s->key[s->read_pos] =3D val; - s->status =3D 0x04; - } else if(s->read_pos =3D=3D 4) { - s->data_len =3D val; - s->status =3D 0x05; - s->data_pos =3D 0; - smc_debug("Key =3D %c%c%c%c Len =3D %d\n", s->key[0], - s->key[1], s->key[2], s->key[3], val); - applesmc_fill_data(s); - } - s->read_pos++; - break; + switch (s->cmd) { + case APPLESMC_READ_CMD: + if (s->read_pos < 4) { + s->key[s->read_pos] =3D val; + s->status =3D 0x04; + } else if (s->read_pos =3D=3D 4) { + s->data_len =3D val; + s->status =3D 0x05; + s->data_pos =3D 0; + smc_debug("Key =3D %c%c%c%c Len =3D %d\n", s->key[0], + s->key[1], s->key[2], s->key[3], val); + applesmc_fill_data(s); + } + s->read_pos++; + break; } } =20 -static uint64_t applesmc_io_data_read(void *opaque, hwaddr addr1, - unsigned size) +static uint64_t applesmc_io_data_read(void *opaque, hwaddr addr, unsigned = size) { AppleSMCState *s =3D opaque; uint8_t retval =3D 0; =20 - switch(s->cmd) { - case APPLESMC_READ_CMD: - if(s->data_pos < s->data_len) { - retval =3D s->data[s->data_pos]; - smc_debug("READ_DATA[%d] =3D %#hhx\n", s->data_pos, - retval); - s->data_pos++; - if(s->data_pos =3D=3D s->data_len) { - s->status =3D 0x00; - smc_debug("EOF\n"); - } else - s->status =3D 0x05; + switch (s->cmd) { + case APPLESMC_READ_CMD: + if (s->data_pos < s->data_len) { + retval =3D s->data[s->data_pos]; + smc_debug("READ_DATA[%d] =3D %#hhx\n", s->data_pos, + retval); + s->data_pos++; + if (s->data_pos =3D=3D s->data_len) { + s->status =3D 0x00; + smc_debug("EOF\n"); + } else { + s->status =3D 0x05; } + } } - smc_debug("DATA Read b: %#x =3D %#x\n", addr1, retval); + smc_debug("DATA Read b: %#x =3D %#x\n", addr, retval); =20 return retval; } =20 -static uint64_t applesmc_io_cmd_read(void *opaque, hwaddr addr1, unsigned = size) +static uint64_t applesmc_io_cmd_read(void *opaque, hwaddr addr, unsigned s= ize) { AppleSMCState *s =3D opaque; =20 - smc_debug("CMD Read B: %#x\n", addr1); + smc_debug("CMD Read B: %#x\n", addr); return s->status; } =20 --=20 2.7.4 From nobody Sun Apr 28 12:32:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1490979100001483.93572223571755; Fri, 31 Mar 2017 09:51:40 -0700 (PDT) Received: from localhost ([::1]:42003 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ctzly-0006Xu-Kq for importer@patchew.org; Fri, 31 Mar 2017 12:51:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56552) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ctzjN-0004v8-CV for qemu-devel@nongnu.org; Fri, 31 Mar 2017 12:48:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ctzjJ-0004qN-MX for qemu-devel@nongnu.org; Fri, 31 Mar 2017 12:48:57 -0400 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:36859) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ctzjJ-0004pv-I7 for qemu-devel@nongnu.org; Fri, 31 Mar 2017 12:48:53 -0400 Received: by mail-qt0-x243.google.com with SMTP id n37so10938424qtb.3 for ; Fri, 31 Mar 2017 09:48:53 -0700 (PDT) Received: from HEDWIG.ini.cmu.edu (HEDWIG.INI.CMU.EDU. [128.2.16.51]) by smtp.gmail.com with ESMTPSA id z42sm3859371qtb.20.2017.03.31.09.48.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 09:48:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Aj3bU/Ec8aWm86Rhm/+QB/GfN936pEU1hbdVI1ZFy7A=; b=iIBbMm9VunAPiRVrvNkutQe8ihBD+QKoa45T/jTXkiDJ9Q0cygE1GrvRglsJWYBVfI IptzwKzCPclNw5xk6hwApbpSjiX7H4xWExZg/w4iEAdll3h3XAkLc6BEe4EzWOcw+pb5 mYAZr3ADoH9UCX/ETDgjlvCPg+Us40ZKyQ5e7Y7IBwQI5sHNiumSLVMJLXaz7ztYWAA3 fDEXq4fluFKnusI2x3wcYYTiInsYTffxdxqMJB7eC+jR05xNqY4jjxS3lO03ranAt6n/ 7YKA4Xu+ni95I6pXDoxf7D4Mj9MGPv0szWhpe33PPqQ568IS1T9j2rXSi0JZMlLC4u98 Wmwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Aj3bU/Ec8aWm86Rhm/+QB/GfN936pEU1hbdVI1ZFy7A=; b=L7cCcbPx1bNd3xWL4q8CQpZdQbjNm0NbrPhPbGoHHcHYUCRJ5kKCUiJYvlSbE4gN+V TlHgAhhqDCCMd1naOybMTxG47x2sHKwJmtNtYg/RmnbA9fKMPTGFB4NiUL8FZxmVwsQl AiE0XZuzwCGsy3OiDj488YsphonDkJLLM13MwH2bxAHfQ0RZNUFzrDlfSCQ9+ytu8Zs9 McaU2JzaX1BdZSoR/Dyp54Ip0Vq8riRdqNh6aOVBMcHiHB7B8alZY+bWOYJRGiTf1JAW aX9hD3SC89pS/psvm0eDFBlDNOlPPnVock6iTu21qM0JTD1muXRmz2H6umWR1+32FTHC I4Uw== X-Gm-Message-State: AFeK/H12w49BBEc7ty3PbWkUW3erTPYSTah3hmNgtUSHNLY7jIFNeavhvidQgfaWjZYQ/w== X-Received: by 10.237.33.240 with SMTP id m45mr4008610qtc.246.1490978932847; Fri, 31 Mar 2017 09:48:52 -0700 (PDT) From: "Gabriel L. Somlo" To: qemu-devel@nongnu.org Date: Fri, 31 Mar 2017 12:48:40 -0400 Message-Id: <1490978921-3782-3-git-send-email-gsomlo@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1490978921-3782-1-git-send-email-gsomlo@gmail.com> References: <1490978921-3782-1-git-send-email-gsomlo@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PATCH v1 2/3] applesmc: consolidate port i/o into single contiguous region X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: agraf@suse.de, eshelton@pobox.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Newer AppleSMC revisions support an error status (read) port in addition to the data and command ports currently supported. Register the full 32-bit region at once, and handle individual ports at various offsets within the region from the top-level applesmc_io_[write|read]() methods (ctual support for reading the error status port to be added by a subsequent patch). Originally proposed by Eric Shelton Signed-off-by: Gabriel Somlo --- hw/misc/applesmc.c | 56 ++++++++++++++++++++++++++++++++------------------= ---- 1 file changed, 33 insertions(+), 23 deletions(-) diff --git a/hw/misc/applesmc.c b/hw/misc/applesmc.c index 986f2ac..e581e02 100644 --- a/hw/misc/applesmc.c +++ b/hw/misc/applesmc.c @@ -75,8 +75,7 @@ typedef struct AppleSMCState AppleSMCState; struct AppleSMCState { ISADevice parent_obj; =20 - MemoryRegion io_data; - MemoryRegion io_cmd; + MemoryRegion io_reg; uint32_t iobase; uint8_t cmd; uint8_t status; @@ -207,19 +206,36 @@ static void qdev_applesmc_isa_reset(DeviceState *dev) applesmc_add_key(s, "MSSD", 1, "\0x3"); } =20 -static const MemoryRegionOps applesmc_data_io_ops =3D { - .write =3D applesmc_io_data_write, - .read =3D applesmc_io_data_read, - .endianness =3D DEVICE_NATIVE_ENDIAN, - .impl =3D { - .min_access_size =3D 1, - .max_access_size =3D 1, - }, -}; +static void applesmc_io_write(void *opaque, hwaddr addr, uint64_t val, + unsigned size) +{ + switch (addr) { + case APPLESMC_DATA_PORT: + applesmc_io_data_write(opaque, addr, val, size); + break; + case APPLESMC_CMD_PORT: + applesmc_io_cmd_write(opaque, addr, val, size); + break; + default: + break; + } +} =20 -static const MemoryRegionOps applesmc_cmd_io_ops =3D { - .write =3D applesmc_io_cmd_write, - .read =3D applesmc_io_cmd_read, +static uint64_t applesmc_io_read(void *opaque, hwaddr addr, unsigned size) +{ + switch (addr) { + case APPLESMC_DATA_PORT: + return applesmc_io_data_read(opaque, addr, size); + case APPLESMC_CMD_PORT: + return applesmc_io_cmd_read(opaque, addr, size); + default: + return 0xff; + } +} + +static const MemoryRegionOps applesmc_io_ops =3D { + .write =3D applesmc_io_write, + .read =3D applesmc_io_read, .endianness =3D DEVICE_NATIVE_ENDIAN, .impl =3D { .min_access_size =3D 1, @@ -231,15 +247,9 @@ static void applesmc_isa_realize(DeviceState *dev, Err= or **errp) { AppleSMCState *s =3D APPLE_SMC(dev); =20 - memory_region_init_io(&s->io_data, OBJECT(s), &applesmc_data_io_ops, s, - "applesmc-data", 4); - isa_register_ioport(&s->parent_obj, &s->io_data, - s->iobase + APPLESMC_DATA_PORT); - - memory_region_init_io(&s->io_cmd, OBJECT(s), &applesmc_cmd_io_ops, s, - "applesmc-cmd", 4); - isa_register_ioport(&s->parent_obj, &s->io_cmd, - s->iobase + APPLESMC_CMD_PORT); + memory_region_init_io(&s->io_reg, OBJECT(s), &applesmc_io_ops, s, + "applesmc", APPLESMC_NUM_PORTS); + isa_register_ioport(&s->parent_obj, &s->io_reg, s->iobase); =20 if (!s->osk || (strlen(s->osk) !=3D 64)) { fprintf(stderr, "WARNING: Using AppleSMC with invalid key\n"); --=20 2.7.4 From nobody Sun Apr 28 12:32:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 149097900822212.068419419419797; Fri, 31 Mar 2017 09:50:08 -0700 (PDT) Received: from localhost ([::1]:41995 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ctzkT-0005UV-NK for importer@patchew.org; Fri, 31 Mar 2017 12:50:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56549) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ctzjN-0004v5-Bq for qemu-devel@nongnu.org; Fri, 31 Mar 2017 12:48:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ctzjK-0004r5-CX for qemu-devel@nongnu.org; Fri, 31 Mar 2017 12:48:57 -0400 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:35138) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ctzjK-0004qb-83 for qemu-devel@nongnu.org; Fri, 31 Mar 2017 12:48:54 -0400 Received: by mail-qk0-x244.google.com with SMTP id v5so6398050qkb.2 for ; Fri, 31 Mar 2017 09:48:54 -0700 (PDT) Received: from HEDWIG.ini.cmu.edu (HEDWIG.INI.CMU.EDU. [128.2.16.51]) by smtp.gmail.com with ESMTPSA id z42sm3859371qtb.20.2017.03.31.09.48.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 09:48:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=DiEzRjtZ3rsy/AHHafDw89bnTyMdDh887zngLpO1RXM=; b=oTKaN5Sig4oJCLAiU7rcZWRekWVFvR8ACGpNWbTuLHUt1hCFvj6Clxk5KM72aC15MS odh55IqdSBOL4kH0tOg5SKfk6yRCKInS066eHu9fhUqQwXP1popAEngE13kvDfZbtX1t wYXm9WhU39O6ka6qgoFtp0ZEtHCSuDaRcgaQ72ChIXNhsBdYSVDUsMZpmryxZnx9B23+ 1giTahCyXaon4ckj2S35DNnnUmKTXD00Ut6HzZGs4ZPJ46KHSGtN/jyb5Hrs/Guie22P ZlbA/U7QTxbVM05iJnNy23u3Cq99OtcUfZULSvPjCnuespHipCNcMeZT9tKEtSXeQZ8T uSEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=DiEzRjtZ3rsy/AHHafDw89bnTyMdDh887zngLpO1RXM=; b=nEhmKOT0qzIHsUF3cbcPTqeUqvUGsT/2JrgrIgQ05Vnr0CvKIx5+JJqfz8DWN+ACoO qExvOWle/AYl6Lj6VpGYHTlf5tMXsTSKswsqI19KATqe5+Piu5C+xYvyVxZt7UarFeOd IIX59b+H6R88xAMa6Lty+MPY221jRHqeq+aIRrQZr/1t3IAAnDm/ibut4QRSbR/Z7Y4k nU4E6Kb1a5ov5sJQGVOvZqWEdsd35LpVnsieT/u9bjL7Omp4foJCMDYknk7/frKs/dqY g6lc9sEl4neiVP6T2/8C4Ikw/c1gO50mWVPyAVwXfeG2wihqDG/E9Xe8blp8vmYSdX66 10Iw== X-Gm-Message-State: AFeK/H1lHdiMESsOFq9TzGESX633X3nNJTo/FIlqi2Os8EpPJeP8Cy3UO7l6N0dQdkft9g== X-Received: by 10.55.148.194 with SMTP id w185mr3736733qkd.270.1490978933546; Fri, 31 Mar 2017 09:48:53 -0700 (PDT) From: "Gabriel L. Somlo" To: qemu-devel@nongnu.org Date: Fri, 31 Mar 2017 12:48:41 -0400 Message-Id: <1490978921-3782-4-git-send-email-gsomlo@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1490978921-3782-1-git-send-email-gsomlo@gmail.com> References: <1490978921-3782-1-git-send-email-gsomlo@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::244 Subject: [Qemu-devel] [PATCH v1 3/3] applesmc: implement error status port X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: agraf@suse.de, eshelton@pobox.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" As of release 10.12.4, OS X (Sierra) refuses to boot unless the AppleSMC supports an additional I/O port, expected to provide an error status code. Update the [cmd|data]_write() and data_read() methods to implement the required state machine, and add an err_read() method to provide the error status code to the guest. Originally proposed by Eric Shelton Signed-off-by: Gabriel Somlo --- hw/misc/applesmc.c | 120 +++++++++++++++++++++++++++++++++++++++++--------= ---- 1 file changed, 94 insertions(+), 26 deletions(-) diff --git a/hw/misc/applesmc.c b/hw/misc/applesmc.c index e581e02..eac0659 100644 --- a/hw/misc/applesmc.c +++ b/hw/misc/applesmc.c @@ -43,6 +43,7 @@ enum { APPLESMC_DATA_PORT =3D 0x00, APPLESMC_CMD_PORT =3D 0x04, + APPLESMC_ERR_PORT =3D 0x1e, APPLESMC_NUM_PORTS =3D 0x20, }; =20 @@ -53,6 +54,24 @@ enum { APPLESMC_GET_KEY_TYPE_CMD =3D 0x13, }; =20 +enum { + APPLESMC_ST_CMD_DONE =3D 0x00, + APPLESMC_ST_DATA_READY =3D 0x01, + APPLESMC_ST_BUSY =3D 0x02, + APPLESMC_ST_ACK =3D 0x04, + APPLESMC_ST_NEW_CMD =3D 0x08, +}; + +enum { + APPLESMC_ST_1E_CMD_INTRUPTED =3D 0x80, + APPLESMC_ST_1E_STILL_BAD_CMD =3D 0x81, + APPLESMC_ST_1E_BAD_CMD =3D 0x82, + APPLESMC_ST_1E_NOEXIST =3D 0x84, + APPLESMC_ST_1E_WRITEONLY =3D 0x85, + APPLESMC_ST_1E_READONLY =3D 0x86, + APPLESMC_ST_1E_BAD_INDEX =3D 0xb8, +}; + #ifdef DEBUG_SMC #define smc_debug(...) fprintf(stderr, "AppleSMC: " __VA_ARGS__) #else @@ -79,6 +98,8 @@ struct AppleSMCState { uint32_t iobase; uint8_t cmd; uint8_t status; + uint8_t status_1e; + uint8_t last_ret; char key[4]; uint8_t read_pos; uint8_t data_len; @@ -92,79 +113,112 @@ static void applesmc_io_cmd_write(void *opaque, hwadd= r addr, uint64_t val, unsigned size) { AppleSMCState *s =3D opaque; + uint8_t status =3D s->status & 0x0f; =20 - smc_debug("CMD Write B: %#x =3D %#x\n", addr, val); + smc_debug("CMD received: 0x%02x\n", (uint8_t)val); switch (val) { case APPLESMC_READ_CMD: - s->status =3D 0x0c; + /* did last command run through OK? */ + if (status =3D=3D APPLESMC_ST_CMD_DONE || status =3D=3D APPLESMC_S= T_NEW_CMD) { + s->cmd =3D val; + s->status =3D APPLESMC_ST_NEW_CMD | APPLESMC_ST_ACK; + } else { + smc_debug("ERROR: previous command interrupted!\n"); + s->status =3D APPLESMC_ST_NEW_CMD; + s->status_1e =3D APPLESMC_ST_1E_CMD_INTRUPTED; + } break; + default: + smc_debug("UNEXPECTED CMD 0x%02x\n", (uint8_t)val); + s->status =3D APPLESMC_ST_NEW_CMD; + s->status_1e =3D APPLESMC_ST_1E_BAD_CMD; } - s->cmd =3D val; s->read_pos =3D 0; s->data_pos =3D 0; } =20 -static void applesmc_fill_data(AppleSMCState *s) +static struct AppleSMCData *applesmc_find_key(AppleSMCState *s, const char= *key) { struct AppleSMCData *d; =20 QLIST_FOREACH(d, &s->data_def, node) { - if (!memcmp(d->key, s->key, 4)) { - smc_debug("Key matched (%s Len=3D%d Data=3D%s)\n", d->key, - d->len, d->data); - memcpy(s->data, d->data, d->len); - return; + if (!memcmp(d->key, key, 4)) { + return d; } } + return NULL; } =20 static void applesmc_io_data_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) { AppleSMCState *s =3D opaque; + struct AppleSMCData *d; =20 - smc_debug("DATA Write B: %#x =3D %#x\n", addr, val); + smc_debug("DATA received: 0x%02x\n", (uint8_t)val); switch (s->cmd) { case APPLESMC_READ_CMD: + if ((s->status & 0x0f) =3D=3D APPLESMC_ST_CMD_DONE) { + break; + } if (s->read_pos < 4) { s->key[s->read_pos] =3D val; - s->status =3D 0x04; + s->status =3D APPLESMC_ST_ACK; } else if (s->read_pos =3D=3D 4) { - s->data_len =3D val; - s->status =3D 0x05; - s->data_pos =3D 0; - smc_debug("Key =3D %c%c%c%c Len =3D %d\n", s->key[0], - s->key[1], s->key[2], s->key[3], val); - applesmc_fill_data(s); + d =3D applesmc_find_key(s, s->key); + if (d !=3D NULL) { + memcpy(s->data, d->data, d->len); + s->data_len =3D d->len; + s->data_pos =3D 0; + s->status =3D APPLESMC_ST_ACK | APPLESMC_ST_DATA_READY; + s->status_1e =3D APPLESMC_ST_CMD_DONE; /* clear on valid = key */ + } else { + smc_debug("READ_CMD: key '%c%c%c%c' not found!\n", + s->key[0], s->key[1], s->key[2], s->key[3]); + s->status =3D APPLESMC_ST_CMD_DONE; + s->status_1e =3D APPLESMC_ST_1E_NOEXIST; + } } s->read_pos++; break; + default: + s->status =3D APPLESMC_ST_CMD_DONE; + s->status_1e =3D APPLESMC_ST_1E_STILL_BAD_CMD; } } =20 static uint64_t applesmc_io_data_read(void *opaque, hwaddr addr, unsigned = size) { AppleSMCState *s =3D opaque; - uint8_t retval =3D 0; =20 switch (s->cmd) { case APPLESMC_READ_CMD: + if (!(s->status & APPLESMC_ST_DATA_READY)) { + break; + } if (s->data_pos < s->data_len) { - retval =3D s->data[s->data_pos]; - smc_debug("READ_DATA[%d] =3D %#hhx\n", s->data_pos, - retval); + s->last_ret =3D s->data[s->data_pos]; + smc_debug("READ '%c%c%c%c'[%d] =3D %0x%02x\n", + s->key[0], s->key[1], s->key[2], s->key[3], + s->data_pos, s->last_ret); s->data_pos++; if (s->data_pos =3D=3D s->data_len) { - s->status =3D 0x00; - smc_debug("EOF\n"); + s->status =3D APPLESMC_ST_CMD_DONE; + smc_debug("READ '%c%c%c%c' Len=3D%d complete!\n", + s->key[0], s->key[1], s->key[2], s->key[3], + s->data_len); } else { - s->status =3D 0x05; + s->status =3D APPLESMC_ST_ACK | APPLESMC_ST_DATA_READY; } } + break; + default: + s->status =3D APPLESMC_ST_CMD_DONE; + s->status_1e =3D APPLESMC_ST_1E_STILL_BAD_CMD; } - smc_debug("DATA Read b: %#x =3D %#x\n", addr, retval); + smc_debug("DATA sent: 0x%02x\n", s->last_ret); =20 - return retval; + return s->last_ret; } =20 static uint64_t applesmc_io_cmd_read(void *opaque, hwaddr addr, unsigned s= ize) @@ -175,6 +229,15 @@ static uint64_t applesmc_io_cmd_read(void *opaque, hwa= ddr addr, unsigned size) return s->status; } =20 +static uint64_t applesmc_io_err_read(void *opaque, hwaddr addr, unsigned s= ize) +{ + AppleSMCState *s =3D opaque; + + /* NOTE: read does not clear the 1e status */ + smc_debug("ERR_CODE sent: 0x%02x\n", s->status_1e); + return s->status_1e; +} + static void applesmc_add_key(AppleSMCState *s, const char *key, int len, const char *data) { @@ -197,6 +260,9 @@ static void qdev_applesmc_isa_reset(DeviceState *dev) QLIST_FOREACH_SAFE(d, &s->data_def, node, next) { QLIST_REMOVE(d, node); } + s->status =3D 0x00; + s->status_1e =3D 0x00; + s->last_ret =3D 0x00; =20 applesmc_add_key(s, "REV ", 6, "\x01\x13\x0f\x00\x00\x03"); applesmc_add_key(s, "OSK0", 32, s->osk); @@ -228,6 +294,8 @@ static uint64_t applesmc_io_read(void *opaque, hwaddr a= ddr, unsigned size) return applesmc_io_data_read(opaque, addr, size); case APPLESMC_CMD_PORT: return applesmc_io_cmd_read(opaque, addr, size); + case APPLESMC_ERR_PORT: + return applesmc_io_err_read(opaque, addr, size); default: return 0xff; } --=20 2.7.4