From patchwork Thu Feb 1 16:14:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Cassel X-Patchwork-Id: 1894049 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=EOOkw/UJ; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2604:1380:4601:e00::3; helo=am.mirrors.kernel.org; envelope-from=linux-ide+bounces-405-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from am.mirrors.kernel.org (am.mirrors.kernel.org [IPv6:2604:1380:4601:e00::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TQkc81Dg3z23gx for ; Fri, 2 Feb 2024 03:18:48 +1100 (AEDT) Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id A33191F21B94 for ; Thu, 1 Feb 2024 16:18:45 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 37225779ED; Thu, 1 Feb 2024 16:15:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="EOOkw/UJ" X-Original-To: linux-ide@vger.kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EC7B9626D7 for ; Thu, 1 Feb 2024 16:15:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706804122; cv=none; b=HnZHfTAHBJ1muC7AlFrIgtVZTwZY3fiKTywsVWIStBguRC3UV8WGkfDqooYf9canj/DTzjf7BZVoVY0IvnUczfnF52hIC/ot08M08WkcBBCkk10DFR/3YAx38pRk22L/puJLnYjMI+db0AvNtu71fskaEZEOkBPcqb8hiwOpodQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706804122; c=relaxed/simple; bh=7u5txi2BZgTrKl0BJ+paP2Z3dV8tSPFgtBmXOtG4NBo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KAjl+R8OVNk4ovpHihzvCVxB/RL0zmKsNL3lHFErjJH9n1ZmiOr/V+SAmQl9Qd9XJtKzSZTXHOKij+nmeSzvmtOnCPEPxGI4v9/7iomkaGjMub+NlKIOgUplQw9TSymrLf6eZso9byehyFwYDOWXElwqfe7ifKRnbh6XO5Wg+po= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=EOOkw/UJ; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 75753C433C7; Thu, 1 Feb 2024 16:15:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706804121; bh=7u5txi2BZgTrKl0BJ+paP2Z3dV8tSPFgtBmXOtG4NBo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EOOkw/UJ6xOd4rzA+OsdR9f/iuYSQolGDE/9EDgSzWXyQvNL+zFjh94P2N1uIozAV aCyXe92rbWy2m/38+/t48+UjFN802OELi4XT7oBBk+8gD97q7bebDaUgeXHC6R8mMQ 6N/cSPOk66+kel0iBAEUVya6BWXFuUO+I7KE4QAVA3hYLvV4oBGs9OVFoirGY6VhMj 3thDdSy2Yi7HguDTVl1tAk7iIJt/YfRMvfXBfAptZonaeds6T0EMa+HzszKaqPVuAu gQZv7ILQskz9ExBpj7/KTI/VpqK8eQn5tnUooFapdPbWKjUTgPcLlP3gfWs4fiwoAk cvT3+nEK6bSTg== From: Niklas Cassel To: Damien Le Moal , Niklas Cassel Cc: Werner Fischer , Daniel Drake , Mika Westerberg , Jian-Hong Pan , Dieter Mummenschanz , linux-ide@vger.kernel.org Subject: [PATCH 2/5] ata: ahci: a hotplug capable port is an external port Date: Thu, 1 Feb 2024 17:14:59 +0100 Message-ID: <20240201161507.1147521-3-cassel@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240201161507.1147521-1-cassel@kernel.org> References: <20240201161507.1147521-1-cassel@kernel.org> Precedence: bulk X-Mailing-List: linux-ide@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 A hotplug capable port is an external port, so mark it as such. We even say this ourselves in libata-scsi.c: /* set scsi removable (RMB) bit per ata bit, or if the * AHCI port says it's external (Hotplug-capable, eSATA). */ This also matches the terminology used in AHCI 1.3.1 (the keyword to search for is "externally accessible"). Signed-off-by: Niklas Cassel Reviewed-by: Damien Le Moal --- drivers/ata/ahci.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 157ab88bdf75..8c8403bae36f 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -1649,7 +1649,8 @@ static void ahci_mark_external_port(struct ata_port *ap) u32 tmp; tmp = readl(port_mmio + PORT_CMD); - if ((tmp & PORT_CMD_ESP) && (hpriv->cap & HOST_CAP_SXS)) + if (((tmp & PORT_CMD_ESP) && (hpriv->cap & HOST_CAP_SXS)) || + (tmp & PORT_CMD_HPCP)) ap->pflags |= ATA_PFLAG_EXTERNAL; } @@ -1945,7 +1946,7 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) if (ap->flags & ATA_FLAG_EM) ap->em_message_type = hpriv->em_msg_type; - /* mark esata ports */ + /* mark external ports (hotplug-capable, eSATA) */ ahci_mark_external_port(ap); ahci_update_initial_lpm_policy(ap, hpriv);