[{"id":2912298,"web_url":"http://patchwork.ozlabs.org/comment/2912298/","msgid":"<707c18cb-d499-a499-db9a-db5d73f0f3b4@opensource.wdc.com>","list_archive_url":null,"date":"2022-06-14T08:38:14","subject":"Re: [PATCH v4 15/23] ata: ahci: Convert __ahci_port_base to accepting\n hpriv as arguments","submitter":{"id":82259,"url":"http://patchwork.ozlabs.org/api/people/82259/","name":"Damien Le Moal","email":"damien.lemoal@opensource.wdc.com"},"content":"On 6/10/22 17:17, Serge Semin wrote:\n> It may get required to retrieve the port-base address even before the\n\nThe port base address may be required even before the...\n\n> ata_host instance is initialized and activated, for instance in the\n> ahci_save_initial_config() method which we about to update (consider this\n\ns/we/we are\n\n> modification as a preparation for that one). Seeing the __ahci_port_base()\n> function isn't used much it's the best candidate to provide the required\n> functionality. So let's convert it to accepting the ahci_host_priv\n> structure pointer.\n> \n> Signed-off-by: Serge Semin \n> Reviewed-by: Hannes Reinecke \n> ---\n> drivers/ata/ahci.c | 2 +-\n> drivers/ata/ahci.h | 7 ++++---\n> 2 files changed, 5 insertions(+), 4 deletions(-)\n> \n> diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c\n> index 9bc8fa77e92f..d14d74649e0e 100644\n> --- a/drivers/ata/ahci.c\n> +++ b/drivers/ata/ahci.c\n> @@ -689,7 +689,7 @@ static void ahci_pci_init_controller(struct ata_host *host)\n> \t\t\tmv = 2;\n> \t\telse\n> \t\t\tmv = 4;\n> -\t\tport_mmio = __ahci_port_base(host, mv);\n> +\t\tport_mmio = __ahci_port_base(hpriv, mv);\n> \n> \t\twritel(0, port_mmio + PORT_IRQ_MASK);\n> \n> diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h\n> index 0e66446a5883..8b9826533ae5 100644\n> --- a/drivers/ata/ahci.h\n> +++ b/drivers/ata/ahci.h\n> @@ -431,10 +431,9 @@ int ahci_host_activate(struct ata_host *host, struct scsi_host_template *sht);\n> void ahci_error_handler(struct ata_port *ap);\n> u32 ahci_handle_port_intr(struct ata_host *host, u32 irq_masked);\n> \n> -static inline void __iomem *__ahci_port_base(struct ata_host *host,\n> +static inline void __iomem *__ahci_port_base(struct ahci_host_priv *hpriv,\n> \t\t\t\t\t unsigned int port_no)\n> {\n> -\tstruct ahci_host_priv *hpriv = host->private_data;\n> \tvoid __iomem *mmio = hpriv->mmio;\n> \n> \treturn mmio + 0x100 + (port_no * 0x80);\n> @@ -442,7 +441,9 @@ static inline void __iomem *__ahci_port_base(struct ata_host *host,\n> \n> static inline void __iomem *ahci_port_base(struct ata_port *ap)\n> {\n> -\treturn __ahci_port_base(ap->host, ap->port_no);\n> +\tstruct ahci_host_priv *hpriv = ap->host->private_data;\n> +\n> +\treturn __ahci_port_base(hpriv, ap->port_no);\n> }\n> \n> static inline int ahci_nr_ports(u32 cap)","headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["bilbo.ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n unprotected) header.d=wdc.com header.i=@wdc.com header.a=rsa-sha256\n header.s=dkim.wdc.com header.b=CXCsbWZ3;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=opensource.wdc.com header.i=@opensource.wdc.com\n header.a=rsa-sha256 header.s=dkim header.b=GAPz1aR5;\n\tdkim-atps=neutral","ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org\n (client-ip=2620:137:e000::1:20; helo=out1.vger.email;\n envelope-from=linux-ide-owner@vger.kernel.org; receiver=)","usg-ed-osssrv.wdc.com (amavisd-new); dkim=pass\n reason=\"pass (just generated, assumed good)\"\n header.d=opensource.wdc.com"],"Received":["from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20])\n\tby bilbo.ozlabs.org (Postfix) with ESMTP id 4LMhhX4HmQz9sGH\n\tfor ; Tue, 14 Jun 2022 18:40:12 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n id S1354086AbiFNIkK (ORCPT );\n Tue, 14 Jun 2022 04:40:10 -0400","from lindbergh.monkeyblade.net ([23.128.96.19]:35118 \"EHLO\n lindbergh.monkeyblade.net\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n with ESMTP id S1352745AbiFNIjs (ORCPT\n ); Tue, 14 Jun 2022 04:39:48 -0400","from esa3.hgst.iphmx.com (esa3.hgst.iphmx.com [216.71.153.141])\n by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8CDF544A1E\n for ; Tue, 14 Jun 2022 01:38:31 -0700 (PDT)","from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com)\n ([199.255.45.15])\n by ob1.hgst.iphmx.com with ESMTP; 14 Jun 2022 16:38:18 +0800","from uls-op-cesaip02.wdc.com ([10.248.3.37])\n by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256;\n 14 Jun 2022 00:56:53 -0700","from usg-ed-osssrv.wdc.com ([10.3.10.180])\n by uls-op-cesaip02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256;\n 14 Jun 2022 01:38:18 -0700","from usg-ed-osssrv.wdc.com (usg-ed-osssrv.wdc.com [127.0.0.1])\n by usg-ed-osssrv.wdc.com (Postfix) with ESMTP id 4LMhfL1XPWz1SVnx\n for ; Tue, 14 Jun 2022 01:38:18 -0700 (PDT)","from usg-ed-osssrv.wdc.com ([127.0.0.1])\n by usg-ed-osssrv.wdc.com (usg-ed-osssrv.wdc.com [127.0.0.1])\n (amavisd-new, port 10026)\n with ESMTP id m07NyrYiSvfb for ;\n Tue, 14 Jun 2022 01:38:17 -0700 (PDT)","from [10.225.163.77] (unknown [10.225.163.77])\n by usg-ed-osssrv.wdc.com (Postfix) with ESMTPSA id 4LMhfH5K10z1Rvlx;\n Tue, 14 Jun 2022 01:38:15 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=simple/simple;\n d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com;\n t=1655195910; x=1686731910;\n h=message-id:date:mime-version:subject:to:cc:references:\n from:in-reply-to:content-transfer-encoding;\n bh=dCSS31S8S1GINFNrobul2NF/nWwqbuMchVq6qrxnFQU=;\n b=CXCsbWZ3ryWHgGo9dPWihW5YK4OXQSzXIsFXTDIKhf5/UI9OsqkQ9wIs\n hFq9AK8ah2994R8qIz6/57Ne1fXVEmvhHI5iCYMGXieGsEmIKtuehbtbg\n 9Z6BwABstXVkrkzKmdmOH+U9Pe3laz/O1S66b0vLJ30KxtHxfTyQJSMPG\n 2IAamtTt+3vZEwoRrsWDBDPKe+JMWJvgSVzQ2rZXYUFQgsqH9KMsJIzWo\n j3FZgLOPv513/fNFL5M3yPMKBZFh4VKqHitM3aETzg65N7PPop47xdRv3\n lL3sMmrKdaYJu+rBTf49oQE3Y1bBXgLCFHlNcOZWqfq+VAQlmeG6shwLd\n g==;","v=1; a=rsa-sha256; c=relaxed/simple; d=\n opensource.wdc.com; h=content-transfer-encoding:content-type\n :in-reply-to:organization:from:references:to:content-language\n :subject:user-agent:mime-version:date:message-id; s=dkim; t=\n 1655195897; x=1657787898; bh=dCSS31S8S1GINFNrobul2NF/nWwqbuMchVq\n 6qrxnFQU=; b=GAPz1aR5qGjrfkl7Ifydky76S/6wKAl4AmNi1CsP0YsJwCcm29i\n ieoROnl1EagvkhHexCHNlsPpCSkG3LNX6sUPoxWlGnqFz9TwO+P4+zkJan6oJvP5\n kCr2HAkoXK26kTVHIH1Ttm9TG3Bt+kD2TpAhpKf9A/nqWGRLqe1wfwlV/x6H31MG\n usb9jmns7zpiS3fwI7cdbgS7DYa52L+wi44uTXWfP8JarVVWBDamSO+0HXDQ/xaM\n uw8/esgEIsCTSY+0WmP4nYWDMfRESExTZFjyuaNrfax0jwamxt5n7eZGR7yynQW+\n uIe1LVSpsScWQnxmO397Gqn4qEDroyruaHw=="],"X-IronPort-AV":"E=Sophos;i=\"5.91,299,1647273600\";\n d=\"scan'208\";a=\"207952911\"","IronPort-SDR":["\n FwXGKArVGgjfuXmZ2pPmVWgJNVLm9ma8wLuiNCYzCXzZp9DSiM/BXhqAazrUMO/q781LeussKS\n 63zzNgsn2PGFgo+po024nVS3BjHPocBLVToqINvewrS/jq5mV1cpsxU5cqJTT/v7dMb1cd1NEv\n NjiIp9DSqY5FBN2/FlpS2C9BFH0Hwsk7UOrrWeyMmm644H83/Cszl56BnBfRkcVOsbriXE8JdH\n G3H4ST71Bfzt0zN5eYHQKqOkx/7ALNJVbSYgKXUvsWKLXaAol/IXrWSDCca6gH+5yZxq+Tu7yE\n Z4ibQbry4PWVNSw/lKAULynY","\n FMETK6vh1iexJI781Cctpg7PLHXkH/UDxyN6g51YLYYGDYh7+cBmQJlK8Ukfs6caUsP3x3WslX\n UbFgvtkIBThPfed6Lim1EA6wA07kWGmZ6/K7j0TONBzqEo8v3LkBQQkKJejgTUv/8H6xORzyC9\n QhwSr0Omkak92nahE7dNqECvc1DS3ncSQu2m6CzVhgmDX81p6iHiNzWp96ZmShVaaW6G+1vtUX\n SHVrgqGEz6AthT+MX22EfzPyAVURXrZ/DdqLb6jyZMswW3ch+NgQxSWtKLzbit7lhbLXht1Uh7\n gzs="],"WDCIronportException":"Internal","X-Virus-Scanned":"amavisd-new at usg-ed-osssrv.wdc.com","Message-ID":"<707c18cb-d499-a499-db9a-db5d73f0f3b4@opensource.wdc.com>","Date":"Tue, 14 Jun 2022 17:38:14 +0900","MIME-Version":"1.0","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101\n Thunderbird/91.10.0","Subject":"Re: [PATCH v4 15/23] ata: ahci: Convert __ahci_port_base to accepting\n hpriv as arguments","Content-Language":"en-US","To":"Serge Semin ,\n Hans de Goede ,\n Jens Axboe , Hannes Reinecke ","Cc":"Serge Semin ,\n Alexey Malahov ,\n Pavel Parkhomenko ,\n Rob Herring , linux-ide@vger.kernel.org,\n linux-kernel@vger.kernel.org, devicetree@vger.kernel.org","References":"<20220610081801.11854-1-Sergey.Semin@baikalelectronics.ru>\n <20220610081801.11854-16-Sergey.Semin@baikalelectronics.ru>","From":"Damien Le Moal ","Organization":"Western Digital Research","In-Reply-To":"<20220610081801.11854-16-Sergey.Semin@baikalelectronics.ru>","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"7bit","X-Spam-Status":"No, score=-5.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,\n DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_MED,\n SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham\n autolearn_force=no version=3.4.6","X-Spam-Checker-Version":"SpamAssassin 3.4.6 (2021-04-09) on\n lindbergh.monkeyblade.net","Precedence":"bulk","List-ID":"","X-Mailing-List":"linux-ide@vger.kernel.org"}},{"id":2913748,"web_url":"http://patchwork.ozlabs.org/comment/2913748/","msgid":"<20220615212531.gmyfxjwdmeukmnzz@mobilestation>","list_archive_url":null,"date":"2022-06-15T21:25:31","subject":"Re: [PATCH v4 15/23] ata: ahci: Convert __ahci_port_base to\n accepting hpriv as arguments","submitter":{"id":70038,"url":"http://patchwork.ozlabs.org/api/people/70038/","name":"Serge Semin","email":"fancer.lancer@gmail.com"},"content":"On Tue, Jun 14, 2022 at 05:38:14PM +0900, Damien Le Moal wrote:\n> On 6/10/22 17:17, Serge Semin wrote:\n> > It may get required to retrieve the port-base address even before the\n> \n> The port base address may be required even before the...\n> \n> > ata_host instance is initialized and activated, for instance in the\n> > ahci_save_initial_config() method which we about to update (consider this\n> \n> s/we/we are\n\nGot it. will be fixed in v5.\n\n-Sergey\n\n> \n> > modification as a preparation for that one). Seeing the __ahci_port_base()\n> > function isn't used much it's the best candidate to provide the required\n> > functionality. So let's convert it to accepting the ahci_host_priv\n> > structure pointer.\n> > \n> > Signed-off-by: Serge Semin \n> > Reviewed-by: Hannes Reinecke \n> > ---\n> > drivers/ata/ahci.c | 2 +-\n> > drivers/ata/ahci.h | 7 ++++---\n> > 2 files changed, 5 insertions(+), 4 deletions(-)\n> > \n> > diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c\n> > index 9bc8fa77e92f..d14d74649e0e 100644\n> > --- a/drivers/ata/ahci.c\n> > +++ b/drivers/ata/ahci.c\n> > @@ -689,7 +689,7 @@ static void ahci_pci_init_controller(struct ata_host *host)\n> > \t\t\tmv = 2;\n> > \t\telse\n> > \t\t\tmv = 4;\n> > -\t\tport_mmio = __ahci_port_base(host, mv);\n> > +\t\tport_mmio = __ahci_port_base(hpriv, mv);\n> > \n> > \t\twritel(0, port_mmio + PORT_IRQ_MASK);\n> > \n> > diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h\n> > index 0e66446a5883..8b9826533ae5 100644\n> > --- a/drivers/ata/ahci.h\n> > +++ b/drivers/ata/ahci.h\n> > @@ -431,10 +431,9 @@ int ahci_host_activate(struct ata_host *host, struct scsi_host_template *sht);\n> > void ahci_error_handler(struct ata_port *ap);\n> > u32 ahci_handle_port_intr(struct ata_host *host, u32 irq_masked);\n> > \n> > -static inline void __iomem *__ahci_port_base(struct ata_host *host,\n> > +static inline void __iomem *__ahci_port_base(struct ahci_host_priv *hpriv,\n> > \t\t\t\t\t unsigned int port_no)\n> > {\n> > -\tstruct ahci_host_priv *hpriv = host->private_data;\n> > \tvoid __iomem *mmio = hpriv->mmio;\n> > \n> > \treturn mmio + 0x100 + (port_no * 0x80);\n> > @@ -442,7 +441,9 @@ static inline void __iomem *__ahci_port_base(struct ata_host *host,\n> > \n> > static inline void __iomem *ahci_port_base(struct ata_port *ap)\n> > {\n> > -\treturn __ahci_port_base(ap->host, ap->port_no);\n> > +\tstruct ahci_host_priv *hpriv = ap->host->private_data;\n> > +\n> > +\treturn __ahci_port_base(hpriv, ap->port_no);\n> > }\n> > \n> > static inline int ahci_nr_ports(u32 cap)\n> \n> \n> -- \n> Damien Le Moal\n> Western Digital Research","headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["bilbo.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256\n header.s=20210112 header.b=oTZQqk2F;\n\tdkim-atps=neutral","ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org\n (client-ip=2620:137:e000::1:20; helo=out1.vger.email;\n envelope-from=linux-ide-owner@vger.kernel.org; receiver=)"],"Received":["from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20])\n\tby bilbo.ozlabs.org (Postfix) with ESMTP id 4LNddG590Bz9sG0\n\tfor ; Thu, 16 Jun 2022 07:25:38 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n id S1347544AbiFOVZh (ORCPT );\n Wed, 15 Jun 2022 17:25:37 -0400","from lindbergh.monkeyblade.net ([23.128.96.19]:49328 \"EHLO\n lindbergh.monkeyblade.net\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n with ESMTP id S236639AbiFOVZg (ORCPT\n ); Wed, 15 Jun 2022 17:25:36 -0400","from mail-lf1-x12e.google.com (mail-lf1-x12e.google.com\n [IPv6:2a00:1450:4864:20::12e])\n by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B115156200;\n Wed, 15 Jun 2022 14:25:35 -0700 (PDT)","by mail-lf1-x12e.google.com with SMTP id c4so20803913lfj.12;\n Wed, 15 Jun 2022 14:25:35 -0700 (PDT)","from mobilestation ([95.79.189.214])\n by smtp.gmail.com with ESMTPSA id\n r30-20020ac25c1e000000b004791f9ea46esm1924017lfp.231.2022.06.15.14.25.32\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Wed, 15 Jun 2022 14:25:33 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=gmail.com; s=20210112;\n h=date:from:to:cc:subject:message-id:references:mime-version\n :content-disposition:in-reply-to;\n bh=pyTQQlNbGPEuJO15lTuPZ7DQfEn06e9frSoizvFwKWw=;\n b=oTZQqk2F8TVXVFGVypiZ5kqvrzYjclRj/aSnxyTIM6hQJnbMveHh8CN5NSKdEjXmrT\n xnw04YfUTHUA41scTdZ/ihwYtqlZNJ9sUR0uy9FJ1xPpQgOZvvs4lW4nToN3lIemtsoJ\n kxboW1x3I1bnf4Kq6p6QHgo6/qu6mbpOjgHIQPMjvOS77A6H3dVySOFH9pN377hOv0zY\n ue1Cr1ZBlam4ytR7Ko6On/O1zB9BOiLb+JehNpP6MKeyhGYMYY+GsyW+/StTuZPDXhQK\n 20RA9vj8+odsXy1OjpAVHocdS9L+G9ETirfDVa8V52HKPFVLpnzz0eGA5ueD8WlYeHD8\n TcGA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20210112;\n h=x-gm-message-state:date:from:to:cc:subject:message-id:references\n :mime-version:content-disposition:in-reply-to;\n bh=pyTQQlNbGPEuJO15lTuPZ7DQfEn06e9frSoizvFwKWw=;\n b=i5SIFNeaLxI/O95l+vVoTP4agizPWv3URQEJL4a7D/u/BnNU10AKaot9WybfYeVzAO\n jYqfa2UDLRfFok7ilkhdV9eWeZRB32Ger7030uCCkYCY1rAA/kAr5h/UF5vIbgzNmMa1\n /d9i6ImW2vM8B+gxXG0pjiNcBgn4neIwdoIFGRXcXQ48UGehx8EndZBCyiDiz2HVNb6A\n 4StRP2FPzoEiiMRmXs9orUcY0Kr8CobFUR4F/2BgbQ1ajQmZUlrOBKVpaIyCNCQn7Kb5\n 9lXIOQ6hII3fw3+1gDVabHCyqxKYFI4DHFmnGd4f1hcLhiXt7MU64luyJHNKCh9Atk94\n e7lQ==","X-Gm-Message-State":"AJIora/phkDpkeekJR6hLUtKV9Hp8O/jCmJ+4agx0AaICwpo0xZgagwA\n U9rCb4qCFAq4lV8EUu+CeoQ=","X-Google-Smtp-Source":"\n AGRyM1tNfm48SgxJ6bhN8fJEPsmy+wX9TOkullLnS11iK/m9CjlKWH6IosEJU9UKnbB9kyNUpONeSg==","X-Received":"by 2002:a05:6512:6c1:b0:478:e288:1c39 with SMTP id\n u1-20020a05651206c100b00478e2881c39mr840800lff.58.1655328334096;\n Wed, 15 Jun 2022 14:25:34 -0700 (PDT)","Date":"Thu, 16 Jun 2022 00:25:31 +0300","From":"Serge Semin ","To":"Damien Le Moal ","Cc":"Serge Semin ,\n Hans de Goede ,\n Jens Axboe , Hannes Reinecke ,\n Alexey Malahov ,\n Pavel Parkhomenko ,\n Rob Herring , linux-ide@vger.kernel.org,\n linux-kernel@vger.kernel.org, devicetree@vger.kernel.org","Subject":"Re: [PATCH v4 15/23] ata: ahci: Convert __ahci_port_base to\n accepting hpriv as arguments","Message-ID":"<20220615212531.gmyfxjwdmeukmnzz@mobilestation>","References":"<20220610081801.11854-1-Sergey.Semin@baikalelectronics.ru>\n <20220610081801.11854-16-Sergey.Semin@baikalelectronics.ru>\n <707c18cb-d499-a499-db9a-db5d73f0f3b4@opensource.wdc.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=us-ascii","Content-Disposition":"inline","In-Reply-To":"<707c18cb-d499-a499-db9a-db5d73f0f3b4@opensource.wdc.com>","X-Spam-Status":"No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,\n DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,\n RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE\n autolearn=ham autolearn_force=no version=3.4.6","X-Spam-Checker-Version":"SpamAssassin 3.4.6 (2021-04-09) on\n lindbergh.monkeyblade.net","Precedence":"bulk","List-ID":"","X-Mailing-List":"linux-ide@vger.kernel.org"}}]